@infinite-table/infinite-react 0.4.5 → 0.4.8

package/index.d.ts

@@ -1703,7 +1703,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)
           })
@@ -9402,11 +9404,17 @@ function getSelectionApi(param) {
       }
       return rowSelection.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;
@@ -9582,7 +9590,7 @@ function getLivePaginationCursorValue(livePaginationCursorProp, state) {
   return livePaginationCursor;
 }
 function mapPropsToState(params) {
-  var _a, _b;
+  var _a;
   const { props, state, oldState } = params;
   const controlledSort = isControlledValue(props.sortInfo);
   const controlledFilter = isControlledValue(props.filterValue);
@@ -9601,7 +9609,7 @@ function mapPropsToState(params) {
     if (props.cellSelection !== void 0 || props.defaultCellSelection !== void 0) {
       selectionMode = "multi-cell";
     } else {
-      const rowSelectionProp = (_a = props.rowSelection) != null ? _a : props.defaultRowSelection;
+      const rowSelectionProp = props.rowSelection !== void 0 ? props.rowSelection : props.defaultRowSelection;
       if (rowSelectionProp !== void 0) {
         if (rowSelectionProp && typeof rowSelectionProp === "object") {
           selectionMode = "multi-row";
@@ -9636,7 +9644,7 @@ function mapPropsToState(params) {
     operatorsByFilterType,
     controlledSort,
     controlledFilter,
-    filterMode: ((_b = props.filterMode) != null ? _b : props.filterFunction != null) ? "local" : typeof props.data === "function" ? "remote" : "local",
+    filterMode: ((_a = props.filterMode) != null ? _a : props.filterFunction != null) ? "local" : typeof props.data === "function" ? "remote" : "local",
     multiSort: Array.isArray(controlledSort ? props.sortInfo : props.defaultSortInfo),
     lazyLoadBatchSize: typeof props.lazyLoad === "object" ? props.lazyLoad.batchSize : void 0
   };
@@ -12374,7 +12382,7 @@ var useLicense = (licenseKey = "") => {
   const valid = useMemo11(() => {
     let valid2 = isValidLicense(licenseKey, {
       publishedAt: 1624970570587,
-      version: "0.4.5"
+      version: "0.4.8"
     });
     if (!licenseKey && !valid2 && isInsidePlayground) {
       return true;
@@ -12436,7 +12444,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);
@@ -12709,11 +12717,10 @@ function onCellClick(context, event) {
   updateRowSelectionOnCellClick(context, event);
 }
 function updateRowSelectionOnCellClick(context, event) {
-  const { rowIndex, getDataSourceState, getComputed, dataSourceActions } = context;
+  const { rowIndex, getDataSourceState, getComputed, dataSourceActions, api } = context;
   const { multiRowSelector, renderSelectionCheckBox } = getComputed();
   const dataSourceState = getDataSourceState();
-  const { selectionMode, groupBy } = dataSourceState;
-  let { rowSelection: rowSelectionState } = dataSourceState;
+  const { selectionMode, groupBy, dataArray } = dataSourceState;
   if (groupBy.length) {
     return false;
   }
@@ -12721,6 +12728,7 @@ function updateRowSelectionOnCellClick(context, event) {
     if (renderSelectionCheckBox && !event.key) {
       return false;
     }
+    let { rowSelection: rowSelectionState } = dataSourceState;
     rowSelectionState = new RowSelectionState(rowSelectionState, rowSelectionStateConfigGetter(getDataSourceState));
     multiRowSelector.rowSelectionState = rowSelectionState;
     if (rowSelectionState && typeof rowSelectionState === "object") {
@@ -12735,6 +12743,12 @@ function updateRowSelectionOnCellClick(context, event) {
       return true;
     }
   } else if (selectionMode === "single-row") {
+    const id = dataArray[rowIndex].id;
+    if (event.metaKey || event.ctrlKey) {
+      api.selectionApi.toggleRowSelection(id);
+    } else {
+      api.selectionApi.selectRow(id);
+    }
   }
   return false;
 }
@@ -12987,7 +13001,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)
           })
@@ -9309,11 +9311,17 @@ function getSelectionApi(param) {
       }
       return rowSelection.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;
@@ -9489,7 +9497,7 @@ function getLivePaginationCursorValue(livePaginationCursorProp, state) {
   return livePaginationCursor;
 }
 function mapPropsToState(params) {
-  var _a, _b;
+  var _a;
   const { props, state, oldState } = params;
   const controlledSort = isControlledValue(props.sortInfo);
   const controlledFilter = isControlledValue(props.filterValue);
@@ -9508,7 +9516,7 @@ function mapPropsToState(params) {
     if (props.cellSelection !== void 0 || props.defaultCellSelection !== void 0) {
       selectionMode = "multi-cell";
     } else {
-      const rowSelectionProp = (_a = props.rowSelection) != null ? _a : props.defaultRowSelection;
+      const rowSelectionProp = props.rowSelection !== void 0 ? props.rowSelection : props.defaultRowSelection;
       if (rowSelectionProp !== void 0) {
         if (rowSelectionProp && typeof rowSelectionProp === "object") {
           selectionMode = "multi-row";
@@ -9543,7 +9551,7 @@ function mapPropsToState(params) {
     operatorsByFilterType,
     controlledSort,
     controlledFilter,
-    filterMode: ((_b = props.filterMode) != null ? _b : props.filterFunction != null) ? "local" : typeof props.data === "function" ? "remote" : "local",
+    filterMode: ((_a = props.filterMode) != null ? _a : props.filterFunction != null) ? "local" : typeof props.data === "function" ? "remote" : "local",
     multiSort: Array.isArray(controlledSort ? props.sortInfo : props.defaultSortInfo),
     lazyLoadBatchSize: typeof props.lazyLoad === "object" ? props.lazyLoad.batchSize : void 0
   };
@@ -12275,7 +12283,7 @@ var useLicense = (licenseKey = "") => {
   const valid = (0, import_react44.useMemo)(() => {
     let valid2 = isValidLicense(licenseKey, {
       publishedAt: 1624970570587,
-      version: "0.4.5"
+      version: "0.4.8"
     });
     if (!licenseKey && !valid2 && isInsidePlayground) {
       return true;
@@ -12337,7 +12345,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);
@@ -12610,11 +12618,10 @@ function onCellClick(context, event) {
   updateRowSelectionOnCellClick(context, event);
 }
 function updateRowSelectionOnCellClick(context, event) {
-  const { rowIndex, getDataSourceState, getComputed, dataSourceActions } = context;
+  const { rowIndex, getDataSourceState, getComputed, dataSourceActions, api } = context;
   const { multiRowSelector, renderSelectionCheckBox } = getComputed();
   const dataSourceState = getDataSourceState();
-  const { selectionMode, groupBy } = dataSourceState;
-  let { rowSelection: rowSelectionState } = dataSourceState;
+  const { selectionMode, groupBy, dataArray } = dataSourceState;
   if (groupBy.length) {
     return false;
   }
@@ -12622,6 +12629,7 @@ function updateRowSelectionOnCellClick(context, event) {
     if (renderSelectionCheckBox && !event.key) {
       return false;
     }
+    let { rowSelection: rowSelectionState } = dataSourceState;
     rowSelectionState = new RowSelectionState(rowSelectionState, rowSelectionStateConfigGetter(getDataSourceState));
     multiRowSelector.rowSelectionState = rowSelectionState;
     if (rowSelectionState && typeof rowSelectionState === "object") {
@@ -12636,6 +12644,12 @@ function updateRowSelectionOnCellClick(context, event) {
       return true;
     }
   } else if (selectionMode === "single-row") {
+    const id = dataArray[rowIndex].id;
+    if (event.metaKey || event.ctrlKey) {
+      api.selectionApi.toggleRowSelection(id);
+    } else {
+      api.selectionApi.selectRow(id);
+    }
   }
   return false;
 }
@@ -12888,7 +12902,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.5",
+  "version": "0.4.8",
   "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": 1660890090935
+  "publishedAt": 1660912348938
 }