Merge pull request #8608 from marmelab/fix-autocompletearrayinput

Fix AutocompleteArrayInput when value is not an array
marmelab · Jan 31, 2023 · 8a0c81c · 8a0c81c
2 parents bb039d6 + 466a0b4
commit 8a0c81c
Showing 2 changed files with 40 additions and 1 deletion.
diff --git a/packages/ra-ui-materialui/src/input/AutocompleteArrayInput.spec.tsx b/packages/ra-ui-materialui/src/input/AutocompleteArrayInput.spec.tsx
@@ -988,4 +988,43 @@ describe('<AutocompleteArrayInput />', () => {
 
         expect(noOptionsAppeared).toBe(false);
     });
+
+    it('should not crash if its value is not an array', () => {
+        render(
+            <AdminContext dataProvider={testDataProvider()}>
+                <SimpleForm
+                    onSubmit={jest.fn()}
+                    defaultValues={{ tags: 'programming' }}
+                >
+                    <AutocompleteArrayInput
+                        choices={[
+                            { id: 'programming', name: 'Programming' },
+                            { id: 'lifestyle', name: 'Lifestyle' },
+                            { id: 'photography', name: 'Photography' },
+                        ]}
+                        {...defaultProps}
+                    />
+                </SimpleForm>
+            </AdminContext>
+        );
+        expect(screen.queryByRole('textbox')).not.toBeNull();
+    });
+
+    it('should not crash if its value is not an array and is empty', () => {
+        render(
+            <AdminContext dataProvider={testDataProvider()}>
+                <SimpleForm onSubmit={jest.fn()} defaultValues={{ tags: '' }}>
+                    <AutocompleteArrayInput
+                        choices={[
+                            { id: 'programming', name: 'Programming' },
+                            { id: 'lifestyle', name: 'Lifestyle' },
+                            { id: 'photography', name: 'Photography' },
+                        ]}
+                        {...defaultProps}
+                    />
+                </SimpleForm>
+            </AdminContext>
+        );
+        expect(screen.queryByRole('textbox')).not.toBeNull();
+    });
 });
diff --git a/packages/ra-ui-materialui/src/input/AutocompleteInput.tsx b/packages/ra-ui-materialui/src/input/AutocompleteInput.tsx
@@ -742,7 +742,7 @@ const getSelectedItems = (
     multiple
 ) => {
     if (multiple) {
-        return (Array.isArray(value || []) ? value : [value])
+        return (Array.isArray(value ?? []) ? value : [value])
             .map(item =>
                 choices.find(
                     choice => String(item) === String(get(choice, optionValue))