@infinite-table/infinite-react 9.2.0 → 9.3.0

package/index.d.ts

@@ -2450,7 +2450,14 @@ type RowSelectionStateConfig<T> = {
     groupBy: DataSourceState<T>['groupBy'];
     groupDeepMap: DataSourceState<T>['groupDeepMap'];
     toPrimaryKey: DataSourceState<T>['toPrimaryKey'];
+    /**
+     * The count of all the rows - for lazy load, after the (remote) filter
+     */
     totalCount: number;
+    /**
+     * Lazy load: the count of all the rows without the filter, when the server sends it
+     */
+    lazyUnfilteredCount?: number;
     indexer: DataSourceState<T>['indexer'];
     lazyLoad: boolean;
     onlyUsePrimaryKeys: boolean;
@@ -2500,6 +2507,17 @@ declare class RowSelectionState<T = any> {
      * so the rows of the group that are filtered out keep their selection
      */
     private setVisibleRowsSelection;
+    /**
+     * Lazy load, when the selection also acts on rows that are filtered out:
+     * the count of all the rows inside the group without the filter, if the server sent it
+     */
+    private getLazyUnfilteredCount;
+    /**
+     * Lazy load, when the selection also acts on rows that are filtered out:
+     * the count of the rows inside the group (not at the last level) that are not inside
+     * its loaded groups - so the rows of the groups hidden by the filter or not loaded yet
+     */
+    getLazyHiddenRowsCount(groupKeys: any[]): number;
     getGroupCount(groupKeys: any[]): number;
     getGroupKeysDirectlyInsideGroup(groupKeys: any[]): any[][];
     getAllPrimaryKeysInsideGroup(groupKeys: any[]): any[];
@@ -3055,7 +3073,7 @@ interface DataSourceDataParams<T> {
     lazyLoadStartIndex?: number;
     groupKeys?: any[];
     /**
-     * Only passed with `lazyLoad`: the rows a stored multi row selection covers.
+     * Only passed with `lazyLoad` and `selectionMode: 'multi-row'`: the rows a stored multi row selection covers.
      * For `'visible'`, a selected group or `defaultSelection: true` covers only the rows that pass `filterValue`.
      */
     multiRowSelectionTarget?: DataSourcePropMultiRowSelectionTarget;
@@ -3079,7 +3097,19 @@ type DataSourceRemoteData<T> = {
     cache?: boolean;
     error?: string;
     totalCount?: number;
+    /**
+     * The count of rows (or groups, for a group level) without the filter
+     */
     totalCountUnfiltered?: number;
+    /**
+     * For a group level: the leaf rows under it (at any depth), after the filter
+     */
+    totalChildrenCount?: number;
+    /**
+     * For a group level: the leaf rows under it (at any depth), without the filter.
+     * With `multiRowSelectionTarget: 'all'`, the selection checkboxes also count the rows that the filter hides.
+     */
+    totalChildrenCountUnfiltered?: number;
     livePaginationCursor?: DataSourceLivePaginationCursorValue;
 };
 type DataSourceDataFn<T> = (dataInfo: DataSourceDataParams<T>) => T[] | Promise<T[] | DataSourceRemoteData<T>>;
@@ -3170,6 +3200,11 @@ type LazyGroupDataItem<DataType> = {
     aggregations?: Record<string, any>;
     dataset?: DataSourceRemoteData<DataType>;
     totalChildrenCount?: number;
+    /**
+     * The leaf rows under the group (at any depth), without the filter.
+     * With `multiRowSelectionTarget: 'all'`, the selection checkboxes also count the rows that the filter hides.
+     */
+    totalChildrenCountUnfiltered?: number;
     pivot?: {
         values: Record<string, any>;
         totals?: Record<string, any>;
@@ -3184,7 +3219,8 @@ type LazyRowInfoGroup<DataType> = {
     childrenAvailable: boolean;
     cache: boolean;
     totalCount: number;
-    totalCountUnfiltered: number;
+    totalCountUnfiltered?: number;
+    totalChildrenCountUnfiltered?: number;
     error?: string;
 };
 type LazyGroupDataDeepMap<DataType, KeyType = string> = DeepMap<KeyType, LazyRowInfoGroup<DataType>>;
@@ -7050,6 +7086,7 @@ type DeepMapGroupValueType<DataType, KeyType> = {
     childrenLoading: boolean;
     childrenAvailable: boolean;
     totalChildrenCount?: number;
+    totalChildrenCountUnfiltered?: number;
     cache: boolean;
     error?: string;
     isTree: false;

package/index.dev.js

@@ -15185,6 +15185,7 @@ function lazyGroup(groupParams, rootData) {
           childrenAvailable: false,
           commonData: dataObject,
           totalChildrenCount: dataArray[i].totalChildrenCount,
+          totalChildrenCountUnfiltered: dataArray[i].totalChildrenCountUnfiltered,
           reducerResults: dataArray[i].aggregations || {},
           isTree: false,
           isGroupBy: true
@@ -16882,9 +16883,40 @@ var RowSelectionState = class _RowSelectionState {
     });
     this.xcache();
   }
+  /**
+   * Lazy load, when the selection also acts on rows that are filtered out:
+   * the count of all the rows inside the group without the filter, if the server sent it
+   */
+  getLazyUnfilteredCount(groupKeys) {
+    const config = this.getConfig();
+    if (!config.lazyLoad || config.multiRowSelectionTarget === "visible") {
+      return void 0;
+    }
+    if (!groupKeys.length) {
+      return config.lazyUnfilteredCount;
+    }
+    return config.groupDeepMap?.get(groupKeys)?.totalChildrenCountUnfiltered;
+  }
+  /**
+   * Lazy load, when the selection also acts on rows that are filtered out:
+   * the count of the rows inside the group (not at the last level) that are not inside
+   * its loaded groups - so the rows of the groups hidden by the filter or not loaded yet
+   */
+  getLazyHiddenRowsCount(groupKeys) {
+    const unfilteredCount = groupKeys.length < this.getGroupByLength() ? this.getLazyUnfilteredCount(groupKeys) : void 0;
+    if (unfilteredCount === void 0) {
+      return 0;
+    }
+    const { groupDeepMap } = this.getConfig();
+    let childrenCount = 0;
+    this.getGroupKeysDirectlyInsideGroup(groupKeys).forEach((keys) => {
+      childrenCount += this.getLazyUnfilteredCount(keys) ?? (groupDeepMap?.get(keys)?.totalChildrenCount || 0);
+    });
+    return Math.max(unfilteredCount - childrenCount, 0);
+  }
   getGroupCount(groupKeys) {
     if (groupKeys.length == 0) {
-      return this.getConfig().totalCount;
+      return this.getLazyUnfilteredCount([]) ?? this.getConfig().totalCount;
     }
     if (this.targetsFilteredOutRows()) {
       return getUnfilteredGroups(this.getConfig()).get(groupKeys)?.count ?? 0;
@@ -16894,7 +16926,7 @@ var RowSelectionState = class _RowSelectionState {
     if (!deepMapValue) {
       return 0;
     }
-    return deepMapValue.totalChildrenCount ?? (deepMapValue.items.length || 0);
+    return this.getLazyUnfilteredCount(groupKeys) ?? deepMapValue.totalChildrenCount ?? (deepMapValue.items.length || 0);
   }
   getGroupKeysDirectlyInsideGroup(groupKeys) {
     const config = this.getConfig();
@@ -17343,8 +17375,9 @@ var RowSelectionState = class _RowSelectionState {
     }
     let selectedCount = 0;
     let deselectedCount = 0;
-    if (this.getConfig().lazyLoad && !allKeys.length) {
-      const totalChildrenCount = this.getConfig().groupDeepMap?.get(groupKeys)?.totalChildrenCount || 0;
+    const { lazyLoad, groupDeepMap } = this.getConfig();
+    if (lazyLoad && !allKeys.length) {
+      const totalChildrenCount = this.getLazyUnfilteredCount(groupKeys) ?? (groupDeepMap?.get(groupKeys)?.totalChildrenCount || 0);
       if (parentSelected) {
         selectedCount = totalChildrenCount;
         deselectedCount = this.deselectedMap.getAllChildrenSizeFor(groupKeys);
@@ -17367,6 +17400,12 @@ var RowSelectionState = class _RowSelectionState {
       selectedCount += selCount;
       deselectedCount += deselCount;
     });
+    const hiddenCount = allKeys.length ? this.getLazyHiddenRowsCount(groupKeys) : 0;
+    if (parentSelected) {
+      selectedCount += hiddenCount;
+    } else {
+      deselectedCount += hiddenCount;
+    }
     const result = {
       selectedCount,
       deselectedCount
@@ -17387,14 +17426,17 @@ function rowSelectionStateConfigGetter(stateOrStateGetter) {
   return () => {
     const state = typeof stateOrStateGetter === "function" ? stateOrStateGetter() : stateOrStateGetter;
     const { originalDataArray, postFilterDataArray } = state;
+    const lazyLoad = !!state.lazyLoad;
+    const lazyRoot = lazyLoad ? state.originalLazyGroupData.get([LAZY_ROOT_KEY_FOR_GROUPS]) : void 0;
     return {
-      lazyLoad: !!state.lazyLoad,
+      lazyLoad,
       toPrimaryKey: state.toPrimaryKey,
       onlyUsePrimaryKeys: !state.useGroupKeysForMultiRowSelection,
       groupBy: state.groupBy,
       groupDeepMap: state.groupDeepMap,
       indexer: state.indexer,
-      totalCount: state.unfilteredCount,
+      totalCount: lazyLoad ? originalDataArray?.length ?? 0 : state.unfilteredCount,
+      lazyUnfilteredCount: state.groupBy.length ? lazyRoot?.totalChildrenCountUnfiltered : lazyRoot?.totalCountUnfiltered,
       multiRowSelectionTarget: state.multiRowSelectionTarget,
       someRowsFilteredOut: !state.lazyLoad && !!originalDataArray && !!postFilterDataArray && postFilterDataArray.length < originalDataArray.length,
       originalDataArray,
@@ -22310,6 +22352,14 @@ function concludeReducer(params) {
           }
         }
       });
+      const { rowSelection } = state;
+      if (rowSelection instanceof RowSelectionState && rowSelection.getLazyHiddenRowsCount([])) {
+        if (rowSelection.defaultSelection) {
+          someRowsSelected = true;
+        } else {
+          allRowsSelected = false;
+        }
+      }
       state.allRowsSelected = allRowsSelected;
       state.someRowsSelected = someRowsSelected;
       if (debugId) {
@@ -22428,7 +22478,9 @@ function buildDataSourceDataParams(componentState, overrides, masterContext) {
       dataSourceParams.lazyLoadStartIndex = 0;
     }
     dataSourceParams.groupKeys = [];
-    dataSourceParams.multiRowSelectionTarget = componentState.multiRowSelectionTarget;
+    if (componentState.selectionMode === "multi-row") {
+      dataSourceParams.multiRowSelectionTarget = componentState.multiRowSelectionTarget;
+    }
   }
   if (overrides) {
     Object.assign(dataSourceParams, overrides);
@@ -22505,8 +22557,7 @@ function loadData(data, componentState, actions, overrides, masterContext) {
         childrenLoading: true,
         childrenAvailable: false,
         cache: CACHE_DEFAULT,
-        totalCount: 0,
-        totalCountUnfiltered: 0
+        totalCount: 0
       });
     }
     actions.originalLazyGroupDataChangeDetect = getChangeDetect();
@@ -22545,7 +22596,9 @@ function loadData(data, componentState, actions, overrides, masterContext) {
             childrenLoading: false,
             childrenAvailable: true,
             totalCount: remoteData2.totalCount ?? dataArray2.length,
-            totalCountUnfiltered: remoteData2.totalCount ?? dataArray2.length,
+            // set even when missing, so a previous response's values are not kept
+            totalCountUnfiltered: remoteData2.totalCountUnfiltered,
+            totalChildrenCountUnfiltered: remoteData2.totalChildrenCountUnfiltered,
             children: dataArray2,
             error: remoteData2.error
           };
@@ -28105,7 +28158,7 @@ var useLicense = (licenseKey = "") => {
     }
     let valid2 = isValidLicense(licenseKey, {
       publishedAt: 1624970570587,
-      version: "9.2.0"
+      version: "9.3.0"
     });
     if (!licenseKey && !valid2 && isInsidePlayground) {
       return true;

package/index.dev.mjs

@@ -15119,6 +15119,7 @@ function lazyGroup(groupParams, rootData) {
           childrenAvailable: false,
           commonData: dataObject,
           totalChildrenCount: dataArray[i].totalChildrenCount,
+          totalChildrenCountUnfiltered: dataArray[i].totalChildrenCountUnfiltered,
           reducerResults: dataArray[i].aggregations || {},
           isTree: false,
           isGroupBy: true
@@ -16816,9 +16817,40 @@ var RowSelectionState = class _RowSelectionState {
     });
     this.xcache();
   }
+  /**
+   * Lazy load, when the selection also acts on rows that are filtered out:
+   * the count of all the rows inside the group without the filter, if the server sent it
+   */
+  getLazyUnfilteredCount(groupKeys) {
+    const config = this.getConfig();
+    if (!config.lazyLoad || config.multiRowSelectionTarget === "visible") {
+      return void 0;
+    }
+    if (!groupKeys.length) {
+      return config.lazyUnfilteredCount;
+    }
+    return config.groupDeepMap?.get(groupKeys)?.totalChildrenCountUnfiltered;
+  }
+  /**
+   * Lazy load, when the selection also acts on rows that are filtered out:
+   * the count of the rows inside the group (not at the last level) that are not inside
+   * its loaded groups - so the rows of the groups hidden by the filter or not loaded yet
+   */
+  getLazyHiddenRowsCount(groupKeys) {
+    const unfilteredCount = groupKeys.length < this.getGroupByLength() ? this.getLazyUnfilteredCount(groupKeys) : void 0;
+    if (unfilteredCount === void 0) {
+      return 0;
+    }
+    const { groupDeepMap } = this.getConfig();
+    let childrenCount = 0;
+    this.getGroupKeysDirectlyInsideGroup(groupKeys).forEach((keys) => {
+      childrenCount += this.getLazyUnfilteredCount(keys) ?? (groupDeepMap?.get(keys)?.totalChildrenCount || 0);
+    });
+    return Math.max(unfilteredCount - childrenCount, 0);
+  }
   getGroupCount(groupKeys) {
     if (groupKeys.length == 0) {
-      return this.getConfig().totalCount;
+      return this.getLazyUnfilteredCount([]) ?? this.getConfig().totalCount;
     }
     if (this.targetsFilteredOutRows()) {
       return getUnfilteredGroups(this.getConfig()).get(groupKeys)?.count ?? 0;
@@ -16828,7 +16860,7 @@ var RowSelectionState = class _RowSelectionState {
     if (!deepMapValue) {
       return 0;
     }
-    return deepMapValue.totalChildrenCount ?? (deepMapValue.items.length || 0);
+    return this.getLazyUnfilteredCount(groupKeys) ?? deepMapValue.totalChildrenCount ?? (deepMapValue.items.length || 0);
   }
   getGroupKeysDirectlyInsideGroup(groupKeys) {
     const config = this.getConfig();
@@ -17277,8 +17309,9 @@ var RowSelectionState = class _RowSelectionState {
     }
     let selectedCount = 0;
     let deselectedCount = 0;
-    if (this.getConfig().lazyLoad && !allKeys.length) {
-      const totalChildrenCount = this.getConfig().groupDeepMap?.get(groupKeys)?.totalChildrenCount || 0;
+    const { lazyLoad, groupDeepMap } = this.getConfig();
+    if (lazyLoad && !allKeys.length) {
+      const totalChildrenCount = this.getLazyUnfilteredCount(groupKeys) ?? (groupDeepMap?.get(groupKeys)?.totalChildrenCount || 0);
       if (parentSelected) {
         selectedCount = totalChildrenCount;
         deselectedCount = this.deselectedMap.getAllChildrenSizeFor(groupKeys);
@@ -17301,6 +17334,12 @@ var RowSelectionState = class _RowSelectionState {
       selectedCount += selCount;
       deselectedCount += deselCount;
     });
+    const hiddenCount = allKeys.length ? this.getLazyHiddenRowsCount(groupKeys) : 0;
+    if (parentSelected) {
+      selectedCount += hiddenCount;
+    } else {
+      deselectedCount += hiddenCount;
+    }
     const result = {
       selectedCount,
       deselectedCount
@@ -17321,14 +17360,17 @@ function rowSelectionStateConfigGetter(stateOrStateGetter) {
   return () => {
     const state = typeof stateOrStateGetter === "function" ? stateOrStateGetter() : stateOrStateGetter;
     const { originalDataArray, postFilterDataArray } = state;
+    const lazyLoad = !!state.lazyLoad;
+    const lazyRoot = lazyLoad ? state.originalLazyGroupData.get([LAZY_ROOT_KEY_FOR_GROUPS]) : void 0;
     return {
-      lazyLoad: !!state.lazyLoad,
+      lazyLoad,
       toPrimaryKey: state.toPrimaryKey,
       onlyUsePrimaryKeys: !state.useGroupKeysForMultiRowSelection,
       groupBy: state.groupBy,
       groupDeepMap: state.groupDeepMap,
       indexer: state.indexer,
-      totalCount: state.unfilteredCount,
+      totalCount: lazyLoad ? originalDataArray?.length ?? 0 : state.unfilteredCount,
+      lazyUnfilteredCount: state.groupBy.length ? lazyRoot?.totalChildrenCountUnfiltered : lazyRoot?.totalCountUnfiltered,
       multiRowSelectionTarget: state.multiRowSelectionTarget,
       someRowsFilteredOut: !state.lazyLoad && !!originalDataArray && !!postFilterDataArray && postFilterDataArray.length < originalDataArray.length,
       originalDataArray,
@@ -22244,6 +22286,14 @@ function concludeReducer(params) {
           }
         }
       });
+      const { rowSelection } = state;
+      if (rowSelection instanceof RowSelectionState && rowSelection.getLazyHiddenRowsCount([])) {
+        if (rowSelection.defaultSelection) {
+          someRowsSelected = true;
+        } else {
+          allRowsSelected = false;
+        }
+      }
       state.allRowsSelected = allRowsSelected;
       state.someRowsSelected = someRowsSelected;
       if (debugId) {
@@ -22362,7 +22412,9 @@ function buildDataSourceDataParams(componentState, overrides, masterContext) {
       dataSourceParams.lazyLoadStartIndex = 0;
     }
     dataSourceParams.groupKeys = [];
-    dataSourceParams.multiRowSelectionTarget = componentState.multiRowSelectionTarget;
+    if (componentState.selectionMode === "multi-row") {
+      dataSourceParams.multiRowSelectionTarget = componentState.multiRowSelectionTarget;
+    }
   }
   if (overrides) {
     Object.assign(dataSourceParams, overrides);
@@ -22439,8 +22491,7 @@ function loadData(data, componentState, actions, overrides, masterContext) {
         childrenLoading: true,
         childrenAvailable: false,
         cache: CACHE_DEFAULT,
-        totalCount: 0,
-        totalCountUnfiltered: 0
+        totalCount: 0
       });
     }
     actions.originalLazyGroupDataChangeDetect = getChangeDetect();
@@ -22479,7 +22530,9 @@ function loadData(data, componentState, actions, overrides, masterContext) {
             childrenLoading: false,
             childrenAvailable: true,
             totalCount: remoteData2.totalCount ?? dataArray2.length,
-            totalCountUnfiltered: remoteData2.totalCount ?? dataArray2.length,
+            // set even when missing, so a previous response's values are not kept
+            totalCountUnfiltered: remoteData2.totalCountUnfiltered,
+            totalChildrenCountUnfiltered: remoteData2.totalChildrenCountUnfiltered,
             children: dataArray2,
             error: remoteData2.error
           };
@@ -28044,7 +28097,7 @@ var useLicense = (licenseKey = "") => {
     }
     let valid2 = isValidLicense(licenseKey, {
       publishedAt: 1624970570587,
-      version: "9.2.0"
+      version: "9.3.0"
     });
     if (!licenseKey && !valid2 && isInsidePlayground) {
       return true;