@tamagui/theme-builder 1.142.0 → 2.0.0-1
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/cjs/ThemeBuilder.cjs +1 -1
- package/dist/cjs/ThemeBuilder.js +1 -1
- package/dist/cjs/ThemeBuilder.js.map +1 -1
- package/dist/cjs/ThemeBuilder.native.js +2 -2
- package/dist/cjs/ThemeBuilder.native.js.map +1 -1
- package/dist/cjs/createThemes.cjs +22 -14
- package/dist/cjs/createThemes.js +38 -29
- package/dist/cjs/createThemes.js.map +1 -1
- package/dist/cjs/createThemes.native.js +18 -11
- package/dist/cjs/createThemes.native.js.map +1 -1
- package/dist/esm/ThemeBuilder.js +1 -1
- package/dist/esm/ThemeBuilder.js.map +1 -1
- package/dist/esm/ThemeBuilder.mjs +1 -1
- package/dist/esm/ThemeBuilder.mjs.map +1 -1
- package/dist/esm/ThemeBuilder.native.js +2 -2
- package/dist/esm/ThemeBuilder.native.js.map +1 -1
- package/dist/esm/createThemes.js +38 -29
- package/dist/esm/createThemes.js.map +1 -1
- package/dist/esm/createThemes.mjs +22 -14
- package/dist/esm/createThemes.mjs.map +1 -1
- package/dist/esm/createThemes.native.js +18 -11
- package/dist/esm/createThemes.native.js.map +1 -1
- package/package.json +4 -4
- package/src/ThemeBuilder.ts +13 -1
- package/src/createThemes.ts +57 -39
- package/types/ThemeBuilder.d.ts.map +1 -1
- package/types/createThemes.d.ts +4 -5
- package/types/createThemes.d.ts.map +1 -1
package/dist/esm/createThemes.js
CHANGED
|
@@ -28,13 +28,17 @@ let lastBuilder = null;
|
|
|
28
28
|
const getLastBuilder = () => lastBuilder;
|
|
29
29
|
function normalizeSubThemes(defs) {
|
|
30
30
|
return Object.fromEntries(
|
|
31
|
-
Object.entries(defs || {}).map(([name, value]) =>
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
31
|
+
Object.entries(defs || {}).map(([name, value]) => {
|
|
32
|
+
const hasPalette = value.palette !== void 0;
|
|
33
|
+
return [
|
|
34
|
+
name,
|
|
35
|
+
{
|
|
36
|
+
// Only add palette if the definition has one, otherwise theme is template-only
|
|
37
|
+
...hasPalette ? { palette: name } : {},
|
|
38
|
+
template: value.template || "base"
|
|
39
|
+
}
|
|
40
|
+
];
|
|
41
|
+
})
|
|
38
42
|
);
|
|
39
43
|
}
|
|
40
44
|
const defaultPalettes = createPalettes(
|
|
@@ -103,26 +107,31 @@ function createSimpleThemeBuilder(props) {
|
|
|
103
107
|
}
|
|
104
108
|
}
|
|
105
109
|
});
|
|
106
|
-
return
|
|
107
|
-
accent: [
|
|
108
|
-
{
|
|
109
|
-
parent: "light",
|
|
110
|
-
template: "base",
|
|
111
|
-
palette: "light_accent",
|
|
112
|
-
nonInheritedValues: accentExtra?.light
|
|
113
|
-
},
|
|
114
|
-
{
|
|
115
|
-
parent: "dark",
|
|
116
|
-
template: "base",
|
|
117
|
-
palette: "dark_accent",
|
|
118
|
-
nonInheritedValues: accentExtra?.dark
|
|
119
|
-
}
|
|
120
|
-
]
|
|
121
|
-
})), childrenThemes && (themeBuilder = themeBuilder.addChildThemes(childrenThemes, {
|
|
110
|
+
return childrenThemes && (themeBuilder = themeBuilder.addChildThemes(childrenThemes, {
|
|
122
111
|
avoidNestingWithin: ["accent"]
|
|
123
112
|
})), grandChildrenThemes && (themeBuilder = themeBuilder.addChildThemes(grandChildrenThemes, {
|
|
124
113
|
avoidNestingWithin: ["accent"]
|
|
125
|
-
})),
|
|
114
|
+
})), palettes.light_accent && (themeBuilder = themeBuilder.addChildThemes(
|
|
115
|
+
{
|
|
116
|
+
accent: [
|
|
117
|
+
{
|
|
118
|
+
parent: "light",
|
|
119
|
+
template: "base",
|
|
120
|
+
palette: "light_accent",
|
|
121
|
+
nonInheritedValues: accentExtra?.light
|
|
122
|
+
},
|
|
123
|
+
{
|
|
124
|
+
parent: "dark",
|
|
125
|
+
template: "base",
|
|
126
|
+
palette: "dark_accent",
|
|
127
|
+
nonInheritedValues: accentExtra?.dark
|
|
128
|
+
}
|
|
129
|
+
]
|
|
130
|
+
},
|
|
131
|
+
{
|
|
132
|
+
avoidNestingWithin: Object.keys(childrenThemes || {})
|
|
133
|
+
}
|
|
134
|
+
)), componentThemes && (themeBuilder = themeBuilder.addComponentThemes(getComponentThemes(componentThemes), {
|
|
126
135
|
avoidNestingWithin: [
|
|
127
136
|
// ...Object.keys(childrenThemes || {}),
|
|
128
137
|
...Object.keys(grandChildrenThemes || {})
|
|
@@ -159,15 +168,15 @@ function coerceSimplePaletteToSchemePalette(def) {
|
|
|
159
168
|
}
|
|
160
169
|
function getThemesPalettes(props) {
|
|
161
170
|
const base = coerceSimplePaletteToSchemePalette(props.base.palette), accent = props.accent ? coerceSimplePaletteToSchemePalette(props.accent.palette) : null, baseAnchors = getAnchors(base);
|
|
162
|
-
function getSubThemesPalettes(defs) {
|
|
171
|
+
function getSubThemesPalettes(defs, isGrandChildren = !1) {
|
|
163
172
|
return Object.fromEntries(
|
|
164
|
-
Object.entries(defs).map(([key, value]) => [
|
|
173
|
+
Object.entries(defs).map(([key, value]) => isGrandChildren && key === "accent" && !value.palette ? null : [
|
|
165
174
|
key,
|
|
166
175
|
{
|
|
167
176
|
name: key,
|
|
168
177
|
anchors: value.palette ? getAnchors(coerceSimplePaletteToSchemePalette(value.palette)) : baseAnchors
|
|
169
178
|
}
|
|
170
|
-
])
|
|
179
|
+
]).filter(Boolean)
|
|
171
180
|
);
|
|
172
181
|
}
|
|
173
182
|
return {
|
|
@@ -181,8 +190,8 @@ function getThemesPalettes(props) {
|
|
|
181
190
|
anchors: getAnchors(accent)
|
|
182
191
|
}
|
|
183
192
|
},
|
|
184
|
-
...props.childrenThemes && getSubThemesPalettes(props.childrenThemes),
|
|
185
|
-
...props.grandChildrenThemes && getSubThemesPalettes(props.grandChildrenThemes)
|
|
193
|
+
...props.childrenThemes && getSubThemesPalettes(props.childrenThemes, !1),
|
|
194
|
+
...props.grandChildrenThemes && getSubThemesPalettes(props.grandChildrenThemes, !0)
|
|
186
195
|
};
|
|
187
196
|
}
|
|
188
197
|
const getComponentThemes = (components) => Object.fromEntries(
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/createThemes.ts"],
|
|
4
|
-
"mappings": "AAAA,SAAS,mBAAmB;AAC5B,SAAS,8BAA8B;AACvC,SAAS,wBAAwB;AACjC,SAAS,uBAAuB,iCAAiC;AACjE,SAAS,0BAA6C;
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["palettes"]
|
|
6
6
|
}
|
|
@@ -28,10 +28,16 @@ function createThemes(props) {
|
|
|
28
28
|
let lastBuilder = null;
|
|
29
29
|
const getLastBuilder = () => lastBuilder;
|
|
30
30
|
function normalizeSubThemes(defs) {
|
|
31
|
-
return Object.fromEntries(Object.entries(defs || {}).map(([name, value]) =>
|
|
32
|
-
palette
|
|
33
|
-
|
|
34
|
-
|
|
31
|
+
return Object.fromEntries(Object.entries(defs || {}).map(([name, value]) => {
|
|
32
|
+
const hasPalette = value.palette !== void 0;
|
|
33
|
+
return [name, {
|
|
34
|
+
// Only add palette if the definition has one, otherwise theme is template-only
|
|
35
|
+
...(hasPalette ? {
|
|
36
|
+
palette: name
|
|
37
|
+
} : {}),
|
|
38
|
+
template: value.template || "base"
|
|
39
|
+
}];
|
|
40
|
+
}));
|
|
35
41
|
}
|
|
36
42
|
const defaultPalettes = createPalettes(getThemesPalettes({
|
|
37
43
|
base: {
|
|
@@ -97,7 +103,11 @@ function createSimpleThemeBuilder(props) {
|
|
|
97
103
|
}
|
|
98
104
|
}
|
|
99
105
|
});
|
|
100
|
-
return
|
|
106
|
+
return childrenThemes && (themeBuilder = themeBuilder.addChildThemes(childrenThemes, {
|
|
107
|
+
avoidNestingWithin: ["accent"]
|
|
108
|
+
})), grandChildrenThemes && (themeBuilder = themeBuilder.addChildThemes(grandChildrenThemes, {
|
|
109
|
+
avoidNestingWithin: ["accent"]
|
|
110
|
+
})), palettes.light_accent && (themeBuilder = themeBuilder.addChildThemes({
|
|
101
111
|
accent: [{
|
|
102
112
|
parent: "light",
|
|
103
113
|
template: "base",
|
|
@@ -109,10 +119,8 @@ function createSimpleThemeBuilder(props) {
|
|
|
109
119
|
palette: "dark_accent",
|
|
110
120
|
nonInheritedValues: accentExtra?.dark
|
|
111
121
|
}]
|
|
112
|
-
}
|
|
113
|
-
avoidNestingWithin:
|
|
114
|
-
})), grandChildrenThemes && (themeBuilder = themeBuilder.addChildThemes(grandChildrenThemes, {
|
|
115
|
-
avoidNestingWithin: ["accent"]
|
|
122
|
+
}, {
|
|
123
|
+
avoidNestingWithin: Object.keys(childrenThemes || {})
|
|
116
124
|
})), componentThemes && (themeBuilder = themeBuilder.addComponentThemes(getComponentThemes(componentThemes), {
|
|
117
125
|
avoidNestingWithin: [
|
|
118
126
|
// ...Object.keys(childrenThemes || {}),
|
|
@@ -165,11 +173,11 @@ function getThemesPalettes(props) {
|
|
|
165
173
|
const base = coerceSimplePaletteToSchemePalette(props.base.palette),
|
|
166
174
|
accent = props.accent ? coerceSimplePaletteToSchemePalette(props.accent.palette) : null,
|
|
167
175
|
baseAnchors = getAnchors(base);
|
|
168
|
-
function getSubThemesPalettes(defs) {
|
|
169
|
-
return Object.fromEntries(Object.entries(defs).map(([key, value]) => [key, {
|
|
176
|
+
function getSubThemesPalettes(defs, isGrandChildren = !1) {
|
|
177
|
+
return Object.fromEntries(Object.entries(defs).map(([key, value]) => isGrandChildren && key === "accent" && !value.palette ? null : [key, {
|
|
170
178
|
name: key,
|
|
171
179
|
anchors: value.palette ? getAnchors(coerceSimplePaletteToSchemePalette(value.palette)) : baseAnchors
|
|
172
|
-
}]));
|
|
180
|
+
}]).filter(Boolean));
|
|
173
181
|
}
|
|
174
182
|
return {
|
|
175
183
|
base: {
|
|
@@ -182,8 +190,8 @@ function getThemesPalettes(props) {
|
|
|
182
190
|
anchors: getAnchors(accent)
|
|
183
191
|
}
|
|
184
192
|
}),
|
|
185
|
-
...(props.childrenThemes && getSubThemesPalettes(props.childrenThemes)),
|
|
186
|
-
...(props.grandChildrenThemes && getSubThemesPalettes(props.grandChildrenThemes))
|
|
193
|
+
...(props.childrenThemes && getSubThemesPalettes(props.childrenThemes, !1)),
|
|
194
|
+
...(props.grandChildrenThemes && getSubThemesPalettes(props.grandChildrenThemes, !0))
|
|
187
195
|
};
|
|
188
196
|
}
|
|
189
197
|
const getComponentThemes = components => Object.fromEntries(Object.entries(components).map(([componentName, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["parseToHsla","defaultComponentThemes","defaultTemplates","getThemeSuitePalettes","PALETTE_BACKGROUND_OFFSET","createThemeBuilder","createThemes","props","accent","childrenThemes","grandChildrenThemes","templates","componentThemes","getTheme","builder","createSimpleThemeBuilder","extra","base","accentExtra","palettes","createPalettes","getThemesPalettes","accentTheme","normalizeSubThemes","lastBuilder","themeBuilder","themes","getLastBuilder","defs","Object","fromEntries","entries","map","name","value","palette","template","defaultPalettes","addPalettes","addTemplates","addThemes","light","nonInheritedValues","light_accent","accent1","accent2","accent3","accent4","accent5","accent6","accent7","accent8","accent9","accent10","accent11","accent12","dark","dark_accent","addChildThemes","parent","
|
|
1
|
+
{"version":3,"names":["parseToHsla","defaultComponentThemes","defaultTemplates","getThemeSuitePalettes","PALETTE_BACKGROUND_OFFSET","createThemeBuilder","createThemes","props","accent","childrenThemes","grandChildrenThemes","templates","componentThemes","getTheme","builder","createSimpleThemeBuilder","extra","base","accentExtra","palettes","createPalettes","getThemesPalettes","accentTheme","normalizeSubThemes","lastBuilder","themeBuilder","themes","getLastBuilder","defs","Object","fromEntries","entries","map","name","value","hasPalette","palette","template","defaultPalettes","addPalettes","addTemplates","addThemes","light","nonInheritedValues","light_accent","accent1","accent2","accent3","accent4","accent5","accent6","accent7","accent8","accent9","accent10","accent11","accent12","dark","dark_accent","addChildThemes","avoidNestingWithin","parent","keys","addComponentThemes","getComponentThemes","build","getSchemePalette","colors","reverse","getAnchors","numItems","length","lcolor","index","dcolor","lhue","lsat","llum","lalpha","dhue","dsat","dlum","dalpha","spreadIndex","hue","sat","lum","alpha","maxIndex","Math","round","coerceSimplePaletteToSchemePalette","def","Array","isArray","baseAnchors","getSubThemesPalettes","isGrandChildren","key","anchors","filter","Boolean","components","componentName","accentPalettes","basePalettes","flatMap","palettes2","oppositePalettes","startsWith","oppositeLight","oppositeDark","bgOffset"],"sources":["../../src/createThemes.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -31,9 +31,13 @@ var lastBuilder = null,
|
|
|
31
31
|
};
|
|
32
32
|
function normalizeSubThemes(defs) {
|
|
33
33
|
return Object.fromEntries(Object.entries(defs || {}).map(function (param) {
|
|
34
|
-
var [name, value] = param
|
|
34
|
+
var [name, value] = param,
|
|
35
|
+
hasPalette = value.palette !== void 0;
|
|
35
36
|
return [name, {
|
|
36
|
-
palette
|
|
37
|
+
// Only add palette if the definition has one, otherwise theme is template-only
|
|
38
|
+
...(hasPalette ? {
|
|
39
|
+
palette: name
|
|
40
|
+
} : {}),
|
|
37
41
|
template: value.template || "base"
|
|
38
42
|
}];
|
|
39
43
|
}));
|
|
@@ -102,7 +106,11 @@ function createSimpleThemeBuilder(props) {
|
|
|
102
106
|
}
|
|
103
107
|
}
|
|
104
108
|
});
|
|
105
|
-
return
|
|
109
|
+
return childrenThemes && (themeBuilder = themeBuilder.addChildThemes(childrenThemes, {
|
|
110
|
+
avoidNestingWithin: ["accent"]
|
|
111
|
+
})), grandChildrenThemes && (themeBuilder = themeBuilder.addChildThemes(grandChildrenThemes, {
|
|
112
|
+
avoidNestingWithin: ["accent"]
|
|
113
|
+
})), palettes.light_accent && (themeBuilder = themeBuilder.addChildThemes({
|
|
106
114
|
accent: [{
|
|
107
115
|
parent: "light",
|
|
108
116
|
template: "base",
|
|
@@ -114,10 +122,8 @@ function createSimpleThemeBuilder(props) {
|
|
|
114
122
|
palette: "dark_accent",
|
|
115
123
|
nonInheritedValues: accentExtra?.dark
|
|
116
124
|
}]
|
|
117
|
-
}
|
|
118
|
-
avoidNestingWithin:
|
|
119
|
-
})), grandChildrenThemes && (themeBuilder = themeBuilder.addChildThemes(grandChildrenThemes, {
|
|
120
|
-
avoidNestingWithin: ["accent"]
|
|
125
|
+
}, {
|
|
126
|
+
avoidNestingWithin: Object.keys(childrenThemes || {})
|
|
121
127
|
})), componentThemes && (themeBuilder = themeBuilder.addComponentThemes(getComponentThemes(componentThemes), {
|
|
122
128
|
avoidNestingWithin: [
|
|
123
129
|
// ...Object.keys(childrenThemes || {}),
|
|
@@ -173,13 +179,14 @@ function getThemesPalettes(props) {
|
|
|
173
179
|
accent = props.accent ? coerceSimplePaletteToSchemePalette(props.accent.palette) : null,
|
|
174
180
|
baseAnchors = getAnchors(base);
|
|
175
181
|
function getSubThemesPalettes(defs) {
|
|
182
|
+
var isGrandChildren = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : !1;
|
|
176
183
|
return Object.fromEntries(Object.entries(defs).map(function (param) {
|
|
177
184
|
var [key, value] = param;
|
|
178
|
-
return [key, {
|
|
185
|
+
return isGrandChildren && key === "accent" && !value.palette ? null : [key, {
|
|
179
186
|
name: key,
|
|
180
187
|
anchors: value.palette ? getAnchors(coerceSimplePaletteToSchemePalette(value.palette)) : baseAnchors
|
|
181
188
|
}];
|
|
182
|
-
}));
|
|
189
|
+
}).filter(Boolean));
|
|
183
190
|
}
|
|
184
191
|
return {
|
|
185
192
|
base: {
|
|
@@ -192,8 +199,8 @@ function getThemesPalettes(props) {
|
|
|
192
199
|
anchors: getAnchors(accent)
|
|
193
200
|
}
|
|
194
201
|
}),
|
|
195
|
-
...(props.childrenThemes && getSubThemesPalettes(props.childrenThemes)),
|
|
196
|
-
...(props.grandChildrenThemes && getSubThemesPalettes(props.grandChildrenThemes))
|
|
202
|
+
...(props.childrenThemes && getSubThemesPalettes(props.childrenThemes, !1)),
|
|
203
|
+
...(props.grandChildrenThemes && getSubThemesPalettes(props.grandChildrenThemes, !0))
|
|
197
204
|
};
|
|
198
205
|
}
|
|
199
206
|
var getComponentThemes = function (components) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["parseToHsla","defaultComponentThemes","defaultTemplates","getThemeSuitePalettes","PALETTE_BACKGROUND_OFFSET","createThemeBuilder","createThemes","props","accent","childrenThemes","grandChildrenThemes","templates","componentThemes","getTheme","builder","createSimpleThemeBuilder","extra","base","accentExtra","palettes","createPalettes","getThemesPalettes","accentTheme","normalizeSubThemes","lastBuilder","themeBuilder","themes","getLastBuilder","defs","Object","fromEntries","entries","map","param","name","value","palette","template","defaultPalettes","addPalettes","addTemplates","addThemes","light","nonInheritedValues","light_accent","accent1","accent2","accent3","accent4","accent5","accent6","accent7","accent8","accent9","accent10","accent11","accent12","dark","dark_accent","addChildThemes","parent","
|
|
1
|
+
{"version":3,"names":["parseToHsla","defaultComponentThemes","defaultTemplates","getThemeSuitePalettes","PALETTE_BACKGROUND_OFFSET","createThemeBuilder","createThemes","props","accent","childrenThemes","grandChildrenThemes","templates","componentThemes","getTheme","builder","createSimpleThemeBuilder","extra","base","accentExtra","palettes","createPalettes","getThemesPalettes","accentTheme","normalizeSubThemes","lastBuilder","themeBuilder","themes","getLastBuilder","defs","Object","fromEntries","entries","map","param","name","value","hasPalette","palette","template","defaultPalettes","addPalettes","addTemplates","addThemes","light","nonInheritedValues","light_accent","accent1","accent2","accent3","accent4","accent5","accent6","accent7","accent8","accent9","accent10","accent11","accent12","dark","dark_accent","addChildThemes","avoidNestingWithin","parent","keys","addComponentThemes","getComponentThemes","build","getSchemePalette","colors","reverse","getAnchors","maxIndex","numItems","length","anchors","lcolor","index","dcolor","lhue","lsat","llum","lalpha","dhue","dsat","dlum","dalpha","spreadIndex","hue","sat","lum","alpha","Math","round","coerceSimplePaletteToSchemePalette","def","Array","isArray","baseAnchors","getSubThemesPalettes","isGrandChildren","arguments","key","filter","Boolean","components","componentName","accentPalettes","basePalettes","next","flatMap","_$palettes","isAccent","startsWith","oppositePalettes","oppositeLight","oppositeDark","bgOffset","out"],"sources":["../../src/createThemes.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tamagui/theme-builder",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "2.0.0-001",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"sideEffects": false,
|
|
6
6
|
"source": "src/index.ts",
|
|
@@ -38,12 +38,12 @@
|
|
|
38
38
|
}
|
|
39
39
|
},
|
|
40
40
|
"dependencies": {
|
|
41
|
-
"@tamagui/create-theme": "
|
|
42
|
-
"@tamagui/web": "
|
|
41
|
+
"@tamagui/create-theme": "2.0.0-001",
|
|
42
|
+
"@tamagui/web": "2.0.0-001",
|
|
43
43
|
"color2k": "^2.0.2"
|
|
44
44
|
},
|
|
45
45
|
"devDependencies": {
|
|
46
|
-
"@tamagui/build": "
|
|
46
|
+
"@tamagui/build": "2.0.0-001",
|
|
47
47
|
"vitest": "^4.0.4"
|
|
48
48
|
},
|
|
49
49
|
"publishConfig": {
|
package/src/ThemeBuilder.ts
CHANGED
|
@@ -242,12 +242,24 @@ export class ThemeBuilder<
|
|
|
242
242
|
if ('avoidNestingWithin' in definition) {
|
|
243
243
|
const avoidNest = definition.avoidNestingWithin as string[]
|
|
244
244
|
if (
|
|
245
|
-
avoidNest.some((name) =>
|
|
245
|
+
avoidNest.some((name) => {
|
|
246
|
+
// For base scheme names (light/dark), use exact match to avoid matching derivatives
|
|
247
|
+
if ((name === 'light' || name === 'dark') && prefix.includes('_')) {
|
|
248
|
+
return false
|
|
249
|
+
}
|
|
250
|
+
return prefix.startsWith(name) || prefix.endsWith(name)
|
|
251
|
+
})
|
|
246
252
|
) {
|
|
247
253
|
return null as never
|
|
248
254
|
}
|
|
249
255
|
}
|
|
250
256
|
|
|
257
|
+
// Avoid double-nesting: don't add a child theme to a parent that already ends with that child
|
|
258
|
+
// e.g., don't create light_blue_accent_accent from light_blue_accent + accent
|
|
259
|
+
if (prefix.endsWith(`_${subName}`)) {
|
|
260
|
+
return null as never
|
|
261
|
+
}
|
|
262
|
+
|
|
251
263
|
return [fullName, definition] as const
|
|
252
264
|
})
|
|
253
265
|
.filter(Boolean)
|
package/src/createThemes.ts
CHANGED
|
@@ -6,11 +6,10 @@ import { createThemeBuilder, type ThemeBuilder } from './ThemeBuilder'
|
|
|
6
6
|
import type { BuildPalettes, BuildTemplates, GetThemeFn } from './types'
|
|
7
7
|
|
|
8
8
|
/**
|
|
9
|
-
*
|
|
10
|
-
*
|
|
11
|
-
* -
|
|
12
|
-
*
|
|
13
|
-
* needs to update both runtime logic and types
|
|
9
|
+
* GrandChildren theme nesting logic implementation:
|
|
10
|
+
* - IF palette is set: treat as palette theme (don't nest into accent family)
|
|
11
|
+
* - IF only template: nest into color children, but avoid base themes (light, dark)
|
|
12
|
+
* to prevent conflicts with top-level accent theme
|
|
14
13
|
*/
|
|
15
14
|
|
|
16
15
|
type ExtraThemeValues = Record<string, string>
|
|
@@ -104,10 +103,13 @@ export const getLastBuilder = () => lastBuilder
|
|
|
104
103
|
function normalizeSubThemes<A extends SimpleThemesDefinition>(defs?: A) {
|
|
105
104
|
return Object.fromEntries(
|
|
106
105
|
Object.entries(defs || {}).map(([name, value]) => {
|
|
106
|
+
const hasPalette = value.palette !== undefined
|
|
107
|
+
|
|
107
108
|
return [
|
|
108
109
|
name,
|
|
109
110
|
{
|
|
110
|
-
palette
|
|
111
|
+
// Only add palette if the definition has one, otherwise theme is template-only
|
|
112
|
+
...(hasPalette ? { palette: name } : {}),
|
|
111
113
|
template: value.template || 'base',
|
|
112
114
|
},
|
|
113
115
|
]
|
|
@@ -249,25 +251,6 @@ export function createSimpleThemeBuilder<
|
|
|
249
251
|
},
|
|
250
252
|
})
|
|
251
253
|
|
|
252
|
-
if (palettes.light_accent) {
|
|
253
|
-
themeBuilder = themeBuilder.addChildThemes({
|
|
254
|
-
accent: [
|
|
255
|
-
{
|
|
256
|
-
parent: 'light',
|
|
257
|
-
template: 'base',
|
|
258
|
-
palette: 'light_accent',
|
|
259
|
-
nonInheritedValues: accentExtra?.light,
|
|
260
|
-
},
|
|
261
|
-
{
|
|
262
|
-
parent: 'dark',
|
|
263
|
-
template: 'base',
|
|
264
|
-
palette: 'dark_accent',
|
|
265
|
-
nonInheritedValues: accentExtra?.dark,
|
|
266
|
-
},
|
|
267
|
-
],
|
|
268
|
-
}) as any
|
|
269
|
-
}
|
|
270
|
-
|
|
271
254
|
if (childrenThemes) {
|
|
272
255
|
themeBuilder = themeBuilder.addChildThemes(childrenThemes, {
|
|
273
256
|
avoidNestingWithin: ['accent'],
|
|
@@ -280,6 +263,32 @@ export function createSimpleThemeBuilder<
|
|
|
280
263
|
}) as any
|
|
281
264
|
}
|
|
282
265
|
|
|
266
|
+
// Add top-level accent AFTER grandChildren
|
|
267
|
+
// Avoid nesting within color children (blue, red, etc.) so grandChildren accent can handle those
|
|
268
|
+
if (palettes.light_accent) {
|
|
269
|
+
themeBuilder = themeBuilder.addChildThemes(
|
|
270
|
+
{
|
|
271
|
+
accent: [
|
|
272
|
+
{
|
|
273
|
+
parent: 'light',
|
|
274
|
+
template: 'base',
|
|
275
|
+
palette: 'light_accent',
|
|
276
|
+
nonInheritedValues: accentExtra?.light,
|
|
277
|
+
},
|
|
278
|
+
{
|
|
279
|
+
parent: 'dark',
|
|
280
|
+
template: 'base',
|
|
281
|
+
palette: 'dark_accent',
|
|
282
|
+
nonInheritedValues: accentExtra?.dark,
|
|
283
|
+
},
|
|
284
|
+
],
|
|
285
|
+
},
|
|
286
|
+
{
|
|
287
|
+
avoidNestingWithin: Object.keys(childrenThemes || {}),
|
|
288
|
+
}
|
|
289
|
+
) as any
|
|
290
|
+
}
|
|
291
|
+
|
|
283
292
|
if (componentThemes) {
|
|
284
293
|
themeBuilder = themeBuilder.addComponentThemes(getComponentThemes(componentThemes), {
|
|
285
294
|
avoidNestingWithin: [
|
|
@@ -343,19 +352,27 @@ function getThemesPalettes(props: CreateThemesProps<any, any>): BuildPalettes {
|
|
|
343
352
|
|
|
344
353
|
const baseAnchors = getAnchors(base)
|
|
345
354
|
|
|
346
|
-
function getSubThemesPalettes(defs: SimpleThemesDefinition) {
|
|
355
|
+
function getSubThemesPalettes(defs: SimpleThemesDefinition, isGrandChildren = false) {
|
|
347
356
|
return Object.fromEntries(
|
|
348
|
-
Object.entries(defs)
|
|
349
|
-
|
|
350
|
-
|
|
351
|
-
|
|
352
|
-
|
|
353
|
-
|
|
354
|
-
|
|
355
|
-
|
|
356
|
-
|
|
357
|
-
|
|
358
|
-
|
|
357
|
+
Object.entries(defs)
|
|
358
|
+
.map(([key, value]) => {
|
|
359
|
+
// For grandChildren accent without custom palette: skip it entirely
|
|
360
|
+
// It will inherit from parent in the theme builder
|
|
361
|
+
if (isGrandChildren && key === 'accent' && !value.palette) {
|
|
362
|
+
return null
|
|
363
|
+
}
|
|
364
|
+
|
|
365
|
+
return [
|
|
366
|
+
key,
|
|
367
|
+
{
|
|
368
|
+
name: key,
|
|
369
|
+
anchors: value.palette
|
|
370
|
+
? getAnchors(coerceSimplePaletteToSchemePalette(value.palette))
|
|
371
|
+
: baseAnchors,
|
|
372
|
+
},
|
|
373
|
+
]
|
|
374
|
+
})
|
|
375
|
+
.filter(Boolean) as [string, any][]
|
|
359
376
|
)
|
|
360
377
|
}
|
|
361
378
|
|
|
@@ -370,8 +387,9 @@ function getThemesPalettes(props: CreateThemesProps<any, any>): BuildPalettes {
|
|
|
370
387
|
anchors: getAnchors(accent),
|
|
371
388
|
},
|
|
372
389
|
}),
|
|
373
|
-
...(props.childrenThemes && getSubThemesPalettes(props.childrenThemes)),
|
|
374
|
-
...(props.grandChildrenThemes &&
|
|
390
|
+
...(props.childrenThemes && getSubThemesPalettes(props.childrenThemes, false)),
|
|
391
|
+
...(props.grandChildrenThemes &&
|
|
392
|
+
getSubThemesPalettes(props.grandChildrenThemes, true)),
|
|
375
393
|
}
|
|
376
394
|
}
|
|
377
395
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ThemeBuilder.d.ts","sourceRoot":"","sources":["../src/ThemeBuilder.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"ThemeBuilder.d.ts","sourceRoot":"","sources":["../src/ThemeBuilder.ts"],"names":[],"mappings":"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"}
|