Merge pull request #6 from n0eyes/develop

Release: v1.1.2
n0eyes · Dec 30, 2023 · fecd143 · fecd143
2 parents 8fa7c6a + 2e9e2ee
commit fecd143
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 10 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-tiniest-form",
-  "version": "1.0.2",
+  "version": "1.1.2",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "browser": "./browser/specific/main.js",

diff --git a/src/hooks/Form/useForm.ts b/src/hooks/Form/useForm.ts
@@ -28,7 +28,7 @@ const useFormStore = <DefaultValues extends FormFields = FormFields>(
   type FormErrors = Errors<DefaultValues>;
   type Name = FieldName<DefaultValues>;
 
-  const formStore = useRef(createFormsStore<DefaultValues>(options?.defaultValues)).current;
+  const formStore = useRef(createFormsStore<DefaultValues>(options)).current;
 
   const [snapshot, setSnapshot] = useState<FormStore>(formStore.store);
 
@@ -125,6 +125,10 @@ const useForm = <DefaultValues extends FormFields>(options?: UseFormOptions<Defa
       onBlur?(e: ChangeEvent<HTMLInputElement | HTMLSelectElement>): void;
     },
   ) => {
+    const isControlledValue = options?.value !== undefined;
+
+    const controlledValue = parseToInputValue(options?.value);
+
     const onChange = (e: ChangeEvent<HTMLInputElement | HTMLSelectElement>) => {
       const {
         target: { value },
@@ -148,21 +152,25 @@ const useForm = <DefaultValues extends FormFields>(options?: UseFormOptions<Defa
     const ref: RefCallback<HTMLInputElement | HTMLSelectElement> = instance => {
       if (!instance) return;
 
-      /**@todo need? */
-      instance.value = getFieldValue(name);
+      if (!getFieldInfo(name)?.registered) {
+        const defaultValue = getFieldValue(name);
 
-      registerField(name, {
-        value: parseToInputValue(options?.value),
-        validations: options?.validations,
-        ref: instance,
-      });
+        registerField(name, {
+          value: controlledValue || defaultValue,
+          validations: options?.validations,
+          ref: instance,
+        });
+
+        instance.value = getFieldValue(name);
+      }
     };
 
     return {
       name,
       onChange,
       onBlur,
       ref,
+      ...(isControlledValue ? { value: controlledValue } : {}),
     };
   };
 

diff --git a/src/utils/formStore/createFormStore.ts b/src/utils/formStore/createFormStore.ts
@@ -61,7 +61,7 @@ const createFormsStore = <DefaultValues extends FormFields>(
     store[name] = {
       ...store[name],
       ...options,
-      value: store[name]?.registered ? store[name]?.value : parseToInputValue(options?.value),
+      value: parseToInputValue(options?.value),
       registered: true,
     };
   };