@economic/taco 2.69.2-search-race-condition.0 → 2.69.2-search-race-condition.1

package/dist/taco.cjs

@@ -45098,10 +45098,10 @@ function Search$1(props) {
   };
   const [loading, setLoading] = React.useState(false);
   const handleSearch = React.useCallback(
-    _.debounce((query2) => {
+    _.debounce((query2, hiddenColumns2) => {
       var _a2, _b, _c;
       setLoading(true);
-      (_c = (_b = (_a2 = tableMeta.search).handleSearch) == null ? void 0 : _b.call(_a2, query2, hiddenColumns)) == null ? void 0 : _c.then(() => {
+      (_c = (_b = (_a2 = tableMeta.search).handleSearch) == null ? void 0 : _b.call(_a2, query2, hiddenColumns2)) == null ? void 0 : _c.then(() => {
         setLoading(false);
       });
     }, 400),
@@ -45110,7 +45110,7 @@ function Search$1(props) {
   const handleChange = (query2) => {
     table.setGlobalFilter(String(query2 ?? ""));
     if (tableMeta.search.enableGlobalFilter && tableMeta.search.handleSearch) {
-      handleSearch(query2);
+      handleSearch(query2, hiddenColumns);
     }
   };
   const handleToggleExcludeUnmatchedResults = async (enabled) => {
@@ -49651,7 +49651,14 @@ const EditPopover = (props) => {
         onChangeColor: setColor,
         onKeyDown: preventKeyDownPropagation
       }
-    )) : null, /* @__PURE__ */ React.createElement(Group$6, null, /* @__PURE__ */ React.createElement(Button$4, { onClick: close }, texts.select2.cancel), /* @__PURE__ */ React.createElement(Button$4, { appearance: "primary", onClick: handleSave(close) }, texts.select2.save))) : null, onEdit && onDelete ? /* @__PURE__ */ React.createElement("hr", null) : null, onDelete ? /* @__PURE__ */ React.createElement(
+    )) : null, /* @__PURE__ */ React.createElement(Group$6, null, /* @__PURE__ */ React.createElement(Button$4, { onClick: close }, texts.select2.cancel), /* @__PURE__ */ React.createElement(
+      Button$4,
+      {
+        appearance: "primary",
+        onClick: handleSave(close)
+      },
+      texts.select2.save
+    ))) : null, onEdit && onDelete ? /* @__PURE__ */ React.createElement("hr", null) : null, onDelete ? /* @__PURE__ */ React.createElement(
       "button",
       {
         className: "hover:text-grey-700 flex items-center justify-start gap-1",
@@ -50917,6 +50924,7 @@ function Control(props) {
   const controlRenderer = (_a = column == null ? void 0 : column.columnDef.meta) == null ? void 0 : _a.control;
   const dataType = (_b = column == null ? void 0 : column.columnDef.meta) == null ? void 0 : _b.dataType;
   const filters = React.useContext(FilterContext);
+  const ref = React.useRef(null);
   React.useEffect(() => {
     if ((controlRenderer === "switch" || controlRenderer === "checkbox") && value === void 0) {
       onChange(false);
@@ -50926,8 +50934,9 @@ function Control(props) {
     const control = controlRenderer(
       {
         ...attributes,
-        setValue: (value2) => onChange(value2),
-        value
+        setValue: onChange,
+        value,
+        ref
       },
       void 0,
       filters
@@ -57189,7 +57198,9 @@ const useRowSelect = (onSelectedRows) => {
             const { onChange: _2, ...props } = getToggleAllRowsSelectedProps();
             const onChange = (checked) => {
               if (checked) {
-                onSelectedRows(Object.assign({}, Array.from({ length: rows.length }).fill(true)));
+                onSelectedRows(
+                  Object.assign({}, Array.from({ length: rows.length }).fill(true))
+                );
               } else {
                 onSelectedRows({});
               }
@@ -60636,7 +60647,8 @@ var setWithExports = requireSetWith();
 const setWith = /* @__PURE__ */ getDefaultExportFromCjs(setWithExports);
 const DELAY_BEFORE_REMOVING_SAVE_STATUS = 3e3;
 function reducer(state, action) {
-  const { type, rowId, payload } = action;
+  var _a;
+  const { type, payload } = action;
   switch (type) {
     case "setCellValue": {
       const { columnId, index: index2, row, value } = payload;
@@ -60644,26 +60656,26 @@ function reducer(state, action) {
         ...state,
         changes: {
           ...state.changes,
-          rows: setWith(state.changes.rows, `${rowId}.${columnId}`, value, Object),
-          originals: setWith(state.changes.originals, rowId, row, Object),
-          dirty: setWith(state.changes.dirty, rowId, true, Object)
+          rows: setWith(state.changes.rows, `${action.rowId}.${columnId}`, value, Object),
+          originals: setWith(state.changes.originals, action.rowId, row, Object),
+          dirty: setWith(state.changes.dirty, action.rowId, true, Object)
         },
-        indexes: setWith(state.indexes, rowId, index2, Object)
+        indexes: setWith(state.indexes, action.rowId, index2, Object)
       };
     }
     case "removeCellValue": {
       const { columnId, rowIdentityAccessor } = payload;
-      const changes = omit$1(state.changes.rows, `${rowId}.${columnId}`);
-      if (!Object.keys(changes[rowId]).length) {
-        return reducer(state, { type: "removeRow", rowId, payload: { rowIdentityAccessor } });
+      const changes = omit$1(state.changes.rows, `${action.rowId}.${columnId}`);
+      if (!Object.keys(changes[action.rowId]).length) {
+        return reducer(state, { type: "removeRow", rowId: action.rowId, payload: { rowIdentityAccessor } });
       }
       return {
         ...state,
         changes: {
           ...state.changes,
-          rows: omit$1(state.changes.rows, `${rowId}.${columnId}`),
-          errors: omit$1(state.changes.errors, `${rowId}.cells.${columnId}`),
-          moveReasons: omit$1(state.changes.moveReasons, `${rowId}.${columnId}`)
+          rows: omit$1(state.changes.rows, `${action.rowId}.${columnId}`),
+          errors: omit$1(state.changes.errors, `${action.rowId}.cells.${columnId}`),
+          moveReasons: omit$1(state.changes.moveReasons, `${action.rowId}.${columnId}`)
         }
       };
     }
@@ -60673,24 +60685,28 @@ function reducer(state, action) {
         ...state,
         changes: {
           ...state.changes,
-          rows: setWith(state.changes.rows, rowId, value, Object),
+          rows: setWith(state.changes.rows, action.rowId, value, Object),
           errors: setWith(
             state.changes.errors,
-            `${rowId}.cells`,
-            cellErrors ?? state.changes.errors.cells[rowId],
+            `${action.rowId}.cells`,
+            cellErrors ?? ((_a = state.changes.errors[action.rowId]) == null ? void 0 : _a.cells),
+            Object
+          ),
+          originals: setWith(
+            state.changes.originals,
+            action.rowId,
+            original ?? state.changes.originals[action.rowId],
             Object
           ),
-          originals: setWith(state.changes.originals, rowId, original ?? state.changes.originals[rowId], Object),
           moveReasons: setWith(
             state.changes.moveReasons,
-            rowId,
-            moveReasons ?? state.changes.moveReasons[rowId],
+            action.rowId,
+            moveReasons ?? state.changes.moveReasons[action.rowId],
             Object
-          ),
-          // status can be undefined, so don't use ??
-          status: setWith(state.changes.status, rowId, void 0, Object)
+          )
         },
-        indexes: setWith(state.indexes, rowId, index2, Object)
+        indexes: setWith(state.indexes, action.rowId, index2, Object),
+        statuses: omit$1(state.statuses, action.rowId)
       };
     }
     case "removeRow": {
@@ -60699,28 +60715,27 @@ function reducer(state, action) {
         ...state,
         changes: {
           ...state.changes,
-          rows: omit$1(state.changes.rows, rowId),
-          errors: omit$1(state.changes.errors, rowId),
-          moveReasons: omit$1(state.changes.moveReasons, rowId),
-          originals: omit$1(state.changes.originals, rowId),
-          status: omit$1(state.changes.status, rowId),
-          dirty: omit$1(state.changes.dirty, rowId)
+          rows: omit$1(state.changes.rows, action.rowId),
+          errors: omit$1(state.changes.errors, action.rowId),
+          moveReasons: omit$1(state.changes.moveReasons, action.rowId),
+          originals: omit$1(state.changes.originals, action.rowId),
+          dirty: omit$1(state.changes.dirty, action.rowId)
         },
-        indexes: omit$1(state.indexes, rowId),
-        temporaryRows: state.temporaryRows.filter((row) => row[rowIdentityAccessor] !== rowId)
+        indexes: omit$1(state.indexes, action.rowId),
+        temporaryRows: state.temporaryRows.filter((row) => row[rowIdentityAccessor] !== action.rowId)
       };
     }
     case "complete": {
       const { changes, handleDiscard } = payload;
-      if (JSON.stringify(changes) !== JSON.stringify(state.changes.rows[rowId])) {
+      if (JSON.stringify(changes) !== JSON.stringify(state.changes.rows[action.rowId])) {
         return {
           ...state,
           changes: {
             ...state.changes,
             originals: setWith(
               state.changes.originals,
-              rowId,
-              { ...state.changes.originals[rowId], ...changes },
+              action.rowId,
+              { ...state.changes.originals[action.rowId], ...changes },
               Object
             )
           }
@@ -60733,12 +60748,15 @@ function reducer(state, action) {
     }
     case "setRowStatus": {
       const { status } = payload;
+      if (status) {
+        return {
+          ...state,
+          statuses: setWith(state.statuses, action.rowId, status, Object)
+        };
+      }
       return {
         ...state,
-        changes: {
-          ...state.changes,
-          status: status ? setWith(state.changes.status, rowId, status, Object) : omit$1(state.changes.status, rowId)
-        }
+        statuses: omit$1(state.statuses, action.rowId)
       };
     }
     case "setRowErrors": {
@@ -60747,7 +60765,7 @@ function reducer(state, action) {
         ...state,
         changes: {
           ...state.changes,
-          errors: setWith(state.changes.errors, rowId, errors, Object)
+          errors: setWith(state.changes.errors, action.rowId, errors, Object)
         }
       };
     }
@@ -60758,10 +60776,10 @@ function reducer(state, action) {
         temporaryRows: state.temporaryRows.concat(value),
         changes: {
           ...state.changes,
-          rows: setWith(state.changes.rows, rowId, value, Object),
-          originals: setWith(state.changes.originals, rowId, value, Object)
+          rows: setWith(state.changes.rows, action.rowId, value, Object),
+          originals: setWith(state.changes.originals, action.rowId, value, Object)
         },
-        indexes: setWith(state.indexes, rowId, index2, Object)
+        indexes: setWith(state.indexes, action.rowId, index2, Object)
       };
     }
     case "forceValidate": {
@@ -60778,9 +60796,10 @@ function reducer(state, action) {
 function usePendingChangesState(handleSave, handleChange, handleDiscard, rowIdentityAccessor, validator) {
   const localization = useLocalization();
   const [state, dispatch] = React.useReducer(reducer, {
-    changes: { rows: {}, errors: {}, moveReasons: {}, originals: {}, status: {}, dirty: {} },
+    changes: { rows: {}, errors: {}, moveReasons: {}, originals: {}, dirty: {} },
     indexes: {},
-    temporaryRows: []
+    temporaryRows: [],
+    statuses: {}
   });
   function getRowValue(rowId) {
     var _a;
@@ -60808,7 +60827,7 @@ function usePendingChangesState(handleSave, handleChange, handleDiscard, rowIden
     return !!((_b = state.changes.errors[rowId]) == null ? void 0 : _b.row) || !!Object.keys(((_c = state.changes.errors[rowId]) == null ? void 0 : _c.cells) ?? {}).length;
   }
   function getRowStatus(rowId) {
-    return state.changes.status[rowId];
+    return state.statuses[rowId];
   }
   function setRowStatus(rowId, status) {
     dispatch({
@@ -60819,6 +60838,12 @@ function usePendingChangesState(handleSave, handleChange, handleDiscard, rowIden
       }
     });
   }
+  function showSavedStatus(rowId) {
+    setRowStatus(rowId, "saved");
+    setTimeout(() => {
+      setRowStatus(rowId, void 0);
+    }, DELAY_BEFORE_REMOVING_SAVE_STATUS);
+  }
   function insertTemporaryRow(data, rowIndex) {
     const newRowId = `${TEMPORARY_ROW_ID_PREFIX}${nanoid()}`;
     const value = {
@@ -60945,7 +60970,7 @@ function usePendingChangesState(handleSave, handleChange, handleDiscard, rowIden
               newState.changes.originals[row.id] = row.original;
               newState.changes.moveReasons[row.id] = { ...newState.changes.moveReasons[row.id] };
               newState.changes.rows[row.id] = { ...newState.changes.rows[row.id] };
-              newState.changes.status[row.id] = "errored";
+              newState.statuses[row.id] = "errored";
               newState.indexes[row.id] = index2;
               newState.changes.errors[row.id] = {
                 cells: cellErrors,
@@ -60986,7 +61011,7 @@ function usePendingChangesState(handleSave, handleChange, handleDiscard, rowIden
     }));
   }
   function hasSaved() {
-    return !!Object.values(state.changes.status).filter((value) => value === "saved").length;
+    return !!Object.values(state.statuses).filter((status) => status === "saved").length;
   }
   function hasChanges(rowId) {
     return rowId ? !!state.changes.rows[rowId] : !!Object.keys(state.changes.rows).length;
@@ -61025,10 +61050,7 @@ function usePendingChangesState(handleSave, handleChange, handleDiscard, rowIden
         }
         await handleSave(changeSet);
         complete(rowId2, table, rowChanges);
-        setRowStatus(rowId2, "saved");
-        setTimeout(() => {
-          setRowStatus(rowId2, void 0);
-        }, DELAY_BEFORE_REMOVING_SAVE_STATUS);
+        showSavedStatus(rowId2);
       } catch (error) {
         if (error instanceof ReferenceError || error instanceof TypeError || ((_a = error == null ? void 0 : error.response) == null ? void 0 : _a.status) >= 500) {
           console.error(error);
@@ -61211,7 +61233,8 @@ function RowMoveIndicator(props) {
   const { cell, cellRef, isActiveRow } = props;
   const { texts } = useLocalization();
   const [show, setShow] = React.useState(false);
-  const tableMeta = cell.getContext().table.options.meta;
+  const table = cell.getContext().table;
+  const tableMeta = table.options.meta;
   const columnMeta = cell.column.columnDef.meta ?? {};
   const moveReason = tableMeta.editing.getRowMoveReason(cell.row.id);
   React.useEffect(() => {
@@ -61239,7 +61262,15 @@ function RowMoveIndicator(props) {
     return null;
   }
   const { title, description } = getMessageFromReason(texts, moveReason);
-  return /* @__PURE__ */ React.createElement(Tooltip$3, { placement: "bottom", title: description.replace("[COLUMN]", columnMeta.header) }, /* @__PURE__ */ React.createElement("span", { "data-row-move-indicator": true }, /* @__PURE__ */ React.createElement(Icon$1, { name: "info", className: "-mt-0.5 mr-1 !h-4 !w-4 rounded-full bg-white !p-0 text-blue-500" }), title));
+  let columnHeader = columnMeta.header;
+  if (moveReason === "sorting") {
+    const sortedColumns = table.getState().sorting;
+    const sortedColumn = table.getColumn(sortedColumns[0].id);
+    if (sortedColumn) {
+      columnHeader = sortedColumn.columnDef.meta.header;
+    }
+  }
+  return /* @__PURE__ */ React.createElement(Tooltip$3, { placement: "bottom", title: description.replace("[COLUMN]", columnHeader) }, /* @__PURE__ */ React.createElement("span", { "data-row-move-indicator": true }, /* @__PURE__ */ React.createElement(Icon$1, { name: "info", className: "-mt-0.5 mr-1 !h-4 !w-4 rounded-full bg-white !p-0 text-blue-500" }), title));
 }
 function getMessageFromReason(texts, reason) {
   let title;
@@ -61408,10 +61439,17 @@ function EditingControlCell(props) {
   const handleFocus = useEditingCellAutofocus(props);
   const value = cell.getValue();
   const rowChanges = tableMeta.editing.getRowValue(cell.row.id);
+  const shouldRunUpdate = React.useRef(false);
   const hasNonTextControl = React.useMemo(() => {
     var _a;
     return typeof type === "function" && !!((_a = cellRef.current) == null ? void 0 : _a.querySelector('[data-taco="Select2"],[data-taco="switch"],[data-taco="checkbox"]'));
   }, [cellRef.current]);
+  useLazyEffect(() => {
+    if (hasNonTextControl && shouldRunUpdate.current) {
+      tableMeta.editing.onCellChanged(cell, rowIndex, value, true, false);
+      shouldRunUpdate.current = false;
+    }
+  }, [value]);
   const handleChange = React.useCallback(
     (nextValue) => {
       let hasChanged = false;
@@ -61428,9 +61466,7 @@ function EditingControlCell(props) {
       }
       if (hasChanged) {
         tableMeta.editing.setCellValue(cell, rowIndex, nextValue);
-        if (hasNonTextControl) {
-          requestAnimationFrame(() => tableMeta.editing.onCellChanged(cell, rowIndex, nextValue, true, false));
-        }
+        shouldRunUpdate.current = hasNonTextControl;
       }
     },
     [hasNonTextControl, cell.row.id, cell.column.id, cell.row.original, rowIndex, value, columnMeta.dataType]
@@ -61885,7 +61921,7 @@ function useTable3(props, ref) {
           removeRowChanges: (rowId) => table.meta.editing.discardChanges(rowId, table.instance),
           save: (rowId) => table.meta.editing.saveChanges(table.instance, rowId)
         };
-        if (props.onEditingCreate) {
+        if (props.onEditingCreate && instance.editing) {
           instance.editing.createRow = (row) => table.meta.editing.createRow(table.instance, row);
         }
       }
@@ -61894,7 +61930,7 @@ function useTable3(props, ref) {
   React.useEffect(() => {
     if (table.ref.current) {
       const instance = table.ref.current.instance;
-      if (table.meta.editing.isEnabled) {
+      if (table.meta.editing.isEnabled && instance.editing) {
         instance.editing.forceValidate = async () => await table.meta.editing.forceValidate(table.instance);
       }
     }