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

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,17 @@ 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>
+<a href="https://github.com/dacoto97">
+     <img src="https://avatars.githubusercontent.com/u/16915053?v=4" height="70px" width="70px" alt="dacoto97" />
 </a>
 
 ## Past sponsors
@@ -89,6 +101,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/CMakeLists.txt

@@ -23,7 +23,7 @@ include_directories(
     ../cxx/shadowTree
 )
 
-string(APPEND CMAKE_CXX_FLAGS "-DFOLLY_NO_CONFIG=1 -DFOLLY_CFG_NO_COROUTINES=1 -DFOLLY_MOBILE=1")
+string(APPEND CMAKE_CXX_FLAGS " -DFOLLY_NO_CONFIG=1 -DFOLLY_CFG_NO_COROUTINES=1 -DFOLLY_MOBILE=1")
 
 set_target_properties(unistyles PROPERTIES
     CXX_STANDARD 20

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

@@ -6,11 +6,13 @@ import android.os.Build
 import android.util.DisplayMetrics
 import android.view.View
 import android.view.WindowManager
+import androidx.annotation.Keep
 import androidx.core.text.TextUtilsCompat
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowCompat
 import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.WindowInsetsControllerCompat
+import com.facebook.proguard.annotations.DoNotStrip
 import com.facebook.react.bridge.LifecycleEventListener
 import com.facebook.react.bridge.ReactApplicationContext
 import com.margelo.nitro.unistyles.ColorScheme
@@ -22,6 +24,8 @@ import com.margelo.nitro.unistyles.UnistyleDependency
 import com.margelo.nitro.unistyles.UnistylesNativeMiniRuntime
 import java.util.Locale
 
+@Keep
+@DoNotStrip
 class NativePlatformAndroid(private val reactContext: ReactApplicationContext): HybridNativePlatformSpec(), LifecycleEventListener {
     private val _insets = NativePlatformInsets(reactContext, this::getMiniRuntime) { this.diffMiniRuntime() }
     private var _miniRuntime: UnistylesNativeMiniRuntime = buildMiniRuntime()
@@ -32,9 +36,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

@@ -5,9 +5,11 @@ import android.os.Build
 import android.view.View
 import android.view.Window
 import android.view.WindowManager
+import androidx.annotation.Keep
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsAnimationCompat
 import androidx.core.view.WindowInsetsCompat
+import com.facebook.proguard.annotations.DoNotStrip
 import com.facebook.react.bridge.ReactApplicationContext
 import com.margelo.nitro.unistyles.Insets
 import com.margelo.nitro.unistyles.UnistyleDependency
@@ -15,6 +17,8 @@ import com.margelo.nitro.unistyles.UnistylesNativeMiniRuntime
 
 typealias CxxImeListener = (miniRuntime: UnistylesNativeMiniRuntime) -> Unit
 
+@Keep
+@DoNotStrip
 class NativePlatformInsets(
     private val reactContext: ReactApplicationContext,
     private val getMiniRuntime: () -> UnistylesNativeMiniRuntime,
@@ -23,6 +27,21 @@ class NativePlatformInsets(
     private val _imeListeners: MutableList<CxxImeListener> = mutableListOf()
     private var _insets: Insets = Insets(0.0, 0.0, 0.0, 0.0, 0.0)
 
+    init {
+        // get initial insets
+        reactContext.currentActivity?.let { activity ->
+            val insets = ViewCompat.getRootWindowInsets(activity.window.decorView)
+
+            insets?.let { windowInsets ->
+                setInsets(windowInsets, activity.window, null, true)
+            }
+        }
+    }
+
+    fun onDestroy() {
+        this.removeImeListeners()
+    }
+
     fun getInsets(): Insets {
         val density = reactContext.resources.displayMetrics.density
 
@@ -35,7 +54,7 @@ class NativePlatformInsets(
         )
     }
 
-    fun setInsets(insetsCompat: WindowInsetsCompat, window: Window, animatedBottomInsets: Double?) {
+    fun setInsets(insetsCompat: WindowInsetsCompat, window: Window, animatedBottomInsets: Double?, skipUpdate: Boolean = false) {
         // below Android 11, we need to use window flags to detect status bar visibility
         val isStatusBarVisible = when(Build.VERSION.SDK_INT) {
             in 30..Int.MAX_VALUE -> {
@@ -82,6 +101,10 @@ class NativePlatformInsets(
             imeInsets
         )
 
+        if (skipUpdate) {
+            return
+        }
+
         diffMiniRuntime()
 
         if (shouldEmitImeEvent) {

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

@@ -6,12 +6,16 @@ import android.content.Intent
 import android.content.IntentFilter
 import android.os.Handler
 import android.os.Looper
+import androidx.annotation.Keep
+import com.facebook.proguard.annotations.DoNotStrip
 import com.facebook.react.bridge.ReactApplicationContext
 import com.margelo.nitro.unistyles.UnistyleDependency
 import com.margelo.nitro.unistyles.UnistylesNativeMiniRuntime
 
 typealias CxxDependencyListener = (dependencies: Array<UnistyleDependency>, miniRuntime: UnistylesNativeMiniRuntime) -> Unit
 
+@Keep
+@DoNotStrip
 class NativePlatformListener(
     private val reactContext: ReactApplicationContext,
     private val getMiniRuntime: () -> UnistylesNativeMiniRuntime,
@@ -31,7 +35,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

@@ -11,6 +11,7 @@ import com.facebook.react.turbomodule.core.interfaces.TurboModuleWithJSIBindings
 import com.facebook.react.uimanager.UIManagerHelper
 import com.facebook.react.uimanager.common.UIManagerType
 import com.margelo.nitro.unistyles.HybridNativePlatformSpec
+import com.margelo.nitro.unistyles.unistylesOnLoad.Companion.initializeNative
 
 @Suppress("KotlinJniMissingFunction")
 class UnistylesModule(reactContext: ReactApplicationContext): NativeTurboUnistylesSpec(reactContext), TurboModuleWithJSIBindings {
@@ -20,16 +21,16 @@ class UnistylesModule(reactContext: ReactApplicationContext): NativeTurboUnistyl
 
     companion object {
         const val NAME = NativeTurboUnistylesSpec.NAME
+
+        init {
+            initializeNative()
+        }
     }
 
     init {
         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/HashGenerator.cpp

@@ -17,7 +17,7 @@ std::string HashGenerator::generateHash(const std::string& input) {
     std::stringstream ss;
     ss << std::hex << std::setfill('0') << std::setw(8) << (combinedHash & 0xFFFFFFFF);
 
-    return "unistyles-" + ss.str();
+    return "unistyles_" + ss.str();
 }
 
 }

package/cxx/core/HostUnistyle.cpp

@@ -39,14 +39,40 @@ jsi::Value HostUnistyle::get(jsi::Runtime& rt, const jsi::PropNameID& propNameId
     auto& unistyle = this->_stylesheet->unistyles[propertyName];
 
     // check if Unistyles recomputed new style in the background
-    // ()when no node was mounted), if so we need to simply rebuild unistyle to get fresh data
+    // (when no node was mounted), if so we need to simply rebuild unistyle to get fresh data
     if (unistyle->isDirty) {
+        this->_cache.erase(propertyName);
+
         auto parser = parser::Parser(this->_unistylesRuntime);
 
         parser.rebuildUnistyle(rt, unistyle, this->_variants, std::nullopt);
     }
 
-    return valueFromUnistyle(rt, this->_unistylesRuntime, this->_stylesheet->unistyles[propertyName], this->_variants);
+    if (unistyle->type == UnistyleType::DynamicFunction) {
+        // for dynamic functions we will also bind "this"
+        auto styleFn = valueFromUnistyle(rt, this->_unistylesRuntime, unistyle, this->_variants);
+
+        // construct newThis
+        jsi::Object newThis = jsi::Object(rt);
+        newThis.setProperty(rt, helpers::STYLESHEET_VARIANTS.c_str(), helpers::variantsToValue(rt, this->_variants));
+
+        auto functionPrototype = rt.global()
+            .getPropertyAsObject(rt, "Function")
+            .getPropertyAsObject(rt, "prototype")
+            .getPropertyAsFunction(rt, "bind");
+
+        return functionPrototype.callWithThis(rt, styleFn.asObject(rt), newThis);
+    }
+
+    if (this->_cache.contains(propertyName)) {
+        return jsi::Value(rt, this->_cache[propertyName]);
+    }
+
+    auto style = valueFromUnistyle(rt, this->_unistylesRuntime, unistyle, this->_variants);
+
+    this->_cache.emplace(propertyName, jsi::Value(rt, style));
+
+    return style;
 }
 
 void HostUnistyle::set(jsi::Runtime& rt, const jsi::PropNameID& propNameId, const jsi::Value& value) {}
@@ -73,8 +99,6 @@ jsi::Function HostUnistyle::createAddVariantsProxyFunction(jsi::Runtime& rt) {
             }
         });
 
-        this->_variants = variants;
-
         auto style = std::make_shared<core::HostUnistyle>(this->_stylesheet, this->_unistylesRuntime, variants);
         auto styleHostObject = jsi::Object::createFromHostObject(rt, style);
 

package/cxx/core/HostUnistyle.h

@@ -22,6 +22,7 @@ private:
     Variants _variants;
     std::shared_ptr<StyleSheet> _stylesheet;
     std::shared_ptr<HybridUnistylesRuntime> _unistylesRuntime;
+    std::unordered_map<std::string, jsi::Value> _cache;
 };
 
 }

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/UnistyleWrapper.h

@@ -35,7 +35,7 @@ inline static Unistyle::Shared unistyleFromStaticStyleSheet(jsi::Runtime& rt, js
 
 inline static std::vector<std::string> getUnistylesHashKeys(jsi::Runtime& rt, jsi::Object& object) {
     std::vector<std::string> matchingKeys{};
-    const std::string prefix = "unistyles-";
+    const std::string prefix = "unistyles_";
 
     auto propertyNames = object.getPropertyNames(rt);
     size_t length = propertyNames.length(rt);
@@ -82,13 +82,13 @@ inline static std::vector<Unistyle::Shared> unistylesFromNonExistentNativeState(
 
 You likely altered unistyle hash key and we're not able to recover C++ state attached to this node.)");
     }
-    
+
     // someone merged unistyles, and will be warned in JS
     // the best we can do is to return first unistyle
     if (unistyles.size() > 1) {
         return {unistyles.at(0)};
     }
-    
+
     return unistyles;
 }
 
@@ -137,7 +137,7 @@ inline static jsi::Value objectFromUnistyle(jsi::Runtime& rt, std::shared_ptr<Hy
     auto parsedArguments = arguments.has_value()
         ? helpers::parseDynamicFunctionArguments(rt, arguments.value())
         : std::optional<std::vector<folly::dynamic>>{};
-    
+
     if (arguments.has_value()) {
         // this is required for HybridShadowRegistry::link
         helpers::defineHiddenProperty(rt, secrets, helpers::ARGUMENTS.c_str(), arguments.value());
@@ -148,7 +148,7 @@ inline static jsi::Value objectFromUnistyle(jsi::Runtime& rt, std::shared_ptr<Hy
 
     // this is required for withUnistyles
     helpers::defineHiddenProperty(rt, secrets, helpers::STYLE_DEPENDENCIES.c_str(), helpers::dependenciesToJSIArray(rt, unistyle->dependencies));
-    
+
     // this is required for withUnistyles
     auto hostFn = jsi::Function::createFromHostFunction(
         rt,
@@ -160,7 +160,7 @@ inline static jsi::Value objectFromUnistyle(jsi::Runtime& rt, std::shared_ptr<Hy
 
         return jsi::Value(rt, unistyle->parsedStyle.value()).asObject(rt);
     });
-    
+
     helpers::defineHiddenProperty(rt, secrets, helpers::GET_STYLES.c_str(), std::move(hostFn));
 
     obj.setProperty(rt, unistyleID, secrets);

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

@@ -18,7 +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),
+                helpers::HashGenerator::generateHash(styleKey + std::to_string(styleSheet->tag)),
                 UnistyleType::DynamicFunction,
                 styleKey,
                 styleValue,
@@ -29,7 +29,7 @@ void parser::Parser::buildUnistyles(jsi::Runtime& rt, std::shared_ptr<StyleSheet
         }
 
         styleSheet->unistyles[styleKey] = std::make_shared<Unistyle>(
-            helpers::HashGenerator::generateHash(styleKey),
+            helpers::HashGenerator::generateHash(styleKey + std::to_string(styleSheet->tag)),
             UnistyleType::Object,
             styleKey,
             styleValue,
@@ -361,7 +361,7 @@ void parser::Parser::rebuildUnistyle(jsi::Runtime& rt, Unistyle::Shared unistyle
         unistyleFn->unprocessedValue = std::move(functionResult);
         unistyleFn->parsedStyle = this->parseFirstLevel(rt, unistyleFn, variants);
     }
-    
+
     if (unistyle->isDirty) {
         unistyle->isDirty = false;
     }
@@ -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;
         }
@@ -524,7 +526,7 @@ jsi::Function parser::Parser::createDynamicFunctionProxy(jsi::Runtime& rt, Unist
 
             Variants variants = helpers::variantsToPairs(rt, rawVariants.asObject(rt));
 
-            unistyleFn->parsedStyle = this->parseFirstLevel(rt, unistyleFn, variants);
+            unistyleFn->parsedStyle = parser.parseFirstLevel(rt, unistyleFn, variants);
             unistyleFn->seal();
 
             // for compatibility purpose save last arguments to style instance. It will work ok, if user sees warning about multiple unistyles
@@ -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 {