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

package/cxx/hybridObjects/HybridStyleSheet.cpp

@@ -36,10 +36,7 @@ jsi::Value HybridStyleSheet::create(jsi::Runtime& rt, const jsi::Value &thisVal,
     parser.buildUnistyles(rt, registeredStyleSheet);
     parser.parseUnistyles(rt, registeredStyleSheet);
 
-    auto style = std::make_shared<core::HostStyle>(registeredStyleSheet, this->_unistylesRuntime);
-    auto styleHostObject = jsi::Object::createFromHostObject(rt, style);
-
-    return styleHostObject;
+    return core::toRNStyle(rt, registeredStyleSheet, this->_unistylesRuntime, {});
 }
 
 jsi::Value HybridStyleSheet::configure(jsi::Runtime &rt, const jsi::Value &thisVal, const jsi::Value *arguments, size_t count) {
@@ -80,6 +77,10 @@ jsi::Value HybridStyleSheet::configure(jsi::Runtime &rt, const jsi::Value &thisV
 }
 
 jsi::Value HybridStyleSheet::init(jsi::Runtime &rt, const jsi::Value &thisVal, const jsi::Value *arguments, size_t count) {
+    if (this->isInitialized) {
+        return jsi::Value::undefined();
+    }
+    
     // create new state
     auto& registry = core::UnistylesRegistry::get();
 
@@ -87,6 +88,8 @@ jsi::Value HybridStyleSheet::init(jsi::Runtime &rt, const jsi::Value &thisVal, c
 
     loadExternalMethods(thisVal, rt);
     registerHooks(rt);
+    
+    this->isInitialized = true;
 
     return jsi::Value::undefined();
 }
@@ -121,6 +124,24 @@ void HybridStyleSheet::parseSettings(jsi::Runtime &rt, jsi::Object settings) {
             return;
         }
 
+        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) + "'");
     });
 }
@@ -135,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) {
@@ -250,8 +277,6 @@ void HybridStyleSheet::onPlatformDependenciesChange(std::vector<UnistyleDependen
 
     if (dependencyMap.empty()) {
         this->notifyJSListeners(dependencies);
-
-        return;
     }
 
     // in a later step, we will rebuild only Unistyles with mounted StyleSheets
@@ -260,6 +285,13 @@ void HybridStyleSheet::onPlatformDependenciesChange(std::vector<UnistyleDependen
     auto dependentStyleSheets = registry.getStyleSheetsToRefresh(rt, dependencies);
 
     parser.rebuildUnistylesInDependencyMap(rt, dependencyMap, dependentStyleSheets, std::nullopt);
+
+    // we need to stop here if there is nothing to update at the moment,
+    // but we need to compute dependentStyleSheets
+    if (dependencyMap.empty()) {
+        return;
+    }
+
     parser.rebuildShadowLeafUpdates(rt, dependencyMap);
 
     this->notifyJSListeners(dependencies);
@@ -281,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)
@@ -296,8 +333,6 @@ void HybridStyleSheet::onPlatformNativeDependenciesChange(std::vector<UnistyleDe
 
         if (dependencyMap.empty()) {
             this->notifyJSListeners(unistyleDependencies);
-
-            return;
         }
 
         // in a later step, we will rebuild only Unistyles with mounted StyleSheets
@@ -306,6 +341,13 @@ void HybridStyleSheet::onPlatformNativeDependenciesChange(std::vector<UnistyleDe
         auto dependentStyleSheets = registry.getStyleSheetsToRefresh(rt, unistyleDependencies);
 
         parser.rebuildUnistylesInDependencyMap(rt, dependencyMap, dependentStyleSheets, miniRuntime);
+
+        // we need to stop here if there is nothing to update at the moment,
+        // but we need to compute dependentStyleSheets
+        if (dependencyMap.empty()) {
+            return;
+        }
+
         parser.rebuildShadowLeafUpdates(rt, dependencyMap);
 
         this->notifyJSListeners(unistyleDependencies);

package/cxx/hybridObjects/HybridStyleSheet.h

@@ -4,7 +4,7 @@
 #include <jsi/jsi.h>
 #include "HybridUnistylesRuntime.h"
 #include "HybridUnistylesStyleSheetSpec.hpp"
-#include "HostStyle.h"
+#include "RNStyle.h"
 #include "Helpers.h"
 #include "Constants.h"
 #include "Breakpoints.h"
@@ -73,6 +73,7 @@ private:
     void onImeChange(UnistylesNativeMiniRuntime miniRuntime);
     void notifyJSListeners(std::vector<UnistyleDependency>& dependencies);
 
+    bool isInitialized = false;
     double __unid = -1;
     std::vector<std::unique_ptr<const std::function<void(std::vector<UnistyleDependency>&)>>> _changeListeners{};
     std::shared_ptr<HybridUnistylesRuntime> _unistylesRuntime;

package/cxx/hybridObjects/HybridUnistylesRuntime.cpp

@@ -4,7 +4,7 @@
 using namespace margelo::nitro::unistyles;
 
 ColorScheme HybridUnistylesRuntime::getColorScheme() {
-    auto colorScheme = this->_nativePlatform.getColorScheme();
+    auto colorScheme = this->_nativePlatform->getColorScheme();
 
     return static_cast<ColorScheme>(colorScheme);
 }
@@ -16,7 +16,7 @@ bool HybridUnistylesRuntime::getHasAdaptiveThemes() {
 };
 
 Dimensions HybridUnistylesRuntime::getScreen() {
-    return this->_nativePlatform.getScreenDimensions();
+    return this->_nativePlatform->getScreenDimensions();
 };
 
 std::optional<std::string> HybridUnistylesRuntime::getThemeName() {
@@ -26,7 +26,7 @@ std::optional<std::string> HybridUnistylesRuntime::getThemeName() {
 };
 
 std::string HybridUnistylesRuntime::getContentSizeCategory() {
-    return this->_nativePlatform.getContentSizeCategory();
+    return this->_nativePlatform->getContentSizeCategory();
 };
 
 std::optional<std::string> HybridUnistylesRuntime::getBreakpoint() {
@@ -36,25 +36,25 @@ std::optional<std::string> HybridUnistylesRuntime::getBreakpoint() {
 };
 
 bool HybridUnistylesRuntime::getRtl() {
-    return this->_nativePlatform.getPrefersRtlDirection();
+    return this->_nativePlatform->getPrefersRtlDirection();
 }
 
 Insets HybridUnistylesRuntime::getInsets() {
-    return this->_nativePlatform.getInsets();
+    return this->_nativePlatform->getInsets();
 };
 
 Orientation HybridUnistylesRuntime::getOrientation() {
-    auto orientation = this->_nativePlatform.getOrientation();
+    auto orientation = this->_nativePlatform->getOrientation();
 
     return static_cast<Orientation>(orientation);
 };
 
 double HybridUnistylesRuntime::getPixelRatio() {
-    return this->_nativePlatform.getPixelRatio();
+    return this->_nativePlatform->getPixelRatio();
 };
 
 double HybridUnistylesRuntime::getFontScale() {
-    return this->_nativePlatform.getFontScale();
+    return this->_nativePlatform->getFontScale();
 };
 
 std::unordered_map<std::string, double> HybridUnistylesRuntime::getBreakpoints() {
@@ -133,7 +133,7 @@ jsi::Value HybridUnistylesRuntime::getTheme(jsi::Runtime &rt, const jsi::Value &
         if (args[0].isUndefined()) {
             return state.getCurrentJSTheme();
         }
-        
+
         helpers::assertThat(rt, args[0].isString(), "UnistylesRuntime.getTheme expected to be called with string.");
 
         auto themeName = args[0].asString(rt).utf8(rt);
@@ -164,11 +164,11 @@ jsi::Value HybridUnistylesRuntime::updateTheme(jsi::Runtime &rt, const jsi::Valu
 }
 
 void HybridUnistylesRuntime::setImmersiveMode(bool isEnabled) {
-    this->_nativePlatform.setImmersiveMode(isEnabled);
+    this->_nativePlatform->setImmersiveMode(isEnabled);
 };
 
 void HybridUnistylesRuntime::setRootViewBackgroundColor(double color) {
-    this->_nativePlatform.setRootViewBackgroundColor(color);
+    this->_nativePlatform->setRootViewBackgroundColor(color);
 }
 
 jsi::Value HybridUnistylesRuntime::createHybridStatusBar(jsi::Runtime &rt, const jsi::Value &thisValue, const jsi::Value *args, size_t count) {
@@ -188,7 +188,7 @@ jsi::Value HybridUnistylesRuntime::createHybridNavigationBar(jsi::Runtime &rt, c
 }
 
 UnistylesCxxMiniRuntime HybridUnistylesRuntime::getMiniRuntime() {
-    UnistylesNativeMiniRuntime nativeMiniRuntime = this->_nativePlatform.getMiniRuntime();
+    UnistylesNativeMiniRuntime nativeMiniRuntime = this->_nativePlatform->getMiniRuntime();
     UnistylesCxxMiniRuntime cxxMiniRuntime{
         this->getThemeName(),
         this->getBreakpoint(),
@@ -260,16 +260,16 @@ void HybridUnistylesRuntime::registerPlatformListener(const std::function<void (
 }
 
 void HybridUnistylesRuntime::registerNativePlatformListener(const std::function<void(std::vector<UnistyleDependency>, UnistylesNativeMiniRuntime)>& listener) {
-    this->_nativePlatform.registerPlatformListener(listener);
+    this->_nativePlatform->registerPlatformListener(listener);
     this->_onNativeDependenciesChange = listener;
 }
 
 void HybridUnistylesRuntime::registerImeListener(const std::function<void(UnistylesNativeMiniRuntime)>& listener) {
-    this->_nativePlatform.registerImeListener(listener);
+    this->_nativePlatform->registerImeListener(listener);
 }
 
 void HybridUnistylesRuntime::unregisterNativePlatformListeners() {
-    this->_nativePlatform.unregisterPlatformListeners();
+    this->_nativePlatform->unregisterPlatformListeners();
 }
 
 void HybridUnistylesRuntime::includeDependenciesForColorSchemeChange(std::vector<UnistyleDependency>& deps) {

package/cxx/hybridObjects/HybridUnistylesRuntime.h

@@ -13,7 +13,7 @@
 namespace margelo::nitro::unistyles {
 
 struct HybridUnistylesRuntime: public HybridUnistylesRuntimeSpec {
-    HybridUnistylesRuntime(Unistyles::HybridNativePlatformSpecCxx nativePlatform, jsi::Runtime& rt, std::function<void(std::function<void(jsi::Runtime&)>&&)> runOnJSThread)
+    HybridUnistylesRuntime(std::shared_ptr<HybridNativePlatformSpec> nativePlatform, jsi::Runtime& rt, std::function<void(std::function<void(jsi::Runtime&)>&&)> runOnJSThread)
         : HybridObject(TAG), _nativePlatform{nativePlatform}, _rt{&rt}, runOnJSThread(std::move(runOnJSThread)) {}
 
     jsi::Value getTheme(jsi::Runtime& rt,
@@ -78,7 +78,7 @@ private:
     jsi::Runtime* _rt;
     std::shared_ptr<HybridNavigationBar> _navigationBar;
     std::shared_ptr<HybridStatusBar> _statusBar;
-    Unistyles::HybridNativePlatformSpecCxx _nativePlatform;
+    std::shared_ptr<HybridNativePlatformSpec> _nativePlatform;
     std::function<void(std::vector<UnistyleDependency>)> _onDependenciesChange;
     std::function<void(std::vector<UnistyleDependency>, UnistylesNativeMiniRuntime)> _onNativeDependenciesChange;
 };

package/cxx/parser/Parser.cpp

@@ -18,6 +18,7 @@ void parser::Parser::buildUnistyles(jsi::Runtime& rt, std::shared_ptr<StyleSheet
 
         if (styleValue.isFunction(rt)) {
             styleSheet->unistyles[styleKey] = std::make_shared<UnistyleDynamicFunction>(
+                helpers::HashGenerator::generateHash(styleKey),
                 UnistyleType::DynamicFunction,
                 styleKey,
                 styleValue,
@@ -28,6 +29,7 @@ void parser::Parser::buildUnistyles(jsi::Runtime& rt, std::shared_ptr<StyleSheet
         }
 
         styleSheet->unistyles[styleKey] = std::make_shared<Unistyle>(
+            helpers::HashGenerator::generateHash(styleKey),
             UnistyleType::Object,
             styleKey,
             styleValue,
@@ -301,7 +303,7 @@ void parser::Parser::rebuildUnistylesInDependencyMap(jsi::Runtime& rt, Dependenc
                 );
             } else {
                 unistyle->rawValue = parsedStyleSheetsWithDefaultTheme[unistyleStyleSheet].asObject(rt).getProperty(rt, unistyle->styleKey.c_str()).asObject(rt);
-                this->rebuildUnistyle(rt, unistyleStyleSheet, unistyle, unistyleData->variants, unistyleData->dynamicFunctionMetadata);
+                this->rebuildUnistyle(rt, unistyle, unistyleData->variants, unistyleData->dynamicFunctionMetadata);
                 unistyleData->parsedStyle = jsi::Value(rt, unistyle->parsedStyle.value()).asObject(rt);
             }
 
@@ -317,13 +319,14 @@ void parser::Parser::rebuildUnistylesInDependencyMap(jsi::Runtime& rt, Dependenc
         for (auto& [_, unistyle] : styleSheet->unistyles) {
             if (!parsedUnistyles.contains(unistyle)) {
                 unistyle->rawValue = parsedStyleSheetsWithDefaultTheme[styleSheet].asObject(rt).getProperty(rt, unistyle->styleKey.c_str()).asObject(rt);
+                unistyle->isDirty = true;
             }
         }
     }
 }
 
 // rebuild single unistyle
-void parser::Parser::rebuildUnistyle(jsi::Runtime& rt, std::shared_ptr<StyleSheet> styleSheet, Unistyle::Shared unistyle, const Variants& variants, std::optional<std::vector<folly::dynamic>> metadata) {
+void parser::Parser::rebuildUnistyle(jsi::Runtime& rt, Unistyle::Shared unistyle, const Variants& variants, std::optional<std::vector<folly::dynamic>> metadata) {
     if (unistyle->type == core::UnistyleType::Object) {
         auto result = this->parseFirstLevel(rt, unistyle, variants);
 
@@ -358,6 +361,10 @@ void parser::Parser::rebuildUnistyle(jsi::Runtime& rt, std::shared_ptr<StyleShee
         unistyleFn->unprocessedValue = std::move(functionResult);
         unistyleFn->parsedStyle = this->parseFirstLevel(rt, unistyleFn, variants);
     }
+    
+    if (unistyle->isDirty) {
+        unistyle->isDirty = false;
+    }
 }
 
 // convert dependency map to shadow tree updates
@@ -392,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;
         }
@@ -508,36 +517,22 @@ jsi::Function parser::Parser::createDynamicFunctionProxy(jsi::Runtime& rt, Unist
 
             // memoize metadata to call it later
             auto unistyleFn = std::dynamic_pointer_cast<UnistyleDynamicFunction>(unistyle);
-            auto& registry = core::UnistylesRegistry::get();
 
             unistyleFn->unprocessedValue = jsi::Value(rt, result).asObject(rt);
 
-            jsi::Value rawVariants = thisObject.hasProperty(rt, helpers::STYLE_VARIANTS.c_str())
-                ? thisObject.getProperty(rt, helpers::STYLE_VARIANTS.c_str())
-                : jsi::Value::undefined();
-            std::optional<Variants> variants = rawVariants.isUndefined()
-                ? registry.getScopedVariants()
-                : std::optional<Variants>(helpers::variantsToPairs(rt, rawVariants.asObject(rt)));
+            jsi::Value rawVariants = thisObject.hasProperty(rt, helpers::STYLESHEET_VARIANTS.c_str())
+                ? thisObject.getProperty(rt, helpers::STYLESHEET_VARIANTS.c_str())
+                : jsi::Object(rt);
+
+            Variants variants = helpers::variantsToPairs(rt, rawVariants.asObject(rt));
 
             unistyleFn->parsedStyle = this->parseFirstLevel(rt, unistyleFn, variants);
             unistyleFn->seal();
 
-            jsi::Object style = jsi::Value(rt, unistyleFn->parsedStyle.value()).asObject(rt);
-
-            // include dependencies for createUnistylesComponent
-            style.setProperty(rt, "__proto__", generateUnistylesPrototype(rt, unistylesRuntime, unistyle, variants, helpers::functionArgumentsToArray(rt, args, count)));
-
-            jsi::Object secrets = jsi::Object(rt);
-
-            secrets.setProperty(rt, helpers::ARGUMENTS.c_str(), helpers::functionArgumentsToArray(rt, args, count));
-
-            helpers::defineHiddenProperty(rt, style, helpers::SECRETS.c_str(), secrets);
-
-            auto wrappedUnistyle = std::make_shared<UnistyleWrapper>(unistyle);
-
-            style.setNativeState(rt, std::move(wrappedUnistyle));
+            // for compatibility purpose save last arguments to style instance. It will work ok, if user sees warning about multiple unistyles
+            helpers::defineHiddenProperty(rt, thisObject, helpers::ARGUMENTS.c_str() + std::string("_") + unistyleFn->styleKey, helpers::functionArgumentsToArray(rt, args, count));
 
-            return style;
+            return core::objectFromUnistyle(rt, unistylesRuntime, unistyle, variants, std::make_optional<jsi::Array>(helpers::functionArgumentsToArray(rt, args, count))).asObject(rt);
     });
 }
 
@@ -658,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/cxx/parser/Parser.h

@@ -10,6 +10,7 @@
 #include "HybridUnistylesRuntime.h"
 #include "StyleSheet.h"
 #include "ShadowLeafUpdate.h"
+#include "HashGenerator.h"
 
 namespace margelo::nitro::unistyles::parser {
 
@@ -27,7 +28,7 @@ struct Parser {
     void rebuildUnistylesInDependencyMap(jsi::Runtime& rt, core::DependencyMap& dependencyMap, std::vector<std::shared_ptr<core::StyleSheet>>& styleSheets, std::optional<UnistylesNativeMiniRuntime> maybeMiniRuntime);
     void rebuildShadowLeafUpdates(jsi::Runtime& rt, core::DependencyMap& dependencyMap);
     folly::dynamic parseStylesToShadowTreeStyles(jsi::Runtime& rt, const std::vector<std::shared_ptr<UnistyleData>>& unistyles);
-    void rebuildUnistyle(jsi::Runtime& rt, std::shared_ptr<StyleSheet> styleSheet, Unistyle::Shared unistyle, const Variants& variants, std::optional<std::vector<folly::dynamic>>);
+    void rebuildUnistyle(jsi::Runtime& rt, Unistyle::Shared unistyle, const Variants& variants, std::optional<std::vector<folly::dynamic>>);
     void rebuildUnistyleWithScopedTheme(jsi::Runtime& rt, jsi::Value& jsScopedTheme, std::shared_ptr<core::UnistyleData> unistyleData);
     jsi::Value getParsedStyleSheetForScopedTheme(jsi::Runtime& rt, core::Unistyle::Shared unistyle, std::string& scopedTheme);
 

package/ios/NativePlatform+ios.swift

@@ -14,12 +14,10 @@ class NativeIOSPlatform: HybridNativePlatformSpec {
 
     var dependencyListeners: Array<CxxDependencyListener> = []
     var imeListeners: Array<CxxImeListener> = []
-    var hybridContext = margelo.nitro.HybridContext()
-    var memorySize: Int {
-        return getSizeOf(self)
-    }
 
-    init() {
+    override init() {
+        super.init()
+        
         self.miniRuntime = self.buildMiniRuntime()
 
         setupPlatformListeners()
@@ -116,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)
             }
@@ -139,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 {
@@ -187,7 +191,7 @@ class NativeIOSPlatform: HybridNativePlatformSpec {
             return getContentSizeCategoryFn()
         }
     }
-    
+
     func getMainWindow() -> UIWindow? {
         guard let mainWindow = UIApplication.shared.connectedScenes
             .compactMap({ $0 as? UIWindowScene })
@@ -195,7 +199,7 @@ class NativeIOSPlatform: HybridNativePlatformSpec {
             .first(where: { $0.isKeyWindow }) else {
             return nil
         }
-        
+
         return mainWindow
     }
 
@@ -270,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
@@ -299,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/NativePlatform.swift

@@ -5,13 +5,13 @@ enum PlatformError: Error {
 }
 
 public class NativePlatform {
-    public static func create() -> HybridNativePlatformSpecCxx {
+    public static func create() -> HybridNativePlatformSpec_cxx {
         #if os(iOS)
         let nativePlatform = NativeIOSPlatform()
         #else
         throw PlatformError.UnsupportedPlatform
         #endif
 
-        return HybridNativePlatformSpecCxx(nativePlatform)
+        return HybridNativePlatformSpec_cxx(nativePlatform);
     }
 }

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,14 +36,11 @@ __weak RCTSurfacePresenter* _surfacePresenter;
 }
 
 - (void)createHybrids:(jsi::Runtime&)rt {
-    auto runOnJSThread = ([executor = _runtimeExecutor](std::function<void(jsi::Runtime& rt)> &&callback) {
-        __block auto objcCallback = callback;
+    auto runOnJSThread = [callInvoker = _callInvoker.callInvoker](std::function<void(jsi::Runtime& rt)> &&callback){
+        callInvoker->invokeAsync(std::move(callback));
+    };
 
-        [executor execute:^(jsi::Runtime& rt){
-            objcCallback(rt);
-        }];
-    });
-    auto nativePlatform = Unistyles::NativePlatform::create();
+    auto nativePlatform = Unistyles::NativePlatform::create().getCxxPart();
     auto unistylesRuntime = std::make_shared<HybridUnistylesRuntime>(nativePlatform, rt, runOnJSThread);
     auto uiManager = [_surfacePresenter scheduler].uiManager;
     auto styleSheet = std::make_shared<HybridStyleSheet>(unistylesRuntime, uiManager);

package/lib/commonjs/components/ScopedTheme.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","_interopRequireWildcard","require","_specs","_jsxRuntime","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","Apply","name","UnistylesShadowRegistry","setScopedTheme","useLayoutEffect","ScopedTheme","children","previousScopedTheme","getScopedTheme","mappedChildren","jsx","Fragment","exports"],"sourceRoot":"../../../src","sources":["components/ScopedTheme.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,uBAAA,CAAAC,OAAA;AAEA,IAAAC,MAAA,GAAAD,OAAA;AAAkD,IAAAE,WAAA,GAAAF,OAAA;AAAA,SAAAG,yBAAAC,CAAA,6BAAAC,OAAA,mBAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,CAAA,WAAAA,CAAA,GAAAG,CAAA,GAAAD,CAAA,KAAAF,CAAA;AAAA,SAAAL,wBAAAK,CAAA,EAAAE,CAAA,SAAAA,CAAA,IAAAF,CAAA,IAAAA,CAAA,CAAAI,UAAA,SAAAJ,CAAA,eAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,WAAAK,OAAA,EAAAL,CAAA,QAAAG,CAAA,GAAAJ,wBAAA,CAAAG,CAAA,OAAAC,CAAA,IAAAA,CAAA,CAAAG,GAAA,CAAAN,CAAA,UAAAG,CAAA,CAAAI,GAAA,CAAAP,CAAA,OAAAQ,CAAA,KAAAC,SAAA,UAAAC,CAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,CAAA,IAAAd,CAAA,oBAAAc,CAAA,OAAAC,cAAA,CAAAC,IAAA,CAAAhB,CAAA,EAAAc,CAAA,SAAAG,CAAA,GAAAP,CAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAb,CAAA,EAAAc,CAAA,UAAAG,CAAA,KAAAA,CAAA,CAAAV,GAAA,IAAAU,CAAA,CAAAC,GAAA,IAAAP,MAAA,CAAAC,cAAA,CAAAJ,CAAA,EAAAM,CAAA,EAAAG,CAAA,IAAAT,CAAA,CAAAM,CAAA,IAAAd,CAAA,CAAAc,CAAA,YAAAN,CAAA,CAAAH,OAAA,GAAAL,CAAA,EAAAG,CAAA,IAAAA,CAAA,CAAAe,GAAA,CAAAlB,CAAA,EAAAQ,CAAA,GAAAA,CAAA;AAMlD,MAAMW,KAAK,GAAGA,CAAC;EAAEC;AAAuC,CAAC,KAAK;EAC1DC,8BAAuB,CAACC,cAAc,CAACF,IAAI,CAAC;EAE5C,IAAAG,sBAAe,EAAC,MAAM;IAClBF,8BAAuB,CAACC,cAAc,CAACF,IAAI,CAAC;EAChD,CAAC,CAAC;EAEF,OAAO,IAAI;AACf,CAAC;AAEM,MAAMI,WAAyE,GAAGA,CAAC;EAAEJ,IAAI;EAAEK;AAAS,CAAC,KAAK;EAC7G,MAAMC,mBAAmB,GAAGL,8BAAuB,CAACM,cAAc,CAAC,CAAC;EACpE,MAAMC,cAAc,GAAG,cACnB,IAAA9B,WAAA,CAAA+B,GAAA,EAACV,KAAK;IAAYC,IAAI,EAAEA;EAAK,GAAjBA,IAAmB,CAAC,EAChCK,QAAQ,eACR,IAAA3B,WAAA,CAAA+B,GAAA,EAACV,KAAK;IAAeC,IAAI,EAAEM;EAAoB,GAApC,SAAsC,CAAC,CACrD;EAED,oBACI,IAAA5B,WAAA,CAAA+B,GAAA,EAACnC,MAAA,CAAAW,OAAK,CAACyB,QAAQ;IAAAL,QAAA,EACVG;EAAc,CACH,CAAC;AAEzB,CAAC;AAAAG,OAAA,CAAAP,WAAA,GAAAA,WAAA","ignoreList":[]}
+{"version":3,"names":["_react","_interopRequireWildcard","require","_specs","_jsxRuntime","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","Apply","name","UnistylesShadowRegistry","setScopedTheme","useLayoutEffect","ScopedTheme","children","previousScopedTheme","getScopedTheme","mappedChildren","jsx","Fragment","exports"],"sourceRoot":"../../../src","sources":["components/ScopedTheme.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,uBAAA,CAAAC,OAAA;AAEA,IAAAC,MAAA,GAAAD,OAAA;AAAkD,IAAAE,WAAA,GAAAF,OAAA;AAAA,SAAAG,yBAAAC,CAAA,6BAAAC,OAAA,mBAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,CAAA,WAAAA,CAAA,GAAAG,CAAA,GAAAD,CAAA,KAAAF,CAAA;AAAA,SAAAL,wBAAAK,CAAA,EAAAE,CAAA,SAAAA,CAAA,IAAAF,CAAA,IAAAA,CAAA,CAAAI,UAAA,SAAAJ,CAAA,eAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,WAAAK,OAAA,EAAAL,CAAA,QAAAG,CAAA,GAAAJ,wBAAA,CAAAG,CAAA,OAAAC,CAAA,IAAAA,CAAA,CAAAG,GAAA,CAAAN,CAAA,UAAAG,CAAA,CAAAI,GAAA,CAAAP,CAAA,OAAAQ,CAAA,KAAAC,SAAA,UAAAC,CAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,CAAA,IAAAd,CAAA,oBAAAc,CAAA,OAAAC,cAAA,CAAAC,IAAA,CAAAhB,CAAA,EAAAc,CAAA,SAAAG,CAAA,GAAAP,CAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAb,CAAA,EAAAc,CAAA,UAAAG,CAAA,KAAAA,CAAA,CAAAV,GAAA,IAAAU,CAAA,CAAAC,GAAA,IAAAP,MAAA,CAAAC,cAAA,CAAAJ,CAAA,EAAAM,CAAA,EAAAG,CAAA,IAAAT,CAAA,CAAAM,CAAA,IAAAd,CAAA,CAAAc,CAAA,YAAAN,CAAA,CAAAH,OAAA,GAAAL,CAAA,EAAAG,CAAA,IAAAA,CAAA,CAAAe,GAAA,CAAAlB,CAAA,EAAAQ,CAAA,GAAAA,CAAA;AAMlD,MAAMW,KAAK,GAAGA,CAAC;EAAEC;AAAuC,CAAC,KAAK;EAC1DC,8BAAuB,CAACC,cAAc,CAACF,IAAI,CAAC;EAE5C,IAAAG,sBAAe,EAAC,MAAM;IAClBF,8BAAuB,CAACC,cAAc,CAACF,IAAI,CAAC;EAChD,CAAC,CAAC;EAEF,OAAO,IAAI;AACf,CAAC;AAEM,MAAMI,WAAyE,GAAGA,CAAC;EAAEJ,IAAI;EAAEK;AAAS,CAAC,KAAK;EAC7G,MAAMC,mBAAmB,GAAGL,8BAAuB,CAACM,cAAc,CAAC,CAAC;EACpE,MAAMC,cAAc,GAAG,cACnB,IAAA9B,WAAA,CAAA+B,GAAA,EAACV,KAAK;IAAYC,IAAI,EAAEA;EAAK,GAAjBA,IAAmB,CAAC,EAChCK,QAAQ,eACR,IAAA3B,WAAA,CAAA+B,GAAA,EAACV,KAAK;IAAeC,IAAI,EAAEM;EAAyD,GAAzE,SAA2E,CAAC,CAC1F;EAED,oBACI,IAAA5B,WAAA,CAAA+B,GAAA,EAACnC,MAAA,CAAAW,OAAK,CAACyB,QAAQ;IAAAL,QAAA,EACVG;EAAc,CACH,CAAC;AAEzB,CAAC;AAAAG,OAAA,CAAAP,WAAA,GAAAA,WAAA","ignoreList":[]}

package/lib/commonjs/components/index.js

@@ -21,14 +21,7 @@ Object.defineProperty(exports, "ScopedTheme", {
     return _ScopedTheme.ScopedTheme;
   }
 });
-Object.defineProperty(exports, "Variants", {
-  enumerable: true,
-  get: function () {
-    return _Variants.Variants;
-  }
-});
 var _Hide = require("./Hide");
 var _Display = require("./Display");
-var _Variants = require("./Variants");
 var _ScopedTheme = require("./ScopedTheme");
 //# sourceMappingURL=index.js.map

package/lib/commonjs/components/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["_Hide","require","_Display","_Variants","_ScopedTheme"],"sourceRoot":"../../../src","sources":["components/index.ts"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,KAAA,GAAAC,OAAA;AACA,IAAAC,QAAA,GAAAD,OAAA;AACA,IAAAE,SAAA,GAAAF,OAAA;AACA,IAAAG,YAAA,GAAAH,OAAA","ignoreList":[]}
+{"version":3,"names":["_Hide","require","_Display","_ScopedTheme"],"sourceRoot":"../../../src","sources":["components/index.ts"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,KAAA,GAAAC,OAAA;AACA,IAAAC,QAAA,GAAAD,OAAA;AACA,IAAAE,YAAA,GAAAF,OAAA","ignoreList":[]}

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":[]}