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

package/README.md

@@ -18,6 +18,19 @@
 yarn add react-native-unistyles@beta
 ```
 
+Install dependencies:
+
+```shell
+yarn add react-native-edge-to-edge react-native-nitro-modules@0.22.1
+```
+
+> Always use fixed version of `react-native-nitro-modules` to avoid unexpected behaviors.
+
+| react-native-unistyles | react-native-nitro-modules |
+|------------------------|----------------------------|
+| 3.0.0.beta.7           | 0.22.1                     |
+| 3.0.0.nightly-20250226 | 0.24.1                     |
+
 Then follow [installation guides](https://unistyl.es/v3/start/getting-started) for your platform.
 
 ## [Documentation](https://unistyl.es/)
@@ -77,6 +90,9 @@ Then follow [installation guides](https://unistyl.es/v3/start/getting-started) f
 <a href="https://github.com/dacoto97">
      <img src="https://avatars.githubusercontent.com/u/16915053?v=4" height="70px" width="70px" alt="dacoto97" />
 </a>
+<a href="https://github.com/chinamcafee">
+     <img src="https://avatars.githubusercontent.com/u/3439961?v=4" height="70px" width="70px" alt="chinamcafee" />
+</a>
 
 ## Past sponsors
 

package/android/CMakeLists.txt

@@ -23,7 +23,8 @@ include_directories(
     ../cxx/shadowTree
 )
 
-string(APPEND CMAKE_CXX_FLAGS " -DFOLLY_NO_CONFIG=1 -DFOLLY_CFG_NO_COROUTINES=1 -DFOLLY_MOBILE=1")
+# Nitro appends all Folly Flags, leaving it empty
+string(APPEND CMAKE_CXX_FLAGS " ")
 
 set_target_properties(unistyles PROPERTIES
     CXX_STANDARD 20

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

@@ -24,6 +24,7 @@ class NativePlatformInsets(
     private val getMiniRuntime: () -> UnistylesNativeMiniRuntime,
     private val diffMiniRuntime: () -> Array<UnistyleDependency>
 ) {
+    private var _shouldListenToImeEvents = false
     private val _imeListeners: MutableList<CxxImeListener> = mutableListOf()
     private var _insets: Insets = Insets(0.0, 0.0, 0.0, 0.0, 0.0)
 
@@ -113,6 +114,8 @@ class NativePlatformInsets(
     }
 
     fun startInsetsListener() {
+        _shouldListenToImeEvents = true
+
         reactContext.currentActivity?.let { activity ->
             activity.findViewById<View>(android.R.id.content)?.let { mainView ->
                 ViewCompat.setOnApplyWindowInsetsListener(mainView) { _, insets ->
@@ -130,6 +133,10 @@ class NativePlatformInsets(
                                 insets: WindowInsetsCompat,
                                 runningAnimations: List<WindowInsetsAnimationCompat>
                             ): WindowInsetsCompat {
+                                if (!_shouldListenToImeEvents) {
+                                    return insets
+                                }
+
                                 runningAnimations.firstOrNull()?.let {
                                     val bottomInset = insets.getInsets(WindowInsetsCompat.Type.ime()).bottom.toDouble() - this@NativePlatformInsets._insets.bottom
                                     val nextBottomInset = if (bottomInset < 0) {
@@ -160,9 +167,10 @@ class NativePlatformInsets(
         reactContext.currentActivity?.let { activity ->
             activity.window?.decorView?.let { view ->
                 ViewCompat.setOnApplyWindowInsetsListener(view, null)
-                ViewCompat.setWindowInsetsAnimationCallback(view, null)
             }
         }
+
+        _shouldListenToImeEvents = false
     }
 
     fun addImeListener(listener: CxxImeListener) {

package/cxx/common/Helpers.h

@@ -225,4 +225,89 @@ inline static jsi::Array dependenciesToJSIArray(jsi::Runtime& rt, const std::vec
     return result;
 }
 
+inline void debugPrintJSIObject(jsi::Runtime& rt, std::string& name, jsi::Object& obj) {
+    auto console = rt.global().getPropertyAsObject(rt, "console");
+    auto log = console.getPropertyAsFunction(rt, "log");
+    auto parser = [&](const std::string& key, jsi::Value& value){
+        if (value.isBool()) {
+            std::string output = key + ": " + (value.getBool() ? "true" : "false");
+            log.call(rt, output);
+
+            return;
+        }
+
+        if (value.isNumber()) {
+            std::string output = key + ": " + std::to_string(value.getNumber());
+            log.call(rt, output);
+
+            return;
+        }
+
+        if (value.isString()) {
+            std::string output = key + ": " + value.getString(rt).utf8(rt);
+            log.call(rt, output);
+
+            return;
+        }
+
+        if (value.isUndefined()) {
+            std::string output = key + ": undefined";
+            log.call(rt, output);
+
+            return;
+        }
+
+        if (value.isNull()) {
+            std::string output = key + ": null";
+            log.call(rt, output);
+
+            return;
+        }
+    };
+
+    log.call(rt, "===" + name + "===");
+
+    enumerateJSIObject(rt, obj, [&](const std::string& key, jsi::Value& value){
+        if (value.isObject()) {
+            if (value.asObject(rt).isArray(rt)) {
+                iterateJSIArray(rt, value.asObject(rt).asArray(rt), [&](size_t i, jsi::Value& nestedValue){
+                    std::string printableKey = key + ": Array[" + std::to_string(i) + "]";
+
+                    log.call(rt, printableKey);
+
+                    if (nestedValue.isObject()) {
+                        enumerateJSIObject(rt, nestedValue.asObject(rt), [&](const std::string& nestedKey, jsi::Value& nestedValue){
+                            parser(nestedKey, nestedValue);
+                        });
+                    } else {
+                        parser(printableKey, nestedValue);
+                    }
+
+                    std::string endKey = key + ": Array[end]";
+
+                    log.call(rt, endKey);
+                });
+            }
+
+            if (value.asObject(rt).isFunction(rt)) {
+                std::string output = key + ": [Function]";
+
+                log.call(rt, output);
+
+                return;
+            }
+
+            enumerateJSIObject(rt, value.asObject(rt), [&](const std::string& nestedKey, jsi::Value& nestedValue){
+                parser(nestedKey, nestedValue);
+            });
+
+            return;
+        }
+
+        parser(key, value);
+    });
+
+    log.call(rt, "===/" + name + "===");
+}
+
 }

package/cxx/core/UnistylesCommitHook.cpp

@@ -29,21 +29,24 @@ RootShadowNode::Unshared core::UnistylesCommitHook::shadowTreeWillCommit(
     // this is React Native / Reanimated commit
     // merge Unistyles updates before it completes
     auto& registry = core::UnistylesRegistry::get();
-    auto& shadowLeafUpdates = registry.trafficController.getUpdates();
-
-    // oops, no updates from Unistyles yet, skip it!
-    if (shadowLeafUpdates.size() == 0) {
-        return newRootShadowNode;
-    }
-
-    auto affectedNodes = shadow::ShadowTreeManager::findAffectedNodes(*rootNode, shadowLeafUpdates);
-
-    registry.trafficController.stopUnistylesTraffic();
-
-    // we have few updates, so merge it
-    return std::static_pointer_cast<RootShadowNode>(shadow::ShadowTreeManager::cloneShadowTree(
-        *rootNode,
-        shadowLeafUpdates,
-        affectedNodes
-    ));
+    
+    return registry.trafficController.withLock([&](){
+        auto& shadowLeafUpdates = registry.trafficController.getUpdates();
+
+        // oops, no updates from Unistyles yet, skip it!
+        if (shadowLeafUpdates.size() == 0) {
+            return newRootShadowNode;
+        }
+
+        auto affectedNodes = shadow::ShadowTreeManager::findAffectedNodes(*rootNode, shadowLeafUpdates);
+
+        registry.trafficController.stopUnistylesTraffic();
+        
+        // we have few updates, so merge it
+        return std::static_pointer_cast<RootShadowNode>(shadow::ShadowTreeManager::cloneShadowTree(
+            *rootNode,
+            shadowLeafUpdates,
+            affectedNodes
+        ));
+    });
 }

package/cxx/core/UnistylesMountHook.cpp

@@ -22,7 +22,7 @@ void core::UnistylesMountHook::shadowTreeDidMount(RootShadowNode::Shared const &
     // one more time merge Unistyles changes
     auto& registry = core::UnistylesRegistry::get();
 
-    if (!registry.trafficController.shouldStop()) {
-        shadow::ShadowTreeManager::updateShadowTree(this->_uiManager->getShadowTreeRegistry());
+    if (registry.trafficController.shouldStop()) {
+        registry.trafficController.resumeUnistylesTraffic();
     }
 }

package/cxx/core/UnistylesMountHook.h

@@ -3,15 +3,13 @@
 #include <react/renderer/uimanager/UIManager.h>
 #include <react/renderer/uimanager/UIManagerMountHook.h>
 #include "ShadowTreeManager.h"
-#include "HybridUnistylesRuntime.h"
 
 namespace margelo::nitro::unistyles::core {
 
 using namespace facebook::react;
 
 struct UnistylesMountHook : public UIManagerMountHook {
-    UnistylesMountHook(std::shared_ptr<UIManager> uiManager, std::shared_ptr<HybridUnistylesRuntime> unistylesRuntime)
-        : _uiManager{uiManager}, _unistylesRuntime{unistylesRuntime} {
+    UnistylesMountHook(std::shared_ptr<UIManager> uiManager): _uiManager{uiManager} {
         _uiManager->registerMountHook(*this);
     }
 
@@ -21,7 +19,6 @@ struct UnistylesMountHook : public UIManagerMountHook {
 
 private:
     std::shared_ptr<UIManager> _uiManager;
-    std::shared_ptr<HybridUnistylesRuntime> _unistylesRuntime;
 };
 
 }

package/cxx/core/UnistylesRegistry.cpp

@@ -108,12 +108,14 @@ void core::UnistylesRegistry::removeDuplicatedUnistyles(jsi::Runtime& rt, const
 }
 
 void core::UnistylesRegistry::unlinkShadowNodeWithUnistyles(jsi::Runtime& rt, const ShadowNodeFamily* shadowNodeFamily) {
-    this->_shadowRegistry[&rt].erase(shadowNodeFamily);
-    this->trafficController.removeShadowNode(shadowNodeFamily);
-
-    if (this->_shadowRegistry[&rt].empty()) {
-        this->_shadowRegistry.erase(&rt);
-    }
+    this->trafficController.withLock([this, &rt, shadowNodeFamily](){
+        this->_shadowRegistry[&rt].erase(shadowNodeFamily);
+        this->trafficController.removeShadowNode(shadowNodeFamily);
+        
+        if (this->_shadowRegistry[&rt].empty()) {
+            this->_shadowRegistry.erase(&rt);
+        }
+    });
 }
 
 std::shared_ptr<core::StyleSheet> core::UnistylesRegistry::addStyleSheet(jsi::Runtime& rt, int unid, core::StyleSheetType type, jsi::Object&& rawValue) {

package/cxx/hybridObjects/HybridShadowRegistry.cpp

@@ -49,7 +49,6 @@ jsi::Value HybridShadowRegistry::link(jsi::Runtime &rt, const jsi::Value &thisVa
     }
 
     auto parser = parser::Parser(this->_unistylesRuntime);
-    auto parsedStyleSheet = jsi::Value::undefined();
     std::vector<std::shared_ptr<core::UnistyleData>> unistylesData{};
 
     // create unistyleData based on wrappers
@@ -77,10 +76,8 @@ jsi::Value HybridShadowRegistry::link(jsi::Runtime &rt, const jsi::Value &thisVa
         );
 
         // before linking we need to check if given unistyle is affected by scoped theme
-        if (scopedTheme.has_value()) {
-            if (parsedStyleSheet.isUndefined()) {
-                parsedStyleSheet = parser.getParsedStyleSheetForScopedTheme(rt, unistyle, scopedTheme.value());
-            }
+        if (scopedTheme.has_value() && unistyle->styleKey != helpers::EXOTIC_STYLE_KEY) {
+            auto parsedStyleSheet = parser.getParsedStyleSheetForScopedTheme(rt, unistyle, scopedTheme.value());
 
             // if so we need to force update
             parser.rebuildUnistyleWithScopedTheme(rt, parsedStyleSheet, unistyleData);

package/cxx/hybridObjects/HybridStyleSheet.cpp

@@ -261,7 +261,7 @@ void HybridStyleSheet::registerHooks(jsi::Runtime& rt) {
     core::UnistylesRegistry::get().trafficController.restore();
 
     this->_unistylesCommitHook = std::make_shared<core::UnistylesCommitHook>(this->_uiManager);
-    this->_unistylesMountHook = std::make_shared<core::UnistylesMountHook>(this->_uiManager, this->_unistylesRuntime);
+    this->_unistylesMountHook = std::make_shared<core::UnistylesMountHook>(this->_uiManager);
 }
 
 void HybridStyleSheet::onPlatformDependenciesChange(std::vector<UnistyleDependency> dependencies) {

package/cxx/hybridObjects/HybridUnistylesRuntime.cpp

@@ -73,9 +73,13 @@ void HybridUnistylesRuntime::setTheme(const std::string &themeName) {
     helpers::assertThat(*_rt, !this->getHasAdaptiveThemes(), "Unistyles: You're trying to set theme to: '" + themeName + "', but adaptiveThemes are enabled.");
 
     auto& state = core::UnistylesRegistry::get().getState(*_rt);
+    auto currentThemeName = state.getCurrentThemeName();
 
     state.setTheme(themeName);
-    this->_onDependenciesChange({UnistyleDependency::THEME, UnistyleDependency::THEMENAME});
+
+    if (currentThemeName.value() != themeName) {
+        this->_onDependenciesChange({UnistyleDependency::THEME, UnistyleDependency::THEMENAME});
+    }
 };
 
 void HybridUnistylesRuntime::setAdaptiveThemes(bool isEnabled) {

package/cxx/parser/Parser.cpp

@@ -62,10 +62,10 @@ jsi::Value parser::Parser::getParsedStyleSheetForScopedTheme(jsi::Runtime& rt, c
         .asObject(rt);
 }
 
-void parser::Parser::rebuildUnistyleWithScopedTheme(jsi::Runtime& rt, jsi::Value& jsScopedTheme, std::shared_ptr<core::UnistyleData> unistyleData) {
-    auto parsedStyleSheet = jsScopedTheme.isUndefined()
+void parser::Parser::rebuildUnistyleWithScopedTheme(jsi::Runtime& rt, jsi::Value& scopedStyleSheet, std::shared_ptr<core::UnistyleData> unistyleData) {
+    auto parsedStyleSheet = scopedStyleSheet.isUndefined()
         ? this->getParsedStyleSheetForScopedTheme(rt, unistyleData->unistyle, unistyleData->scopedTheme.value())
-        : jsScopedTheme.asObject(rt);
+        : scopedStyleSheet.asObject(rt);
 
     if (parsedStyleSheet.isUndefined()) {
         return;
@@ -305,6 +305,7 @@ void parser::Parser::rebuildUnistylesInDependencyMap(jsi::Runtime& rt, Dependenc
                 unistyle->rawValue = parsedStyleSheetsWithDefaultTheme[unistyleStyleSheet].asObject(rt).getProperty(rt, unistyle->styleKey.c_str()).asObject(rt);
                 this->rebuildUnistyle(rt, unistyle, unistyleData->variants, unistyleData->dynamicFunctionMetadata);
                 unistyleData->parsedStyle = jsi::Value(rt, unistyle->parsedStyle.value()).asObject(rt);
+                unistyle->isDirty = true;
             }
 
             if (!parsedUnistyles.contains(unistyle)) {
@@ -880,21 +881,43 @@ jsi::Value parser::Parser::parseSecondLevel(jsi::Runtime &rt, Unistyle::Shared u
 
             return;
         }
-
+        
+        auto isArray = nestedObjectStyle.isArray(rt);
+        
+        if (!isArray) {
+            parsedStyle.setProperty(rt, propertyName.c_str(), this->getValueFromBreakpoints(rt, unistyle, nestedObjectStyle));
+        }
+        
         // possible with variants and compoundVariants
-        if (nestedObjectStyle.isArray(rt) && propertyName == "transform") {
+        if (propertyName == "transform") {
             parsedStyle.setProperty(rt, propertyName.c_str(), parseTransforms(rt, unistyle, nestedObjectStyle));
 
             return;
         }
 
-        if (nestedObjectStyle.isArray(rt) && propertyName == "fontVariant") {
+        if (propertyName == "boxShadow") {
+            parsedStyle.setProperty(rt, propertyName.c_str(), parseBoxShadow(rt, unistyle, nestedObjectStyle));
+
+            return;
+        }
+
+        if (propertyName == "filter") {
+            parsedStyle.setProperty(rt, propertyName.c_str(), parseFilters(rt, unistyle, nestedObjectStyle));
+
+            return;
+        }
+
+        if (propertyName == "fontVariant") {
             parsedStyle.setProperty(rt, propertyName.c_str(), propertyValue);
 
             return;
         }
 
-        parsedStyle.setProperty(rt, propertyName.c_str(), this->getValueFromBreakpoints(rt, unistyle, nestedObjectStyle));
+        if (propertyName == "shadowOffset" || propertyName == "textShadowOffset") {
+            parsedStyle.setProperty(rt, propertyName.c_str(), this->parseSecondLevel(rt, unistyle, propertyValue));
+
+            return;
+        }
     });
 
     return parsedStyle;
@@ -908,7 +931,7 @@ folly::dynamic parser::Parser::parseStylesToShadowTreeStyles(jsi::Runtime& rt, c
     for (const auto& unistyleData : unistyles) {
         // this can happen for exotic stylesheets
         if (!unistyleData->parsedStyle.has_value()) {
-            return nullptr;
+            continue;
         }
 
         helpers::enumerateJSIObject(rt, unistyleData->parsedStyle.value(), [&](const std::string& propertyName, jsi::Value& propertyValue){
@@ -916,7 +939,49 @@ folly::dynamic parser::Parser::parseStylesToShadowTreeStyles(jsi::Runtime& rt, c
                 return convertedStyles.setProperty(rt, propertyName.c_str(), jsi::Value(state.parseColor(propertyValue)));
             }
 
-            convertedStyles.setProperty(rt, propertyName.c_str(), propertyValue);
+            if (!propertyValue.isObject()) {
+                return convertedStyles.setProperty(rt, propertyName.c_str(), propertyValue);
+            }
+
+            auto objValue = propertyValue.asObject(rt);
+
+            if (!objValue.isArray(rt)) {
+                return convertedStyles.setProperty(rt, propertyName.c_str(), propertyValue);
+            }
+
+            // parse nested arrays like boxShadow
+            auto arrValue = objValue.asArray(rt);
+            auto parsedArray = jsi::Array(rt, arrValue.length(rt));
+
+            helpers::iterateJSIArray(rt, arrValue, [&](size_t i, jsi::Value& nestedValue){
+                if (nestedValue.isObject()) {
+                    jsi::Object obj = jsi::Object(rt);
+
+                    helpers::enumerateJSIObject(rt, nestedValue.asObject(rt), [&](const std::string& propertyName, jsi::Value& propertyValue){
+                        if (this->isColor(propertyName)) {
+                            obj.setProperty(rt, propertyName.c_str(), state.parseColor(propertyValue));
+
+                            return;
+                        }
+
+                        obj.setProperty(rt, propertyName.c_str(), propertyValue);
+                    });
+
+                    parsedArray.setValueAtIndex(rt, i, std::move(obj));
+
+                    return;
+                }
+
+                if (this->isColor(propertyName)) {
+                    parsedArray.setValueAtIndex(rt, i, jsi::Value(state.parseColor(nestedValue)));
+
+                    return;
+                }
+
+                parsedArray.setValueAtIndex(rt, i, nestedValue);
+            });
+
+            return convertedStyles.setProperty(rt, propertyName.c_str(), parsedArray);
         });
     }
 

package/cxx/shadowTree/ShadowTrafficController.h

@@ -21,7 +21,7 @@ struct ShadowTrafficController {
     }
 
     inline shadow::ShadowLeafUpdates& getUpdates() {
-        std::lock_guard<std::mutex> lock(_mutex);
+        // call it only within withLock!
  
         return _unistylesUpdates;
     }
@@ -45,8 +45,7 @@ struct ShadowTrafficController {
     }
     
     inline void removeShadowNode(const ShadowNodeFamily* shadowNodeFamily) {
-        std::lock_guard<std::mutex> lock(_mutex);
-        
+        // call it only within withLock!
         if (_unistylesUpdates.contains(shadowNodeFamily)) {
             _unistylesUpdates.erase(shadowNodeFamily);
         }
@@ -58,7 +57,14 @@ struct ShadowTrafficController {
         _unistylesUpdates = {};
         _canCommit = false;
     }
-
+    
+    template <typename F>
+    inline auto withLock(F&& func) {
+        std::lock_guard<std::mutex> lock(_mutex);
+        
+        return std::forward<F>(func)();
+    }
+    
 private:
     std::atomic<bool> _canCommit = false;
     shadow::ShadowLeafUpdates _unistylesUpdates{};

package/cxx/shadowTree/ShadowTreeManager.cpp

@@ -8,43 +8,46 @@ using AffectedNodes = std::unordered_map<const ShadowNodeFamily*, std::unordered
 
 void shadow::ShadowTreeManager::updateShadowTree(const ShadowTreeRegistry& shadowTreeRegistry) {
     auto& registry = core::UnistylesRegistry::get();
-    auto updates = registry.trafficController.getUpdates();
-
-    if (updates.empty()) {
-        return;
-    }
-
-    shadowTreeRegistry.enumerate([&updates](const ShadowTree& shadowTree, bool& stop){
-        // we could iterate via updates and create multiple commits
-        // but it can cause performance issues for hundreds of nodes
-        // so let's mutate Shadow Tree in single transaction
-        auto transaction = [&](const RootShadowNode& oldRootShadowNode) {
-            auto affectedNodes = shadow::ShadowTreeManager::findAffectedNodes(oldRootShadowNode, updates);
-            auto newRootNode = std::static_pointer_cast<RootShadowNode>(shadow::ShadowTreeManager::cloneShadowTree(
-                oldRootShadowNode,
-                updates,
-                affectedNodes
-            ));
-
-            // set unistyles trait
-            auto unistylesRootNode = std::reinterpret_pointer_cast<core::UnistylesCommitShadowNode>(newRootNode);
-
-            unistylesRootNode->addUnistylesCommitTrait();
-
-            return newRootNode;
-        };
-
-        // commit once!
-        // CommitOptions:
-        // enableStateReconciliation: https://reactnative.dev/architecture/render-pipeline#react-native-renderer-state-updates
-        // mountSynchronously: must be true as this is update from C++ not React
-        shadowTree.commit(transaction, {false, true});
+    
+    registry.trafficController.withLock([&](){
+        auto updates = registry.trafficController.getUpdates();
 
+        if (updates.empty()) {
+            return;
+        }
 
-        // for now we're assuming single surface, can be improved in the future
-        // stop = true means stop enumerating next shadow tree
-        // so in other words first shadow tree is our desired tree
-        stop = true;
+        shadowTreeRegistry.enumerate([&updates](const ShadowTree& shadowTree, bool& stop){
+            // we could iterate via updates and create multiple commits
+            // but it can cause performance issues for hundreds of nodes
+            // so let's mutate Shadow Tree in single transaction
+            auto transaction = [&](const RootShadowNode& oldRootShadowNode) {
+                auto affectedNodes = shadow::ShadowTreeManager::findAffectedNodes(oldRootShadowNode, updates);
+                auto newRootNode = std::static_pointer_cast<RootShadowNode>(shadow::ShadowTreeManager::cloneShadowTree(
+                    oldRootShadowNode,
+                    updates,
+                    affectedNodes
+                ));
+
+                // set unistyles trait
+                auto unistylesRootNode = std::reinterpret_pointer_cast<core::UnistylesCommitShadowNode>(newRootNode);
+
+                unistylesRootNode->addUnistylesCommitTrait();
+
+                return newRootNode;
+            };
+
+            // commit once!
+            // CommitOptions:
+            // enableStateReconciliation: https://reactnative.dev/architecture/render-pipeline#react-native-renderer-state-updates
+            // mountSynchronously: must be true as this is update from C++ not React
+            shadowTree.commit(transaction, {false, true});
+
+
+            // for now we're assuming single surface, can be improved in the future
+            // stop = true means stop enumerating next shadow tree
+            // so in other words first shadow tree is our desired tree
+            stop = true;
+        });
     });
 }
 

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

@@ -18,39 +18,35 @@ const UnistylesImageBackground = /*#__PURE__*/(0, _react.forwardRef)((props, for
   let storedImageRef = null;
   const styleClassNames = (0, _core.getClassName)(props.style);
   const imageClassNames = (0, _core.getClassName)(props.imageStyle);
-  return (
-    /*#__PURE__*/
-    // @ts-expect-error - RN types are not compatible with RNW styles
-    (0, _jsxRuntime.jsx)(_reactNative.ImageBackground, {
-      ...props,
-      style: styleClassNames,
-      imageStyle: imageClassNames,
-      ref: (0, _utils2.isServer)() ? undefined : ref => {
-        if (!ref) {
-          // @ts-expect-error hidden from TS
-          _web.UnistylesShadowRegistry.remove(storedRef, styleClassNames?.hash);
-        }
-        storedRef = ref;
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.ImageBackground, {
+    ...props,
+    style: styleClassNames,
+    imageStyle: imageClassNames,
+    ref: (0, _utils2.isServer)() ? undefined : ref => {
+      if (!ref) {
         // @ts-expect-error hidden from TS
-        _web.UnistylesShadowRegistry.add(ref, styleClassNames?.hash);
-        if (typeof forwardedRef === 'function') {
-          return forwardedRef(ref);
-        }
-        if (forwardedRef) {
-          forwardedRef.current = ref;
-        }
-      },
-      imageRef: (0, _utils2.isServer)() ? undefined : ref => {
-        if (!ref) {
-          // @ts-expect-error hidden from TS
-          _web.UnistylesShadowRegistry.remove(storedImageRef, imageClassNames?.hash);
-        }
-        storedImageRef = ref;
+        _web.UnistylesShadowRegistry.remove(storedRef, styleClassNames?.hash);
+      }
+      storedRef = ref;
+      // @ts-expect-error hidden from TS
+      _web.UnistylesShadowRegistry.add(ref, styleClassNames?.hash);
+      if (typeof forwardedRef === 'function') {
+        return forwardedRef(ref);
+      }
+      if (forwardedRef) {
+        forwardedRef.current = ref;
+      }
+    },
+    imageRef: (0, _utils2.isServer)() ? undefined : ref => {
+      if (!ref) {
         // @ts-expect-error hidden from TS
-        _web.UnistylesShadowRegistry.add(ref, imageClassNames?.hash);
+        _web.UnistylesShadowRegistry.remove(storedImageRef, imageClassNames?.hash);
       }
-    })
-  );
+      storedImageRef = ref;
+      // @ts-expect-error hidden from TS
+      _web.UnistylesShadowRegistry.add(ref, imageClassNames?.hash);
+    }
+  });
 });
 const ImageBackground = exports.ImageBackground = (0, _utils.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","_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":[]}
+{"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":[]}