From 997bcf4dd3ee5cd1880e864f48e876cbfc2d3f1a Mon Sep 17 00:00:00 2001 From: Daniela Buzatu Date: Wed, 8 Nov 2023 11:29:21 +0200 Subject: [PATCH 1/2] fix resize cell indicator not showing when maxHeight --- src/api/apiData.js | 7 +++++++ src/plugins/ResizeReorder/ResizeCell.js | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/api/apiData.js b/src/api/apiData.js index 25000851..08e859f4 100644 --- a/src/api/apiData.js +++ b/src/api/apiData.js @@ -9,11 +9,16 @@ */ import columnWidths from '../selectors/columnWidths'; import shallowEqualSelector from '../helper/shallowEqualSelector'; +import tableHeightsSelector from '../selectors/tableHeights'; const getApiDataSelector = () => shallowEqualSelector( [ (state) => state.tableSize.height, + (state) => + (state.headerHeight ? state.headerHeight : 0) + + (state.groupHeaderHeight ? state.groupHeaderHeight : 0) + + tableHeightsSelector(state).visibleRowsHeight, (state) => state.elementHeights.groupHeaderHeight, (state) => state.scrollX, (state) => state.maxScrollX, @@ -22,6 +27,7 @@ const getApiDataSelector = () => ], ( /*number*/ tableHeight, + /*number*/ bodyAndHeaderHeight, /*number*/ groupHeaderHeight, /*number*/ scrollX, /*number*/ maxScrollX, @@ -30,6 +36,7 @@ const getApiDataSelector = () => ) => { return { tableHeight, + bodyAndHeaderHeight, groupHeaderHeight, scrollX, maxScrollX, diff --git a/src/plugins/ResizeReorder/ResizeCell.js b/src/plugins/ResizeReorder/ResizeCell.js index bdeb8d56..b9ec6378 100644 --- a/src/plugins/ResizeReorder/ResizeCell.js +++ b/src/plugins/ResizeReorder/ResizeCell.js @@ -89,7 +89,7 @@ class ResizeCell extends React.PureComponent { <> Date: Wed, 8 Nov 2023 13:57:50 +0200 Subject: [PATCH 2/2] use computed componentHeight --- src/api/apiData.js | 8 +------- src/plugins/ResizeReorder/ResizeCell.js | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/api/apiData.js b/src/api/apiData.js index 08e859f4..27e2b22a 100644 --- a/src/api/apiData.js +++ b/src/api/apiData.js @@ -14,11 +14,7 @@ import tableHeightsSelector from '../selectors/tableHeights'; const getApiDataSelector = () => shallowEqualSelector( [ - (state) => state.tableSize.height, - (state) => - (state.headerHeight ? state.headerHeight : 0) + - (state.groupHeaderHeight ? state.groupHeaderHeight : 0) + - tableHeightsSelector(state).visibleRowsHeight, + (state) => tableHeightsSelector(state).componentHeight, (state) => state.elementHeights.groupHeaderHeight, (state) => state.scrollX, (state) => state.maxScrollX, @@ -27,7 +23,6 @@ const getApiDataSelector = () => ], ( /*number*/ tableHeight, - /*number*/ bodyAndHeaderHeight, /*number*/ groupHeaderHeight, /*number*/ scrollX, /*number*/ maxScrollX, @@ -36,7 +31,6 @@ const getApiDataSelector = () => ) => { return { tableHeight, - bodyAndHeaderHeight, groupHeaderHeight, scrollX, maxScrollX, diff --git a/src/plugins/ResizeReorder/ResizeCell.js b/src/plugins/ResizeReorder/ResizeCell.js index b9ec6378..bdeb8d56 100644 --- a/src/plugins/ResizeReorder/ResizeCell.js +++ b/src/plugins/ResizeReorder/ResizeCell.js @@ -89,7 +89,7 @@ class ResizeCell extends React.PureComponent { <>