@infinite-table/infinite-react 0.2.5 → 0.2.6

package/index.d.ts

@@ -675,7 +675,9 @@ declare module "components/InfiniteTable/types/InfiniteTableColumn" {
         draggable?: boolean;
         resizable?: boolean;
         comparer?: InfiniteTableColumnComparer<T>;
-        defaultHiddenWhenGrouped?: boolean;
+        defaultHiddenWhenGroupedBy?: '*' | keyof T | {
+            [k in keyof Partial<T>]: true;
+        };
         align?: InfiniteTableColumnAlign;
         verticalAlign?: InfiniteTableColumnVerticalAlign;
         columnGroup?: string;
@@ -1136,7 +1138,7 @@ declare module "components/InfiniteTable/types/InfiniteTableProps" {
         defaultWidth?: number;
         defaultFlex?: number;
         defaultPinned?: InfiniteTableColumnPinnedValues;
-        defaultHiddenWhenGrouped?: boolean;
+        defaultHiddenWhenGroupedBy?: InfiniteTableColumn<T>['defaultHiddenWhenGroupedBy'];
         header?: InfiniteTableColumn<T>['header'];
         comparer?: InfiniteTableColumn<T>['comparer'];
         draggable?: InfiniteTableColumn<T>['draggable'];

package/index.esm.js

@@ -1390,7 +1390,7 @@ var getComputedVisibleColumns = ({
     const result2 = __spreadProps(__spreadValues({
       align: colType.align,
       verticalAlign: colType.verticalAlign,
-      defaultHiddenWhenGrouped: colType.defaultHiddenWhenGrouped,
+      defaultHiddenWhenGroupedBy: colType.defaultHiddenWhenGroupedBy,
       valueGetter: colType.valueGetter,
       renderValue: colType.renderValue,
       render: colType.render
@@ -3973,7 +3973,7 @@ function concludeReducer(params) {
     state.groupDeepMap = void 0;
     state.pivotColumns = void 0;
     const arrayDifferentAfterSortStep = previousState.postSortDataArray != state.postSortDataArray;
-    if (arrayDifferentAfterSortStep) {
+    if (arrayDifferentAfterSortStep || groupsDepsChanged) {
       rowInfoDataArray = dataArray.map((data, index) => toRowInfo(data, data ? toPrimaryKey(data) : index, index));
     }
   }
@@ -4084,7 +4084,7 @@ function useColumnsWhen() {
   }, [pivotTotalColumnPosition]);
   useColumnsWhenInlineGroupRenderStrategy(groupByMap);
   const { toggleGroupRow } = useColumnsWhenGrouping();
-  useHideColumns();
+  useHideColumns(groupByMap);
   return { toggleGroupRow };
 }
 function useColumnsWhenInlineGroupRenderStrategy(groupByMap) {
@@ -4206,7 +4206,7 @@ function useColumnsWhenGrouping() {
   ]);
   return { toggleGroupRow };
 }
-function useHideColumns() {
+function useHideColumns(groupByMap) {
   const {
     componentState: {
       dataArray,
@@ -4283,22 +4283,23 @@ function useHideColumns() {
     const newColumnVisibility = __spreadValues({}, columnVisibility);
     let updated = false;
     computedColumns.forEach((col, id) => {
-      if (col.defaultHiddenWhenGrouped) {
+      if (col.defaultHiddenWhenGroupedBy) {
         const nowHidden = columnVisibility[id] === false;
-        if (!nowHidden && isGrouped) {
+        const shouldBeHidden = col.defaultHiddenWhenGroupedBy === "*" && isGrouped || typeof col.defaultHiddenWhenGroupedBy === "string" && groupByMap.get(col.defaultHiddenWhenGroupedBy) || typeof col.defaultHiddenWhenGroupedBy === "object" && Object.keys(col.defaultHiddenWhenGroupedBy).reduce((acc, field) => acc || groupByMap.has(field), false);
+        if (nowHidden !== shouldBeHidden) {
           updated = true;
-          newColumnVisibility[id] = false;
-        }
-        if (nowHidden && !isGrouped) {
-          updated = true;
-          delete newColumnVisibility[id];
+          if (shouldBeHidden) {
+            newColumnVisibility[id] = false;
+          } else {
+            delete newColumnVisibility[id];
+          }
         }
       }
     });
     if (updated) {
       componentActions.columnVisibility = newColumnVisibility;
     }
-  }, [computedColumns, columnTypes, groupBy]);
+  }, [computedColumns, columnTypes, groupBy, groupByMap]);
 }
 function getColumnsWhenGrouping(params) {
   const {
@@ -7770,7 +7771,7 @@ var useLicense = (licenseKey = "") => {
   const valid = useMemo12(() => {
     let valid2 = isValidLicense(licenseKey, {
       publishedAt: 1624970570587,
-      version: "0.2.5"
+      version: "0.2.6"
     });
     if (!licenseKey && !valid2 && isInsideSandbox) {
       return true;

package/index.js

@@ -1399,7 +1399,7 @@ var getComputedVisibleColumns = ({
     const result2 = __spreadProps(__spreadValues({
       align: colType.align,
       verticalAlign: colType.verticalAlign,
-      defaultHiddenWhenGrouped: colType.defaultHiddenWhenGrouped,
+      defaultHiddenWhenGroupedBy: colType.defaultHiddenWhenGroupedBy,
       valueGetter: colType.valueGetter,
       renderValue: colType.renderValue,
       render: colType.render
@@ -3959,7 +3959,7 @@ function concludeReducer(params) {
     state.groupDeepMap = void 0;
     state.pivotColumns = void 0;
     const arrayDifferentAfterSortStep = previousState.postSortDataArray != state.postSortDataArray;
-    if (arrayDifferentAfterSortStep) {
+    if (arrayDifferentAfterSortStep || groupsDepsChanged) {
       rowInfoDataArray = dataArray.map((data, index) => toRowInfo(data, data ? toPrimaryKey(data) : index, index));
     }
   }
@@ -4070,7 +4070,7 @@ function useColumnsWhen() {
   }, [pivotTotalColumnPosition]);
   useColumnsWhenInlineGroupRenderStrategy(groupByMap);
   const { toggleGroupRow } = useColumnsWhenGrouping();
-  useHideColumns();
+  useHideColumns(groupByMap);
   return { toggleGroupRow };
 }
 function useColumnsWhenInlineGroupRenderStrategy(groupByMap) {
@@ -4192,7 +4192,7 @@ function useColumnsWhenGrouping() {
   ]);
   return { toggleGroupRow };
 }
-function useHideColumns() {
+function useHideColumns(groupByMap) {
   const {
     componentState: {
       dataArray,
@@ -4269,22 +4269,23 @@ function useHideColumns() {
     const newColumnVisibility = __spreadValues({}, columnVisibility);
     let updated = false;
     computedColumns.forEach((col, id) => {
-      if (col.defaultHiddenWhenGrouped) {
+      if (col.defaultHiddenWhenGroupedBy) {
         const nowHidden = columnVisibility[id] === false;
-        if (!nowHidden && isGrouped) {
+        const shouldBeHidden = col.defaultHiddenWhenGroupedBy === "*" && isGrouped || typeof col.defaultHiddenWhenGroupedBy === "string" && groupByMap.get(col.defaultHiddenWhenGroupedBy) || typeof col.defaultHiddenWhenGroupedBy === "object" && Object.keys(col.defaultHiddenWhenGroupedBy).reduce((acc, field) => acc || groupByMap.has(field), false);
+        if (nowHidden !== shouldBeHidden) {
           updated = true;
-          newColumnVisibility[id] = false;
-        }
-        if (nowHidden && !isGrouped) {
-          updated = true;
-          delete newColumnVisibility[id];
+          if (shouldBeHidden) {
+            newColumnVisibility[id] = false;
+          } else {
+            delete newColumnVisibility[id];
+          }
         }
       }
     });
     if (updated) {
       componentActions.columnVisibility = newColumnVisibility;
     }
-  }, [computedColumns, columnTypes, groupBy]);
+  }, [computedColumns, columnTypes, groupBy, groupByMap]);
 }
 function getColumnsWhenGrouping(params) {
   const {
@@ -7677,7 +7678,7 @@ var useLicense = (licenseKey = "") => {
   const valid = (0, import_react43.useMemo)(() => {
     let valid2 = isValidLicense(licenseKey, {
       publishedAt: 1624970570587,
-      version: "0.2.5"
+      version: "0.2.6"
     });
     if (!licenseKey && !valid2 && isInsideSandbox) {
       return true;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@infinite-table/infinite-react",
   "description": "Infinite Table for React",
-  "version": "0.2.5",
+  "version": "0.2.6",
   "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": 1644855707573
+  "publishedAt": 1644931690394
 }