@tamagui/static 1.0.1-beta.74 → 1.0.1-beta.77
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/constants.js +0 -0
- package/dist/cjs/constants.js.map +0 -0
- package/dist/cjs/extractor/accessSafe.js +0 -0
- package/dist/cjs/extractor/accessSafe.js.map +0 -0
- package/dist/cjs/extractor/babelParse.js +0 -0
- package/dist/cjs/extractor/babelParse.js.map +0 -0
- package/dist/cjs/extractor/buildClassName.js +0 -0
- package/dist/cjs/extractor/buildClassName.js.map +0 -0
- package/dist/cjs/extractor/createEvaluator.js +0 -0
- package/dist/cjs/extractor/createEvaluator.js.map +0 -0
- package/dist/cjs/extractor/createExtractor.js +9 -6
- package/dist/cjs/extractor/createExtractor.js.map +2 -2
- package/dist/cjs/extractor/ensureImportingConcat.js +0 -0
- package/dist/cjs/extractor/ensureImportingConcat.js.map +0 -0
- package/dist/cjs/extractor/evaluateAstNode.js +0 -0
- package/dist/cjs/extractor/evaluateAstNode.js.map +0 -0
- package/dist/cjs/extractor/extractHelpers.js +0 -0
- package/dist/cjs/extractor/extractHelpers.js.map +0 -0
- package/dist/cjs/extractor/extractMediaStyle.js +0 -0
- package/dist/cjs/extractor/extractMediaStyle.js.map +0 -0
- package/dist/cjs/extractor/extractToClassNames.js +2 -2
- package/dist/cjs/extractor/extractToClassNames.js.map +2 -2
- package/dist/cjs/extractor/findTopmostFunction.js +0 -0
- package/dist/cjs/extractor/findTopmostFunction.js.map +0 -0
- package/dist/cjs/extractor/generatedUid.js +0 -0
- package/dist/cjs/extractor/generatedUid.js.map +0 -0
- package/dist/cjs/extractor/getPrefixLogs.js +0 -0
- package/dist/cjs/extractor/getPrefixLogs.js.map +0 -0
- package/dist/cjs/extractor/getPropValueFromAttributes.js +0 -0
- package/dist/cjs/extractor/getPropValueFromAttributes.js.map +0 -0
- package/dist/cjs/extractor/getSourceModule.js +0 -0
- package/dist/cjs/extractor/getSourceModule.js.map +0 -0
- package/dist/cjs/extractor/getStaticBindingsForScope.js +0 -0
- package/dist/cjs/extractor/getStaticBindingsForScope.js.map +0 -0
- package/dist/cjs/extractor/hoistClassNames.js +0 -0
- package/dist/cjs/extractor/hoistClassNames.js.map +0 -0
- package/dist/cjs/extractor/literalToAst.js +0 -0
- package/dist/cjs/extractor/literalToAst.js.map +0 -0
- package/dist/cjs/extractor/loadTamagui.js +41 -5
- package/dist/cjs/extractor/loadTamagui.js.map +2 -2
- package/dist/cjs/extractor/logLines.js +0 -0
- package/dist/cjs/extractor/logLines.js.map +0 -0
- package/dist/cjs/extractor/normalizeTernaries.js +0 -0
- package/dist/cjs/extractor/normalizeTernaries.js.map +0 -0
- package/dist/cjs/extractor/removeUnusedHooks.js +0 -0
- package/dist/cjs/extractor/removeUnusedHooks.js.map +0 -0
- package/dist/cjs/extractor/timer.js +0 -0
- package/dist/cjs/extractor/timer.js.map +0 -0
- package/dist/cjs/extractor/validHTMLAttributes.js +0 -0
- package/dist/cjs/extractor/validHTMLAttributes.js.map +0 -0
- package/dist/cjs/index.js +1 -0
- package/dist/cjs/index.js.map +2 -2
- package/dist/cjs/types.js +0 -0
- package/dist/cjs/types.js.map +0 -0
- package/dist/esm/constants.js +0 -0
- package/dist/esm/constants.js.map +0 -0
- package/dist/esm/extractor/accessSafe.js +0 -0
- package/dist/esm/extractor/accessSafe.js.map +0 -0
- package/dist/esm/extractor/babelParse.js +0 -0
- package/dist/esm/extractor/babelParse.js.map +0 -0
- package/dist/esm/extractor/buildClassName.js +0 -0
- package/dist/esm/extractor/buildClassName.js.map +0 -0
- package/dist/esm/extractor/createEvaluator.js +0 -0
- package/dist/esm/extractor/createEvaluator.js.map +0 -0
- package/dist/esm/extractor/createExtractor.js +111 -72
- package/dist/esm/extractor/createExtractor.js.map +2 -2
- package/dist/esm/extractor/ensureImportingConcat.js +0 -0
- package/dist/esm/extractor/ensureImportingConcat.js.map +0 -0
- package/dist/esm/extractor/evaluateAstNode.js +0 -0
- package/dist/esm/extractor/evaluateAstNode.js.map +0 -0
- package/dist/esm/extractor/extractHelpers.js +0 -0
- package/dist/esm/extractor/extractHelpers.js.map +0 -0
- package/dist/esm/extractor/extractMediaStyle.js +27 -12
- package/dist/esm/extractor/extractMediaStyle.js.map +1 -1
- package/dist/esm/extractor/extractToClassNames.js +30 -16
- package/dist/esm/extractor/extractToClassNames.js.map +2 -2
- package/dist/esm/extractor/findTopmostFunction.js +0 -0
- package/dist/esm/extractor/findTopmostFunction.js.map +0 -0
- package/dist/esm/extractor/generatedUid.js +0 -0
- package/dist/esm/extractor/generatedUid.js.map +0 -0
- package/dist/esm/extractor/getPrefixLogs.js +1 -2
- package/dist/esm/extractor/getPrefixLogs.js.map +1 -1
- package/dist/esm/extractor/getPropValueFromAttributes.js +0 -0
- package/dist/esm/extractor/getPropValueFromAttributes.js.map +0 -0
- package/dist/esm/extractor/getSourceModule.js +0 -0
- package/dist/esm/extractor/getSourceModule.js.map +0 -0
- package/dist/esm/extractor/getStaticBindingsForScope.js +0 -0
- package/dist/esm/extractor/getStaticBindingsForScope.js.map +0 -0
- package/dist/esm/extractor/hoistClassNames.js +0 -0
- package/dist/esm/extractor/hoistClassNames.js.map +0 -0
- package/dist/esm/extractor/literalToAst.js +22 -7
- package/dist/esm/extractor/literalToAst.js.map +1 -1
- package/dist/esm/extractor/loadTamagui.js +42 -5
- package/dist/esm/extractor/loadTamagui.js.map +2 -2
- package/dist/esm/extractor/logLines.js +0 -0
- package/dist/esm/extractor/logLines.js.map +0 -0
- package/dist/esm/extractor/normalizeTernaries.js +36 -7
- package/dist/esm/extractor/normalizeTernaries.js.map +1 -1
- package/dist/esm/extractor/removeUnusedHooks.js +3 -4
- package/dist/esm/extractor/removeUnusedHooks.js.map +1 -1
- package/dist/esm/extractor/timer.js +0 -0
- package/dist/esm/extractor/timer.js.map +0 -0
- package/dist/esm/extractor/validHTMLAttributes.js +0 -0
- package/dist/esm/extractor/validHTMLAttributes.js.map +0 -0
- package/dist/esm/index.js +1 -0
- package/dist/esm/index.js.map +2 -2
- package/dist/esm/types.js +0 -0
- package/dist/esm/types.js.map +0 -0
- package/dist/jsx/constants.js +0 -0
- package/dist/jsx/extractor/accessSafe.js +0 -0
- package/dist/jsx/extractor/babelParse.js +0 -0
- package/dist/jsx/extractor/buildClassName.js +0 -0
- package/dist/jsx/extractor/createEvaluator.js +0 -0
- package/dist/jsx/extractor/createExtractor.js +10 -7
- package/dist/jsx/extractor/ensureImportingConcat.js +0 -0
- package/dist/jsx/extractor/evaluateAstNode.js +0 -0
- package/dist/jsx/extractor/extractHelpers.js +0 -0
- package/dist/jsx/extractor/extractMediaStyle.js +0 -0
- package/dist/jsx/extractor/extractToClassNames.js +2 -2
- package/dist/jsx/extractor/findTopmostFunction.js +0 -0
- package/dist/jsx/extractor/generatedUid.js +0 -0
- package/dist/jsx/extractor/getPrefixLogs.js +0 -0
- package/dist/jsx/extractor/getPropValueFromAttributes.js +0 -0
- package/dist/jsx/extractor/getSourceModule.js +0 -0
- package/dist/jsx/extractor/getStaticBindingsForScope.js +0 -0
- package/dist/jsx/extractor/hoistClassNames.js +0 -0
- package/dist/jsx/extractor/literalToAst.js +0 -0
- package/dist/jsx/extractor/loadTamagui.js +27 -5
- package/dist/jsx/extractor/logLines.js +0 -0
- package/dist/jsx/extractor/normalizeTernaries.js +0 -0
- package/dist/jsx/extractor/removeUnusedHooks.js +0 -0
- package/dist/jsx/extractor/timer.js +0 -0
- package/dist/jsx/extractor/validHTMLAttributes.js +0 -0
- package/dist/jsx/index.js +1 -0
- package/dist/jsx/types.js +0 -0
- package/package.json +11 -11
- package/src/extractor/createExtractor.ts +10 -7
- package/src/extractor/extractToClassNames.ts +2 -2
- package/src/extractor/loadTamagui.ts +42 -36
- package/src/index.ts +1 -0
- package/types/constants.d.ts +0 -0
- package/types/constants.d.ts.map +0 -0
- package/types/extractor/accessSafe.d.ts +0 -0
- package/types/extractor/accessSafe.d.ts.map +0 -0
- package/types/extractor/babelParse.d.ts +0 -0
- package/types/extractor/babelParse.d.ts.map +0 -0
- package/types/extractor/buildClassName.d.ts +0 -0
- package/types/extractor/buildClassName.d.ts.map +0 -0
- package/types/extractor/createEvaluator.d.ts +0 -0
- package/types/extractor/createEvaluator.d.ts.map +0 -0
- package/types/extractor/createExtractor.d.ts +0 -0
- package/types/extractor/createExtractor.d.ts.map +1 -1
- package/types/extractor/ensureImportingConcat.d.ts +0 -0
- package/types/extractor/ensureImportingConcat.d.ts.map +0 -0
- package/types/extractor/evaluateAstNode.d.ts +0 -0
- package/types/extractor/evaluateAstNode.d.ts.map +0 -0
- package/types/extractor/extractHelpers.d.ts +0 -0
- package/types/extractor/extractHelpers.d.ts.map +0 -0
- package/types/extractor/extractMediaStyle.d.ts +0 -0
- package/types/extractor/extractMediaStyle.d.ts.map +0 -0
- package/types/extractor/extractToClassNames.d.ts +0 -0
- package/types/extractor/extractToClassNames.d.ts.map +0 -0
- package/types/extractor/findTopmostFunction.d.ts +0 -0
- package/types/extractor/findTopmostFunction.d.ts.map +0 -0
- package/types/extractor/generatedUid.d.ts +0 -0
- package/types/extractor/generatedUid.d.ts.map +0 -0
- package/types/extractor/getPrefixLogs.d.ts +0 -0
- package/types/extractor/getPrefixLogs.d.ts.map +0 -0
- package/types/extractor/getPropValueFromAttributes.d.ts +0 -0
- package/types/extractor/getPropValueFromAttributes.d.ts.map +0 -0
- package/types/extractor/getSourceModule.d.ts +0 -0
- package/types/extractor/getSourceModule.d.ts.map +0 -0
- package/types/extractor/getStaticBindingsForScope.d.ts +0 -0
- package/types/extractor/getStaticBindingsForScope.d.ts.map +0 -0
- package/types/extractor/hoistClassNames.d.ts +0 -0
- package/types/extractor/hoistClassNames.d.ts.map +0 -0
- package/types/extractor/literalToAst.d.ts +0 -0
- package/types/extractor/literalToAst.d.ts.map +0 -0
- package/types/extractor/loadTamagui.d.ts +10 -4
- package/types/extractor/loadTamagui.d.ts.map +1 -1
- package/types/extractor/logLines.d.ts +0 -0
- package/types/extractor/logLines.d.ts.map +0 -0
- package/types/extractor/normalizeTernaries.d.ts +0 -0
- package/types/extractor/normalizeTernaries.d.ts.map +0 -0
- package/types/extractor/removeUnusedHooks.d.ts +0 -0
- package/types/extractor/removeUnusedHooks.d.ts.map +0 -0
- package/types/extractor/timer.d.ts +0 -0
- package/types/extractor/timer.d.ts.map +0 -0
- package/types/extractor/validHTMLAttributes.d.ts +0 -0
- package/types/extractor/validHTMLAttributes.d.ts.map +0 -0
- package/types/index.d.ts +1 -0
- package/types/index.d.ts.map +1 -1
- package/types/types.d.ts +0 -0
- package/types/types.d.ts.map +0 -0
|
@@ -1,3 +1,34 @@
|
|
|
1
|
+
var __defProp = Object.defineProperty;
|
|
2
|
+
var __defProps = Object.defineProperties;
|
|
3
|
+
var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
|
|
4
|
+
var __getOwnPropSymbols = Object.getOwnPropertySymbols;
|
|
5
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
6
|
+
var __propIsEnum = Object.prototype.propertyIsEnumerable;
|
|
7
|
+
var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
|
|
8
|
+
var __spreadValues = (a, b) => {
|
|
9
|
+
for (var prop in b || (b = {}))
|
|
10
|
+
if (__hasOwnProp.call(b, prop))
|
|
11
|
+
__defNormalProp(a, prop, b[prop]);
|
|
12
|
+
if (__getOwnPropSymbols)
|
|
13
|
+
for (var prop of __getOwnPropSymbols(b)) {
|
|
14
|
+
if (__propIsEnum.call(b, prop))
|
|
15
|
+
__defNormalProp(a, prop, b[prop]);
|
|
16
|
+
}
|
|
17
|
+
return a;
|
|
18
|
+
};
|
|
19
|
+
var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
|
|
20
|
+
var __objRest = (source, exclude) => {
|
|
21
|
+
var target = {};
|
|
22
|
+
for (var prop in source)
|
|
23
|
+
if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
|
|
24
|
+
target[prop] = source[prop];
|
|
25
|
+
if (source != null && __getOwnPropSymbols)
|
|
26
|
+
for (var prop of __getOwnPropSymbols(source)) {
|
|
27
|
+
if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop))
|
|
28
|
+
target[prop] = source[prop];
|
|
29
|
+
}
|
|
30
|
+
return target;
|
|
31
|
+
};
|
|
1
32
|
import { relative } from "path";
|
|
2
33
|
import traverse from "@babel/traverse";
|
|
3
34
|
import * as t from "@babel/types";
|
|
@@ -8,7 +39,7 @@ import {
|
|
|
8
39
|
mediaQueryConfig,
|
|
9
40
|
normalizeStyleObject,
|
|
10
41
|
proxyThemeVariables,
|
|
11
|
-
|
|
42
|
+
pseudoDescriptors,
|
|
12
43
|
rnw,
|
|
13
44
|
stylePropsTransform
|
|
14
45
|
} from "@tamagui/core-node";
|
|
@@ -56,32 +87,50 @@ function createExtractor() {
|
|
|
56
87
|
let hasLogged = false;
|
|
57
88
|
function isValidStyleKey(name, staticConfig) {
|
|
58
89
|
var _a;
|
|
59
|
-
return !!(!!((_a = staticConfig.validStyles) == null ? void 0 : _a[name]) || !!
|
|
90
|
+
return !!(!!((_a = staticConfig.validStyles) == null ? void 0 : _a[name]) || !!pseudoDescriptors[name] || loadedTamaguiConfig.shorthands[name] || (name[0] === "$" ? !!mediaQueryConfig[name.slice(1)] : false));
|
|
60
91
|
}
|
|
61
92
|
return {
|
|
62
93
|
getTamagui() {
|
|
63
94
|
return loadedTamaguiConfig;
|
|
64
95
|
},
|
|
65
|
-
parse: (fileOrPath, {
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
96
|
+
parse: (fileOrPath, _a) => {
|
|
97
|
+
var _b = _a, {
|
|
98
|
+
config = "tamagui.config.ts",
|
|
99
|
+
importsWhitelist = ["constants.js"],
|
|
100
|
+
evaluateVars = true,
|
|
101
|
+
shouldPrintDebug = false,
|
|
102
|
+
sourcePath = "",
|
|
103
|
+
onExtractTag,
|
|
104
|
+
onStyleRule,
|
|
105
|
+
getFlattenedNode,
|
|
106
|
+
disable,
|
|
107
|
+
disableExtraction,
|
|
108
|
+
disableExtractInlineMedia,
|
|
109
|
+
disableExtractVariables,
|
|
110
|
+
disableDebugAttr,
|
|
111
|
+
extractStyledDefinitions,
|
|
112
|
+
prefixLogs,
|
|
113
|
+
excludeProps,
|
|
114
|
+
target
|
|
115
|
+
} = _b, props = __objRest(_b, [
|
|
116
|
+
"config",
|
|
117
|
+
"importsWhitelist",
|
|
118
|
+
"evaluateVars",
|
|
119
|
+
"shouldPrintDebug",
|
|
120
|
+
"sourcePath",
|
|
121
|
+
"onExtractTag",
|
|
122
|
+
"onStyleRule",
|
|
123
|
+
"getFlattenedNode",
|
|
124
|
+
"disable",
|
|
125
|
+
"disableExtraction",
|
|
126
|
+
"disableExtractInlineMedia",
|
|
127
|
+
"disableExtractVariables",
|
|
128
|
+
"disableDebugAttr",
|
|
129
|
+
"extractStyledDefinitions",
|
|
130
|
+
"prefixLogs",
|
|
131
|
+
"excludeProps",
|
|
132
|
+
"target"
|
|
133
|
+
]);
|
|
85
134
|
if (disable) {
|
|
86
135
|
return null;
|
|
87
136
|
}
|
|
@@ -118,8 +167,8 @@ function createExtractor() {
|
|
|
118
167
|
return isInsideTamagui(sourcePath) && importStr[0] === ".";
|
|
119
168
|
};
|
|
120
169
|
const validComponents = Object.keys(components).filter((key) => {
|
|
121
|
-
var
|
|
122
|
-
return key[0].toUpperCase() === key[0] && !!((
|
|
170
|
+
var _a2;
|
|
171
|
+
return key[0].toUpperCase() === key[0] && !!((_a2 = components[key]) == null ? void 0 : _a2.staticConfig);
|
|
123
172
|
}).reduce((obj, name) => {
|
|
124
173
|
obj[name] = components[name];
|
|
125
174
|
return obj;
|
|
@@ -245,12 +294,11 @@ function createExtractor() {
|
|
|
245
294
|
pressIn: false,
|
|
246
295
|
resolveVariablesAs: "variable"
|
|
247
296
|
});
|
|
248
|
-
const classNames = {
|
|
249
|
-
...out.classNames
|
|
250
|
-
};
|
|
297
|
+
const classNames = __spreadValues({}, out.classNames);
|
|
251
298
|
const atomics = getStylesAtomic(out.style);
|
|
252
299
|
for (const atomic of atomics) {
|
|
253
300
|
for (const rule of atomic.rules) {
|
|
301
|
+
out.rulesToInsert = out.rulesToInsert || [];
|
|
254
302
|
out.rulesToInsert.push([atomic.identifier, rule]);
|
|
255
303
|
}
|
|
256
304
|
classNames[atomic.property] = atomic.identifier;
|
|
@@ -260,8 +308,10 @@ function createExtractor() {
|
|
|
260
308
|
const val = classNames[cn];
|
|
261
309
|
definition.properties.push(t.objectProperty(t.stringLiteral(cn), t.stringLiteral(val)));
|
|
262
310
|
}
|
|
263
|
-
|
|
264
|
-
|
|
311
|
+
if (out.rulesToInsert) {
|
|
312
|
+
for (const [identifier, rule] of out.rulesToInsert) {
|
|
313
|
+
onStyleRule == null ? void 0 : onStyleRule(identifier, [rule]);
|
|
314
|
+
}
|
|
265
315
|
}
|
|
266
316
|
res.styled++;
|
|
267
317
|
if (shouldPrintDebug) {
|
|
@@ -269,7 +319,7 @@ function createExtractor() {
|
|
|
269
319
|
}
|
|
270
320
|
},
|
|
271
321
|
JSXElement(traversePath) {
|
|
272
|
-
var
|
|
322
|
+
var _a2, _b2, _c, _d, _e;
|
|
273
323
|
tm.mark("jsx-element", shouldPrintDebug === "verbose");
|
|
274
324
|
const node = traversePath.node.openingElement;
|
|
275
325
|
const ogAttributes = node.attributes;
|
|
@@ -658,9 +708,7 @@ function createExtractor() {
|
|
|
658
708
|
inlineMediaQuery: mediaQueryKey
|
|
659
709
|
});
|
|
660
710
|
if (ternaries2) {
|
|
661
|
-
return ternaries2.map((value) => ({
|
|
662
|
-
...ternaryPartial,
|
|
663
|
-
...value,
|
|
711
|
+
return ternaries2.map((value) => __spreadProps(__spreadValues(__spreadValues({}, ternaryPartial), value), {
|
|
664
712
|
test: t.logicalExpression("&&", value.test, test)
|
|
665
713
|
}));
|
|
666
714
|
} else {
|
|
@@ -677,39 +725,38 @@ function createExtractor() {
|
|
|
677
725
|
t.objectExpression([t.objectProperty(property.key, property.value.alternate)])
|
|
678
726
|
].map((x) => attemptEval(x));
|
|
679
727
|
return [
|
|
680
|
-
createTernary({
|
|
728
|
+
createTernary(__spreadProps(__spreadValues({
|
|
681
729
|
remove() {
|
|
682
|
-
}
|
|
683
|
-
|
|
730
|
+
}
|
|
731
|
+
}, ternaryPartial), {
|
|
684
732
|
test: t.logicalExpression("&&", test, property.value.test),
|
|
685
733
|
consequent: truthy,
|
|
686
734
|
alternate: null
|
|
687
|
-
}),
|
|
688
|
-
createTernary({
|
|
689
|
-
...ternaryPartial,
|
|
735
|
+
})),
|
|
736
|
+
createTernary(__spreadProps(__spreadValues({}, ternaryPartial), {
|
|
690
737
|
test: t.logicalExpression("&&", test, t.unaryExpression("!", property.value.test)),
|
|
691
738
|
consequent: falsy,
|
|
692
739
|
alternate: null,
|
|
693
740
|
remove() {
|
|
694
741
|
}
|
|
695
|
-
})
|
|
742
|
+
}))
|
|
696
743
|
];
|
|
697
744
|
}
|
|
698
745
|
const obj = t.objectExpression([t.objectProperty(property.key, property.value)]);
|
|
699
746
|
const consequent = attemptEval(obj);
|
|
700
|
-
return createTernary({
|
|
747
|
+
return createTernary(__spreadProps(__spreadValues({
|
|
701
748
|
remove() {
|
|
702
|
-
}
|
|
703
|
-
|
|
749
|
+
}
|
|
750
|
+
}, ternaryPartial), {
|
|
704
751
|
test,
|
|
705
752
|
consequent,
|
|
706
753
|
alternate: null
|
|
707
|
-
});
|
|
754
|
+
}));
|
|
708
755
|
});
|
|
709
756
|
}, mergeStyles = function(prev2, next) {
|
|
710
757
|
normalizeStyleObject(next);
|
|
711
758
|
for (const key in next) {
|
|
712
|
-
if (
|
|
759
|
+
if (pseudoDescriptors[key]) {
|
|
713
760
|
prev2[key] = prev2[key] || {};
|
|
714
761
|
if (shouldPrintDebug) {
|
|
715
762
|
if (!next[key] || !prev2[key]) {
|
|
@@ -724,7 +771,7 @@ function createExtractor() {
|
|
|
724
771
|
}, omitInvalidStyles = function(style) {
|
|
725
772
|
if (staticConfig.validStyles) {
|
|
726
773
|
for (const key in style) {
|
|
727
|
-
if (stylePropsTransform[key] || !staticConfig.validStyles[key] && !
|
|
774
|
+
if (stylePropsTransform[key] || !staticConfig.validStyles[key] && !pseudoDescriptors[key] && !/(hoverStyle|focusStyle|pressStyle)$/.test(key)) {
|
|
728
775
|
if (shouldPrintDebug)
|
|
729
776
|
console.log(" delete invalid style", key);
|
|
730
777
|
delete style[key];
|
|
@@ -755,8 +802,8 @@ function createExtractor() {
|
|
|
755
802
|
const { staticConfig } = component;
|
|
756
803
|
const variants = staticConfig.variants || {};
|
|
757
804
|
const isTextView = staticConfig.isText || false;
|
|
758
|
-
const validStyles = (
|
|
759
|
-
let tagName = (
|
|
805
|
+
const validStyles = (staticConfig == null ? void 0 : staticConfig.validStyles) ?? {};
|
|
806
|
+
let tagName = ((_a2 = staticConfig.defaultProps) == null ? void 0 : _a2.tag) ?? (isTextView ? "span" : "div");
|
|
760
807
|
traversePath.get("openingElement").get("attributes").forEach((path) => {
|
|
761
808
|
const attr = path.node;
|
|
762
809
|
if (t.isJSXSpreadAttribute(attr))
|
|
@@ -884,14 +931,14 @@ function createExtractor() {
|
|
|
884
931
|
ternaries.push(cur.value);
|
|
885
932
|
}
|
|
886
933
|
if ((!next || next.type !== "ternary") && ternaries.length) {
|
|
887
|
-
const normalized = normalizeTernaries(ternaries).map((
|
|
934
|
+
const normalized = normalizeTernaries(ternaries).map((_a3) => {
|
|
935
|
+
var _b3 = _a3, { alternate, consequent } = _b3, rest = __objRest(_b3, ["alternate", "consequent"]);
|
|
888
936
|
return {
|
|
889
937
|
type: "ternary",
|
|
890
|
-
value: {
|
|
891
|
-
...rest,
|
|
938
|
+
value: __spreadProps(__spreadValues({}, rest), {
|
|
892
939
|
alternate: alternate || null,
|
|
893
940
|
consequent: consequent || null
|
|
894
|
-
}
|
|
941
|
+
})
|
|
895
942
|
};
|
|
896
943
|
});
|
|
897
944
|
try {
|
|
@@ -914,7 +961,7 @@ function createExtractor() {
|
|
|
914
961
|
let themeVal = inlined.get("theme");
|
|
915
962
|
inlined.delete("theme");
|
|
916
963
|
for (const [key] of [...inlined]) {
|
|
917
|
-
if (INLINE_EXTRACTABLE[key] || ((
|
|
964
|
+
if (INLINE_EXTRACTABLE[key] || ((_b2 = staticConfig.variants) == null ? void 0 : _b2[key])) {
|
|
918
965
|
inlined.delete(key);
|
|
919
966
|
}
|
|
920
967
|
}
|
|
@@ -977,10 +1024,10 @@ function createExtractor() {
|
|
|
977
1024
|
for (const cur of attrs) {
|
|
978
1025
|
if (cur.type === "style") {
|
|
979
1026
|
for (const key in cur.value) {
|
|
980
|
-
const shouldEnsureOverridden = !!((
|
|
1027
|
+
const shouldEnsureOverridden = !!((_c = staticConfig.ensureOverriddenProp) == null ? void 0 : _c[key]);
|
|
981
1028
|
const isSetInAttrsAlready = attrs.some((x) => x.type === "attr" && x.value.type === "JSXAttribute" && x.value.name.name === key);
|
|
982
1029
|
if (!isSetInAttrsAlready) {
|
|
983
|
-
const isVariant = !!((
|
|
1030
|
+
const isVariant = !!((_d = staticConfig.variants) == null ? void 0 : _d[cur.name || ""]);
|
|
984
1031
|
if (isVariant || shouldEnsureOverridden) {
|
|
985
1032
|
ensureOverridden[key] = true;
|
|
986
1033
|
}
|
|
@@ -1006,10 +1053,7 @@ function createExtractor() {
|
|
|
1006
1053
|
const cur = attrs[key];
|
|
1007
1054
|
if (cur.type === "style") {
|
|
1008
1055
|
normalizeStyleObject(cur.value);
|
|
1009
|
-
foundStaticProps = {
|
|
1010
|
-
...foundStaticProps,
|
|
1011
|
-
...expandStyles(cur.value)
|
|
1012
|
-
};
|
|
1056
|
+
foundStaticProps = __spreadValues(__spreadValues({}, foundStaticProps), expandStyles(cur.value));
|
|
1013
1057
|
continue;
|
|
1014
1058
|
}
|
|
1015
1059
|
if (cur.type === "attr") {
|
|
@@ -1022,10 +1066,9 @@ function createExtractor() {
|
|
|
1022
1066
|
const key2 = cur.value.name.name;
|
|
1023
1067
|
const value = attemptEvalSafe(cur.value.value || t.booleanLiteral(true));
|
|
1024
1068
|
if (value !== FAILED_EVAL) {
|
|
1025
|
-
foundStaticProps = {
|
|
1026
|
-
...foundStaticProps,
|
|
1069
|
+
foundStaticProps = __spreadProps(__spreadValues({}, foundStaticProps), {
|
|
1027
1070
|
[key2]: value
|
|
1028
|
-
};
|
|
1071
|
+
});
|
|
1029
1072
|
}
|
|
1030
1073
|
}
|
|
1031
1074
|
}
|
|
@@ -1049,7 +1092,7 @@ function createExtractor() {
|
|
|
1049
1092
|
return acc;
|
|
1050
1093
|
}
|
|
1051
1094
|
if (variants[name] && variantValues.has(name)) {
|
|
1052
|
-
let out = Object.fromEntries(staticConfig.propMapper(name, variantValues.get(name), defaultTheme, completeProps, {
|
|
1095
|
+
let out = Object.fromEntries(staticConfig.propMapper(name, variantValues.get(name), defaultTheme, completeProps, __spreadProps(__spreadValues({}, state), { resolveVariablesAs: "auto" }), void 0, shouldPrintDebug) || []);
|
|
1053
1096
|
if (out && isTargetingHTML) {
|
|
1054
1097
|
const cn = out.className;
|
|
1055
1098
|
out = rnw.createDOMProps(isTextView ? "span" : "div", out);
|
|
@@ -1113,7 +1156,7 @@ function createExtractor() {
|
|
|
1113
1156
|
if (cur.type === "style") {
|
|
1114
1157
|
const key = Object.keys(cur.value)[0];
|
|
1115
1158
|
const value = cur.value[key];
|
|
1116
|
-
const shouldKeepOriginalAttr = !shouldFlatten && !validStyles[key] && !
|
|
1159
|
+
const shouldKeepOriginalAttr = !shouldFlatten && !validStyles[key] && !pseudoDescriptors[key] && !key.startsWith("data-");
|
|
1117
1160
|
if (shouldKeepOriginalAttr) {
|
|
1118
1161
|
if (shouldPrintDebug) {
|
|
1119
1162
|
console.log(" - keeping as non-style", key);
|
|
@@ -1163,14 +1206,10 @@ function createExtractor() {
|
|
|
1163
1206
|
}
|
|
1164
1207
|
}
|
|
1165
1208
|
try {
|
|
1166
|
-
const out = getSplitStyles(props2, staticConfig, defaultTheme, {
|
|
1167
|
-
...state,
|
|
1209
|
+
const out = getSplitStyles(props2, staticConfig, defaultTheme, __spreadProps(__spreadValues({}, state), {
|
|
1168
1210
|
fallbackProps: completeProps
|
|
1169
|
-
}, void 0, props2["debug"]);
|
|
1170
|
-
const outStyle = {
|
|
1171
|
-
...out.style,
|
|
1172
|
-
...out.pseudos
|
|
1173
|
-
};
|
|
1211
|
+
}), void 0, props2["debug"]);
|
|
1212
|
+
const outStyle = __spreadValues(__spreadValues({}, out.style), out.pseudos);
|
|
1174
1213
|
return outStyle;
|
|
1175
1214
|
} catch (err) {
|
|
1176
1215
|
console.log("error", err.message, err.stack);
|
|
@@ -1248,7 +1287,7 @@ function createExtractor() {
|
|
|
1248
1287
|
if (INLINE_EXTRACTABLE[name]) {
|
|
1249
1288
|
attr.value.name.name = INLINE_EXTRACTABLE[name];
|
|
1250
1289
|
}
|
|
1251
|
-
if ((
|
|
1290
|
+
if ((_e = staticConfig.variants) == null ? void 0 : _e[name]) {
|
|
1252
1291
|
const expanded = getStyles({});
|
|
1253
1292
|
}
|
|
1254
1293
|
}
|