@etsoo/react 1.7.9 → 1.7.10

package/lib/app/ReactUtils.d.ts

@@ -27,9 +27,9 @@ export declare namespace ReactUtils {
      * Update refs
      * @param refs Refs
      * @param data Data
-     * @param callback Callback to update refs' value
+     * @param callback Callback to update refs' value, return false continue to process
      */
-    function updateRefs<D, T = HTMLInputElement>(refs: Partial<DataTypes.DI<ReadonlyArray<keyof D & string>, React.MutableRefObject<T | undefined>>>, data: D, callback?: ((item: T, value: D[keyof D & string]) => void) | keyof T): void;
+    function updateRefs<D, T = HTMLInputElement>(refs: Partial<DataTypes.DI<ReadonlyArray<keyof D & string>, React.MutableRefObject<T | undefined>>>, data: D, callback?: ((item: T, value: D[keyof D & string]) => void | boolean) | keyof T): void;
     /**
      * Update data with refs
      * @param refs Refs

package/lib/app/ReactUtils.js

@@ -1,3 +1,4 @@
+import { DomUtils } from '@etsoo/shared';
 /**
  * React utils
  */
@@ -88,7 +89,7 @@ export var ReactUtils;
      * Update refs
      * @param refs Refs
      * @param data Data
-     * @param callback Callback to update refs' value
+     * @param callback Callback to update refs' value, return false continue to process
      */
     function updateRefs(refs, data, callback) {
         const local = callback == null
@@ -105,12 +106,14 @@ export var ReactUtils;
             if (item == null)
                 continue;
             const value = data[k];
-            if (local) {
-                local(item, value);
+            if (local && local(item, value) !== false) {
+                continue;
+            }
+            else if (item instanceof HTMLInputElement) {
+                item.value = `${value !== null && value !== void 0 ? value : ''}`;
             }
             else {
-                // Straightforward set string value to property "value"
-                item.value = value !== null && value !== void 0 ? value : '';
+                item.value = value;
             }
         }
     }
@@ -136,6 +139,9 @@ export var ReactUtils;
             if (local) {
                 data[k] = local(item);
             }
+            else if (item instanceof HTMLInputElement) {
+                data[k] = DomUtils.getInputValue(item);
+            }
             else {
                 data[k] = item.value;
             }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/react",
-    "version": "1.7.9",
+    "version": "1.7.10",
     "description": "TypeScript ReactJs UI Independent Framework",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",

package/src/app/ReactUtils.ts

@@ -1,4 +1,4 @@
-import { DataTypes } from '@etsoo/shared';
+import { DataTypes, DomUtils } from '@etsoo/shared';
 import React from 'react';
 
 /**
@@ -104,7 +104,7 @@ export namespace ReactUtils {
      * Update refs
      * @param refs Refs
      * @param data Data
-     * @param callback Callback to update refs' value
+     * @param callback Callback to update refs' value, return false continue to process
      */
     export function updateRefs<D, T = HTMLInputElement>(
         refs: Partial<
@@ -114,7 +114,9 @@ export namespace ReactUtils {
             >
         >,
         data: D,
-        callback?: ((item: T, value: D[keyof D & string]) => void) | keyof T
+        callback?:
+            | ((item: T, value: D[keyof D & string]) => void | boolean)
+            | keyof T
     ) {
         const local: typeof callback =
             callback == null
@@ -132,11 +134,12 @@ export namespace ReactUtils {
             if (item == null) continue;
             const value = data[k];
 
-            if (local) {
-                local(item, value);
+            if (local && local(item, value) !== false) {
+                continue;
+            } else if (item instanceof HTMLInputElement) {
+                item.value = `${value ?? ''}`;
             } else {
-                // Straightforward set string value to property "value"
-                (item as any).value = value ?? '';
+                (item as any).value = value;
             }
         }
     }
@@ -172,6 +175,8 @@ export namespace ReactUtils {
 
             if (local) {
                 data[k] = local(item);
+            } else if (item instanceof HTMLInputElement) {
+                data[k] = DomUtils.getInputValue(item) as any;
             } else {
                 data[k] = (item as any).value;
             }