Merge pull request #8659 from marmelab/fix-ArrayField-when-value-is-null

Fix ArrayField breaking when value is null
marmelab · Feb 15, 2023 · f711f7e · f711f7e
2 parents 9cc2705 + a41a751
commit f711f7e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/packages/ra-ui-materialui/src/field/ArrayField.spec.tsx b/packages/ra-ui-materialui/src/field/ArrayField.spec.tsx
@@ -43,6 +43,16 @@ describe('<ArrayField />', () => {
         );
     });
 
+    it('should not fail when value is null', () => {
+        render(
+            <Wrapper>
+                <ArrayField source="arr" record={{ id: 123, arr: null }}>
+                    <DummyIterator />
+                </ArrayField>
+            </Wrapper>
+        );
+    });
+
     it('should render the alternative empty component', () => {
         const { queryByText } = render(
             <Wrapper>

diff --git a/packages/ra-ui-materialui/src/field/ArrayField.tsx b/packages/ra-ui-materialui/src/field/ArrayField.tsx
@@ -75,7 +75,7 @@ import { PublicFieldProps, InjectedFieldProps, fieldPropTypes } from './types';
 export const ArrayField: FC<ArrayFieldProps> = memo(props => {
     const { children, resource, source } = props;
     const record = useRecordContext(props);
-    const data = get(record, source, emptyArray);
+    const data = get(record, source, emptyArray) || emptyArray;
 
     return (
         <ListContextProvider