Skip to content

Commit 96913ac

Browse files
authored
fix: query tables styles (#2815)
1 parent ed4f15b commit 96913ac

File tree

4 files changed

+14
-23
lines changed

4 files changed

+14
-23
lines changed

src/components/Fullscreen/Fullscreen.tsx

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,11 @@ function Fullscreen({children, className}: FullscreenProps) {
6161
} else {
6262
ref.current?.appendChild(container);
6363
}
64+
// Trigger recalculation for components relying on window resize
65+
// Dispatch after DOM repaint to ensure correct measurements
66+
requestAnimationFrame(() => {
67+
window.dispatchEvent(new Event('resize'));
68+
});
6469
}
6570
}, [container, isFullscreen]);
6671

src/components/QueryResultTable/QueryResultTable.tsx

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -105,16 +105,14 @@ export const QueryResultTable = (props: QueryResultTableProps) => {
105105
}
106106

107107
return (
108-
<div style={{display: 'flex', flexGrow: 1}}>
109-
<ResizeableDataTable
110-
data={data}
111-
columns={preparedColumns}
112-
settings={settings}
113-
// prevent accessing row.id in case it is present but is not the PK (i.e. may repeat)
114-
rowKey={getRowIndex}
115-
visibleRowIndex={getVisibleRowIndex}
116-
wrapperClassName={b('table-wrapper')}
117-
/>
118-
</div>
108+
<ResizeableDataTable
109+
data={data}
110+
columns={preparedColumns}
111+
settings={settings}
112+
// prevent accessing row.id in case it is present but is not the PK (i.e. may repeat)
113+
rowKey={getRowIndex}
114+
visibleRowIndex={getVisibleRowIndex}
115+
wrapperClassName={b('table-wrapper')}
116+
/>
119117
);
120118
};

src/components/ResizeableDataTable/ResizeableDataTable.scss

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
.ydb-resizeable-data-table {
2-
display: flex;
3-
42
width: max-content;
53

64
// padding for easier resize of the last column

src/containers/Tenant/Query/QueryResult/components/ResultSetsViewer/ResultSetsViewer.tsx

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import {Flex, Tab, TabList, TabProvider, Text} from '@gravity-ui/uikit';
66
import {QueryResultTable} from '../../../../../../components/QueryResultTable';
77
import type {ParsedResultSet} from '../../../../../../types/store/query';
88
import {cn} from '../../../../../../utils/cn';
9-
import {useTypedSelector} from '../../../../../../utils/hooks';
109
import {QueryResultError} from '../QueryResultError/QueryResultError';
1110

1211
import './ResultSetsViewer.scss';
@@ -23,20 +22,11 @@ interface ResultSetsViewerProps {
2322

2423
export function ResultSetsViewer(props: ResultSetsViewerProps) {
2524
const {selectedResultSet, setSelectedResultSet, resultSets, error} = props;
26-
const isFullscreen = useTypedSelector((state) => state.fullscreen);
2725

2826
const scrollRef = React.useRef<HTMLDivElement>(null);
2927

3028
const currentResult = resultSets?.[selectedResultSet];
3129

32-
React.useEffect(() => {
33-
//this is needed to trigger data-table recount visible rows
34-
if (isFullscreen) {
35-
const resizeEvent = new Event('resize');
36-
scrollRef.current?.dispatchEvent(resizeEvent);
37-
}
38-
}, [isFullscreen]);
39-
4030
const renderTabs = () => {
4131
return (
4232
<TabProvider value={String(selectedResultSet)}>

0 commit comments

Comments
 (0)