@etsoo/react 1.8.37 → 1.8.39

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

@@ -4,3 +4,8 @@ import { DataTypes } from "@etsoo/shared";
  * Provide exact type data
  */
 export declare function useSearchParamsEx<T extends DataTypes.BasicTemplate>(template: T): DataTypes.BasicTemplateType<T>;
+/**
+ * Extended useSearchParams of react-router-dom
+ * Provide exact type data and setSearchParams function
+ */
+export declare function useSearchParamsEx1<T extends DataTypes.BasicTemplate>(template: T): readonly [DataTypes.BasicTemplateType<T>, import("react-router").SetURLSearchParams];

package/lib/cjs/uses/useSearchParamsEx.js

@@ -1,8 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useSearchParamsEx = useSearchParamsEx;
+exports.useSearchParamsEx1 = useSearchParamsEx1;
 const shared_1 = require("@etsoo/shared");
 const react_router_1 = require("react-router");
+function parseData(template, sp) {
+    const paras = Object.fromEntries(Object.keys(template).map((key) => {
+        const type = template[key];
+        return [key, type.endsWith("[]") ? sp.getAll(key) : sp.get(key)];
+    }));
+    // Return
+    return shared_1.DomUtils.dataAs(paras, template, false);
+}
 /**
  * Extended useSearchParams of react-router-dom
  * Provide exact type data
@@ -10,10 +19,15 @@ const react_router_1 = require("react-router");
 function useSearchParamsEx(template) {
     // Get parameters
     const [sp] = (0, react_router_1.useSearchParams)();
-    const paras = Object.fromEntries(Object.keys(template).map((key) => {
-        const type = template[key];
-        return [key, type.endsWith("[]") ? sp.getAll(key) : sp.get(key)];
-    }));
+    return parseData(template, sp);
+}
+/**
+ * Extended useSearchParams of react-router-dom
+ * Provide exact type data and setSearchParams function
+ */
+function useSearchParamsEx1(template) {
+    // Get parameters
+    const [sp, setSearchParams] = (0, react_router_1.useSearchParams)();
     // Return
-    return shared_1.DomUtils.dataAs(paras, template, false);
+    return [parseData(template, sp), setSearchParams];
 }

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

@@ -4,3 +4,8 @@ import { DataTypes } from "@etsoo/shared";
  * Provide exact type data
  */
 export declare function useSearchParamsEx<T extends DataTypes.BasicTemplate>(template: T): DataTypes.BasicTemplateType<T>;
+/**
+ * Extended useSearchParams of react-router-dom
+ * Provide exact type data and setSearchParams function
+ */
+export declare function useSearchParamsEx1<T extends DataTypes.BasicTemplate>(template: T): readonly [DataTypes.BasicTemplateType<T>, import("react-router").SetURLSearchParams];

package/lib/mjs/uses/useSearchParamsEx.js

@@ -1,5 +1,13 @@
 import { DomUtils } from "@etsoo/shared";
 import { useSearchParams } from "react-router";
+function parseData(template, sp) {
+    const paras = Object.fromEntries(Object.keys(template).map((key) => {
+        const type = template[key];
+        return [key, type.endsWith("[]") ? sp.getAll(key) : sp.get(key)];
+    }));
+    // Return
+    return DomUtils.dataAs(paras, template, false);
+}
 /**
  * Extended useSearchParams of react-router-dom
  * Provide exact type data
@@ -7,10 +15,15 @@ import { useSearchParams } from "react-router";
 export function useSearchParamsEx(template) {
     // Get parameters
     const [sp] = useSearchParams();
-    const paras = Object.fromEntries(Object.keys(template).map((key) => {
-        const type = template[key];
-        return [key, type.endsWith("[]") ? sp.getAll(key) : sp.get(key)];
-    }));
+    return parseData(template, sp);
+}
+/**
+ * Extended useSearchParams of react-router-dom
+ * Provide exact type data and setSearchParams function
+ */
+export function useSearchParamsEx1(template) {
+    // Get parameters
+    const [sp, setSearchParams] = useSearchParams();
     // Return
-    return DomUtils.dataAs(paras, template, false);
+    return [parseData(template, sp), setSearchParams];
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/react",
-  "version": "1.8.37",
+  "version": "1.8.39",
   "description": "TypeScript ReactJs UI Independent Framework",
   "main": "lib/cjs/index.js",
   "module": "lib/mjs/index.js",
@@ -40,12 +40,12 @@
     "@emotion/css": "^11.13.5",
     "@emotion/react": "^11.13.5",
     "@emotion/styled": "^11.13.5",
-    "@etsoo/appscript": "^1.6.21",
+    "@etsoo/appscript": "^1.6.22",
     "@etsoo/notificationbase": "^1.1.60",
-    "@etsoo/shared": "^1.2.66",
+    "@etsoo/shared": "^1.2.68",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
-    "react-router-dom": "^7.4.1",
+    "react-router-dom": "^7.5.0",
     "react-window": "^1.8.11"
   },
   "overrides": {
@@ -65,8 +65,8 @@
     "@types/react-dom": "^18.3.6",
     "@types/react-window": "^1.8.8",
     "@vitejs/plugin-react": "^4.3.4",
-    "jsdom": "^26.0.0",
-    "typescript": "^5.8.2",
+    "jsdom": "^26.1.0",
+    "typescript": "^5.8.3",
     "vitest": "^3.1.1"
   }
 }

package/src/uses/useSearchParamsEx.ts

@@ -1,6 +1,21 @@
 import { DataTypes, DomUtils } from "@etsoo/shared";
 import { useSearchParams } from "react-router";
 
+function parseData<T extends DataTypes.BasicTemplate>(
+  template: T,
+  sp: URLSearchParams
+) {
+  const paras = Object.fromEntries(
+    Object.keys(template).map((key) => {
+      const type = template[key];
+      return [key, type.endsWith("[]") ? sp.getAll(key) : sp.get(key)];
+    })
+  );
+
+  // Return
+  return DomUtils.dataAs(paras, template, false);
+}
+
 /**
  * Extended useSearchParams of react-router-dom
  * Provide exact type data
@@ -10,13 +25,19 @@ export function useSearchParamsEx<T extends DataTypes.BasicTemplate>(
 ) {
   // Get parameters
   const [sp] = useSearchParams();
-  const paras = Object.fromEntries(
-    Object.keys(template).map((key) => {
-      const type = template[key];
-      return [key, type.endsWith("[]") ? sp.getAll(key) : sp.get(key)];
-    })
-  );
+  return parseData(template, sp);
+}
+
+/**
+ * Extended useSearchParams of react-router-dom
+ * Provide exact type data and setSearchParams function
+ */
+export function useSearchParamsEx1<T extends DataTypes.BasicTemplate>(
+  template: T
+) {
+  // Get parameters
+  const [sp, setSearchParams] = useSearchParams();
 
   // Return
-  return DomUtils.dataAs(paras, template, false);
+  return [parseData(template, sp), setSearchParams] as const;
 }