From 11ac0cd6898528e416cb34b3a65daa46b4b4664e Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 6 Apr 2026 16:24:14 +0000 Subject: [PATCH 1/2] Initial plan From 1bab466ac241d657904e9d5c22568e7c57b50b4b Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 6 Apr 2026 16:35:08 +0000 Subject: [PATCH 2/2] fix: Restore ArrayField TypeScript type to accept FieldProps (including label prop) Agent-Logs-Url: https://github.com/marmelab/react-admin/sessions/09a2d7a3-86fe-49c6-addb-bdcb7bad1a27 Co-authored-by: fzaninotto <99944+fzaninotto@users.noreply.github.com> --- .../src/field/ArrayField.spec.tsx | 16 ++++++++++++++++ .../ra-ui-materialui/src/field/ArrayField.tsx | 5 ++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/packages/ra-ui-materialui/src/field/ArrayField.spec.tsx b/packages/ra-ui-materialui/src/field/ArrayField.spec.tsx index e1406f3478b..ad234d85e58 100644 --- a/packages/ra-ui-materialui/src/field/ArrayField.spec.tsx +++ b/packages/ra-ui-materialui/src/field/ArrayField.spec.tsx @@ -48,6 +48,22 @@ describe('', () => { ); }); + it('should accept label prop (FieldProps)', () => { + // This test ensures that ArrayField accepts the label prop from FieldProps + // Regression test for https://github.com/marmelab/react-admin/issues/11197 + render( + + + + + + ); + }); + it('should not fail when value is null', () => { render( diff --git a/packages/ra-ui-materialui/src/field/ArrayField.tsx b/packages/ra-ui-materialui/src/field/ArrayField.tsx index 5a315d33d38..7901adf7e7f 100644 --- a/packages/ra-ui-materialui/src/field/ArrayField.tsx +++ b/packages/ra-ui-materialui/src/field/ArrayField.tsx @@ -1,3 +1,4 @@ +import * as React from 'react'; import { ArrayFieldBase, type ArrayFieldBaseProps } from 'ra-core'; import type { FieldProps } from './types'; @@ -23,7 +24,9 @@ import type { FieldProps } from './types'; * * @see useListContext */ -export const ArrayField = ArrayFieldBase; +export const ArrayField = ArrayFieldBase as unknown as < + RecordType extends Record = Record, +>(props: ArrayFieldProps) => React.ReactElement; export interface ArrayFieldProps< RecordType extends Record = Record,