From ea0b46d3c6925ddce2637a9dd84ef324f809c040 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=F0=9D=91=BE=F0=9D=92=96=F0=9D=92=99=F0=9D=92=89?= Date: Thu, 17 Oct 2024 18:23:21 +0800 Subject: [PATCH 1/2] feat(luxon-getNow): Improve the response `tz` setting for obtaining the current time method --- src/generate/luxon.ts | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/generate/luxon.ts b/src/generate/luxon.ts index dffa4acf3..3fb65d633 100644 --- a/src/generate/luxon.ts +++ b/src/generate/luxon.ts @@ -57,7 +57,14 @@ const normalizeLocale = (locale: string): string => locale.replace(/_/g, '-'); const generateConfig: GenerateConfig = { // get - getNow: () => DateTime.local(), + getNow: () => { + /** + * The current time that can respond to tz settings is required. + * @see: https://github.com/ant-design/ant-design/issues/51282 + * like `dayjs().tz()`: https://github.com/ant-design/ant-design/discussions/50934 + */ + return DateTime.now(); + }, getFixedDate: (string) => DateTime.fromFormat(string, 'yyyy-MM-dd'), getEndDate: (date) => date.endOf('month'), getWeekDay: (date) => date.weekday, From ae5c7f706fb73740b79cc65d80414bffc3dc3c98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=F0=9D=91=BE=F0=9D=92=96=F0=9D=92=99=F0=9D=92=89?= Date: Thu, 17 Oct 2024 18:31:44 +0800 Subject: [PATCH 2/2] chore: update --- src/generate/luxon.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/generate/luxon.ts b/src/generate/luxon.ts index 3fb65d633..6e9832242 100644 --- a/src/generate/luxon.ts +++ b/src/generate/luxon.ts @@ -59,9 +59,9 @@ const generateConfig: GenerateConfig = { // get getNow: () => { /** - * The current time that can respond to tz settings is required. + * The current time that can respond to tz settings is required. like `dayjs().tz()`. * @see: https://github.com/ant-design/ant-design/issues/51282 - * like `dayjs().tz()`: https://github.com/ant-design/ant-design/discussions/50934 + * https://github.com/react-component/picker/pull/878 */ return DateTime.now(); },