x-ui-design 0.3.94 → 0.3.97

package/dist/esm/types/types/form.d.ts

@@ -89,7 +89,7 @@ export interface FormInstance {
     setFieldValue: (name: string, value: RuleTypes) => void;
     getFieldValue: (name: string) => RuleTypes;
     validateFields: (nameList?: string[]) => Promise<boolean>;
-    setFieldsValue: (values: Partial<Record<string, RuleTypes>>) => void;
+    setFieldsValue: (values: Partial<Record<string, RuleTypes>>, reset?: boolean | null | undefined) => void;
     getFieldsValue: (nameList?: string[]) => Record<string, RuleTypes>;
     isFieldTouched: (name: string) => boolean;
     getFieldsError: () => Pick<FieldError, 'errors' | 'name'>[];

package/dist/index.esm.js

@@ -675,8 +675,8 @@ const useForm = (initialValues = {}, onFieldsChange, onValuesChange, scrollToFir
       });
     }
   }
-  function setFieldsValue(values) {
-    Object.entries(values).forEach(([name, value]) => setFieldValue(name, value));
+  function setFieldsValue(values, reset) {
+    Object.entries(values).forEach(([name, value]) => setFieldValue(name, value, undefined, reset));
   }
   function setFields(fields) {
     fields.forEach(({
@@ -2738,31 +2738,25 @@ const InputComponent = /*#__PURE__*/forwardRef(({
     }
   }));
   useEffect(() => {
-    setInternalValue(mask ? applyMask(stripMask(`${value ?? ''}`, mask), mask) : `${value ?? ''}`);
-  }, [value, mask]);
+    setInternalValue(mask ? applyMask(stripMask(`${value ?? ''}`, mask, maskChar), mask, maskChar) : `${value ?? ''}`);
+  }, [value, mask, maskChar]);
   const handleChange = e => {
     const inputEl = inputRef.current;
     if (!inputEl) return;
     const rawInput = e.target.value;
-    const prevCaretPos = inputEl.selectionStart ?? rawInput.length;
+    let nextCaret = inputEl.selectionStart ?? rawInput.length;
     const raw = mask ? rawInput.replace(maskRegex, '') : rawInput;
-    const masked = mask ? applyMask(raw, mask) : rawInput;
+    const masked = mask ? applyMask(raw, mask, maskChar) : rawInput;
     setInternalValue(masked);
     if (mask) {
       requestAnimationFrame(() => {
         if (!inputEl) return;
-        let nextCaret = prevCaretPos;
         const isBackspace = lastKeyPressed.current === 'Backspace';
         const isDelete = lastKeyPressed.current === 'Delete';
-        if (isBackspace || isDelete) {
-          if (mask.includes(masked[nextCaret - 1])) {
+        while (mask.includes(masked[nextCaret - 1])) {
+          if (isBackspace || isDelete) {
             nextCaret--;
-          }
-        } else {
-          if (mask.includes(masked[nextCaret - 1])) {
-            nextCaret++;
-          }
-          while (nextCaret < masked.length && mask[nextCaret] !== maskChar) {
+          } else {
             nextCaret++;
           }
         }