Work with array of values answering choice questions

beda-software · Feb 15, 2024 · 94c942b · 94c942b
1 parent 6cc3a9c
commit 94c942b
Showing 1 changed file with 6 additions and 13 deletions.
diff --git a/src/components/BaseQuestionnaireResponseForm/widgets/choice/index.tsx b/src/components/BaseQuestionnaireResponseForm/widgets/choice/index.tsx
@@ -46,21 +46,19 @@ function ChoiceQuestionSelect(props: ChoiceQuestionSelectProps) {
 
 export function QuestionChoice({ parentPath, questionItem }: QuestionItemProps) {
     const { linkId, answerOption, repeats, answerValueSet } = questionItem;
-    let fieldName = [...parentPath, linkId, 0];
-
-    if (repeats) {
-        fieldName = [...parentPath, linkId];
-    }
+    const fieldName = [...parentPath, linkId];
 
     const { value, formItem, onChange } = useFieldController(fieldName, questionItem);
 
+    const onSelect = useCallback((option: any) => onChange([].concat(option)), [onChange]);
+
     if (answerValueSet) {
         return (
             <Form.Item {...formItem} data-testid="question-choice">
                 <ChoiceQuestionValueSet
                     answerValueSet={answerValueSet}
-                    value={!repeats && value ? [value] : value}
-                    onChange={onChange}
+                    value={value}
+                    onChange={onSelect}
                     repeats={repeats}
                 />
             </Form.Item>
@@ -69,12 +67,7 @@ export function QuestionChoice({ parentPath, questionItem }: QuestionItemProps)
 
     return (
         <Form.Item {...formItem} data-testid="question-choice">
-            <ChoiceQuestionSelect
-                options={answerOption!}
-                value={!repeats && value ? [value] : value}
-                onChange={onChange}
-                repeats={repeats}
-            />
+            <ChoiceQuestionSelect options={answerOption!} value={value} onChange={onSelect} repeats={repeats} />
         </Form.Item>
     );
 }