@infinite-table/infinite-react 9.1.0 → 9.1.1

package/index.dev.js

@@ -22491,6 +22491,40 @@ function lazyLoadRange(options, cache) {
   }, initialPromise);
 }
 
+// src/components/InfiniteTable/utils/getEditingCellContext.ts
+function resolveEditingCellRowIndex(context, editingCell) {
+  const { rowIndex, primaryKey } = editingCell;
+  const { dataArray } = context.getDataSourceState();
+  if (primaryKey !== void 0) {
+    const indexByKey = context.dataSourceApi.getIndexByPrimaryKey(primaryKey);
+    if (indexByKey !== -1) {
+      return indexByKey;
+    }
+    if (dataArray[rowIndex]?.id !== primaryKey) {
+      return -1;
+    }
+  }
+  return dataArray[rowIndex] ? rowIndex : -1;
+}
+function getEditingCellContext(context, editingCell) {
+  const rowIndex = resolveEditingCellRowIndex(context, editingCell);
+  if (rowIndex === -1) {
+    return null;
+  }
+  return getCellContext({
+    ...context,
+    rowIndex,
+    columnId: editingCell.columnId
+  });
+}
+function warnEditedRowGone(callbackName, editingCell) {
+  console.warn(
+    `Skipping "${callbackName}": the edited row (primaryKey: ${String(
+      editingCell.primaryKey
+    )}, rowIndex: ${editingCell.rowIndex}) is no longer in the data array.`
+  );
+}
+
 // src/components/InfiniteTable/api/realignColumnContextMenu.ts
 function realignColumnContextMenu(param) {
   const { getComputed, getState, actions } = param;
@@ -23367,9 +23401,28 @@ var InfiniteTableApiImpl = class {
           waiting: "persist"
         };
       }
+      const rowIndex = resolveEditingCellRowIndex(
+        { ...this.context, api: this },
+        editingCell
+      );
+      if (rowIndex === -1) {
+        const error4 = new Error(
+          `Cannot persist edit: the edited row (primaryKey: ${String(
+            editingCell.primaryKey
+          )}, rowIndex: ${editingCell.rowIndex}) is no longer in the data array.`
+        );
+        this.actions.editingCell = {
+          ...editingCell,
+          active: false,
+          accepted: false,
+          waiting: false,
+          persisted: error4
+        };
+        return Promise.resolve(error4);
+      }
       const params = {
         ...getCellContext({
-          rowIndex: editingCell.rowIndex,
+          rowIndex,
           columnId: editingCell.columnId,
           ...this.context,
           api: this
@@ -27758,7 +27811,7 @@ var useLicense = (licenseKey = "") => {
     }
     let valid2 = isValidLicense(licenseKey, {
       publishedAt: 1624970570587,
-      version: "9.1.0"
+      version: "9.1.1"
     });
     if (!licenseKey && !valid2 && isInsidePlayground) {
       return true;
@@ -30403,15 +30456,19 @@ function useOnEditCancelled() {
   const cancelled = editingCell && !editingCell.active ? editingCell.cancelled : void 0;
   (0, import_react61.useEffect)(() => {
     if (cancelled) {
-      const { rowIndex, columnId, initialValue } = getState().editingCell;
       const { onEditCancelled } = getState();
-      onEditCancelled?.({
-        ...getCellContext({
-          rowIndex,
-          columnId,
-          ...context
-        }),
-        initialValue
+      const editingCell2 = getState().editingCell;
+      if (!onEditCancelled) {
+        return;
+      }
+      const cellContext = getEditingCellContext(context, editingCell2);
+      if (!cellContext) {
+        warnEditedRowGone("onEditCancelled", editingCell2);
+        return;
+      }
+      onEditCancelled({
+        ...cellContext,
+        initialValue: editingCell2.initialValue
       });
     }
   }, [cancelled]);
@@ -30427,17 +30484,21 @@ function useOnEditRejected() {
   const rejected = editingCell && !editingCell.active && editingCell.accepted instanceof Error ? editingCell.accepted : void 0;
   (0, import_react61.useEffect)(() => {
     if (rejected) {
-      const { rowIndex, columnId, value, initialValue } = getState().editingCell;
       const { onEditRejected } = getState();
-      onEditRejected?.({
-        ...getCellContext({
-          rowIndex,
-          columnId,
-          ...context
-        }),
-        value,
+      const editingCell2 = getState().editingCell;
+      if (!onEditRejected) {
+        return;
+      }
+      const cellContext = getEditingCellContext(context, editingCell2);
+      if (!cellContext) {
+        warnEditedRowGone("onEditRejected", editingCell2);
+        return;
+      }
+      onEditRejected({
+        ...cellContext,
+        value: editingCell2.value,
         error: rejected,
-        initialValue
+        initialValue: editingCell2.initialValue
       });
     }
   }, [rejected]);
@@ -30468,18 +30529,17 @@ function useOnEditAccepted() {
   const accepted = editingCell && !editingCell.active && !editingCell.cancelled && editingCell.accepted === true;
   (0, import_react61.useEffect)(() => {
     if (accepted) {
-      const { editingCell: editingCell2 } = getState();
-      const { value, rowIndex, columnId, initialValue } = editingCell2;
-      const editParams = {
-        ...getCellContext({
-          rowIndex,
-          columnId,
-          ...context
-        }),
-        value,
-        initialValue
-      };
-      getState().onEditAccepted?.(editParams);
+      const { onEditAccepted } = getState();
+      const editingCell2 = getState().editingCell;
+      const { value, initialValue } = editingCell2;
+      if (onEditAccepted) {
+        const cellContext = getEditingCellContext(context, editingCell2);
+        if (cellContext) {
+          onEditAccepted({ ...cellContext, value, initialValue });
+        } else {
+          warnEditedRowGone("onEditAccepted", editingCell2);
+        }
+      }
       context.api.persistEdit({ value });
     }
   }, [accepted]);
@@ -30499,15 +30559,19 @@ function useOnEditPersisted() {
       if (!editingCell2) {
         return;
       }
-      const { rowIndex, columnId, value, initialValue } = editingCell2;
+      const callbackName = persisted instanceof Error ? "onEditPersistError" : "onEditPersistSuccess";
+      if (!getState()[callbackName]) {
+        return;
+      }
+      const cellContext = getEditingCellContext(context, editingCell2);
+      if (!cellContext) {
+        warnEditedRowGone(callbackName, editingCell2);
+        return;
+      }
       const params = {
-        ...getCellContext({
-          rowIndex,
-          columnId,
-          ...context
-        }),
-        value,
-        initialValue
+        ...cellContext,
+        value: editingCell2.value,
+        initialValue: editingCell2.initialValue
       };
       if (persisted instanceof Error) {
         onEditPersistError?.({ ...params, error: persisted });

package/index.dev.mjs

@@ -22425,6 +22425,40 @@ function lazyLoadRange(options, cache) {
   }, initialPromise);
 }
 
+// src/components/InfiniteTable/utils/getEditingCellContext.ts
+function resolveEditingCellRowIndex(context, editingCell) {
+  const { rowIndex, primaryKey } = editingCell;
+  const { dataArray } = context.getDataSourceState();
+  if (primaryKey !== void 0) {
+    const indexByKey = context.dataSourceApi.getIndexByPrimaryKey(primaryKey);
+    if (indexByKey !== -1) {
+      return indexByKey;
+    }
+    if (dataArray[rowIndex]?.id !== primaryKey) {
+      return -1;
+    }
+  }
+  return dataArray[rowIndex] ? rowIndex : -1;
+}
+function getEditingCellContext(context, editingCell) {
+  const rowIndex = resolveEditingCellRowIndex(context, editingCell);
+  if (rowIndex === -1) {
+    return null;
+  }
+  return getCellContext({
+    ...context,
+    rowIndex,
+    columnId: editingCell.columnId
+  });
+}
+function warnEditedRowGone(callbackName, editingCell) {
+  console.warn(
+    `Skipping "${callbackName}": the edited row (primaryKey: ${String(
+      editingCell.primaryKey
+    )}, rowIndex: ${editingCell.rowIndex}) is no longer in the data array.`
+  );
+}
+
 // src/components/InfiniteTable/api/realignColumnContextMenu.ts
 function realignColumnContextMenu(param) {
   const { getComputed, getState, actions } = param;
@@ -23301,9 +23335,28 @@ var InfiniteTableApiImpl = class {
           waiting: "persist"
         };
       }
+      const rowIndex = resolveEditingCellRowIndex(
+        { ...this.context, api: this },
+        editingCell
+      );
+      if (rowIndex === -1) {
+        const error4 = new Error(
+          `Cannot persist edit: the edited row (primaryKey: ${String(
+            editingCell.primaryKey
+          )}, rowIndex: ${editingCell.rowIndex}) is no longer in the data array.`
+        );
+        this.actions.editingCell = {
+          ...editingCell,
+          active: false,
+          accepted: false,
+          waiting: false,
+          persisted: error4
+        };
+        return Promise.resolve(error4);
+      }
       const params = {
         ...getCellContext({
-          rowIndex: editingCell.rowIndex,
+          rowIndex,
           columnId: editingCell.columnId,
           ...this.context,
           api: this
@@ -27697,7 +27750,7 @@ var useLicense = (licenseKey = "") => {
     }
     let valid2 = isValidLicense(licenseKey, {
       publishedAt: 1624970570587,
-      version: "9.1.0"
+      version: "9.1.1"
     });
     if (!licenseKey && !valid2 && isInsidePlayground) {
       return true;
@@ -30352,15 +30405,19 @@ function useOnEditCancelled() {
   const cancelled = editingCell && !editingCell.active ? editingCell.cancelled : void 0;
   useEffect33(() => {
     if (cancelled) {
-      const { rowIndex, columnId, initialValue } = getState().editingCell;
       const { onEditCancelled } = getState();
-      onEditCancelled?.({
-        ...getCellContext({
-          rowIndex,
-          columnId,
-          ...context
-        }),
-        initialValue
+      const editingCell2 = getState().editingCell;
+      if (!onEditCancelled) {
+        return;
+      }
+      const cellContext = getEditingCellContext(context, editingCell2);
+      if (!cellContext) {
+        warnEditedRowGone("onEditCancelled", editingCell2);
+        return;
+      }
+      onEditCancelled({
+        ...cellContext,
+        initialValue: editingCell2.initialValue
       });
     }
   }, [cancelled]);
@@ -30376,17 +30433,21 @@ function useOnEditRejected() {
   const rejected = editingCell && !editingCell.active && editingCell.accepted instanceof Error ? editingCell.accepted : void 0;
   useEffect33(() => {
     if (rejected) {
-      const { rowIndex, columnId, value, initialValue } = getState().editingCell;
       const { onEditRejected } = getState();
-      onEditRejected?.({
-        ...getCellContext({
-          rowIndex,
-          columnId,
-          ...context
-        }),
-        value,
+      const editingCell2 = getState().editingCell;
+      if (!onEditRejected) {
+        return;
+      }
+      const cellContext = getEditingCellContext(context, editingCell2);
+      if (!cellContext) {
+        warnEditedRowGone("onEditRejected", editingCell2);
+        return;
+      }
+      onEditRejected({
+        ...cellContext,
+        value: editingCell2.value,
         error: rejected,
-        initialValue
+        initialValue: editingCell2.initialValue
       });
     }
   }, [rejected]);
@@ -30417,18 +30478,17 @@ function useOnEditAccepted() {
   const accepted = editingCell && !editingCell.active && !editingCell.cancelled && editingCell.accepted === true;
   useEffect33(() => {
     if (accepted) {
-      const { editingCell: editingCell2 } = getState();
-      const { value, rowIndex, columnId, initialValue } = editingCell2;
-      const editParams = {
-        ...getCellContext({
-          rowIndex,
-          columnId,
-          ...context
-        }),
-        value,
-        initialValue
-      };
-      getState().onEditAccepted?.(editParams);
+      const { onEditAccepted } = getState();
+      const editingCell2 = getState().editingCell;
+      const { value, initialValue } = editingCell2;
+      if (onEditAccepted) {
+        const cellContext = getEditingCellContext(context, editingCell2);
+        if (cellContext) {
+          onEditAccepted({ ...cellContext, value, initialValue });
+        } else {
+          warnEditedRowGone("onEditAccepted", editingCell2);
+        }
+      }
       context.api.persistEdit({ value });
     }
   }, [accepted]);
@@ -30448,15 +30508,19 @@ function useOnEditPersisted() {
       if (!editingCell2) {
         return;
       }
-      const { rowIndex, columnId, value, initialValue } = editingCell2;
+      const callbackName = persisted instanceof Error ? "onEditPersistError" : "onEditPersistSuccess";
+      if (!getState()[callbackName]) {
+        return;
+      }
+      const cellContext = getEditingCellContext(context, editingCell2);
+      if (!cellContext) {
+        warnEditedRowGone(callbackName, editingCell2);
+        return;
+      }
       const params = {
-        ...getCellContext({
-          rowIndex,
-          columnId,
-          ...context
-        }),
-        value,
-        initialValue
+        ...cellContext,
+        value: editingCell2.value,
+        initialValue: editingCell2.initialValue
       };
       if (persisted instanceof Error) {
         onEditPersistError?.({ ...params, error: persisted });