FIX select input issue

MAIF · Jan 24, 2022 · 14a0ec6 · 14a0ec6
1 parent 1c308d5
commit 14a0ec6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/src/form.js b/src/form.js
@@ -222,7 +222,6 @@ export const Form = React.forwardRef(({ schema, flow, value, inputWrapper, onSub
               switch (typeof visible) {
                 case 'object':
                   const value = watch(step.visible.ref);
-                  console.log({ value, step })
                   return option(step.visible.test).map(test => test(value)).getOrElse(value)
                 case 'boolean':
                   return visible;
@@ -303,7 +302,7 @@ const Step = ({ entry, step, error, errors, register, schema, control, trigger,
             <BasicWrapper key={`collapse-${en}-${entryIdx}`} entry={en} error={err} label={stp?.label || en} help={stp?.help} render={inputWrapper}>
               <Step entry={en} step={stp} error={err} errors={errors}
                 register={register} schema={schema} control={control} trigger={trigger} getValues={getValues}
-                setValue={setValue} watch={watch} inputWrapper={inputWrapper} />
+                setValue={setValue} watch={watch} inputWrapper={inputWrapper} httpClient={httpClient} defaultValue={stp.defaultValue}/>
             </BasicWrapper>
           )
         })}

diff --git a/src/inputs/SelectInput.js b/src/inputs/SelectInput.js
@@ -17,8 +17,8 @@ const valueToSelectOption = (value, possibleValues = [], isMulti = false, maybeT
   const maybeValue = option(possibleValues.find(v => deepEqual(v.value, value)))
   return maybeValue
     .getOrElse({
-      label: maybeValue.map(v => v.label).getOrElse(value),
-      value: maybeValue.map(v => v.value).getOrElse(value),
+      label: maybeValue.map(v => v.label).getOrElse(value?.label || value),
+      value: maybeValue.map(v => v.value).getOrElse(value?.value || value),
     });
 };