react-native-unistyles 3.0.0-alpha.35 → 3.0.0-alpha.37

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

@@ -0,0 +1,148 @@
+package com.unistyles
+
+import android.graphics.Rect
+import android.os.Build
+import android.view.View
+import android.view.Window
+import android.view.WindowManager
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsAnimationCompat
+import androidx.core.view.WindowInsetsCompat
+import com.facebook.react.bridge.ReactApplicationContext
+import com.margelo.nitro.unistyles.Insets
+import com.margelo.nitro.unistyles.UnistyleDependency
+
+typealias CxxImeListener = () -> Unit
+
+class NativePlatformInsets(private val reactContext: ReactApplicationContext, private val diffMiniRuntime: () -> Array<UnistyleDependency>) {
+    private val _imeListeners: MutableList<CxxImeListener> = mutableListOf()
+    private var _insets: Insets = Insets(0.0, 0.0, 0.0, 0.0, 0.0)
+
+    fun getInsets(): Insets {
+        val density = reactContext.resources.displayMetrics.density
+
+        return Insets(
+            this._insets.top / density,
+            this._insets.bottom / density,
+            this._insets.left / density,
+            this._insets.right / density,
+            this._insets.ime / density
+        )
+    }
+
+    fun setInsets(insetsCompat: WindowInsetsCompat, window: Window, animatedBottomInsets: Double?) {
+        // 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 -> {
+                insetsCompat.isVisible(WindowInsetsCompat.Type.statusBars())
+            }
+            else -> {
+                @Suppress("DEPRECATION")
+                window.attributes.flags and WindowManager.LayoutParams.FLAG_FULLSCREEN != WindowManager.LayoutParams.FLAG_FULLSCREEN
+            }
+        }
+        // React Native is forcing insets to make status bar translucent
+        // so we need to calculate top inset manually, as WindowInsetCompat will always return 0
+        val statusBarTopInset = when(isStatusBarVisible) {
+            true -> {
+                val visibleRect = Rect()
+
+                window.decorView.getWindowVisibleDisplayFrame(visibleRect)
+
+                visibleRect.top
+            }
+            false -> 0
+        }
+
+        val insets = insetsCompat.getInsets(WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.displayCutout())
+
+        // Android 10 and below - set bottom insets to 0 while keyboard is visible and use default bottom insets otherwise
+        // Android 11 and above - animate bottom insets while keyboard is appearing and disappearing
+        val imeInsets = if (Build.VERSION.SDK_INT >= 30) {
+            animatedBottomInsets ?: this._insets.ime
+        } else {
+            val nextBottomInset = insetsCompat.getInsets(WindowInsetsCompat.Type.ime()).bottom - insets.bottom
+
+            // call new IME event here, as for SDK >= 30 it's called in AnimationCallback
+            this@NativePlatformInsets.emitImeEvent()
+
+            if (nextBottomInset < 0) {
+                0
+            } else {
+                nextBottomInset
+            }
+        }
+
+        this._insets = Insets(
+            statusBarTopInset.toDouble(),
+            insets.bottom.toDouble(),
+            insets.left.toDouble(),
+            insets.right.toDouble(),
+            imeInsets.toDouble()
+        )
+
+        diffMiniRuntime()
+    }
+
+    fun startInsetsListener() {
+        reactContext.currentActivity?.let { activity ->
+            activity.findViewById<View>(android.R.id.content)?.let { mainView ->
+                ViewCompat.setOnApplyWindowInsetsListener(mainView) { _, insets ->
+                    setInsets(insets, activity.window, null)
+
+                    insets
+                }
+
+                // IME insets are available from Android 11
+                if (Build.VERSION.SDK_INT >= 30) {
+                    ViewCompat.setWindowInsetsAnimationCallback(
+                        mainView,
+                        object : WindowInsetsAnimationCompat.Callback(DISPATCH_MODE_STOP) {
+                            override fun onProgress(
+                                insets: WindowInsetsCompat,
+                                runningAnimations: List<WindowInsetsAnimationCompat>
+                            ): WindowInsetsCompat {
+                                runningAnimations.firstOrNull()?.let {
+                                    val bottomInset = insets.getInsets(WindowInsetsCompat.Type.ime()).bottom.toDouble() - this@NativePlatformInsets._insets.bottom
+                                    val nextBottomInset = if (bottomInset < 0) {
+                                        0.0
+                                    } else {
+                                        bottomInset
+                                    }
+
+                                    this@NativePlatformInsets.setInsets(insets, activity.window, nextBottomInset)
+                                    this@NativePlatformInsets.emitImeEvent()
+                                }
+
+                                return insets
+                            }
+                        }
+                    )
+                }
+            }
+        }
+    }
+
+    fun emitImeEvent() {
+        _imeListeners.forEach { listener ->
+            listener()
+        }
+    }
+
+    fun stopInsetsListener() {
+        reactContext.currentActivity?.let { activity ->
+            activity.window?.decorView?.let { view ->
+                ViewCompat.setOnApplyWindowInsetsListener(view, null)
+                ViewCompat.setWindowInsetsAnimationCallback(view, null)
+            }
+        }
+    }
+
+    fun addImeListener(listener: CxxImeListener) {
+        this._imeListeners.add(listener)
+    }
+
+    fun removeImeListeners() {
+        this._imeListeners.clear()
+    }
+}

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

@@ -0,0 +1,54 @@
+package com.unistyles
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
+import android.os.Handler
+import android.os.Looper
+import com.facebook.react.bridge.ReactApplicationContext
+import com.margelo.nitro.unistyles.UnistyleDependency
+
+typealias CxxDependencyListener = (dependencies: Array<UnistyleDependency>) -> Unit
+
+class NativePlatformListener(private val reactContext: ReactApplicationContext, private val diffMiniRuntime: () -> Array<UnistyleDependency>) {
+    private val _dependencyListeners: MutableList<CxxDependencyListener> = mutableListOf()
+
+    private val configurationChangeReceiver = object : BroadcastReceiver() {
+        override fun onReceive(context: Context, intent: Intent) {
+            Handler(Looper.getMainLooper()).postDelayed({
+                this@NativePlatformListener.onConfigChange()
+            }, 10)
+        }
+    }
+
+    init {
+        reactContext.registerReceiver(configurationChangeReceiver, IntentFilter(Intent.ACTION_CONFIGURATION_CHANGED))
+    }
+
+    fun invalidate() {
+        reactContext.unregisterReceiver(configurationChangeReceiver)
+    }
+
+    fun addPlatformListener(listener: CxxDependencyListener) {
+        this._dependencyListeners.add(listener)
+    }
+
+    fun removePlatformListeners() {
+        this._dependencyListeners.clear()
+    }
+
+    private fun emitCxxEvent(dependencies: Array<UnistyleDependency>) {
+        this._dependencyListeners.forEach { listener ->
+            listener(dependencies)
+        }
+    }
+
+    fun onConfigChange() {
+        val changedDependencies = diffMiniRuntime()
+
+        if (changedDependencies.isNotEmpty()) {
+            emitCxxEvent(changedDependencies)
+        }
+    }
+}

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

@@ -0,0 +1,51 @@
+package com.unistyles
+
+import com.facebook.fbreact.specs.NativeTurboUnistylesSpec
+import com.facebook.jni.HybridData
+import com.facebook.proguard.annotations.DoNotStrip
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.RuntimeExecutor
+import com.facebook.react.fabric.FabricUIManager
+import com.facebook.react.turbomodule.core.interfaces.BindingsInstallerHolder
+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
+
+@Suppress("KotlinJniMissingFunction")
+class UnistylesModule(reactContext: ReactApplicationContext): NativeTurboUnistylesSpec(reactContext), TurboModuleWithJSIBindings {
+    @DoNotStrip
+    private var mHybridData: HybridData?
+    private val _nativePlatform = NativePlatformAndroid(reactContext)
+
+    companion object {
+        const val NAME = NativeTurboUnistylesSpec.NAME
+    }
+
+    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.")
+        val fabricUIManager = UIManagerHelper.getUIManager(reactContext, UIManagerType.FABRIC) as? FabricUIManager
+            ?: throw IllegalStateException("Unistyles: Fabric UI Manager is not available. Please follow installation guides.")
+
+        return initHybrid(runtimeExecutor, fabricUIManager, _nativePlatform)
+    }
+
+    @DoNotStrip
+    external override fun getBindingsInstaller(): BindingsInstallerHolder
+
+    @DoNotStrip
+    private external fun initHybrid(
+        runtimeExecutor: RuntimeExecutor,
+        fabricUIManager: FabricUIManager,
+        nativePlatform: HybridNativePlatformSpec
+    ): HybridData
+}

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

@@ -1,28 +1,30 @@
 package com.unistyles
 
-import android.util.Log
 import com.facebook.react.TurboReactPackage
 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() {
-    companion object {
-        private const val TAG: String = "Unistyles"
-
-        init {
-            try {
-                System.loadLibrary("unistyles")
-                Log.i(TAG, "Installed Unistyles \uD83E\uDD84!")
-            } catch (e: Throwable) {
-                Log.e(TAG, "Failed to load Unistyles C++ library! Is it properly linked?", e)
-                throw e
-            }
+    override fun getModule(name: String, reactContext: ReactApplicationContext): NativeModule? {
+        return if (name == UnistylesModule.NAME) {
+            UnistylesModule(reactContext)
+        } else {
+            null
         }
     }
 
-    override fun getModule(name: String, reactContext: ReactApplicationContext): NativeModule? = null
     override fun getReactModuleInfoProvider(): ReactModuleInfoProvider {
-        return ReactModuleInfoProvider { emptyMap() }
+        return ReactModuleInfoProvider {
+            mapOf(UnistylesModule.NAME to ReactModuleInfo(
+                UnistylesModule.NAME,
+                UnistylesModule.NAME,
+                _canOverrideExistingModule = true,
+                _needsEagerInit = true,
+                isCxxModule = true,
+                isTurboModule = true
+            ))
+        }
     }
 }

package/cxx/NativePlatform.h

@@ -0,0 +1,11 @@
+#if __has_include("Unistyles-Swift-Cxx-Umbrella.hpp")
+    #include "Unistyles-Swift-Cxx-Umbrella.hpp"
+#elif __has_include("JHybridNativePlatformSpec.hpp")
+    #include "JHybridNativePlatformSpec.hpp"
+
+    namespace Unistyles {
+        using HybridNativePlatformSpecCxx = margelo::nitro::unistyles::JHybridNativePlatformSpec;
+    }
+#else
+    #error "Unistyles: Can't find platform specific header!"
+#endif

package/cxx/common/Helpers.h

@@ -3,7 +3,7 @@
 #include <jsi/jsi.h>
 #include <jsi/JSIDynamic.h>
 #include <folly/dynamic.h>
-#include "Unistyles-Swift-Cxx-Umbrella.hpp"
+#include "NativePlatform.h"
 #include <unordered_set>
 
 using namespace facebook;

package/cxx/core/Unistyle.h

@@ -3,7 +3,7 @@
 #include "string"
 #include <jsi/jsi.h>
 #include <folly/dynamic.h>
-#include "Unistyles-Swift-Cxx-Umbrella.hpp"
+#include "NativePlatform.h"
 
 namespace margelo::nitro::unistyles::core {
 

package/cxx/core/UnistyleData.h

@@ -12,7 +12,7 @@ struct UnistyleData {
         : unistyle{unistyle}, variants(std::move(variants)), dynamicFunctionMetadata{std::move(arguments)} {}
 
     UnistyleData(const UnistyleData&) = delete;
-    UnistyleData(UnistyleData&& other): unistyle{other.unistyle}, variants(std::move(other.variants)) {}
+    UnistyleData(UnistyleData&& other) = delete;
 
     core::Unistyle::Shared unistyle;
     core::Variants variants;

package/cxx/core/UnistyleWrapper.h

@@ -32,7 +32,6 @@ inline static Unistyle::Shared unistyleFromStaticStyleSheet(jsi::Runtime& rt, js
     return exoticUnistyle;
 }
 
-
 inline static std::vector<Unistyle::Shared> unistylesFromNonExistentNativeState(jsi::Runtime& rt, jsi::Object& value) {
     auto hasUnistyleName = value.hasProperty(rt, helpers::NAME_STYLE_KEY.c_str());
 
@@ -71,7 +70,7 @@ inline static jsi::Object generateUnistylesPrototype(
     auto hostFn = jsi::Function::createFromHostFunction(rt, jsi::PropNameID::forUtf8(rt, "getStyle"), 0, [unistyle, unistylesRuntime](jsi::Runtime &rt, const jsi::Value &thisValue, const jsi::Value *args, size_t count){
         auto variants = helpers::variantsToPairs(rt, thisValue.asObject(rt).getProperty(rt, "variants").asObject(rt));
         auto arguments = helpers::parseDynamicFunctionArguments(rt, thisValue.asObject(rt).getProperty(rt, "arguments").asObject(rt).asArray(rt));
-        
+
         parser::Parser(unistylesRuntime).rebuildUnistyle(rt, unistyle->parent, unistyle, variants, std::make_optional<std::vector<folly::dynamic>>(arguments));
 
         return jsi::Value(rt, unistyle->parsedStyle.value()).asObject(rt);

package/cxx/core/UnistylesCommitHook.cpp

@@ -31,7 +31,7 @@ RootShadowNode::Unshared core::UnistylesCommitHook::shadowTreeWillCommit(
     auto& registry = core::UnistylesRegistry::get();
     auto& shadowLeafUpdates = registry.trafficController.getUpdates();
 
-    // oops, not updates from Unistyles yet, skip it!
+    // oops, no updates from Unistyles yet, skip it!
     if (shadowLeafUpdates.size() == 0) {
         return newRootShadowNode;
     }

package/cxx/core/UnistylesMountHook.cpp

@@ -23,6 +23,6 @@ void core::UnistylesMountHook::shadowTreeDidMount(RootShadowNode::Shared const &
     auto& registry = core::UnistylesRegistry::get();
 
     if (!registry.trafficController.shouldStop()) {
-        shadow::ShadowTreeManager::updateShadowTree(this->_unistylesRuntime->getRuntime());
+        shadow::ShadowTreeManager::updateShadowTree(this->_uiManager->getShadowTreeRegistry());
     }
 }

package/cxx/core/UnistylesRegistry.cpp

@@ -78,10 +78,6 @@ void core::UnistylesRegistry::linkShadowNodeWithUnistyle(
     auto parser = parser::Parser(nullptr);
     shadow::ShadowLeafUpdates updates;
 
-    if (!this->_shadowRegistry[&rt].contains(shadowNodeFamily)) {
-        this->_shadowRegistry[&rt][shadowNodeFamily] = {};
-    }
-
     std::for_each(unistyles.begin(), unistyles.end(), [&, this](Unistyle::Shared unistyle){
         this->_shadowRegistry[&rt][shadowNodeFamily].emplace_back(std::make_shared<UnistyleData>(unistyle, variants, arguments));
 
@@ -104,16 +100,11 @@ void core::UnistylesRegistry::linkShadowNodeWithUnistyle(
 
 void core::UnistylesRegistry::unlinkShadowNodeWithUnistyles(jsi::Runtime& rt, const ShadowNodeFamily* shadowNodeFamily) {
     this->_shadowRegistry[&rt].erase(shadowNodeFamily);
-}
+    this->trafficController.removeShadowNode(shadowNodeFamily);
 
-core::Unistyle::Shared core::UnistylesRegistry::findUnistyleFromKey(jsi::Runtime& rt, std::string styleKey, int tag) {
-    auto targetStyleSheet = this->_styleSheetRegistry[&rt][tag];
-
-    if (targetStyleSheet == nullptr) {
-        return nullptr;
+    if (this->_shadowRegistry[&rt].empty()) {
+        this->_shadowRegistry.erase(&rt);
     }
-
-    return targetStyleSheet.get()->unistyles[styleKey];
 }
 
 std::shared_ptr<core::StyleSheet> core::UnistylesRegistry::addStyleSheet(jsi::Runtime& rt, int unid, core::StyleSheetType type, jsi::Object&& rawValue) {
@@ -162,7 +153,7 @@ void core::UnistylesRegistry::shadowLeafUpdateFromUnistyle(jsi::Runtime& rt, Uni
     for (const auto& [family, unistyles] : this->_shadowRegistry[&rt]) {
         for (const auto& unistyleData : unistyles) {
             if (unistyleData->unistyle == unistyle) {
-                updates[family] = parser.parseStylesToShadowTreeStyles(rt, {unistyleData});
+                updates[family] = parser.parseStylesToShadowTreeStyles(rt, { unistyleData });
             }
         }
     }

package/cxx/core/UnistylesRegistry.h

@@ -41,7 +41,6 @@ struct UnistylesRegistry: public StyleSheetRegistry {
     void unlinkShadowNodeWithUnistyles(jsi::Runtime& rt, const ShadowNodeFamily*);
     std::shared_ptr<core::StyleSheet> addStyleSheet(jsi::Runtime& rt, int tag, core::StyleSheetType type, jsi::Object&& rawValue);
     DependencyMap buildDependencyMap(jsi::Runtime& rt, std::vector<UnistyleDependency>& deps);
-    Unistyle::Shared findUnistyleFromKey(jsi::Runtime& rt, std::string styleKey, int tag);
     void shadowLeafUpdateFromUnistyle(jsi::Runtime& rt, Unistyle::Shared unistyle);
     shadow::ShadowTrafficController trafficController{};
 
@@ -50,10 +49,10 @@ private:
 
     std::unordered_map<jsi::Runtime*, UnistylesState> _states{};
     std::unordered_map<jsi::Runtime*, std::unordered_map<int, std::shared_ptr<core::StyleSheet>>> _styleSheetRegistry{};
-    std::unordered_map<jsi::Runtime*, std::unordered_map<const ShadowNodeFamily*, std::vector<std::shared_ptr<UnistyleData>>>> _shadowRegistry{};
+    std::unordered_map<jsi::Runtime*, std::unordered_map<const ShadowNodeFamily*, std::vector<const std::shared_ptr<UnistyleData>>>> _shadowRegistry{};
 };
 
-UnistylesRegistry& UnistylesRegistry::get() {
+inline UnistylesRegistry& UnistylesRegistry::get() {
     static UnistylesRegistry cache;
 
     return cache;

package/cxx/core/UnistylesState.cpp

@@ -25,7 +25,7 @@ std::optional<std::string>& core::UnistylesState::getCurrentThemeName() {
 
 jsi::Object core::UnistylesState::getCurrentJSTheme() {
     auto hasSomeThemes = _registeredThemeNames.size() > 0;
-    
+
     if (!hasSomeThemes && !this->hasUserConfig) {
         helpers::assertThat(*_rt, false, "Unistyles: One of your stylesheets is trying to get the theme, but no theme has been selected yet. Did you forget to call StyleSheet.configure? If you called it, make sure you did so before any StyleSheet.create.");
     }
@@ -99,15 +99,18 @@ int core::UnistylesState::parseColor(jsi::Value& maybeColor) {
     if (!maybeColor.isString()) {
         return 0;
     }
-    
+
     auto colorString = maybeColor.asString(*_rt);
-    
+
     if (!this->_colorCache.contains(colorString.utf8(*_rt).c_str())) {
-        // we must convert it to uint32_t first, otherwise color will be broken
-        uint32_t color = this->_processColorFn.get()->call(*_rt, colorString).asNumber();
-        
+        #ifdef ANDROID
+            int color = this->_processColorFn.get()->call(*_rt, colorString).asNumber();
+        #else
+            uint32_t color = this->_processColorFn.get()->call(*_rt, colorString).asNumber();
+        #endif
+
         this->_colorCache[colorString.utf8(*_rt).c_str()] = color ? color : 0;
     }
-    
+
     return this->_colorCache[colorString.utf8(*_rt).c_str()];
 }

package/cxx/hybridObjects/HybridNavigationBar.h

@@ -1,19 +1,19 @@
 #pragma once
 
 #include "HybridUnistylesNavigationBarSpec.hpp"
-#include "Unistyles-Swift-Cxx-Umbrella.hpp"
+#include "NativePlatform.h"
 #include <optional>
 
 using namespace margelo::nitro::unistyles;
 
 struct HybridNavigationBar: public HybridUnistylesNavigationBarSpec {
     HybridNavigationBar(Unistyles::HybridNativePlatformSpecCxx nativePlatform): HybridObject(TAG), _nativePlatform{nativePlatform} {}
-    
+
     void setBackgroundColor(double color) override;
     void setHidden(bool isHidden) override;
     double getWidth() override;
     double getHeight() override;
-    
+
 private:
     Unistyles::HybridNativePlatformSpecCxx _nativePlatform;
 };

package/cxx/hybridObjects/HybridStatusBar.h

@@ -1,19 +1,19 @@
 #pragma once
 
 #include "HybridUnistylesStatusBarSpec.hpp"
-#include "Unistyles-Swift-Cxx-Umbrella.hpp"
+#include "NativePlatform.h"
 #include <optional>
 
 using namespace margelo::nitro::unistyles;
 
 struct HybridStatusBar: public HybridUnistylesStatusBarSpec {
     HybridStatusBar(Unistyles::HybridNativePlatformSpecCxx nativePlatform): HybridObject(TAG), _nativePlatform{nativePlatform} {}
- 
+
     void setBackgroundColor(double color) override;
     double getWidth() override;
     double getHeight() override;
     void setHidden(bool isHidden) override;
-    
+
 private:
     Unistyles::HybridNativePlatformSpecCxx _nativePlatform;
 };

package/cxx/hybridObjects/HybridStyleSheet.cpp

@@ -15,7 +15,7 @@ double HybridStyleSheet::getUnid() {
 
 jsi::Value HybridStyleSheet::create(jsi::Runtime& rt, const jsi::Value &thisVal, const jsi::Value *arguments, size_t count) {
     if (count == 1) {
-        helpers::assertThat(rt, count == 2, "Unistyles is not initialized correctly. Please add babel plugin to your babel config.");
+        helpers::assertThat(rt, false, "Unistyles is not initialized correctly. Please add babel plugin to your babel config.");
     }
 
     // second argument is hidden, so validation is perfectly fine
@@ -128,7 +128,7 @@ void HybridStyleSheet::parseSettings(jsi::Runtime &rt, jsi::Object settings) {
 void HybridStyleSheet::parseBreakpoints(jsi::Runtime &rt, jsi::Object breakpoints){
     helpers::Breakpoints sortedBreakpoints = helpers::jsiBreakpointsToVecPairs(rt, std::move(breakpoints));
 
-    helpers::assertThat(rt, sortedBreakpoints.size() > 0, "StyleSheet.configure's breakpoints can't be empty.");
+    helpers::assertThat(rt, !sortedBreakpoints.empty(), "StyleSheet.configure's breakpoints can't be empty.");
     helpers::assertThat(rt, sortedBreakpoints.front().second == 0, "StyleSheet.configure's first breakpoint must start from 0.");
 
     auto& registry = core::UnistylesRegistry::get();
@@ -197,7 +197,7 @@ void HybridStyleSheet::verifyAndSelectTheme(jsi::Runtime &rt) {
 
 void HybridStyleSheet::setThemeFromColorScheme(jsi::Runtime& rt) {
     auto& state = core::UnistylesRegistry::get().getState(rt);
-    ColorScheme colorScheme = static_cast<ColorScheme>(this->_unistylesRuntime->getColorScheme());
+    auto colorScheme = static_cast<ColorScheme>(this->_unistylesRuntime->getColorScheme());
 
     switch (colorScheme) {
         case ColorScheme::LIGHT:
@@ -232,7 +232,7 @@ void HybridStyleSheet::loadExternalMethods(const jsi::Value& thisValue, jsi::Run
 void HybridStyleSheet::registerHooks(jsi::Runtime& rt) {
     // cleanup Shadow updates
     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);
 }
@@ -248,20 +248,20 @@ void HybridStyleSheet::onPlatformDependenciesChange(std::vector<UnistyleDependen
         auto dependencies = std::move(unistylesDependencies);
 
         // re-compute new breakpoint
-        auto dimensionsIt = std::find(dependencies.begin(), dependencies.end(), UnistyleDependency::DIMENSIONS);
+        auto dimensionsIt = std::find(unistylesDependencies.begin(), unistylesDependencies.end(), UnistyleDependency::DIMENSIONS);
 
-        if (dimensionsIt != dependencies.end()) {
+        if (dimensionsIt != unistylesDependencies.end()) {
             registry.getState(rt).computeCurrentBreakpoint(this->_unistylesRuntime->getScreen().width);
         }
 
         // check if color scheme changed and then if Unistyles state depend on it (adaptive themes)
-        auto colorSchemeIt = std::find(dependencies.begin(), dependencies.end(), UnistyleDependency::COLORSCHEME);
-        auto hasNewColorScheme = colorSchemeIt != dependencies.end();
+        auto colorSchemeIt = std::find(unistylesDependencies.begin(), unistylesDependencies.end(), UnistyleDependency::COLORSCHEME);
+        auto hasNewColorScheme = colorSchemeIt != unistylesDependencies.end();
 
         // in a later step, we will rebuild only Unistyles with mounted StyleSheets
         // however, user may have StyleSheets with components that haven't mounted yet
         // we need to rebuild all dependent StyleSheets as well
-        auto dependentStyleSheets = registry.getStyleSheetsToRefresh(rt, hasNewColorScheme, dependencies.size() > 1);
+        auto dependentStyleSheets = registry.getStyleSheetsToRefresh(rt, hasNewColorScheme, unistylesDependencies.size() > 1);
 
         if (hasNewColorScheme) {
             this->_unistylesRuntime->includeDependenciesForColorSchemeChange(dependencies);
@@ -269,17 +269,17 @@ void HybridStyleSheet::onPlatformDependenciesChange(std::vector<UnistyleDependen
 
         auto dependencyMap = registry.buildDependencyMap(rt, dependencies);
 
-        if (dependencyMap.size() == 0) {
+        if (dependencyMap.empty()) {
             this->notifyJSListeners(dependencies);
 
             return;
         }
 
         parser.rebuildUnistylesInDependencyMap(rt, dependencyMap, dependentStyleSheets);
-        parser.rebuildShadowLeafUpdates(dependencyMap);
-        
+        parser.rebuildShadowLeafUpdates(rt, dependencyMap);
+
         this->notifyJSListeners(dependencies);
-        shadow::ShadowTreeManager::updateShadowTree(rt);
+        shadow::ShadowTreeManager::updateShadowTree(UIManagerBinding::getBinding(rt)->getUIManager().getShadowTreeRegistry());
     });
 }
 
@@ -298,18 +298,21 @@ void HybridStyleSheet::onImeChange() {
 
         auto dependencyMap = registry.buildDependencyMap(rt, dependencies);
 
-        if (dependencyMap.size() == 0) {
+        if (dependencyMap.empty()) {
             return;
         }
+        
+        std::vector<std::shared_ptr<core::StyleSheet>> styleSheet;
+
+        parser.rebuildUnistylesInDependencyMap(rt, dependencyMap, styleSheet);
+        parser.rebuildShadowLeafUpdates(rt, dependencyMap);
 
-        parser.rebuildUnistylesInDependencyMap(rt, dependencyMap, {});
-        parser.rebuildShadowLeafUpdates(dependencyMap);
-        shadow::ShadowTreeManager::updateShadowTree(rt);
+        shadow::ShadowTreeManager::updateShadowTree(UIManagerBinding::getBinding(rt)->getUIManager().getShadowTreeRegistry());
     });
 }
 
 void HybridStyleSheet::notifyJSListeners(std::vector<UnistyleDependency>& dependencies) {
-    if (dependencies.size() > 0) {
+    if (!dependencies.empty()) {
         std::for_each(this->_changeListeners.begin(), this->_changeListeners.end(), [&](auto& listener){
             (*listener)(dependencies);
         });