From 7e5d70d97736bd9c1b1a33c6918a9e3e3e21ca54 Mon Sep 17 00:00:00 2001 From: Gavin Elster Date: Tue, 18 Apr 2023 15:31:07 -0700 Subject: [PATCH 1/3] Clarify DateField options type --- packages/ra-ui-materialui/src/field/DateField.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ra-ui-materialui/src/field/DateField.tsx b/packages/ra-ui-materialui/src/field/DateField.tsx index a22bd8f408b..8dfa41c2769 100644 --- a/packages/ra-ui-materialui/src/field/DateField.tsx +++ b/packages/ra-ui-materialui/src/field/DateField.tsx @@ -130,7 +130,7 @@ export interface DateFieldProps InjectedFieldProps, Omit { locales?: string | string[]; - options?: object; + options?: Intl.DateTimeFormatOptions; showTime?: boolean; showDate?: boolean; } From 7ce88fedcf413c63435cc1627b27f814de9f22a1 Mon Sep 17 00:00:00 2001 From: Gavin Elster Date: Tue, 18 Apr 2023 15:37:35 -0700 Subject: [PATCH 2/3] Update locales type --- packages/ra-ui-materialui/src/field/DateField.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ra-ui-materialui/src/field/DateField.tsx b/packages/ra-ui-materialui/src/field/DateField.tsx index 8dfa41c2769..36217130b7d 100644 --- a/packages/ra-ui-materialui/src/field/DateField.tsx +++ b/packages/ra-ui-materialui/src/field/DateField.tsx @@ -129,7 +129,7 @@ export interface DateFieldProps extends PublicFieldProps, InjectedFieldProps, Omit { - locales?: string | string[]; + locales?: Intl.LocalesArgument; options?: Intl.DateTimeFormatOptions; showTime?: boolean; showDate?: boolean; From 61e1b7c3e2d5c0c211f4751fff91e88523438f89 Mon Sep 17 00:00:00 2001 From: Gavin Elster Date: Thu, 20 Apr 2023 16:32:29 -0600 Subject: [PATCH 3/3] Set explicit type for mock DateField options --- packages/ra-ui-materialui/src/field/DateField.spec.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ra-ui-materialui/src/field/DateField.spec.tsx b/packages/ra-ui-materialui/src/field/DateField.spec.tsx index c016c3020e4..4c854cc999f 100644 --- a/packages/ra-ui-materialui/src/field/DateField.spec.tsx +++ b/packages/ra-ui-materialui/src/field/DateField.spec.tsx @@ -107,7 +107,7 @@ describe('', () => { it('should pass the options prop to toLocaleString', () => { const date = new Date('2017-04-23'); - const options = { + const options: Intl.DateTimeFormatOptions = { weekday: 'long', year: 'numeric', month: 'long',