Skip to content

Commit 0dbe5f9

Browse files
committed
chore: remove useless todo and better naming
1 parent b8866a9 commit 0dbe5f9

File tree

4 files changed

+9
-10
lines changed

4 files changed

+9
-10
lines changed

packages/pluggableWidgets/datagrid-web/src/components/Grid.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,13 @@ export const Grid = observer(function Grid(props: PropsWithChildren): ReactEleme
77
const config = useDatagridConfig();
88
const gridSizeStore = useGridSizeStore();
99

10-
// TODO: add check custom css styling is applie
1110
const style = useGridStyle().get();
1211
return (
1312
<div
1413
aria-multiselectable={config.multiselectable}
15-
className={classNames("widget-datagrid-grid table", { "infinite-loading": gridSizeStore.isInfinite })}
14+
className={classNames("widget-datagrid-grid table", {
15+
"infinite-loading": gridSizeStore.hasVirtualScrolling
16+
})}
1617
role="grid"
1718
style={style}
1819
ref={gridSizeStore.gridContainerRef}

packages/pluggableWidgets/datagrid-web/src/model/hooks/useInfiniteControl.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,21 +43,21 @@ export function useInfiniteControl(): [trackBodyScrolling: ((e: any) => void) |
4343
);
4444

4545
const gridBody = gridSizeStore.gridBodyRef.current;
46-
const { isInfinite, gridBodyHeight, hasMoreItems } = gridSizeStore;
46+
const { hasVirtualScrolling, gridBodyHeight, hasMoreItems } = gridSizeStore;
4747

4848
const lockGridBodyHeight = useCallback((): void => {
49-
if (isVisible && isInfinite && hasMoreItems && gridBodyHeight === undefined && gridBody) {
49+
if (isVisible && hasVirtualScrolling && hasMoreItems && gridBodyHeight === undefined && gridBody) {
5050
gridSizeStore.setGridBodyHeight(gridBody.clientHeight - offsetBottom);
5151
}
52-
}, [isVisible, isInfinite, hasMoreItems, gridBodyHeight, gridBody, gridSizeStore]);
52+
}, [isVisible, hasVirtualScrolling, hasMoreItems, gridBodyHeight, gridBody, gridSizeStore]);
5353

5454
useLayoutEffect(() => {
5555
setTimeout(() => lockGridBodyHeight(), 100);
5656
}, [lockGridBodyHeight]);
5757

5858
useLayoutEffect(() => {
5959
const observeTarget = gridSizeStore.gridContainerRef.current;
60-
if (!gridSizeStore.isInfinite || !observeTarget) return;
60+
if (!gridSizeStore.hasVirtualScrolling || !observeTarget) return;
6161

6262
const resizeObserver = new ResizeObserver(entries => {
6363
for (const entry of entries) {
@@ -72,5 +72,5 @@ export function useInfiniteControl(): [trackBodyScrolling: ((e: any) => void) |
7272
};
7373
}, [gridSizeStore]);
7474

75-
return [gridSizeStore.isInfinite ? trackBodyScrolling : undefined];
75+
return [gridSizeStore.hasVirtualScrolling ? trackBodyScrolling : undefined];
7676
}

packages/pluggableWidgets/datagrid-web/src/model/models/grid.model.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ export function gridStyleAtom(
1111
config: DatagridConfig,
1212
gridSizeStore: GridSizeStore
1313
): ComputedAtom<CSSProperties> {
14-
// todo: include custom variables from gridSizeStore;
15-
1614
return computed(
1715
() =>
1816
({

packages/pluggableWidgets/datagrid-web/src/model/stores/GridSize.store.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ export class GridSizeStore {
4242
return this.paging.hasMoreItems;
4343
}
4444

45-
get isInfinite(): boolean {
45+
get hasVirtualScrolling(): boolean {
4646
return this.paging.pagination === "virtualScrolling";
4747
}
4848

0 commit comments

Comments
 (0)