@infinite-table/infinite-react 0.3.1 → 0.3.2

package/index.d.ts

@@ -760,6 +760,7 @@ declare type DataSourceRemoteData<T> = {
     data: T[] | LazyGroupDataItem<T>[];
     mappings?: DataSourceMappings;
     cache?: boolean;
+    error?: string;
     totalCount?: number;
     livePaginationCursor?: DataSourceLivePaginationCursorValue;
 };
@@ -988,6 +989,7 @@ declare type InfiniteTable_HasGrouping_RowInfoGroup<T> = {
      * in the order in which they are visible in the table
      */
     deepRowInfoArray: (InfiniteTable_HasGrouping_RowInfoNormal<T> | InfiniteTable_HasGrouping_RowInfoGroup<T>)[];
+    error?: string;
     reducerResults?: Record<string, AggregationReducerResult>;
     /**
      * The count of all leaf nodes (normal rows) that are inside this group.

package/index.esm.js

@@ -2820,7 +2820,7 @@ var ReactHeadlessTableRenderer = class extends Logger {
         this.hoverRowUpdatesInProgress.delete(rowIndex);
       });
     };
-    this.updateElementPosition = (elementIndex) => {
+    this.updateElementPosition = (elementIndex, options) => {
       const itemElement = this.itemDOMElements[elementIndex];
       const cell = this.mappedCells.getRenderedCellAtElement(elementIndex);
       if (cell == null) {
@@ -2845,7 +2845,8 @@ var ReactHeadlessTableRenderer = class extends Logger {
           itemElement.style.transform = `translate3d(${x}px, ${y}px, 0)`;
           itemElement.style.willChange = "transform";
           itemElement.style.backfaceVisibility = "hidden";
-          itemElement.style.zIndex = "auto";
+          const hidden = options ? options.hidden : !!this.isCellCovered(rowIndex, colIndex);
+          itemElement.style.zIndex = hidden ? "-1" : "auto";
         } else {
           itemElement.style.display = "";
           itemElement.style.left = `${x}px`;
@@ -3040,6 +3041,7 @@ var ReactHeadlessTableRenderer = class extends Logger {
     const heightWithRowspan = rowspan === 1 ? height : this.brain.getRowHeightWithSpan(rowIndex, colIndex, rowspan);
     const widthWithColspan = colspan === 1 ? width : this.brain.getColWidthWithSpan(rowIndex, colIndex, colspan);
     const { row: rowFixed, col: colFixed } = this.isCellFixed(rowIndex, colIndex);
+    const hidden = !!covered;
     const renderedNode = renderCell({
       rowIndex,
       colIndex,
@@ -3049,7 +3051,7 @@ var ReactHeadlessTableRenderer = class extends Logger {
       colspan,
       rowFixed,
       colFixed,
-      hidden: !!covered,
+      hidden,
       heightWithRowspan,
       widthWithColspan,
       onMouseEnter: this.onMouseEnter.bind(null, rowIndex),
@@ -3066,7 +3068,7 @@ var ReactHeadlessTableRenderer = class extends Logger {
       this.debug(`Render cell ${rowIndex},${colIndex} at element ${elementIndex}`);
     }
     itemUpdater(renderedNode);
-    this.updateElementPosition(elementIndex);
+    this.updateElementPosition(elementIndex, { hidden, rowspan, colspan });
     return;
   }
   reset() {
@@ -5128,6 +5130,9 @@ function useColumnRowspan(computedVisibleColumns) {
     return colsWithRowspan.length ? ({ rowIndex, colIndex }) => {
       const dataArray = getDataSourceState().dataArray;
       const rowInfo = dataArray[rowIndex];
+      if (!rowInfo) {
+        return 1;
+      }
       const data = rowInfo.data;
       const column = computedVisibleColumns[colIndex];
       if (!column || !column.rowspan) {
@@ -5521,10 +5526,8 @@ function lazyGroup(groupParams, rootData) {
       }
       const dataObject = dataArray[i].data;
       const dataKeys = dataArray[i].keys;
-      const item = dataObject;
       if (dataKeys.length) {
-        const { field: groupByProperty } = groupBy[dataKeys.length - 1];
-        const key = item[groupByProperty];
+        const key = dataKeys[dataKeys.length - 1];
         currentGroupKeys.push(key);
       }
       const deepMapGroupValue = {
@@ -5687,6 +5690,7 @@ function flatten(groupResult) {
   return result;
 }
 function getEnhancedGroupData(options, deepMapValue) {
+  var _a;
   const { groupBy, groupKeys, collapsed, parents, reducers, lazyLoad } = options;
   const groupNesting = groupKeys.length;
   const {
@@ -5695,9 +5699,9 @@ function getEnhancedGroupData(options, deepMapValue) {
     pivotDeepMap,
     commonData
   } = deepMapValue;
-  let data = null;
+  let data = commonData != null ? commonData : null;
   if (Object.keys(reducerResults).length > 0) {
-    data = commonData || {};
+    data = __spreadValues({}, commonData);
     for (const key in reducers)
       if (reducers.hasOwnProperty(key)) {
         const reducer = reducers[key];
@@ -5708,7 +5712,7 @@ function getEnhancedGroupData(options, deepMapValue) {
       }
   }
   let selfLoaded = true;
-  let theValue = groupKeys[groupKeys.length - 1];
+  let theValue = (_a = data != null ? data[groupBy[groupKeys.length - 1]] : null) != null ? _a : groupKeys[groupKeys.length - 1];
   if (typeof theValue === "string" && theValue.startsWith(NOT_LOADED_YET_KEY_PREFIX)) {
     selfLoaded = false;
     theValue = null;
@@ -5722,6 +5726,7 @@ function getEnhancedGroupData(options, deepMapValue) {
     collapsed,
     dataSourceHasGrouping: true,
     selfLoaded,
+    error: options.error,
     parents,
     deepRowInfoArray: [],
     collapsedChildrenCount: 0,
@@ -5785,6 +5790,7 @@ function enhancedFlatten(param) {
       indexInParentGroups: Array.from(indexInParentGroups),
       indexInAll: result.length,
       groupKeys,
+      error: deepMapValue.error,
       childrenLoading: deepMapValue.childrenLoading,
       childrenAvailable: deepMapValue.childrenAvailable,
       directChildrenCount: groupKeys.length === groupByStrings.length ? deepMapValue.items.length : deepMap.getDirectChildrenSizeFor(groupKeys),
@@ -5984,6 +5990,25 @@ function useEffectWithChanges(fn, deps) {
   }, useEffectDeps);
 }
 
+// src/components/InfiniteTable/utils/assignFiltered.ts
+function assignFiltered(filterFn, target, ...rest) {
+  const result = target;
+  rest.forEach((obj) => {
+    for (const key in obj) {
+      if (obj.hasOwnProperty(key) && filterFn(obj[key], key)) {
+        result[key] = obj[key];
+      }
+    }
+  });
+  return result;
+}
+function assignNonNull(target, ...rest) {
+  return assignFiltered((value) => value != null, target, ...rest);
+}
+function assignExcept(exceptKeys, target, ...rest) {
+  return assignFiltered((_value, key) => !(key in exceptKeys), target, ...rest);
+}
+
 // src/components/DataSource/privateHooks/getChangeDetect.ts
 function getChangeDetect() {
   var _a;
@@ -6099,7 +6124,7 @@ function loadData(data, componentState, actions, overrides) {
       }
       if (componentState.lazyLoad) {
         let resolveRemoteData = function(keys, remoteData2, parentKeys) {
-          var _a, _b, _c, _d;
+          var _a, _b, _c;
           const theKey = [LAZY_ROOT_KEY_FOR_GROUPS, ...keys];
           const dataArray2 = remoteData2.data;
           const newGroupRowInfo = {
@@ -6107,28 +6132,22 @@ function loadData(data, componentState, actions, overrides) {
             childrenLoading: false,
             childrenAvailable: true,
             totalCount: (_a = remoteData2.totalCount) != null ? _a : dataArray2.length,
-            children: dataArray2
+            children: dataArray2,
+            error: remoteData2.error
           };
           const childDatasets = [];
           if (dataParams.lazyLoadBatchSize && !parentKeys) {
             const existingGroupRowInfo = lazyGroupData.get(theKey);
-            const currentGroupRowInfo = existingGroupRowInfo != null ? existingGroupRowInfo : {
-              children: [],
-              childrenAvailable: true,
-              childrenLoading: false,
-              totalCount: newGroupRowInfo.totalCount,
-              cache: (_b = newGroupRowInfo.cache) != null ? _b : CACHE_DEFAULT
-            };
-            if (existingGroupRowInfo) {
-              existingGroupRowInfo.cache = newGroupRowInfo.cache;
-              existingGroupRowInfo.totalCount = newGroupRowInfo.totalCount;
-              existingGroupRowInfo.childrenLoading = false;
-              existingGroupRowInfo.childrenAvailable = true;
-              existingGroupRowInfo.error = newGroupRowInfo.error;
+            const isGroupNew = !existingGroupRowInfo;
+            const currentGroupRowInfo = assignExcept({
+              children: true
+            }, existingGroupRowInfo || {}, newGroupRowInfo);
+            if (isGroupNew) {
+              currentGroupRowInfo.chidren = [];
             }
             currentGroupRowInfo.children.length = currentGroupRowInfo.totalCount;
-            const start = (_c = dataParams.lazyLoadStartIndex) != null ? _c : 0;
-            const end = Math.min((_d = remoteData2.totalCount) != null ? _d : dataArray2.length, start + dataParams.lazyLoadBatchSize);
+            const start = (_b = dataParams.lazyLoadStartIndex) != null ? _b : 0;
+            const end = Math.min((_c = remoteData2.totalCount) != null ? _c : dataArray2.length, start + dataParams.lazyLoadBatchSize);
             for (let i = start; i < end; i++) {
               const it = newGroupRowInfo.children[i - start];
               if (!it) {
@@ -6142,13 +6161,13 @@ function loadData(data, componentState, actions, overrides) {
                 });
               }
             }
-            if (!existingGroupRowInfo) {
+            if (isGroupNew) {
               lazyGroupData.set(theKey, currentGroupRowInfo);
             }
           } else {
             if (parentKeys) {
               newGroupRowInfo.children.forEach((child) => {
-                if (child.dataset) {
+                if (child && child.dataset) {
                   childDatasets.push({
                     keys: child.keys,
                     dataset: child.dataset
@@ -7750,22 +7769,6 @@ function getColumnComputedType(column, columnTypes) {
   return column.type.reduce((acc, columnType) => Object.assign(acc, columnTypes[columnType]), {});
 }
 
-// src/components/InfiniteTable/utils/assignFiltered.ts
-function assignFiltered(filterFn, target, ...rest) {
-  let result = target;
-  rest.forEach((obj) => {
-    for (const key in obj) {
-      if (obj.hasOwnProperty(key) && filterFn(obj[key], key)) {
-        result[key] = obj[key];
-      }
-    }
-  });
-  return result;
-}
-function assignNonNull(target, ...rest) {
-  return assignFiltered((value) => value != null, target, ...rest);
-}
-
 // src/components/InfiniteTable/utils/getComputedVisibleColumns.ts
 var logError = err("getComputedVisibleColumns");
 var isColumnVisible = (columnVisibility, _columnVisibilityAssumeVisible, colId) => {
@@ -8532,7 +8535,7 @@ var useLicense = (licenseKey = "") => {
   const valid = useMemo10(() => {
     let valid2 = isValidLicense(licenseKey, {
       publishedAt: 1624970570587,
-      version: "0.3.1"
+      version: "0.3.2"
     });
     if (!licenseKey && !valid2 && isInsidePlayground) {
       return true;

package/index.js

@@ -2807,7 +2807,7 @@ var ReactHeadlessTableRenderer = class extends Logger {
         this.hoverRowUpdatesInProgress.delete(rowIndex);
       });
     };
-    this.updateElementPosition = (elementIndex) => {
+    this.updateElementPosition = (elementIndex, options) => {
       const itemElement = this.itemDOMElements[elementIndex];
       const cell = this.mappedCells.getRenderedCellAtElement(elementIndex);
       if (cell == null) {
@@ -2832,7 +2832,8 @@ var ReactHeadlessTableRenderer = class extends Logger {
           itemElement.style.transform = `translate3d(${x}px, ${y}px, 0)`;
           itemElement.style.willChange = "transform";
           itemElement.style.backfaceVisibility = "hidden";
-          itemElement.style.zIndex = "auto";
+          const hidden = options ? options.hidden : !!this.isCellCovered(rowIndex, colIndex);
+          itemElement.style.zIndex = hidden ? "-1" : "auto";
         } else {
           itemElement.style.display = "";
           itemElement.style.left = `${x}px`;
@@ -3027,6 +3028,7 @@ var ReactHeadlessTableRenderer = class extends Logger {
     const heightWithRowspan = rowspan === 1 ? height : this.brain.getRowHeightWithSpan(rowIndex, colIndex, rowspan);
     const widthWithColspan = colspan === 1 ? width : this.brain.getColWidthWithSpan(rowIndex, colIndex, colspan);
     const { row: rowFixed, col: colFixed } = this.isCellFixed(rowIndex, colIndex);
+    const hidden = !!covered;
     const renderedNode = renderCell({
       rowIndex,
       colIndex,
@@ -3036,7 +3038,7 @@ var ReactHeadlessTableRenderer = class extends Logger {
       colspan,
       rowFixed,
       colFixed,
-      hidden: !!covered,
+      hidden,
       heightWithRowspan,
       widthWithColspan,
       onMouseEnter: this.onMouseEnter.bind(null, rowIndex),
@@ -3053,7 +3055,7 @@ var ReactHeadlessTableRenderer = class extends Logger {
       this.debug(`Render cell ${rowIndex},${colIndex} at element ${elementIndex}`);
     }
     itemUpdater(renderedNode);
-    this.updateElementPosition(elementIndex);
+    this.updateElementPosition(elementIndex, { hidden, rowspan, colspan });
     return;
   }
   reset() {
@@ -5062,6 +5064,9 @@ function useColumnRowspan(computedVisibleColumns) {
     return colsWithRowspan.length ? ({ rowIndex, colIndex }) => {
       const dataArray = getDataSourceState().dataArray;
       const rowInfo = dataArray[rowIndex];
+      if (!rowInfo) {
+        return 1;
+      }
       const data = rowInfo.data;
       const column = computedVisibleColumns[colIndex];
       if (!column || !column.rowspan) {
@@ -5448,10 +5453,8 @@ function lazyGroup(groupParams, rootData) {
       }
       const dataObject = dataArray[i].data;
       const dataKeys = dataArray[i].keys;
-      const item = dataObject;
       if (dataKeys.length) {
-        const { field: groupByProperty } = groupBy[dataKeys.length - 1];
-        const key = item[groupByProperty];
+        const key = dataKeys[dataKeys.length - 1];
         currentGroupKeys.push(key);
       }
       const deepMapGroupValue = {
@@ -5614,6 +5617,7 @@ function flatten(groupResult) {
   return result;
 }
 function getEnhancedGroupData(options, deepMapValue) {
+  var _a;
   const { groupBy, groupKeys, collapsed, parents, reducers, lazyLoad } = options;
   const groupNesting = groupKeys.length;
   const {
@@ -5622,9 +5626,9 @@ function getEnhancedGroupData(options, deepMapValue) {
     pivotDeepMap,
     commonData
   } = deepMapValue;
-  let data = null;
+  let data = commonData != null ? commonData : null;
   if (Object.keys(reducerResults).length > 0) {
-    data = commonData || {};
+    data = __spreadValues({}, commonData);
     for (const key in reducers)
       if (reducers.hasOwnProperty(key)) {
         const reducer = reducers[key];
@@ -5635,7 +5639,7 @@ function getEnhancedGroupData(options, deepMapValue) {
       }
   }
   let selfLoaded = true;
-  let theValue = groupKeys[groupKeys.length - 1];
+  let theValue = (_a = data != null ? data[groupBy[groupKeys.length - 1]] : null) != null ? _a : groupKeys[groupKeys.length - 1];
   if (typeof theValue === "string" && theValue.startsWith(NOT_LOADED_YET_KEY_PREFIX)) {
     selfLoaded = false;
     theValue = null;
@@ -5649,6 +5653,7 @@ function getEnhancedGroupData(options, deepMapValue) {
     collapsed,
     dataSourceHasGrouping: true,
     selfLoaded,
+    error: options.error,
     parents,
     deepRowInfoArray: [],
     collapsedChildrenCount: 0,
@@ -5712,6 +5717,7 @@ function enhancedFlatten(param) {
       indexInParentGroups: Array.from(indexInParentGroups),
       indexInAll: result.length,
       groupKeys,
+      error: deepMapValue.error,
       childrenLoading: deepMapValue.childrenLoading,
       childrenAvailable: deepMapValue.childrenAvailable,
       directChildrenCount: groupKeys.length === groupByStrings.length ? deepMapValue.items.length : deepMap.getDirectChildrenSizeFor(groupKeys),
@@ -5908,6 +5914,25 @@ function useEffectWithChanges(fn, deps) {
   }, useEffectDeps);
 }
 
+// src/components/InfiniteTable/utils/assignFiltered.ts
+function assignFiltered(filterFn, target, ...rest) {
+  const result = target;
+  rest.forEach((obj) => {
+    for (const key in obj) {
+      if (obj.hasOwnProperty(key) && filterFn(obj[key], key)) {
+        result[key] = obj[key];
+      }
+    }
+  });
+  return result;
+}
+function assignNonNull(target, ...rest) {
+  return assignFiltered((value) => value != null, target, ...rest);
+}
+function assignExcept(exceptKeys, target, ...rest) {
+  return assignFiltered((_value, key) => !(key in exceptKeys), target, ...rest);
+}
+
 // src/components/DataSource/privateHooks/getChangeDetect.ts
 function getChangeDetect() {
   var _a;
@@ -6023,7 +6048,7 @@ function loadData(data, componentState, actions, overrides) {
       }
       if (componentState.lazyLoad) {
         let resolveRemoteData = function(keys, remoteData2, parentKeys) {
-          var _a, _b, _c, _d;
+          var _a, _b, _c;
           const theKey = [LAZY_ROOT_KEY_FOR_GROUPS, ...keys];
           const dataArray2 = remoteData2.data;
           const newGroupRowInfo = {
@@ -6031,28 +6056,22 @@ function loadData(data, componentState, actions, overrides) {
             childrenLoading: false,
             childrenAvailable: true,
             totalCount: (_a = remoteData2.totalCount) != null ? _a : dataArray2.length,
-            children: dataArray2
+            children: dataArray2,
+            error: remoteData2.error
           };
           const childDatasets = [];
           if (dataParams.lazyLoadBatchSize && !parentKeys) {
             const existingGroupRowInfo = lazyGroupData.get(theKey);
-            const currentGroupRowInfo = existingGroupRowInfo != null ? existingGroupRowInfo : {
-              children: [],
-              childrenAvailable: true,
-              childrenLoading: false,
-              totalCount: newGroupRowInfo.totalCount,
-              cache: (_b = newGroupRowInfo.cache) != null ? _b : CACHE_DEFAULT
-            };
-            if (existingGroupRowInfo) {
-              existingGroupRowInfo.cache = newGroupRowInfo.cache;
-              existingGroupRowInfo.totalCount = newGroupRowInfo.totalCount;
-              existingGroupRowInfo.childrenLoading = false;
-              existingGroupRowInfo.childrenAvailable = true;
-              existingGroupRowInfo.error = newGroupRowInfo.error;
+            const isGroupNew = !existingGroupRowInfo;
+            const currentGroupRowInfo = assignExcept({
+              children: true
+            }, existingGroupRowInfo || {}, newGroupRowInfo);
+            if (isGroupNew) {
+              currentGroupRowInfo.chidren = [];
             }
             currentGroupRowInfo.children.length = currentGroupRowInfo.totalCount;
-            const start = (_c = dataParams.lazyLoadStartIndex) != null ? _c : 0;
-            const end = Math.min((_d = remoteData2.totalCount) != null ? _d : dataArray2.length, start + dataParams.lazyLoadBatchSize);
+            const start = (_b = dataParams.lazyLoadStartIndex) != null ? _b : 0;
+            const end = Math.min((_c = remoteData2.totalCount) != null ? _c : dataArray2.length, start + dataParams.lazyLoadBatchSize);
             for (let i = start; i < end; i++) {
               const it = newGroupRowInfo.children[i - start];
               if (!it) {
@@ -6066,13 +6085,13 @@ function loadData(data, componentState, actions, overrides) {
                 });
               }
             }
-            if (!existingGroupRowInfo) {
+            if (isGroupNew) {
               lazyGroupData.set(theKey, currentGroupRowInfo);
             }
           } else {
             if (parentKeys) {
               newGroupRowInfo.children.forEach((child) => {
-                if (child.dataset) {
+                if (child && child.dataset) {
                   childDatasets.push({
                     keys: child.keys,
                     dataset: child.dataset
@@ -7674,22 +7693,6 @@ function getColumnComputedType(column, columnTypes) {
   return column.type.reduce((acc, columnType) => Object.assign(acc, columnTypes[columnType]), {});
 }
 
-// src/components/InfiniteTable/utils/assignFiltered.ts
-function assignFiltered(filterFn, target, ...rest) {
-  let result = target;
-  rest.forEach((obj) => {
-    for (const key in obj) {
-      if (obj.hasOwnProperty(key) && filterFn(obj[key], key)) {
-        result[key] = obj[key];
-      }
-    }
-  });
-  return result;
-}
-function assignNonNull(target, ...rest) {
-  return assignFiltered((value) => value != null, target, ...rest);
-}
-
 // src/components/InfiniteTable/utils/getComputedVisibleColumns.ts
 var logError = err("getComputedVisibleColumns");
 var isColumnVisible = (columnVisibility, _columnVisibilityAssumeVisible, colId) => {
@@ -8456,7 +8459,7 @@ var useLicense = (licenseKey = "") => {
   const valid = (0, import_react39.useMemo)(() => {
     let valid2 = isValidLicense(licenseKey, {
       publishedAt: 1624970570587,
-      version: "0.3.1"
+      version: "0.3.2"
     });
     if (!licenseKey && !valid2 && isInsidePlayground) {
       return true;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@infinite-table/infinite-react",
   "description": "Infinite Table for React",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "main": "index.js",
   "module": "index.esm.js",
   "typings": "index.d.ts",
@@ -14,5 +14,5 @@
   },
   "license": "Commercial & Open Source",
   "//": "will be updated at build time",
-  "publishedAt": 1651578366058
+  "publishedAt": 1651670850272
 }