react-native-unistyles 3.0.0-nightly-20250208 → 3.0.0-nightly-20250213
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 +3 -0
- package/android/CMakeLists.txt +1 -1
- package/android/src/main/java/com/unistyles/NativePlatform+android.kt +4 -0
- package/android/src/main/java/com/unistyles/NativePlatform+insets.kt +20 -1
- package/android/src/main/java/com/unistyles/NativePlatform+listener.kt +4 -0
- package/android/src/main/java/com/unistyles/UnistylesModule.kt +5 -0
- package/cxx/core/HashGenerator.cpp +1 -1
- package/cxx/core/HostUnistyle.cpp +15 -5
- package/cxx/core/HostUnistyle.h +1 -0
- package/cxx/core/UnistyleWrapper.h +6 -6
- package/cxx/core/UnistylesCommitHook.cpp +20 -17
- package/cxx/core/UnistylesRegistry.cpp +8 -6
- package/cxx/shadowTree/ShadowTrafficController.h +10 -4
- package/cxx/shadowTree/ShadowTreeManager.cpp +38 -35
- package/lib/commonjs/components/native/Pressable.native.js +8 -1
- package/lib/commonjs/components/native/Pressable.native.js.map +1 -1
- package/lib/commonjs/core/useProxifiedUnistyles/useProxifiedUnistyles.js +2 -2
- package/lib/commonjs/core/useProxifiedUnistyles/useProxifiedUnistyles.js.map +1 -1
- package/lib/commonjs/core/warn.js +1 -1
- package/lib/commonjs/core/withUnistyles/withUnistyles.js +1 -1
- package/lib/commonjs/core/withUnistyles/withUnistyles.js.map +1 -1
- package/lib/commonjs/core/withUnistyles/withUnistyles.native.js +4 -2
- package/lib/commonjs/core/withUnistyles/withUnistyles.native.js.map +1 -1
- package/lib/commonjs/web/convert/index.js +1 -1
- package/lib/commonjs/web/convert/index.js.map +1 -1
- package/lib/commonjs/web/utils/common.js +1 -1
- package/lib/commonjs/web/utils/unistyle.js +3 -3
- package/lib/module/components/native/Pressable.native.js +8 -1
- package/lib/module/components/native/Pressable.native.js.map +1 -1
- package/lib/module/core/useProxifiedUnistyles/useProxifiedUnistyles.js +2 -2
- package/lib/module/core/useProxifiedUnistyles/useProxifiedUnistyles.js.map +1 -1
- package/lib/module/core/warn.js +1 -1
- package/lib/module/core/withUnistyles/withUnistyles.js +1 -1
- package/lib/module/core/withUnistyles/withUnistyles.js.map +1 -1
- package/lib/module/core/withUnistyles/withUnistyles.native.js +5 -3
- package/lib/module/core/withUnistyles/withUnistyles.native.js.map +1 -1
- package/lib/module/web/convert/index.js +1 -1
- package/lib/module/web/convert/index.js.map +1 -1
- package/lib/module/web/utils/common.js +1 -1
- package/lib/module/web/utils/unistyle.js +3 -3
- package/lib/typescript/src/components/native/Pressable.native.d.ts.map +1 -1
- package/lib/typescript/src/core/useProxifiedUnistyles/useProxifiedUnistyles.d.ts +2 -1
- package/lib/typescript/src/core/useProxifiedUnistyles/useProxifiedUnistyles.d.ts.map +1 -1
- package/lib/typescript/src/core/withUnistyles/withUnistyles.native.d.ts.map +1 -1
- package/nitrogen/generated/android/c++/JHybridNativePlatformSpec.hpp +1 -1
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/unistyles/HybridNativePlatformSpec.kt +23 -39
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/unistyles/unistylesOnLoad.kt +35 -0
- package/nitrogen/generated/ios/Unistyles+autolinking.rb +2 -0
- package/nitrogen/generated/ios/Unistyles-Swift-Cxx-Bridge.cpp +1 -1
- package/nitrogen/generated/ios/c++/HybridNativePlatformSpecSwift.hpp +3 -1
- package/nitrogen/generated/ios/swift/HybridNativePlatformSpec.swift +2 -3
- package/nitrogen/generated/ios/swift/HybridNativePlatformSpec_cxx.swift +18 -18
- package/nitrogen/generated/shared/c++/ColorScheme.hpp +1 -1
- package/nitrogen/generated/shared/c++/Dimensions.hpp +1 -1
- package/nitrogen/generated/shared/c++/HybridNativePlatformSpec.hpp +1 -1
- package/nitrogen/generated/shared/c++/HybridUnistylesNavigationBarSpec.hpp +1 -1
- package/nitrogen/generated/shared/c++/HybridUnistylesRuntimeSpec.hpp +1 -1
- package/nitrogen/generated/shared/c++/HybridUnistylesShadowRegistrySpec.hpp +1 -1
- package/nitrogen/generated/shared/c++/HybridUnistylesStatusBarSpec.hpp +1 -1
- package/nitrogen/generated/shared/c++/HybridUnistylesStyleSheetSpec.hpp +1 -1
- package/nitrogen/generated/shared/c++/Insets.hpp +1 -1
- package/nitrogen/generated/shared/c++/Orientation.hpp +1 -1
- package/nitrogen/generated/shared/c++/UnistyleDependency.hpp +1 -1
- package/nitrogen/generated/shared/c++/UnistylesCxxMiniRuntime.hpp +1 -1
- package/nitrogen/generated/shared/c++/UnistylesNativeMiniRuntime.hpp +1 -1
- package/package.json +3 -3
- package/plugin/import.js +1 -1
- package/plugin/index.js +2 -2
- package/plugin/stylesheet.js +2 -2
- package/src/components/native/Pressable.native.tsx +9 -1
- package/src/core/useProxifiedUnistyles/useProxifiedUnistyles.ts +2 -2
- package/src/core/warn.ts +1 -1
- package/src/core/withUnistyles/withUnistyles.native.tsx +6 -4
- package/src/core/withUnistyles/withUnistyles.tsx +1 -1
- package/src/web/convert/index.ts +1 -1
- package/src/web/utils/common.ts +1 -1
- package/src/web/utils/unistyle.ts +3 -3
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"names":["_utils","require","_object","_pseudo","_shadow","_style","_utils2","convertUnistyles","value","hasTextShadow","hasShadow","stylesArray","Object","entries","_web","flatMap","unistylesKey","unistylesValue","includes","startsWith","isPseudo","flattenValues","isTextShadow","getTextShadowStyle","isShadow","getBoxShadowStyle","isFilter","getFilterStyle","isBoxShadow","getBoxShadow","isTransform","getTransformStyle","map","breakpointKey","breakpointValue","getStyle","deepMergeObjects","exports"],"sourceRoot":"../../../../src","sources":["web/convert/index.ts"],"mappings":";;;;;;AACA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,OAAA,GAAAD,OAAA;AACA,IAAAE,OAAA,GAAAF,OAAA;AACA,IAAAG,OAAA,GAAAH,OAAA;AACA,IAAAI,MAAA,GAAAJ,OAAA;AACA,IAAAK,OAAA,GAAAL,OAAA;AAEO,MAAMM,gBAAgB,GAAIC,KAAsB,IAAK;EACxD;EACA,IAAIC,aAAa,GAAG,KAAK;EACzB;EACA,IAAIC,SAAS,GAAG,KAAK;EAErB,MAAMC,WAAW,GAAGC,MAAM,CAACC,OAAO,CAAC;IAC/B,GAAGL,KAAK;IACR,GAAGA,KAAK,CAACM;EACb,CAAC,CAAC,CAACC,OAAO,CAAC,CAAC,CAACC,YAAY,EAAEC,cAAc,CAAC,KAAK;IAC3C;IACA,IAAI,CAAC,aAAa,EAAE,MAAM,EAAE,UAAU,EAAE,kBAAkB,EAAE,mBAAmB,
|
1
|
+
{"version":3,"names":["_utils","require","_object","_pseudo","_shadow","_style","_utils2","convertUnistyles","value","hasTextShadow","hasShadow","stylesArray","Object","entries","_web","flatMap","unistylesKey","unistylesValue","includes","startsWith","isPseudo","flattenValues","isTextShadow","getTextShadowStyle","isShadow","getBoxShadowStyle","isFilter","getFilterStyle","isBoxShadow","getBoxShadow","isTransform","getTransformStyle","map","breakpointKey","breakpointValue","getStyle","deepMergeObjects","exports"],"sourceRoot":"../../../../src","sources":["web/convert/index.ts"],"mappings":";;;;;;AACA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,OAAA,GAAAD,OAAA;AACA,IAAAE,OAAA,GAAAF,OAAA;AACA,IAAAG,OAAA,GAAAH,OAAA;AACA,IAAAI,MAAA,GAAAJ,OAAA;AACA,IAAAK,OAAA,GAAAL,OAAA;AAEO,MAAMM,gBAAgB,GAAIC,KAAsB,IAAK;EACxD;EACA,IAAIC,aAAa,GAAG,KAAK;EACzB;EACA,IAAIC,SAAS,GAAG,KAAK;EAErB,MAAMC,WAAW,GAAGC,MAAM,CAACC,OAAO,CAAC;IAC/B,GAAGL,KAAK;IACR,GAAGA,KAAK,CAACM;EACb,CAAC,CAAC,CAACC,OAAO,CAAC,CAAC,CAACC,YAAY,EAAEC,cAAc,CAAC,KAAK;IAC3C;IACA,IAAI,CAAC,aAAa,EAAE,MAAM,EAAE,UAAU,EAAE,kBAAkB,EAAE,mBAAmB,CAAC,CAACC,QAAQ,CAACF,YAAY,CAAC,IAAIA,YAAY,CAACG,UAAU,CAAC,YAAY,CAAC,EAAE;MAC9I,OAAO,EAAE;IACb;;IAEA;IACA,IAAI,IAAAC,gBAAQ,EAACJ,YAAY,CAAC,EAAE;MACxB,MAAMK,aAAa,GAAGd,gBAAgB,CAACU,cAAiC,CAAC;MAEzE,OAAO;QAAE,CAACD,YAAY,GAAGK;MAAc,CAAC;IAC5C;;IAEA;IACA,IAAI,IAAAC,oBAAY,EAACN,YAAY,CAAC,EAAE;MAC5B,IAAIP,aAAa,EAAE;QACf,OAAO,EAAE;MACb;MAEAA,aAAa,GAAG,IAAI;MAEpB,OAAO,IAAAc,0BAAkB,EAACf,KAAK,CAAC;IACpC;;IAEA;IACA,IAAI,IAAAgB,gBAAQ,EAACR,YAAY,CAAC,EAAE;MACxB,IAAIN,SAAS,EAAE;QACX,OAAO,EAAE;MACb;MAEAA,SAAS,GAAG,IAAI;MAEhB,OAAO,IAAAe,yBAAiB,EAACjB,KAAK,CAAC;IACnC;IAEA,IAAI,IAAAkB,gBAAQ,EAACV,YAAY,EAAEC,cAAc,CAAC,EAAE;MACxC,OAAO,IAAAU,sBAAc,EAACV,cAAc,CAAC;IACzC;IAEA,IAAI,IAAAW,mBAAW,EAACZ,YAAY,EAAEC,cAAc,CAAC,EAAE;MAC3C,OAAO,IAAAY,oBAAY,EAACZ,cAAc,CAAC;IACvC;;IAEA;IACA,IAAI,IAAAa,mBAAW,EAACd,YAAY,EAAEC,cAAc,CAAC,EAAE;MAC3C,OAAO,IAAAc,yBAAiB,EAACd,cAAc,CAAC;IAC5C;;IAEA;IACA,IAAI,OAAOA,cAAc,KAAK,QAAQ,IAAIA,cAAc,KAAK,IAAI,EAAE;MAC/D,OAAOL,MAAM,CAACC,OAAO,CAACI,cAAc,CAAC,CAACe,GAAG,CAAC,CAAC,CAACC,aAAa,EAAEC,eAAe,CAAC,KAAK;QAC5E,OAAO;UAAE,CAACD,aAAa,GAAG,IAAAE,eAAQ,EAACnB,YAAY,EAAEkB,eAAe;QAAE,CAAC;MACvE,CAAC,CAAC;IACN;;IAEA;IACA,OAAO,IAAAC,eAAQ,EAACnB,YAAY,EAAEC,cAAc,CAAC;EACjD,CAAC,CAA+B;EAEhC,OAAO,IAAAmB,uBAAgB,EAAC,GAAGzB,WAAW,CAAC;AAC3C,CAAC;AAAA0B,OAAA,CAAA9B,gBAAA,GAAAA,gBAAA","ignoreList":[]}
|
@@ -53,7 +53,7 @@ const cyrb53 = (data, seed = 0) => {
|
|
53
53
|
};
|
54
54
|
const generateHash = value => {
|
55
55
|
const serialized = serialize(value);
|
56
|
-
return `
|
56
|
+
return `unistyles_${cyrb53(serialized).toString(36)}`;
|
57
57
|
};
|
58
58
|
exports.generateHash = generateHash;
|
59
59
|
//# sourceMappingURL=common.js.map
|
@@ -22,9 +22,9 @@ const assignSecrets = (object, secrets) => {
|
|
22
22
|
const secretsId = Math.random().toString(36).slice(8);
|
23
23
|
|
24
24
|
// @ts-expect-error assign hidden secrets
|
25
|
-
object[`
|
25
|
+
object[`unistyles_${secretsId}`] = {};
|
26
26
|
// @ts-expect-error assign hidden secrets
|
27
|
-
Object.defineProperties(object[`
|
27
|
+
Object.defineProperties(object[`unistyles_${secretsId}`], (0, _common.reduceObject)(secrets, secret => ({
|
28
28
|
value: secret,
|
29
29
|
enumerable: false,
|
30
30
|
configurable: true
|
@@ -36,7 +36,7 @@ const extractSecrets = object => {
|
|
36
36
|
if (!object) {
|
37
37
|
return undefined;
|
38
38
|
}
|
39
|
-
const [, secrets] = Object.entries(object).find(([key]) => key.startsWith('
|
39
|
+
const [, secrets] = Object.entries(object).find(([key]) => key.startsWith('unistyles_')) ?? [];
|
40
40
|
if (!secrets) {
|
41
41
|
return undefined;
|
42
42
|
}
|
@@ -6,7 +6,7 @@ import { passForwardedRef } from '../../core';
|
|
6
6
|
import { UnistylesShadowRegistry } from '../../specs';
|
7
7
|
import { jsx as _jsx } from "react/jsx-runtime";
|
8
8
|
const getStyles = (styleProps = {}) => {
|
9
|
-
const unistyleKey = Object.keys(styleProps).find(key => key.startsWith('
|
9
|
+
const unistyleKey = Object.keys(styleProps).find(key => key.startsWith('unistyles_'));
|
10
10
|
if (!unistyleKey) {
|
11
11
|
return styleProps;
|
12
12
|
}
|
@@ -33,9 +33,16 @@ export const Pressable = /*#__PURE__*/forwardRef(({
|
|
33
33
|
return /*#__PURE__*/_jsx(NativePressableReactNative, {
|
34
34
|
...props,
|
35
35
|
ref: ref => {
|
36
|
+
const isPropStyleAFunction = typeof style === 'function';
|
37
|
+
const unistyles = isPropStyleAFunction ? style.call(style, {
|
38
|
+
pressed: false
|
39
|
+
}) : getStyles(style);
|
36
40
|
if (ref) {
|
37
41
|
storedRef.current = ref;
|
38
42
|
}
|
43
|
+
|
44
|
+
// @ts-expect-error - this is hidden from TS
|
45
|
+
UnistylesShadowRegistry.add(storedRef.current, unistyles);
|
39
46
|
return passForwardedRef(props, ref, forwardedRef);
|
40
47
|
},
|
41
48
|
style: state => {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"names":["React","forwardRef","useLayoutEffect","useRef","Pressable","NativePressableReactNative","passForwardedRef","UnistylesShadowRegistry","jsx","_jsx","getStyles","styleProps","unistyleKey","Object","keys","find","key","startsWith","uni__getStyles","variants","style","props","forwardedRef","storedRef","current","remove","ref","
|
1
|
+
{"version":3,"names":["React","forwardRef","useLayoutEffect","useRef","Pressable","NativePressableReactNative","passForwardedRef","UnistylesShadowRegistry","jsx","_jsx","getStyles","styleProps","unistyleKey","Object","keys","find","key","startsWith","uni__getStyles","variants","style","props","forwardedRef","storedRef","current","remove","ref","isPropStyleAFunction","unistyles","call","pressed","add","state"],"sourceRoot":"../../../../src","sources":["components/native/Pressable.native.tsx"],"mappings":";;AAAA,OAAOA,KAAK,IAAIC,UAAU,EAAEC,eAAe,EAAEC,MAAM,QAAQ,OAAO;AAClE,SAASC,SAAS,IAAIC,0BAA0B,QAAQ,cAAc;AAEtE,SAASC,gBAAgB,QAAQ,YAAY;AAC7C,SAASC,uBAAuB,QAAQ,aAAa;AAAA,SAAAC,GAAA,IAAAC,IAAA;AAMrD,MAAMC,SAAS,GAAGA,CAACC,UAA+B,GAAG,CAAC,CAAC,KAAK;EACxD,MAAMC,WAAW,GAAGC,MAAM,CACrBC,IAAI,CAACH,UAAU,CAAC,CAChBI,IAAI,CAACC,GAAG,IAAIA,GAAG,CAACC,UAAU,CAAC,YAAY,CAAC,CAAC;EAE9C,IAAI,CAACL,WAAW,EAAE;IACd,OAAOD,UAAU;EACrB;EAEA,OAAO;IACH;IACA,GAAGA,UAAU,CAACC,WAAW,CAAC,CAACM,cAAc,CAAC,CAAC;IAC3C,CAACN,WAAW,GAAGD,UAAU,CAACC,WAAW;EACzC,CAAC;AACL,CAAC;AAED,OAAO,MAAMR,SAAS,gBAAGH,UAAU,CAAuB,CAAC;EAAEkB,QAAQ;EAAEC,KAAK;EAAE,GAAGC;AAAM,CAAC,EAAEC,YAAY,KAAK;EACvG,MAAMC,SAAS,GAAGpB,MAAM,CAAc,CAAC;EAEvCD,eAAe,CAAC,MAAM;IAClB,OAAO,MAAM;MACT,IAAIqB,SAAS,CAACC,OAAO,EAAE;QACnB;QACAjB,uBAAuB,CAACkB,MAAM,CAACF,SAAS,CAACC,OAAO,CAAC;MACrD;IACJ,CAAC;EACL,CAAC,EAAE,EAAE,CAAC;EAEN,oBACIf,IAAA,CAACJ,0BAA0B;IAAA,GACnBgB,KAAK;IACTK,GAAG,EAAEA,GAAG,IAAI;MACR,MAAMC,oBAAoB,GAAG,OAAOP,KAAK,KAAK,UAAU;MACxD,MAAMQ,SAAS,GAAGD,oBAAoB,GAChCP,KAAK,CAACS,IAAI,CAACT,KAAK,EAAE;QAAEU,OAAO,EAAE;MAAM,CAAC,CAAC,GACrCpB,SAAS,CAACU,KAAuC,CAAC;MAExD,IAAIM,GAAG,EAAE;QACLH,SAAS,CAACC,OAAO,GAAGE,GAAG;MAC3B;;MAEA;MACAnB,uBAAuB,CAACwB,GAAG,CAACR,SAAS,CAACC,OAAO,EAAEI,SAAS,CAAC;MAEzD,OAAOtB,gBAAgB,CAACe,KAAK,EAAEK,GAAG,EAAEJ,YAAY,CAAC;IACrD,CAAE;IACFF,KAAK,EAAEY,KAAK,IAAI;MACZ,MAAML,oBAAoB,GAAG,OAAOP,KAAK,KAAK,UAAU;MACxD,MAAMQ,SAAS,GAAGD,oBAAoB,GAChCP,KAAK,CAACS,IAAI,CAACT,KAAK,EAAEY,KAAK,CAAC,GACxBtB,SAAS,CAACU,KAAuC,CAAC;MAExD,IAAI,CAACG,SAAS,CAACC,OAAO,EAAE;QACpB,OAAOI,SAAS;MACpB;;MAEA;MACArB,uBAAuB,CAACkB,MAAM,CAACF,SAAS,CAACC,OAAO,CAAC;;MAEjD;MACAjB,uBAAuB,CAACwB,GAAG,CAACR,SAAS,CAACC,OAAO,EAAEI,SAAS,CAAC;MAEzD,OAAOA,SAAS;IACpB;EAAE,CACL,CAAC;AAEV,CAAC,CAAC","ignoreList":[]}
|
@@ -24,8 +24,8 @@ const RTDependencyMap = {
|
|
24
24
|
pixelRatio: UnistyleDependency.PixelRatio,
|
25
25
|
themeName: UnistyleDependency.ThemeName
|
26
26
|
};
|
27
|
-
export const useProxifiedUnistyles =
|
28
|
-
const scopedTheme = UnistylesShadowRegistry.getScopedTheme();
|
27
|
+
export const useProxifiedUnistyles = forcedTheme => {
|
28
|
+
const scopedTheme = forcedTheme ?? UnistylesShadowRegistry.getScopedTheme();
|
29
29
|
const [dependencies] = useState(() => new Set());
|
30
30
|
const [theme, setTheme] = useState(UnistylesRuntime.getTheme(scopedTheme));
|
31
31
|
const [_, runtimeChanged] = useReducer(() => ({}), {});
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"names":["useEffect","useReducer","useRef","useState","UnistylesRuntime","UnistylesShadowRegistry","UnistyleDependency","listener","getMiniRuntime","miniRuntime","RTDependencyMap","breakpoint","Breakpoints","colorScheme","ColorScheme","contentSizeCategory","ContentSizeCategory","hasAdaptiveThemes","AdaptiveThemes","insets","Insets","fontScale","FontScale","isLandscape","Orientation","isPortrait","navigationBar","NavigationBar","screen","Dimensions","statusBar","StatusBar","pixelRatio","PixelRatio","themeName","ThemeName","useProxifiedUnistyles","scopedTheme","getScopedTheme","dependencies","Set","theme","setTheme","getTheme","_","runtimeChanged","disposeRef","reinitListener","current","Array","from","updateTheme","updateRuntime","size","proxifiedTheme","Proxy","get","target","prop","add","Theme","proxifiedRuntime","addDependencies","newDependencies","dependenciesSize","forEach","dependency"],"sourceRoot":"../../../../src","sources":["core/useProxifiedUnistyles/useProxifiedUnistyles.ts"],"mappings":";;AAAA,SAASA,SAAS,EAAEC,UAAU,EAAEC,MAAM,EAAEC,QAAQ,QAAQ,OAAO;AAC/D,SAAoCC,gBAAgB,EAAEC,uBAAuB,QAAQ,aAAa;AAClG;AACA,SAASC,kBAAkB,QAAQ,4BAA4B;AAE/D,SAASC,QAAQ,QAAQ,YAAY;AAErC,MAAMC,cAAc,GAAGA,CAAA,KAA4B;EAC/C;EACA,OAAOJ,gBAAgB,CAACK,WAAW;AACvC,CAAC;AAED,MAAMC,eAAe,GAAG;EACpBC,UAAU,EAAEL,kBAAkB,CAACM,WAAW;EAC1CC,WAAW,EAAEP,kBAAkB,CAACQ,WAAW;EAC3CC,mBAAmB,EAAET,kBAAkB,CAACU,mBAAmB;EAC3DC,iBAAiB,EAAEX,kBAAkB,CAACY,cAAc;EACpDC,MAAM,EAAEb,kBAAkB,CAACc,MAAM;EACjCC,SAAS,EAAEf,kBAAkB,CAACgB,SAAS;EACvCC,WAAW,EAAEjB,kBAAkB,CAACkB,WAAW;EAC3CC,UAAU,EAAEnB,kBAAkB,CAACkB,WAAW;EAC1CE,aAAa,EAAEpB,kBAAkB,CAACqB,aAAa;EAC/CC,MAAM,EAAEtB,kBAAkB,CAACuB,UAAU;EACrCC,SAAS,EAAExB,kBAAkB,CAACyB,SAAS;EACvCC,UAAU,EAAE1B,kBAAkB,CAAC2B,UAAU;EACzCC,SAAS,EAAE5B,kBAAkB,CAAC6B;AAClC,CAA2E;AAE3E,OAAO,MAAMC,qBAAqB,
|
1
|
+
{"version":3,"names":["useEffect","useReducer","useRef","useState","UnistylesRuntime","UnistylesShadowRegistry","UnistyleDependency","listener","getMiniRuntime","miniRuntime","RTDependencyMap","breakpoint","Breakpoints","colorScheme","ColorScheme","contentSizeCategory","ContentSizeCategory","hasAdaptiveThemes","AdaptiveThemes","insets","Insets","fontScale","FontScale","isLandscape","Orientation","isPortrait","navigationBar","NavigationBar","screen","Dimensions","statusBar","StatusBar","pixelRatio","PixelRatio","themeName","ThemeName","useProxifiedUnistyles","forcedTheme","scopedTheme","getScopedTheme","dependencies","Set","theme","setTheme","getTheme","_","runtimeChanged","disposeRef","reinitListener","current","Array","from","updateTheme","updateRuntime","size","proxifiedTheme","Proxy","get","target","prop","add","Theme","proxifiedRuntime","addDependencies","newDependencies","dependenciesSize","forEach","dependency"],"sourceRoot":"../../../../src","sources":["core/useProxifiedUnistyles/useProxifiedUnistyles.ts"],"mappings":"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","ignoreList":[]}
|
package/lib/module/core/warn.js
CHANGED
@@ -2,7 +2,7 @@
|
|
2
2
|
|
3
3
|
export const maybeWarnAboutMultipleUnistyles = (style, displayName = 'Unknown') => {
|
4
4
|
if (__DEV__ && style && !Array.isArray(style)) {
|
5
|
-
const unistylesKeys = Object.keys(style).filter(key => key.startsWith('
|
5
|
+
const unistylesKeys = Object.keys(style).filter(key => key.startsWith('unistyles_'));
|
6
6
|
if (unistylesKeys.length > 1) {
|
7
7
|
console.warn(`Unistyles: we detected style object with ${unistylesKeys.length} unistyles styles. This might cause no updates or unpredictable behavior. Please check style prop for "${displayName}" and use array syntax instead of object syntax.`);
|
8
8
|
}
|
@@ -27,7 +27,7 @@ export const withUnistyles = (Component, mappings) => {
|
|
27
27
|
style: styleClassNames
|
28
28
|
} : {}),
|
29
29
|
...(narrowedProps.contentContainerStyle ? {
|
30
|
-
|
30
|
+
contentContainerStyle: contentContainerStyleClassNames
|
31
31
|
} : {})
|
32
32
|
};
|
33
33
|
|
@@ -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","combinedProps","displayName","name","NativeComponent"],"sourceRoot":"../../../../src","sources":["core/withUnistyles/withUnistyles.tsx"],"mappings":";;AAAA,OAAOA,KAAK,IAAwBC,UAAU,QAAgD,OAAO;AAGrG,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,CAAC;IACzD,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;IAE5G,MAAMK,aAAa,GAAG;MAClB,GAAGrB,gBAAgB,CAACkB,aAAa,EAAEC,aAAa,EAAEV,KAAK,CAAC;MACxD,IAAGE,aAAa,CAACE,KAAK,GAAG;QACrBA,KAAK,EAAED;MACX,CAAC,GAAG,CAAC,CAAC;MACN,IAAGD,aAAa,CAACI,qBAAqB,GAAG;
|
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","combinedProps","displayName","name","NativeComponent"],"sourceRoot":"../../../../src","sources":["core/withUnistyles/withUnistyles.tsx"],"mappings":";;AAAA,OAAOA,KAAK,IAAwBC,UAAU,QAAgD,OAAO;AAGrG,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,CAAC;IACzD,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;IAE5G,MAAMK,aAAa,GAAG;MAClB,GAAGrB,gBAAgB,CAACkB,aAAa,EAAEC,aAAa,EAAEV,KAAK,CAAC;MACxD,IAAGE,aAAa,CAACE,KAAK,GAAG;QACrBA,KAAK,EAAED;MACX,CAAC,GAAG,CAAC,CAAC;MACN,IAAGD,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,CAACe,WAAW,IAAIf,SAAS,CAACgB,IAAI,IAAI,SAAS,GAAG,CAAC;IAC9H;IACApB,+BAA+B,CAACQ,aAAa,CAACI,qBAAqB,EAAE,iBAAiBR,SAAS,CAACe,WAAW,IAAIf,SAAS,CAACgB,IAAI,IAAI,SAAS,GAAG,CAAC;IAE9I,MAAMC,eAAe,GAAGjB,SAA0B;IAElD,oBAAOF,IAAA,CAACmB,eAAe;MAAA,GAAKH,aAAa;MAAEX,GAAG,EAAEA;IAAI,CAAE,CAAC;EAC3D,CAAC,CAAC;AACN,CAAC","ignoreList":[]}
|
@@ -1,6 +1,7 @@
|
|
1
1
|
"use strict";
|
2
2
|
|
3
|
-
import React, { forwardRef, useEffect } from 'react';
|
3
|
+
import React, { forwardRef, useEffect, useRef } from 'react';
|
4
|
+
import { UnistylesShadowRegistry } from '../../specs';
|
4
5
|
import { deepMergeObjects } from '../../utils';
|
5
6
|
import { useProxifiedUnistyles } from '../useProxifiedUnistyles';
|
6
7
|
import { maybeWarnAboutMultipleUnistyles } from '../warn';
|
@@ -11,7 +12,7 @@ import { maybeWarnAboutMultipleUnistyles } from '../warn';
|
|
11
12
|
import { jsx as _jsx } from "react/jsx-runtime";
|
12
13
|
export const withUnistyles = (Component, mappings) => {
|
13
14
|
const getSecrets = (styleProps = {}) => {
|
14
|
-
const unistyleKey = Object.keys(styleProps).find(key => key.startsWith('
|
15
|
+
const unistyleKey = Object.keys(styleProps).find(key => key.startsWith('unistyles_'));
|
15
16
|
return unistyleKey ? styleProps[unistyleKey] : {
|
16
17
|
uni__getStyles: () => styleProps,
|
17
18
|
uni__dependencies: []
|
@@ -25,11 +26,12 @@ export const withUnistyles = (Component, mappings) => {
|
|
25
26
|
maybeWarnAboutMultipleUnistyles(narrowedProps.style, `withUnistyles(${Component.displayName ?? Component.name ?? 'Unknown'})`);
|
26
27
|
// @ts-ignore we don't know the type of the component
|
27
28
|
maybeWarnAboutMultipleUnistyles(narrowedProps.contentContainerStyle, `withUnistyles(${Component.displayName ?? Component.name ?? 'Unknown'})`);
|
29
|
+
const scopedTheme = useRef(UnistylesShadowRegistry.getScopedTheme());
|
28
30
|
const {
|
29
31
|
proxifiedRuntime,
|
30
32
|
proxifiedTheme,
|
31
33
|
addDependencies
|
32
|
-
} = useProxifiedUnistyles();
|
34
|
+
} = useProxifiedUnistyles(scopedTheme.current);
|
33
35
|
useEffect(() => {
|
34
36
|
const styleSecrets = getSecrets(narrowedProps.style);
|
35
37
|
const contentContainerStyleSecrets = getSecrets(narrowedProps.contentContainerStyle);
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"names":["React","forwardRef","useEffect","deepMergeObjects","useProxifiedUnistyles","maybeWarnAboutMultipleUnistyles","jsx","_jsx","withUnistyles","Component","mappings","getSecrets","styleProps","unistyleKey","Object","keys","find","key","startsWith","uni__getStyles","uni__dependencies","props","ref","narrowedProps","NativeComponent","style","displayName","name","contentContainerStyle","proxifiedRuntime","proxifiedTheme","addDependencies","styleSecrets","contentContainerStyleSecrets","Array","from","Set","mappingsProps","unistyleProps","uniProps","finalProps"],"sourceRoot":"../../../../src","sources":["core/withUnistyles/withUnistyles.native.tsx"],"mappings":";;AAAA,OAAOA,KAAK,IAAIC,UAAU,EAAEC,SAAS,
|
1
|
+
{"version":3,"names":["React","forwardRef","useEffect","useRef","UnistylesShadowRegistry","deepMergeObjects","useProxifiedUnistyles","maybeWarnAboutMultipleUnistyles","jsx","_jsx","withUnistyles","Component","mappings","getSecrets","styleProps","unistyleKey","Object","keys","find","key","startsWith","uni__getStyles","uni__dependencies","props","ref","narrowedProps","NativeComponent","style","displayName","name","contentContainerStyle","scopedTheme","getScopedTheme","proxifiedRuntime","proxifiedTheme","addDependencies","current","styleSecrets","contentContainerStyleSecrets","Array","from","Set","mappingsProps","unistyleProps","uniProps","finalProps"],"sourceRoot":"../../../../src","sources":["core/withUnistyles/withUnistyles.native.tsx"],"mappings":";;AAAA,OAAOA,KAAK,IAAIC,UAAU,EAAEC,SAAS,EAAsBC,MAAM,QAAQ,OAAO;AAChF,SAAkCC,uBAAuB,QAAQ,aAAa;AAG9E,SAASC,gBAAgB,QAAQ,aAAa;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;EAKrJ,MAAMC,UAAU,GAAGA,CAACC,UAA+B,GAAG,CAAC,CAAC,KAA8E;IAClI,MAAMC,WAAW,GAAGC,MAAM,CACrBC,IAAI,CAACH,UAAU,CAAC,CAChBI,IAAI,CAACC,GAAG,IAAIA,GAAG,CAACC,UAAU,CAAC,YAAY,CAAC,CAAC;IAE9C,OAAOL,WAAW,GACZD,UAAU,CAACC,WAAW,CAAC,GACvB;MACEM,cAAc,EAAEA,CAAA,KAAMP,UAAU;MAChCQ,iBAAiB,EAAE;IACvB,CAAC;EACT,CAAC;EAED,oBAAOrB,UAAU,CAAsD,CAACsB,KAAK,EAAEC,GAAG,KAAK;IACnF,MAAMC,aAAa,GAAGF,KAA2B;IACjD,MAAMG,eAAe,GAAGf,SAA0B;;IAElD;IACAJ,+BAA+B,CAACkB,aAAa,CAACE,KAAK,EAAE,iBAAiBhB,SAAS,CAACiB,WAAW,IAAIjB,SAAS,CAACkB,IAAI,IAAI,SAAS,GAAG,CAAC;IAC9H;IACAtB,+BAA+B,CAACkB,aAAa,CAACK,qBAAqB,EAAE,iBAAiBnB,SAAS,CAACiB,WAAW,IAAIjB,SAAS,CAACkB,IAAI,IAAI,SAAS,GAAG,CAAC;IAE9I,MAAME,WAAW,GAAG5B,MAAM,CAACC,uBAAuB,CAAC4B,cAAc,CAAC,CAAmB,CAAC;IACtF,MAAM;MAAEC,gBAAgB;MAAEC,cAAc;MAAEC;IAAgB,CAAC,GAAG7B,qBAAqB,CAACyB,WAAW,CAACK,OAAO,CAAC;IAExGlC,SAAS,CAAC,MAAM;MACZ,MAAMmC,YAAY,GAAGxB,UAAU,CAACY,aAAa,CAACE,KAAK,CAAC;MACpD,MAAMW,4BAA4B,GAAGzB,UAAU,CAACY,aAAa,CAACK,qBAAqB,CAAC;MAEpFK,eAAe,CAACI,KAAK,CAACC,IAAI,CAAC,IAAIC,GAAG,CAAC,CAAC,GAAGJ,YAAY,CAACf,iBAAiB,EAAE,GAAGgB,4BAA4B,CAAChB,iBAAiB,CAAC,CAAC,CAAC,CAAC;IAChI,CAAC,EAAE,CAACG,aAAa,CAACE,KAAK,EAAEF,aAAa,CAACK,qBAAqB,CAAC,CAAC;IAE9D,MAAMY,aAAa,GAAG9B,QAAQ,GAAGA,QAAQ,CAACsB,cAAc,EAAED,gBAAgB,CAAC,GAAG,CAAC,CAAC;IAChF,MAAMU,aAAa,GAAGlB,aAAa,CAACmB,QAAQ,GAAGnB,aAAa,CAACmB,QAAQ,CAACV,cAAc,EAAED,gBAAgB,CAAC,GAAG,CAAC,CAAC;IAE5G,MAAMI,YAAY,GAAGxB,UAAU,CAACY,aAAa,CAACE,KAAK,CAAC;IACpD,MAAMW,4BAA4B,GAAGzB,UAAU,CAACY,aAAa,CAACK,qBAAqB,CAAC;IAEpF,MAAMe,UAAU,GAAG;MACf,GAAGxC,gBAAgB,CAACqC,aAAa,EAAEC,aAAa,EAAEpB,KAAK,CAAC;MACxD,IAAGE,aAAa,CAACE,KAAK,GAAG;QACrBA,KAAK,EAAEU,YAAY,CAAChB,cAAc,CAAC;MACvC,CAAC,GAAG,CAAC,CAAC;MACN,IAAGI,aAAa,CAACK,qBAAqB,GAAG;QACrCA,qBAAqB,EAAEQ,4BAA4B,CAACjB,cAAc,CAAC;MACvE,CAAC,GAAG,CAAC,CAAC;IACV,CAAQ;IAER,oBAAOZ,IAAA,CAACiB,eAAe;MAAA,GAAKmB,UAAU;MAAYrB,GAAG,EAAEA;IAAI,CAAE,CAAC;EAClE,CAAC,CAAC;AACN,CAAC","ignoreList":[]}
|
@@ -16,7 +16,7 @@ export const convertUnistyles = value => {
|
|
16
16
|
...value._web
|
17
17
|
}).flatMap(([unistylesKey, unistylesValue]) => {
|
18
18
|
// Keys to omit
|
19
|
-
if (['_classNames', '_web', 'variants', 'compoundVariants', 'uni__dependencies'
|
19
|
+
if (['_classNames', '_web', 'variants', 'compoundVariants', 'uni__dependencies'].includes(unistylesKey) || unistylesKey.startsWith('unistyles_')) {
|
20
20
|
return [];
|
21
21
|
}
|
22
22
|
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"names":["deepMergeObjects","getBoxShadow","getFilterStyle","getTransformStyle","isPseudo","getBoxShadowStyle","getTextShadowStyle","getStyle","isBoxShadow","isFilter","isShadow","isTextShadow","isTransform","convertUnistyles","value","hasTextShadow","hasShadow","stylesArray","Object","entries","_web","flatMap","unistylesKey","unistylesValue","includes","startsWith","flattenValues","map","breakpointKey","breakpointValue"],"sourceRoot":"../../../../src","sources":["web/convert/index.ts"],"mappings":";;AACA,SAASA,gBAAgB,QAAQ,aAAa;AAC9C,SAASC,YAAY,EAAEC,cAAc,EAAEC,iBAAiB,QAAQ,UAAU;AAC1E,SAASC,QAAQ,QAAQ,UAAU;AACnC,SAASC,iBAAiB,EAAEC,kBAAkB,QAAQ,UAAU;AAChE,SAASC,QAAQ,QAAQ,SAAS;AAClC,SAASC,WAAW,EAAEC,QAAQ,EAAEC,QAAQ,EAAEC,YAAY,EAAEC,WAAW,QAAQ,SAAS;AAEpF,OAAO,MAAMC,gBAAgB,GAAIC,KAAsB,IAAK;EACxD;EACA,IAAIC,aAAa,GAAG,KAAK;EACzB;EACA,IAAIC,SAAS,GAAG,KAAK;EAErB,MAAMC,WAAW,GAAGC,MAAM,CAACC,OAAO,CAAC;IAC/B,GAAGL,KAAK;IACR,GAAGA,KAAK,CAACM;EACb,CAAC,CAAC,CAACC,OAAO,CAAC,CAAC,CAACC,YAAY,EAAEC,cAAc,CAAC,KAAK;IAC3C;IACA,IAAI,CAAC,aAAa,EAAE,MAAM,EAAE,UAAU,EAAE,kBAAkB,EAAE,mBAAmB,
|
1
|
+
{"version":3,"names":["deepMergeObjects","getBoxShadow","getFilterStyle","getTransformStyle","isPseudo","getBoxShadowStyle","getTextShadowStyle","getStyle","isBoxShadow","isFilter","isShadow","isTextShadow","isTransform","convertUnistyles","value","hasTextShadow","hasShadow","stylesArray","Object","entries","_web","flatMap","unistylesKey","unistylesValue","includes","startsWith","flattenValues","map","breakpointKey","breakpointValue"],"sourceRoot":"../../../../src","sources":["web/convert/index.ts"],"mappings":";;AACA,SAASA,gBAAgB,QAAQ,aAAa;AAC9C,SAASC,YAAY,EAAEC,cAAc,EAAEC,iBAAiB,QAAQ,UAAU;AAC1E,SAASC,QAAQ,QAAQ,UAAU;AACnC,SAASC,iBAAiB,EAAEC,kBAAkB,QAAQ,UAAU;AAChE,SAASC,QAAQ,QAAQ,SAAS;AAClC,SAASC,WAAW,EAAEC,QAAQ,EAAEC,QAAQ,EAAEC,YAAY,EAAEC,WAAW,QAAQ,SAAS;AAEpF,OAAO,MAAMC,gBAAgB,GAAIC,KAAsB,IAAK;EACxD;EACA,IAAIC,aAAa,GAAG,KAAK;EACzB;EACA,IAAIC,SAAS,GAAG,KAAK;EAErB,MAAMC,WAAW,GAAGC,MAAM,CAACC,OAAO,CAAC;IAC/B,GAAGL,KAAK;IACR,GAAGA,KAAK,CAACM;EACb,CAAC,CAAC,CAACC,OAAO,CAAC,CAAC,CAACC,YAAY,EAAEC,cAAc,CAAC,KAAK;IAC3C;IACA,IAAI,CAAC,aAAa,EAAE,MAAM,EAAE,UAAU,EAAE,kBAAkB,EAAE,mBAAmB,CAAC,CAACC,QAAQ,CAACF,YAAY,CAAC,IAAIA,YAAY,CAACG,UAAU,CAAC,YAAY,CAAC,EAAE;MAC9I,OAAO,EAAE;IACb;;IAEA;IACA,IAAIrB,QAAQ,CAACkB,YAAY,CAAC,EAAE;MACxB,MAAMI,aAAa,GAAGb,gBAAgB,CAACU,cAAiC,CAAC;MAEzE,OAAO;QAAE,CAACD,YAAY,GAAGI;MAAc,CAAC;IAC5C;;IAEA;IACA,IAAIf,YAAY,CAACW,YAAY,CAAC,EAAE;MAC5B,IAAIP,aAAa,EAAE;QACf,OAAO,EAAE;MACb;MAEAA,aAAa,GAAG,IAAI;MAEpB,OAAOT,kBAAkB,CAACQ,KAAK,CAAC;IACpC;;IAEA;IACA,IAAIJ,QAAQ,CAACY,YAAY,CAAC,EAAE;MACxB,IAAIN,SAAS,EAAE;QACX,OAAO,EAAE;MACb;MAEAA,SAAS,GAAG,IAAI;MAEhB,OAAOX,iBAAiB,CAACS,KAAK,CAAC;IACnC;IAEA,IAAIL,QAAQ,CAACa,YAAY,EAAEC,cAAc,CAAC,EAAE;MACxC,OAAOrB,cAAc,CAACqB,cAAc,CAAC;IACzC;IAEA,IAAIf,WAAW,CAACc,YAAY,EAAEC,cAAc,CAAC,EAAE;MAC3C,OAAOtB,YAAY,CAACsB,cAAc,CAAC;IACvC;;IAEA;IACA,IAAIX,WAAW,CAACU,YAAY,EAAEC,cAAc,CAAC,EAAE;MAC3C,OAAOpB,iBAAiB,CAACoB,cAAc,CAAC;IAC5C;;IAEA;IACA,IAAI,OAAOA,cAAc,KAAK,QAAQ,IAAIA,cAAc,KAAK,IAAI,EAAE;MAC/D,OAAOL,MAAM,CAACC,OAAO,CAACI,cAAc,CAAC,CAACI,GAAG,CAAC,CAAC,CAACC,aAAa,EAAEC,eAAe,CAAC,KAAK;QAC5E,OAAO;UAAE,CAACD,aAAa,GAAGrB,QAAQ,CAACe,YAAY,EAAEO,eAAe;QAAE,CAAC;MACvE,CAAC,CAAC;IACN;;IAEA;IACA,OAAOtB,QAAQ,CAACe,YAAY,EAAEC,cAAc,CAAC;EACjD,CAAC,CAA+B;EAEhC,OAAOvB,gBAAgB,CAAC,GAAGiB,WAAW,CAAC;AAC3C,CAAC","ignoreList":[]}
|
@@ -42,6 +42,6 @@ const cyrb53 = (data, seed = 0) => {
|
|
42
42
|
};
|
43
43
|
export const generateHash = value => {
|
44
44
|
const serialized = serialize(value);
|
45
|
-
return `
|
45
|
+
return `unistyles_${cyrb53(serialized).toString(36)}`;
|
46
46
|
};
|
47
47
|
//# sourceMappingURL=common.js.map
|
@@ -17,9 +17,9 @@ export const assignSecrets = (object, secrets) => {
|
|
17
17
|
const secretsId = Math.random().toString(36).slice(8);
|
18
18
|
|
19
19
|
// @ts-expect-error assign hidden secrets
|
20
|
-
object[`
|
20
|
+
object[`unistyles_${secretsId}`] = {};
|
21
21
|
// @ts-expect-error assign hidden secrets
|
22
|
-
Object.defineProperties(object[`
|
22
|
+
Object.defineProperties(object[`unistyles_${secretsId}`], reduceObject(secrets, secret => ({
|
23
23
|
value: secret,
|
24
24
|
enumerable: false,
|
25
25
|
configurable: true
|
@@ -30,7 +30,7 @@ export const extractSecrets = object => {
|
|
30
30
|
if (!object) {
|
31
31
|
return undefined;
|
32
32
|
}
|
33
|
-
const [, secrets] = Object.entries(object).find(([key]) => key.startsWith('
|
33
|
+
const [, secrets] = Object.entries(object).find(([key]) => key.startsWith('unistyles_')) ?? [];
|
34
34
|
if (!secrets) {
|
35
35
|
return undefined;
|
36
36
|
}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"Pressable.native.d.ts","sourceRoot":"","sources":["../../../../../src/components/native/Pressable.native.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA8C,MAAM,OAAO,CAAA;AAElE,OAAO,KAAK,EAAE,cAAc,IAAI,KAAK,EAAE,IAAI,EAAE,MAAM,cAAc,CAAA;AAwBjE,eAAO,MAAM,SAAS;eAnBP,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC;
|
1
|
+
{"version":3,"file":"Pressable.native.d.ts","sourceRoot":"","sources":["../../../../../src/components/native/Pressable.native.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA8C,MAAM,OAAO,CAAA;AAElE,OAAO,KAAK,EAAE,cAAc,IAAI,KAAK,EAAE,IAAI,EAAE,MAAM,cAAc,CAAA;AAwBjE,eAAO,MAAM,SAAS;eAnBP,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC;8BAqE7C,CAAA"}
|
@@ -1,6 +1,7 @@
|
|
1
1
|
import { type UnistylesMiniRuntime } from '../../specs';
|
2
2
|
import { UnistyleDependency } from '../../specs/NativePlatform';
|
3
|
-
|
3
|
+
import type { UnistylesTheme } from '../../types';
|
4
|
+
export declare const useProxifiedUnistyles: (forcedTheme?: UnistylesTheme) => {
|
4
5
|
proxifiedTheme: never;
|
5
6
|
proxifiedRuntime: UnistylesMiniRuntime;
|
6
7
|
addDependencies: (newDependencies: Array<UnistyleDependency>) => void;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"useProxifiedUnistyles.d.ts","sourceRoot":"","sources":["../../../../../src/core/useProxifiedUnistyles/useProxifiedUnistyles.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,oBAAoB,EAA6C,MAAM,aAAa,CAAA;AAElG,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAA;
|
1
|
+
{"version":3,"file":"useProxifiedUnistyles.d.ts","sourceRoot":"","sources":["../../../../../src/core/useProxifiedUnistyles/useProxifiedUnistyles.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,oBAAoB,EAA6C,MAAM,aAAa,CAAA;AAElG,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAA;AAC/D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AAwBjD,eAAO,MAAM,qBAAqB,iBAAkB,cAAc;;;uCAgDvB,KAAK,CAAC,kBAAkB,CAAC;CAcnE,CAAA"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"withUnistyles.native.d.ts","sourceRoot":"","sources":["../../../../../src/core/withUnistyles/withUnistyles.native.tsx"],"names":[],"mappings":"AAAA,OAAO,
|
1
|
+
{"version":3,"file":"withUnistyles.native.d.ts","sourceRoot":"","sources":["../../../../../src/core/withUnistyles/withUnistyles.native.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA4D,MAAM,OAAO,CAAA;AAOhF,OAAO,KAAK,EAAE,QAAQ,EAAuB,MAAM,SAAS,CAAA;AAG5D,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,mBAAQ;0CAoDlC,CAAA"}
|
@@ -32,7 +32,7 @@ namespace margelo::nitro::unistyles {
|
|
32
32
|
_javaPart(jni::make_global(jThis)) {}
|
33
33
|
|
34
34
|
public:
|
35
|
-
|
35
|
+
~JHybridNativePlatformSpec() override {
|
36
36
|
// Hermes GC can destroy JS objects on a non-JNI Thread.
|
37
37
|
jni::ThreadScope::WithClassLoader([&] { _javaPart.reset(); });
|
38
38
|
}
|
package/nitrogen/generated/android/kotlin/com/margelo/nitro/unistyles/HybridNativePlatformSpec.kt
CHANGED
@@ -7,7 +7,6 @@
|
|
7
7
|
|
8
8
|
package com.margelo.nitro.unistyles
|
9
9
|
|
10
|
-
import android.util.Log
|
11
10
|
import androidx.annotation.Keep
|
12
11
|
import com.facebook.jni.HybridData
|
13
12
|
import com.facebook.proguard.annotations.DoNotStrip
|
@@ -29,100 +28,96 @@ abstract class HybridNativePlatformSpec: HybridObject() {
|
|
29
28
|
private var mHybridData: HybridData = initHybrid()
|
30
29
|
|
31
30
|
init {
|
32
|
-
// Pass this `HybridData` through to it's base class,
|
33
|
-
// to represent inheritance to JHybridObject on C++ side
|
34
31
|
super.updateNative(mHybridData)
|
35
32
|
}
|
36
33
|
|
37
|
-
/**
|
38
|
-
* Call from a child class to initialize HybridData with a child.
|
39
|
-
*/
|
40
34
|
override fun updateNative(hybridData: HybridData) {
|
41
35
|
mHybridData = hybridData
|
36
|
+
super.updateNative(hybridData)
|
42
37
|
}
|
43
38
|
|
44
39
|
// Properties
|
45
|
-
|
40
|
+
|
46
41
|
|
47
42
|
// Methods
|
48
43
|
@DoNotStrip
|
49
44
|
@Keep
|
50
45
|
abstract fun getInsets(): Insets
|
51
|
-
|
46
|
+
|
52
47
|
@DoNotStrip
|
53
48
|
@Keep
|
54
49
|
abstract fun getColorScheme(): ColorScheme
|
55
|
-
|
50
|
+
|
56
51
|
@DoNotStrip
|
57
52
|
@Keep
|
58
53
|
abstract fun getFontScale(): Double
|
59
|
-
|
54
|
+
|
60
55
|
@DoNotStrip
|
61
56
|
@Keep
|
62
57
|
abstract fun getPixelRatio(): Double
|
63
|
-
|
58
|
+
|
64
59
|
@DoNotStrip
|
65
60
|
@Keep
|
66
61
|
abstract fun getOrientation(): Orientation
|
67
|
-
|
62
|
+
|
68
63
|
@DoNotStrip
|
69
64
|
@Keep
|
70
65
|
abstract fun getContentSizeCategory(): String
|
71
|
-
|
66
|
+
|
72
67
|
@DoNotStrip
|
73
68
|
@Keep
|
74
69
|
abstract fun getScreenDimensions(): Dimensions
|
75
|
-
|
70
|
+
|
76
71
|
@DoNotStrip
|
77
72
|
@Keep
|
78
73
|
abstract fun getStatusBarDimensions(): Dimensions
|
79
|
-
|
74
|
+
|
80
75
|
@DoNotStrip
|
81
76
|
@Keep
|
82
77
|
abstract fun getNavigationBarDimensions(): Dimensions
|
83
|
-
|
78
|
+
|
84
79
|
@DoNotStrip
|
85
80
|
@Keep
|
86
81
|
abstract fun getPrefersRtlDirection(): Boolean
|
87
|
-
|
82
|
+
|
88
83
|
@DoNotStrip
|
89
84
|
@Keep
|
90
85
|
abstract fun setRootViewBackgroundColor(color: Double): Unit
|
91
|
-
|
86
|
+
|
92
87
|
@DoNotStrip
|
93
88
|
@Keep
|
94
89
|
abstract fun setNavigationBarHidden(isHidden: Boolean): Unit
|
95
|
-
|
90
|
+
|
96
91
|
@DoNotStrip
|
97
92
|
@Keep
|
98
93
|
abstract fun setStatusBarHidden(isHidden: Boolean): Unit
|
99
|
-
|
94
|
+
|
100
95
|
@DoNotStrip
|
101
96
|
@Keep
|
102
97
|
abstract fun setImmersiveMode(isEnabled: Boolean): Unit
|
103
|
-
|
98
|
+
|
104
99
|
@DoNotStrip
|
105
100
|
@Keep
|
106
101
|
abstract fun getMiniRuntime(): UnistylesNativeMiniRuntime
|
107
|
-
|
102
|
+
|
108
103
|
abstract fun registerPlatformListener(callback: (dependencies: Array<UnistyleDependency>, miniRuntime: UnistylesNativeMiniRuntime) -> Unit): Unit
|
109
|
-
|
104
|
+
|
110
105
|
@DoNotStrip
|
111
106
|
@Keep
|
112
|
-
|
107
|
+
fun registerPlatformListener_cxx(callback: Func_void_std__vector_UnistyleDependency__UnistylesNativeMiniRuntime): Unit {
|
113
108
|
val __result = registerPlatformListener(callback)
|
114
109
|
return __result
|
115
110
|
}
|
116
|
-
|
111
|
+
|
117
112
|
abstract fun registerImeListener(callback: (miniRuntime: UnistylesNativeMiniRuntime) -> Unit): Unit
|
118
|
-
|
113
|
+
|
119
114
|
@DoNotStrip
|
120
115
|
@Keep
|
121
|
-
|
116
|
+
fun registerImeListener_cxx(callback: Func_void_UnistylesNativeMiniRuntime): Unit {
|
122
117
|
val __result = registerImeListener(callback)
|
123
118
|
return __result
|
124
119
|
}
|
125
|
-
|
120
|
+
|
126
121
|
@DoNotStrip
|
127
122
|
@Keep
|
128
123
|
abstract fun unregisterPlatformListeners(): Unit
|
@@ -131,16 +126,5 @@ abstract class HybridNativePlatformSpec: HybridObject() {
|
|
131
126
|
|
132
127
|
companion object {
|
133
128
|
private const val TAG = "HybridNativePlatformSpec"
|
134
|
-
init {
|
135
|
-
try {
|
136
|
-
Log.i(TAG, "Loading unistyles C++ library...")
|
137
|
-
System.loadLibrary("unistyles")
|
138
|
-
Log.i(TAG, "Successfully loaded unistyles C++ library!")
|
139
|
-
} catch (e: Error) {
|
140
|
-
Log.e(TAG, "Failed to load unistyles C++ library! Is it properly installed and linked? " +
|
141
|
-
"Is the name correct? (see `CMakeLists.txt`, at `add_library(...)`)", e)
|
142
|
-
throw e
|
143
|
-
}
|
144
|
-
}
|
145
129
|
}
|
146
130
|
}
|
@@ -0,0 +1,35 @@
|
|
1
|
+
///
|
2
|
+
/// unistylesOnLoad.kt
|
3
|
+
/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
|
4
|
+
/// https://github.com/mrousavy/nitro
|
5
|
+
/// Copyright © 2025 Marc Rousavy @ Margelo
|
6
|
+
///
|
7
|
+
|
8
|
+
package com.margelo.nitro.unistyles
|
9
|
+
|
10
|
+
import android.util.Log
|
11
|
+
|
12
|
+
internal class unistylesOnLoad {
|
13
|
+
companion object {
|
14
|
+
private const val TAG = "unistylesOnLoad"
|
15
|
+
private var didLoad = false
|
16
|
+
/**
|
17
|
+
* Initializes the native part of "unistyles".
|
18
|
+
* This method is idempotent and can be called more than once.
|
19
|
+
*/
|
20
|
+
@JvmStatic
|
21
|
+
fun initializeNative() {
|
22
|
+
if (didLoad) return
|
23
|
+
try {
|
24
|
+
Log.i(TAG, "Loading unistyles C++ library...")
|
25
|
+
System.loadLibrary("unistyles")
|
26
|
+
Log.i(TAG, "Successfully loaded unistyles C++ library!")
|
27
|
+
didLoad = true
|
28
|
+
} catch (e: Error) {
|
29
|
+
Log.e(TAG, "Failed to load unistyles C++ library! Is it properly installed and linked? " +
|
30
|
+
"Is the name correct? (see `CMakeLists.txt`, at `add_library(...)`)", e)
|
31
|
+
throw e
|
32
|
+
}
|
33
|
+
}
|
34
|
+
}
|
35
|
+
}
|
@@ -44,6 +44,8 @@ def add_nitrogen_files(spec)
|
|
44
44
|
spec.private_header_files = current_private_header_files + [
|
45
45
|
# iOS specific specs
|
46
46
|
"nitrogen/generated/ios/c++/**/*.{h,hpp}",
|
47
|
+
# Views are framework-specific and should be private
|
48
|
+
"nitrogen/generated/shared/**/views/**/*"
|
47
49
|
]
|
48
50
|
|
49
51
|
current_pod_target_xcconfig = spec.attributes_hash['pod_target_xcconfig'] || {}
|
@@ -41,7 +41,7 @@ namespace margelo::nitro::unistyles::bridge::swift {
|
|
41
41
|
throw std::runtime_error("Class \"HybridNativePlatformSpec\" is not implemented in Swift!");
|
42
42
|
}
|
43
43
|
#endif
|
44
|
-
Unistyles::HybridNativePlatformSpec_cxx swiftPart = swiftWrapper->getSwiftPart();
|
44
|
+
Unistyles::HybridNativePlatformSpec_cxx& swiftPart = swiftWrapper->getSwiftPart();
|
45
45
|
return swiftPart.toUnsafe();
|
46
46
|
}
|
47
47
|
|
@@ -58,7 +58,9 @@ namespace margelo::nitro::unistyles {
|
|
58
58
|
|
59
59
|
public:
|
60
60
|
// Get the Swift part
|
61
|
-
inline Unistyles::HybridNativePlatformSpec_cxx getSwiftPart() noexcept {
|
61
|
+
inline Unistyles::HybridNativePlatformSpec_cxx& getSwiftPart() noexcept {
|
62
|
+
return _swiftPart;
|
63
|
+
}
|
62
64
|
|
63
65
|
public:
|
64
66
|
// Get memory pressure
|
@@ -9,7 +9,7 @@ import Foundation
|
|
9
9
|
import NitroModules
|
10
10
|
|
11
11
|
/// See ``HybridNativePlatformSpec``
|
12
|
-
public protocol HybridNativePlatformSpec_protocol:
|
12
|
+
public protocol HybridNativePlatformSpec_protocol: HybridObject {
|
13
13
|
// Properties
|
14
14
|
|
15
15
|
|
@@ -35,7 +35,7 @@ public protocol HybridNativePlatformSpec_protocol: AnyObject {
|
|
35
35
|
}
|
36
36
|
|
37
37
|
/// See ``HybridNativePlatformSpec``
|
38
|
-
public class HybridNativePlatformSpec_base
|
38
|
+
public class HybridNativePlatformSpec_base {
|
39
39
|
private weak var cxxWrapper: HybridNativePlatformSpec_cxx? = nil
|
40
40
|
public func getCxxWrapper() -> HybridNativePlatformSpec_cxx {
|
41
41
|
#if DEBUG
|
@@ -51,7 +51,6 @@ public class HybridNativePlatformSpec_base: HybridObjectSpec {
|
|
51
51
|
return cxxWrapper
|
52
52
|
}
|
53
53
|
}
|
54
|
-
public var memorySize: Int { return 0 }
|
55
54
|
}
|
56
55
|
|
57
56
|
/**
|