@infinite-table/infinite-react 0.4.6 → 0.4.9

package/index.d.ts

@@ -663,9 +663,11 @@ declare type RowSelectionStateObject = {
 declare type RowSelectionStateConfig<T> = {
     groupBy: DataSourceState<T>['groupBy'];
     groupDeepMap: DataSourceState<T>['groupDeepMap'];
+    toPrimaryKey: DataSourceState<T>['toPrimaryKey'];
     totalCount: number;
     indexer: DataSourceState<T>['indexer'];
     lazyLoad: boolean;
+    onlyUsePrimaryKeys: boolean;
 };
 declare type GetRowSelectionStateConfig<T> = () => RowSelectionStateConfig<T>;
 declare type RowSelectionStateOverrideForTesting = {
@@ -673,6 +675,7 @@ declare type RowSelectionStateOverrideForTesting = {
     getGroupByLength: RowSelectionState<any>['getGroupByLength'];
     getGroupCount: RowSelectionState<any>['getGroupCount'];
     getGroupKeysDirectlyInsideGroup: RowSelectionState<any>['getGroupKeysDirectlyInsideGroup'];
+    getAllPrimaryKeysInsideGroup: RowSelectionState<any>['getAllPrimaryKeysInsideGroup'];
 };
 declare class RowSelectionState<T = any> {
     selectedRows: RowSelectionStateItem | null;
@@ -680,6 +683,7 @@ declare class RowSelectionState<T = any> {
     defaultSelection: boolean;
     selectedMap: DeepMap<any, true>;
     deselectedMap: DeepMap<any, true>;
+    onlyUsePrimaryKeys: boolean;
     selectionCache: DeepMap<any, boolean | null>;
     selectionCountCache: DeepMap<any, {
         selectedCount: number;
@@ -690,6 +694,7 @@ declare class RowSelectionState<T = any> {
     getGroupDeepMap(): DeepMap<any, DeepMapGroupValueType<T, any>> | undefined;
     getGroupCount(groupKeys: any[]): number;
     getGroupKeysDirectlyInsideGroup(groupKeys: any[]): any[][];
+    getAllPrimaryKeysInsideGroup(groupKeys: any[]): any[];
     getGroupByLength(): number;
     static from<T>(rowSeleStateObject: RowSelectionStateObject, getConfig: GetRowSelectionStateConfig<T>, _forTestingOnly?: RowSelectionStateOverrideForTesting): RowSelectionState<T>;
     constructor(state: RowSelectionStateObject | RowSelectionState, getConfig: GetRowSelectionStateConfig<T>, _forTestingOnly?: RowSelectionStateOverrideForTesting);
@@ -1155,6 +1160,7 @@ interface DataSourceMappedState<T> {
     livePagination: DataSourceProps<T>['livePagination'];
     isRowSelected: DataSourceProps<T>['isRowSelected'];
     lazyLoad: DataSourceProps<T>['lazyLoad'];
+    usePrimaryKeysForMultiRowSelection: NonUndefined<DataSourceProps<T>['usePrimaryKeysForMultiRowSelection']>;
     onDataParamsChange: DataSourceProps<T>['onDataParamsChange'];
     data: DataSourceProps<T>['data'];
     sortMode: DataSourceProps<T>['sortMode'];
@@ -1267,6 +1273,7 @@ declare type DataSourceProps<T> = {
     fields?: (keyof T)[];
     data: DataSourceData<T>;
     selectionMode?: DataSourcePropSelectionMode;
+    usePrimaryKeysForMultiRowSelection?: boolean;
     rowSelection?: DataSourcePropRowSelection_MultiRow | DataSourcePropRowSelection_SingleRow;
     defaultRowSelection?: DataSourcePropRowSelection_MultiRow | DataSourcePropRowSelection_SingleRow;
     cellSelection?: DataSourcePropCellSelection;
@@ -1703,7 +1710,7 @@ declare type InfiniteTableSelectionApi = {
     deselectGroupRow(groupKeys: any[], children?: ArrayOfIds): void;
     toggleGroupRowSelection(groupKeys: any[], children?: ArrayOfIds): void;
     getGroupRowSelectionState(groupKeys: any[]): boolean | null;
-    getSelectedPrimaryKeys(): (string | number)[];
+    getSelectedPrimaryKeys(rowSelection?: RowSelectionStateObject): (string | number)[];
     selectAll(): void;
     deselectAll(): void;
 };

package/index.esm.js

@@ -6785,6 +6785,7 @@ function InfiniteTableHeaderCell(props) {
   };
   const align = column.align || "start";
   const renderChildren = () => {
+    var _a2;
     if (column.renderSortIcon) {
       renderParam.renderBag.sortIcon = /* @__PURE__ */ createElement25(RenderHeaderCellHookComponent, {
         render: column.renderSortIcon,
@@ -6798,9 +6799,10 @@ function InfiniteTableHeaderCell(props) {
         render: defaultRenderSelectionCheckBox2,
         renderParam
       });
-      if (column.renderHeaderSelectionCheckBox && column.renderHeaderSelectionCheckBox !== true) {
+      const renderHeaderSelectionCheckBox = (_a2 = column.renderHeaderSelectionCheckBox) != null ? _a2 : column.renderSelectionCheckBox;
+      if (renderHeaderSelectionCheckBox && renderHeaderSelectionCheckBox !== true) {
         renderParam.renderBag.selectionCheckBox = /* @__PURE__ */ createElement25(RenderHeaderCellHookComponent, {
-          render: column.renderHeaderSelectionCheckBox,
+          render: renderHeaderSelectionCheckBox,
           renderParam: __spreadProps(__spreadValues({}, renderParam), {
             renderBag: __spreadValues({}, renderParam.renderBag)
           })
@@ -8892,11 +8894,16 @@ var RowSelectionState = class {
     this.defaultSelection = false;
     this.selectedMap = new DeepMap();
     this.deselectedMap = new DeepMap();
+    this.onlyUsePrimaryKeys = false;
     this.selectionCache = new DeepMap();
     this.selectionCountCache = new DeepMap();
     this.mapSet = (name, key) => {
       if (!Array.isArray(key)) {
-        key = [...this.getGroupKeysForPrimaryKey(key), key];
+        if (this.onlyUsePrimaryKeys) {
+          key = [key];
+        } else {
+          key = [...this.getGroupKeysForPrimaryKey(key), key];
+        }
       }
       this.xcache();
       if (name === "selected") {
@@ -8913,6 +8920,7 @@ var RowSelectionState = class {
     };
     const stateObject = state instanceof Object.getPrototypeOf(this).constructor ? state.getState() : state;
     this.getConfig = getConfig;
+    this.onlyUsePrimaryKeys = getConfig().onlyUsePrimaryKeys;
     if (_forTestingOnly) {
       Object.assign(this, _forTestingOnly);
     }
@@ -8942,6 +8950,15 @@ var RowSelectionState = class {
     const { groupDeepMap } = this.getConfig();
     return (groupDeepMap == null ? void 0 : groupDeepMap.getKeysStartingWith(groupKeys, true, 1)) || [];
   }
+  getAllPrimaryKeysInsideGroup(groupKeys) {
+    const { groupDeepMap } = this.getConfig();
+    if (!groupKeys.length) {
+      const topLevelKeys = (groupDeepMap == null ? void 0 : groupDeepMap.getKeysStartingWith([], true, 1)) || [];
+      return topLevelKeys.map((groupKeys2) => this.getAllPrimaryKeysInsideGroup(groupKeys2)).flat();
+    }
+    const group2 = groupDeepMap == null ? void 0 : groupDeepMap.get(groupKeys);
+    return group2 ? group2.items.map(this.getConfig().toPrimaryKey) : [];
+  }
   getGroupByLength() {
     return this.getConfig().groupBy.length;
   }
@@ -8966,7 +8983,12 @@ var RowSelectionState = class {
   getState() {
     const normalize = (allKeys) => {
       const groupByLength = this.getGroupByLength();
-      return allKeys.map((keys) => keys.length > groupByLength ? keys.pop() : keys);
+      return allKeys.map((keys) => {
+        if (this.onlyUsePrimaryKeys) {
+          return keys[0];
+        }
+        return keys.length > groupByLength ? keys.pop() : keys;
+      });
     };
     const selectedRows = normalize(this.selectedMap.topDownKeys());
     const deselectedRows = normalize(this.deselectedMap.topDownKeys());
@@ -8997,6 +9019,9 @@ var RowSelectionState = class {
     return this.defaultSelection === false;
   }
   isRowSelected(key, groupKeys) {
+    if (this.onlyUsePrimaryKeys) {
+      return this.defaultSelection ? !this.deselectedMap.has([key]) : this.selectedMap.has([key]);
+    }
     groupKeys = groupKeys || this.getGroupKeysForPrimaryKey(key);
     const finalKey = [...groupKeys, key];
     const cachedResult = this.selectionCache.get(finalKey);
@@ -9053,7 +9078,7 @@ var RowSelectionState = class {
     if (cachedResult !== void 0) {
       return cachedResult;
     }
-    const { selectedCount, deselectedCount } = this.getSelectionCountFor(initialGroupKeys, this.getGroupRowBooleanSelectionStateFromParent(initialGroupKeys));
+    const { selectedCount, deselectedCount } = this.getSelectionCountFor(initialGroupKeys, this.onlyUsePrimaryKeys ? void 0 : this.getGroupRowBooleanSelectionStateFromParent(initialGroupKeys));
     const result = selectedCount && deselectedCount ? null : selectedCount ? true : false;
     this.selectionCache.set(initialGroupKeys, result);
     return result;
@@ -9094,28 +9119,67 @@ var RowSelectionState = class {
     return this.getGroupRowSelectionState(groupKeys) === false;
   }
   selectGroupRow(groupKeys) {
+    if (this.onlyUsePrimaryKeys) {
+      const keys = this.getAllPrimaryKeysInsideGroup(groupKeys);
+      keys.forEach((key) => {
+        if (this.defaultSelection === true) {
+          this.deselectedMap.delete([key]);
+        } else {
+          this._selectedMapSet(key);
+        }
+      });
+      this.xcache();
+      return;
+    }
     const selectedKeys = this.selectedMap.getKeysStartingWith(groupKeys, true);
     selectedKeys.forEach((groupKeys2) => {
       this.selectedMap.delete(groupKeys2);
     });
-    this._selectedMapSet(groupKeys);
+    if (groupKeys.length === 1 && this.defaultSelection === true) {
+    } else {
+      this._selectedMapSet(groupKeys);
+    }
     const deselectedKeys = this.deselectedMap.getKeysStartingWith(groupKeys);
     deselectedKeys.forEach((groupKeys2) => {
       this.deselectedMap.delete(groupKeys2);
     });
   }
   deselectGroupRow(groupKeys) {
+    if (this.onlyUsePrimaryKeys) {
+      const keys = this.getAllPrimaryKeysInsideGroup(groupKeys);
+      keys.forEach((key) => {
+        if (this.defaultSelection === false) {
+          this.selectedMap.delete([key]);
+        } else {
+          this._deselectedMapSet(key);
+        }
+      });
+      this.xcache();
+      return;
+    }
     const deselectedKeys = this.deselectedMap.getKeysStartingWith(groupKeys, true);
     deselectedKeys.forEach((groupKeys2) => {
       this.deselectedMap.delete(groupKeys2);
     });
-    this._deselectedMapSet(groupKeys);
+    if (groupKeys.length === 1 && this.defaultSelection === false) {
+    } else {
+      this._deselectedMapSet(groupKeys);
+    }
     const selectedKeys = this.selectedMap.getKeysStartingWith(groupKeys);
     selectedKeys.forEach((groupKeys2) => {
       this.selectedMap.delete(groupKeys2);
     });
   }
   setRowAsSelected(key, groupKeys) {
+    if (this.onlyUsePrimaryKeys) {
+      if (this.defaultSelection) {
+        this.deselectedMap.delete([key]);
+      } else {
+        this._selectedMapSet(key);
+      }
+      this.xcache();
+      return;
+    }
     groupKeys = groupKeys || this.getGroupKeysForPrimaryKey(key);
     const finalKey = [...groupKeys, key];
     this.deselectedMap.delete(finalKey);
@@ -9128,9 +9192,19 @@ var RowSelectionState = class {
     }
   }
   setRowAsDeselected(key, groupKeys) {
+    if (this.onlyUsePrimaryKeys) {
+      if (this.defaultSelection) {
+        this._deselectedMapSet(key);
+      } else {
+        this.selectedMap.delete([key]);
+      }
+      this.xcache();
+      return;
+    }
     groupKeys = groupKeys || this.getGroupKeysForPrimaryKey(key);
     const finalKey = [...groupKeys, key];
     this.selectedMap.delete(finalKey);
+    this.xcache();
     if (this.getGroupRowSelectionState(groupKeys) !== false) {
       this._deselectedMapSet(finalKey);
       if (this.getGroupRowSelectionState(groupKeys) === false) {
@@ -9179,6 +9253,32 @@ var RowSelectionState = class {
       this.selectionCountCache.set(groupKeys, result2);
       return result2;
     }
+    if (this.onlyUsePrimaryKeys) {
+      const allKeys2 = this.getAllPrimaryKeysInsideGroup(groupKeys);
+      let selectedCount2 = 0;
+      let deselectedCount2 = 0;
+      allKeys2.forEach((key) => {
+        if (this.defaultSelection) {
+          if (this.deselectedMap.has([key])) {
+            deselectedCount2++;
+            return;
+          }
+          selectedCount2++;
+        } else {
+          if (this.selectedMap.has([key])) {
+            selectedCount2++;
+            return;
+          }
+          deselectedCount2++;
+        }
+      });
+      const result2 = {
+        selectedCount: selectedCount2,
+        deselectedCount: deselectedCount2
+      };
+      this.selectionCountCache.set(groupKeys, result2);
+      return result2;
+    }
     parentSelected = parentSelected != null ? parentSelected : this.getGroupRowBooleanSelectionStateFromParent(groupKeys);
     let allKeys = this.getGroupKeysDirectlyInsideGroup(groupKeys);
     if (groupKeys.length === this.getGroupByLength()) {
@@ -9235,6 +9335,8 @@ function rowSelectionStateConfigGetter(stateOrStateGetter) {
     const state = typeof stateOrStateGetter === "function" ? stateOrStateGetter() : stateOrStateGetter;
     return {
       lazyLoad: !!state.lazyLoad,
+      toPrimaryKey: state.toPrimaryKey,
+      onlyUsePrimaryKeys: state.usePrimaryKeysForMultiRowSelection,
       groupBy: state.groupBy,
       groupDeepMap: state.groupDeepMap,
       indexer: state.indexer,
@@ -9389,24 +9491,32 @@ function getSelectionApi(param) {
       rowSelectionState.toggleGroupRowSelection(groupKeys);
       dataSourceActions.rowSelection = rowSelectionState;
     },
-    getGroupRowSelectionState(groupKeys) {
-      const { selectionMode, rowSelection, groupBy } = getDataSourceState();
+    getGroupRowSelectionState(groupKeys, rowSelection) {
+      const state = getDataSourceState();
+      const { selectionMode, groupBy } = state;
+      const rowSelectionState = rowSelection ? new RowSelectionState(rowSelection, rowSelectionStateConfigGetter(state)) : state.rowSelection;
       if (selectionMode !== "multi-row") {
         throw 'Selection mode should be "multi-row"';
       }
       if (!groupBy) {
         throw "No grouping specified";
       }
-      if (!(rowSelection instanceof RowSelectionState)) {
+      if (!(rowSelectionState instanceof RowSelectionState)) {
         throw "Invalid row selection";
       }
-      return rowSelection.getGroupRowSelectionState(groupKeys);
+      return rowSelectionState.getGroupRowSelectionState(groupKeys);
     },
-    getSelectedPrimaryKeys: () => {
+    getSelectedPrimaryKeys: (rowSelection) => {
+      const state = getDataSourceState();
+      const rowSelectionState = rowSelection ? new RowSelectionState(rowSelection, rowSelectionStateConfigGetter(state)) : state.rowSelection;
       const selected = [];
-      getDataSourceState().dataArray.forEach((rowInfo) => {
-        if (!rowInfo.isGroupRow && rowInfo.rowSelected) {
-          selected.push(rowInfo.id);
+      if (state.lazyLoad) {
+        console.error(`getSelectedPrimaryKeys  should not be called for lazy-loaded datasources as it wont return reliable results`);
+      }
+      state.originalDataArray.forEach((data) => {
+        const id = state.toPrimaryKey(data);
+        if (rowSelectionState.isRowSelected(id)) {
+          selected.push(id);
         }
       });
       return selected;
@@ -9548,6 +9658,7 @@ var forwardProps3 = (setupState) => {
     livePagination: 1,
     filterFunction: 1,
     filterValue: 1,
+    usePrimaryKeysForMultiRowSelection: (usePrimaryKeysForMultiRowSelection) => usePrimaryKeysForMultiRowSelection != null ? usePrimaryKeysForMultiRowSelection : false,
     filterDelay: (filterDelay) => filterDelay != null ? filterDelay : 200,
     filterTypes: (filterTypes) => {
       return __spreadValues(__spreadValues({}, defaultFilterTypes), filterTypes);
@@ -10636,7 +10747,8 @@ function useCellRendering(param) {
     rowClassName,
     onScrollToTop,
     onScrollToBottom,
-    scrollToBottomOffset
+    scrollToBottomOffset,
+    ready
   } = componentState;
   const repaintId = dataSourceState.updatedAt;
   useYourBrain({
@@ -10677,12 +10789,16 @@ function useCellRendering(param) {
     if (!bodySize.height) {
       return;
     }
-    const { onReady } = getState();
     componentActions.ready = true;
+  }, [!!bodySize.height]);
+  useEffect19(() => {
+    if (!ready) {
+    }
+    const { onReady } = getState();
     if (onReady) {
       onReady(imperativeApi);
     }
-  }, [!!bodySize.height]);
+  }, [ready]);
   const [, rerender] = useRerender();
   useEffect19(() => {
     rerender();
@@ -12374,7 +12490,7 @@ var useLicense = (licenseKey = "") => {
   const valid = useMemo11(() => {
     let valid2 = isValidLicense(licenseKey, {
       publishedAt: 1624970570587,
-      version: "0.4.6"
+      version: "0.4.9"
     });
     if (!licenseKey && !valid2 && isInsidePlayground) {
       return true;
@@ -12436,7 +12552,7 @@ function useScrollToActiveRow(activeRowIndex, dataCount, imperativeApi) {
         times++;
         rafId.current = requestAnimationFrame(() => {
           didScrollRef.current = imperativeApi.scrollRowIntoView(activeRowIndex, {
-            offset: 30
+            offset: 0
           });
           if (!didScrollRef.current && times < RETRIES2) {
             tryScroll(times);
@@ -12993,7 +13109,6 @@ function handleKeyboardSelection(context) {
       const event = __spreadValues({}, context);
       const { renderSelectionCheckBox } = context.getComputed();
       if (renderSelectionCheckBox) {
-        event.shiftKey = false;
         event.metaKey = false;
         event.ctrlKey = true;
       }

package/index.js

@@ -6717,6 +6717,7 @@ function InfiniteTableHeaderCell(props) {
   };
   const align = column.align || "start";
   const renderChildren = () => {
+    var _a2;
     if (column.renderSortIcon) {
       renderParam.renderBag.sortIcon = /* @__PURE__ */ React28.createElement(RenderHeaderCellHookComponent, {
         render: column.renderSortIcon,
@@ -6730,9 +6731,10 @@ function InfiniteTableHeaderCell(props) {
         render: defaultRenderSelectionCheckBox2,
         renderParam
       });
-      if (column.renderHeaderSelectionCheckBox && column.renderHeaderSelectionCheckBox !== true) {
+      const renderHeaderSelectionCheckBox = (_a2 = column.renderHeaderSelectionCheckBox) != null ? _a2 : column.renderSelectionCheckBox;
+      if (renderHeaderSelectionCheckBox && renderHeaderSelectionCheckBox !== true) {
         renderParam.renderBag.selectionCheckBox = /* @__PURE__ */ React28.createElement(RenderHeaderCellHookComponent, {
-          render: column.renderHeaderSelectionCheckBox,
+          render: renderHeaderSelectionCheckBox,
           renderParam: __spreadProps(__spreadValues({}, renderParam), {
             renderBag: __spreadValues({}, renderParam.renderBag)
           })
@@ -8799,11 +8801,16 @@ var RowSelectionState = class {
     this.defaultSelection = false;
     this.selectedMap = new DeepMap();
     this.deselectedMap = new DeepMap();
+    this.onlyUsePrimaryKeys = false;
     this.selectionCache = new DeepMap();
     this.selectionCountCache = new DeepMap();
     this.mapSet = (name, key) => {
       if (!Array.isArray(key)) {
-        key = [...this.getGroupKeysForPrimaryKey(key), key];
+        if (this.onlyUsePrimaryKeys) {
+          key = [key];
+        } else {
+          key = [...this.getGroupKeysForPrimaryKey(key), key];
+        }
       }
       this.xcache();
       if (name === "selected") {
@@ -8820,6 +8827,7 @@ var RowSelectionState = class {
     };
     const stateObject = state instanceof Object.getPrototypeOf(this).constructor ? state.getState() : state;
     this.getConfig = getConfig;
+    this.onlyUsePrimaryKeys = getConfig().onlyUsePrimaryKeys;
     if (_forTestingOnly) {
       Object.assign(this, _forTestingOnly);
     }
@@ -8849,6 +8857,15 @@ var RowSelectionState = class {
     const { groupDeepMap } = this.getConfig();
     return (groupDeepMap == null ? void 0 : groupDeepMap.getKeysStartingWith(groupKeys, true, 1)) || [];
   }
+  getAllPrimaryKeysInsideGroup(groupKeys) {
+    const { groupDeepMap } = this.getConfig();
+    if (!groupKeys.length) {
+      const topLevelKeys = (groupDeepMap == null ? void 0 : groupDeepMap.getKeysStartingWith([], true, 1)) || [];
+      return topLevelKeys.map((groupKeys2) => this.getAllPrimaryKeysInsideGroup(groupKeys2)).flat();
+    }
+    const group2 = groupDeepMap == null ? void 0 : groupDeepMap.get(groupKeys);
+    return group2 ? group2.items.map(this.getConfig().toPrimaryKey) : [];
+  }
   getGroupByLength() {
     return this.getConfig().groupBy.length;
   }
@@ -8873,7 +8890,12 @@ var RowSelectionState = class {
   getState() {
     const normalize = (allKeys) => {
       const groupByLength = this.getGroupByLength();
-      return allKeys.map((keys) => keys.length > groupByLength ? keys.pop() : keys);
+      return allKeys.map((keys) => {
+        if (this.onlyUsePrimaryKeys) {
+          return keys[0];
+        }
+        return keys.length > groupByLength ? keys.pop() : keys;
+      });
     };
     const selectedRows = normalize(this.selectedMap.topDownKeys());
     const deselectedRows = normalize(this.deselectedMap.topDownKeys());
@@ -8904,6 +8926,9 @@ var RowSelectionState = class {
     return this.defaultSelection === false;
   }
   isRowSelected(key, groupKeys) {
+    if (this.onlyUsePrimaryKeys) {
+      return this.defaultSelection ? !this.deselectedMap.has([key]) : this.selectedMap.has([key]);
+    }
     groupKeys = groupKeys || this.getGroupKeysForPrimaryKey(key);
     const finalKey = [...groupKeys, key];
     const cachedResult = this.selectionCache.get(finalKey);
@@ -8960,7 +8985,7 @@ var RowSelectionState = class {
     if (cachedResult !== void 0) {
       return cachedResult;
     }
-    const { selectedCount, deselectedCount } = this.getSelectionCountFor(initialGroupKeys, this.getGroupRowBooleanSelectionStateFromParent(initialGroupKeys));
+    const { selectedCount, deselectedCount } = this.getSelectionCountFor(initialGroupKeys, this.onlyUsePrimaryKeys ? void 0 : this.getGroupRowBooleanSelectionStateFromParent(initialGroupKeys));
     const result = selectedCount && deselectedCount ? null : selectedCount ? true : false;
     this.selectionCache.set(initialGroupKeys, result);
     return result;
@@ -9001,28 +9026,67 @@ var RowSelectionState = class {
     return this.getGroupRowSelectionState(groupKeys) === false;
   }
   selectGroupRow(groupKeys) {
+    if (this.onlyUsePrimaryKeys) {
+      const keys = this.getAllPrimaryKeysInsideGroup(groupKeys);
+      keys.forEach((key) => {
+        if (this.defaultSelection === true) {
+          this.deselectedMap.delete([key]);
+        } else {
+          this._selectedMapSet(key);
+        }
+      });
+      this.xcache();
+      return;
+    }
     const selectedKeys = this.selectedMap.getKeysStartingWith(groupKeys, true);
     selectedKeys.forEach((groupKeys2) => {
       this.selectedMap.delete(groupKeys2);
     });
-    this._selectedMapSet(groupKeys);
+    if (groupKeys.length === 1 && this.defaultSelection === true) {
+    } else {
+      this._selectedMapSet(groupKeys);
+    }
     const deselectedKeys = this.deselectedMap.getKeysStartingWith(groupKeys);
     deselectedKeys.forEach((groupKeys2) => {
       this.deselectedMap.delete(groupKeys2);
     });
   }
   deselectGroupRow(groupKeys) {
+    if (this.onlyUsePrimaryKeys) {
+      const keys = this.getAllPrimaryKeysInsideGroup(groupKeys);
+      keys.forEach((key) => {
+        if (this.defaultSelection === false) {
+          this.selectedMap.delete([key]);
+        } else {
+          this._deselectedMapSet(key);
+        }
+      });
+      this.xcache();
+      return;
+    }
     const deselectedKeys = this.deselectedMap.getKeysStartingWith(groupKeys, true);
     deselectedKeys.forEach((groupKeys2) => {
       this.deselectedMap.delete(groupKeys2);
     });
-    this._deselectedMapSet(groupKeys);
+    if (groupKeys.length === 1 && this.defaultSelection === false) {
+    } else {
+      this._deselectedMapSet(groupKeys);
+    }
     const selectedKeys = this.selectedMap.getKeysStartingWith(groupKeys);
     selectedKeys.forEach((groupKeys2) => {
       this.selectedMap.delete(groupKeys2);
     });
   }
   setRowAsSelected(key, groupKeys) {
+    if (this.onlyUsePrimaryKeys) {
+      if (this.defaultSelection) {
+        this.deselectedMap.delete([key]);
+      } else {
+        this._selectedMapSet(key);
+      }
+      this.xcache();
+      return;
+    }
     groupKeys = groupKeys || this.getGroupKeysForPrimaryKey(key);
     const finalKey = [...groupKeys, key];
     this.deselectedMap.delete(finalKey);
@@ -9035,9 +9099,19 @@ var RowSelectionState = class {
     }
   }
   setRowAsDeselected(key, groupKeys) {
+    if (this.onlyUsePrimaryKeys) {
+      if (this.defaultSelection) {
+        this._deselectedMapSet(key);
+      } else {
+        this.selectedMap.delete([key]);
+      }
+      this.xcache();
+      return;
+    }
     groupKeys = groupKeys || this.getGroupKeysForPrimaryKey(key);
     const finalKey = [...groupKeys, key];
     this.selectedMap.delete(finalKey);
+    this.xcache();
     if (this.getGroupRowSelectionState(groupKeys) !== false) {
       this._deselectedMapSet(finalKey);
       if (this.getGroupRowSelectionState(groupKeys) === false) {
@@ -9086,6 +9160,32 @@ var RowSelectionState = class {
       this.selectionCountCache.set(groupKeys, result2);
       return result2;
     }
+    if (this.onlyUsePrimaryKeys) {
+      const allKeys2 = this.getAllPrimaryKeysInsideGroup(groupKeys);
+      let selectedCount2 = 0;
+      let deselectedCount2 = 0;
+      allKeys2.forEach((key) => {
+        if (this.defaultSelection) {
+          if (this.deselectedMap.has([key])) {
+            deselectedCount2++;
+            return;
+          }
+          selectedCount2++;
+        } else {
+          if (this.selectedMap.has([key])) {
+            selectedCount2++;
+            return;
+          }
+          deselectedCount2++;
+        }
+      });
+      const result2 = {
+        selectedCount: selectedCount2,
+        deselectedCount: deselectedCount2
+      };
+      this.selectionCountCache.set(groupKeys, result2);
+      return result2;
+    }
     parentSelected = parentSelected != null ? parentSelected : this.getGroupRowBooleanSelectionStateFromParent(groupKeys);
     let allKeys = this.getGroupKeysDirectlyInsideGroup(groupKeys);
     if (groupKeys.length === this.getGroupByLength()) {
@@ -9142,6 +9242,8 @@ function rowSelectionStateConfigGetter(stateOrStateGetter) {
     const state = typeof stateOrStateGetter === "function" ? stateOrStateGetter() : stateOrStateGetter;
     return {
       lazyLoad: !!state.lazyLoad,
+      toPrimaryKey: state.toPrimaryKey,
+      onlyUsePrimaryKeys: state.usePrimaryKeysForMultiRowSelection,
       groupBy: state.groupBy,
       groupDeepMap: state.groupDeepMap,
       indexer: state.indexer,
@@ -9296,24 +9398,32 @@ function getSelectionApi(param) {
       rowSelectionState.toggleGroupRowSelection(groupKeys);
       dataSourceActions.rowSelection = rowSelectionState;
     },
-    getGroupRowSelectionState(groupKeys) {
-      const { selectionMode, rowSelection, groupBy } = getDataSourceState();
+    getGroupRowSelectionState(groupKeys, rowSelection) {
+      const state = getDataSourceState();
+      const { selectionMode, groupBy } = state;
+      const rowSelectionState = rowSelection ? new RowSelectionState(rowSelection, rowSelectionStateConfigGetter(state)) : state.rowSelection;
       if (selectionMode !== "multi-row") {
         throw 'Selection mode should be "multi-row"';
       }
       if (!groupBy) {
         throw "No grouping specified";
       }
-      if (!(rowSelection instanceof RowSelectionState)) {
+      if (!(rowSelectionState instanceof RowSelectionState)) {
         throw "Invalid row selection";
       }
-      return rowSelection.getGroupRowSelectionState(groupKeys);
+      return rowSelectionState.getGroupRowSelectionState(groupKeys);
     },
-    getSelectedPrimaryKeys: () => {
+    getSelectedPrimaryKeys: (rowSelection) => {
+      const state = getDataSourceState();
+      const rowSelectionState = rowSelection ? new RowSelectionState(rowSelection, rowSelectionStateConfigGetter(state)) : state.rowSelection;
       const selected = [];
-      getDataSourceState().dataArray.forEach((rowInfo) => {
-        if (!rowInfo.isGroupRow && rowInfo.rowSelected) {
-          selected.push(rowInfo.id);
+      if (state.lazyLoad) {
+        console.error(`getSelectedPrimaryKeys  should not be called for lazy-loaded datasources as it wont return reliable results`);
+      }
+      state.originalDataArray.forEach((data) => {
+        const id = state.toPrimaryKey(data);
+        if (rowSelectionState.isRowSelected(id)) {
+          selected.push(id);
         }
       });
       return selected;
@@ -9455,6 +9565,7 @@ var forwardProps3 = (setupState) => {
     livePagination: 1,
     filterFunction: 1,
     filterValue: 1,
+    usePrimaryKeysForMultiRowSelection: (usePrimaryKeysForMultiRowSelection) => usePrimaryKeysForMultiRowSelection != null ? usePrimaryKeysForMultiRowSelection : false,
     filterDelay: (filterDelay) => filterDelay != null ? filterDelay : 200,
     filterTypes: (filterTypes) => {
       return __spreadValues(__spreadValues({}, defaultFilterTypes), filterTypes);
@@ -10537,7 +10648,8 @@ function useCellRendering(param) {
     rowClassName,
     onScrollToTop,
     onScrollToBottom,
-    scrollToBottomOffset
+    scrollToBottomOffset,
+    ready
   } = componentState;
   const repaintId = dataSourceState.updatedAt;
   useYourBrain({
@@ -10578,12 +10690,16 @@ function useCellRendering(param) {
     if (!bodySize.height) {
       return;
     }
-    const { onReady } = getState();
     componentActions.ready = true;
+  }, [!!bodySize.height]);
+  (0, import_react32.useEffect)(() => {
+    if (!ready) {
+    }
+    const { onReady } = getState();
     if (onReady) {
       onReady(imperativeApi);
     }
-  }, [!!bodySize.height]);
+  }, [ready]);
   const [, rerender] = useRerender();
   (0, import_react32.useEffect)(() => {
     rerender();
@@ -12275,7 +12391,7 @@ var useLicense = (licenseKey = "") => {
   const valid = (0, import_react44.useMemo)(() => {
     let valid2 = isValidLicense(licenseKey, {
       publishedAt: 1624970570587,
-      version: "0.4.6"
+      version: "0.4.9"
     });
     if (!licenseKey && !valid2 && isInsidePlayground) {
       return true;
@@ -12337,7 +12453,7 @@ function useScrollToActiveRow(activeRowIndex, dataCount, imperativeApi) {
         times++;
         rafId.current = requestAnimationFrame(() => {
           didScrollRef.current = imperativeApi.scrollRowIntoView(activeRowIndex, {
-            offset: 30
+            offset: 0
           });
           if (!didScrollRef.current && times < RETRIES2) {
             tryScroll(times);
@@ -12894,7 +13010,6 @@ function handleKeyboardSelection(context) {
       const event = __spreadValues({}, context);
       const { renderSelectionCheckBox } = context.getComputed();
       if (renderSelectionCheckBox) {
-        event.shiftKey = false;
         event.metaKey = false;
         event.ctrlKey = true;
       }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@infinite-table/infinite-react",
   "description": "Infinite Table for React",
-  "version": "0.4.6",
+  "version": "0.4.9",
   "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": 1660896701925
+  "publishedAt": 1661328172572
 }