Skip to content

Commit

Permalink
fix for figma
Browse files Browse the repository at this point in the history
  • Loading branch information
lukasoppermann committed Dec 17, 2024
1 parent 6c3ec7f commit 6f6c1d8
Show file tree
Hide file tree
Showing 10 changed files with 38 additions and 24 deletions.
4 changes: 2 additions & 2 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -96,11 +96,11 @@ export default tseslint.config([
{
allow: [
'light_high_contrast',
'light_colorblind',
'light_protanopia_deuteranopia',
'light_tritanopia',
'dark_dimmed',
'dark_high_contrast',
'dark_colorblind',
'dark_protanopia_deuteranopia',
'dark_tritanopia',
],
},
Expand Down
12 changes: 6 additions & 6 deletions scripts/buildFigma.ts
Original file line number Diff line number Diff line change
Expand Up @@ -61,14 +61,14 @@ const buildFigma = async (buildOptions: ConfigGeneratorOptions): Promise<void> =
await extended.buildAllPlatforms()
}
//
for (const {filename, source, include} of themes) {
for (const {filename, source, include, theme} of themes) {
// build functional scales
const extended = await PrimerStyleDictionary.extend({
source,
include,
platforms: {
figma: figma(`figma/themes/${filename}.json`, buildOptions.prefix, buildOptions.buildPath, {
theme: filename.replaceAll('-', ' '),
theme: [theme, getFallbackTheme(theme)],
}),
},
})
Expand Down Expand Up @@ -146,7 +146,7 @@ const buildFigma = async (buildOptions: ConfigGeneratorOptions): Promise<void> =
`src/tokens/functional/color/light/primitives-light.json5`,
`src/tokens/functional/color/light/patterns-light.json5`,
],
theme: 'light colorblind',
theme: 'light protanopia deuteranopia',
},
{
name: 'light-tritanopia',
Expand Down Expand Up @@ -205,7 +205,7 @@ const buildFigma = async (buildOptions: ConfigGeneratorOptions): Promise<void> =
`src/tokens/functional/color/dark/primitives-dark.json5`,
`src/tokens/functional/color/dark/patterns-dark.json5`,
],
theme: 'dark colorblind',
theme: 'dark protanopia deuteranopia',
},
{
name: 'dark-tritanopia',
Expand Down Expand Up @@ -289,8 +289,8 @@ const buildFigma = async (buildOptions: ConfigGeneratorOptions): Promise<void> =
'dark dimmed',
'light high contrast',
'dark high contrast',
'light colorblind',
'dark colorblind',
'light protanopia deuteranopia',
'dark protanopia deuteranopia',
'light tritanopia',
'dark tritanopia',
].reverse()
Expand Down
8 changes: 4 additions & 4 deletions scripts/colorContrast.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -254,12 +254,12 @@ export const bgColors: string[] = ['bgColor-default', 'bgColor-muted']
export type ThemeName =
| 'light'
| 'light_high_contrast'
| 'light_colorblind'
| 'light_protanopia_deuteranopia'
| 'light_tritanopia'
| 'dark'
| 'dark_dimmed'
| 'dark_high_contrast'
| 'dark_colorblind'
| 'dark_protanopia_deuteranopia'
| 'dark_tritanopia'

const defaultContrast: ContrastRequirement[] = setContrastRatios('default', [
Expand All @@ -278,12 +278,12 @@ export const contrastRequirements: ContrastRequirements = {
// default light mode
light: defaultContrast,
light_high_contrast: highContrast,
light_colorblind: defaultContrast,
light_protanopia_deuteranopia: defaultContrast,
light_tritanopia: defaultContrast,
// default dark mode
dark: defaultContrast,
dark_dimmed: defaultContrast,
dark_high_contrast: highContrast,
dark_colorblind: defaultContrast,
dark_protanopia_deuteranopia: defaultContrast,
dark_tritanopia: defaultContrast,
}
7 changes: 4 additions & 3 deletions scripts/colorContrast.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import {readFile} from 'fs/promises'
import {normal} from 'color-blend'
import {getContrast, parseToRgba, rgba} from 'color2k'
import {makeConsoleTable, makeMarkdownTable} from './utilities/makeTable.js'
import {getThemeFileName} from './utilities/getThemeFileName.js'
/**
* Type definitions
*/
Expand Down Expand Up @@ -207,7 +208,7 @@ const getColorsFromFiles = async (filePaths: ThemeName[]): Promise<Theme[]> => {
[
themeName,
await JSON.parse(
await readFile(`./dist/docs/functional/themes/${themeName.replaceAll('_', '-')}.json`, 'utf8'),
await readFile(`./dist/docs/functional/themes/${getThemeFileName(themeName, '_', '-')}.json`, 'utf8'),
),
] as Theme,
)
Expand All @@ -224,8 +225,8 @@ const runCheck = async () => {
'dark',
'light_high_contrast',
'dark_high_contrast',
'light_colorblind',
'dark_colorblind',
'light_protanopia_deuteranopia',
'dark_protanopia_deuteranopia',
'light_tritanopia',
'dark_tritanopia',
] as ThemeName[]
Expand Down
12 changes: 12 additions & 0 deletions scripts/utilities/getThemeFileName.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
export const getThemeFileName = (theme: string, find: string = '_', replace: string = '-') => {
const themeName = theme.replaceAll(find, replace)

if (themeName === 'light_protanopia_deuteranopia') {
return 'light_colorblind'
}
if (themeName === 'dark_protanopia_deuteranopia') {
return 'dark_colorblind'
}

return themeName
}
3 changes: 2 additions & 1 deletion src/platforms/figma.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ export const figma: PlatformInitializer = (outputFile, prefix, buildPath, option
},
// should this object be spread here?
...options,
theme: options?.theme[0].replaceAll('-', ' '),
themeOverrides: {
theme: options?.theme,
},
Expand All @@ -58,7 +59,7 @@ export const figma: PlatformInitializer = (outputFile, prefix, buildPath, option
format: `json/figma`,
options: {
outputReferences: true,
theme: options?.theme,
theme: options?.theme[0].replaceAll('-', ' '),
},
},
],
Expand Down
4 changes: 2 additions & 2 deletions src/schemas/collectionSchema.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ describe('Schema: mode', () => {
'dark dimmed',
'light high contrast',
'dark high contrast',
'light colorblind',
'dark colorblind',
'light protanopia deuteranopia',
'dark protanopia deuteranopia',
'light tritanopia',
'dark tritanopia',
])
Expand Down
4 changes: 2 additions & 2 deletions src/schemas/collections.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ type Modes =
| 'dark dimmed'
| 'light high contrast'
| 'dark high contrast'
| 'light colorblind'
| 'dark colorblind'
| 'light protanopia deuteranopia'
| 'dark protanopia deuteranopia'
| 'light tritanopia'
| 'dark tritanopia'

Expand Down
4 changes: 2 additions & 2 deletions src/schemas/colorToken.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ export const colorToken = baseColorToken
'dark dimmed',
'light high contrast',
'dark high contrast',
'light colorblind',
'dark colorblind',
'light protanopia deuteranopia',
'dark protanopia deuteranopia',
'light tritanopia',
'dark tritanopia',
]).optional(),
Expand Down
4 changes: 2 additions & 2 deletions src/schemas/shadowToken.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ export const shadowToken = baseToken
'dark dimmed',
'light high contrast',
'dark high contrast',
'light colorblind',
'dark colorblind',
'light protanopia deuteranopia',
'dark protanopia deuteranopia',
'light tritanopia',
'dark tritanopia',
]).optional(),
Expand Down

0 comments on commit 6f6c1d8

Please sign in to comment.