add default value check

aerian-studios · Oct 16, 2020 · 594febe · 594febe
1 parent b2d99f0
commit 594febe
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/src/components/Form/Form.story.tsx b/src/components/Form/Form.story.tsx
@@ -186,7 +186,14 @@ export const applyThemeForm = () => (
           { label: "Brie", value: "brie" },
         ]}
       />
+
+      <FormTagSelector 
+        name="tagging"
+        label="Doing a tagging"
+        className={styles.formInput}
+        defaultValue={["a", "b"]}
+      />
     </ThemedFormContents>
-    <ThemedFormControls loading />
+    <ThemedFormControls />
   </Form>
 );
diff --git a/src/components/FormElements/FormElements.tsx b/src/components/FormElements/FormElements.tsx
@@ -311,7 +311,7 @@ export const FormTagSelector: React.FC<TagSelectorProps> = ({
   name,
   inputClassName,
   tagClassName,
-  defaultValue
+  defaultValue,
 }) => {
   const { setValue, register } = useFormContext("TagSelector");
 
@@ -351,8 +351,10 @@ export const FormTagSelector: React.FC<TagSelectorProps> = ({
 
   useEffect(() => {
     register(name);
-    setTags(defaultValue as string[]);
-    setValue(name, defaultValue as string[]);
+    if (Array.isArray(defaultValue)) {
+      setTags(defaultValue);
+      setValue(name, defaultValue);
+    }
   }, []);
 
   const Tags: React.FC = () => (