feat: better horizontal scrolling

Author: r0b1n

packages/modules/data-widgets/src/themesource/datawidgets/web/_datagrid.scss

@@ -395,6 +395,11 @@ $root: ".widget-datagrid";
             display: grid !important;
             min-width: fit-content;
             margin-bottom: 0;
+            &.infinite-loading {
+                // in order to restrict the scroll to row area
+                // we need to prevent table itself to expanding beyond available position
+                min-width: 0;
+            }
         }
     }
 
@@ -530,24 +535,57 @@ $root: ".widget-datagrid";
     margin: var(--spacing-small, 8px) 0;
 }
 
-.infinite-loading.widget-datagrid-grid-body {
-    // when virtual scroll is enabled we make area that holds rows scrollable
-    // (while the area that holds column headers still stays in place)
-    overflow-y: auto;
+.infinite-loading {
+    .widget-datagrid-grid-head {
+        width: calc(var(--mx-grid-width) - var(--mx-grid-scrollbar-size));
+        overflow-x: hidden;
+    }
+    .widget-datagrid-grid-head[data-scrolled-y="true"] {
+        box-shadow: 0 5px 5px -5px gray;
+    }
+
+    .widget-datagrid-grid-body {
+        width: var(--mx-grid-width);
+        overflow-y: auto;
+        max-height: var(--mx-grid-body-height);
+    }
+
+    .widget-datagrid-grid-head[data-scrolled-x="true"]:after {
+        content: "";
+        position: absolute;
+        left: 0px;
+        width: 10px;
+        box-shadow: inset 5px 0 5px -5px gray;
+        top: 0;
+        bottom: 0;
+    }
 }
 
-.widget-datagrid-grid-head,
+.widget-datagrid-grid-head {
+    display: grid;
+
+    // this head is not part of the grid, so it has dedicated column template  --mx-grid-template-columns-head
+    // but it might not be available at the initial render, so we use template from the grid --mx-grid-template-columns
+    // using template from the grid might to misalignment from the grid itself,
+    // but in practice:
+    //   - grid has no data at that moment, so misalignment is not visible.
+    //   - as soon as the grid itself gets rendered --mx-grid-template-columns-head gets calculated
+    //     and everything looks like it should.
+    grid-template-columns: var(--mx-grid-template-columns-head, var(--mx-grid-template-columns));
+}
 .widget-datagrid-grid-body {
     // this element has to position their children (columns or headers)
     // as grid and have those aligned with the parent grid
     display: grid;
     // this property makes sure we align our own grid columns
     // to the columns defined in the global grid
-    grid-template-columns: subgrid;
+    grid-template-columns: var(--mx-grid-template-columns);
+}
 
-    // ensure that we cover all columns of original top level grid
-    // so our own columns get aligned with the parent
+.grid-mock-header {
+    grid-template-columns: subgrid;
     grid-column: 1 / -1;
+    display: grid;
 }
 
 :where(#{$root}-paging-bottom, #{$root}-padding-top) {

packages/pluggableWidgets/datagrid-web/CHANGELOG.md

@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 
+### Changed
+
+- We improved virtual scrolling behavior when horizontal scrolling is present due to grid size.
+
 ### Added
 
 - We added a new property for export to excel. The new property allows to set the cell export type and also the format for type number and date.

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

@@ -1,16 +1,20 @@
+import classNames from "classnames";
 import { observer } from "mobx-react-lite";
 import { PropsWithChildren, ReactElement } from "react";
-import { useDatagridConfig, useGridStyle } from "../model/hooks/injection-hooks";
+import { useDatagridConfig, useGridSizeStore, useGridStyle } from "../model/hooks/injection-hooks";
 
 export const Grid = observer(function Grid(props: PropsWithChildren): ReactElement {
     const config = useDatagridConfig();
+    const gridSizeStore = useGridSizeStore();
+    // TODO: add check custom css styling is applied
     const style = useGridStyle().get();
     return (
         <div
             aria-multiselectable={config.multiselectable}
-            className={"widget-datagrid-grid table"}
+            className={classNames("widget-datagrid-grid table", { "infinite-loading": gridSizeStore.isInfinite })}
             role="grid"
             style={style}
+            ref={gridSizeStore.gridContainerRef}
         >
             {props.children}
         </div>

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

@@ -1,4 +1,3 @@
-import classNames from "classnames";
 import { observer } from "mobx-react-lite";
 import { Fragment, PropsWithChildren, ReactElement, ReactNode } from "react";
 import {
@@ -14,12 +13,11 @@ import { SpinnerLoader } from "./loader/SpinnerLoader";
 
 export const GridBody = observer(function GridBody(props: PropsWithChildren): ReactElement {
     const { children } = props;
-    const { bodySize, containerRef, isInfinite, handleScroll } = useBodyScroll();
+    const { containerRef, handleScroll } = useBodyScroll();
 
     return (
         <div
-            className={classNames("widget-datagrid-grid-body table-content", { "infinite-loading": isInfinite })}
-            style={isInfinite && bodySize > 0 ? { maxHeight: `${bodySize}px` } : {}}
+            className={"widget-datagrid-grid-body table-content"}
             role="rowgroup"
             ref={containerRef}
             onScroll={handleScroll}

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

@@ -1,5 +1,5 @@
 import { ReactElement, useState } from "react";
-import { useColumnsStore, useDatagridConfig } from "../model/hooks/injection-hooks";
+import { useColumnsStore, useDatagridConfig, useGridSizeStore } from "../model/hooks/injection-hooks";
 import { ColumnId } from "../typings/GridColumn";
 import { CheckboxColumnHeader } from "./CheckboxColumnHeader";
 import { ColumnProvider } from "./ColumnProvider";
@@ -11,6 +11,7 @@ import { HeaderSkeletonLoader } from "./loader/HeaderSkeletonLoader";
 export function GridHeader(): ReactElement {
     const { columnsHidable, id: gridId } = useDatagridConfig();
     const columnsStore = useColumnsStore();
+    const gridSizeStore = useGridSizeStore();
     const columns = columnsStore.visibleColumns;
     const [dragOver, setDragOver] = useState<[ColumnId, "before" | "after"] | undefined>(undefined);
     const [isDragging, setIsDragging] = useState<[ColumnId | undefined, ColumnId, ColumnId | undefined] | undefined>();
@@ -20,7 +21,7 @@ export function GridHeader(): ReactElement {
     }
 
     return (
-        <div className="widget-datagrid-grid-head" role="rowgroup">
+        <div className="widget-datagrid-grid-head" role="rowgroup" ref={gridSizeStore.gridHeaderRef}>
             <div key="headers_row" className="tr" role="row">
                 <CheckboxColumnHeader key="headers_column_select_all" />
                 {columns.map(column => (

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

@@ -60,7 +60,6 @@ export function Header(props: HeaderProps): ReactElement {
             role="columnheader"
             style={!canSort ? { cursor: "unset" } : undefined}
             title={caption}
-            ref={ref => column.setHeaderElementRef(ref)}
             data-column-id={column.columnId}
             onDrop={draggableProps.onDrop}
             onDragEnter={draggableProps.onDragEnter}

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

@@ -0,0 +1,65 @@
+import { GridColumn } from "../typings/GridColumn";
+import { ReactNode, useCallback, useEffect, useRef } from "react";
+
+function getColumnSizes(container: HTMLDivElement | null): Map<string, number> {
+    const sizes = new Map<string, number>();
+    if (container) {
+        container.querySelectorAll<HTMLDivElement>("[data-column-id]").forEach(c => {
+            const columnId = c.dataset.columnId;
+            if (!columnId) {
+                console.debug("getColumnSizes: can't find id on:", c);
+                return;
+            }
+            sizes.set(columnId, c.offsetWidth);
+        });
+    }
+
+    return sizes;
+}
+
+interface MockHeaderProps {
+    visibleColumns: GridColumn[];
+    showCheckboxColumn: boolean;
+    showColumnSelectorColumn: boolean;
+    updateColumnSizes: (sizes: number[]) => void;
+}
+
+export function MockHeader({
+    visibleColumns,
+    showCheckboxColumn,
+    showColumnSelectorColumn,
+    updateColumnSizes
+}: MockHeaderProps): ReactNode {
+    const headerRef = useRef<HTMLDivElement | null>(null);
+    const resizeCallback = useCallback<ResizeObserverCallback>(() => {
+        updateColumnSizes(getColumnSizes(headerRef.current).values().toArray());
+    }, [headerRef, updateColumnSizes]);
+
+    useEffect(() => {
+        const observer = new ResizeObserver(resizeCallback);
+
+        if (headerRef.current) {
+            observer.observe(headerRef.current);
+        }
+        return () => {
+            observer.disconnect();
+        };
+    }, [resizeCallback, headerRef]);
+
+    return (
+        <div className={"grid-mock-header"} aria-hidden ref={headerRef}>
+            {showCheckboxColumn && <div data-column-id="checkboxes" key={"checkboxes"}></div>}
+            {visibleColumns.map(c => (
+                <div
+                    data-column-id={c.columnId}
+                    key={c.columnId}
+                    // we set header ref here instead of the real header
+                    // as this mock header is aligned with CSS grid, so it is more reliable
+                    // the real header is aligned programmatically based on this header
+                    ref={ref => c.setHeaderElementRef(ref)}
+                ></div>
+            ))}
+            {showColumnSelectorColumn && <div data-column-id="selector" key={"selector"}></div>}
+        </div>
+    );
+}

packages/pluggableWidgets/datagrid-web/src/helpers/state/column/ColumnStore.tsx

@@ -28,6 +28,8 @@ export class ColumnStore implements GridColumn {
     private baseInfo: BaseColumnInfo;
     private parentStore: IColumnParentStore;
 
+    // this holds size of the column that it had prior to resizing started
+    // this is needed to prevent personalization being saved while resizing
     private frozenSize: number | undefined;
 
     // dynamic props from PW API

packages/pluggableWidgets/datagrid-web/src/model/containers/Datagrid.container.ts

@@ -32,6 +32,7 @@ import { DerivedLoaderController } from "../services/DerivedLoaderController";
 import { PaginationController } from "../services/PaginationController";
 import { SelectionGate } from "../services/SelectionGate.service";
 import { CORE_TOKENS as CORE, DG_TOKENS as DG, SA_TOKENS } from "../tokens";
+import { GridSizeStore } from "../stores/GridSize.store";
 
 // base
 injected(ColumnGroupStore, CORE.setupService, CORE.mainGate, CORE.config, DG.filterHost);
@@ -40,6 +41,7 @@ injected(DatasourceService, CORE.setupService, DG.queryGate, DG.refreshInterval.
 injected(PaginationController, CORE.setupService, DG.paginationConfig, DG.query);
 injected(GridBasicData, CORE.mainGate);
 injected(WidgetRootViewModel, CORE.mainGate, CORE.config, DG.exportProgressService, SA_TOKENS.selectionDialogVM);
+injected(GridSizeStore, DG.paginationService);
 
 // loader
 injected(DerivedLoaderController, DG.query, DG.exportProgressService, CORE.columnsStore, DG.loaderConfig);
@@ -98,6 +100,8 @@ export class DatagridContainer extends Container {
         this.bind(DG.query).toInstance(DatasourceService).inSingletonScope();
         // Pagination service
         this.bind(DG.paginationService).toInstance(PaginationController).inSingletonScope();
+        // Grid sizing and scrolling store
+        this.bind(DG.gridSizeStore).toInstance(GridSizeStore).inSingletonScope();
         // Datasource params service
         this.bind(DG.paramsService).toInstance(DatasourceParamsController).inSingletonScope();
         // FilterAPI
@@ -229,5 +233,7 @@ export class DatagridContainer extends Container {
 
         // Hydrate filters from props
         this.get(DG.combinedFilter).hydrate(props.datasource.filter);
+
+        this.get(DG.gridSizeStore);
     }
 }

packages/pluggableWidgets/datagrid-web/src/model/hooks/injection-hooks.ts

@@ -9,6 +9,7 @@ export const [useExportProgressService] = createInjectionHooks(DG.exportProgress
 export const [useLoaderViewModel] = createInjectionHooks(DG.loaderVM);
 export const [useMainGate] = createInjectionHooks(CORE.mainGate);
 export const [usePaginationService] = createInjectionHooks(DG.paginationService);
+export const [useGridSizeStore] = createInjectionHooks(DG.gridSizeStore);
 export const [useSelectionHelper] = createInjectionHooks(DG.selectionHelper);
 export const [useGridStyle] = createInjectionHooks(DG.gridColumnsStyle);
 export const [useQueryService] = createInjectionHooks(DG.query);