@etsoo/react 1.7.18 → 1.7.19

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.19",
     "description": "TypeScript ReactJs UI Independent Framework",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",

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;
             }