Skip to content

Commit a172108

Browse files
Combine dark and light default button into button.json5 (#1179)
* combine dark and light default button into button.json5 --------- Co-authored-by: lukasoppermann <[email protected]>
1 parent 4d9a727 commit a172108

16 files changed

+1761
-2298
lines changed

scripts/themes.config.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,9 @@ export const themes: TokenBuildInput[] = [
7575
source: [
7676
`src/tokens/functional/shadow/dark.json5`,
7777
`src/tokens/functional/border/*.json5`,
78-
`src/tokens/component/*.json5`,
7978
`src/tokens/functional/color/*.json5`,
8079
`src/tokens/functional/color/dark/*.json5`,
80+
`src/tokens/component/*.json5`,
8181
],
8282
include: [
8383
`src/tokens/functional/size/border.json5`,
@@ -94,7 +94,6 @@ export const themes: TokenBuildInput[] = [
9494
`src/tokens/component/*.json5`,
9595
`src/tokens/functional/color/*.json5`,
9696
`src/tokens/functional/color/dark/*.json5`,
97-
`src/tokens/functional/color/dark/overrides/dark.dimmed.json5`,
9897
],
9998
include: [
10099
`src/tokens/functional/size/border.json5`,

src/preprocessors/themeOverrides.test.ts

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,4 +238,93 @@ describe('Preprocessor: themeOverrides', () => {
238238
}),
239239
).toStrictEqual(resultDictionary.tokens)
240240
})
241+
242+
it('works with non-string values', () => {
243+
const dictionary = getMockDictionary({
244+
objectValueOverride: getMockToken({
245+
name: 'red',
246+
description: 'This is a description',
247+
value: 'transformedValue',
248+
path: ['tokens', 'subgroup', 'red'],
249+
$extensions: {
250+
theme: {
251+
dark: {
252+
value: {test: 'value'},
253+
},
254+
},
255+
},
256+
}),
257+
arrayValueOverride: getMockToken({
258+
name: 'red',
259+
description: 'This is a description',
260+
value: 'transformedValue',
261+
path: ['tokens', 'subgroup', 'red'],
262+
$extensions: {
263+
theme: {
264+
dark: {
265+
value: [
266+
{
267+
value: 'darkValue',
268+
description: 'DarkMode description',
269+
},
270+
],
271+
},
272+
},
273+
},
274+
}),
275+
})
276+
277+
const resultDictionary = getMockDictionary({
278+
objectValueOverride: getMockToken({
279+
name: 'red',
280+
description: 'This is a description',
281+
value: {test: 'value'},
282+
path: ['tokens', 'subgroup', 'red'],
283+
$extensions: {
284+
theme: {
285+
dark: {
286+
value: {test: 'value'},
287+
},
288+
},
289+
},
290+
}),
291+
arrayValueOverride: getMockToken({
292+
name: 'red',
293+
description: 'This is a description',
294+
value: [
295+
{
296+
value: 'darkValue',
297+
description: 'DarkMode description',
298+
},
299+
],
300+
path: ['tokens', 'subgroup', 'red'],
301+
$extensions: {
302+
theme: {
303+
dark: {
304+
value: [
305+
{
306+
value: 'darkValue',
307+
description: 'DarkMode description',
308+
},
309+
],
310+
},
311+
},
312+
},
313+
}),
314+
})
315+
316+
expect(
317+
themeOverrides.preprocessor(dictionary.tokens, {
318+
themeOverrides: {
319+
valueProp: 'value',
320+
extensionProp: 'theme',
321+
},
322+
}),
323+
).toStrictEqual(dictionary.tokens)
324+
expect(
325+
themeOverrides.preprocessor(dictionary.tokens, {
326+
options: {themeOverrides: {theme: 'dark', valueProp: 'value', extensionProp: 'theme'}},
327+
}),
328+
).toStrictEqual(resultDictionary.tokens)
329+
})
241330
})

0 commit comments

Comments
 (0)