@snack-uikit/utils 3.7.1-preview-74c13173.0 → 3.7.1-preview-d479ae3f.0

package/README.md

@@ -75,15 +75,11 @@
 ### Props
 | name | type | default value | description |
 |------|------|---------------|-------------|
-| onLoadFilter* | `(filter: T) => void` | - |  |
-| filter* | `T` | - |  |
 | source | `BaseSource<T>` | - |  |
 ## useSaveFilterState
 ### Props
 | name | type | default value | description |
 |------|------|---------------|-------------|
-| onLoadFilter* | `(filter: TFilter) => void` | - |  |
-| filter* | `TFilter` | - |  |
 | options | `FilterStateOptions<TFilter>` | - |  |
 | parser | `(jsonFilter: string) => TFilter` | - |  |
 | serializer | `(filter: TFilter) => string` | - |  |

package/dist/cjs/hooks/useSaveFilterState.d.ts

@@ -9,5 +9,8 @@ type FilterStateProps<TFilter> = Omit<StateProps<TFilter>, 'source'> & {
     parser?(jsonFilter: string): TFilter;
     serializer?(filter: TFilter): string;
 };
-export declare const useSaveFilterState: <TFilter>({ options, filter, onLoadFilter, parser, serializer, }: FilterStateProps<TFilter>) => void;
+export declare const useSaveFilterState: <TFilter>({ options, parser, serializer }: FilterStateProps<TFilter>) => {
+    getDefaultFilter: () => NonNullable<TFilter> | null | undefined;
+    setDataToStorages: (data: TFilter) => void;
+};
 export {};

package/dist/cjs/hooks/useSaveFilterState.js

@@ -9,48 +9,34 @@ const useSaveState_1 = require("./useSaveState");
 const useSaveFilterState = _ref => {
   let {
     options,
-    filter,
-    onLoadFilter,
     parser,
     serializer
   } = _ref;
-  const [queryFilter, setQueryFilter] = (0, react_1.useState)(null);
-  const [localStorageFilter, setLocalStorageFilter] = (0, react_1.useState)(null);
-  const [isLoaded, setIsLoaded] = (0, react_1.useState)({
-    localStorage: false,
-    queryParams: false
-  });
-  const onLoadQueryParams = (0, react_1.useCallback)(value => {
-    setQueryFilter(value);
-    setIsLoaded(prev => Object.assign(Object.assign({}, prev), {
-      queryParams: true
-    }));
-  }, []);
-  const onLoadLocalStorage = (0, react_1.useCallback)(value => {
-    setLocalStorageFilter(value);
-    setIsLoaded(prev => Object.assign(Object.assign({}, prev), {
-      localStorage: true
-    }));
-  }, []);
   const querySource = (0, react_1.useMemo)(() => options ? new useSaveState_1.QueryParamSource(options.filterQueryKey, options.validateData, parser, serializer) : undefined, [options, parser, serializer]);
   const localStorageSource = (0, react_1.useMemo)(() => options ? new useSaveState_1.LocalStorageSource(options.filterLocalStorageKey, options.validateData, parser, serializer) : undefined, [options, parser, serializer]);
-  (0, useSaveState_1.useSaveState)({
-    filter,
-    onLoadFilter: onLoadQueryParams,
+  const {
+    getData: getLocalStorageData,
+    setData: setLocalStorageData
+  } = (0, useSaveState_1.useSaveState)({
     source: querySource
   });
-  (0, useSaveState_1.useSaveState)({
-    filter,
-    onLoadFilter: onLoadLocalStorage,
+  const {
+    getData: getQueryParamsData,
+    setData: setQueryParamsData
+  } = (0, useSaveState_1.useSaveState)({
     source: localStorageSource
   });
-  (0, react_1.useEffect)(() => {
-    if (!options) {
-      onLoadFilter(null);
-    }
-    if (isLoaded.localStorage && isLoaded.queryParams) {
-      onLoadFilter(queryFilter ? queryFilter : localStorageFilter);
-    }
-  }, [queryFilter, onLoadFilter, localStorageFilter, isLoaded, options]);
+  const setDataToStorages = (0, react_1.useCallback)(data => {
+    setLocalStorageData(data);
+    setQueryParamsData(data);
+  }, [setLocalStorageData, setQueryParamsData]);
+  const getDefaultFilter = (0, react_1.useCallback)(() => {
+    const queryData = getQueryParamsData();
+    return queryData ? queryData : getLocalStorageData();
+  }, [getLocalStorageData, getQueryParamsData]);
+  return {
+    getDefaultFilter,
+    setDataToStorages
+  };
 };
 exports.useSaveFilterState = useSaveFilterState;

package/dist/cjs/hooks/useSaveState/useSaveState.d.ts

@@ -1,7 +1,8 @@
 import { BaseSource } from './sources/baseSource';
 export type StateProps<T> = {
-    filter: T;
-    onLoadFilter(filter: T | null): void;
     source?: BaseSource<T>;
 };
-export declare const useSaveState: <T>({ filter, onLoadFilter, source }: StateProps<T>) => void;
+export declare const useSaveState: <T>({ source }: StateProps<T>) => {
+    getData: () => NonNullable<T> | null | undefined;
+    setData: (filter: T) => void;
+};

package/dist/cjs/hooks/useSaveState/useSaveState.js

@@ -7,23 +7,18 @@ exports.useSaveState = void 0;
 const react_1 = require("react");
 const useSaveState = _ref => {
   let {
-    filter,
-    onLoadFilter,
     source
   } = _ref;
-  const [isLoaded, setIsLoaded] = (0, react_1.useState)(false);
-  (0, react_1.useEffect)(() => {
+  const setData = (0, react_1.useCallback)(filter => {
     if (!source) {
       return;
     }
-    onLoadFilter(source.getFilter());
-    setIsLoaded(true);
-  }, [onLoadFilter, source]);
-  (0, react_1.useEffect)(() => {
-    if (!source || !isLoaded) {
-      return;
-    }
     source.setFilter(filter);
-  }, [filter, source, isLoaded]);
+  }, [source]);
+  const getData = (0, react_1.useCallback)(() => source === null || source === void 0 ? void 0 : source.getFilter(), [source]);
+  return {
+    getData,
+    setData
+  };
 };
 exports.useSaveState = useSaveState;

package/dist/esm/hooks/useSaveFilterState.d.ts

@@ -9,5 +9,8 @@ type FilterStateProps<TFilter> = Omit<StateProps<TFilter>, 'source'> & {
     parser?(jsonFilter: string): TFilter;
     serializer?(filter: TFilter): string;
 };
-export declare const useSaveFilterState: <TFilter>({ options, filter, onLoadFilter, parser, serializer, }: FilterStateProps<TFilter>) => void;
+export declare const useSaveFilterState: <TFilter>({ options, parser, serializer }: FilterStateProps<TFilter>) => {
+    getDefaultFilter: () => NonNullable<TFilter> | null | undefined;
+    setDataToStorages: (data: TFilter) => void;
+};
 export {};

package/dist/esm/hooks/useSaveFilterState.js

@@ -1,34 +1,25 @@
-import { useCallback, useEffect, useMemo, useState } from 'react';
+import { useCallback, useMemo } from 'react';
 import { LocalStorageSource, QueryParamSource, useSaveState } from './useSaveState';
-export const useSaveFilterState = ({ options, filter, onLoadFilter, parser, serializer, }) => {
-    const [queryFilter, setQueryFilter] = useState(null);
-    const [localStorageFilter, setLocalStorageFilter] = useState(null);
-    const [isLoaded, setIsLoaded] = useState({
-        localStorage: false,
-        queryParams: false,
-    });
-    const onLoadQueryParams = useCallback((value) => {
-        setQueryFilter(value);
-        setIsLoaded(prev => (Object.assign(Object.assign({}, prev), { queryParams: true })));
-    }, []);
-    const onLoadLocalStorage = useCallback((value) => {
-        setLocalStorageFilter(value);
-        setIsLoaded(prev => (Object.assign(Object.assign({}, prev), { localStorage: true })));
-    }, []);
+export const useSaveFilterState = ({ options, parser, serializer }) => {
     const querySource = useMemo(() => options
         ? new QueryParamSource(options.filterQueryKey, options.validateData, parser, serializer)
         : undefined, [options, parser, serializer]);
     const localStorageSource = useMemo(() => options
         ? new LocalStorageSource(options.filterLocalStorageKey, options.validateData, parser, serializer)
         : undefined, [options, parser, serializer]);
-    useSaveState({ filter, onLoadFilter: onLoadQueryParams, source: querySource });
-    useSaveState({ filter, onLoadFilter: onLoadLocalStorage, source: localStorageSource });
-    useEffect(() => {
-        if (!options) {
-            onLoadFilter(null);
-        }
-        if (isLoaded.localStorage && isLoaded.queryParams) {
-            onLoadFilter(queryFilter ? queryFilter : localStorageFilter);
-        }
-    }, [queryFilter, onLoadFilter, localStorageFilter, isLoaded, options]);
+    const { getData: getLocalStorageData, setData: setLocalStorageData } = useSaveState({
+        source: querySource,
+    });
+    const { getData: getQueryParamsData, setData: setQueryParamsData } = useSaveState({
+        source: localStorageSource,
+    });
+    const setDataToStorages = useCallback((data) => {
+        setLocalStorageData(data);
+        setQueryParamsData(data);
+    }, [setLocalStorageData, setQueryParamsData]);
+    const getDefaultFilter = useCallback(() => {
+        const queryData = getQueryParamsData();
+        return queryData ? queryData : getLocalStorageData();
+    }, [getLocalStorageData, getQueryParamsData]);
+    return { getDefaultFilter, setDataToStorages };
 };

package/dist/esm/hooks/useSaveState/useSaveState.d.ts

@@ -1,7 +1,8 @@
 import { BaseSource } from './sources/baseSource';
 export type StateProps<T> = {
-    filter: T;
-    onLoadFilter(filter: T | null): void;
     source?: BaseSource<T>;
 };
-export declare const useSaveState: <T>({ filter, onLoadFilter, source }: StateProps<T>) => void;
+export declare const useSaveState: <T>({ source }: StateProps<T>) => {
+    getData: () => NonNullable<T> | null | undefined;
+    setData: (filter: T) => void;
+};

package/dist/esm/hooks/useSaveState/useSaveState.js

@@ -1,17 +1,11 @@
-import { useEffect, useState } from 'react';
-export const useSaveState = ({ filter, onLoadFilter, source }) => {
-    const [isLoaded, setIsLoaded] = useState(false);
-    useEffect(() => {
+import { useCallback } from 'react';
+export const useSaveState = ({ source }) => {
+    const setData = useCallback((filter) => {
         if (!source) {
             return;
         }
-        onLoadFilter(source.getFilter());
-        setIsLoaded(true);
-    }, [onLoadFilter, source]);
-    useEffect(() => {
-        if (!source || !isLoaded) {
-            return;
-        }
         source.setFilter(filter);
-    }, [filter, source, isLoaded]);
+    }, [source]);
+    const getData = useCallback(() => source === null || source === void 0 ? void 0 : source.getFilter(), [source]);
+    return { getData, setData };
 };

package/package.json

@@ -4,7 +4,7 @@
     "access": "public"
   },
   "title": "Utils",
-  "version": "3.7.1-preview-74c13173.0",
+  "version": "3.7.1-preview-d479ae3f.0",
   "sideEffects": [
     "*.css",
     "*.woff",
@@ -39,5 +39,5 @@
     "react-swipeable": "7.0.2",
     "uncontrollable": "8.0.4"
   },
-  "gitHead": "a3a4d2281eb9a1143c3a60efd0ccca4daa5c246c"
+  "gitHead": "fbef57a916bd6bc34b52fe127004713a8228b795"
 }

package/src/hooks/useSaveFilterState.ts

@@ -1,4 +1,4 @@
-import { useCallback, useEffect, useMemo, useState } from 'react';
+import { useCallback, useMemo } from 'react';
 
 import { LocalStorageSource, QueryParamSource, StateProps, useSaveState } from './useSaveState';
 
@@ -14,30 +14,7 @@ type FilterStateProps<TFilter> = Omit<StateProps<TFilter>, 'source'> & {
   serializer?(filter: TFilter): string;
 };
 
-export const useSaveFilterState = <TFilter>({
-  options,
-  filter,
-  onLoadFilter,
-  parser,
-  serializer,
-}: FilterStateProps<TFilter>) => {
-  const [queryFilter, setQueryFilter] = useState<TFilter | null>(null);
-  const [localStorageFilter, setLocalStorageFilter] = useState<TFilter | null>(null);
-  const [isLoaded, setIsLoaded] = useState<{ localStorage: boolean; queryParams: boolean }>({
-    localStorage: false,
-    queryParams: false,
-  });
-
-  const onLoadQueryParams = useCallback((value: TFilter | null) => {
-    setQueryFilter(value);
-    setIsLoaded(prev => ({ ...prev, queryParams: true }));
-  }, []);
-
-  const onLoadLocalStorage = useCallback((value: TFilter | null) => {
-    setLocalStorageFilter(value);
-    setIsLoaded(prev => ({ ...prev, localStorage: true }));
-  }, []);
-
+export const useSaveFilterState = <TFilter>({ options, parser, serializer }: FilterStateProps<TFilter>) => {
   const querySource = useMemo(
     () =>
       options
@@ -53,15 +30,25 @@ export const useSaveFilterState = <TFilter>({
     [options, parser, serializer],
   );
 
-  useSaveState<TFilter>({ filter, onLoadFilter: onLoadQueryParams, source: querySource });
-  useSaveState<TFilter>({ filter, onLoadFilter: onLoadLocalStorage, source: localStorageSource });
+  const { getData: getLocalStorageData, setData: setLocalStorageData } = useSaveState<TFilter>({
+    source: querySource,
+  });
+  const { getData: getQueryParamsData, setData: setQueryParamsData } = useSaveState<TFilter>({
+    source: localStorageSource,
+  });
+
+  const setDataToStorages = useCallback(
+    (data: TFilter) => {
+      setLocalStorageData(data);
+      setQueryParamsData(data);
+    },
+    [setLocalStorageData, setQueryParamsData],
+  );
+
+  const getDefaultFilter = useCallback(() => {
+    const queryData = getQueryParamsData();
+    return queryData ? queryData : getLocalStorageData();
+  }, [getLocalStorageData, getQueryParamsData]);
 
-  useEffect(() => {
-    if (!options) {
-      onLoadFilter(null);
-    }
-    if (isLoaded.localStorage && isLoaded.queryParams) {
-      onLoadFilter(queryFilter ? queryFilter : localStorageFilter);
-    }
-  }, [queryFilter, onLoadFilter, localStorageFilter, isLoaded, options]);
+  return { getDefaultFilter, setDataToStorages };
 };

package/src/hooks/useSaveState/useSaveState.ts

@@ -1,28 +1,23 @@
-import { useEffect, useState } from 'react';
+import { useCallback } from 'react';
 
 import { BaseSource } from './sources/baseSource';
 
 export type StateProps<T> = {
-  filter: T;
-  onLoadFilter(filter: T | null): void;
   source?: BaseSource<T>;
 };
 
-export const useSaveState = <T>({ filter, onLoadFilter, source }: StateProps<T>) => {
-  const [isLoaded, setIsLoaded] = useState<boolean>(false);
+export const useSaveState = <T>({ source }: StateProps<T>) => {
+  const setData = useCallback(
+    (filter: T) => {
+      if (!source) {
+        return;
+      }
+      source.setFilter(filter);
+    },
+    [source],
+  );
 
-  useEffect(() => {
-    if (!source) {
-      return;
-    }
-    onLoadFilter(source.getFilter());
-    setIsLoaded(true);
-  }, [onLoadFilter, source]);
+  const getData = useCallback(() => source?.getFilter(), [source]);
 
-  useEffect(() => {
-    if (!source || !isLoaded) {
-      return;
-    }
-    source.setFilter(filter);
-  }, [filter, source, isLoaded]);
+  return { getData, setData };
 };