@promoboxx/use-filter 1.10.0 → 1.11.1

package/dist/store/index.d.ts

@@ -7,4 +7,4 @@ export interface FilterStore {
     clear(): void;
 }
 export declare function setFilterStore(newStore: FilterStore): void;
-export declare function getFilterStore(): FilterStore;
+export declare function getFilterStore(optionalStore?: FilterStore): FilterStore;

package/dist/store/index.js

@@ -1,15 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getFilterStore = exports.setFilterStore = void 0;
-var store;
+var globalStore;
 function setFilterStore(newStore) {
-    store = newStore;
+    globalStore = newStore;
 }
 exports.setFilterStore = setFilterStore;
-function getFilterStore() {
-    if (!store) {
+function getFilterStore(optionalStore) {
+    var resolvedStore = optionalStore || globalStore;
+    if (!resolvedStore) {
         throw new Error('A store must be set with setFilterStore');
     }
-    return store;
+    return resolvedStore;
 }
 exports.getFilterStore = getFilterStore;

package/dist/useFilter.d.ts

@@ -1,3 +1,4 @@
+import { FilterStore } from './store';
 declare type MaybePromise<T> = T | Promise<T>;
 interface UseFilterOptions<TFilter, TResult> {
     /**
@@ -19,6 +20,7 @@ interface UseFilterOptions<TFilter, TResult> {
      */
     debounceDuration?: number;
     onBeforeSaveFilter?: (filterInfo: FilterInfo<TFilter>) => FilterInfo<TFilter>;
+    store?: FilterStore;
 }
 export interface FilterApi<TFilter, TResult> {
     /**

package/dist/useFilter.js

@@ -32,15 +32,6 @@ var getPageFromOffset_1 = __importDefault(require("./lib/getPageFromOffset"));
 var shallowEqual_1 = __importDefault(require("./lib/shallowEqual"));
 var store_1 = require("./store");
 function useFilter(namespace, options) {
-    var _a = react_1.useState(function () {
-        var existing = store_1.getFilterStore().getFilter(namespace);
-        var initialValue = existing
-            ? __assign(__assign({}, existing), { shouldRunImmediately: true }) : undefined;
-        return initialValue;
-    }), filterInfo = _a[0], setFilterInfoState = _a[1];
-    var _b = react_1.useState(function () {
-        return store_1.getFilterStore().getData(namespace);
-    }), data = _b[0], setData = _b[1];
     // Having these types of refs helps get around rules of hooks, and they need
     // to be updated each render.
     var ctxRefValue = {
@@ -49,11 +40,26 @@ function useFilter(namespace, options) {
         debounceDuration: options.debounceDuration,
         defaultFilterInfo: options.defaultFilterInfo,
         onBeforeSaveFilter: options.onBeforeSaveFilter,
+        store: options.store,
     };
     var ctxRef = react_1.useRef(ctxRefValue);
     react_1.useEffect(function () {
         ctxRef.current = ctxRefValue;
     });
+    var _a = 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_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);
+    }), data = _b[0], setData = _b[1];
     var _c = react_1.useState(!filterInfo), isLoading = _c[0], setIsLoading = _c[1];
     var doesFilterExist = react_1.useRef(!!filterInfo);
     var lastRefreshAtRef = react_1.useRef(
@@ -83,7 +89,7 @@ function useFilter(namespace, options) {
         var makeRequest = function () {
             lastRefreshAtRef.current = filterInfo.lastRefreshAt;
             var response = ctxRef.current.onChange(filterInfo, updateReasonRef.current);
-            store_1.getFilterStore().saveFilter(namespace, ctxRef.current.onBeforeSaveFilter
+            store_1.getFilterStore(ctxRef.current.store).saveFilter(namespace, ctxRef.current.onBeforeSaveFilter
                 ? ctxRef.current.onBeforeSaveFilter(filterInfo)
                 : filterInfo);
             if (!response) {
@@ -132,7 +138,7 @@ function useFilter(namespace, options) {
                 }
                 if (response.data) {
                     setData(response.data);
-                    store_1.getFilterStore().saveData(namespace, response.data);
+                    store_1.getFilterStore(ctxRef.current.store).saveData(namespace, response.data);
                 }
             }
             if (isPromise(response)) {

package/dist/useSimpleFilter.d.ts

@@ -1,3 +1,4 @@
+import { FilterStore } from './store';
 import { UseFilterUpdateReason } from './useFilter';
 interface UseSimpleFilterOptions<TFilter> {
     /**
@@ -11,6 +12,7 @@ interface UseSimpleFilterOptions<TFilter> {
      */
     debounceDuration?: number;
     onBeforeSaveFilter?: (filterInfo: SimpleFilterInfo<TFilter>) => SimpleFilterInfo<TFilter>;
+    store?: FilterStore;
 }
 export interface SimpleFilterApi<TFilter> {
     /**

package/dist/useSimpleFilter.js

@@ -27,14 +27,27 @@ function useSimpleFilter(namespace, options) {
         debounceDuration: options.debounceDuration,
         defaultFilterInfo: options.defaultFilterInfo,
         onBeforeSaveFilter: options.onBeforeSaveFilter,
+        store: options.store,
     };
     var ctxRef = react_1.useRef(ctxRefValue);
     react_1.useEffect(function () {
         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().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);
@@ -50,7 +63,7 @@ function useSimpleFilter(namespace, options) {
         var timeout = undefined;
         function makeRequest() {
             lastRefreshAtRef.current = filterInfo.lastRefreshAt;
-            store_1.getFilterStore().saveFilter(ctxRef.current.namespace, (ctxRef.current.onBeforeSaveFilter
+            store_1.getFilterStore(ctxRef.current.store).saveFilter(ctxRef.current.namespace, (ctxRef.current.onBeforeSaveFilter
                 ? ctxRef.current.onBeforeSaveFilter(filterInfo)
                 : filterInfo));
             setDebouncedFilterInfo(filterInfo);

package/package.json

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