react-native-unistyles 3.0.0-beta.5 → 3.0.0-nightly-20250122
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/android/src/main/java/com/unistyles/UnistylesPackage.kt +2 -2
- package/ios/UnistylesModuleOnLoad.h +4 -4
- package/ios/UnistylesModuleOnLoad.mm +4 -8
- package/lib/commonjs/core/createUnistylesElement.native.js +13 -3
- package/lib/commonjs/core/createUnistylesElement.native.js.map +1 -1
- package/lib/commonjs/server/getServerUnistyles.js +3 -1
- package/lib/commonjs/server/getServerUnistyles.js.map +1 -1
- package/lib/module/core/createUnistylesElement.native.js +13 -3
- package/lib/module/core/createUnistylesElement.native.js.map +1 -1
- package/lib/module/server/getServerUnistyles.js +3 -1
- package/lib/module/server/getServerUnistyles.js.map +1 -1
- package/lib/typescript/src/core/createUnistylesElement.native.d.ts.map +1 -1
- package/lib/typescript/src/server/getServerUnistyles.d.ts.map +1 -1
- package/package.json +3 -3
- package/src/core/createUnistylesElement.native.tsx +14 -4
- package/src/server/getServerUnistyles.tsx +2 -1
@@ -20,8 +20,8 @@ class UnistylesPackage: TurboReactPackage() {
|
|
20
20
|
mapOf(UnistylesModule.NAME to ReactModuleInfo(
|
21
21
|
UnistylesModule.NAME,
|
22
22
|
UnistylesModule.NAME,
|
23
|
-
|
24
|
-
|
23
|
+
canOverrideExistingModule = true,
|
24
|
+
needsEagerInit = true,
|
25
25
|
isCxxModule = true,
|
26
26
|
isTurboModule = true
|
27
27
|
))
|
@@ -8,12 +8,12 @@
|
|
8
8
|
#import "TurboUnistyles/TurboUnistyles.h"
|
9
9
|
#import <React/RCTSurfacePresenter.h>
|
10
10
|
#import <React/RCTScheduler.h>
|
11
|
-
#import <React/
|
12
|
-
#import <
|
11
|
+
#import <React/RCTCallInvoker.h>
|
12
|
+
#import <React/RCTCallInvokerModule.h>
|
13
13
|
#import <ReactCommon/RCTTurboModuleWithJSIBindings.h>
|
14
14
|
|
15
|
-
@interface UnistylesModule: RCTEventEmitter<NativeTurboUnistylesSpec>
|
15
|
+
@interface UnistylesModule: RCTEventEmitter<NativeTurboUnistylesSpec, RCTCallInvokerModule>
|
16
16
|
@end
|
17
17
|
|
18
|
-
@interface UnistylesModule()<RCTTurboModuleWithJSIBindings
|
18
|
+
@interface UnistylesModule()<RCTTurboModuleWithJSIBindings>
|
19
19
|
@end
|
@@ -11,7 +11,7 @@ using namespace margelo::nitro;
|
|
11
11
|
RCT_EXPORT_MODULE(Unistyles)
|
12
12
|
|
13
13
|
__weak RCTSurfacePresenter* _surfacePresenter;
|
14
|
-
@synthesize
|
14
|
+
@synthesize callInvoker = _callInvoker;
|
15
15
|
|
16
16
|
+ (BOOL)requiresMainQueueSetup {
|
17
17
|
return YES;
|
@@ -36,13 +36,9 @@ __weak RCTSurfacePresenter* _surfacePresenter;
|
|
36
36
|
}
|
37
37
|
|
38
38
|
- (void)createHybrids:(jsi::Runtime&)rt {
|
39
|
-
auto runOnJSThread =
|
40
|
-
|
41
|
-
|
42
|
-
[executor execute:^(jsi::Runtime& rt){
|
43
|
-
objcCallback(rt);
|
44
|
-
}];
|
45
|
-
});
|
39
|
+
auto runOnJSThread = [callInvoker = _callInvoker.callInvoker](std::function<void(jsi::Runtime& rt)> &&callback){
|
40
|
+
callInvoker->invokeAsync(std::move(callback));
|
41
|
+
};
|
46
42
|
|
47
43
|
auto nativePlatform = Unistyles::NativePlatform::create().getCxxPart();
|
48
44
|
auto unistylesRuntime = std::make_shared<HybridUnistylesRuntime>(nativePlatform, rt, runOnJSThread);
|
@@ -11,6 +11,18 @@ var _warn = require("./warn");
|
|
11
11
|
var _jsxRuntime = require("react/jsx-runtime");
|
12
12
|
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
|
13
13
|
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
|
14
|
+
const getNativeRef = (Component, ref) => {
|
15
|
+
switch (Component.name) {
|
16
|
+
case 'KeyboardAvoidingView':
|
17
|
+
return ref.viewRef?.current;
|
18
|
+
case 'FlatList':
|
19
|
+
return ref.getNativeScrollRef?.();
|
20
|
+
case 'VirtualizedList':
|
21
|
+
return ref.getScrollRef?.();
|
22
|
+
default:
|
23
|
+
return ref;
|
24
|
+
}
|
25
|
+
};
|
14
26
|
const createUnistylesElement = Component => /*#__PURE__*/_react.default.forwardRef((props, forwardedRef) => {
|
15
27
|
const storedRef = (0, _react.useRef)(null);
|
16
28
|
(0, _react.useEffect)(() => {
|
@@ -25,9 +37,7 @@ const createUnistylesElement = Component => /*#__PURE__*/_react.default.forwardR
|
|
25
37
|
...props,
|
26
38
|
ref: ref => {
|
27
39
|
if (ref) {
|
28
|
-
storedRef.current = Component
|
29
|
-
// @ts-ignore this is special case for KeyboardAvoidingView
|
30
|
-
? ref.viewRef.current : ref;
|
40
|
+
storedRef.current = getNativeRef(Component, ref);
|
31
41
|
}
|
32
42
|
(0, _passForwardRef.passForwardedRef)(props, ref, forwardedRef);
|
33
43
|
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"names":["_react","_interopRequireWildcard","require","_specs","_passForwardRef","_warn","_jsxRuntime","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","
|
1
|
+
{"version":3,"names":["_react","_interopRequireWildcard","require","_specs","_passForwardRef","_warn","_jsxRuntime","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","getNativeRef","Component","ref","name","viewRef","current","getNativeScrollRef","getScrollRef","createUnistylesElement","React","forwardRef","props","forwardedRef","storedRef","useRef","useEffect","UnistylesShadowRegistry","remove","jsx","passForwardedRef","maybeWarnAboutMultipleUnistyles","style","displayName","exports"],"sourceRoot":"../../../src","sources":["core/createUnistylesElement.native.tsx"],"mappings":"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","ignoreList":[]}
|
@@ -30,7 +30,9 @@ const getServerUnistyles = ({
|
|
30
30
|
children: css
|
31
31
|
}), /*#__PURE__*/(0, _jsxRuntime.jsx)("script", {
|
32
32
|
id: "unistyles-script",
|
33
|
-
|
33
|
+
dangerouslySetInnerHTML: {
|
34
|
+
__html: `window.__UNISTYLES_STATE__ = ${JSON.stringify(state)}`
|
35
|
+
}
|
34
36
|
})]
|
35
37
|
});
|
36
38
|
};
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"names":["_react","_interopRequireDefault","require","_reactNative","_utils","_web","_types","_jsxRuntime","e","__esModule","default","getServerUnistyles","includeRNWStyles","DefaultServerUnistylesSettings","isServer","error","rnwStyle","StyleSheet","getSheet","textContent","css","UnistylesWeb","registry","getStyles","state","getState","jsxs","Fragment","children","jsx","id","JSON","stringify","exports"],"sourceRoot":"../../../src","sources":["server/getServerUnistyles.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AACA,IAAAE,MAAA,GAAAF,OAAA;AACA,IAAAG,IAAA,GAAAH,OAAA;AACA,IAAAI,MAAA,GAAAJ,OAAA;AAAsF,IAAAK,WAAA,GAAAL,OAAA;AAAA,SAAAD,uBAAAO,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAE/E,MAAMG,kBAAkB,GAAGA,CAAC;EAAEC,gBAAgB,GAAG;AAA8B,CAAC,GAAGC,qCAA8B,KAAK;EACzH,IAAI,CAAC,IAAAC,eAAQ,EAAC,CAAC,EAAE;IACb,MAAM,IAAAC,YAAK,EAAC,iDAAiD,CAAC;EAClE;EACA;EACA,MAAMC,QAAuB,GAAGJ,gBAAgB,GAAIK,uBAAU,EAAEC,QAAQ,CAAC,CAAC,CAACC,WAAW,IAAI,EAAE,GAAI,IAAI;EACpG,MAAMC,GAAG,GAAGC,iBAAY,CAACC,QAAQ,CAACF,GAAG,CAACG,SAAS,CAAC,CAAC;EACjD,MAAMC,KAAK,GAAGH,iBAAY,CAACC,QAAQ,CAACF,GAAG,CAACK,QAAQ,CAAC,CAAC;EAClD,oBAAO,IAAAlB,WAAA,CAAAmB,IAAA,EAAAnB,WAAA,CAAAoB,QAAA;IAAAC,QAAA,GACFZ,QAAQ,iBAAI,IAAAT,WAAA,CAAAsB,GAAA;MAAOC,EAAE,EAAC,WAAW;MAAAF,QAAA,EAAEZ;IAAQ,CAAQ,CAAC,eACrD,IAAAT,WAAA,CAAAsB,GAAA;MAAOC,EAAE,EAAC,eAAe;MAAAF,QAAA,EAAER;IAAG,CAAQ,CAAC,
|
1
|
+
{"version":3,"names":["_react","_interopRequireDefault","require","_reactNative","_utils","_web","_types","_jsxRuntime","e","__esModule","default","getServerUnistyles","includeRNWStyles","DefaultServerUnistylesSettings","isServer","error","rnwStyle","StyleSheet","getSheet","textContent","css","UnistylesWeb","registry","getStyles","state","getState","jsxs","Fragment","children","jsx","id","dangerouslySetInnerHTML","__html","JSON","stringify","exports"],"sourceRoot":"../../../src","sources":["server/getServerUnistyles.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AACA,IAAAE,MAAA,GAAAF,OAAA;AACA,IAAAG,IAAA,GAAAH,OAAA;AACA,IAAAI,MAAA,GAAAJ,OAAA;AAAsF,IAAAK,WAAA,GAAAL,OAAA;AAAA,SAAAD,uBAAAO,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAE/E,MAAMG,kBAAkB,GAAGA,CAAC;EAAEC,gBAAgB,GAAG;AAA8B,CAAC,GAAGC,qCAA8B,KAAK;EACzH,IAAI,CAAC,IAAAC,eAAQ,EAAC,CAAC,EAAE;IACb,MAAM,IAAAC,YAAK,EAAC,iDAAiD,CAAC;EAClE;EACA;EACA,MAAMC,QAAuB,GAAGJ,gBAAgB,GAAIK,uBAAU,EAAEC,QAAQ,CAAC,CAAC,CAACC,WAAW,IAAI,EAAE,GAAI,IAAI;EACpG,MAAMC,GAAG,GAAGC,iBAAY,CAACC,QAAQ,CAACF,GAAG,CAACG,SAAS,CAAC,CAAC;EACjD,MAAMC,KAAK,GAAGH,iBAAY,CAACC,QAAQ,CAACF,GAAG,CAACK,QAAQ,CAAC,CAAC;EAClD,oBAAO,IAAAlB,WAAA,CAAAmB,IAAA,EAAAnB,WAAA,CAAAoB,QAAA;IAAAC,QAAA,GACFZ,QAAQ,iBAAI,IAAAT,WAAA,CAAAsB,GAAA;MAAOC,EAAE,EAAC,WAAW;MAAAF,QAAA,EAAEZ;IAAQ,CAAQ,CAAC,eACrD,IAAAT,WAAA,CAAAsB,GAAA;MAAOC,EAAE,EAAC,eAAe;MAAAF,QAAA,EAAER;IAAG,CAAQ,CAAC,eAEvC,IAAAb,WAAA,CAAAsB,GAAA;MAAQC,EAAE,EAAC,kBAAkB;MAACC,uBAAuB,EAAE;QAAEC,MAAM,EAAE,gCAAgCC,IAAI,CAACC,SAAS,CAACV,KAAK,CAAC;MAAE;IAAE,CAAE,CAAC;EAAA,CAC/H,CAAC;AACP,CAAC;AAAAW,OAAA,CAAAxB,kBAAA,GAAAA,kBAAA","ignoreList":[]}
|
@@ -5,6 +5,18 @@ import { UnistylesShadowRegistry } from '../specs';
|
|
5
5
|
import { passForwardedRef } from './passForwardRef';
|
6
6
|
import { maybeWarnAboutMultipleUnistyles } from './warn';
|
7
7
|
import { jsx as _jsx } from "react/jsx-runtime";
|
8
|
+
const getNativeRef = (Component, ref) => {
|
9
|
+
switch (Component.name) {
|
10
|
+
case 'KeyboardAvoidingView':
|
11
|
+
return ref.viewRef?.current;
|
12
|
+
case 'FlatList':
|
13
|
+
return ref.getNativeScrollRef?.();
|
14
|
+
case 'VirtualizedList':
|
15
|
+
return ref.getScrollRef?.();
|
16
|
+
default:
|
17
|
+
return ref;
|
18
|
+
}
|
19
|
+
};
|
8
20
|
export const createUnistylesElement = Component => /*#__PURE__*/React.forwardRef((props, forwardedRef) => {
|
9
21
|
const storedRef = useRef(null);
|
10
22
|
useEffect(() => {
|
@@ -19,9 +31,7 @@ export const createUnistylesElement = Component => /*#__PURE__*/React.forwardRef
|
|
19
31
|
...props,
|
20
32
|
ref: ref => {
|
21
33
|
if (ref) {
|
22
|
-
storedRef.current = Component
|
23
|
-
// @ts-ignore this is special case for KeyboardAvoidingView
|
24
|
-
? ref.viewRef.current : ref;
|
34
|
+
storedRef.current = getNativeRef(Component, ref);
|
25
35
|
}
|
26
36
|
passForwardedRef(props, ref, forwardedRef);
|
27
37
|
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"names":["React","useEffect","useRef","UnistylesShadowRegistry","passForwardedRef","maybeWarnAboutMultipleUnistyles","jsx","_jsx","
|
1
|
+
{"version":3,"names":["React","useEffect","useRef","UnistylesShadowRegistry","passForwardedRef","maybeWarnAboutMultipleUnistyles","jsx","_jsx","getNativeRef","Component","ref","name","viewRef","current","getNativeScrollRef","getScrollRef","createUnistylesElement","forwardRef","props","forwardedRef","storedRef","remove","style","displayName"],"sourceRoot":"../../../src","sources":["core/createUnistylesElement.native.tsx"],"mappings":";;AAAA,OAAOA,KAAK,IAAIC,SAAS,EAAEC,MAAM,QAAQ,OAAO;AAChD,SAASC,uBAAuB,QAAQ,UAAU;AAClD,SAASC,gBAAgB,QAAQ,kBAAkB;AACnD,SAASC,+BAA+B,QAAQ,QAAQ;AAAA,SAAAC,GAAA,IAAAC,IAAA;AAExD,MAAMC,YAAY,GAAGA,CAACC,SAAc,EAAEC,GAAQ,KAAK;EAC/C,QAAQD,SAAS,CAACE,IAAI;IAClB,KAAK,sBAAsB;MACvB,OAAOD,GAAG,CAACE,OAAO,EAAEC,OAAO;IAC/B,KAAK,UAAU;MACX,OAAOH,GAAG,CAACI,kBAAkB,GAAG,CAAC;IACrC,KAAK,iBAAiB;MAClB,OAAOJ,GAAG,CAACK,YAAY,GAAG,CAAC;IAC/B;MACI,OAAOL,GAAG;EAClB;AACJ,CAAC;AAED,OAAO,MAAMM,sBAAsB,GAAIP,SAAc,iBAAKT,KAAK,CAACiB,UAAU,CAAC,CAACC,KAAK,EAAEC,YAAY,KAAK;EAChG,MAAMC,SAAS,GAAGlB,MAAM,CAAU,IAAI,CAAC;EAEvCD,SAAS,CAAC,MAAM;IACZ,OAAO,MAAM;MACT,IAAImB,SAAS,CAACP,OAAO,EAAE;QACnB;QACAV,uBAAuB,CAACkB,MAAM,CAACD,SAAS,CAACP,OAAO,CAAC;MACrD;IACJ,CAAC;EACL,CAAC,EAAE,EAAE,CAAC;EAEN,oBACIN,IAAA,CAACE,SAAS;IAAA,GACFS,KAAK;IACTR,GAAG,EAAGA,GAAY,IAAK;MACnB,IAAIA,GAAG,EAAE;QACLU,SAAS,CAACP,OAAO,GAAGL,YAAY,CAACC,SAAS,EAAEC,GAAG,CAAC;MACpD;MAEAN,gBAAgB,CAACc,KAAK,EAAER,GAAG,EAAES,YAAY,CAAC;;MAE1C;MACAd,+BAA+B,CAACa,KAAK,CAACI,KAAK,EAAEb,SAAS,CAACc,WAAW,CAAC;IACvE;EAAE,CACL,CAAC;AAEV,CAAC,CAAC","ignoreList":[]}
|
@@ -25,7 +25,9 @@ export const getServerUnistyles = ({
|
|
25
25
|
children: css
|
26
26
|
}), /*#__PURE__*/_jsx("script", {
|
27
27
|
id: "unistyles-script",
|
28
|
-
|
28
|
+
dangerouslySetInnerHTML: {
|
29
|
+
__html: `window.__UNISTYLES_STATE__ = ${JSON.stringify(state)}`
|
30
|
+
}
|
29
31
|
})]
|
30
32
|
});
|
31
33
|
};
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"names":["React","StyleSheet","error","isServer","UnistylesWeb","DefaultServerUnistylesSettings","jsx","_jsx","Fragment","_Fragment","jsxs","_jsxs","getServerUnistyles","includeRNWStyles","rnwStyle","getSheet","textContent","css","registry","getStyles","state","getState","children","id","JSON","stringify"],"sourceRoot":"../../../src","sources":["server/getServerUnistyles.tsx"],"mappings":";;AAAA,OAAOA,KAAK,MAAM,OAAO;AACzB,SAASC,UAAU,QAAQ,cAAc;AACzC,SAASC,KAAK,EAAEC,QAAQ,QAAQ,cAAc;AAC9C,SAASC,YAAY,QAAQ,QAAQ;AACrC,SAASC,8BAA8B,QAAsC,SAAS;AAAA,SAAAC,GAAA,IAAAC,IAAA,EAAAC,QAAA,IAAAC,SAAA,EAAAC,IAAA,IAAAC,KAAA;AAEtF,OAAO,MAAMC,kBAAkB,GAAGA,CAAC;EAAEC,gBAAgB,GAAG;AAA8B,CAAC,GAAGR,8BAA8B,KAAK;EACzH,IAAI,CAACF,QAAQ,CAAC,CAAC,EAAE;IACb,MAAMD,KAAK,CAAC,iDAAiD,CAAC;EAClE;EACA;EACA,MAAMY,QAAuB,GAAGD,gBAAgB,GAAIZ,UAAU,EAAEc,QAAQ,CAAC,CAAC,CAACC,WAAW,IAAI,EAAE,GAAI,IAAI;EACpG,MAAMC,GAAG,GAAGb,YAAY,CAACc,QAAQ,CAACD,GAAG,CAACE,SAAS,CAAC,CAAC;EACjD,MAAMC,KAAK,GAAGhB,YAAY,CAACc,QAAQ,CAACD,GAAG,CAACI,QAAQ,CAAC,CAAC;EAClD,oBAAOV,KAAA,CAAAF,SAAA;IAAAa,QAAA,GACFR,QAAQ,iBAAIP,IAAA;MAAOgB,EAAE,EAAC,WAAW;MAAAD,QAAA,EAAER;IAAQ,CAAQ,CAAC,eACrDP,IAAA;MAAOgB,EAAE,EAAC,eAAe;MAAAD,QAAA,EAAEL;IAAG,CAAQ,CAAC,
|
1
|
+
{"version":3,"names":["React","StyleSheet","error","isServer","UnistylesWeb","DefaultServerUnistylesSettings","jsx","_jsx","Fragment","_Fragment","jsxs","_jsxs","getServerUnistyles","includeRNWStyles","rnwStyle","getSheet","textContent","css","registry","getStyles","state","getState","children","id","dangerouslySetInnerHTML","__html","JSON","stringify"],"sourceRoot":"../../../src","sources":["server/getServerUnistyles.tsx"],"mappings":";;AAAA,OAAOA,KAAK,MAAM,OAAO;AACzB,SAASC,UAAU,QAAQ,cAAc;AACzC,SAASC,KAAK,EAAEC,QAAQ,QAAQ,cAAc;AAC9C,SAASC,YAAY,QAAQ,QAAQ;AACrC,SAASC,8BAA8B,QAAsC,SAAS;AAAA,SAAAC,GAAA,IAAAC,IAAA,EAAAC,QAAA,IAAAC,SAAA,EAAAC,IAAA,IAAAC,KAAA;AAEtF,OAAO,MAAMC,kBAAkB,GAAGA,CAAC;EAAEC,gBAAgB,GAAG;AAA8B,CAAC,GAAGR,8BAA8B,KAAK;EACzH,IAAI,CAACF,QAAQ,CAAC,CAAC,EAAE;IACb,MAAMD,KAAK,CAAC,iDAAiD,CAAC;EAClE;EACA;EACA,MAAMY,QAAuB,GAAGD,gBAAgB,GAAIZ,UAAU,EAAEc,QAAQ,CAAC,CAAC,CAACC,WAAW,IAAI,EAAE,GAAI,IAAI;EACpG,MAAMC,GAAG,GAAGb,YAAY,CAACc,QAAQ,CAACD,GAAG,CAACE,SAAS,CAAC,CAAC;EACjD,MAAMC,KAAK,GAAGhB,YAAY,CAACc,QAAQ,CAACD,GAAG,CAACI,QAAQ,CAAC,CAAC;EAClD,oBAAOV,KAAA,CAAAF,SAAA;IAAAa,QAAA,GACFR,QAAQ,iBAAIP,IAAA;MAAOgB,EAAE,EAAC,WAAW;MAAAD,QAAA,EAAER;IAAQ,CAAQ,CAAC,eACrDP,IAAA;MAAOgB,EAAE,EAAC,eAAe;MAAAD,QAAA,EAAEL;IAAG,CAAQ,CAAC,eAEvCV,IAAA;MAAQgB,EAAE,EAAC,kBAAkB;MAACC,uBAAuB,EAAE;QAAEC,MAAM,EAAE,gCAAgCC,IAAI,CAACC,SAAS,CAACP,KAAK,CAAC;MAAE;IAAE,CAAE,CAAC;EAAA,CAC/H,CAAC;AACP,CAAC","ignoreList":[]}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"createUnistylesElement.native.d.ts","sourceRoot":"","sources":["../../../../src/core/createUnistylesElement.native.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA4B,MAAM,OAAO,CAAA;
|
1
|
+
{"version":3,"file":"createUnistylesElement.native.d.ts","sourceRoot":"","sources":["../../../../src/core/createUnistylesElement.native.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA4B,MAAM,OAAO,CAAA;AAkBhD,eAAO,MAAM,sBAAsB,cAAe,GAAG,kEA2BnD,CAAA"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"getServerUnistyles.d.ts","sourceRoot":"","sources":["../../../../src/server/getServerUnistyles.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAIzB,OAAO,EAAkC,KAAK,uBAAuB,EAAE,MAAM,SAAS,CAAA;AAEtF,eAAO,MAAM,kBAAkB,0BAAiC,uBAAuB,
|
1
|
+
{"version":3,"file":"getServerUnistyles.d.ts","sourceRoot":"","sources":["../../../../src/server/getServerUnistyles.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAIzB,OAAO,EAAkC,KAAK,uBAAuB,EAAE,MAAM,SAAS,CAAA;AAEtF,eAAO,MAAM,kBAAkB,0BAAiC,uBAAuB,sBActF,CAAA"}
|
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "react-native-unistyles",
|
3
|
-
"version": "3.0.0-
|
3
|
+
"version": "3.0.0-nightly-20250122",
|
4
4
|
"description": "Level up your React Native StyleSheet",
|
5
5
|
"scripts": {
|
6
6
|
"test": "jest",
|
@@ -84,7 +84,7 @@
|
|
84
84
|
"@babel/plugin-syntax-jsx": "7.25.9",
|
85
85
|
"@biomejs/biome": "1.9.4",
|
86
86
|
"@commitlint/config-conventional": "19.6.0",
|
87
|
-
"@react-native/normalize-colors": "0.
|
87
|
+
"@react-native/normalize-colors": "0.77.0",
|
88
88
|
"@release-it/conventional-changelog": "8.0.2",
|
89
89
|
"@types/jest": "29.5.14",
|
90
90
|
"@types/react": "18.3.12",
|
@@ -96,7 +96,7 @@
|
|
96
96
|
"metro-react-native-babel-preset": "0.77.0",
|
97
97
|
"nitro-codegen": "0.21.0",
|
98
98
|
"react": "18.3.1",
|
99
|
-
"react-native": "0.
|
99
|
+
"react-native": "0.77.0",
|
100
100
|
"react-native-builder-bob": "0.33.1",
|
101
101
|
"react-native-nitro-modules": "0.21.0",
|
102
102
|
"react-native-web": "0.19.13",
|
@@ -3,6 +3,19 @@ import { UnistylesShadowRegistry } from '../specs'
|
|
3
3
|
import { passForwardedRef } from './passForwardRef'
|
4
4
|
import { maybeWarnAboutMultipleUnistyles } from './warn'
|
5
5
|
|
6
|
+
const getNativeRef = (Component: any, ref: any) => {
|
7
|
+
switch (Component.name) {
|
8
|
+
case 'KeyboardAvoidingView':
|
9
|
+
return ref.viewRef?.current
|
10
|
+
case 'FlatList':
|
11
|
+
return ref.getNativeScrollRef?.()
|
12
|
+
case 'VirtualizedList':
|
13
|
+
return ref.getScrollRef?.()
|
14
|
+
default:
|
15
|
+
return ref
|
16
|
+
}
|
17
|
+
}
|
18
|
+
|
6
19
|
export const createUnistylesElement = (Component: any) => React.forwardRef((props, forwardedRef) => {
|
7
20
|
const storedRef = useRef<unknown>(null)
|
8
21
|
|
@@ -20,10 +33,7 @@ export const createUnistylesElement = (Component: any) => React.forwardRef((prop
|
|
20
33
|
{...props}
|
21
34
|
ref={(ref: unknown) => {
|
22
35
|
if (ref) {
|
23
|
-
storedRef.current = Component
|
24
|
-
// @ts-ignore this is special case for KeyboardAvoidingView
|
25
|
-
? ref.viewRef.current
|
26
|
-
: ref
|
36
|
+
storedRef.current = getNativeRef(Component, ref)
|
27
37
|
}
|
28
38
|
|
29
39
|
passForwardedRef(props, ref, forwardedRef)
|
@@ -15,6 +15,7 @@ export const getServerUnistyles = ({ includeRNWStyles = true }: ServerUnistylesS
|
|
15
15
|
return <>
|
16
16
|
{rnwStyle && <style id='rnw-style'>{rnwStyle}</style>}
|
17
17
|
<style id='unistyles-web'>{css}</style>
|
18
|
-
|
18
|
+
{/* biome-ignore lint/security/noDangerouslySetInnerHtml: Needs the json quotes to be unescaped */}
|
19
|
+
<script id='unistyles-script' dangerouslySetInnerHTML={{ __html: `window.__UNISTYLES_STATE__ = ${JSON.stringify(state)}`}} />
|
19
20
|
</>
|
20
21
|
}
|