diff --git a/src/components/Molecules/Button/hooks/useButtonViewModel/__tests__/useButtonViewModel.test.ts b/src/components/Molecules/Button/hooks/useButtonViewModel/__tests__/useButtonViewModel.test.ts index ecf9c62..d19e08d 100644 --- a/src/components/Molecules/Button/hooks/useButtonViewModel/__tests__/useButtonViewModel.test.ts +++ b/src/components/Molecules/Button/hooks/useButtonViewModel/__tests__/useButtonViewModel.test.ts @@ -49,7 +49,7 @@ describe('useButtonViewModel', () => { const { result } = renderHook(() => useButtonViewModel({ ...baseProps, size: 'sm' })); expect(result.current.sizes.height).toBe(36); - expect(result.current.sizes.fontSize).toBe('sm'); + expect(result.current.sizes.fontSize).toBe('xs'); expect(result.current.sizes.iconSize).toBe('small_16'); expect(result.current.sizes.loadingSize).toBe('tiny_48'); }); @@ -58,7 +58,7 @@ describe('useButtonViewModel', () => { const { result } = renderHook(() => useButtonViewModel({ ...baseProps, size: 'md' })); expect(result.current.sizes.height).toBe(44); - expect(result.current.sizes.fontSize).toBe('md'); + expect(result.current.sizes.fontSize).toBe('sm'); expect(result.current.sizes.iconSize).toBe('tiny_20'); expect(result.current.sizes.loadingSize).toBe('small_64'); }); @@ -67,7 +67,7 @@ describe('useButtonViewModel', () => { const { result } = renderHook(() => useButtonViewModel({ ...baseProps, size: 'lg' })); expect(result.current.sizes.height).toBe(52); - expect(result.current.sizes.fontSize).toBe('lg'); + expect(result.current.sizes.fontSize).toBe('md'); expect(result.current.sizes.iconSize).toBe('tiny_20'); expect(result.current.sizes.loadingSize).toBe('small_64'); }); @@ -76,7 +76,7 @@ describe('useButtonViewModel', () => { const { result } = renderHook(() => useButtonViewModel(baseProps)); expect(result.current.sizes.height).toBe(44); - expect(result.current.sizes.fontSize).toBe('md'); + expect(result.current.sizes.fontSize).toBe('sm'); }); }); diff --git a/src/store/index.ts b/src/store/index.ts index 6d9878c..c23561f 100644 --- a/src/store/index.ts +++ b/src/store/index.ts @@ -13,7 +13,7 @@ export const useRubberDuckStore = create((set) => ({ const isDarkMode = config.darkMode ?? state.isDarkMode; return { isDarkMode, - colors: config.colors ?? (isDarkMode ? dark : light), + colors: { ...(isDarkMode ? dark : light), ...config.colors }, }; }); }, diff --git a/src/store/types/IConfigureStore.ts b/src/store/types/IConfigureStore.ts index 1846fc7..afefd6b 100644 --- a/src/store/types/IConfigureStore.ts +++ b/src/store/types/IConfigureStore.ts @@ -2,5 +2,5 @@ import type { IColors } from '../../tokens/colors'; export interface IConfigureStore { darkMode?: boolean; - colors?: IColors; + colors?: Partial; }