@etsoo/react 1.7.18 → 1.7.20

package/lib/app/ReactUtils.d.ts

@@ -35,6 +35,7 @@ export declare namespace ReactUtils {
      * @param refs Refs
      * @param data Data
      * @param callback Callback to return new value
+     * @param ignoreEmpty Ignore empty string or not, default true
      */
-    function updateRefValues<D extends object, T = HTMLInputElement>(refs: Partial<DataTypes.DI<ReadonlyArray<keyof D & string>, React.MutableRefObject<T | undefined>>>, data: D, callback?: ((item: T) => any) | keyof T): void;
+    function updateRefValues<D extends object, T = HTMLInputElement>(refs: Partial<DataTypes.DI<ReadonlyArray<keyof D & string>, React.MutableRefObject<T | undefined>>>, data: D, callback?: ((item: T) => any) | keyof T, ignoreEmpty?: boolean): void;
 }

package/lib/app/ReactUtils.js

@@ -133,13 +133,19 @@ export var ReactUtils;
      * @param refs Refs
      * @param data Data
      * @param callback Callback to return new value
+     * @param ignoreEmpty Ignore empty string or not, default true
      */
-    function updateRefValues(refs, data, callback) {
+    function updateRefValues(refs, data, callback, ignoreEmpty = true) {
         const local = callback == null
             ? undefined
             : typeof callback === 'function'
                 ? callback
                 : (item) => item[callback];
+        const formatValue = (value) => {
+            if (ignoreEmpty && value === '')
+                return null;
+            return value;
+        };
         let k;
         for (k in refs) {
             const ref = refs[k];
@@ -150,11 +156,11 @@ export var ReactUtils;
                 data[k] = local(item);
             }
             else if (item instanceof HTMLInputElement) {
-                Utils.setNestedValue(data, item.name || k, DomUtils.getInputValue(item));
+                Utils.setNestedValue(data, item.name || k, formatValue(DomUtils.getInputValue(item)));
             }
             else if (item instanceof HTMLTextAreaElement ||
                 item instanceof HTMLSelectElement) {
-                Utils.setNestedValue(data, item.name || k, item.value);
+                Utils.setNestedValue(data, item.name || k, formatValue(item.value));
             }
             else {
                 data[k] = item.value;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/react",
-    "version": "1.7.18",
+    "version": "1.7.20",
     "description": "TypeScript ReactJs UI Independent Framework",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
@@ -50,15 +50,15 @@
         "@emotion/css": "^11.11.2",
         "@emotion/react": "^11.11.1",
         "@emotion/styled": "^11.11.0",
-        "@etsoo/appscript": "^1.4.59",
-        "@etsoo/notificationbase": "^1.1.29",
-        "@etsoo/shared": "^1.2.17",
-        "@types/react": "^18.2.28",
-        "@types/react-dom": "^18.2.13",
-        "@types/react-window": "^1.8.6",
+        "@etsoo/appscript": "^1.4.62",
+        "@etsoo/notificationbase": "^1.1.30",
+        "@etsoo/shared": "^1.2.18",
+        "@types/react": "^18.2.33",
+        "@types/react-dom": "^18.2.14",
+        "@types/react-window": "^1.8.7",
         "react": "^18.2.0",
         "react-dom": "^18.2.0",
-        "react-router-dom": "^6.16.0",
+        "react-router-dom": "^6.17.0",
         "react-window": "^1.8.9"
     },
     "devDependencies": {
@@ -69,7 +69,7 @@
         "@babel/runtime-corejs3": "^7.23.2",
         "@testing-library/jest-dom": "^6.1.4",
         "@testing-library/react": "^14.0.0",
-        "@types/jest": "^29.5.5",
+        "@types/jest": "^29.5.7",
         "jest": "^29.7.0",
         "jest-environment-jsdom": "^29.7.0",
         "ts-jest": "^29.1.1",

package/src/app/ReactUtils.ts

@@ -163,6 +163,7 @@ export namespace ReactUtils {
      * @param refs Refs
      * @param data Data
      * @param callback Callback to return new value
+     * @param ignoreEmpty Ignore empty string or not, default true
      */
     export function updateRefValues<D extends object, T = HTMLInputElement>(
         refs: Partial<
@@ -172,7 +173,8 @@ export namespace ReactUtils {
             >
         >,
         data: D,
-        callback?: ((item: T) => any) | keyof T
+        callback?: ((item: T) => any) | keyof T,
+        ignoreEmpty: boolean = true
     ) {
         const local: typeof callback =
             callback == null
@@ -181,6 +183,11 @@ export namespace ReactUtils {
                 ? callback
                 : (item) => item[callback];
 
+        const formatValue = (value: unknown) => {
+            if (ignoreEmpty && value === '') return null;
+            return value;
+        };
+
         let k: keyof typeof refs;
         for (k in refs) {
             const ref = refs[k];
@@ -193,13 +200,17 @@ export namespace ReactUtils {
                 Utils.setNestedValue(
                     data,
                     item.name || k,
-                    DomUtils.getInputValue(item)
+                    formatValue(DomUtils.getInputValue(item))
                 );
             } else if (
                 item instanceof HTMLTextAreaElement ||
                 item instanceof HTMLSelectElement
             ) {
-                Utils.setNestedValue(data, item.name || k, item.value);
+                Utils.setNestedValue(
+                    data,
+                    item.name || k,
+                    formatValue(item.value)
+                );
             } else {
                 data[k] = (item as any).value;
             }