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

package/DataTable/utils/queryParams.d.ts

@@ -11,9 +11,8 @@ export function getMergedOpts(topLevel?: {}, instanceLevel?: {}): {
 export function getCCDisplayName(field: object): string;
 export function getCurrentParamsFromUrl(location: any, isSimple: any): any;
 export function setCurrentParamsOnUrl(newParams: any, replace: any, isSimple: any): void;
-export function makeDataTableHandlers({ setNewParams, updateSearch, defaults, onlyOneFilter }: {
+export function makeDataTableHandlers({ setNewParams, defaults, onlyOneFilter }: {
     setNewParams: any;
-    updateSearch: any;
     defaults: any;
     onlyOneFilter: any;
 }): {

package/index.cjs.js

@@ -3123,63 +3123,89 @@ function getAugmentedNamespace(n2) {
 }
 __name(getAugmentedNamespace, "getAugmentedNamespace");
 var propTypes$1 = { exports: {} };
-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;
+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 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;
+    __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()();
   }
-  __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();
+  return propTypes$1.exports;
 }
-var propTypesExports = propTypes$1.exports;
+__name(requirePropTypes, "requirePropTypes");
+var propTypesExports = requirePropTypes();
 const PropTypes$1 = /* @__PURE__ */ getDefaultExportFromCjs(propTypesExports);
 function __awaiter(thisArg, _arguments, P2, generator) {
   function adopt(value) {
@@ -13470,7 +13496,7 @@ var reactList = {};
 (function(exports2) {
   (function(global2, factory) {
     {
-      factory(exports2, propTypesExports, React$1);
+      factory(exports2, requirePropTypes(), React$1);
     }
   })(commonjsGlobal, function(_exports, _propTypes2, _react3) {
     Object.defineProperty(_exports, "__esModule", {
@@ -20080,7 +20106,6 @@ function buildRef(qb, reference2, searchField, expression) {
 __name(buildRef, "buildRef");
 function makeDataTableHandlers({
   setNewParams,
-  updateSearch,
   defaults: defaults2,
   onlyOneFilter
 }) {
@@ -20091,7 +20116,6 @@ function makeDataTableHandlers({
       searchTerm: searchTerm === defaults2.searchTerm ? void 0 : searchTerm
     });
     setNewParams(newParams);
-    updateSearch(searchTerm);
     onlyOneFilter && clearFilters();
   }
   __name(setSearchTerm, "setSearchTerm");
@@ -20108,7 +20132,6 @@ function makeDataTableHandlers({
       filters
     });
     setNewParams(newParams);
-    onlyOneFilter && updateSearch();
   }
   __name(addFilters, "addFilters");
   function removeSingleFilter(filterOn, currentParams) {
@@ -20131,7 +20154,6 @@ function makeDataTableHandlers({
       toClear[key] = void 0;
     });
     setNewParams(toClear);
-    updateSearch();
   }
   __name(clearFilters, "clearFilters");
   function setPageSize(pageSize, currentParams) {
@@ -32988,13 +33010,13 @@ const SearchBar = /* @__PURE__ */ __name(({
       disabled,
       loading,
       type: "search",
-      name: "reduxFormSearchInput",
+      defaultValue: searchInput,
       className: classNames("datatable-search-input", core.Classes.ROUND),
       placeholder: "Search..."
     }, onEnterHelper((e2) => {
       e2.preventDefault();
       e2.stopPropagation();
-      setSearchTerm(searchInput);
+      setSearchTerm(e2.target.value);
       e2.nativeEvent.stopImmediatePropagation();
     })), {
       rightElement
@@ -52463,7 +52485,6 @@ const DataTable = /* @__PURE__ */ __name((_G) => {
     reduxFormEditingCell,
     reduxFormEntities,
     reduxFormQueryParams: _reduxFormQueryParams = {},
-    reduxFormSearchInput: _reduxFormSearchInput = "",
     reduxFormSelectedEntityIdMap: _reduxFormSelectedEntityIdMap = {}
   } = reactRedux.useSelector(
     (state) => reduxForm.formValueSelector(formName)(
@@ -52471,13 +52492,11 @@ const DataTable = /* @__PURE__ */ __name((_G) => {
       "reduxFormCellValidation",
       "reduxFormEntities",
       "reduxFormQueryParams",
-      "reduxFormSearchInput",
       "reduxFormSelectedEntityIdMap"
     )
   );
   const reduxFormCellValidation = useDeepEqualMemo(_reduxFormCellValidation);
   const reduxFormQueryParams = useDeepEqualMemo(_reduxFormQueryParams);
-  const reduxFormSearchInput = useDeepEqualMemo(_reduxFormSearchInput);
   const reduxFormSelectedEntityIdMap = useDeepEqualMemo(
     _reduxFormSelectedEntityIdMap
   );
@@ -52552,22 +52571,17 @@ const DataTable = /* @__PURE__ */ __name((_G) => {
   });
   const _currentParams = React$1.useMemo(() => {
     const tmp = (urlConnected ? getCurrentParamsFromUrl(history.location) : reduxFormQueryParams) || {};
-    tmp.searchTerm = reduxFormSearchInput;
     return tmp;
-  }, [history, reduxFormQueryParams, reduxFormSearchInput, urlConnected]);
+  }, [history, reduxFormQueryParams, urlConnected]);
   const currentParams = useDeepEqualMemo(_currentParams);
   const tableParams = React$1.useMemo(() => {
     if (!isTableParamsConnected) {
-      const updateSearch = /* @__PURE__ */ __name((val) => {
-        change("reduxFormSearchInput", val || "");
-      }, "updateSearch");
       const setNewParams2 = /* @__PURE__ */ __name((newParams) => {
         urlConnected && setCurrentParamsOnUrl(newParams, history.replace);
         change("reduxFormQueryParams", newParams);
       }, "setNewParams2");
       const bindThese = makeDataTableHandlers({
         setNewParams: setNewParams2,
-        updateSearch,
         defaults: defaults2,
         onlyOneFilter: props.onlyOneFilter
       });
@@ -54988,7 +55002,7 @@ const DataTable = /* @__PURE__ */ __name((_G) => {
       )) : "", /* @__PURE__ */ React$1.createElement(
         SearchBar,
         {
-          searchInput: reduxFormSearchInput,
+          searchInput: currentParams.searchTerm,
           setSearchTerm,
           loading: isLoading,
           searchMenuButton,
@@ -68586,31 +68600,22 @@ const useTableParams = /* @__PURE__ */ __name((props) => {
   }
   const {
     reduxFormQueryParams: _reduxFormQueryParams = {},
-    reduxFormSearchInput: _reduxFormSearchInput = "",
     reduxFormSelectedEntityIdMap: _reduxFormSelectedEntityIdMap = {}
   } = reactRedux.useSelector(
     (state) => reduxForm.formValueSelector(formName)(
       state,
       "reduxFormQueryParams",
-      "reduxFormSearchInput",
       "reduxFormSelectedEntityIdMap"
     )
   );
   const reduxFormQueryParams = useDeepEqualMemo(_reduxFormQueryParams);
-  const reduxFormSearchInput = useDeepEqualMemo(_reduxFormSearchInput);
   const reduxFormSelectedEntityIdMap = useDeepEqualMemo(
     _reduxFormSelectedEntityIdMap
   );
   const _currentParams = React$1.useMemo(() => {
     const tmp = (urlConnected ? getCurrentParamsFromUrl(history == null ? void 0 : history.location) : reduxFormQueryParams) || {};
-    tmp.searchTerm = reduxFormSearchInput;
     return tmp;
-  }, [
-    history == null ? void 0 : history.location,
-    reduxFormQueryParams,
-    reduxFormSearchInput,
-    urlConnected
-  ]);
+  }, [history == null ? void 0 : history.location, reduxFormQueryParams, urlConnected]);
   const selectedEntities = React$1.useMemo(
     () => withSelectedEntities2 ? Object.values(reduxFormSelectedEntityIdMap).sort((a2, b2) => a2.rowIndex - b2.rowIndex).map((item) => item.entity) : void 0,
     [reduxFormSelectedEntityIdMap, withSelectedEntities2]
@@ -68631,11 +68636,12 @@ const useTableParams = /* @__PURE__ */ __name((props) => {
       formName: "tgDataTable"
     }, props), {
       pageSize: controlled_pageSize || pageSize,
-      defaults: defaultsToUse
+      defaults: defaultsToUse,
+      location: 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]
+    [controlled_pageSize, defaultsToUse, pageSize, history.location]
   );
   const queryParams = React$1.useMemo(() => {
     const additionalFilterToUse = typeof additionalFilter === "function" ? additionalFilter.bind(void 0, passingProps) : () => additionalFilter;
@@ -68676,16 +68682,12 @@ const useTableParams = /* @__PURE__ */ __name((props) => {
   const dispatch = reactRedux.useDispatch();
   const tableParams = React$1.useMemo(() => {
     const change = /* @__PURE__ */ __name((...args) => dispatch(reduxForm.change(formName, ...args)), "change");
-    const updateSearch = /* @__PURE__ */ __name((val) => {
-      change("reduxFormSearchInput", val || "");
-    }, "updateSearch");
     const setNewParams = /* @__PURE__ */ __name((newParams) => {
       urlConnected && setCurrentParamsOnUrl(newParams, history == null ? void 0 : history.replace);
       change("reduxFormQueryParams", newParams);
     }, "setNewParams");
     const bindThese = makeDataTableHandlers({
       setNewParams,
-      updateSearch,
       defaults: defaults2,
       onlyOneFilter
     });
@@ -69376,7 +69378,7 @@ Object.defineProperty(DraggableCore$2, "__esModule", {
 });
 DraggableCore$2.default = void 0;
 var React = _interopRequireWildcard$1(React$1);
-var _propTypes = _interopRequireDefault$2(propTypesExports);
+var _propTypes = _interopRequireDefault$2(requirePropTypes());
 var _reactDom$1 = _interopRequireDefault$2(require$$2$1);
 var _domFns = domFns;
 var _positionFns = positionFns;
@@ -69968,7 +69970,7 @@ _defineProperty(DraggableCore$1, "defaultProps", {
   });
   exports2.default = void 0;
   var React2 = _interopRequireWildcard2(React$1);
-  var _propTypes2 = _interopRequireDefault2(propTypesExports);
+  var _propTypes2 = _interopRequireDefault2(requirePropTypes());
   var _reactDom2 = _interopRequireDefault2(require$$2$1);
   var _clsx2 = _interopRequireDefault2(require$$3);
   var _domFns2 = domFns;
@@ -73799,7 +73801,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(propTypesExports);
+var PropTypes = _interopRequireWildcard(requirePropTypes());
 var _react$1 = _interopRequireDefault$1(React$1);
 var _reactDom = _interopRequireDefault$1(require$$2$1);
 var _reactLifecyclesCompat = require$$2;
@@ -74117,7 +74119,7 @@ Transition$1.default = _default;
 (function(module2, exports2) {
   exports2.__esModule = true;
   exports2.default = void 0;
-  _interopRequireWildcard2(propTypesExports);
+  _interopRequireWildcard2(requirePropTypes());
   var _addClass = _interopRequireDefault2(addClassExports);
   var _removeClass = _interopRequireDefault2(removeClass);
   var _react3 = _interopRequireDefault2(React$1);
@@ -74400,7 +74402,7 @@ __name(getNextChildMapping, "getNextChildMapping");
 (function(module2, exports2) {
   exports2.__esModule = true;
   exports2.default = void 0;
-  var _propTypes2 = _interopRequireDefault2(propTypesExports);
+  var _propTypes2 = _interopRequireDefault2(requirePropTypes());
   var _react3 = _interopRequireDefault2(React$1);
   var _reactLifecyclesCompat2 = require$$2;
   var _ChildMapping = ChildMapping;
@@ -74554,7 +74556,7 @@ var TransitionGroupExports = TransitionGroup.exports;
 (function(module2, exports2) {
   exports2.__esModule = true;
   exports2.default = void 0;
-  _interopRequireDefault2(propTypesExports);
+  _interopRequireDefault2(requirePropTypes());
   var _react3 = _interopRequireDefault2(React$1);
   var _reactDom2 = require$$2$1;
   var _TransitionGroup2 = _interopRequireDefault2(TransitionGroupExports);

package/index.es.js

@@ -3105,63 +3105,89 @@ function getAugmentedNamespace(n2) {
 }
 __name(getAugmentedNamespace, "getAugmentedNamespace");
 var propTypes$1 = { exports: {} };
-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;
+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 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;
+    __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()();
   }
-  __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();
+  return propTypes$1.exports;
 }
-var propTypesExports = propTypes$1.exports;
+__name(requirePropTypes, "requirePropTypes");
+var propTypesExports = requirePropTypes();
 const PropTypes$1 = /* @__PURE__ */ getDefaultExportFromCjs(propTypesExports);
 function __awaiter(thisArg, _arguments, P2, generator) {
   function adopt(value) {
@@ -13452,7 +13478,7 @@ var reactList = {};
 (function(exports2) {
   (function(global2, factory) {
     {
-      factory(exports2, propTypesExports, React__default);
+      factory(exports2, requirePropTypes(), React__default);
     }
   })(commonjsGlobal, function(_exports, _propTypes2, _react3) {
     Object.defineProperty(_exports, "__esModule", {
@@ -20062,7 +20088,6 @@ function buildRef(qb, reference2, searchField, expression) {
 __name(buildRef, "buildRef");
 function makeDataTableHandlers({
   setNewParams,
-  updateSearch,
   defaults: defaults2,
   onlyOneFilter
 }) {
@@ -20073,7 +20098,6 @@ function makeDataTableHandlers({
       searchTerm: searchTerm === defaults2.searchTerm ? void 0 : searchTerm
     });
     setNewParams(newParams);
-    updateSearch(searchTerm);
     onlyOneFilter && clearFilters();
   }
   __name(setSearchTerm, "setSearchTerm");
@@ -20090,7 +20114,6 @@ function makeDataTableHandlers({
       filters
     });
     setNewParams(newParams);
-    onlyOneFilter && updateSearch();
   }
   __name(addFilters, "addFilters");
   function removeSingleFilter(filterOn, currentParams) {
@@ -20113,7 +20136,6 @@ function makeDataTableHandlers({
       toClear[key] = void 0;
     });
     setNewParams(toClear);
-    updateSearch();
   }
   __name(clearFilters, "clearFilters");
   function setPageSize(pageSize, currentParams) {
@@ -32970,13 +32992,13 @@ const SearchBar = /* @__PURE__ */ __name(({
       disabled,
       loading,
       type: "search",
-      name: "reduxFormSearchInput",
+      defaultValue: searchInput,
       className: classNames("datatable-search-input", Classes.ROUND),
       placeholder: "Search..."
     }, onEnterHelper((e2) => {
       e2.preventDefault();
       e2.stopPropagation();
-      setSearchTerm(searchInput);
+      setSearchTerm(e2.target.value);
       e2.nativeEvent.stopImmediatePropagation();
     })), {
       rightElement
@@ -52445,7 +52467,6 @@ const DataTable = /* @__PURE__ */ __name((_G) => {
     reduxFormEditingCell,
     reduxFormEntities,
     reduxFormQueryParams: _reduxFormQueryParams = {},
-    reduxFormSearchInput: _reduxFormSearchInput = "",
     reduxFormSelectedEntityIdMap: _reduxFormSelectedEntityIdMap = {}
   } = useSelector(
     (state) => formValueSelector(formName)(
@@ -52453,13 +52474,11 @@ const DataTable = /* @__PURE__ */ __name((_G) => {
       "reduxFormCellValidation",
       "reduxFormEntities",
       "reduxFormQueryParams",
-      "reduxFormSearchInput",
       "reduxFormSelectedEntityIdMap"
     )
   );
   const reduxFormCellValidation = useDeepEqualMemo(_reduxFormCellValidation);
   const reduxFormQueryParams = useDeepEqualMemo(_reduxFormQueryParams);
-  const reduxFormSearchInput = useDeepEqualMemo(_reduxFormSearchInput);
   const reduxFormSelectedEntityIdMap = useDeepEqualMemo(
     _reduxFormSelectedEntityIdMap
   );
@@ -52534,22 +52553,17 @@ const DataTable = /* @__PURE__ */ __name((_G) => {
   });
   const _currentParams = useMemo(() => {
     const tmp = (urlConnected ? getCurrentParamsFromUrl(history.location) : reduxFormQueryParams) || {};
-    tmp.searchTerm = reduxFormSearchInput;
     return tmp;
-  }, [history, reduxFormQueryParams, reduxFormSearchInput, urlConnected]);
+  }, [history, reduxFormQueryParams, urlConnected]);
   const currentParams = useDeepEqualMemo(_currentParams);
   const tableParams = useMemo(() => {
     if (!isTableParamsConnected) {
-      const updateSearch = /* @__PURE__ */ __name((val) => {
-        change$1("reduxFormSearchInput", val || "");
-      }, "updateSearch");
       const setNewParams2 = /* @__PURE__ */ __name((newParams) => {
         urlConnected && setCurrentParamsOnUrl(newParams, history.replace);
         change$1("reduxFormQueryParams", newParams);
       }, "setNewParams2");
       const bindThese = makeDataTableHandlers({
         setNewParams: setNewParams2,
-        updateSearch,
         defaults: defaults2,
         onlyOneFilter: props.onlyOneFilter
       });
@@ -54970,7 +54984,7 @@ const DataTable = /* @__PURE__ */ __name((_G) => {
       )) : "", /* @__PURE__ */ React__default.createElement(
         SearchBar,
         {
-          searchInput: reduxFormSearchInput,
+          searchInput: currentParams.searchTerm,
           setSearchTerm,
           loading: isLoading,
           searchMenuButton,
@@ -68568,31 +68582,22 @@ const useTableParams = /* @__PURE__ */ __name((props) => {
   }
   const {
     reduxFormQueryParams: _reduxFormQueryParams = {},
-    reduxFormSearchInput: _reduxFormSearchInput = "",
     reduxFormSelectedEntityIdMap: _reduxFormSelectedEntityIdMap = {}
   } = useSelector(
     (state) => formValueSelector(formName)(
       state,
       "reduxFormQueryParams",
-      "reduxFormSearchInput",
       "reduxFormSelectedEntityIdMap"
     )
   );
   const reduxFormQueryParams = useDeepEqualMemo(_reduxFormQueryParams);
-  const reduxFormSearchInput = useDeepEqualMemo(_reduxFormSearchInput);
   const reduxFormSelectedEntityIdMap = useDeepEqualMemo(
     _reduxFormSelectedEntityIdMap
   );
   const _currentParams = useMemo(() => {
     const tmp = (urlConnected ? getCurrentParamsFromUrl(history == null ? void 0 : history.location) : reduxFormQueryParams) || {};
-    tmp.searchTerm = reduxFormSearchInput;
     return tmp;
-  }, [
-    history == null ? void 0 : history.location,
-    reduxFormQueryParams,
-    reduxFormSearchInput,
-    urlConnected
-  ]);
+  }, [history == null ? void 0 : history.location, reduxFormQueryParams, urlConnected]);
   const selectedEntities = useMemo(
     () => withSelectedEntities2 ? Object.values(reduxFormSelectedEntityIdMap).sort((a2, b2) => a2.rowIndex - b2.rowIndex).map((item) => item.entity) : void 0,
     [reduxFormSelectedEntityIdMap, withSelectedEntities2]
@@ -68613,11 +68618,12 @@ const useTableParams = /* @__PURE__ */ __name((props) => {
       formName: "tgDataTable"
     }, props), {
       pageSize: controlled_pageSize || pageSize,
-      defaults: defaultsToUse
+      defaults: defaultsToUse,
+      location: 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]
+    [controlled_pageSize, defaultsToUse, pageSize, history.location]
   );
   const queryParams = useMemo(() => {
     const additionalFilterToUse = typeof additionalFilter === "function" ? additionalFilter.bind(void 0, passingProps) : () => additionalFilter;
@@ -68658,16 +68664,12 @@ const useTableParams = /* @__PURE__ */ __name((props) => {
   const dispatch = useDispatch();
   const tableParams = useMemo(() => {
     const change$1 = /* @__PURE__ */ __name((...args) => dispatch(change(formName, ...args)), "change$1");
-    const updateSearch = /* @__PURE__ */ __name((val) => {
-      change$1("reduxFormSearchInput", val || "");
-    }, "updateSearch");
     const setNewParams = /* @__PURE__ */ __name((newParams) => {
       urlConnected && setCurrentParamsOnUrl(newParams, history == null ? void 0 : history.replace);
       change$1("reduxFormQueryParams", newParams);
     }, "setNewParams");
     const bindThese = makeDataTableHandlers({
       setNewParams,
-      updateSearch,
       defaults: defaults2,
       onlyOneFilter
     });
@@ -69358,7 +69360,7 @@ Object.defineProperty(DraggableCore$2, "__esModule", {
 });
 DraggableCore$2.default = void 0;
 var React = _interopRequireWildcard$1(React__default);
-var _propTypes = _interopRequireDefault$2(propTypesExports);
+var _propTypes = _interopRequireDefault$2(requirePropTypes());
 var _reactDom$1 = _interopRequireDefault$2(require$$2$1);
 var _domFns = domFns;
 var _positionFns = positionFns;
@@ -69950,7 +69952,7 @@ _defineProperty(DraggableCore$1, "defaultProps", {
   });
   exports2.default = void 0;
   var React2 = _interopRequireWildcard2(React__default);
-  var _propTypes2 = _interopRequireDefault2(propTypesExports);
+  var _propTypes2 = _interopRequireDefault2(requirePropTypes());
   var _reactDom2 = _interopRequireDefault2(require$$2$1);
   var _clsx2 = _interopRequireDefault2(require$$3);
   var _domFns2 = domFns;
@@ -73781,7 +73783,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(propTypesExports);
+var PropTypes = _interopRequireWildcard(requirePropTypes());
 var _react$1 = _interopRequireDefault$1(React__default);
 var _reactDom = _interopRequireDefault$1(require$$2$1);
 var _reactLifecyclesCompat = require$$2;
@@ -74099,7 +74101,7 @@ Transition$1.default = _default;
 (function(module2, exports2) {
   exports2.__esModule = true;
   exports2.default = void 0;
-  _interopRequireWildcard2(propTypesExports);
+  _interopRequireWildcard2(requirePropTypes());
   var _addClass = _interopRequireDefault2(addClassExports);
   var _removeClass = _interopRequireDefault2(removeClass);
   var _react3 = _interopRequireDefault2(React__default);
@@ -74382,7 +74384,7 @@ __name(getNextChildMapping, "getNextChildMapping");
 (function(module2, exports2) {
   exports2.__esModule = true;
   exports2.default = void 0;
-  var _propTypes2 = _interopRequireDefault2(propTypesExports);
+  var _propTypes2 = _interopRequireDefault2(requirePropTypes());
   var _react3 = _interopRequireDefault2(React__default);
   var _reactLifecyclesCompat2 = require$$2;
   var _ChildMapping = ChildMapping;
@@ -74536,7 +74538,7 @@ var TransitionGroupExports = TransitionGroup.exports;
 (function(module2, exports2) {
   exports2.__esModule = true;
   exports2.default = void 0;
-  _interopRequireDefault2(propTypesExports);
+  _interopRequireDefault2(requirePropTypes());
   var _react3 = _interopRequireDefault2(React__default);
   var _reactDom2 = require$$2$1;
   var _TransitionGroup2 = _interopRequireDefault2(TransitionGroupExports);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teselagen/ui",
-  "version": "0.5.23-beta.28",
+  "version": "0.5.23-beta.29",
   "main": "./src/index.js",
   "exports": {
     ".": {

package/src/DataTable/SearchBar.js

@@ -40,13 +40,13 @@ const SearchBar = ({
       disabled={disabled}
       loading={loading}
       type="search"
-      name="reduxFormSearchInput"
+      defaultValue={searchInput}
       className={classNames("datatable-search-input", Classes.ROUND)}
       placeholder="Search..."
       {...onEnterHelper(e => {
         e.preventDefault();
         e.stopPropagation();
-        setSearchTerm(searchInput);
+        setSearchTerm(e.target.value);
         e.nativeEvent.stopImmediatePropagation();
       })}
       rightElement={rightElement}

package/src/DataTable/index.js

@@ -169,7 +169,6 @@ const DataTable = ({
     reduxFormEditingCell,
     reduxFormEntities,
     reduxFormQueryParams: _reduxFormQueryParams = {},
-    reduxFormSearchInput: _reduxFormSearchInput = "",
     reduxFormSelectedEntityIdMap: _reduxFormSelectedEntityIdMap = {}
   } = useSelector(state =>
     formValueSelector(formName)(
@@ -177,7 +176,6 @@ const DataTable = ({
       "reduxFormCellValidation",
       "reduxFormEntities",
       "reduxFormQueryParams",
-      "reduxFormSearchInput",
       "reduxFormSelectedEntityIdMap"
     )
   );
@@ -186,7 +184,6 @@ const DataTable = ({
   // with redux-forms we tend to do unnecessary renders
   const reduxFormCellValidation = useDeepEqualMemo(_reduxFormCellValidation);
   const reduxFormQueryParams = useDeepEqualMemo(_reduxFormQueryParams);
-  const reduxFormSearchInput = useDeepEqualMemo(_reduxFormSearchInput);
   const reduxFormSelectedEntityIdMap = useDeepEqualMemo(
     _reduxFormSelectedEntityIdMap
   );
@@ -286,19 +283,13 @@ const DataTable = ({
       (urlConnected
         ? getCurrentParamsFromUrl(history.location) //important to use history location and not ownProps.location because for some reason the location path lags one render behind!!
         : reduxFormQueryParams) || {};
-
-    tmp.searchTerm = reduxFormSearchInput;
     return tmp;
-  }, [history, reduxFormQueryParams, reduxFormSearchInput, urlConnected]);
+  }, [history, reduxFormQueryParams, urlConnected]);
 
   const currentParams = useDeepEqualMemo(_currentParams);
 
   const tableParams = useMemo(() => {
     if (!isTableParamsConnected) {
-      const updateSearch = val => {
-        change("reduxFormSearchInput", val || "");
-      };
-
       const setNewParams = newParams => {
         urlConnected && setCurrentParamsOnUrl(newParams, history.replace);
         change("reduxFormQueryParams", newParams); //we always will update the redux params as a workaround for withRouter not always working if inside a redux-connected container https://github.com/ReactTraining/react-router/issues/5037
@@ -306,7 +297,6 @@ const DataTable = ({
 
       const bindThese = makeDataTableHandlers({
         setNewParams,
-        updateSearch,
         defaults,
         onlyOneFilter: props.onlyOneFilter
       });
@@ -3031,7 +3021,7 @@ const DataTable = ({
                     ""
                   )}
                   <SearchBar
-                    searchInput={reduxFormSearchInput}
+                    searchInput={currentParams.searchTerm}
                     setSearchTerm={setSearchTerm}
                     loading={isLoading}
                     searchMenuButton={searchMenuButton}

package/src/DataTable/utils/queryParams.js

@@ -603,7 +603,6 @@ function buildRef(qb, reference, searchField, expression) {
 
 export function makeDataTableHandlers({
   setNewParams,
-  updateSearch,
   defaults,
   onlyOneFilter
 }) {
@@ -615,7 +614,6 @@ export function makeDataTableHandlers({
       searchTerm: searchTerm === defaults.searchTerm ? undefined : searchTerm
     };
     setNewParams(newParams);
-    updateSearch(searchTerm);
     onlyOneFilter && clearFilters();
   }
   function addFilters(newFilters, currentParams) {
@@ -631,7 +629,6 @@ export function makeDataTableHandlers({
       filters
     };
     setNewParams(newParams);
-    onlyOneFilter && updateSearch();
   }
   function removeSingleFilter(filterOn, currentParams) {
     const filters = currentParams.filters
@@ -655,7 +652,6 @@ export function makeDataTableHandlers({
       toClear[key] = undefined;
     });
     setNewParams(toClear);
-    updateSearch();
   }
   function setPageSize(pageSize, currentParams) {
     const newParams = {

package/src/DataTable/utils/withTableParams.js

@@ -101,13 +101,11 @@ export const useTableParams = props => {
 
   const {
     reduxFormQueryParams: _reduxFormQueryParams = {},
-    reduxFormSearchInput: _reduxFormSearchInput = "",
     reduxFormSelectedEntityIdMap: _reduxFormSelectedEntityIdMap = {}
   } = useSelector(state =>
     formValueSelector(formName)(
       state,
       "reduxFormQueryParams",
-      "reduxFormSearchInput",
       "reduxFormSelectedEntityIdMap"
     )
   );
@@ -115,7 +113,6 @@ export const useTableParams = props => {
   // We want to make sure we don't rerender everything unnecessary
   // with redux-forms we tend to do unnecessary renders
   const reduxFormQueryParams = useDeepEqualMemo(_reduxFormQueryParams);
-  const reduxFormSearchInput = useDeepEqualMemo(_reduxFormSearchInput);
   const reduxFormSelectedEntityIdMap = useDeepEqualMemo(
     _reduxFormSelectedEntityIdMap
   );
@@ -126,14 +123,8 @@ export const useTableParams = props => {
         ? getCurrentParamsFromUrl(history?.location) //important to use history location and not ownProps.location because for some reason the location path lags one render behind!!
         : reduxFormQueryParams) || {};
 
-    tmp.searchTerm = reduxFormSearchInput;
     return tmp;
-  }, [
-    history?.location,
-    reduxFormQueryParams,
-    reduxFormSearchInput,
-    urlConnected
-  ]);
+  }, [history?.location, reduxFormQueryParams, urlConnected]);
 
   const selectedEntities = useMemo(
     () =>
@@ -166,11 +157,12 @@ export const useTableParams = props => {
       formName: "tgDataTable",
       ...props,
       pageSize: controlled_pageSize || pageSize,
-      defaults: defaultsToUse
+      defaults: defaultsToUse,
+      location: 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]
+    [controlled_pageSize, defaultsToUse, pageSize, history.location]
   );
 
   const queryParams = useMemo(() => {
@@ -221,9 +213,6 @@ export const useTableParams = props => {
 
   const tableParams = useMemo(() => {
     const change = (...args) => dispatch(_change(formName, ...args));
-    const updateSearch = val => {
-      change("reduxFormSearchInput", val || "");
-    };
 
     const setNewParams = newParams => {
       urlConnected && setCurrentParamsOnUrl(newParams, history?.replace);
@@ -232,7 +221,6 @@ export const useTableParams = props => {
 
     const bindThese = makeDataTableHandlers({
       setNewParams,
-      updateSearch,
       defaults,
       onlyOneFilter
     });