dennii/dbgate
1
0
Fork 0
mirror of https://github.com/DeNNiiInc/dbgate.git synced 2026-04-30 06:53:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

grid columns max scroll count

Browse Source
This commit is contained in:
Jan Prochazka
2020-04-26 17:35:02 +02:00
parent 9c800f87f4
commit f3f9404637
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/web/src/datagrid/DataGridCore.js
View File

@@ -370,6 +370,11 @@ export default function DataGridCore(props) {
} }
}, [tabVisible, focusFieldRef.current]); }, [tabVisible, focusFieldRef.current]);
const maxScrollColumn = React.useMemo(() => {
let newColumn = columnSizes.scrollInView(0, columns.length - 1 - columnSizes.frozenCount, gridScrollAreaWidth);
return newColumn;
}, [columnSizes, gridScrollAreaWidth]);
const handleJslDataStats = React.useCallback((stats) => { const handleJslDataStats = React.useCallback((stats) => {
setLoadProps((oldProps) => ({ setLoadProps((oldProps) => ({
...oldProps, ...oldProps,
@@ -419,7 +424,7 @@ export default function DataGridCore(props) {
const invMap = _.invert(realColumnUniqueNames); const invMap = _.invert(realColumnUniqueNames);
const colIndex = invMap[display.focusedColumn]; const colIndex = invMap[display.focusedColumn];
if (colIndex) { if (colIndex) {
scrollIntoView([currentCell[0], colIndex]); scrollIntoView([null, colIndex]);
} }
} }
}, [display && display.focusedColumn]); }, [display && display.focusedColumn]);
@@ -1046,7 +1051,7 @@ export default function DataGridCore(props) {
valueToSet={hScrollValueToSet} valueToSet={hScrollValueToSet}
valueToSetDate={hScrollValueToSetDate} valueToSetDate={hScrollValueToSetDate}
minimum={0} minimum={0}
maximum={columns.length - 1} maximum={maxScrollColumn}
viewportRatio={gridScrollAreaWidth / columnSizes.getVisibleScrollSizeSum()} viewportRatio={gridScrollAreaWidth / columnSizes.getVisibleScrollSizeSum()}
onScroll={handleColumnScroll} onScroll={handleColumnScroll}
/> />