@equinor/apollo-components 3.1.2-rowfix.2 → 3.1.2-rowfix.21

package/dist/index.js

@@ -663,7 +663,7 @@ function TableHeader({ table, sticky }) {
 // src/DataTable/DataTable.tsx
 var import_eds_core_react18 = require("@equinor/eds-core-react");
 var import_react_table3 = require("@tanstack/react-table");
-var import_react6 = require("react");
+var import_react7 = require("react");
 var import_styled_components16 = __toESM(require("styled-components"));
 
 // src/DataTable/components/BasicTable.tsx
@@ -944,6 +944,7 @@ function VirtualTableBody({
   table,
   rowConfig,
   cellConfig,
+  hasRef,
   containerRef,
   ...props
 }) {
@@ -959,6 +960,7 @@ function VirtualTableBody({
   if (!rowVirtualizer)
     return null;
   const virtualRows = rowVirtualizer.getVirtualItems();
+  console.log("VirtualTableBody", { container: containerRef.current, virtualRows, hasRef });
   const paddingTop = virtualRows.length > 0 ? ((_a = virtualRows == null ? void 0 : virtualRows[0]) == null ? void 0 : _a.start) || 0 : 0;
   const paddingBottom = virtualRows.length > 0 ? rowVirtualizer.getTotalSize() - (((_b = virtualRows == null ? void 0 : virtualRows[virtualRows.length - 1]) == null ? void 0 : _b.end) || 0) : 0;
   return /* @__PURE__ */ (0, import_jsx_runtime18.jsxs)(TableBody, {
@@ -1015,6 +1017,13 @@ function useFetchMoreOnBottomReached(tableContainerRef, infiniteScrollConfig) {
   return onTableContainerScroll;
 }
 
+// src/DataTable/hooks/useForceRerender.ts
+var import_react6 = require("react");
+function useForceRerender() {
+  const [, setTick] = (0, import_react6.useState)(0);
+  return (0, import_react6.useCallback)(() => setTick((tick) => tick + 1), []);
+}
+
 // src/DataTable/DataTable.tsx
 var import_jsx_runtime19 = require("react/jsx-runtime");
 var DataTableWrapper = import_styled_components16.default.div`
@@ -1037,12 +1046,12 @@ var DataTableWrapper = import_styled_components16.default.div`
 function DataTable(props) {
   var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r;
   const { columns, data, bannerConfig, cellConfig, sorting } = props;
-  const [internalColumnVisibility, setInternalColumnVisibility] = (0, import_react6.useState)({});
+  const [internalColumnVisibility, setInternalColumnVisibility] = (0, import_react7.useState)({});
   const [columnVisibility, setColumnVisibility] = [
     ((_a = props.columnVisibility) == null ? void 0 : _a.state) ?? internalColumnVisibility,
     ((_b = props.columnVisibility) == null ? void 0 : _b.onChange) ?? setInternalColumnVisibility
   ];
-  const [internalGlobalFilterState, setInternalGlobalFilterState] = (0, import_react6.useState)("");
+  const [internalGlobalFilterState, setInternalGlobalFilterState] = (0, import_react7.useState)("");
   const [globalFilterState, setGlobalFilterState] = [
     ((_c = props.globalFilter) == null ? void 0 : _c.state) ?? internalGlobalFilterState,
     ((_d = props.globalFilter) == null ? void 0 : _d.onChange) ?? setInternalGlobalFilterState
@@ -1051,17 +1060,17 @@ function DataTable(props) {
   function enableGlobalFilter(value) {
     return enableOrUndefined(shouldEnableGlobalFilter, value);
   }
-  const [internalSortingState, setInternalSortingState] = (0, import_react6.useState)([]);
+  const [internalSortingState, setInternalSortingState] = (0, import_react7.useState)([]);
   const [sortingState, setSortingState] = [
     ((_f = props.sorting) == null ? void 0 : _f.state) ?? internalSortingState,
     ((_g = props.sorting) == null ? void 0 : _g.onChange) ?? setInternalSortingState
   ];
-  const [internalRowSelectionState, setInternalRowSelectionState] = (0, import_react6.useState)({});
+  const [internalRowSelectionState, setInternalRowSelectionState] = (0, import_react7.useState)({});
   const [rowSelectionState, setRowSelectionState] = [
     ((_h = props.rowSelection) == null ? void 0 : _h.state) ?? internalRowSelectionState,
     ((_i = props.rowSelection) == null ? void 0 : _i.onChange) ?? setInternalRowSelectionState
   ];
-  const [internalExpandedState, setInternalExpandedState] = (0, import_react6.useState)({});
+  const [internalExpandedState, setInternalExpandedState] = (0, import_react7.useState)({});
   const [expandedState, setExpandedState] = [
     ((_j = props.expansion) == null ? void 0 : _j.state) ?? internalExpandedState,
     ((_k = props.expansion) == null ? void 0 : _k.onChange) ?? setInternalExpandedState
@@ -1104,18 +1113,24 @@ function DataTable(props) {
     getSubRows: props == null ? void 0 : props.getSubRows,
     getRowId: props == null ? void 0 : props.getRowId
   });
-  (0, import_react6.useEffect)(() => {
+  (0, import_react7.useEffect)(() => {
     var _a2;
     if ((_a2 = props.expansion) == null ? void 0 : _a2.expandAllByDefault) {
       table.toggleAllRowsExpanded();
     }
   }, [table, (_p = props.expansion) == null ? void 0 : _p.expandAllByDefault]);
   const { isLoading, rowConfig } = props;
-  const tableContainerRef = (0, import_react6.useRef)(null);
+  const tableContainerRef = (0, import_react7.useRef)(null);
+  console.log("DataTable", { container: tableContainerRef.current });
   const onTableContainerScroll = useFetchMoreOnBottomReached(
     tableContainerRef,
     props.infiniteScroll
   );
+  const forceRerender = useForceRerender();
+  (0, import_react7.useEffect)(() => {
+    if (Boolean(tableContainerRef.current))
+      forceRerender();
+  }, [tableContainerRef.current === null]);
   return /* @__PURE__ */ (0, import_jsx_runtime19.jsxs)(DataTableWrapper, {
     height: props == null ? void 0 : props.height,
     width: props == null ? void 0 : props.width,
@@ -1129,10 +1144,12 @@ function DataTable(props) {
       }),
       /* @__PURE__ */ (0, import_jsx_runtime19.jsx)("div", {
         ...props.tableContainerProps,
-        className: "--table-container " + ((_q = props.tableContainerProps) == null ? void 0 : _q.className),
+        className: "--table-container " + (((_q = props.tableContainerProps) == null ? void 0 : _q.className) ?? ""),
+        style: { contain: "strict" },
         onScroll: ((_r = props.tableContainerProps) == null ? void 0 : _r.onScroll) ?? onTableContainerScroll,
         ref: (node) => {
           var _a2;
+          console.log({ node });
           if (node) {
             tableContainerRef.current = node;
             if ((_a2 = props.tableContainerProps) == null ? void 0 : _a2.ref) {
@@ -1150,7 +1167,7 @@ function DataTable(props) {
               sticky: props.stickyHeader,
               table
             }),
-            /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(VirtualTableBody, {
+            tableContainerRef.current !== null && /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(VirtualTableBody, {
               containerRef: tableContainerRef,
               tableCaption: props.tableCaption,
               table,

package/dist/index.mjs

@@ -620,7 +620,7 @@ import {
   getSortedRowModel,
   useReactTable
 } from "@tanstack/react-table";
-import { useEffect as useEffect3, useRef as useRef3, useState as useState5 } from "react";
+import { useEffect as useEffect3, useRef as useRef3, useState as useState6 } from "react";
 import styled16 from "styled-components";
 
 // src/DataTable/components/BasicTable.tsx
@@ -901,6 +901,7 @@ function VirtualTableBody({
   table,
   rowConfig,
   cellConfig,
+  hasRef,
   containerRef,
   ...props
 }) {
@@ -916,6 +917,7 @@ function VirtualTableBody({
   if (!rowVirtualizer)
     return null;
   const virtualRows = rowVirtualizer.getVirtualItems();
+  console.log("VirtualTableBody", { container: containerRef.current, virtualRows, hasRef });
   const paddingTop = virtualRows.length > 0 ? ((_a = virtualRows == null ? void 0 : virtualRows[0]) == null ? void 0 : _a.start) || 0 : 0;
   const paddingBottom = virtualRows.length > 0 ? rowVirtualizer.getTotalSize() - (((_b = virtualRows == null ? void 0 : virtualRows[virtualRows.length - 1]) == null ? void 0 : _b.end) || 0) : 0;
   return /* @__PURE__ */ jsxs10(TableBody, {
@@ -972,6 +974,13 @@ function useFetchMoreOnBottomReached(tableContainerRef, infiniteScrollConfig) {
   return onTableContainerScroll;
 }
 
+// src/DataTable/hooks/useForceRerender.ts
+import { useCallback as useCallback2, useState as useState5 } from "react";
+function useForceRerender() {
+  const [, setTick] = useState5(0);
+  return useCallback2(() => setTick((tick) => tick + 1), []);
+}
+
 // src/DataTable/DataTable.tsx
 import { jsx as jsx19, jsxs as jsxs11 } from "react/jsx-runtime";
 var DataTableWrapper = styled16.div`
@@ -994,12 +1003,12 @@ var DataTableWrapper = styled16.div`
 function DataTable(props) {
   var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r;
   const { columns, data, bannerConfig, cellConfig, sorting } = props;
-  const [internalColumnVisibility, setInternalColumnVisibility] = useState5({});
+  const [internalColumnVisibility, setInternalColumnVisibility] = useState6({});
   const [columnVisibility, setColumnVisibility] = [
     ((_a = props.columnVisibility) == null ? void 0 : _a.state) ?? internalColumnVisibility,
     ((_b = props.columnVisibility) == null ? void 0 : _b.onChange) ?? setInternalColumnVisibility
   ];
-  const [internalGlobalFilterState, setInternalGlobalFilterState] = useState5("");
+  const [internalGlobalFilterState, setInternalGlobalFilterState] = useState6("");
   const [globalFilterState, setGlobalFilterState] = [
     ((_c = props.globalFilter) == null ? void 0 : _c.state) ?? internalGlobalFilterState,
     ((_d = props.globalFilter) == null ? void 0 : _d.onChange) ?? setInternalGlobalFilterState
@@ -1008,17 +1017,17 @@ function DataTable(props) {
   function enableGlobalFilter(value) {
     return enableOrUndefined(shouldEnableGlobalFilter, value);
   }
-  const [internalSortingState, setInternalSortingState] = useState5([]);
+  const [internalSortingState, setInternalSortingState] = useState6([]);
   const [sortingState, setSortingState] = [
     ((_f = props.sorting) == null ? void 0 : _f.state) ?? internalSortingState,
     ((_g = props.sorting) == null ? void 0 : _g.onChange) ?? setInternalSortingState
   ];
-  const [internalRowSelectionState, setInternalRowSelectionState] = useState5({});
+  const [internalRowSelectionState, setInternalRowSelectionState] = useState6({});
   const [rowSelectionState, setRowSelectionState] = [
     ((_h = props.rowSelection) == null ? void 0 : _h.state) ?? internalRowSelectionState,
     ((_i = props.rowSelection) == null ? void 0 : _i.onChange) ?? setInternalRowSelectionState
   ];
-  const [internalExpandedState, setInternalExpandedState] = useState5({});
+  const [internalExpandedState, setInternalExpandedState] = useState6({});
   const [expandedState, setExpandedState] = [
     ((_j = props.expansion) == null ? void 0 : _j.state) ?? internalExpandedState,
     ((_k = props.expansion) == null ? void 0 : _k.onChange) ?? setInternalExpandedState
@@ -1069,10 +1078,16 @@ function DataTable(props) {
   }, [table, (_p = props.expansion) == null ? void 0 : _p.expandAllByDefault]);
   const { isLoading, rowConfig } = props;
   const tableContainerRef = useRef3(null);
+  console.log("DataTable", { container: tableContainerRef.current });
   const onTableContainerScroll = useFetchMoreOnBottomReached(
     tableContainerRef,
     props.infiniteScroll
   );
+  const forceRerender = useForceRerender();
+  useEffect3(() => {
+    if (Boolean(tableContainerRef.current))
+      forceRerender();
+  }, [tableContainerRef.current === null]);
   return /* @__PURE__ */ jsxs11(DataTableWrapper, {
     height: props == null ? void 0 : props.height,
     width: props == null ? void 0 : props.width,
@@ -1086,10 +1101,12 @@ function DataTable(props) {
       }),
       /* @__PURE__ */ jsx19("div", {
         ...props.tableContainerProps,
-        className: "--table-container " + ((_q = props.tableContainerProps) == null ? void 0 : _q.className),
+        className: "--table-container " + (((_q = props.tableContainerProps) == null ? void 0 : _q.className) ?? ""),
+        style: { contain: "strict" },
         onScroll: ((_r = props.tableContainerProps) == null ? void 0 : _r.onScroll) ?? onTableContainerScroll,
         ref: (node) => {
           var _a2;
+          console.log({ node });
           if (node) {
             tableContainerRef.current = node;
             if ((_a2 = props.tableContainerProps) == null ? void 0 : _a2.ref) {
@@ -1107,7 +1124,7 @@ function DataTable(props) {
               sticky: props.stickyHeader,
               table
             }),
-            /* @__PURE__ */ jsx19(VirtualTableBody, {
+            tableContainerRef.current !== null && /* @__PURE__ */ jsx19(VirtualTableBody, {
               containerRef: tableContainerRef,
               tableCaption: props.tableCaption,
               table,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@equinor/apollo-components",
-  "version": "3.1.2-rowfix.2",
+  "version": "3.1.2-rowfix.21",
   "license": "MIT",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",