Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/components/Themes/lib/themeCreatorContext.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import type {
UpdateFontFamilyParams,
UpdateFontFamilyTypeTitleParams,
} from './themeCreatorUtils';
import type {ColorsSettingsType, ThemeCreatorState} from './types';
import type {AdvancedColorType, ColorsSettingsType, ThemeCreatorState} from './types';

export const ThemeCreatorContext = createContext<ThemeCreatorState>(
initThemeCreator(DEFAULT_THEME),
Expand All @@ -39,6 +39,7 @@ export interface ThemeCreatorMethodsContextType {
updateAdvancedTypography: () => void;
openMainSettings: () => void;
setAdvancedMode: (enabled: boolean) => void;
setAdvancedColorType: (type: AdvancedColorType) => void;
importTheme: (theme: GravityTheme) => void;
setColorsSettingsType: (type: ColorsSettingsType) => void;
}
Expand All @@ -60,6 +61,7 @@ export const ThemeCreatorMethodsContext = createContext<ThemeCreatorMethodsConte
updateAdvancedTypography: noop,
openMainSettings: noop,
setAdvancedMode: noop,
setAdvancedColorType: noop,
importTheme: noop,
setColorsSettingsType: noop,
});
1 change: 1 addition & 0 deletions src/components/Themes/lib/themeCreatorUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -354,6 +354,7 @@ export function initThemeCreator(inputTheme: GravityTheme): ThemeCreatorState {
paletteTokens,
showMainSettings: false,
advancedModeEnabled: false,
advancedColorType: 'basic-palette',
changesExist: false,
borders: {
preset: bordersPreset,
Expand Down
1 change: 1 addition & 0 deletions src/components/Themes/lib/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ export interface ThemeCreatorState {
paletteTokens: PaletteTokens;
showMainSettings: boolean;
advancedModeEnabled: boolean;
advancedColorType: AdvancedColorType;
changesExist: boolean;

borders: BordersOption;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import {CircleQuestion} from '@gravity-ui/icons';
import {Button, Flex, Icon} from '@gravity-ui/uikit';
import {useTranslation} from 'next-i18next';
import {useMemo, useState} from 'react';
import {useMemo} from 'react';

import {block} from '../../../../../utils';
import {type TagItem, Tags} from '../../../../Tags/Tags';
import {useThemeCreator, useThemeCreatorMethods} from '../../../hooks/useThemeCreator';
import type {AdvancedColorType} from '../../../lib/types';
import {AdvancedSettingsTable} from '../../AdvancedSettingsTable/AdvancedSettingsTable';
import {ThemeSection} from '../../ThemeSection';
Expand All @@ -13,7 +14,8 @@ const b = block('advanced-color-settings');

export const AdvancedSettings = () => {
const {t} = useTranslation('themes');
const [activeTab, setActiveTab] = useState<AdvancedColorType>('basic-palette');
const {advancedColorType} = useThemeCreator();
const {setAdvancedColorType} = useThemeCreatorMethods();

const tags: TagItem<AdvancedColorType>[] = useMemo(
() => [
Expand Down Expand Up @@ -63,12 +65,12 @@ export const AdvancedSettings = () => {
<Tags
className={b('tags')}
items={tags}
value={activeTab}
onChange={setActiveTab}
value={advancedColorType}
onChange={setAdvancedColorType}
/>
</Flex>

<AdvancedSettingsTable colorType={activeTab} />
<AdvancedSettingsTable colorType={advancedColorType} />
</ThemeSection>
);
};
20 changes: 19 additions & 1 deletion src/components/Themes/ui/ThemeCreatorContextProvider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import {
updateFontFamilyInTheme,
updateFontFamilyTypeTitleInTheme,
} from '../lib/themeCreatorUtils';
import type {ColorsSettingsType, ThemeCreatorState} from '../lib/types';
import type {AdvancedColorType, ColorsSettingsType, ThemeCreatorState} from '../lib/types';

type ThemeCreatorAction =
| {
Expand Down Expand Up @@ -104,6 +104,10 @@ type ThemeCreatorAction =
type: 'setAdvancedMode';
payload: boolean;
}
| {
type: 'setAdvancedColorType';
payload: AdvancedColorType;
}
| {
type: 'setColorsSettingsType';
payload: ColorsSettingsType;
Expand Down Expand Up @@ -157,6 +161,11 @@ const themeCreatorReducer = (
...newState,
advancedModeEnabled: action.payload,
};
case 'setAdvancedColorType':
return {
...newState,
advancedColorType: action.payload,
};
case 'reinitialize':
return initThemeCreator(action.payload);
case 'setColorsSettingsType':
Expand Down Expand Up @@ -336,6 +345,13 @@ export const ThemeCreatorContextProvider: React.FC<ThemeCreatorProps> = ({
});
}, []);

const setAdvancedColorType = React.useCallback((type: AdvancedColorType) => {
dispatchThemeCreator({
type: 'setAdvancedColorType',
payload: type,
});
}, []);

const importTheme = React.useCallback((gravityTheme: GravityTheme) => {
dispatchThemeCreator({
type: 'reinitialize',
Expand Down Expand Up @@ -370,6 +386,7 @@ export const ThemeCreatorContextProvider: React.FC<ThemeCreatorProps> = ({
updateFontFamily,
openMainSettings,
setAdvancedMode,
setAdvancedColorType,
importTheme,
setColorsSettingsType,
}),
Expand All @@ -390,6 +407,7 @@ export const ThemeCreatorContextProvider: React.FC<ThemeCreatorProps> = ({
updateFontFamilyTypeTitle,
openMainSettings,
setAdvancedMode,
setAdvancedColorType,
importTheme,
setColorsSettingsType,
],
Expand Down
Loading