tokenami 0.0.83 → 0.0.84
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/cli.cjs +9 -4
- package/dist/cli.js +9 -4
- package/package.json +4 -4
package/dist/cli.cjs
CHANGED
|
@@ -1913,7 +1913,7 @@ function createSheet(params) {
|
|
|
1913
1913
|
if (prop.variant && toggleKey) {
|
|
1914
1914
|
const responsive = getResponsiveSelectorFromConfig(prop.responsive, params.config);
|
|
1915
1915
|
const selectorConfig = getPropertyConfigSelector(prop.selector, params.config);
|
|
1916
|
-
const
|
|
1916
|
+
const hasChildSelector = selectorConfig.some(isChildSelector);
|
|
1917
1917
|
const hashedProperty = hashVariantProperty(prop.variant, cssProperty);
|
|
1918
1918
|
const basePropertyValue = getBasePropertyValue(prop.tokenProperty, prop, false);
|
|
1919
1919
|
const toggleProperty = Tokenami2__namespace.parsedTokenProperty(prop.variant);
|
|
@@ -1924,7 +1924,9 @@ function createSheet(params) {
|
|
|
1924
1924
|
const declarationValue = prop.isCustom ? customPropertyValue : variantValue;
|
|
1925
1925
|
const declaration = `${propertyPrefix}${cssProperty}: ${declarationValue};`;
|
|
1926
1926
|
styles.reset.add(`${toggleProperty}: initial;`);
|
|
1927
|
-
if (!isInheritable && !
|
|
1927
|
+
if (!isInheritable && !hasChildSelector) {
|
|
1928
|
+
styles.reset.add(`${prop.tokenProperty}: initial;`);
|
|
1929
|
+
}
|
|
1928
1930
|
if (selectorConfig.includes(`&${SELECTION_PSEUDO}`)) {
|
|
1929
1931
|
styles.selectorsSelection[layer] ??= /* @__PURE__ */ new Set();
|
|
1930
1932
|
styles.selectorsSelection[layer].add(declaration);
|
|
@@ -2195,7 +2197,10 @@ function isElementSelector(selector = "") {
|
|
|
2195
2197
|
return isCombinatorSelector(selector) || /::/.test(selector) || selector === "&";
|
|
2196
2198
|
}
|
|
2197
2199
|
function isCombinatorSelector(selector = "") {
|
|
2198
|
-
return /(.+)\s
|
|
2200
|
+
return isChildSelector(selector) || /(.+)\s\&/.test(selector);
|
|
2201
|
+
}
|
|
2202
|
+
function isChildSelector(selector = "") {
|
|
2203
|
+
return /&\s(.+)/.test(selector);
|
|
2199
2204
|
}
|
|
2200
2205
|
function getResponsiveSelectorFromConfig(responsiveSelector, tokenamiConfig) {
|
|
2201
2206
|
return responsiveSelector && tokenamiConfig.responsive?.[responsiveSelector];
|
|
@@ -2220,7 +2225,7 @@ function getParsedSelectors(propertySelector, selectorConfig, elementSelectors)
|
|
|
2220
2225
|
|
|
2221
2226
|
// package.json
|
|
2222
2227
|
var package_default = {
|
|
2223
|
-
version: "0.0.
|
|
2228
|
+
version: "0.0.83"};
|
|
2224
2229
|
|
|
2225
2230
|
// src/ts-plugin/index.ts
|
|
2226
2231
|
init_cjs_shims();
|
package/dist/cli.js
CHANGED
|
@@ -1881,7 +1881,7 @@ function createSheet(params) {
|
|
|
1881
1881
|
if (prop.variant && toggleKey) {
|
|
1882
1882
|
const responsive = getResponsiveSelectorFromConfig(prop.responsive, params.config);
|
|
1883
1883
|
const selectorConfig = getPropertyConfigSelector(prop.selector, params.config);
|
|
1884
|
-
const
|
|
1884
|
+
const hasChildSelector = selectorConfig.some(isChildSelector);
|
|
1885
1885
|
const hashedProperty = hashVariantProperty(prop.variant, cssProperty);
|
|
1886
1886
|
const basePropertyValue = getBasePropertyValue(prop.tokenProperty, prop, false);
|
|
1887
1887
|
const toggleProperty = Tokenami2.parsedTokenProperty(prop.variant);
|
|
@@ -1892,7 +1892,9 @@ function createSheet(params) {
|
|
|
1892
1892
|
const declarationValue = prop.isCustom ? customPropertyValue : variantValue;
|
|
1893
1893
|
const declaration = `${propertyPrefix}${cssProperty}: ${declarationValue};`;
|
|
1894
1894
|
styles.reset.add(`${toggleProperty}: initial;`);
|
|
1895
|
-
if (!isInheritable && !
|
|
1895
|
+
if (!isInheritable && !hasChildSelector) {
|
|
1896
|
+
styles.reset.add(`${prop.tokenProperty}: initial;`);
|
|
1897
|
+
}
|
|
1896
1898
|
if (selectorConfig.includes(`&${SELECTION_PSEUDO}`)) {
|
|
1897
1899
|
styles.selectorsSelection[layer] ??= /* @__PURE__ */ new Set();
|
|
1898
1900
|
styles.selectorsSelection[layer].add(declaration);
|
|
@@ -2163,7 +2165,10 @@ function isElementSelector(selector = "") {
|
|
|
2163
2165
|
return isCombinatorSelector(selector) || /::/.test(selector) || selector === "&";
|
|
2164
2166
|
}
|
|
2165
2167
|
function isCombinatorSelector(selector = "") {
|
|
2166
|
-
return /(.+)\s
|
|
2168
|
+
return isChildSelector(selector) || /(.+)\s\&/.test(selector);
|
|
2169
|
+
}
|
|
2170
|
+
function isChildSelector(selector = "") {
|
|
2171
|
+
return /&\s(.+)/.test(selector);
|
|
2167
2172
|
}
|
|
2168
2173
|
function getResponsiveSelectorFromConfig(responsiveSelector, tokenamiConfig) {
|
|
2169
2174
|
return responsiveSelector && tokenamiConfig.responsive?.[responsiveSelector];
|
|
@@ -2188,7 +2193,7 @@ function getParsedSelectors(propertySelector, selectorConfig, elementSelectors)
|
|
|
2188
2193
|
|
|
2189
2194
|
// package.json
|
|
2190
2195
|
var package_default = {
|
|
2191
|
-
version: "0.0.
|
|
2196
|
+
version: "0.0.83"};
|
|
2192
2197
|
|
|
2193
2198
|
// src/ts-plugin/index.ts
|
|
2194
2199
|
init_esm_shims();
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "tokenami",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.84",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "./dist/index.cjs",
|
|
@@ -45,8 +45,8 @@
|
|
|
45
45
|
},
|
|
46
46
|
"dependencies": {
|
|
47
47
|
"@stitches/stringify": "^1.2.8",
|
|
48
|
-
"@tokenami/config": "0.0.
|
|
49
|
-
"@tokenami/ds": "0.0.
|
|
48
|
+
"@tokenami/config": "0.0.84",
|
|
49
|
+
"@tokenami/ds": "0.0.84",
|
|
50
50
|
"acorn": "^8.11.3",
|
|
51
51
|
"acorn-walk": "^8.3.2",
|
|
52
52
|
"browserslist": "^4.24.4",
|
|
@@ -67,5 +67,5 @@
|
|
|
67
67
|
"peerDependencies": {
|
|
68
68
|
"typescript": ">= 5"
|
|
69
69
|
},
|
|
70
|
-
"gitHead": "
|
|
70
|
+
"gitHead": "40e063e1748198456b0de56f8df7ab7f9411f537"
|
|
71
71
|
}
|