react-native-unistyles 3.0.0-beta.5 → 3.0.0-beta.6

package/README.md

@@ -47,6 +47,9 @@ Then follow [installation guides](https://unistyl.es/v3/start/getting-started) f
 <a href="https://galaxies.dev">
      <img src="https://avatars.githubusercontent.com/u/118431096?s=200&v=4" height="70px" width="70px" alt="galaxies-dev" />
 </a>
+<a href="https://github.com/FTCHD">
+     <img src="https://avatars.githubusercontent.com/u/144691102?v=4" height="70px" width="70px" alt="FTCHD" />
+</a>
 <a href="https://github.com/mobily">
      <img src="https://avatars.githubusercontent.com/u/1467712?v=4" height="70px" width="70px" alt="mobily" />
 </a>
@@ -62,8 +65,14 @@ Then follow [installation guides](https://unistyl.es/v3/start/getting-started) f
 <a href="https://github.com/oscklm">
      <img src="https://avatars.githubusercontent.com/u/22825865?v=4" height="70px" width="70px" alt="oscklm" />
 </a>
-<a href="https://github.com/giovannilondero">
-     <img src="https://avatars.githubusercontent.com/u/10998991?v=4" height="70px" width="70px" alt="giovannilondero" />
+<a href="https://github.com/guillaumehcht">
+     <img src="https://avatars.githubusercontent.com/u/80776475?v=4" height="70px" width="70px" alt="guillaumehcht" />
+</a>
+<a href="https://github.com/FilipiRafael">
+     <img src="https://avatars.githubusercontent.com/u/61629642?v=4" height="70px" width="70px" alt="FilipiRafael" />
+</a>
+<a href="https://github.com/4cc3ssX">
+     <img src="https://avatars.githubusercontent.com/u/57473799?v=4" height="70px" width="70px" alt="4cc3ssX" />
 </a>
 
 ## Past sponsors
@@ -89,6 +98,9 @@ Then follow [installation guides](https://unistyl.es/v3/start/getting-started) f
 <a href="https://github.com/hyoban">
      <img src="https://avatars.githubusercontent.com/u/38493346?v=4" height="70px" width="70px" alt="hyoban" />
 </a>
+<a href="https://github.com/giovannilondero">
+     <img src="https://avatars.githubusercontent.com/u/10998991?v=4" height="70px" width="70px" alt="giovannilondero" />
+</a>
 
 ## Sponsor my work
 

package/android/src/main/cxx/NativeUnistylesModule.cpp

@@ -37,7 +37,7 @@ jni::local_ref<BindingsInstallerHolder::javaobject> UnistylesModule::getBindings
     auto& uiManager = jobj->cthis()->_uiManager;
     auto& nativePlatform = jobj->cthis()->_nativePlatform;
 
-    return BindingsInstallerHolder::newObjectCxxArgs([&runtimeExecutor, uiManager, nativePlatform](jsi::Runtime& rt) {
+    return BindingsInstallerHolder::newObjectCxxArgs([&runtimeExecutor, &uiManager, &nativePlatform](jsi::Runtime& rt) {
         // function is called on: first init and every live reload
         // check if this is live reload, if so let's replace UnistylesRuntime with new runtime
         auto hasUnistylesRuntime = HybridObjectRegistry::hasHybridObject("UnistylesRuntime");

package/android/src/main/java/com/unistyles/NativePlatform+android.kt

@@ -32,9 +32,8 @@ class NativePlatformAndroid(private val reactContext: ReactApplicationContext):
         reactContext.addLifecycleEventListener(this)
     }
 
-    fun invalidate() {
+    fun onDestroy() {
         reactContext.removeLifecycleEventListener(this)
-        _listener.invalidate()
     }
 
     override fun onHostResume() {

package/android/src/main/java/com/unistyles/NativePlatform+insets.kt

@@ -23,6 +23,10 @@ class NativePlatformInsets(
     private val _imeListeners: MutableList<CxxImeListener> = mutableListOf()
     private var _insets: Insets = Insets(0.0, 0.0, 0.0, 0.0, 0.0)
 
+    fun onDestroy() {
+        this.removeImeListeners()
+    }
+
     fun getInsets(): Insets {
         val density = reactContext.resources.displayMetrics.density
 

package/android/src/main/java/com/unistyles/NativePlatform+listener.kt

@@ -31,7 +31,8 @@ class NativePlatformListener(
         reactContext.registerReceiver(configurationChangeReceiver, IntentFilter(Intent.ACTION_CONFIGURATION_CHANGED))
     }
 
-    fun invalidate() {
+    fun onDestroy() {
+        this.removePlatformListeners()
         reactContext.unregisterReceiver(configurationChangeReceiver)
     }
 

package/android/src/main/java/com/unistyles/UnistylesModule.kt

@@ -26,10 +26,6 @@ class UnistylesModule(reactContext: ReactApplicationContext): NativeTurboUnistyl
         mHybridData = initializeHybridData(reactContext)
     }
 
-    override fun invalidate() {
-        _nativePlatform.invalidate()
-    }
-
     private fun initializeHybridData(reactContext: ReactApplicationContext): HybridData {
         val runtimeExecutor = reactContext.catalystInstance?.runtimeExecutor
             ?: throw IllegalStateException("Unistyles: React Native runtime executor is not available. Please follow installation guides.")

package/android/src/main/java/com/unistyles/UnistylesPackage.kt

@@ -1,12 +1,12 @@
 package com.unistyles
 
-import com.facebook.react.TurboReactPackage
+import com.facebook.react.BaseReactPackage
 import com.facebook.react.bridge.NativeModule
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.module.model.ReactModuleInfo
 import com.facebook.react.module.model.ReactModuleInfoProvider
 
-class UnistylesPackage: TurboReactPackage() {
+class UnistylesPackage: BaseReactPackage() {
     override fun getModule(name: String, reactContext: ReactApplicationContext): NativeModule? {
         return if (name == UnistylesModule.NAME) {
             UnistylesModule(reactContext)
@@ -20,10 +20,10 @@ class UnistylesPackage: TurboReactPackage() {
             mapOf(UnistylesModule.NAME to ReactModuleInfo(
                 UnistylesModule.NAME,
                 UnistylesModule.NAME,
-                _canOverrideExistingModule = true,
-                _needsEagerInit = true,
-                isCxxModule = true,
-                isTurboModule = true
+                true,
+                true,
+                true,
+                true
             ))
         }
     }

package/components/native/Animated/package.json

@@ -0,0 +1,5 @@
+{
+  "main": "../../../lib/commonjs/components/native/Animated.js",
+  "module": "../../../lib/module/components/native/Animated.js",
+  "react-native": "../../../src/components/native/Animated.tsx"
+}

package/components/native/NativeText/package.json

@@ -0,0 +1,5 @@
+{
+  "main": "../../../lib/commonjs/components/native/NativeText.js",
+  "module": "../../../lib/module/components/native/NativeText.js",
+  "react-native": "../../../src/components/native/NativeText.native.tsx"
+}

package/components/native/NativeView/package.json

@@ -0,0 +1,5 @@
+{
+  "main": "../../../lib/commonjs/components/native/NativeView.js",
+  "module": "../../../lib/module/components/native/NativeView.js",
+  "react-native": "../../../src/components/native/NativeView.native.tsx"
+}

package/cxx/core/Unistyle.h

@@ -54,6 +54,10 @@ struct Unistyle {
     inline bool dependsOn(UnistyleDependency dependency) {
         return std::find(this->dependencies.begin(), this->dependencies.end(), dependency) != this->dependencies.end();
     }
+    
+    inline bool isSealed() {
+        return this->_isSealed;
+    }
 
     inline void seal() {
         this->_isSealed = true;

package/cxx/core/UnistylesRegistry.cpp

@@ -86,6 +86,27 @@ void core::UnistylesRegistry::linkShadowNodeWithUnistyle(
     this->trafficController.resumeUnistylesTraffic();
 }
 
+void core::UnistylesRegistry::removeDuplicatedUnistyles(jsi::Runtime& rt, const ShadowNodeFamily *shadowNodeFamily, std::vector<core::Unistyle::Shared>& unistyles) {
+    auto targetFamilyUnistyles = this->_shadowRegistry[&rt][shadowNodeFamily];
+
+    unistyles.erase(
+        std::remove_if(
+            unistyles.begin(),
+            unistyles.end(),
+            [&targetFamilyUnistyles](const core::Unistyle::Shared& unistyle) {
+                return std::any_of(
+                    targetFamilyUnistyles.begin(),
+                    targetFamilyUnistyles.end(),
+                    [&unistyle](const std::shared_ptr<core::UnistyleData>& data) {
+                        return data->unistyle == unistyle;
+                    }
+                );
+            }
+        ),
+        unistyles.end()
+    );
+}
+
 void core::UnistylesRegistry::unlinkShadowNodeWithUnistyles(jsi::Runtime& rt, const ShadowNodeFamily* shadowNodeFamily) {
     this->_shadowRegistry[&rt].erase(shadowNodeFamily);
     this->trafficController.removeShadowNode(shadowNodeFamily);
@@ -201,16 +222,16 @@ std::vector<std::shared_ptr<core::StyleSheet>> core::UnistylesRegistry::getStyle
 core::Unistyle::Shared core::UnistylesRegistry::getUnistyleById(jsi::Runtime& rt, std::string unistyleID) {
     for (auto& pair: this->_styleSheetRegistry[&rt]) {
         auto [_, stylesheet] = pair;
-        
+
         for (auto unistylePair: stylesheet->unistyles) {
             auto [_, unistyle] = unistylePair;
-            
+
             if (unistyle->unid == unistyleID) {
                 return unistyle;
             }
         }
     }
-    
+
     return nullptr;
 }
 

package/cxx/core/UnistylesRegistry.h

@@ -27,6 +27,8 @@ struct UnistylesRegistry: public StyleSheetRegistry {
 
     UnistylesRegistry(const UnistylesRegistry&) = delete;
     UnistylesRegistry(const UnistylesRegistry&&) = delete;
+    
+    bool shouldUsePointsForBreakpoints = false;
 
     void registerTheme(jsi::Runtime& rt, std::string name, jsi::Value& theme);
     void registerBreakpoints(jsi::Runtime& rt, std::vector<std::pair<std::string, double>>& sortedBreakpoints);
@@ -44,6 +46,7 @@ struct UnistylesRegistry: public StyleSheetRegistry {
     void shadowLeafUpdateFromUnistyle(jsi::Runtime& rt, Unistyle::Shared unistyle, jsi::Value& maybePressableId);
     shadow::ShadowTrafficController trafficController{};
     const std::optional<std::string> getScopedTheme();
+    void removeDuplicatedUnistyles(jsi::Runtime& rt, const ShadowNodeFamily* shadowNodeFamily, std::vector<core::Unistyle::Shared>& unistyles);
     void setScopedTheme(std::optional<std::string> themeName);
     core::Unistyle::Shared getUnistyleById(jsi::Runtime& rt, std::string unistyleID);
 

package/cxx/hybridObjects/HybridShadowRegistry.cpp

@@ -12,6 +12,13 @@ jsi::Value HybridShadowRegistry::link(jsi::Runtime &rt, const jsi::Value &thisVa
     std::vector<std::vector<folly::dynamic>> arguments;
     auto& registry = core::UnistylesRegistry::get();
 
+    // this is special case for Animated, and prevents appending same unistyles to node
+    registry.removeDuplicatedUnistyles(rt, &shadowNodeWrapper->getFamily(), unistyleWrappers);
+
+    if (unistyleWrappers.empty()) {
+        return jsi::Value::undefined();
+    }
+
     for (size_t i = 0; i < unistyleWrappers.size(); i++) {
         if (unistyleWrappers[i]->type == core::UnistyleType::DynamicFunction) {
             try {

package/cxx/hybridObjects/HybridStyleSheet.cpp

@@ -127,6 +127,20 @@ void HybridStyleSheet::parseSettings(jsi::Runtime &rt, jsi::Object settings) {
         if (propertyName == "CSSVars") {
             return;
         }
+        
+        if (propertyName == "nativeBreakpointsMode") {
+            helpers::assertThat(rt, propertyValue.isString(), "StyleSheet.configure's nativeBreakpointsMode must be a string");
+            
+            auto mode = propertyValue.asString(rt).utf8(rt);
+            
+            helpers::assertThat(rt, mode == "pixels" || mode == "points", "StyleSheet.configure's nativeBreakpointsMode must be one of: pixels or points");
+            
+            if (mode == "points") {
+                registry.shouldUsePointsForBreakpoints = true;
+            }
+            
+            return;
+        }
 
         helpers::assertThat(rt, false, "StyleSheet.configure's settings received unexpected key: '" + std::string(propertyName) + "'");
     });
@@ -142,7 +156,13 @@ void HybridStyleSheet::parseBreakpoints(jsi::Runtime &rt, jsi::Object breakpoint
     auto& state = registry.getState(rt);
 
     registry.registerBreakpoints(rt, sortedBreakpoints);
-    state.computeCurrentBreakpoint(this->_unistylesRuntime->getScreen().width);
+    
+    auto rawWidth = this->_unistylesRuntime->getScreen().width;
+    auto width = registry.shouldUsePointsForBreakpoints
+        ? rawWidth / this->_unistylesRuntime->getPixelRatio()
+        : rawWidth;
+    
+    state.computeCurrentBreakpoint(width);
 }
 
 void HybridStyleSheet::parseThemes(jsi::Runtime &rt, jsi::Object themes) {
@@ -293,7 +313,12 @@ void HybridStyleSheet::onPlatformNativeDependenciesChange(std::vector<UnistyleDe
         auto dimensionsIt = std::find(dependencies.begin(), dependencies.end(), UnistyleDependency::DIMENSIONS);
 
         if (dimensionsIt != dependencies.end()) {
-            registry.getState(rt).computeCurrentBreakpoint(this->_unistylesRuntime->getScreen().width);
+            auto rawWidth = this->_unistylesRuntime->getScreen().width;
+            auto width = registry.shouldUsePointsForBreakpoints
+                ? rawWidth / this->_unistylesRuntime->getPixelRatio()
+                : rawWidth;
+            
+            registry.getState(rt).computeCurrentBreakpoint(width);
         }
 
         // check if color scheme changed and then if Unistyles state depend on it (adaptive themes)

package/cxx/parser/Parser.cpp

@@ -399,8 +399,10 @@ jsi::Object parser::Parser::parseFirstLevel(jsi::Runtime& rt, Unistyle::Shared u
 
     helpers::enumerateJSIObject(rt, style, [&](const std::string& propertyName, jsi::Value& propertyValue){
         // parse dependencies only once
-        if (propertyName == helpers::STYLE_DEPENDENCIES && unistyle->dependencies.empty()) {
-            unistyle->dependencies = this->parseDependencies(rt, propertyValue.asObject(rt));
+        if (propertyName == helpers::STYLE_DEPENDENCIES && !unistyle->isSealed()) {
+            auto newDeps = this->parseDependencies(rt, propertyValue.asObject(rt));
+            
+            unistyle->dependencies.insert(unistyle->dependencies.end(), newDeps.begin(), newDeps.end());
 
             return;
         }
@@ -651,7 +653,11 @@ jsi::Value parser::Parser::getValueFromBreakpoints(jsi::Runtime& rt, Unistyle::S
     auto sortedBreakpoints = state.getSortedBreakpointPairs();
     auto hasBreakpoints = !sortedBreakpoints.empty();
     auto currentBreakpoint = state.getCurrentBreakpointName();
-    auto dimensions = this->_unistylesRuntime->getScreen();
+    auto rawDimensions = this->_unistylesRuntime->getScreen();
+    auto pixelRatio = this->_unistylesRuntime->getPixelRatio();
+    auto dimensions = registry.shouldUsePointsForBreakpoints
+        ? Dimensions(rawDimensions.width / pixelRatio, rawDimensions.height / pixelRatio)
+        : rawDimensions;
     auto currentOrientation = dimensions.width > dimensions.height
         ? "landscape"
         : "portrait";

package/ios/NativePlatform+ios.swift

@@ -114,6 +114,12 @@ class NativeIOSPlatform: HybridNativePlatformSpec {
         func getScreenDimensionsFn() -> Dimensions {
             guard let presentedViewController = RCTPresentedViewController(),
                   let windowFrame = presentedViewController.view.window?.frame else {
+                
+                // when user goes to background RCTPresentedViewController is not available, try to get last known value
+                if let cachedRuntime = self.miniRuntime, UIApplication.shared.applicationState == .background {
+                    return cachedRuntime.screen;
+                }
+                
                 // this should never happen, but it's better to return zeros
                 return Dimensions(width: 0, height: 0)
             }
@@ -137,10 +143,10 @@ class NativeIOSPlatform: HybridNativePlatformSpec {
         let screenDimensions = getScreenDimensions()
 
         if (screenDimensions.width > screenDimensions.height) {
-            return Orientation.landscape;
+            return Orientation.landscape
         }
 
-        return Orientation.portrait;
+        return Orientation.portrait
     }
 
     func getContentSizeCategory() -> String {
@@ -268,8 +274,14 @@ class NativeIOSPlatform: HybridNativePlatformSpec {
         func getPixelRatioFn() -> Double {
             guard let presentedViewController = RCTPresentedViewController(),
                   let window = presentedViewController.view.window else {
+
+                // when user goes to background RCTPresentedViewController is not available, try to get last known value
+                if let cachedRuntime = self.miniRuntime, UIApplication.shared.applicationState == .background {
+                    return cachedRuntime.pixelRatio;
+                }
+                
                 // this should never happen, but it's better to return default
-                return 1;
+                return 1
             }
 
             return window.screen.scale
@@ -297,7 +309,7 @@ class NativeIOSPlatform: HybridNativePlatformSpec {
     }
 
     func getNavigationBarDimensions() -> Dimensions {
-        return Dimensions(width: 0, height: 0);
+        return Dimensions(width: 0, height: 0)
     }
 
     func setStatusBarHidden(isHidden: Bool) throws {

package/ios/UnistylesModuleOnLoad.h

@@ -8,12 +8,12 @@
 #import "TurboUnistyles/TurboUnistyles.h"
 #import <React/RCTSurfacePresenter.h>
 #import <React/RCTScheduler.h>
-#import <React/RCTRuntimeExecutorModule.h>
-#import <ReactCommon/RCTRuntimeExecutor.h>
+#import <React/RCTCallInvoker.h>
+#import <React/RCTCallInvokerModule.h>
 #import <ReactCommon/RCTTurboModuleWithJSIBindings.h>
 
-@interface UnistylesModule: RCTEventEmitter<NativeTurboUnistylesSpec>
+@interface UnistylesModule: RCTEventEmitter<NativeTurboUnistylesSpec, RCTCallInvokerModule>
 @end
 
-@interface UnistylesModule()<RCTTurboModuleWithJSIBindings, RCTRuntimeExecutorModule>
+@interface UnistylesModule()<RCTTurboModuleWithJSIBindings>
 @end

package/ios/UnistylesModuleOnLoad.mm

@@ -11,7 +11,7 @@ using namespace margelo::nitro;
 RCT_EXPORT_MODULE(Unistyles)
 
 __weak RCTSurfacePresenter* _surfacePresenter;
-@synthesize runtimeExecutor = _runtimeExecutor;
+@synthesize callInvoker = _callInvoker;
 
 + (BOOL)requiresMainQueueSetup {
     return YES;
@@ -36,13 +36,9 @@ __weak RCTSurfacePresenter* _surfacePresenter;
 }
 
 - (void)createHybrids:(jsi::Runtime&)rt {
-    auto runOnJSThread = ([executor = _runtimeExecutor](std::function<void(jsi::Runtime& rt)> &&callback) {
-        __block auto objcCallback = callback;
-
-        [executor execute:^(jsi::Runtime& rt){
-            objcCallback(rt);
-        }];
-    });
+    auto runOnJSThread = [callInvoker = _callInvoker.callInvoker](std::function<void(jsi::Runtime& rt)> &&callback){
+        callInvoker->invokeAsync(std::move(callback));
+    };
 
     auto nativePlatform = Unistyles::NativePlatform::create().getCxxPart();
     auto unistylesRuntime = std::make_shared<HybridUnistylesRuntime>(nativePlatform, rt, runOnJSThread);

package/lib/commonjs/components/native/Animated.js

@@ -0,0 +1,23 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.Animated = void 0;
+var _reactNative = require("react-native");
+var _View = require("./View");
+var _Text = require("./Text");
+var _FlatList = require("./FlatList");
+var _Image = require("./Image");
+var _ScrollView = require("./ScrollView");
+var _SectionList = require("./SectionList");
+const Animated = exports.Animated = {
+  ..._reactNative.Animated,
+  View: _reactNative.Animated.createAnimatedComponent(_View.View),
+  Text: _reactNative.Animated.createAnimatedComponent(_Text.Text),
+  FlatList: _reactNative.Animated.createAnimatedComponent(_FlatList.FlatList),
+  Image: _reactNative.Animated.createAnimatedComponent(_Image.Image),
+  ScrollView: _reactNative.Animated.createAnimatedComponent(_ScrollView.ScrollView),
+  SectionList: _reactNative.Animated.createAnimatedComponent(_SectionList.SectionList)
+};
+//# sourceMappingURL=Animated.js.map

package/lib/commonjs/components/native/Animated.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_reactNative","require","_View","_Text","_FlatList","_Image","_ScrollView","_SectionList","Animated","exports","RNAnimated","View","createAnimatedComponent","Text","FlatList","Image","ScrollView","SectionList"],"sourceRoot":"../../../../src","sources":["components/native/Animated.tsx"],"mappings":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AACA,IAAAC,KAAA,GAAAD,OAAA;AACA,IAAAE,KAAA,GAAAF,OAAA;AACA,IAAAG,SAAA,GAAAH,OAAA;AACA,IAAAI,MAAA,GAAAJ,OAAA;AACA,IAAAK,WAAA,GAAAL,OAAA;AACA,IAAAM,YAAA,GAAAN,OAAA;AAEO,MAAMO,QAAQ,GAAAC,OAAA,CAAAD,QAAA,GAAG;EACpB,GAAGE,qBAAU;EACbC,IAAI,EAAED,qBAAU,CAACE,uBAAuB,CAACD,UAAI,CAAC;EAC9CE,IAAI,EAAEH,qBAAU,CAACE,uBAAuB,CAACC,UAAI,CAAC;EAC9CC,QAAQ,EAAEJ,qBAAU,CAACE,uBAAuB,CAACE,kBAAQ,CAAC;EACtDC,KAAK,EAAEL,qBAAU,CAACE,uBAAuB,CAACG,YAAK,CAAC;EAChDC,UAAU,EAAEN,qBAAU,CAACE,uBAAuB,CAACI,sBAAU,CAAC;EAC1DC,WAAW,EAAEP,qBAAU,CAACE,uBAAuB,CAACK,wBAAW;AAC/D,CAAC","ignoreList":[]}

package/lib/commonjs/components/native/ImageBackground.js

@@ -9,10 +9,11 @@ var _reactNative = require("react-native");
 var _core = require("../../core");
 var _utils = require("../../web/utils");
 var _web = require("../../web");
+var _utils2 = require("../../utils");
 var _jsxRuntime = require("react/jsx-runtime");
 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); }
 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; }
-const ImageBackground = exports.ImageBackground = /*#__PURE__*/(0, _react.forwardRef)((props, forwardedRef) => {
+const UnistylesImageBackground = /*#__PURE__*/(0, _react.forwardRef)((props, forwardedRef) => {
   let storedRef = null;
   let storedImageRef = null;
   const styleClassNames = (0, _core.getClassName)(props.style);
@@ -51,4 +52,5 @@ const ImageBackground = exports.ImageBackground = /*#__PURE__*/(0, _react.forwar
     })
   );
 });
+const ImageBackground = exports.ImageBackground = (0, _utils2.copyComponentProperties)(_reactNative.ImageBackground, UnistylesImageBackground);
 //# sourceMappingURL=ImageBackground.js.map

package/lib/commonjs/components/native/ImageBackground.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","_interopRequireWildcard","require","_reactNative","_core","_utils","_web","_jsxRuntime","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","ImageBackground","exports","forwardRef","props","forwardedRef","storedRef","storedImageRef","styleClassNames","getClassName","style","imageClassNames","imageStyle","jsx","ref","isServer","undefined","UnistylesShadowRegistry","remove","hash","add","current","imageRef"],"sourceRoot":"../../../../src","sources":["components/native/ImageBackground.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","_interopRequireWildcard","require","_reactNative","_core","_utils","_web","_utils2","_jsxRuntime","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","UnistylesImageBackground","forwardRef","props","forwardedRef","storedRef","storedImageRef","styleClassNames","getClassName","style","imageClassNames","imageStyle","jsx","ImageBackground","ref","isServer","undefined","UnistylesShadowRegistry","remove","hash","add","current","imageRef","exports","copyComponentProperties","NativeImageBackground"],"sourceRoot":"../../../../src","sources":["components/native/ImageBackground.tsx"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/components/native/NativeText.js

@@ -0,0 +1,13 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "Text", {
+  enumerable: true,
+  get: function () {
+    return _Text.Text;
+  }
+});
+var _Text = require("./Text");
+//# sourceMappingURL=NativeText.js.map

package/lib/commonjs/components/native/NativeText.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_Text","require"],"sourceRoot":"../../../../src","sources":["components/native/NativeText.tsx"],"mappings":";;;;;;;;;;;AAAA,IAAAA,KAAA,GAAAC,OAAA","ignoreList":[]}

package/lib/commonjs/components/native/NativeText.native.js

@@ -0,0 +1,18 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.NativeText = void 0;
+var _react = require("react");
+var _core = require("../../core");
+// credits to @hirbod
+const LeanText = /*#__PURE__*/(0, _react.forwardRef)((props, ref) => {
+  return /*#__PURE__*/(0, _react.createElement)('RCTText', {
+    ...props,
+    ref
+  });
+});
+LeanText.displayName = 'RCTText';
+const NativeText = exports.NativeText = (0, _core.createUnistylesElement)(LeanText);
+//# sourceMappingURL=NativeText.native.js.map

package/lib/commonjs/components/native/NativeText.native.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_react","require","_core","LeanText","forwardRef","props","ref","createElement","displayName","NativeText","exports","createUnistylesElement"],"sourceRoot":"../../../../src","sources":["components/native/NativeText.native.tsx"],"mappings":";;;;;;AACA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,KAAA,GAAAD,OAAA;AAEA;AACA,MAAME,QAAQ,gBAAG,IAAAC,iBAAU,EAAC,CAACC,KAAK,EAAEC,GAAG,KAAK;EACxC,oBAAO,IAAAC,oBAAa,EAAC,SAAS,EAAE;IAAE,GAAGF,KAAK;IAAEC;EAAI,CAAC,CAAC;AACtD,CAAC,CAA6B;AAE9BH,QAAQ,CAACK,WAAW,GAAG,SAAS;AAEzB,MAAMC,UAAU,GAAAC,OAAA,CAAAD,UAAA,GAAG,IAAAE,4BAAsB,EAACR,QAAQ,CAAC","ignoreList":[]}

package/lib/commonjs/components/native/NativeView.js

@@ -0,0 +1,9 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _View = require("./View");
+var _default = exports.default = _View.View;
+//# sourceMappingURL=NativeView.js.map

package/lib/commonjs/components/native/NativeView.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_View","require","_default","exports","default","View"],"sourceRoot":"../../../../src","sources":["components/native/NativeView.tsx"],"mappings":";;;;;;AAAA,IAAAA,KAAA,GAAAC,OAAA;AAA6B,IAAAC,QAAA,GAAAC,OAAA,CAAAC,OAAA,GAEdC,UAAI","ignoreList":[]}

package/lib/commonjs/components/native/NativeView.native.js

@@ -0,0 +1,20 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _react = require("react");
+var _core = require("../../core");
+// credits to @hirbod
+const LeanView = /*#__PURE__*/(0, _react.forwardRef)((props, ref) => {
+  return /*#__PURE__*/(0, _react.createElement)('RCTView', {
+    ...props,
+    ref
+  });
+});
+LeanView.displayName = 'RCTView';
+
+// this will match default export from react-native
+var _default = exports.default = (0, _core.createUnistylesElement)(LeanView);
+//# sourceMappingURL=NativeView.native.js.map

package/lib/commonjs/components/native/NativeView.native.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_react","require","_core","LeanView","forwardRef","props","ref","createElement","displayName","_default","exports","default","createUnistylesElement"],"sourceRoot":"../../../../src","sources":["components/native/NativeView.native.tsx"],"mappings":";;;;;;AACA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,KAAA,GAAAD,OAAA;AAEA;AACA,MAAME,QAAQ,gBAAG,IAAAC,iBAAU,EAAC,CAACC,KAAK,EAAEC,GAAG,KAAK;EACxC,oBAAO,IAAAC,oBAAa,EAAC,SAAS,EAAE;IAAE,GAAGF,KAAK;IAAEC;EAAI,CAAC,CAAC;AACtD,CAAC,CAA6B;AAE9BH,QAAQ,CAACK,WAAW,GAAG,SAAS;;AAEhC;AAAA,IAAAC,QAAA,GAAAC,OAAA,CAAAC,OAAA,GACe,IAAAC,4BAAsB,EAACT,QAAQ,CAAC","ignoreList":[]}

package/lib/commonjs/components/native/Pressable.native.js

@@ -11,13 +11,24 @@ var _core = require("../../core");
 var _jsxRuntime = require("react/jsx-runtime");
 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); }
 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; }
+const getStyles = (styleProps = {}) => {
+  const unistyleKey = Object.keys(styleProps).find(key => key.startsWith('unistyles-'));
+  if (!unistyleKey) {
+    return styleProps;
+  }
+  return {
+    // styles without C++ state
+    ...styleProps[unistyleKey].uni__getStyles(),
+    [unistyleKey]: styleProps[unistyleKey].uni__getStyles()
+  };
+};
 const Pressable = exports.Pressable = /*#__PURE__*/(0, _react.forwardRef)(({
   variants,
   style,
   ...props
 }, forwardedRef) => {
   const storedRef = (0, _react.useRef)();
-  (0, _react.useEffect)(() => {
+  (0, _react.useLayoutEffect)(() => {
     return () => {
       if (storedRef.current) {
         // @ts-expect-error - this is hidden from TS
@@ -32,7 +43,7 @@ const Pressable = exports.Pressable = /*#__PURE__*/(0, _react.forwardRef)(({
         pressed: false
       }) : style;
 
-      // @ts-expect-error web types are not compatible with RN styles
+      // @ts-expect-error - this is hidden from TS
       _specs.UnistylesShadowRegistry.add(ref, unistyles);
       if (ref) {
         storedRef.current = ref;
@@ -40,11 +51,13 @@ const Pressable = exports.Pressable = /*#__PURE__*/(0, _react.forwardRef)(({
       return (0, _core.passForwardedRef)(props, ref, forwardedRef);
     },
     style: state => {
-      const unistyles = typeof style === 'function' ? style(state) : style;
+      const unistyles = typeof style === 'function' ? style(state) : getStyles(style);
       if (!storedRef.current) {
         return unistyles;
       }
 
+      // @ts-expect-error - this is hidden from TS
+      _specs.UnistylesShadowRegistry.remove(storedRef.current);
       // @ts-expect-error - this is hidden from TS
       _specs.UnistylesShadowRegistry.add(storedRef.current, unistyles);
       return unistyles;