From 0f38aee374029213a47ef7c29bd164093fe63c85 Mon Sep 17 00:00:00 2001 From: Armand Philippot Date: Wed, 15 Nov 2023 12:24:42 +0100 Subject: refactor(hooks): remove useSettings hook It does not make sense to re-export an existing object through a hook. On some pages both the hook and the object was imported... It is better to use the CONFIG (previously settings) object directly and by doing it we avoid potential errors because of conditional hooks. --- src/components/atoms/layout/time/time.test.tsx | 4 ++-- src/components/atoms/layout/time/time.tsx | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/components/atoms/layout') diff --git a/src/components/atoms/layout/time/time.test.tsx b/src/components/atoms/layout/time/time.test.tsx index 910285d..f3da8b5 100644 --- a/src/components/atoms/layout/time/time.test.tsx +++ b/src/components/atoms/layout/time/time.test.tsx @@ -1,6 +1,6 @@ import { describe, expect, it } from '@jest/globals'; import { render, screen as rtlScreen } from '../../../../../tests/utils'; -import { settings } from '../../../../utils/config'; +import { CONFIG } from '../../../../utils/config'; import { Time } from './time'; describe('Time', () => { @@ -31,7 +31,7 @@ describe('Time', () => { expect( rtlScreen.getByText(new RegExp(`${date.getFullYear()}`)) ).toHaveTextContent( - new Intl.DateTimeFormat(settings.locales.defaultLocale, { + new Intl.DateTimeFormat(CONFIG.locales.defaultLocale, { weekday: 'long', }).format(date) ); diff --git a/src/components/atoms/layout/time/time.tsx b/src/components/atoms/layout/time/time.tsx index 02b4763..886fee0 100644 --- a/src/components/atoms/layout/time/time.tsx +++ b/src/components/atoms/layout/time/time.tsx @@ -4,7 +4,7 @@ import { forwardRef, } from 'react'; import { useIntl } from 'react-intl'; -import { settings } from '../../../../utils/config'; +import { CONFIG } from '../../../../utils/config'; type GetDateOptionsConfig = { hasDay: boolean; @@ -65,7 +65,7 @@ export type TimeProps = Omit< /** * The current locale. * - * @default settings.locales.defaultLocale + * @default CONFIG.locales.defaultLocale */ locale?: string; /** @@ -88,7 +88,7 @@ const TimeWithRef: ForwardRefRenderFunction = ( hideDay = false, hideMonth = false, hideYear = false, - locale = settings.locales.defaultLocale, + locale = CONFIG.locales.defaultLocale, showTime = false, showWeekDay = false, ...props -- cgit v1.2.3