@promoboxx/use-filter 1.11.0 → 1.11.2

package/dist/store/urlParamStore.d.ts

@@ -1,2 +1,4 @@
 import { FilterStore } from './index';
 export declare const createUrlParamStore: () => FilterStore;
+export declare function replaceQueryParams(newParams: string): void;
+export declare function naivelyParseExistingParams(): any;

package/dist/store/urlParamStore.js

@@ -10,11 +10,22 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createUrlParamStore = void 0;
+exports.naivelyParseExistingParams = exports.replaceQueryParams = exports.createUrlParamStore = void 0;
 var qs_1 = __importDefault(require("qs"));
 var createUrlParamStore = function () {
     var urlParamStore = {
@@ -24,17 +35,9 @@ var createUrlParamStore = function () {
             var parsedFilter = parsed["filter." + namespace];
             // useFilter doesn't really support returning a partial FilterInfo, so both
             // need to be present,
-            if (parsedInfo && parsedFilter) {
-                if (parsedInfo.page != null) {
-                    parsedInfo.page = Number(parsedInfo.page);
-                }
-                if (parsedInfo.pageSize != null) {
-                    parsedInfo.pageSize = Number(parsedInfo.pageSize);
-                }
-                if (parsedInfo.offset != null) {
-                    parsedInfo.offset = Number(parsedInfo.offset);
-                }
-                return __assign(__assign({}, parsedInfo), { filter: parsedFilter });
+            if (parsedInfo || parsedFilter) {
+                var _a = parsedInfo || {}, page = _a.page, offset = _a.offset, pageSize = _a.pageSize, rest = __rest(_a, ["page", "offset", "pageSize"]);
+                return __assign(__assign({}, __assign({ page: 1 / page ? +page : undefined, pageSize: 1 / pageSize ? +pageSize : undefined, offset: 1 / offset ? +offset : undefined }, rest)), { filter: parsedFilter });
             }
         },
         saveFilter: function (namespace, filterInfo) {
@@ -79,8 +82,10 @@ function replaceQueryParams(newParams) {
     nextUrl.search = newParams;
     window.history.replaceState(undefined, '', nextUrl.toString());
 }
+exports.replaceQueryParams = replaceQueryParams;
 function naivelyParseExistingParams() {
     // Don't really want to do any casting, especially not to `any`, but the type
     // of `qs.parse` is so wide we'd have to litter checks all over the place.
     return qs_1.default.parse(window.location.search.substring(1));
 }
+exports.naivelyParseExistingParams = naivelyParseExistingParams;

package/dist/useFilter.js

@@ -47,10 +47,15 @@ function useFilter(namespace, options) {
         ctxRef.current = ctxRefValue;
     });
     var _a = react_1.useState(function () {
-        var existing = store_1.getFilterStore(ctxRef.current.store).getFilter(namespace);
-        var initialValue = existing
-            ? __assign(__assign({}, existing), { shouldRunImmediately: true }) : undefined;
-        return initialValue;
+        var _a;
+        var fromStore = store_1.getFilterStore(ctxRef.current.store).getFilter(namespace);
+        // If the filter is already in the store, we have to make sure it ...
+        // - has both the filter and filterInfo
+        // - has all the fields the user passed to the hook
+        if (fromStore) {
+            var filterInfo_1 = buildDefaultFilterInfo_1.default(__assign(__assign({}, fromStore), { shouldRunImmediately: true, filter: __assign(__assign({}, (_a = options.defaultFilterInfo) === null || _a === void 0 ? void 0 : _a.filter), fromStore.filter) }));
+            return filterInfo_1;
+        }
     }), filterInfo = _a[0], setFilterInfoState = _a[1];
     var _b = react_1.useState(function () {
         return store_1.getFilterStore(ctxRef.current.store).getData(namespace);

package/dist/useSimpleFilter.js

@@ -34,8 +34,20 @@ function useSimpleFilter(namespace, options) {
         ctxRef.current = ctxRefValue;
     });
     var _a = react_1.useState(false), isLoading = _a[0], setIsLoading = _a[1];
-    var _b = react_1.useState(function () { return (__assign(__assign({}, (store_1.getFilterStore(ctxRef.current.store).getFilter(namespace) ||
-        buildDefaultFilterInfo(options.defaultFilterInfo))), { shouldRunImmediately: true })); }), filterInfo = _b[0], setFilterInfoState = _b[1];
+    var _b = react_1.useState(function () {
+        var _a;
+        var fromStore = store_1.getFilterStore(ctxRef.current.store).getFilter(namespace);
+        // If the filter is already in the store, we have to make sure it ...
+        // - has both the filter and filterInfo
+        // - has all the fields the user passed to the hook
+        if (fromStore) {
+            var filterInfo_1 = buildDefaultFilterInfo(__assign(__assign({}, fromStore), { shouldRunImmediately: true, filter: __assign(__assign({}, (_a = options.defaultFilterInfo) === null || _a === void 0 ? void 0 : _a.filter), fromStore.filter) }));
+            return filterInfo_1;
+        }
+        else {
+            return buildDefaultFilterInfo(__assign(__assign({}, options.defaultFilterInfo), { shouldRunImmediately: true }));
+        }
+    }), filterInfo = _b[0], setFilterInfoState = _b[1];
     var _c = react_1.useState(filterInfo), debouncedFilterInfo = _c[0], setDebouncedFilterInfo = _c[1];
     // Not sure this is needed in simple mode?
     var lastRefreshAtRef = react_1.useRef(-1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@promoboxx/use-filter",
-  "version": "1.11.0",
+  "version": "1.11.2",
   "description": "",
   "main": "dist/useFilter.js",
   "keywords": [],