react-native-unistyles 3.0.0-nightly-20250319 → 3.0.0-nightly-20250324
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/README.md +11 -8
- package/cxx/core/HostUnistyle.cpp +1 -2
- package/lib/commonjs/core/withUnistyles/withUnistyles.js +1 -1
- package/lib/commonjs/core/withUnistyles/withUnistyles.js.map +1 -1
- package/lib/module/core/withUnistyles/withUnistyles.js +1 -1
- package/lib/module/core/withUnistyles/withUnistyles.js.map +1 -1
- package/lib/typescript/src/core/withUnistyles/withUnistyles.d.ts.map +1 -1
- package/package.json +3 -3
- package/plugin/index.js +11 -9
- package/src/core/withUnistyles/withUnistyles.tsx +8 -3
package/README.md
CHANGED
@@ -21,15 +21,15 @@ yarn add react-native-unistyles@beta
|
|
21
21
|
Install dependencies:
|
22
22
|
|
23
23
|
```shell
|
24
|
-
yarn add react-native-edge-to-edge react-native-nitro-modules@0.
|
24
|
+
yarn add react-native-edge-to-edge react-native-nitro-modules@0.25.2
|
25
25
|
```
|
26
26
|
|
27
27
|
> To avoid unexpected behavior, always use a fixed version of `react-native-nitro-modules`
|
28
28
|
|
29
29
|
| react-native-unistyles | react-native-nitro-modules |
|
30
30
|
|------------------------|----------------------------|
|
31
|
-
| 3.0.0.beta.
|
32
|
-
| 3.0.0
|
31
|
+
| 3.0.0.beta.8 | 0.24.1, 0.25.2 |
|
32
|
+
| 3.0.0-nightly-20250319 | 0.24.1, 0.25.2 |
|
33
33
|
|
34
34
|
Then follow [installation guides](https://unistyl.es/v3/start/getting-started) for your platform.
|
35
35
|
|
@@ -81,11 +81,8 @@ Then follow [installation guides](https://unistyl.es/v3/start/getting-started) f
|
|
81
81
|
<a href="https://github.com/guillaumehcht">
|
82
82
|
<img src="https://avatars.githubusercontent.com/u/80776475?v=4" height="70px" width="70px" alt="guillaumehcht" />
|
83
83
|
</a>
|
84
|
-
<a href="https://github.com/
|
85
|
-
<img src="https://avatars.githubusercontent.com/u/
|
86
|
-
</a>
|
87
|
-
<a href="https://github.com/dacoto97">
|
88
|
-
<img src="https://avatars.githubusercontent.com/u/16915053?v=4" height="70px" width="70px" alt="dacoto97" />
|
84
|
+
<a href="https://github.com/ryanlanciaux">
|
85
|
+
<img src="https://avatars.githubusercontent.com/u/85041?v=4" height="70px" width="70px" alt="ryanlanciaux" />
|
89
86
|
</a>
|
90
87
|
<a href="https://github.com/chinamcafee">
|
91
88
|
<img src="https://avatars.githubusercontent.com/u/3439961?v=4" height="70px" width="70px" alt="chinamcafee" />
|
@@ -120,6 +117,12 @@ Then follow [installation guides](https://unistyl.es/v3/start/getting-started) f
|
|
120
117
|
<a href="https://github.com/4cc3ssX">
|
121
118
|
<img src="https://avatars.githubusercontent.com/u/57473799?v=4" height="70px" width="70px" alt="4cc3ssX" />
|
122
119
|
</a>
|
120
|
+
<a href="https://github.com/FilipiRafael">
|
121
|
+
<img src="https://avatars.githubusercontent.com/u/61629642?v=4" height="70px" width="70px" alt="FilipiRafael" />
|
122
|
+
</a>
|
123
|
+
<a href="https://github.com/dacoto97">
|
124
|
+
<img src="https://avatars.githubusercontent.com/u/16915053?v=4" height="70px" width="70px" alt="dacoto97" />
|
125
|
+
</a>
|
123
126
|
|
124
127
|
## Sponsor my work
|
125
128
|
|
@@ -94,6 +94,7 @@ jsi::Function HostUnistyle::createAddVariantsProxyFunction(jsi::Runtime& rt) {
|
|
94
94
|
);
|
95
95
|
|
96
96
|
parser.buildUnistyles(rt, stylesheetCopy);
|
97
|
+
parser.parseUnistyles(rt, stylesheetCopy);
|
97
98
|
|
98
99
|
helpers::enumerateJSIObject(rt, thisVal.asObject(rt), [this, &parser, &rt, &variants, stylesheetCopy](const std::string& name, jsi::Value& value){
|
99
100
|
if (name == helpers::ADD_VARIANTS_FN || !stylesheetCopy->unistyles.contains(name)) {
|
@@ -102,8 +103,6 @@ jsi::Function HostUnistyle::createAddVariantsProxyFunction(jsi::Runtime& rt) {
|
|
102
103
|
|
103
104
|
auto unistyle = stylesheetCopy->unistyles[name];
|
104
105
|
|
105
|
-
unistyle->isDirty = true;
|
106
|
-
|
107
106
|
if (unistyle->dependsOn(UnistyleDependency::VARIANTS)) {
|
108
107
|
parser.rebuildUnistyle(rt, unistyle, variants, std::nullopt);
|
109
108
|
}
|
@@ -27,7 +27,7 @@ const withUnistyles = (Component, mappings) => {
|
|
27
27
|
} = (0, _useProxifiedUnistyles.useProxifiedUnistyles)();
|
28
28
|
const mappingsProps = mappings ? mappings(proxifiedTheme, proxifiedRuntime) : {};
|
29
29
|
const unistyleProps = narrowedProps.uniProps ? narrowedProps.uniProps(proxifiedTheme, proxifiedRuntime) : {};
|
30
|
-
const emptyStyles = Object.fromEntries(Object.entries(Object.getOwnPropertyDescriptors(narrowedProps.style)).filter(([key]) => !key.startsWith(
|
30
|
+
const emptyStyles = narrowedProps.style ? Object.fromEntries(Object.entries(Object.getOwnPropertyDescriptors(narrowedProps.style)).filter(([key]) => !key.startsWith("unistyles") && !key.startsWith("_")).map(([key]) => [key, undefined])) : undefined;
|
31
31
|
const combinedProps = {
|
32
32
|
...(0, _utils.deepMergeObjects)(mappingsProps, unistyleProps, props),
|
33
33
|
...(narrowedProps.style ? {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"names":["_react","_interopRequireWildcard","require","_utils","_getClassname","_useProxifiedUnistyles","_warn","_jsxRuntime","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","withUnistyles","Component","mappings","forwardRef","props","ref","narrowedProps","styleClassNames","getClassName","style","contentContainerStyleClassNames","contentContainerStyle","proxifiedRuntime","proxifiedTheme","useProxifiedUnistyles","mappingsProps","unistyleProps","uniProps","emptyStyles","fromEntries","entries","getOwnPropertyDescriptors","filter","key","startsWith","map","undefined","combinedProps","deepMergeObjects","maybeWarnAboutMultipleUnistyles","displayName","name","NativeComponent","jsx","className","hash","display","children","exports"],"sourceRoot":"../../../../src","sources":["core/withUnistyles/withUnistyles.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,uBAAA,CAAAC,OAAA;AAEA,IAAAC,MAAA,GAAAD,OAAA;AACA,IAAAE,aAAA,GAAAF,OAAA;AACA,IAAAG,sBAAA,GAAAH,OAAA;AACA,IAAAI,KAAA,GAAAJ,OAAA;AAAyD,IAAAK,WAAA,GAAAL,OAAA;AAAA,SAAAM,yBAAAC,CAAA,6BAAAC,OAAA,mBAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,CAAA,WAAAA,CAAA,GAAAG,CAAA,GAAAD,CAAA,KAAAF,CAAA;AAAA,SAAAR,wBAAAQ,CAAA,EAAAE,CAAA,SAAAA,CAAA,IAAAF,CAAA,IAAAA,CAAA,CAAAI,UAAA,SAAAJ,CAAA,eAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,WAAAK,OAAA,EAAAL,CAAA,QAAAG,CAAA,GAAAJ,wBAAA,CAAAG,CAAA,OAAAC,CAAA,IAAAA,CAAA,CAAAG,GAAA,CAAAN,CAAA,UAAAG,CAAA,CAAAI,GAAA,CAAAP,CAAA,OAAAQ,CAAA,KAAAC,SAAA,UAAAC,CAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,CAAA,IAAAd,CAAA,oBAAAc,CAAA,OAAAC,cAAA,CAAAC,IAAA,CAAAhB,CAAA,EAAAc,CAAA,SAAAG,CAAA,GAAAP,CAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAb,CAAA,EAAAc,CAAA,UAAAG,CAAA,KAAAA,CAAA,CAAAV,GAAA,IAAAU,CAAA,CAAAC,GAAA,IAAAP,MAAA,CAAAC,cAAA,CAAAJ,CAAA,EAAAM,CAAA,EAAAG,CAAA,IAAAT,CAAA,CAAAM,CAAA,IAAAd,CAAA,CAAAc,CAAA,YAAAN,CAAA,CAAAH,OAAA,GAAAL,CAAA,EAAAG,CAAA,IAAAA,CAAA,CAAAe,GAAA,CAAAlB,CAAA,EAAAQ,CAAA,GAAAA,CAAA;AAGzD;;AAEA;;AAGO,MAAMW,aAAa,GAAGA,CAAkEC,SAAqB,EAAEC,QAA8B,KAAK;EAUrJ,oBAAO,IAAAC,iBAAU,EAAsD,CAACC,KAAK,EAAEC,GAAG,KAAK;IACnF,MAAMC,aAAa,GAAGF,KAA4C;IAClE,MAAMG,eAAe,GAAG,IAAAC,0BAAY,EAACF,aAAa,CAACG,KAAK,EAAE,IAAI,CAAC;IAC/D,MAAMC,+BAA+B,GAAG,IAAAF,0BAAY,EAACF,aAAa,CAACK,qBAAqB,CAAC;IACzF,MAAM;MAAEC,gBAAgB;MAAEC;IAAe,CAAC,GAAG,IAAAC,4CAAqB,EAAC,CAAC;IAEpE,MAAMC,aAAa,GAAGb,QAAQ,GAAGA,QAAQ,CAACW,cAAc,EAAED,gBAAgB,CAAC,GAAG,CAAC,CAAC;IAChF,MAAMI,aAAa,GAAGV,aAAa,CAACW,QAAQ,GAAGX,aAAa,CAACW,QAAQ,CAACJ,cAAc,EAAED,gBAAgB,CAAC,GAAG,CAAC,CAAC;
|
1
|
+
{"version":3,"names":["_react","_interopRequireWildcard","require","_utils","_getClassname","_useProxifiedUnistyles","_warn","_jsxRuntime","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","withUnistyles","Component","mappings","forwardRef","props","ref","narrowedProps","styleClassNames","getClassName","style","contentContainerStyleClassNames","contentContainerStyle","proxifiedRuntime","proxifiedTheme","useProxifiedUnistyles","mappingsProps","unistyleProps","uniProps","emptyStyles","fromEntries","entries","getOwnPropertyDescriptors","filter","key","startsWith","map","undefined","combinedProps","deepMergeObjects","maybeWarnAboutMultipleUnistyles","displayName","name","NativeComponent","jsx","className","hash","display","children","exports"],"sourceRoot":"../../../../src","sources":["core/withUnistyles/withUnistyles.tsx"],"mappings":"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","ignoreList":[]}
|
@@ -21,7 +21,7 @@ export const withUnistyles = (Component, mappings) => {
|
|
21
21
|
} = useProxifiedUnistyles();
|
22
22
|
const mappingsProps = mappings ? mappings(proxifiedTheme, proxifiedRuntime) : {};
|
23
23
|
const unistyleProps = narrowedProps.uniProps ? narrowedProps.uniProps(proxifiedTheme, proxifiedRuntime) : {};
|
24
|
-
const emptyStyles = Object.fromEntries(Object.entries(Object.getOwnPropertyDescriptors(narrowedProps.style)).filter(([key]) => !key.startsWith(
|
24
|
+
const emptyStyles = narrowedProps.style ? Object.fromEntries(Object.entries(Object.getOwnPropertyDescriptors(narrowedProps.style)).filter(([key]) => !key.startsWith("unistyles") && !key.startsWith("_")).map(([key]) => [key, undefined])) : undefined;
|
25
25
|
const combinedProps = {
|
26
26
|
...deepMergeObjects(mappingsProps, unistyleProps, props),
|
27
27
|
...(narrowedProps.style ? {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"names":["React","forwardRef","deepMergeObjects","getClassName","useProxifiedUnistyles","maybeWarnAboutMultipleUnistyles","jsx","_jsx","withUnistyles","Component","mappings","props","ref","narrowedProps","styleClassNames","style","contentContainerStyleClassNames","contentContainerStyle","proxifiedRuntime","proxifiedTheme","mappingsProps","unistyleProps","uniProps","emptyStyles","Object","fromEntries","entries","getOwnPropertyDescriptors","filter","key","startsWith","map","undefined","combinedProps","displayName","name","NativeComponent","className","hash","display","children"],"sourceRoot":"../../../../src","sources":["core/withUnistyles/withUnistyles.tsx"],"mappings":";;AAAA,OAAOA,KAAK,IAAwBC,UAAU,QAAgD,OAAO;AAErG,SAASC,gBAAgB,QAAQ,aAAa;AAC9C,SAASC,YAAY,QAAQ,iBAAiB;AAC9C,SAASC,qBAAqB,QAAQ,0BAA0B;AAChE,SAASC,+BAA+B,QAAQ,SAAS;;AAGzD;;AAEA;AAAA,SAAAC,GAAA,IAAAC,IAAA;AAGA,OAAO,MAAMC,aAAa,GAAGA,CAAkEC,SAAqB,EAAEC,QAA8B,KAAK;EAUrJ,oBAAOT,UAAU,CAAsD,CAACU,KAAK,EAAEC,GAAG,KAAK;IACnF,MAAMC,aAAa,GAAGF,KAA4C;IAClE,MAAMG,eAAe,GAAGX,YAAY,CAACU,aAAa,CAACE,KAAK,EAAE,IAAI,CAAC;IAC/D,MAAMC,+BAA+B,GAAGb,YAAY,CAACU,aAAa,CAACI,qBAAqB,CAAC;IACzF,MAAM;MAAEC,gBAAgB;MAAEC;IAAe,CAAC,GAAGf,qBAAqB,CAAC,CAAC;IAEpE,MAAMgB,aAAa,GAAGV,QAAQ,GAAGA,QAAQ,CAACS,cAAc,EAAED,gBAAgB,CAAC,GAAG,CAAC,CAAC;IAChF,MAAMG,aAAa,GAAGR,aAAa,CAACS,QAAQ,GAAGT,aAAa,CAACS,QAAQ,CAACH,cAAc,EAAED,gBAAgB,CAAC,GAAG,CAAC,CAAC;
|
1
|
+
{"version":3,"names":["React","forwardRef","deepMergeObjects","getClassName","useProxifiedUnistyles","maybeWarnAboutMultipleUnistyles","jsx","_jsx","withUnistyles","Component","mappings","props","ref","narrowedProps","styleClassNames","style","contentContainerStyleClassNames","contentContainerStyle","proxifiedRuntime","proxifiedTheme","mappingsProps","unistyleProps","uniProps","emptyStyles","Object","fromEntries","entries","getOwnPropertyDescriptors","filter","key","startsWith","map","undefined","combinedProps","displayName","name","NativeComponent","className","hash","display","children"],"sourceRoot":"../../../../src","sources":["core/withUnistyles/withUnistyles.tsx"],"mappings":";;AAAA,OAAOA,KAAK,IAAwBC,UAAU,QAAgD,OAAO;AAErG,SAASC,gBAAgB,QAAQ,aAAa;AAC9C,SAASC,YAAY,QAAQ,iBAAiB;AAC9C,SAASC,qBAAqB,QAAQ,0BAA0B;AAChE,SAASC,+BAA+B,QAAQ,SAAS;;AAGzD;;AAEA;AAAA,SAAAC,GAAA,IAAAC,IAAA;AAGA,OAAO,MAAMC,aAAa,GAAGA,CAAkEC,SAAqB,EAAEC,QAA8B,KAAK;EAUrJ,oBAAOT,UAAU,CAAsD,CAACU,KAAK,EAAEC,GAAG,KAAK;IACnF,MAAMC,aAAa,GAAGF,KAA4C;IAClE,MAAMG,eAAe,GAAGX,YAAY,CAACU,aAAa,CAACE,KAAK,EAAE,IAAI,CAAC;IAC/D,MAAMC,+BAA+B,GAAGb,YAAY,CAACU,aAAa,CAACI,qBAAqB,CAAC;IACzF,MAAM;MAAEC,gBAAgB;MAAEC;IAAe,CAAC,GAAGf,qBAAqB,CAAC,CAAC;IAEpE,MAAMgB,aAAa,GAAGV,QAAQ,GAAGA,QAAQ,CAACS,cAAc,EAAED,gBAAgB,CAAC,GAAG,CAAC,CAAC;IAChF,MAAMG,aAAa,GAAGR,aAAa,CAACS,QAAQ,GAAGT,aAAa,CAACS,QAAQ,CAACH,cAAc,EAAED,gBAAgB,CAAC,GAAG,CAAC,CAAC;IAG5G,MAAMK,WAAW,GAAGV,aAAa,CAACE,KAAK,GACjCS,MAAM,CAACC,WAAW,CACdD,MAAM,CAACE,OAAO,CAACF,MAAM,CAACG,yBAAyB,CAACd,aAAa,CAACE,KAAK,CAAC,CAAC,CAChEa,MAAM,CAAC,CAAC,CAACC,GAAG,CAAC,KAAK,CAACA,GAAG,CAACC,UAAU,CAAC,WAAW,CAAC,IAAI,CAACD,GAAG,CAACC,UAAU,CAAC,GAAG,CAAC,CAAC,CACvEC,GAAG,CAAC,CAAC,CAACF,GAAG,CAAC,KAAK,CAACA,GAAG,EAAEG,SAAS,CAAC,CACxC,CAAC,GACDA,SAAS;IAEf,MAAMC,aAAa,GAAG;MAClB,GAAG/B,gBAAgB,CAACkB,aAAa,EAAEC,aAAa,EAAEV,KAAK,CAAC;MACxD,IAAGE,aAAa,CAACE,KAAK,GAAG;QACrB;QACAA,KAAK,EAAEQ;MACX,CAAC,GAAG,CAAC,CAAC;MACN,IAAGV,aAAa,CAACI,qBAAqB,GAAG;QACrCA,qBAAqB,EAAED;MAC3B,CAAC,GAAG,CAAC,CAAC;IACV,CAAQ;;IAER;IACAX,+BAA+B,CAACQ,aAAa,CAACE,KAAK,EAAE,iBAAiBN,SAAS,CAACyB,WAAW,IAAIzB,SAAS,CAAC0B,IAAI,IAAI,SAAS,GAAG,CAAC;IAC9H;IACA9B,+BAA+B,CAACQ,aAAa,CAACI,qBAAqB,EAAE,iBAAiBR,SAAS,CAACyB,WAAW,IAAIzB,SAAS,CAAC0B,IAAI,IAAI,SAAS,GAAG,CAAC;IAE9I,MAAMC,eAAe,GAAG3B,SAA0B;IAElD,oBACIF,IAAA;MACI8B,SAAS,EAAEvB,eAAe,EAAEwB,IAAK;MACjCvB,KAAK,EAAE;QAAEwB,OAAO,EAAE;MAAW,CAAE;MAAAC,QAAA,eAE/BjC,IAAA,CAAC6B,eAAe;QAAA,GAAKH,aAAa;QAAErB,GAAG,EAAEA;MAAI,CAAE;IAAC,CAC/C,CAAC;EAEd,CAAC,CAAC;AACN,CAAC","ignoreList":[]}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"withUnistyles.d.ts","sourceRoot":"","sources":["../../../../../src/core/withUnistyles/withUnistyles.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAkC,KAAK,cAAc,EAAqB,MAAM,OAAO,CAAA;AAMrG,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAGvC,KAAK,qBAAqB,CAAC,CAAC,IAAI,cAAc,CAAC,CAAC,CAAC,CAAA;AAIjD,eAAO,MAAM,aAAa,GAAI,UAAU,EAAE,SAAS,SAAS,qBAAqB,CAAC,UAAU,CAAC,aAAa,UAAU,aAAa,QAAQ,CAAC,SAAS,CAAC;eAGjI,QAAQ,kCAAQ;
|
1
|
+
{"version":3,"file":"withUnistyles.d.ts","sourceRoot":"","sources":["../../../../../src/core/withUnistyles/withUnistyles.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAkC,KAAK,cAAc,EAAqB,MAAM,OAAO,CAAA;AAMrG,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAGvC,KAAK,qBAAqB,CAAC,CAAC,IAAI,cAAc,CAAC,CAAC,CAAC,CAAA;AAIjD,eAAO,MAAM,aAAa,GAAI,UAAU,EAAE,SAAS,SAAS,qBAAqB,CAAC,UAAU,CAAC,aAAa,UAAU,aAAa,QAAQ,CAAC,SAAS,CAAC;eAGjI,QAAQ,kCAAQ;yDAoDlC,CAAA"}
|
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "react-native-unistyles",
|
3
|
-
"version": "3.0.0-nightly-
|
3
|
+
"version": "3.0.0-nightly-20250324",
|
4
4
|
"description": "Level up your React Native StyleSheet",
|
5
5
|
"scripts": {
|
6
6
|
"test": "jest",
|
@@ -105,11 +105,11 @@
|
|
105
105
|
"husky": "9.1.7",
|
106
106
|
"jest": "29.7.0",
|
107
107
|
"metro-react-native-babel-preset": "0.77.0",
|
108
|
-
"nitro-codegen": "0.
|
108
|
+
"nitro-codegen": "0.25.2",
|
109
109
|
"react": "18.3.1",
|
110
110
|
"react-native": "0.77.1",
|
111
111
|
"react-native-builder-bob": "0.37.0",
|
112
|
-
"react-native-nitro-modules": "0.
|
112
|
+
"react-native-nitro-modules": "0.25.2",
|
113
113
|
"react-native-web": "0.19.13",
|
114
114
|
"react-test-renderer": "18.3.1",
|
115
115
|
"release-it": "17.11.0",
|
package/plugin/index.js
CHANGED
@@ -672,8 +672,8 @@ function index_default() {
|
|
672
672
|
name: "babel-react-native-unistyles",
|
673
673
|
visitor: {
|
674
674
|
Program: {
|
675
|
-
enter(
|
676
|
-
state.file.replaceWithUnistyles = REPLACE_WITH_UNISTYLES_PATHS.concat(state.opts.autoProcessPaths ?? []).some((
|
675
|
+
enter(path, state) {
|
676
|
+
state.file.replaceWithUnistyles = REPLACE_WITH_UNISTYLES_PATHS.concat(state.opts.autoProcessPaths ?? []).some((path2) => state.filename?.includes(path2));
|
677
677
|
state.file.hasAnyUnistyle = false;
|
678
678
|
state.file.hasUnistylesImport = false;
|
679
679
|
state.file.hasVariants = false;
|
@@ -681,6 +681,14 @@ function index_default() {
|
|
681
681
|
state.file.tagNumber = 0;
|
682
682
|
state.reactNativeImports = {};
|
683
683
|
state.file.forceProcessing = state.opts.autoProcessRoot && state.filename ? state.filename.includes(`${state.file.opts.root}/${state.opts.autoProcessRoot}/`) : false;
|
684
|
+
path.traverse({
|
685
|
+
BlockStatement(blockPath) {
|
686
|
+
if (isInsideNodeModules(state)) {
|
687
|
+
return;
|
688
|
+
}
|
689
|
+
extractVariants(blockPath, state);
|
690
|
+
}
|
691
|
+
});
|
684
692
|
},
|
685
693
|
exit(path, state) {
|
686
694
|
if (isInsideNodeModules(state) && !state.file.replaceWithUnistyles) {
|
@@ -761,12 +769,6 @@ function index_default() {
|
|
761
769
|
throw new Error("Detected string based ref which is not supported by Unistyles.");
|
762
770
|
}
|
763
771
|
},
|
764
|
-
BlockStatement(path, state) {
|
765
|
-
if (isInsideNodeModules(state)) {
|
766
|
-
return;
|
767
|
-
}
|
768
|
-
extractVariants(path, state);
|
769
|
-
},
|
770
772
|
CallExpression(path, state) {
|
771
773
|
if (isInsideNodeModules(state)) {
|
772
774
|
return;
|
@@ -776,7 +778,7 @@ function index_default() {
|
|
776
778
|
}
|
777
779
|
state.file.hasAnyUnistyle = true;
|
778
780
|
addStyleSheetTag(path, state);
|
779
|
-
const arg = path.node.arguments[0];
|
781
|
+
const arg = t6.isAssignmentExpression(path.node.arguments[0]) ? path.node.arguments[0].right : path.node.arguments[0];
|
780
782
|
if (t6.isObjectExpression(arg)) {
|
781
783
|
const detectedDependencies = getStylesDependenciesFromObject(path);
|
782
784
|
if (detectedDependencies) {
|
@@ -30,9 +30,14 @@ export const withUnistyles = <TComponent, TMappings extends GenericComponentProp
|
|
30
30
|
const mappingsProps = mappings ? mappings(proxifiedTheme, proxifiedRuntime) : {}
|
31
31
|
const unistyleProps = narrowedProps.uniProps ? narrowedProps.uniProps(proxifiedTheme, proxifiedRuntime) : {}
|
32
32
|
|
33
|
-
|
34
|
-
|
35
|
-
.
|
33
|
+
|
34
|
+
const emptyStyles = narrowedProps.style
|
35
|
+
? Object.fromEntries(
|
36
|
+
Object.entries(Object.getOwnPropertyDescriptors(narrowedProps.style))
|
37
|
+
.filter(([key]) => !key.startsWith("unistyles") && !key.startsWith("_"))
|
38
|
+
.map(([key]) => [key, undefined])
|
39
|
+
)
|
40
|
+
: undefined
|
36
41
|
|
37
42
|
const combinedProps = {
|
38
43
|
...deepMergeObjects(mappingsProps, unistyleProps, props),
|