@etsoo/react 1.8.35 → 1.8.37

package/lib/cjs/index.d.ts

@@ -28,6 +28,7 @@ export * from "./uses/useParamsEx";
 export * from "./uses/useRefs";
 export * from "./uses/useRequiredContext";
 export * from "./uses/useSearchParamsEx";
+export * from "./uses/useSearchParamsWithCache";
 export * from "./uses/useTimeout";
 export * from "./uses/useWindowScroll";
 export * from "./uses/useWindowSize";

package/lib/cjs/index.js

@@ -49,6 +49,7 @@ __exportStar(require("./uses/useParamsEx"), exports);
 __exportStar(require("./uses/useRefs"), exports);
 __exportStar(require("./uses/useRequiredContext"), exports);
 __exportStar(require("./uses/useSearchParamsEx"), exports);
+__exportStar(require("./uses/useSearchParamsWithCache"), exports);
 __exportStar(require("./uses/useTimeout"), exports);
 __exportStar(require("./uses/useWindowScroll"), exports);
 __exportStar(require("./uses/useWindowSize"), exports);

package/lib/cjs/uses/useSearchParamsWithCache.d.ts

@@ -0,0 +1,7 @@
+import { IStorage } from "@etsoo/shared";
+/**
+ * Read search parameters with cache
+ * @param cacheKey Cache key
+ * @param storage Storage
+ */
+export declare function useSearchParamsWithCache(cacheKey?: string, storage?: IStorage): {};

package/lib/cjs/uses/useSearchParamsWithCache.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useSearchParamsWithCache = useSearchParamsWithCache;
+const shared_1 = require("@etsoo/shared");
+const react_router_dom_1 = require("react-router-dom");
+/**
+ * Read search parameters with cache
+ * @param cacheKey Cache key
+ * @param storage Storage
+ */
+function useSearchParamsWithCache(cacheKey, storage) {
+    const data = {};
+    if (cacheKey) {
+        storage ?? (storage = new shared_1.WindowStorage());
+        const paras = storage.getObject(cacheKey);
+        if (paras) {
+            Object.assign(data, paras);
+        }
+    }
+    if ((0, react_router_dom_1.useInRouterContext)()) {
+        const [sp] = (0, react_router_dom_1.useSearchParams)();
+        Object.assign(data, Object.fromEntries(sp.entries()));
+    }
+    return data;
+}

package/lib/mjs/index.d.ts

@@ -28,6 +28,7 @@ export * from "./uses/useParamsEx";
 export * from "./uses/useRefs";
 export * from "./uses/useRequiredContext";
 export * from "./uses/useSearchParamsEx";
+export * from "./uses/useSearchParamsWithCache";
 export * from "./uses/useTimeout";
 export * from "./uses/useWindowScroll";
 export * from "./uses/useWindowSize";

package/lib/mjs/index.js

@@ -33,6 +33,7 @@ export * from "./uses/useParamsEx";
 export * from "./uses/useRefs";
 export * from "./uses/useRequiredContext";
 export * from "./uses/useSearchParamsEx";
+export * from "./uses/useSearchParamsWithCache";
 export * from "./uses/useTimeout";
 export * from "./uses/useWindowScroll";
 export * from "./uses/useWindowSize";

package/lib/mjs/uses/useSearchParamsWithCache.d.ts

@@ -0,0 +1,7 @@
+import { IStorage } from "@etsoo/shared";
+/**
+ * Read search parameters with cache
+ * @param cacheKey Cache key
+ * @param storage Storage
+ */
+export declare function useSearchParamsWithCache(cacheKey?: string, storage?: IStorage): {};

package/lib/mjs/uses/useSearchParamsWithCache.js

@@ -0,0 +1,22 @@
+import { WindowStorage } from "@etsoo/shared";
+import { useInRouterContext, useSearchParams } from "react-router-dom";
+/**
+ * Read search parameters with cache
+ * @param cacheKey Cache key
+ * @param storage Storage
+ */
+export function useSearchParamsWithCache(cacheKey, storage) {
+    const data = {};
+    if (cacheKey) {
+        storage ?? (storage = new WindowStorage());
+        const paras = storage.getObject(cacheKey);
+        if (paras) {
+            Object.assign(data, paras);
+        }
+    }
+    if (useInRouterContext()) {
+        const [sp] = useSearchParams();
+        Object.assign(data, Object.fromEntries(sp.entries()));
+    }
+    return data;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/react",
-  "version": "1.8.35",
+  "version": "1.8.37",
   "description": "TypeScript ReactJs UI Independent Framework",
   "main": "lib/cjs/index.js",
   "module": "lib/mjs/index.js",
@@ -42,7 +42,7 @@
     "@emotion/styled": "^11.13.5",
     "@etsoo/appscript": "^1.6.21",
     "@etsoo/notificationbase": "^1.1.60",
-    "@etsoo/shared": "^1.2.64",
+    "@etsoo/shared": "^1.2.66",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "react-router-dom": "^7.4.1",
@@ -60,9 +60,9 @@
     "@babel/preset-env": "^7.26.9",
     "@babel/runtime-corejs3": "^7.27.0",
     "@testing-library/jest-dom": "^6.6.3",
-    "@testing-library/react": "^16.2.0",
+    "@testing-library/react": "^16.3.0",
     "@types/react": "^18.3.20",
-    "@types/react-dom": "^18.3.1",
+    "@types/react-dom": "^18.3.6",
     "@types/react-window": "^1.8.8",
     "@vitejs/plugin-react": "^4.3.4",
     "jsdom": "^26.0.0",

package/src/index.ts

@@ -43,6 +43,7 @@ export * from "./uses/useParamsEx";
 export * from "./uses/useRefs";
 export * from "./uses/useRequiredContext";
 export * from "./uses/useSearchParamsEx";
+export * from "./uses/useSearchParamsWithCache";
 export * from "./uses/useTimeout";
 export * from "./uses/useWindowScroll";
 export * from "./uses/useWindowSize";

package/src/uses/useSearchParamsWithCache.ts

@@ -0,0 +1,29 @@
+import { IStorage, WindowStorage } from "@etsoo/shared";
+import { useInRouterContext, useSearchParams } from "react-router-dom";
+
+/**
+ * Read search parameters with cache
+ * @param cacheKey Cache key
+ * @param storage Storage
+ */
+export function useSearchParamsWithCache(
+  cacheKey?: string,
+  storage?: IStorage
+) {
+  const data = {};
+
+  if (cacheKey) {
+    storage ??= new WindowStorage();
+    const paras = storage.getObject(cacheKey);
+    if (paras) {
+      Object.assign(data, paras);
+    }
+  }
+
+  if (useInRouterContext()) {
+    const [sp] = useSearchParams();
+    Object.assign(data, Object.fromEntries(sp.entries()));
+  }
+
+  return data;
+}