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

package/DataTable/EditableCell.d.ts

@@ -0,0 +1,7 @@
+export function EditableCell({ cancelEdit, dataTest, finishEdit, isNumeric, initialValue }: {
+    cancelEdit: any;
+    dataTest: any;
+    finishEdit: any;
+    isNumeric: any;
+    initialValue: any;
+}): import("react/jsx-runtime").JSX.Element;

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

@@ -20106,7 +20106,6 @@ function buildRef(qb, reference2, searchField, expression) {
 __name(buildRef, "buildRef");
 function makeDataTableHandlers({
   setNewParams,
-  updateSearch,
   defaults: defaults2,
   onlyOneFilter
 }) {
@@ -20117,7 +20116,6 @@ function makeDataTableHandlers({
       searchTerm: searchTerm === defaults2.searchTerm ? void 0 : searchTerm
     });
     setNewParams(newParams);
-    updateSearch(searchTerm);
     onlyOneFilter && clearFilters();
   }
   __name(setSearchTerm, "setSearchTerm");
@@ -20134,7 +20132,6 @@ function makeDataTableHandlers({
       filters
     });
     setNewParams(newParams);
-    onlyOneFilter && updateSearch();
   }
   __name(addFilters, "addFilters");
   function removeSingleFilter(filterOn, currentParams) {
@@ -20157,7 +20154,6 @@ function makeDataTableHandlers({
       toClear[key] = void 0;
     });
     setNewParams(toClear);
-    updateSearch();
   }
   __name(clearFilters, "clearFilters");
   function setPageSize(pageSize, currentParams) {
@@ -33014,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
@@ -52489,7 +52485,6 @@ const DataTable = /* @__PURE__ */ __name((_G) => {
     reduxFormEditingCell,
     reduxFormEntities,
     reduxFormQueryParams: _reduxFormQueryParams = {},
-    reduxFormSearchInput: _reduxFormSearchInput = "",
     reduxFormSelectedEntityIdMap: _reduxFormSelectedEntityIdMap = {}
   } = reactRedux.useSelector(
     (state) => reduxForm.formValueSelector(formName)(
@@ -52497,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
   );
@@ -52578,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
       });
@@ -55014,7 +55002,7 @@ const DataTable = /* @__PURE__ */ __name((_G) => {
       )) : "", /* @__PURE__ */ React$1.createElement(
         SearchBar,
         {
-          searchInput: reduxFormSearchInput,
+          searchInput: currentParams.searchTerm,
           setSearchTerm,
           loading: isLoading,
           searchMenuButton,
@@ -68612,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]
@@ -68657,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;
@@ -68702,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
     });

package/index.es.js

@@ -20088,7 +20088,6 @@ function buildRef(qb, reference2, searchField, expression) {
 __name(buildRef, "buildRef");
 function makeDataTableHandlers({
   setNewParams,
-  updateSearch,
   defaults: defaults2,
   onlyOneFilter
 }) {
@@ -20099,7 +20098,6 @@ function makeDataTableHandlers({
       searchTerm: searchTerm === defaults2.searchTerm ? void 0 : searchTerm
     });
     setNewParams(newParams);
-    updateSearch(searchTerm);
     onlyOneFilter && clearFilters();
   }
   __name(setSearchTerm, "setSearchTerm");
@@ -20116,7 +20114,6 @@ function makeDataTableHandlers({
       filters
     });
     setNewParams(newParams);
-    onlyOneFilter && updateSearch();
   }
   __name(addFilters, "addFilters");
   function removeSingleFilter(filterOn, currentParams) {
@@ -20139,7 +20136,6 @@ function makeDataTableHandlers({
       toClear[key] = void 0;
     });
     setNewParams(toClear);
-    updateSearch();
   }
   __name(clearFilters, "clearFilters");
   function setPageSize(pageSize, currentParams) {
@@ -32996,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
@@ -52471,7 +52467,6 @@ const DataTable = /* @__PURE__ */ __name((_G) => {
     reduxFormEditingCell,
     reduxFormEntities,
     reduxFormQueryParams: _reduxFormQueryParams = {},
-    reduxFormSearchInput: _reduxFormSearchInput = "",
     reduxFormSelectedEntityIdMap: _reduxFormSelectedEntityIdMap = {}
   } = useSelector(
     (state) => formValueSelector(formName)(
@@ -52479,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
   );
@@ -52560,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
       });
@@ -54996,7 +54984,7 @@ const DataTable = /* @__PURE__ */ __name((_G) => {
       )) : "", /* @__PURE__ */ React__default.createElement(
         SearchBar,
         {
-          searchInput: reduxFormSearchInput,
+          searchInput: currentParams.searchTerm,
           setSearchTerm,
           loading: isLoading,
           searchMenuButton,
@@ -68594,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]
@@ -68639,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;
@@ -68684,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
     });

package/package.json

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