@teselagen/ui 0.5.23-beta.29 → 0.5.23-beta.30

package/DataTable/utils/queryParams.d.ts

@@ -16,13 +16,13 @@ export function makeDataTableHandlers({ setNewParams, defaults, onlyOneFilter }:
     defaults: any;
     onlyOneFilter: any;
 }): {
-    setSearchTerm: (searchTerm: any, currentParams: any) => void;
-    addFilters: (newFilters: any, currentParams: any) => void;
+    setSearchTerm: (searchTerm: any) => void;
+    addFilters: (newFilters: any) => void;
     clearFilters: (additionalFilterKeys?: any[]) => void;
-    removeSingleFilter: (filterOn: any, currentParams: any) => void;
-    setPageSize: (pageSize: any, currentParams: any) => void;
-    setPage: (page: any, currentParams: any) => void;
-    setOrder: (order: any, isRemove: any, shiftHeld: any, currentParams: any) => void;
+    removeSingleFilter: (filterOn: any) => any;
+    setPageSize: (pageSize: any) => any;
+    setPage: (page: any) => void;
+    setOrder: (order: any, isRemove: any, shiftHeld: any) => any;
     setNewParams: any;
 };
 export function getQueryParams({ currentParams, urlConnected, defaults, schema, isInfinite, entities, isLocalCall, additionalFilter, additionalOrFilter, doNotCoercePageSize, noOrderError, isCodeModel, ownProps }: {

package/index.cjs.js

@@ -3123,89 +3123,63 @@ function getAugmentedNamespace(n2) {
 }
 __name(getAugmentedNamespace, "getAugmentedNamespace");
 var propTypes$1 = { exports: {} };
-var ReactPropTypesSecret_1;
-var hasRequiredReactPropTypesSecret;
-function requireReactPropTypesSecret() {
-  if (hasRequiredReactPropTypesSecret)
-    return ReactPropTypesSecret_1;
-  hasRequiredReactPropTypesSecret = 1;
-  var ReactPropTypesSecret = "SECRET_DO_NOT_PASS_THIS_OR_YOU_WILL_BE_FIRED";
-  ReactPropTypesSecret_1 = ReactPropTypesSecret;
-  return ReactPropTypesSecret_1;
-}
-__name(requireReactPropTypesSecret, "requireReactPropTypesSecret");
-var factoryWithThrowingShims;
-var hasRequiredFactoryWithThrowingShims;
-function requireFactoryWithThrowingShims() {
-  if (hasRequiredFactoryWithThrowingShims)
-    return factoryWithThrowingShims;
-  hasRequiredFactoryWithThrowingShims = 1;
-  var ReactPropTypesSecret = requireReactPropTypesSecret();
-  function emptyFunction() {
-  }
-  __name(emptyFunction, "emptyFunction");
-  function emptyFunctionWithReset() {
-  }
-  __name(emptyFunctionWithReset, "emptyFunctionWithReset");
-  emptyFunctionWithReset.resetWarningCache = emptyFunction;
-  factoryWithThrowingShims = /* @__PURE__ */ __name(function() {
-    function shim(props, propName, componentName, location2, propFullName, secret) {
-      if (secret === ReactPropTypesSecret) {
-        return;
-      }
-      var err = new Error(
-        "Calling PropTypes validators directly is not supported by the `prop-types` package. Use PropTypes.checkPropTypes() to call them. Read more at http://fb.me/use-check-prop-types"
-      );
-      err.name = "Invariant Violation";
-      throw err;
+var ReactPropTypesSecret$1 = "SECRET_DO_NOT_PASS_THIS_OR_YOU_WILL_BE_FIRED";
+var ReactPropTypesSecret_1 = ReactPropTypesSecret$1;
+var ReactPropTypesSecret = ReactPropTypesSecret_1;
+function emptyFunction() {
+}
+__name(emptyFunction, "emptyFunction");
+function emptyFunctionWithReset() {
+}
+__name(emptyFunctionWithReset, "emptyFunctionWithReset");
+emptyFunctionWithReset.resetWarningCache = emptyFunction;
+var factoryWithThrowingShims = /* @__PURE__ */ __name(function() {
+  function shim(props, propName, componentName, location2, propFullName, secret) {
+    if (secret === ReactPropTypesSecret) {
+      return;
     }
-    __name(shim, "shim");
-    shim.isRequired = shim;
-    function getShim() {
-      return shim;
-    }
-    __name(getShim, "getShim");
-    var ReactPropTypes = {
-      array: shim,
-      bigint: shim,
-      bool: shim,
-      func: shim,
-      number: shim,
-      object: shim,
-      string: shim,
-      symbol: shim,
-      any: shim,
-      arrayOf: getShim,
-      element: shim,
-      elementType: shim,
-      instanceOf: getShim,
-      node: shim,
-      objectOf: getShim,
-      oneOf: getShim,
-      oneOfType: getShim,
-      shape: getShim,
-      exact: getShim,
-      checkPropTypes: emptyFunctionWithReset,
-      resetWarningCache: emptyFunction
-    };
-    ReactPropTypes.PropTypes = ReactPropTypes;
-    return ReactPropTypes;
-  }, "factoryWithThrowingShims");
-  return factoryWithThrowingShims;
-}
-__name(requireFactoryWithThrowingShims, "requireFactoryWithThrowingShims");
-var hasRequiredPropTypes;
-function requirePropTypes() {
-  if (hasRequiredPropTypes)
-    return propTypes$1.exports;
-  hasRequiredPropTypes = 1;
-  {
-    propTypes$1.exports = requireFactoryWithThrowingShims()();
+    var err = new Error(
+      "Calling PropTypes validators directly is not supported by the `prop-types` package. Use PropTypes.checkPropTypes() to call them. Read more at http://fb.me/use-check-prop-types"
+    );
+    err.name = "Invariant Violation";
+    throw err;
   }
-  return propTypes$1.exports;
+  __name(shim, "shim");
+  shim.isRequired = shim;
+  function getShim() {
+    return shim;
+  }
+  __name(getShim, "getShim");
+  var ReactPropTypes = {
+    array: shim,
+    bigint: shim,
+    bool: shim,
+    func: shim,
+    number: shim,
+    object: shim,
+    string: shim,
+    symbol: shim,
+    any: shim,
+    arrayOf: getShim,
+    element: shim,
+    elementType: shim,
+    instanceOf: getShim,
+    node: shim,
+    objectOf: getShim,
+    oneOf: getShim,
+    oneOfType: getShim,
+    shape: getShim,
+    exact: getShim,
+    checkPropTypes: emptyFunctionWithReset,
+    resetWarningCache: emptyFunction
+  };
+  ReactPropTypes.PropTypes = ReactPropTypes;
+  return ReactPropTypes;
+}, "factoryWithThrowingShims");
+{
+  propTypes$1.exports = factoryWithThrowingShims();
 }
-__name(requirePropTypes, "requirePropTypes");
-var propTypesExports = requirePropTypes();
+var propTypesExports = propTypes$1.exports;
 const PropTypes$1 = /* @__PURE__ */ getDefaultExportFromCjs(propTypesExports);
 function __awaiter(thisArg, _arguments, P2, generator) {
   function adopt(value) {
@@ -13496,7 +13470,7 @@ var reactList = {};
 (function(exports2) {
   (function(global2, factory) {
     {
-      factory(exports2, requirePropTypes(), React$1);
+      factory(exports2, propTypesExports, React$1);
     }
   })(commonjsGlobal, function(_exports, _propTypes2, _react3) {
     Object.defineProperty(_exports, "__esModule", {
@@ -17206,15 +17180,13 @@ const useTableEntities = /* @__PURE__ */ __name((tableFormName) => {
     },
     [dispatch, tableFormName]
   );
-  const { allOrderedEntities = [], selectedEntities = {} } = reactRedux.useSelector(
-    (state) => {
-      var _a, _b, _c, _d, _e, _f;
-      return {
-        allOrderedEntities: (_c = (_b = (_a = state.form) == null ? void 0 : _a[tableFormName]) == null ? void 0 : _b.values) == null ? void 0 : _c.allOrderedEntities,
-        selectedEntities: (_f = (_e = (_d = state.form) == null ? void 0 : _d[tableFormName]) == null ? void 0 : _e.values) == null ? void 0 : _f.reduxFormSelectedEntityIdMap
-      };
-    }
-  );
+  const { allOrderedEntities, selectedEntities } = reactRedux.useSelector((state) => {
+    var _a, _b, _c, _d, _e, _f;
+    return {
+      allOrderedEntities: (_c = (_b = (_a = state.form) == null ? void 0 : _a[tableFormName]) == null ? void 0 : _b.values) == null ? void 0 : _c.allOrderedEntities,
+      selectedEntities: (_f = (_e = (_d = state.form) == null ? void 0 : _d[tableFormName]) == null ? void 0 : _e.values) == null ? void 0 : _f.reduxFormSelectedEntityIdMap
+    };
+  });
   return { selectTableEntities, allOrderedEntities, selectedEntities };
 }, "useTableEntities");
 function rowClick(e2, rowInfo, entities, {
@@ -20109,42 +20081,36 @@ function makeDataTableHandlers({
   defaults: defaults2,
   onlyOneFilter
 }) {
-  function setSearchTerm(searchTerm, currentParams) {
-    const newParams = __spreadProps(__spreadValues({}, currentParams), {
+  const setSearchTerm = /* @__PURE__ */ __name((searchTerm) => {
+    setNewParams((prev) => __spreadProps(__spreadValues({}, prev != null ? prev : {}), {
       page: void 0,
       //set page undefined to return the table to page 1
       searchTerm: searchTerm === defaults2.searchTerm ? void 0 : searchTerm
-    });
-    setNewParams(newParams);
+    }));
     onlyOneFilter && clearFilters();
-  }
-  __name(setSearchTerm, "setSearchTerm");
-  function addFilters(newFilters, currentParams) {
+  }, "setSearchTerm");
+  const addFilters = /* @__PURE__ */ __name((newFilters) => {
     if (!newFilters)
       return;
-    const filters = uniqBy(
-      [...newFilters, ...onlyOneFilter ? [] : currentParams.filters || []],
-      "filterOn"
-    );
-    const newParams = __spreadProps(__spreadValues({}, currentParams), {
-      page: void 0,
-      //set page undefined to return the table to page 1
-      filters
+    setNewParams((prev) => {
+      const filters = uniqBy(
+        [...newFilters, ...onlyOneFilter ? [] : (prev == null ? void 0 : prev.filters) || []],
+        "filterOn"
+      );
+      return __spreadProps(__spreadValues({}, prev != null ? prev : {}), {
+        page: void 0,
+        //set page undefined to return the table to page 1
+        filters
+      });
     });
-    setNewParams(newParams);
-  }
-  __name(addFilters, "addFilters");
-  function removeSingleFilter(filterOn, currentParams) {
-    const filters = currentParams.filters ? currentParams.filters.filter((filter2) => {
+  }, "addFilters");
+  const removeSingleFilter = /* @__PURE__ */ __name((filterOn) => setNewParams((prev) => {
+    const filters = (prev == null ? void 0 : prev.filters) ? prev.filters.filter((filter2) => {
       return filter2.filterOn !== filterOn;
     }) : void 0;
-    const newParams = __spreadProps(__spreadValues({}, currentParams), {
-      filters
-    });
-    setNewParams(newParams);
-  }
-  __name(removeSingleFilter, "removeSingleFilter");
-  function clearFilters(additionalFilterKeys = []) {
+    return __spreadProps(__spreadValues({}, prev != null ? prev : {}), { filters });
+  }), "removeSingleFilter");
+  const clearFilters = /* @__PURE__ */ __name((additionalFilterKeys = []) => {
     const toClear = {
       filters: void 0,
       searchTerm: void 0,
@@ -20154,21 +20120,16 @@ function makeDataTableHandlers({
       toClear[key] = void 0;
     });
     setNewParams(toClear);
-  }
-  __name(clearFilters, "clearFilters");
-  function setPageSize(pageSize, currentParams) {
-    const newParams = __spreadProps(__spreadValues({}, currentParams), {
-      pageSize: pageSize === defaults2.pageSize ? void 0 : pageSize,
-      page: void 0
-      //set page undefined to return the table to page 1
-    });
-    setNewParams(newParams);
-  }
-  __name(setPageSize, "setPageSize");
-  function setOrder(order2, isRemove, shiftHeld, currentParams) {
+  }, "clearFilters");
+  const setPageSize = /* @__PURE__ */ __name((pageSize) => setNewParams((prev) => __spreadProps(__spreadValues({}, prev != null ? prev : {}), {
+    pageSize: pageSize === defaults2.pageSize ? void 0 : pageSize,
+    page: void 0
+    //set page undefined to return the table to page 1
+  })), "setPageSize");
+  const setOrder = /* @__PURE__ */ __name((order2, isRemove, shiftHeld) => setNewParams((prev) => {
     let newOrder = [];
     if (shiftHeld) {
-      newOrder = [...currentParams.order || []].filter((value) => {
+      newOrder = [...(prev == null ? void 0 : prev.order) || []].filter((value) => {
         const shouldRemove = value.replace(/^-/, "") === order2.replace(/^-/, "");
         return !shouldRemove;
       });
@@ -20182,19 +20143,15 @@ function makeDataTableHandlers({
         newOrder = [order2];
       }
     }
-    const newParams = __spreadProps(__spreadValues({}, currentParams), {
+    return __spreadProps(__spreadValues({}, prev != null ? prev : {}), {
       order: newOrder
     });
-    setNewParams(newParams);
-  }
-  __name(setOrder, "setOrder");
-  function setPage(page, currentParams) {
-    const newParams = __spreadProps(__spreadValues({}, currentParams), {
+  }), "setOrder");
+  const setPage = /* @__PURE__ */ __name((page) => {
+    setNewParams((prev) => __spreadProps(__spreadValues({}, prev != null ? prev : {}), {
       page: page === defaults2.page ? void 0 : page
-    });
-    setNewParams(newParams);
-  }
-  __name(setPage, "setPage");
+    }));
+  }, "setPage");
   return {
     setSearchTerm,
     addFilters,
@@ -52577,26 +52534,24 @@ const DataTable = /* @__PURE__ */ __name((_G) => {
   const tableParams = React$1.useMemo(() => {
     if (!isTableParamsConnected) {
       const setNewParams2 = /* @__PURE__ */ __name((newParams) => {
-        urlConnected && setCurrentParamsOnUrl(newParams, history.replace);
-        change("reduxFormQueryParams", newParams);
+        change("reduxFormQueryParams", (prev) => {
+          let tmp = newParams;
+          if (typeof tmp === "function")
+            tmp = newParams(prev);
+          urlConnected && setCurrentParamsOnUrl(tmp, history == null ? void 0 : history.replace);
+          return tmp;
+        });
       }, "setNewParams2");
-      const bindThese = makeDataTableHandlers({
+      const dispatchProps = makeDataTableHandlers({
         setNewParams: setNewParams2,
         defaults: defaults2,
         onlyOneFilter: props.onlyOneFilter
       });
-      const boundDispatchProps = {};
-      Object.keys(bindThese).forEach(function(key) {
-        const action2 = bindThese[key];
-        boundDispatchProps[key] = function(...args) {
-          action2(...args, currentParams);
-        };
-      });
       const changeFormValue = /* @__PURE__ */ __name((...args) => change(...args), "changeFormValue");
       return __spreadProps(__spreadValues(__spreadValues({
         changeFormValue,
         selectedEntities
-      }, _tableParams), boundDispatchProps), {
+      }, _tableParams), dispatchProps), {
         isTableParamsConnected: true
         //let the table know not to do local sorting/filtering etc.
       });
@@ -52605,9 +52560,8 @@ const DataTable = /* @__PURE__ */ __name((_G) => {
   }, [
     _tableParams,
     change,
-    currentParams,
     defaults2,
-    history.replace,
+    history == null ? void 0 : history.replace,
     isTableParamsConnected,
     props.onlyOneFilter,
     selectedEntities,
@@ -52655,7 +52609,7 @@ const DataTable = /* @__PURE__ */ __name((_G) => {
     additionalFooterButtons,
     autoFocusSearch,
     cellRenderer,
-    children: maybeChildren,
+    children,
     className = "",
     clearFilters = noop$4,
     compact: _compact = true,
@@ -54573,12 +54527,6 @@ const DataTable = /* @__PURE__ */ __name((_G) => {
     acc[index2] = expandedEntityIdMap[rowId];
     return acc;
   }, {});
-  const children = React$1.useMemo(() => {
-    if (maybeChildren && typeof maybeChildren === "function") {
-      return maybeChildren(props);
-    }
-    return maybeChildren;
-  }, [maybeChildren, props]);
   const showHeader = (withTitle || withSearch || children) && !noHeader;
   const toggleFullscreenButton = /* @__PURE__ */ React$1.createElement(
     core.Button,
@@ -68637,11 +68585,11 @@ const useTableParams = /* @__PURE__ */ __name((props) => {
     }, props), {
       pageSize: controlled_pageSize || pageSize,
       defaults: defaultsToUse,
-      location: history.location
+      location: history == null ? void 0 : history.location
     }),
     // We don't want to rerender this every time a prop changes
     // eslint-disable-next-line react-hooks/exhaustive-deps
-    [controlled_pageSize, defaultsToUse, pageSize, history.location]
+    [controlled_pageSize, defaultsToUse, pageSize, history == null ? void 0 : history.location]
   );
   const queryParams = React$1.useMemo(() => {
     const additionalFilterToUse = typeof additionalFilter === "function" ? additionalFilter.bind(void 0, passingProps) : () => additionalFilter;
@@ -68680,27 +68628,33 @@ const useTableParams = /* @__PURE__ */ __name((props) => {
     isCodeModel
   ]);
   const dispatch = reactRedux.useDispatch();
-  const tableParams = React$1.useMemo(() => {
-    const change = /* @__PURE__ */ __name((...args) => dispatch(reduxForm.change(formName, ...args)), "change");
-    const setNewParams = /* @__PURE__ */ __name((newParams) => {
-      urlConnected && setCurrentParamsOnUrl(newParams, history == null ? void 0 : history.replace);
-      change("reduxFormQueryParams", newParams);
-    }, "setNewParams");
-    const bindThese = makeDataTableHandlers({
+  const change = React$1.useCallback(
+    (...args) => dispatch(reduxForm.change(formName, ...args)),
+    [dispatch, formName]
+  );
+  const setNewParams = React$1.useCallback(
+    (newParams) => {
+      change("reduxFormQueryParams", (prev) => {
+        let tmp = newParams;
+        if (typeof tmp === "function")
+          tmp = newParams(prev);
+        urlConnected && setCurrentParamsOnUrl(tmp, history == null ? void 0 : history.replace);
+        return tmp;
+      });
+    },
+    [change, history == null ? void 0 : history.replace, urlConnected]
+  );
+  const dispatchProps = React$1.useMemo(
+    () => makeDataTableHandlers({
       setNewParams,
       defaults: defaults2,
       onlyOneFilter
-    });
-    const boundDispatchProps = {};
-    Object.keys(bindThese).forEach(function(key) {
-      const action2 = bindThese[key];
-      boundDispatchProps[key] = function(...args) {
-        action2(...args, currentParams);
-      };
-    });
-    const changeFormValue = /* @__PURE__ */ __name((...args) => change(...args), "changeFormValue");
-    return __spreadProps(__spreadValues(__spreadValues(__spreadProps(__spreadValues({
-      changeFormValue,
+    }),
+    [defaults2, onlyOneFilter, setNewParams]
+  );
+  const tableParams = React$1.useMemo(
+    () => __spreadProps(__spreadValues(__spreadValues(__spreadProps(__spreadValues({
+      changeFormValue: (...args) => change(...args),
       selectedEntities
     }, _tableParams), {
       formName,
@@ -68709,28 +68663,26 @@ const useTableParams = /* @__PURE__ */ __name((props) => {
       schema,
       currentParams,
       withDisplayOptions
-    }), queryParams), boundDispatchProps), {
+    }), queryParams), dispatchProps), {
       form: formName,
       //this will override the default redux form name
       isTableParamsConnected: true
       //let the table know not to do local sorting/filtering etc.
-    });
-  }, [
-    _tableParams,
-    currentParams,
-    defaults2,
-    dispatch,
-    formName,
-    history == null ? void 0 : history.replace,
-    initialValues,
-    isLocalCall,
-    onlyOneFilter,
-    queryParams,
-    schema,
-    selectedEntities,
-    urlConnected,
-    withDisplayOptions
-  ]);
+    }),
+    [
+      _tableParams,
+      change,
+      currentParams,
+      dispatchProps,
+      formName,
+      initialValues,
+      isLocalCall,
+      queryParams,
+      schema,
+      selectedEntities,
+      withDisplayOptions
+    ]
+  );
   return __spreadProps(__spreadValues(__spreadValues({
     isLocalCall,
     schema
@@ -69378,7 +69330,7 @@ Object.defineProperty(DraggableCore$2, "__esModule", {
 });
 DraggableCore$2.default = void 0;
 var React = _interopRequireWildcard$1(React$1);
-var _propTypes = _interopRequireDefault$2(requirePropTypes());
+var _propTypes = _interopRequireDefault$2(propTypesExports);
 var _reactDom$1 = _interopRequireDefault$2(require$$2$1);
 var _domFns = domFns;
 var _positionFns = positionFns;
@@ -69970,7 +69922,7 @@ _defineProperty(DraggableCore$1, "defaultProps", {
   });
   exports2.default = void 0;
   var React2 = _interopRequireWildcard2(React$1);
-  var _propTypes2 = _interopRequireDefault2(requirePropTypes());
+  var _propTypes2 = _interopRequireDefault2(propTypesExports);
   var _reactDom2 = _interopRequireDefault2(require$$2$1);
   var _clsx2 = _interopRequireDefault2(require$$3);
   var _domFns2 = domFns;
@@ -73801,7 +73753,7 @@ var Transition$1 = {};
 const require$$2 = /* @__PURE__ */ getAugmentedNamespace(reactLifecyclesCompat_es);
 Transition$1.__esModule = true;
 Transition$1.default = Transition$1.EXITING = Transition$1.ENTERED = Transition$1.ENTERING = Transition$1.EXITED = Transition$1.UNMOUNTED = void 0;
-var PropTypes = _interopRequireWildcard(requirePropTypes());
+var PropTypes = _interopRequireWildcard(propTypesExports);
 var _react$1 = _interopRequireDefault$1(React$1);
 var _reactDom = _interopRequireDefault$1(require$$2$1);
 var _reactLifecyclesCompat = require$$2;
@@ -74119,7 +74071,7 @@ Transition$1.default = _default;
 (function(module2, exports2) {
   exports2.__esModule = true;
   exports2.default = void 0;
-  _interopRequireWildcard2(requirePropTypes());
+  _interopRequireWildcard2(propTypesExports);
   var _addClass = _interopRequireDefault2(addClassExports);
   var _removeClass = _interopRequireDefault2(removeClass);
   var _react3 = _interopRequireDefault2(React$1);
@@ -74402,7 +74354,7 @@ __name(getNextChildMapping, "getNextChildMapping");
 (function(module2, exports2) {
   exports2.__esModule = true;
   exports2.default = void 0;
-  var _propTypes2 = _interopRequireDefault2(requirePropTypes());
+  var _propTypes2 = _interopRequireDefault2(propTypesExports);
   var _react3 = _interopRequireDefault2(React$1);
   var _reactLifecyclesCompat2 = require$$2;
   var _ChildMapping = ChildMapping;
@@ -74556,7 +74508,7 @@ var TransitionGroupExports = TransitionGroup.exports;
 (function(module2, exports2) {
   exports2.__esModule = true;
   exports2.default = void 0;
-  _interopRequireDefault2(requirePropTypes());
+  _interopRequireDefault2(propTypesExports);
   var _react3 = _interopRequireDefault2(React$1);
   var _reactDom2 = require$$2$1;
   var _TransitionGroup2 = _interopRequireDefault2(TransitionGroupExports);