@economic/taco 2.49.0-server.1 → 2.49.0-server.3

package/dist/taco.cjs.development.js

@@ -4453,15 +4453,12 @@ function shouldTriggerShortcut(event, key) {
   }
   return event.key.toLowerCase() === keyOptions.key.toLowerCase();
 }
-function createShortcutKeyDownHandler(key, handler, stopPropagation, element) {
+function createShortcutKeyDownHandler(key, handler, stopPropagation) {
   if (stopPropagation === void 0) {
     stopPropagation = true;
   }
   return function (event) {
-    var dialog = document.querySelector('[role="dialog"]');
-    var isOutsideDialog = element && dialog && !dialog.contains(element);
-    if (event.target !== event.currentTarget && isElementInteractive(event.target) && !isPressingMetaKey(event) || isOutsideDialog // Avoid triggering shortcut if dialog is open and element is outside the dialog
-    ) {
+    if (event.target !== event.currentTarget && isElementInteractive(event.target) && !isPressingMetaKey(event)) {
       return;
     }
     var condition = shouldTriggerShortcut(event, key);
@@ -4482,11 +4479,11 @@ var isMacOs = function isMacOs() {
   return (_window = window) === null || _window === void 0 ? void 0 : _window.navigator.userAgent.includes('Mac');
 };
 
-var useGlobalKeyDown = function useGlobalKeyDown(shortcut, handler, element) {
+var useGlobalKeyDown = function useGlobalKeyDown(shortcut, handler) {
   React__default.useEffect(function () {
     var handleKeyDown;
     if (shortcut) {
-      handleKeyDown = createShortcutKeyDownHandler(shortcut, handler, false, element);
+      handleKeyDown = createShortcutKeyDownHandler(shortcut, handler, false);
       document.addEventListener('keydown', handleKeyDown);
     }
     return function () {
@@ -4509,8 +4506,13 @@ var Button = /*#__PURE__*/React.forwardRef(function Button(props, ref) {
   useGlobalKeyDown(shortcut, function (event) {
     var _internalRef$current;
     event === null || event === void 0 ? void 0 : event.preventDefault();
+    var dialog = document.querySelector('[role="dialog"]');
+    // Don't trigger the click on the button if it is outside of the dialog
+    if (dialog && !(dialog !== null && dialog !== void 0 && dialog.contains(internalRef.current))) {
+      return;
+    }
     (_internalRef$current = internalRef.current) === null || _internalRef$current === void 0 ? void 0 : _internalRef$current.click();
-  }, internalRef.current);
+  });
   var Tag = props.href ? 'a' : 'button';
   return /*#__PURE__*/React.createElement(Tag, Object.assign({}, otherProps, {
     href: disabled ? undefined : props.href,
@@ -8537,12 +8539,17 @@ var Content$8 = /*#__PURE__*/React.forwardRef(function MenuContent(props, ref) {
       if (child.props.shortcut) {
         shortcuts.push(createShortcutKeyDownHandler(child.props.shortcut, function (event) {
           event.preventDefault();
+          var dialog = document.querySelector('[role="dialog"]');
+          // Don't trigger the shortcut if it is outside of the dialog
+          if (dialog && !(dialog !== null && dialog !== void 0 && dialog.contains(internalRef.current))) {
+            return;
+          }
           menu === null || menu === void 0 ? void 0 : menu.open();
           setTimeout(function () {
             var _childrenRefs$current, _childrenRefs$current2;
             return (_childrenRefs$current = childrenRefs.current[index]) === null || _childrenRefs$current === void 0 ? void 0 : (_childrenRefs$current2 = _childrenRefs$current.current) === null || _childrenRefs$current2 === void 0 ? void 0 : _childrenRefs$current2.click();
           }, 1);
-        }, true, childrenRefs.current[index].current));
+        }));
       }
     });
     shortcuts.forEach(function (handler) {
@@ -10235,11 +10242,6 @@ var fixedForwardRef = React__default.forwardRef;
   TableFilterComparator[TableFilterComparator["HasAllOf"] = 12] = "HasAllOf";
   TableFilterComparator[TableFilterComparator["HasNoneOf"] = 13] = "HasNoneOf";
 })(exports.TableFilterComparator || (exports.TableFilterComparator = {}));
-(function (TableServerLoadAllState) {
-  TableServerLoadAllState[TableServerLoadAllState["Incomplete"] = 0] = "Incomplete";
-  TableServerLoadAllState[TableServerLoadAllState["Loading"] = 1] = "Loading";
-  TableServerLoadAllState[TableServerLoadAllState["Completed"] = 2] = "Completed";
-})(exports.TableServerLoadAllState || (exports.TableServerLoadAllState = {}));
 
 var dataTypes = {
   auto: {
@@ -10946,7 +10948,8 @@ function configureReactTableOptions(options, props, localization) {
     getExpandedRowModel: reactTable.getExpandedRowModel(),
     getGroupedRowModel: reactTable.getGroupedRowModel(),
     getRowId: getRowId,
-    groupedColumnMode: false
+    groupedColumnMode: false,
+    keepPinnedRows: false
   };
   if (tableOptions.enableColumnResizing) {
     tableOptions.columnResizeMode = 'onChange';
@@ -11821,9 +11824,10 @@ function useTableDataLoader(fetchPage, fetchAll, options) {
   var _lastUsedSorting = React__default.useRef([]);
   var _lastUsedFilters = React__default.useRef([]);
   var _lastUsedSearch = React__default.useRef();
+  var _lastUsedHiddenColumns = React__default.useRef([]);
   var _lastUsedPageIndex = React__default.useRef();
   var _forceReset = React__default.useRef(false);
-  var loadPage = function loadPage(pageIndex, sorting, filters) {
+  var loadPage = function loadPage(pageIndex, sorting, filters, hiddenColumns) {
     try {
       var reset = false;
       // sorting or filters changed, reset everything
@@ -11845,9 +11849,10 @@ function useTableDataLoader(fetchPage, fetchAll, options) {
       _lastUsedSorting.current = sorting;
       // set the filters so we can track if it changed between loads
       _lastUsedFilters.current = filters;
+      _lastUsedHiddenColumns.current = hiddenColumns;
       var _temp = _finallyRethrows(function () {
         return _catch(function () {
-          return Promise.resolve(fetchPage(pageIndex, pageSize, sorting, filters)).then(function (response) {
+          return Promise.resolve(fetchPage(pageIndex, pageSize, sorting, filters, hiddenColumns)).then(function (response) {
             // update state, here we do some "magic" to support "load in place"
             setData(function (currentData) {
               var _nextData;
@@ -11877,14 +11882,15 @@ function useTableDataLoader(fetchPage, fetchAll, options) {
       return Promise.reject(e);
     }
   };
-  var loadAll = function loadAll(sorting, filters) {
+  var loadAll = function loadAll(sorting, filters, hiddenColumns) {
     try {
       // set the sorting so we can track if it changed between loads
       _lastUsedSorting.current = sorting;
       // set the filters so we can track if it changed between loads
       _lastUsedFilters.current = filters;
+      _lastUsedHiddenColumns.current = hiddenColumns;
       var _temp2 = _catch(function () {
-        return Promise.resolve(fetchAll(sorting, filters)).then(function (response) {
+        return Promise.resolve(fetchAll(sorting, filters, hiddenColumns)).then(function (response) {
           length.current = response.length;
           setData(function () {
             var nextData;
@@ -11910,11 +11916,11 @@ function useTableDataLoader(fetchPage, fetchAll, options) {
       _forceReset.current = true;
       if (_lastUsedSearch.current) {
         // we're searching, which means we need to refetch all with the correct sorting applied
-        return loadAll(_lastUsedSorting.current, _lastUsedFilters.current);
+        return loadAll(_lastUsedSorting.current, _lastUsedFilters.current, _lastUsedHiddenColumns.current);
       } else {
         var _lastUsedPageIndex$cu;
         // load the last page that we scrolled to
-        return loadPage((_lastUsedPageIndex$cu = _lastUsedPageIndex.current) !== null && _lastUsedPageIndex$cu !== void 0 ? _lastUsedPageIndex$cu : 0, _lastUsedSorting.current, _lastUsedFilters.current);
+        return loadPage((_lastUsedPageIndex$cu = _lastUsedPageIndex.current) !== null && _lastUsedPageIndex$cu !== void 0 ? _lastUsedPageIndex$cu : 0, _lastUsedSorting.current, _lastUsedFilters.current, _lastUsedHiddenColumns.current);
       }
     } catch (e) {
       return Promise.reject(e);
@@ -11926,11 +11932,11 @@ function useTableDataLoader(fetchPage, fetchAll, options) {
     try {
       if (_lastUsedSearch.current) {
         // we're searching, which means we need to refetch all with the correct sorting applied
-        return loadAll(sorting, _lastUsedFilters.current);
+        return loadAll(sorting, _lastUsedFilters.current, _lastUsedHiddenColumns.current);
       } else {
         var _lastUsedPageIndex$cu2;
         // load the last page that we scrolled to
-        return loadPage((_lastUsedPageIndex$cu2 = _lastUsedPageIndex.current) !== null && _lastUsedPageIndex$cu2 !== void 0 ? _lastUsedPageIndex$cu2 : 0, sorting, _lastUsedFilters.current);
+        return loadPage((_lastUsedPageIndex$cu2 = _lastUsedPageIndex.current) !== null && _lastUsedPageIndex$cu2 !== void 0 ? _lastUsedPageIndex$cu2 : 0, sorting, _lastUsedFilters.current, _lastUsedHiddenColumns.current);
       }
     } catch (e) {
       return Promise.reject(e);
@@ -11940,11 +11946,11 @@ function useTableDataLoader(fetchPage, fetchAll, options) {
     try {
       if (_lastUsedSearch.current) {
         // we're searching, which means we need to refetch all with the correct sorting applied
-        return loadAll(_lastUsedSorting.current, filters);
+        return loadAll(_lastUsedSorting.current, filters, _lastUsedHiddenColumns.current);
       } else {
         var _lastUsedPageIndex$cu3;
         // load the last page that we scrolled to
-        return loadPage((_lastUsedPageIndex$cu3 = _lastUsedPageIndex.current) !== null && _lastUsedPageIndex$cu3 !== void 0 ? _lastUsedPageIndex$cu3 : 0, _lastUsedSorting.current, filters);
+        return loadPage((_lastUsedPageIndex$cu3 = _lastUsedPageIndex.current) !== null && _lastUsedPageIndex$cu3 !== void 0 ? _lastUsedPageIndex$cu3 : 0, _lastUsedSorting.current, filters, _lastUsedHiddenColumns.current);
       }
     } catch (e) {
       return Promise.reject(e);
@@ -11973,7 +11979,7 @@ function useTableDataLoader(fetchPage, fetchAll, options) {
   }, invalidate];
 }
 
-function useTableServerLoading(length, loadPage, loadAll, pages, pageSize, _experimentalDataLoader2) {
+function useTableServerLoading(length, data, loadPage, loadAll, pages, pageSize, _experimentalDataLoader2) {
   if (pageSize === void 0) {
     pageSize = DEFAULT_PAGE_SIZE;
   }
@@ -11984,9 +11990,18 @@ function useTableServerLoading(length, loadPage, loadAll, pages, pageSize, _expe
   var _React$useState = React__default.useState(false),
     isReady = _React$useState[0],
     setReady = _React$useState[1];
-  var _React$useState2 = React__default.useState(exports.TableServerLoadAllState.Incomplete),
-    loadAllStatus = _React$useState2[0],
-    setLoadedStatus = _React$useState2[1];
+  var _React$useState2 = React__default.useState(false),
+    loading = _React$useState2[0],
+    setLoading = _React$useState2[1];
+  var hasLoadedAll = React__default.useMemo(function () {
+    var _data$some;
+    if (data.length !== length || !!((_data$some = data.some) !== null && _data$some !== void 0 && _data$some.call(data, function (x) {
+      return x === undefined;
+    }))) {
+      return false;
+    }
+    return true;
+  }, [data, length]);
   var _loadPage;
   var _loadAll;
   var _loadAllIfNeeded;
@@ -11999,7 +12014,6 @@ function useTableServerLoading(length, loadPage, loadAll, pages, pageSize, _expe
         var _temp = function () {
           if (typeof loadPage === 'function') {
             return Promise.resolve(loadPage.apply(void 0, args)).then(function () {
-              setLoadedStatus(exports.TableServerLoadAllState.Incomplete);
               setReady(true);
             });
           }
@@ -12018,9 +12032,9 @@ function useTableServerLoading(length, loadPage, loadAll, pages, pageSize, _expe
       try {
         var _temp2 = function () {
           if (typeof loadAll === 'function') {
-            setLoadedStatus(exports.TableServerLoadAllState.Loading);
+            setLoading(true);
             return Promise.resolve(loadAll.apply(void 0, args)).then(function () {
-              setLoadedStatus(exports.TableServerLoadAllState.Completed);
+              setLoading(false);
               setReady(true);
             });
           }
@@ -12036,7 +12050,7 @@ function useTableServerLoading(length, loadPage, loadAll, pages, pageSize, _expe
       }
       try {
         var _temp3 = function () {
-          if (loadAllStatus === exports.TableServerLoadAllState.Incomplete) {
+          if (!hasLoadedAll) {
             var _loadAll2;
             return Promise.resolve((_loadAll2 = _loadAll) === null || _loadAll2 === void 0 ? void 0 : _loadAll2.apply(void 0, args)).then(function () {});
           }
@@ -12055,7 +12069,7 @@ function useTableServerLoading(length, loadPage, loadAll, pages, pageSize, _expe
     loadPage: _loadPage,
     loadAll: _loadAll,
     loadAllIfNeeded: _loadAllIfNeeded,
-    loadAllStatus: loadAllStatus,
+    loading: loading,
     pageSize: pageSize,
     pageCount: pageCount,
     _experimentalDataLoader2: _experimentalDataLoader2
@@ -12243,7 +12257,7 @@ function useTableRowSelectionListener(table, onRowSelect) {
      * we only need to know if selection was enabled or disabled, because enableRowSelection function
      * will be applied directly to particular rows.
      */
-  }, [!!table.options.enableRowSelection, state]);
+  }, [!!table.options.enableRowSelection, JSON.stringify(state)]);
 }
 
 function useTableSearchListener(table) {
@@ -12269,7 +12283,7 @@ function useTableSearchListener(table) {
     if (meta.search.isEnabled) {
       resetHighlightedColumnIndexes(query, table, localization);
     }
-  }, [meta.server.loadAllStatus, meta.search.isEnabled, meta.search.enableGlobalFilter, table.getRowModel().rows.length, query, JSON.stringify(table.getState().sorting)]);
+  }, [meta.server.loading, meta.search.isEnabled, meta.search.enableGlobalFilter, table.getRowModel().rows.length, query, JSON.stringify(table.getState().sorting)]);
 }
 
 function useTableSettingsListener(table, onChangeSettings) {
@@ -12361,9 +12375,9 @@ function useTableServerLoadingListener(table, loadPage) {
     if (loadPage) {
       var sorting = table.getState().sorting;
       var columnFilters = table.getState().columnFilters;
-      var search = meta.search.enableGlobalFilter ? table.getState().globalFilter : undefined;
       var hiddenColumns = getHiddenColumns(table.getState().columnVisibility);
-      loadPage(0, sorting, columnFilters, search, hiddenColumns);
+      var search = meta.search.enableGlobalFilter ? table.getState().globalFilter : undefined;
+      loadPage(0, sorting, columnFilters, hiddenColumns, search);
     }
   }, []);
 }
@@ -12427,7 +12441,7 @@ function useTableManager(props, meta, internalColumns) {
   var rowHeight = useTableRowHeight(options.enableRowHeight, settings.rowHeight);
   var rowSelection = useTableRowSelection(!!options.enableRowSelection);
   var search = useTableSearch(options.enableSearch, props.onChangeSearch, settings.excludeUnmatchedRecordsInSearch);
-  var server = useTableServerLoading(length, props.loadPage, props.loadAll, props.pages, props.pageSize, props._experimentalDataLoader2);
+  var server = useTableServerLoading(length, data, props.loadPage, props.loadAll, props.pages, props.pageSize, props._experimentalDataLoader2);
   // TODO: memoise
   // convert jsx column components into valid table columns
   var _mapTableChildrenToCo = mapTableChildrenToColumns(props, settings, options, internalColumns, localization),
@@ -12703,7 +12717,7 @@ function useTableGlobalShortcuts(table, tableRef, scrollToIndex) {
     };
   },
   // scrollToIndex function changes when row count changes, so it is important to update handlers
-  [tableRef.current, tableMeta.rowActive.rowActiveIndex, scrollToIndex]);
+  [tableRef.current, tableMeta.length, tableMeta.rowActive.rowActiveIndex, scrollToIndex]);
 }
 
 function useTableRef(table, ref) {
@@ -12838,7 +12852,7 @@ function RowWithServerLoading(props) {
       var hiddenColumns = getHiddenColumns(props.table.getState().columnVisibility);
       timeout = setTimeout(function () {
         var _tableMeta$server$loa, _tableMeta$server;
-        (_tableMeta$server$loa = (_tableMeta$server = tableMeta.server).loadPage) === null || _tableMeta$server$loa === void 0 ? void 0 : _tableMeta$server$loa.call(_tableMeta$server, pageIndex, sorting, filters, tableMeta.search.enableGlobalFilter ? search : undefined, hiddenColumns);
+        (_tableMeta$server$loa = (_tableMeta$server = tableMeta.server).loadPage) === null || _tableMeta$server$loa === void 0 ? void 0 : _tableMeta$server$loa.call(_tableMeta$server, pageIndex, sorting, filters, hiddenColumns, tableMeta.search.enableGlobalFilter ? search : undefined);
       }, DELAY_BEFORE_LOAD_MS$1);
     }
     return function () {
@@ -13316,7 +13330,7 @@ function Header$4(context) {
         if (tableMeta.server.loadAllIfNeeded) {
           var hiddenColumns = getHiddenColumns(table.getState().columnVisibility);
           // don't pass the search query because we need all data - not filtered data
-          return Promise.resolve(tableMeta.server.loadAllIfNeeded(table.getState().sorting, table.getState().columnFilters, tableMeta.search.enableGlobalFilter ? table.getState().globalFilter : undefined, hiddenColumns)).then(function () {});
+          return Promise.resolve(tableMeta.server.loadAllIfNeeded(table.getState().sorting, table.getState().columnFilters, hiddenColumns, tableMeta.search.enableGlobalFilter ? table.getState().globalFilter : undefined)).then(function () {});
         }
       }();
       // load all data if that is possible
@@ -13332,7 +13346,7 @@ function Header$4(context) {
     className: "hover:border-blue !-mt-px",
     checked: isAllRowsSelected,
     indeterminate: isSomeRowsSelected && !isAllRowsSelected,
-    loading: tableMeta.server.loadAllStatus === exports.TableServerLoadAllState.Loading,
+    loading: tableMeta.server.loading,
     onChange: handleChange
   }));
 }
@@ -13390,7 +13404,7 @@ function Cell$3(context) {
                 if (tableMeta.server.loadAllIfNeeded) {
                   var hiddenColumns = getHiddenColumns(table.getState().columnVisibility);
                   // don't pass the search query because we need all data - not filtered data
-                  return Promise.resolve(tableMeta.server.loadAllIfNeeded(table.getState().sorting, table.getState().columnFilters, tableMeta.search.enableGlobalFilter ? table.getState().globalFilter : undefined, hiddenColumns)).then(function () {});
+                  return Promise.resolve(tableMeta.server.loadAllIfNeeded(table.getState().sorting, table.getState().columnFilters, hiddenColumns, tableMeta.search.enableGlobalFilter ? table.getState().globalFilter : undefined)).then(function () {});
                 }
               }();
               return _temp3 && _temp3.then ? _temp3.then(_temp4) : _temp4(_temp3);
@@ -14575,8 +14589,7 @@ function Summary(props) {
     count = /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement("strong", null, new Intl.NumberFormat(locale).format(rowsSelectedLength)), "\xA0", texts.table.footer.summary.count, "\xA0", /*#__PURE__*/React__default.createElement("strong", null, new Intl.NumberFormat(locale).format(length)));
   } else if (!tableMeta.server.isEnabled && ((_table$getState$colum = table.getState().columnFilters) !== null && _table$getState$colum !== void 0 && _table$getState$colum.length ||
   // filtered data
-  !!table.getState().globalFilter && table.options.enableGlobalFilter) // search with hide enabled
-  ) {
+  !!table.getState().globalFilter && table.options.enableGlobalFilter)) {
     label = texts.table.footer.summary.records;
     count = /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement("strong", null, new Intl.NumberFormat(locale).format(currentLength)), "\xA0", texts.table.footer.summary.count, "\xA0", /*#__PURE__*/React__default.createElement("strong", null, new Intl.NumberFormat(locale).format(length)));
   } else {
@@ -14889,9 +14902,9 @@ function Search$1(props) {
       var _temp = function () {
         if (tableMeta.server.loadAllIfNeeded && !tableMeta.server._experimentalDataLoader2) {
           // don't pass the search query because we need all data - not filtered data
-          return Promise.resolve(tableMeta.server.loadAllIfNeeded(table.getState().sorting, table.getState().columnFilters,
+          return Promise.resolve(tableMeta.server.loadAllIfNeeded(table.getState().sorting, table.getState().columnFilters, hiddenColumns,
           // the old data loader doesn't have server side search
-          undefined, hiddenColumns)).then(function () {});
+          undefined)).then(function () {});
         }
       }();
       // load all data if that is possible
@@ -14974,7 +14987,7 @@ function Search$1(props) {
   return /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement(SearchInput2, {
     findCurrent: tableMeta.search.currentHighlightColumnIndex !== undefined ? tableMeta.search.currentHighlightColumnIndex + 1 : null,
     findTotal: (_tableMeta$search$hig2 = (_tableMeta$search$hig3 = tableMeta.search.highlightedColumnIndexes) === null || _tableMeta$search$hig3 === void 0 ? void 0 : _tableMeta$search$hig3.length) !== null && _tableMeta$search$hig2 !== void 0 ? _tableMeta$search$hig2 : null,
-    loading: tableMeta.server._experimentalDataLoader2 ? loading : tableMeta.server.loadAllStatus === exports.TableServerLoadAllState.Loading,
+    loading: tableMeta.server._experimentalDataLoader2 ? loading : tableMeta.server.loading,
     name: "table-search",
     onClickFindPrevious: handlePreviousResult,
     onClickFindNext: handleNextResult,
@@ -17188,7 +17201,7 @@ function Print$1(props) {
         if (tableMeta.server.isEnabled && tableMeta.server.loadAllIfNeeded) {
           var hiddenColumns = getHiddenColumns(table.getState().columnVisibility);
           var _temp = _catch(function () {
-            return Promise.resolve(tableMeta.server.loadAllIfNeeded(table.getState().sorting, table.getState().columnFilters, tableMeta.search.enableGlobalFilter ? table.getState().globalFilter : undefined, hiddenColumns)).then(function () {});
+            return Promise.resolve(tableMeta.server.loadAllIfNeeded(table.getState().sorting, table.getState().columnFilters, hiddenColumns, tableMeta.search.enableGlobalFilter ? table.getState().globalFilter : undefined)).then(function () {});
           }, function (error) {
             var errorMessage = texts.table.print.error + ": " + error;
             console.error(errorMessage);
@@ -19823,7 +19836,28 @@ function reducer$2(state, action) {
       return state;
   }
 }
-function usePendingChangesState(handleSave, handleChange, rowIdentityAccessor, validator) {
+function usePendingChangesState(handleSave, handleChange, handleDiscard, rowIdentityAccessor, validator) {
+  var discardChanges = function discardChanges(rowId, table) {
+    try {
+      // remove any new rows from pinned state before discarding them
+      table.resetRowPinning(true);
+      dispatch({
+        type: 'removeRow',
+        rowId: rowId,
+        payload: {
+          rowIdentityAccessor: rowIdentityAccessor
+        }
+      });
+      var _temp8 = function () {
+        if (typeof handleDiscard === 'function') {
+          return Promise.resolve(handleDiscard()).then(function () {});
+        }
+      }();
+      return Promise.resolve(_temp8 && _temp8.then ? _temp8.then(function () {}) : void 0);
+    } catch (e) {
+      return Promise.reject(e);
+    }
+  };
   var saveChanges = function saveChanges(table, rowId) {
     if (rowId === void 0) {
       rowId = undefined;
@@ -19845,12 +19879,13 @@ function usePendingChangesState(handleSave, handleChange, rowIdentityAccessor, v
           function _temp6(_result) {
             return _exit ? _result : Promise.resolve(handleSave(changeSet)).then(function () {
               // cleanup changes, we don't need them after saving
-              discardChanges(rowId, table);
-              // show the saved status, then remove it after a delay
-              setRowStatus(rowId, 'saved');
-              setTimeout(function () {
-                setRowStatus(rowId, undefined);
-              }, DELAY_BEFORE_REMOVING_SAVE_STATUS);
+              return Promise.resolve(discardChanges(rowId, table)).then(function () {
+                // show the saved status, then remove it after a delay
+                setRowStatus(rowId, 'saved');
+                setTimeout(function () {
+                  setRowStatus(rowId, undefined);
+                }, DELAY_BEFORE_REMOVING_SAVE_STATUS);
+              });
             });
           }
           var rowChanges = (_changes$rowId = changes[rowId]) !== null && _changes$rowId !== void 0 ? _changes$rowId : {};
@@ -20128,17 +20163,6 @@ function usePendingChangesState(handleSave, handleChange, rowIdentityAccessor, v
   function hasChanges(rowId) {
     return rowId ? !!state.changes.rows[rowId] : !!Object.keys(state.changes.rows).length;
   }
-  function discardChanges(rowId, table) {
-    // remove any new rows from pinned state before discarding them
-    table.resetRowPinning(true);
-    dispatch({
-      type: 'removeRow',
-      rowId: rowId,
-      payload: {
-        rowIdentityAccessor: rowIdentityAccessor
-      }
-    });
-  }
   return {
     // row
     getRowValue: getRowValue,
@@ -20165,7 +20189,7 @@ function usePendingChangesState(handleSave, handleChange, rowIdentityAccessor, v
   };
 }
 
-function useTableEditing(isEnabled, handleSave, handleChange, handleCreate, rowIdentityAccessor, validator) {
+function useTableEditing(isEnabled, handleSave, handleChange, handleCreate, handleDiscard, rowIdentityAccessor, validator) {
   var createRow = function createRow(table, scrollToIndex, row) {
     try {
       var _temp2 = function _temp2(_result) {
@@ -20233,7 +20257,7 @@ function useTableEditing(isEnabled, handleSave, handleChange, handleCreate, rowI
   var _React$useState3 = React__default.useState(undefined),
     lastFocusedCellIndex = _React$useState3[0],
     setLastFocusedCellIndex = _React$useState3[1];
-  var pendingChangesFns = usePendingChangesState(handleSave, handleChange, rowIdentityAccessor, validator);
+  var pendingChangesFns = usePendingChangesState(handleSave, handleChange, handleDiscard, rowIdentityAccessor, validator);
   function toggleEditing(enabled, table, scrollToIndex, doSave) {
     if (doSave === void 0) {
       doSave = true;
@@ -20518,7 +20542,7 @@ function EditingControlCell(props) {
     var _cellRef$current;
     return typeof type === 'function' && !!((_cellRef$current = cellRef.current) !== null && _cellRef$current !== void 0 && _cellRef$current.querySelector('[data-taco="Select2"],[data-taco="switch"],[data-taco="checkbox"]'));
   }, [cellRef.current]);
-  var handleChange = function handleChange(nextValue) {
+  var handleChange = React__default.useCallback(function (nextValue) {
     if (nextValue !== value) {
       tableMeta.editing.setCellValue(cell, rowIndex, nextValue);
       if (hasNonTextControl) {
@@ -20527,17 +20551,17 @@ function EditingControlCell(props) {
         });
       }
     }
-  };
-  function blur() {
+  }, [hasNonTextControl, cell.row.id, cell.column.id, cell.row.original, rowIndex, value]);
+  var blur = React__default.useCallback(function blur() {
     tableMeta.editing.toggleDetailedMode(false);
     tableMeta.editing.onCellChanged(cell, rowIndex, undefined, !hasNonTextControl);
-  }
-  var handleBlur = function handleBlur(event) {
+  }, [hasNonTextControl, cell.row.id, cell.column.id, cell.row.original, rowIndex]);
+  var handleBlur = React__default.useCallback(function (event) {
     if (isElementInsideOrTriggeredFromContainer(event.relatedTarget, event.currentTarget)) {
       return;
     }
     blur();
-  };
+  }, [blur]);
   // ensure that blur runs when the cell gets unmounted (when vertically arrow key navigating)
   React__default.useEffect(function () {
     var ref = cellRef.current;
@@ -20935,7 +20959,7 @@ var RENDERERS$1 = {
   cell: Cell$5
 };
 function useTable3(props, ref) {
-  var editing = useTableEditing(props.enableEditing, props.onEditingSave, props.onEditingChange, props.onEditingCreate, props.rowIdentityAccessor, props.validator);
+  var editing = useTableEditing(props.enableEditing, props.onEditingSave, props.onEditingChange, props.onEditingCreate, props.onEditingDiscard, props.rowIdentityAccessor, props.validator);
   var creationEnabled = editing.isEnabled && !!props.onEditingCreate;
   // this gives me the performance heeby jeebies, but can't think of a better way to internalise the state
   var data = React__default.useMemo(function () {
@@ -21048,6 +21072,7 @@ function Alert$1(props) {
       // Add space before and after `messageAnd` text
       links.push(" " + validationTexts.alert.messageAnd + " ");
     }
+    // note: if this row click functionality is removed, indexes can be removed from useEditingState
     var handleClick = function handleClick() {
       // if row is visible
       if (pendingChangeWithError.index > -1) {
@@ -23254,7 +23279,7 @@ Navigation2.Content = Content$a;
 
 var DATASET_SIZE_MULTIPLIER = 15;
 function useTableDataLoader2(fetchPage, fetchAll, options) {
-  var loadPage = function loadPage(pageIndex, sorting, filters, search, hiddenColumns, reset) {
+  var loadPage = function loadPage(pageIndex, sorting, filters, hiddenColumns, search, reset) {
     if (reset === void 0) {
       reset = false;
     }
@@ -23274,7 +23299,7 @@ function useTableDataLoader2(fetchPage, fetchAll, options) {
       _pendingPageRequests.current[pageIndex] = true;
       var _temp2 = _catch(function () {
         _lastRequestId.current = requestId;
-        return Promise.resolve(fetchPage(pageIndex, pageSize, sorting, filters, search, hiddenColumns)).then(function (response) {
+        return Promise.resolve(fetchPage(pageIndex, pageSize, sorting, filters, hiddenColumns, search)).then(function (response) {
           length.current = response.length;
           // update state, here we do some "magic" to support "load in place"
           setData(function (currentData) {
@@ -23354,7 +23379,7 @@ function useTableDataLoader2(fetchPage, fetchAll, options) {
   var _lastUsedFilters = React__default.useRef([]);
   var _lastUsedSearch = React__default.useRef();
   var _lastUsedHiddenColumns = React__default.useRef([]);
-  var loadAll = function loadAll(sorting, filters, search, hiddenColumns) {
+  var loadAll = function loadAll(sorting, filters, hiddenColumns, search) {
     try {
       // set values so we can track if they changed between loads
       _lastUsedSorting.current = sorting;
@@ -23363,7 +23388,7 @@ function useTableDataLoader2(fetchPage, fetchAll, options) {
       _lastUsedHiddenColumns.current = hiddenColumns;
       var _temp = _finallyRethrows(function () {
         return _catch(function () {
-          return Promise.resolve(fetchAll(sorting, filters, search, hiddenColumns)).then(function (response) {
+          return Promise.resolve(fetchAll(sorting, filters, hiddenColumns, search)).then(function (response) {
             length.current = response.length;
             var pages = [];
             var cache = {};
@@ -23396,7 +23421,7 @@ function useTableDataLoader2(fetchPage, fetchAll, options) {
       // reset stuff
       _pendingPageRequests.current = {};
       // load the current page again
-      return loadPage(getCurrentPage(data.pages), _lastUsedSorting.current, _lastUsedFilters.current, _lastUsedSearch.current, _lastUsedHiddenColumns.current, true);
+      return loadPage(getCurrentPage(data.pages), _lastUsedSorting.current, _lastUsedFilters.current, _lastUsedHiddenColumns.current, _lastUsedSearch.current, true);
     } catch (e) {
       return Promise.reject(e);
     }
@@ -23405,7 +23430,7 @@ function useTableDataLoader2(fetchPage, fetchAll, options) {
     try {
       // reset before loading the current page
       _pendingPageRequests.current = {};
-      return loadPage(getCurrentPage(data.pages), sorting, _lastUsedFilters.current, _lastUsedSearch.current, _lastUsedHiddenColumns.current, true);
+      return loadPage(getCurrentPage(data.pages), sorting, _lastUsedFilters.current, _lastUsedHiddenColumns.current, _lastUsedSearch.current, true);
     } catch (e) {
       return Promise.reject(e);
     }
@@ -23414,7 +23439,7 @@ function useTableDataLoader2(fetchPage, fetchAll, options) {
     try {
       // reset before loading the current page
       _pendingPageRequests.current = {};
-      return loadPage(0, _lastUsedSorting.current, filters, _lastUsedSearch.current, hiddenColumns, true);
+      return loadPage(0, _lastUsedSorting.current, filters, hiddenColumns, _lastUsedSearch.current, true);
     } catch (e) {
       return Promise.reject(e);
     }
@@ -23423,7 +23448,7 @@ function useTableDataLoader2(fetchPage, fetchAll, options) {
     try {
       // reset before loading the current page
       _pendingPageRequests.current = {};
-      return loadPage(0, _lastUsedSorting.current, _lastUsedFilters.current, search, hiddenColumns, true);
+      return loadPage(0, _lastUsedSorting.current, _lastUsedFilters.current, hiddenColumns, search, true);
     } catch (e) {
       return Promise.reject(e);
     }