@nordcraft/core 1.0.63 → 1.0.64
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/api/ToddleApiV2.d.ts +1 -1
- package/dist/api/ToddleApiV2.js +10 -5
- package/dist/api/ToddleApiV2.js.map +1 -1
- package/dist/styling/customProperty.d.ts +1 -1
- package/dist/styling/customProperty.js +2 -2
- package/dist/styling/customProperty.js.map +1 -1
- package/dist/styling/theme.d.ts +10 -6
- package/dist/styling/theme.js +35 -25
- package/dist/styling/theme.js.map +1 -1
- package/package.json +1 -1
- package/src/api/ToddleApiV2.ts +10 -6
- package/src/styling/customProperty.ts +2 -2
- package/src/styling/theme.test.ts +155 -7
- package/src/styling/theme.ts +69 -43
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { ActionModel } from '../component/component.types';
|
|
2
2
|
import { type Formula } from '../formula/formula';
|
|
3
3
|
import type { GlobalFormulas } from '../formula/formulaTypes';
|
|
4
|
-
import type
|
|
4
|
+
import { type ApiRequest } from './apiTypes';
|
|
5
5
|
export declare class ToddleApiV2<Handler> implements ApiRequest {
|
|
6
6
|
private api;
|
|
7
7
|
private _apiReferences?;
|
package/dist/api/ToddleApiV2.js
CHANGED
|
@@ -2,6 +2,8 @@ import { getActionsInAction } from '../component/actionUtils';
|
|
|
2
2
|
import {} from '../formula/formula';
|
|
3
3
|
import { getFormulasInAction, getFormulasInFormula, } from '../formula/formulaUtils';
|
|
4
4
|
import { isDefined } from '../utils/util';
|
|
5
|
+
import { HttpMethodsWithAllowedBody } from './api';
|
|
6
|
+
import {} from './apiTypes';
|
|
5
7
|
export class ToddleApiV2 {
|
|
6
8
|
api;
|
|
7
9
|
_apiReferences;
|
|
@@ -180,11 +182,14 @@ export class ToddleApiV2 {
|
|
|
180
182
|
path: ['apis', apiKey, 'headers', headerKey, 'enabled'],
|
|
181
183
|
});
|
|
182
184
|
}
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
185
|
+
// Only visit the body definition if the method supports having a body
|
|
186
|
+
if (api.method && HttpMethodsWithAllowedBody.includes(api.method)) {
|
|
187
|
+
yield* getFormulasInFormula({
|
|
188
|
+
formula: api.body,
|
|
189
|
+
globalFormulas: this.globalFormulas,
|
|
190
|
+
path: ['apis', apiKey, 'body'],
|
|
191
|
+
});
|
|
192
|
+
}
|
|
188
193
|
for (const [actionKey, action] of Object.entries(api.client?.onCompleted?.actions ?? {})) {
|
|
189
194
|
yield* getFormulasInAction({
|
|
190
195
|
action,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ToddleApiV2.js","sourceRoot":"","sources":["../../src/api/ToddleApiV2.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ToddleApiV2.js","sourceRoot":"","sources":["../../src/api/ToddleApiV2.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,5 +9,5 @@ export type CssSyntaxNode = {
|
|
|
9
9
|
keywords: string[];
|
|
10
10
|
};
|
|
11
11
|
export declare function stringifySyntaxNode(node: CssSyntaxNode): string;
|
|
12
|
-
export declare function renderSyntaxDefinition(key: CustomPropertyName, { syntax, inherits, initialValue }: CustomPropertyDefinition,
|
|
12
|
+
export declare function renderSyntaxDefinition(key: CustomPropertyName, { syntax, inherits, initialValue }: CustomPropertyDefinition, theme: Theme): string;
|
|
13
13
|
export declare const appendUnit: (value: any, unit: string | null | undefined) => any;
|
|
@@ -9,10 +9,10 @@ export function stringifySyntaxNode(node) {
|
|
|
9
9
|
throw new Error(`Unknown syntax node type: ${node.type}`);
|
|
10
10
|
}
|
|
11
11
|
}
|
|
12
|
-
export function renderSyntaxDefinition(key, { syntax, inherits, initialValue },
|
|
12
|
+
export function renderSyntaxDefinition(key, { syntax, inherits, initialValue }, theme) {
|
|
13
13
|
let value = initialValue;
|
|
14
14
|
if (initialValue?.includes('var(--')) {
|
|
15
|
-
value = solveVarRecursively(initialValue,
|
|
15
|
+
value = solveVarRecursively(initialValue, theme);
|
|
16
16
|
}
|
|
17
17
|
// Fallback in-case of no reference
|
|
18
18
|
if (!isDefined(value) && syntax.type === 'primitive') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"customProperty.js","sourceRoot":"","sources":["../../src/styling/customProperty.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAgCzC,MAAM,UAAU,mBAAmB,CAAC,IAAmB;IACrD,QAAQ,IAAI,CAAC,IAAI,EAAE,CAAC;QAClB,KAAK,WAAW;YACd,OAAO,IAAI,IAAI,CAAC,IAAI,GAAG,CAAA;QACzB,KAAK,SAAS;YACZ,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QAClC;YACE,MAAM,IAAI,KAAK,CAAC,6BAA8B,IAAY,CAAC,IAAI,EAAE,CAAC,CAAA;IACtE,CAAC;AACH,CAAC;AAED,MAAM,UAAU,sBAAsB,CACpC,GAAuB,EACvB,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY,EAA4B,EAC5D,
|
|
1
|
+
{"version":3,"file":"customProperty.js","sourceRoot":"","sources":["../../src/styling/customProperty.ts"],"names":[],"mappings":"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"}
|
package/dist/styling/theme.d.ts
CHANGED
|
@@ -60,10 +60,13 @@ export type OldTheme = {
|
|
|
60
60
|
}>;
|
|
61
61
|
};
|
|
62
62
|
export type Theme = {
|
|
63
|
-
default?:
|
|
64
|
-
defaultDark?:
|
|
65
|
-
defaultLight?:
|
|
63
|
+
default?: string;
|
|
64
|
+
defaultDark?: string;
|
|
65
|
+
defaultLight?: string;
|
|
66
66
|
propertyDefinitions?: Record<CustomPropertyName, CustomPropertyDefinition>;
|
|
67
|
+
themes?: Record<string, {
|
|
68
|
+
order?: number;
|
|
69
|
+
}>;
|
|
67
70
|
scheme?: 'dark' | 'light';
|
|
68
71
|
color?: StyleTokenGroup[];
|
|
69
72
|
fonts: FontFamily[];
|
|
@@ -78,9 +81,10 @@ export type CustomPropertyDefinition = {
|
|
|
78
81
|
syntax: CssSyntaxNode;
|
|
79
82
|
inherits: boolean;
|
|
80
83
|
initialValue: string | null;
|
|
81
|
-
value: string | null;
|
|
82
84
|
description: string;
|
|
85
|
+
values: Record<string, string | null>;
|
|
83
86
|
};
|
|
84
|
-
export declare const getThemeCss: (
|
|
87
|
+
export declare const getThemeCss: (themes: Record<string, OldTheme | Theme>, options: ThemeOptions) => string;
|
|
85
88
|
export declare const getOldThemeCss: (theme: OldTheme) => string;
|
|
86
|
-
export declare function
|
|
89
|
+
export declare function renderThemeValues(selector: string, entries: Record<string, string>, mediaQuery?: string): string;
|
|
90
|
+
export declare function getThemeEntries(theme: Theme, themeName: string | undefined): Record<string, string>;
|
package/dist/styling/theme.js
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
|
+
import { isDefined } from '../utils/util';
|
|
1
2
|
import { renderSyntaxDefinition } from './customProperty';
|
|
2
3
|
import { RESET_STYLES } from './theme.const';
|
|
3
|
-
export const getThemeCss = (
|
|
4
|
-
const [themesV1, themesV2] = Object.entries(
|
|
4
|
+
export const getThemeCss = (themes, options) => {
|
|
5
|
+
const [themesV1, themesV2] = Object.entries(themes).reduce(([legacy, modern], [key, value]) => {
|
|
5
6
|
if ('breakpoints' in value) {
|
|
6
7
|
legacy[key] = value;
|
|
7
8
|
}
|
|
@@ -10,27 +11,26 @@ export const getThemeCss = (theme, options) => {
|
|
|
10
11
|
}
|
|
11
12
|
return [legacy, modern];
|
|
12
13
|
}, [{}, {}]);
|
|
13
|
-
const defaultTheme = Object.values(themesV2).find((t) => t.default) ??
|
|
14
|
-
// Treat themesV2 as Partial in case there are no themes defined there
|
|
15
|
-
Object.values(themesV2)[0];
|
|
16
|
-
const defaultDarkTheme = Object.values(themesV2).find((t) => t.defaultDark);
|
|
17
|
-
const defaultLightTheme = Object.values(themesV2).find((t) => t.defaultLight);
|
|
18
14
|
return `
|
|
19
15
|
${Object.values(themesV1)
|
|
20
16
|
.map((t) => getOldThemeCss(t))
|
|
21
17
|
.join('\n')}
|
|
22
18
|
|
|
23
|
-
${
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
19
|
+
${Object.values(themesV2)
|
|
20
|
+
.map((themeV2) => {
|
|
21
|
+
return `
|
|
22
|
+
${Object.entries(themeV2.propertyDefinitions ?? {})
|
|
23
|
+
.map(([propertyName, property]) => renderSyntaxDefinition(propertyName, property, themeV2))
|
|
24
|
+
.join('\n')}
|
|
28
25
|
|
|
29
|
-
${
|
|
30
|
-
${
|
|
31
|
-
${
|
|
32
|
-
${Object.entries(
|
|
33
|
-
|
|
26
|
+
${renderThemeValues(':host, :root', getThemeEntries(themeV2, themeV2.default))}
|
|
27
|
+
${renderThemeValues(':host, :root', getThemeEntries(themeV2, themeV2.defaultDark), '@media (prefers-color-scheme: dark)')}
|
|
28
|
+
${renderThemeValues(':host, :root', getThemeEntries(themeV2, themeV2.defaultLight), '@media (prefers-color-scheme: light)')}
|
|
29
|
+
${Object.entries(themeV2.themes ?? {})
|
|
30
|
+
.map(([key, _t]) => renderThemeValues(`[data-theme~="${key}"]`, getThemeEntries(themeV2, key)))
|
|
31
|
+
.join('\n')}
|
|
32
|
+
`;
|
|
33
|
+
})
|
|
34
34
|
.join('\n')}
|
|
35
35
|
|
|
36
36
|
${options.includeResetStyle ? RESET_STYLES : ''}
|
|
@@ -237,17 +237,13 @@ ${RESET_STYLES}
|
|
|
237
237
|
}
|
|
238
238
|
}`;
|
|
239
239
|
};
|
|
240
|
-
export function
|
|
241
|
-
if (
|
|
242
|
-
return '';
|
|
243
|
-
}
|
|
244
|
-
const properties = Object.entries(theme.propertyDefinitions).filter(([, property]) => property.value);
|
|
245
|
-
if (properties.length === 0) {
|
|
240
|
+
export function renderThemeValues(selector, entries, mediaQuery) {
|
|
241
|
+
if (Object.entries(entries).length === 0) {
|
|
246
242
|
return '';
|
|
247
243
|
}
|
|
248
244
|
const css = `${selector} {
|
|
249
|
-
${
|
|
250
|
-
.map(([propertyName,
|
|
245
|
+
${Object.entries(entries)
|
|
246
|
+
.map(([propertyName, value]) => `${propertyName}: ${value};`)
|
|
251
247
|
.join('\n ')}
|
|
252
248
|
}`;
|
|
253
249
|
if (mediaQuery) {
|
|
@@ -257,4 +253,18 @@ export function renderTheme(selector, theme, mediaQuery) {
|
|
|
257
253
|
}
|
|
258
254
|
return css;
|
|
259
255
|
}
|
|
256
|
+
export function getThemeEntries(theme, themeName) {
|
|
257
|
+
const entries = {};
|
|
258
|
+
if (!themeName) {
|
|
259
|
+
return entries;
|
|
260
|
+
}
|
|
261
|
+
for (const [propertyName, definition] of Object.entries(theme.propertyDefinitions ?? {})) {
|
|
262
|
+
const value = definition.values?.[themeName];
|
|
263
|
+
if (!isDefined(value)) {
|
|
264
|
+
continue;
|
|
265
|
+
}
|
|
266
|
+
entries[propertyName] = value;
|
|
267
|
+
}
|
|
268
|
+
return entries;
|
|
269
|
+
}
|
|
260
270
|
//# sourceMappingURL=theme.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"theme.js","sourceRoot":"","sources":["../../src/styling/theme.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sBAAsB,EAAsB,MAAM,kBAAkB,CAAA;AAC7E,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;
|
|
1
|
+
{"version":3,"file":"theme.js","sourceRoot":"","sources":["../../src/styling/theme.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/api/ToddleApiV2.ts
CHANGED
|
@@ -7,7 +7,8 @@ import {
|
|
|
7
7
|
getFormulasInFormula,
|
|
8
8
|
} from '../formula/formulaUtils'
|
|
9
9
|
import { isDefined } from '../utils/util'
|
|
10
|
-
import
|
|
10
|
+
import { HttpMethodsWithAllowedBody } from './api'
|
|
11
|
+
import { type ApiRequest } from './apiTypes'
|
|
11
12
|
|
|
12
13
|
export class ToddleApiV2<Handler> implements ApiRequest {
|
|
13
14
|
private api: ApiRequest
|
|
@@ -231,11 +232,14 @@ export class ToddleApiV2<Handler> implements ApiRequest {
|
|
|
231
232
|
})
|
|
232
233
|
}
|
|
233
234
|
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
235
|
+
// Only visit the body definition if the method supports having a body
|
|
236
|
+
if (api.method && HttpMethodsWithAllowedBody.includes(api.method)) {
|
|
237
|
+
yield* getFormulasInFormula({
|
|
238
|
+
formula: api.body,
|
|
239
|
+
globalFormulas: this.globalFormulas,
|
|
240
|
+
path: ['apis', apiKey, 'body'],
|
|
241
|
+
})
|
|
242
|
+
}
|
|
239
243
|
for (const [actionKey, action] of Object.entries(
|
|
240
244
|
api.client?.onCompleted?.actions ?? {},
|
|
241
245
|
)) {
|
|
@@ -45,11 +45,11 @@ export function stringifySyntaxNode(node: CssSyntaxNode): string {
|
|
|
45
45
|
export function renderSyntaxDefinition(
|
|
46
46
|
key: CustomPropertyName,
|
|
47
47
|
{ syntax, inherits, initialValue }: CustomPropertyDefinition,
|
|
48
|
-
|
|
48
|
+
theme: Theme,
|
|
49
49
|
): string {
|
|
50
50
|
let value = initialValue
|
|
51
51
|
if (initialValue?.includes('var(--')) {
|
|
52
|
-
value = solveVarRecursively(initialValue,
|
|
52
|
+
value = solveVarRecursively(initialValue, theme)
|
|
53
53
|
}
|
|
54
54
|
|
|
55
55
|
// Fallback in-case of no reference
|
|
@@ -1,9 +1,12 @@
|
|
|
1
1
|
import type { Theme } from './theme'
|
|
2
|
-
import {
|
|
2
|
+
import { getThemeCss, getThemeEntries, renderThemeValues } from './theme'
|
|
3
3
|
|
|
4
|
-
describe('
|
|
4
|
+
describe('renderThemeValues()', () => {
|
|
5
5
|
test('it renders a theme correctly', () => {
|
|
6
6
|
const theme: Theme = {
|
|
7
|
+
themes: {
|
|
8
|
+
'my-theme': {},
|
|
9
|
+
},
|
|
7
10
|
fonts: [],
|
|
8
11
|
propertyDefinitions: {
|
|
9
12
|
'--my-color': {
|
|
@@ -11,26 +14,34 @@ describe('renderTheme()', () => {
|
|
|
11
14
|
description: 'A custom color',
|
|
12
15
|
inherits: true,
|
|
13
16
|
initialValue: 'red',
|
|
14
|
-
|
|
17
|
+
values: {
|
|
18
|
+
'my-theme': 'rebeccapurple',
|
|
19
|
+
},
|
|
15
20
|
},
|
|
16
21
|
'--my-other-color': {
|
|
17
22
|
syntax: { type: 'primitive', name: 'color' },
|
|
18
23
|
description: 'A custom color',
|
|
19
24
|
inherits: true,
|
|
20
25
|
initialValue: 'red',
|
|
21
|
-
|
|
26
|
+
values: {},
|
|
22
27
|
},
|
|
23
28
|
'--my-third-prop': {
|
|
24
29
|
syntax: { type: 'primitive', name: 'length-percentage' },
|
|
25
30
|
description: 'A custom length or percentage',
|
|
26
31
|
inherits: true,
|
|
27
32
|
initialValue: null,
|
|
28
|
-
|
|
33
|
+
values: {
|
|
34
|
+
'my-theme': 'var(--my-color)',
|
|
35
|
+
},
|
|
29
36
|
},
|
|
30
37
|
},
|
|
31
38
|
}
|
|
32
|
-
expect(
|
|
33
|
-
|
|
39
|
+
expect(
|
|
40
|
+
renderThemeValues(
|
|
41
|
+
'[data-theme="my-theme"]',
|
|
42
|
+
getThemeEntries(theme, 'my-theme'),
|
|
43
|
+
),
|
|
44
|
+
).toMatchInlineSnapshot(`
|
|
34
45
|
"[data-theme="my-theme"] {
|
|
35
46
|
--my-color: rebeccapurple;
|
|
36
47
|
--my-third-prop: var(--my-color);
|
|
@@ -38,3 +49,140 @@ describe('renderTheme()', () => {
|
|
|
38
49
|
`)
|
|
39
50
|
})
|
|
40
51
|
})
|
|
52
|
+
|
|
53
|
+
describe('getThemeCss()', () => {
|
|
54
|
+
test('should render a full v2 theme correctly', () => {
|
|
55
|
+
const theme: Theme = {
|
|
56
|
+
themes: {
|
|
57
|
+
'my-theme': {},
|
|
58
|
+
'super-dark': {},
|
|
59
|
+
},
|
|
60
|
+
default: 'my-theme',
|
|
61
|
+
defaultDark: 'super-dark',
|
|
62
|
+
fonts: [],
|
|
63
|
+
propertyDefinitions: {
|
|
64
|
+
'--my-color': {
|
|
65
|
+
syntax: { type: 'primitive', name: 'color' },
|
|
66
|
+
description: 'A custom color',
|
|
67
|
+
inherits: true,
|
|
68
|
+
initialValue: 'red',
|
|
69
|
+
values: {
|
|
70
|
+
'my-theme': 'rebeccapurple',
|
|
71
|
+
'super-dark': 'black',
|
|
72
|
+
},
|
|
73
|
+
},
|
|
74
|
+
'--my-other-color': {
|
|
75
|
+
syntax: { type: 'primitive', name: 'color' },
|
|
76
|
+
description: 'A custom color',
|
|
77
|
+
inherits: true,
|
|
78
|
+
initialValue: 'var(--my-color)',
|
|
79
|
+
values: {},
|
|
80
|
+
},
|
|
81
|
+
'--my-third-prop': {
|
|
82
|
+
syntax: { type: 'primitive', name: 'length-percentage' },
|
|
83
|
+
description: 'A custom length or percentage',
|
|
84
|
+
inherits: true,
|
|
85
|
+
initialValue: null,
|
|
86
|
+
values: {
|
|
87
|
+
'my-theme': 'var(--my-color)',
|
|
88
|
+
},
|
|
89
|
+
},
|
|
90
|
+
},
|
|
91
|
+
}
|
|
92
|
+
|
|
93
|
+
expect(
|
|
94
|
+
getThemeCss(
|
|
95
|
+
{ theme },
|
|
96
|
+
{ includeResetStyle: false, createFontFaces: false },
|
|
97
|
+
),
|
|
98
|
+
).toMatchInlineSnapshot(`
|
|
99
|
+
"
|
|
100
|
+
|
|
101
|
+
|
|
102
|
+
|
|
103
|
+
@property --my-color {
|
|
104
|
+
syntax: "<color>";
|
|
105
|
+
inherits: true;
|
|
106
|
+
initial-value: red;
|
|
107
|
+
}
|
|
108
|
+
@property --my-other-color {
|
|
109
|
+
syntax: "<color>";
|
|
110
|
+
inherits: true;
|
|
111
|
+
initial-value: red;
|
|
112
|
+
}
|
|
113
|
+
@property --my-third-prop {
|
|
114
|
+
syntax: "<length-percentage>";
|
|
115
|
+
inherits: true;
|
|
116
|
+
initial-value: 0px;
|
|
117
|
+
}
|
|
118
|
+
|
|
119
|
+
:host, :root {
|
|
120
|
+
--my-color: rebeccapurple;
|
|
121
|
+
--my-third-prop: var(--my-color);
|
|
122
|
+
}
|
|
123
|
+
@media (prefers-color-scheme: dark) {
|
|
124
|
+
:host, :root {
|
|
125
|
+
--my-color: black;
|
|
126
|
+
}
|
|
127
|
+
}
|
|
128
|
+
|
|
129
|
+
[data-theme~="my-theme"] {
|
|
130
|
+
--my-color: rebeccapurple;
|
|
131
|
+
--my-third-prop: var(--my-color);
|
|
132
|
+
}
|
|
133
|
+
[data-theme~="super-dark"] {
|
|
134
|
+
--my-color: black;
|
|
135
|
+
}
|
|
136
|
+
|
|
137
|
+
|
|
138
|
+
|
|
139
|
+
@layer base {
|
|
140
|
+
|
|
141
|
+
body, :host {
|
|
142
|
+
/* Color */
|
|
143
|
+
|
|
144
|
+
/* Fonts */
|
|
145
|
+
|
|
146
|
+
|
|
147
|
+
/* Font size */
|
|
148
|
+
|
|
149
|
+
/* Font weight */
|
|
150
|
+
|
|
151
|
+
/* Shadows */
|
|
152
|
+
|
|
153
|
+
/* Border radius */
|
|
154
|
+
|
|
155
|
+
/* Spacing */
|
|
156
|
+
|
|
157
|
+
/* Z-index */
|
|
158
|
+
|
|
159
|
+
}
|
|
160
|
+
@keyframes animation-spin {
|
|
161
|
+
from {
|
|
162
|
+
transform: rotate(0deg);
|
|
163
|
+
}
|
|
164
|
+
to {
|
|
165
|
+
transform: rotate(360deg);
|
|
166
|
+
}
|
|
167
|
+
}
|
|
168
|
+
@keyframes animation-fade-in {
|
|
169
|
+
from {
|
|
170
|
+
opacity:0;
|
|
171
|
+
}
|
|
172
|
+
to {
|
|
173
|
+
opacity:1;
|
|
174
|
+
}
|
|
175
|
+
}
|
|
176
|
+
@keyframes animation-fade-out {
|
|
177
|
+
from {
|
|
178
|
+
opacity:1;
|
|
179
|
+
}
|
|
180
|
+
to {
|
|
181
|
+
opacity:0;
|
|
182
|
+
}
|
|
183
|
+
}
|
|
184
|
+
}
|
|
185
|
+
"
|
|
186
|
+
`)
|
|
187
|
+
})
|
|
188
|
+
})
|
package/src/styling/theme.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { CustomPropertyName } from '../component/component.types'
|
|
2
|
+
import { isDefined } from '../utils/util'
|
|
2
3
|
import { renderSyntaxDefinition, type CssSyntaxNode } from './customProperty'
|
|
3
4
|
import { RESET_STYLES } from './theme.const'
|
|
4
5
|
|
|
@@ -73,10 +74,17 @@ export type OldTheme = {
|
|
|
73
74
|
}
|
|
74
75
|
|
|
75
76
|
export type Theme = {
|
|
76
|
-
default?:
|
|
77
|
-
defaultDark?:
|
|
78
|
-
defaultLight?:
|
|
77
|
+
default?: string
|
|
78
|
+
defaultDark?: string
|
|
79
|
+
defaultLight?: string
|
|
79
80
|
propertyDefinitions?: Record<CustomPropertyName, CustomPropertyDefinition>
|
|
81
|
+
themes?: Record<
|
|
82
|
+
string,
|
|
83
|
+
{
|
|
84
|
+
order?: number
|
|
85
|
+
}
|
|
86
|
+
>
|
|
87
|
+
// Legacy support
|
|
80
88
|
scheme?: 'dark' | 'light'
|
|
81
89
|
color?: StyleTokenGroup[]
|
|
82
90
|
fonts: FontFamily[]
|
|
@@ -92,15 +100,17 @@ export type CustomPropertyDefinition = {
|
|
|
92
100
|
syntax: CssSyntaxNode
|
|
93
101
|
inherits: boolean
|
|
94
102
|
initialValue: string | null // Required by CSS specs for default-theme, but we can do a fallback so null is allowed
|
|
95
|
-
value: string | null
|
|
96
103
|
description: string
|
|
104
|
+
// Values mapped to theme names.
|
|
105
|
+
// Values are not required, if left out, the default theme value will be used. If no default theme value exists, initialValue will be used.
|
|
106
|
+
values: Record<string, string | null>
|
|
97
107
|
}
|
|
98
108
|
|
|
99
109
|
export const getThemeCss = (
|
|
100
|
-
|
|
110
|
+
themes: Record<string, OldTheme | Theme>,
|
|
101
111
|
options: ThemeOptions,
|
|
102
112
|
) => {
|
|
103
|
-
const [themesV1, themesV2] = Object.entries(
|
|
113
|
+
const [themesV1, themesV2] = Object.entries(themes).reduce(
|
|
104
114
|
([legacy, modern], [key, value]) => {
|
|
105
115
|
if ('breakpoints' in value) {
|
|
106
116
|
legacy[key] = value
|
|
@@ -112,37 +122,37 @@ export const getThemeCss = (
|
|
|
112
122
|
[{}, {}] as [Record<string, OldTheme>, Record<string, Theme>],
|
|
113
123
|
)
|
|
114
124
|
|
|
115
|
-
const defaultTheme =
|
|
116
|
-
Object.values(themesV2).find((t) => t.default) ??
|
|
117
|
-
// Treat themesV2 as Partial in case there are no themes defined there
|
|
118
|
-
Object.values(themesV2 as Partial<Record<string, Theme>>)[0]
|
|
119
|
-
const defaultDarkTheme = Object.values(themesV2).find((t) => t.defaultDark)
|
|
120
|
-
const defaultLightTheme = Object.values(themesV2).find((t) => t.defaultLight)
|
|
121
|
-
|
|
122
125
|
return `
|
|
123
126
|
${Object.values(themesV1)
|
|
124
127
|
.map((t) => getOldThemeCss(t))
|
|
125
128
|
.join('\n')}
|
|
126
129
|
|
|
127
|
-
${
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
}
|
|
130
|
+
${Object.values(themesV2)
|
|
131
|
+
.map((themeV2) => {
|
|
132
|
+
return `
|
|
133
|
+
${Object.entries(themeV2.propertyDefinitions ?? {})
|
|
134
|
+
.map(([propertyName, property]) =>
|
|
135
|
+
renderSyntaxDefinition(
|
|
136
|
+
propertyName as CustomPropertyName,
|
|
137
|
+
property,
|
|
138
|
+
themeV2,
|
|
139
|
+
),
|
|
140
|
+
)
|
|
141
|
+
.join('\n')}
|
|
140
142
|
|
|
141
|
-
${
|
|
142
|
-
${
|
|
143
|
-
${
|
|
144
|
-
${Object.entries(
|
|
145
|
-
.map(([key,
|
|
143
|
+
${renderThemeValues(':host, :root', getThemeEntries(themeV2, themeV2.default))}
|
|
144
|
+
${renderThemeValues(':host, :root', getThemeEntries(themeV2, themeV2.defaultDark), '@media (prefers-color-scheme: dark)')}
|
|
145
|
+
${renderThemeValues(':host, :root', getThemeEntries(themeV2, themeV2.defaultLight), '@media (prefers-color-scheme: light)')}
|
|
146
|
+
${Object.entries(themeV2.themes ?? {})
|
|
147
|
+
.map(([key, _t]) =>
|
|
148
|
+
renderThemeValues(
|
|
149
|
+
`[data-theme~="${key}"]`,
|
|
150
|
+
getThemeEntries(themeV2, key),
|
|
151
|
+
),
|
|
152
|
+
)
|
|
153
|
+
.join('\n')}
|
|
154
|
+
`
|
|
155
|
+
})
|
|
146
156
|
.join('\n')}
|
|
147
157
|
|
|
148
158
|
${options.includeResetStyle ? RESET_STYLES : ''}
|
|
@@ -408,25 +418,18 @@ ${RESET_STYLES}
|
|
|
408
418
|
}`
|
|
409
419
|
}
|
|
410
420
|
|
|
411
|
-
export function
|
|
421
|
+
export function renderThemeValues(
|
|
412
422
|
selector: string,
|
|
413
|
-
|
|
423
|
+
entries: Record<string, string>,
|
|
414
424
|
mediaQuery?: string,
|
|
415
425
|
) {
|
|
416
|
-
if (
|
|
417
|
-
return ''
|
|
418
|
-
}
|
|
419
|
-
|
|
420
|
-
const properties = Object.entries(theme.propertyDefinitions).filter(
|
|
421
|
-
([, property]) => property.value,
|
|
422
|
-
)
|
|
423
|
-
if (properties.length === 0) {
|
|
426
|
+
if (Object.entries(entries).length === 0) {
|
|
424
427
|
return ''
|
|
425
428
|
}
|
|
426
429
|
|
|
427
430
|
const css = `${selector} {
|
|
428
|
-
${
|
|
429
|
-
.map(([propertyName,
|
|
431
|
+
${Object.entries(entries)
|
|
432
|
+
.map(([propertyName, value]) => `${propertyName}: ${value};`)
|
|
430
433
|
.join('\n ')}
|
|
431
434
|
}`
|
|
432
435
|
|
|
@@ -438,3 +441,26 @@ export function renderTheme(
|
|
|
438
441
|
|
|
439
442
|
return css
|
|
440
443
|
}
|
|
444
|
+
|
|
445
|
+
export function getThemeEntries(
|
|
446
|
+
theme: Theme,
|
|
447
|
+
themeName: string | undefined,
|
|
448
|
+
): Record<string, string> {
|
|
449
|
+
const entries: Record<string, string> = {}
|
|
450
|
+
if (!themeName) {
|
|
451
|
+
return entries
|
|
452
|
+
}
|
|
453
|
+
|
|
454
|
+
for (const [propertyName, definition] of Object.entries(
|
|
455
|
+
theme.propertyDefinitions ?? {},
|
|
456
|
+
)) {
|
|
457
|
+
const value = definition.values?.[themeName]
|
|
458
|
+
if (!isDefined(value)) {
|
|
459
|
+
continue
|
|
460
|
+
}
|
|
461
|
+
|
|
462
|
+
entries[propertyName] = value
|
|
463
|
+
}
|
|
464
|
+
|
|
465
|
+
return entries
|
|
466
|
+
}
|