Skip to content

PLASMA-6272: Fix generating hover and active tokens for onDark,onLight and inverse tokens #2387

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
neretin-trike wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

PLASMA-6272: Fix generating hover and active tokens for onDark,onLight and inverse tokens #2387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion website/plasma-theme-builder/src/builder/createTheme.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,27 +44,31 @@ export const getStateTokens = (
return { defaultStateTokens, onDarkStateTokens, onLightStateTokens, inverseStateTokens };
}

const getDefaultStateToken = getStateToken(sectionName, mode, tokens[mode].default);
let newMode = mode;
const getDefaultStateToken = getStateToken(sectionName, newMode, tokens[mode].default);
defaultStateTokens = {
[`${name}Hover`]: getDefaultStateToken('hover'),
[`${name}Active`]: getDefaultStateToken('active'),
...(isBrightness ? { [`${name}Brightness`]: getDefaultStateToken('brightness') } : {}),
};

newMode = 'dark';
const getOnDarkStateToken = getStateToken(sectionName, mode, tokens[mode].onDark);
onDarkStateTokens = {
[`${name}Hover`]: getOnDarkStateToken('hover'),
[`${name}Active`]: getOnDarkStateToken('active'),
...(isBrightness ? { [`${name}Brightness`]: getOnDarkStateToken('brightness') } : {}),
};

newMode = 'light';
const getOnLightStateToken = getStateToken(sectionName, mode, tokens[mode].onLight);
onLightStateTokens = {
[`${name}Hover`]: getOnLightStateToken('hover'),
[`${name}Active`]: getOnLightStateToken('active'),
...(isBrightness ? { [`${name}Brightness`]: getOnLightStateToken('brightness') } : {}),
};

newMode = mode === 'light' ? 'dark' : 'light';
const getInverseStateToken = getStateToken(sectionName, mode, tokens[mode].inverse);
inverseStateTokens = {
[`${name}Hover`]: getInverseStateToken('hover'),
Expand Down
17 changes: 16 additions & 1 deletion website/plasma-theme-builder/src/components/TokenForm/TokenForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,22 @@ export const TokenForm = ({
enabled: enabled?.value,
};

const getStateTokenFunc = getStateToken(sectionName, themeMode, data);
let mode = themeMode;
const subsectionName = subsection.value.toLocaleLowerCase();
if (
(themeMode === 'dark' && (subsectionName.includes('default') || subsectionName.includes('dark'))) ||
(themeMode === 'light' && (subsectionName.includes('inverse') || subsectionName.includes('dark')))
) {
mode = 'dark';
}
if (
(themeMode === 'dark' && (subsectionName.includes('inverse') || subsectionName.includes('light'))) ||
(themeMode === 'light' && (subsectionName.includes('default') || subsectionName.includes('light')))
) {
mode = 'light';
}

const getStateTokenFunc = getStateToken(sectionName, mode, data);

return {
[`${tokenName}Hover`]: getStateTokenFunc('hover'),
Expand Down