react-native-unistyles 3.0.0-alpha.28 → 3.0.0-alpha.29

package/README.md

@@ -28,6 +28,7 @@ Install CocoaPods dependencies / generate native folders with Expo:
 
 ```shell
 pod install
+or
 npx expo prebuild
 ```
 
@@ -68,6 +69,12 @@ npx expo prebuild
 <a href="https://github.com/mwarger">
      <img src="https://avatars.githubusercontent.com/u/686823?v=4" height="70px" width="70px" alt="mwarger" />
 </a>
+<a href="https://github.com/biw">
+     <img src="https://avatars.githubusercontent.com/u/6139501?v=4" height="70px" width="70px" alt="biw" />
+</a>
+<a href="https://github.com/happyfloat">
+     <img src="https://avatars.githubusercontent.com/u/186333704?s=200&v=4" height="70px" width="70px" alt="happyfloat" />
+</a>
 
 ## Past sponsors
 

package/android/CMakeLists.txt

@@ -35,28 +35,19 @@ set_target_properties(unistyles PROPERTIES
 find_package(ReactAndroid REQUIRED CONFIG)
 find_package(fbjni REQUIRED CONFIG)
 
-target_include_directories(
-    unistyles
-    PRIVATE
-    "../node_modules/react-native/ReactCommon"
-    "../node_modules/react-native/ReactAndroid/src/main/jni/react/turbomodule"
-    "../node_modules/react-native/ReactCommon/callinvoker"
-    "../node_modules/react-native/ReactCommon/runtimeexecutor"
-    "../node_modules/react-native/ReactCommon/yoga"
-    "../node_modules/react-native/ReactCommon/react/renderer/graphics/platform/cxx"
-)
+# REACTNATIVE_MERGED_SO doesnt work as of RN 0.76.0-rc.3
+if (ReactAndroid_VERSION_MINOR GREATER_EQUAL 76)
+    target_link_libraries(unistyles ReactAndroid::reactnative)
+else()
+    target_link_libraries(unistyles
+        ReactAndroid::turbomodulejsijni
+        ReactAndroid::react_nativemodule_core
+        android
+        fbjni::fbjni
+    )
+endif()
 
 target_link_libraries(unistyles
     ReactAndroid::jsi
-    ReactAndroid::turbomodulejsijni
-    ReactAndroid::react_nativemodule_core
-    android
-    ReactAndroid::react_render_core
-    ReactAndroid::runtimeexecutor
-    ReactAndroid::fabricjni
-    ReactAndroid::react_debug
-    ReactAndroid::react_render_core
-    ReactAndroid::react_render_componentregistry
-    ReactAndroid::rrc_view
-    ReactAndroid::folly_runtime
+    fbjni::fbjni
 )

package/cxx/core/UnistylesMountHook.cpp

@@ -25,13 +25,3 @@ void core::UnistylesMountHook::shadowTreeDidMount(RootShadowNode::Shared const &
     // so, resume Unistyles commits
     registry.trafficController.resumeUnistylesTraffic();
 }
-
-shadow::ShadowLeafUpdates core::UnistylesMountHook::getUnistylesUpdates() {
-    auto& registry = core::UnistylesRegistry::get();
-    auto parser = parser::Parser(this->_unistylesRuntime);
-    auto dependencyMap = registry.buildDependencyMap(*this->_rt);
-
-    // don't rebuild dependency map, at this point it's already done
-
-    return parser.dependencyMapToShadowLeafUpdates(dependencyMap);
-}

package/cxx/core/UnistylesMountHook.h

@@ -11,20 +11,15 @@ namespace margelo::nitro::unistyles::core {
 using namespace facebook::react;
 
 struct UnistylesMountHook : public UIManagerMountHook {
-    UnistylesMountHook(std::shared_ptr<UIManager> uiManager, std::shared_ptr<HybridUnistylesRuntime> unistylesRuntime, jsi::Runtime& rt)
-        : _unistylesRuntime{unistylesRuntime}, _uiManager{uiManager}, _rt{&rt} {
-            _uiManager->registerMountHook(*this);
-        }
+    UnistylesMountHook(std::shared_ptr<UIManager> uiManager) : _uiManager{uiManager} {
+        _uiManager->registerMountHook(*this);
+    }
 
     ~UnistylesMountHook() noexcept override;
 
     void shadowTreeDidMount(RootShadowNode::Shared const &rootShadowNode, double mountTime) noexcept override;
 
-    shadow::ShadowLeafUpdates getUnistylesUpdates();
-
 private:
-    jsi::Runtime* _rt;
-    std::shared_ptr<HybridUnistylesRuntime> _unistylesRuntime;
     std::shared_ptr<UIManager> _uiManager;
 };
 

package/cxx/hybridObjects/HybridStyleSheet.cpp

@@ -67,9 +67,9 @@ jsi::Value HybridStyleSheet::configure(jsi::Runtime &rt, const jsi::Value &thisV
     });
 
     verifyAndSelectTheme(rt);
-    
+
     auto& state = core::UnistylesRegistry::get().getState(rt);
-    
+
     state.hasUserConfig = true;
 
     return jsi::Value::undefined();
@@ -80,10 +80,10 @@ jsi::Value HybridStyleSheet::init(jsi::Runtime &rt, const jsi::Value &thisVal, c
     auto& registry = core::UnistylesRegistry::get();
 
     registry.createState(rt);
-    
+
     loadExternalMethods(thisVal, rt);
     registerHooks(rt);
-    
+
     return jsi::Value::undefined();
 }
 
@@ -227,50 +227,84 @@ void HybridStyleSheet::loadExternalMethods(const jsi::Value& thisValue, jsi::Run
 
 void HybridStyleSheet::registerHooks(jsi::Runtime& rt) {
     this->_unistylesCommitHook = std::make_shared<core::UnistylesCommitHook>(this->_uiManager, this->_unistylesRuntime, rt);
-    this->_unistylesMountHook = std::make_shared<core::UnistylesMountHook>(this->_uiManager, this->_unistylesRuntime, rt);
+    this->_unistylesMountHook = std::make_shared<core::UnistylesMountHook>(this->_uiManager);
 }
 
 void HybridStyleSheet::onPlatformDependenciesChange(std::vector<UnistyleDependency> dependencies) {
-    auto& registry = core::UnistylesRegistry::get();
-    auto parser = parser::Parser(this->_unistylesRuntime);
-    auto& rt = this->_unistylesRuntime->getRuntime();
-    
-    // re-compute new breakpoint
-    auto dimensionsIt = std::find(dependencies.begin(), dependencies.end(), UnistyleDependency::DIMENSIONS);
-    
-    if (dimensionsIt != dependencies.end()) {
-        registry.getState(rt).computeCurrentBreakpoint(this->_unistylesRuntime->getScreen().width);
+    if (this->_unistylesRuntime == nullptr) {
+        return;
     }
 
-    // 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();
+    this->_unistylesRuntime->runOnJSThread([this, &dependencies](jsi::Runtime& rt){
+        auto& registry = core::UnistylesRegistry::get();
+        auto parser = parser::Parser(this->_unistylesRuntime);
 
-    // 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);
+        // re-compute new breakpoint
+        auto dimensionsIt = std::find(dependencies.begin(), dependencies.end(), UnistyleDependency::DIMENSIONS);
 
-    if (hasNewColorScheme) {
-        this->_unistylesRuntime->includeDependenciesForColorSchemeChange(dependencies);
-    }
+        if (dimensionsIt != dependencies.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();
 
-    this->notifyJSListeners(dependencies);
+        // 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);
+
+        if (hasNewColorScheme) {
+            this->_unistylesRuntime->includeDependenciesForColorSchemeChange(dependencies);
+        }
 
-    auto dependencyMap = registry.buildDependencyMap(rt, dependencies);
+        this->notifyJSListeners(dependencies);
 
-    if (dependencyMap.size() == 0) {
+        auto dependencyMap = registry.buildDependencyMap(rt, dependencies);
+
+        if (dependencyMap.size() == 0) {
+            return;
+        }
+
+        parser.rebuildUnistylesInDependencyMap(rt, dependencyMap, dependentStyleSheets);
+
+        // this is required, otherwise shadow tree will ignore Unistyles commit
+        registry.trafficController.setHasUnistylesCommit(true);
+
+        auto shadowLeafUpdates = parser.dependencyMapToShadowLeafUpdates(dependencyMap);
+
+        shadow::ShadowTreeManager::updateShadowTree(rt, shadowLeafUpdates);
+    });
+}
+
+void HybridStyleSheet::onImeChange() {
+    if (this->_unistylesRuntime == nullptr) {
         return;
     }
 
-    parser.rebuildUnistylesInDependencyMap(rt, dependencyMap, dependentStyleSheets);
+    this->_unistylesRuntime->runOnJSThread([this](jsi::Runtime& rt){
+        auto& registry = core::UnistylesRegistry::get();
+        auto parser = parser::Parser(this->_unistylesRuntime);
+        std::vector<UnistyleDependency> dependencies{UnistyleDependency::IME};
 
-    // this is required, otherwise shadow tree will ignore Unistyles commit
-    registry.trafficController.setHasUnistylesCommit(true);
+        this->notifyJSListeners(dependencies);
 
-    auto shadowLeafUpdates = parser.dependencyMapToShadowLeafUpdates(dependencyMap);
+        auto dependencyMap = registry.buildDependencyMap(rt, dependencies);
 
-    shadow::ShadowTreeManager::updateShadowTree(rt, shadowLeafUpdates);
+        if (dependencyMap.size() == 0) {
+            return;
+        }
+
+        parser.rebuildUnistylesInDependencyMap(rt, dependencyMap, {});
+
+        // this is required, otherwise shadow tree will ignore Unistyles commit
+        registry.trafficController.setHasUnistylesCommit(true);
+
+        auto shadowLeafUpdates = parser.dependencyMapToShadowLeafUpdates(dependencyMap);
+
+        shadow::ShadowTreeManager::updateShadowTree(rt, shadowLeafUpdates);
+    });
 }
 
 void HybridStyleSheet::notifyJSListeners(std::vector<UnistyleDependency>& dependencies) {

package/cxx/hybridObjects/HybridStyleSheet.h

@@ -22,7 +22,14 @@ struct HybridStyleSheet: public HybridUnistylesStyleSheetSpec {
             this->_unistylesRuntime->registerPlatformListener(
                   std::bind(&HybridStyleSheet::onPlatformDependenciesChange, this, std::placeholders::_1)
             );
+            this->_unistylesRuntime->registerImeListener(
+                  std::bind(&HybridStyleSheet::onImeChange, this)
+            );
       }
+    
+    ~HybridStyleSheet() {
+        this->_unistylesRuntime->unregisterPlatformListeners();
+    }
 
     jsi::Value create(jsi::Runtime& rt,
                       const jsi::Value& thisValue,
@@ -50,7 +57,7 @@ struct HybridStyleSheet: public HybridUnistylesStyleSheetSpec {
     double getHairlineWidth() override;
     double getUnid() override;
     std::function<void ()> addChangeListener(const std::function<void (const std::vector<UnistyleDependency> &)>& onChanged) override;
-    
+
 private:
     void parseSettings(jsi::Runtime& rt, jsi::Object settings);
     void parseBreakpoints(jsi::Runtime& rt, jsi::Object breakpoints);
@@ -60,6 +67,7 @@ private:
     void loadExternalMethods(const jsi::Value& thisValue, jsi::Runtime& rt);
     void registerHooks(jsi::Runtime& rt);
     void onPlatformDependenciesChange(std::vector<UnistyleDependency> dependencies);
+    void onImeChange();
     void notifyJSListeners(std::vector<UnistyleDependency>& dependencies);
 
     double __unid = -1;

package/cxx/hybridObjects/HybridUnistylesRuntime.cpp

@@ -114,19 +114,19 @@ void HybridUnistylesRuntime::calculateNewThemeAndDependencies(std::vector<Unisty
 
 jsi::Value HybridUnistylesRuntime::getTheme(jsi::Runtime &rt, const jsi::Value &thisValue, const jsi::Value *args, size_t count) {
     helpers::assertThat(rt, count <= 1, "UnistylesRuntime.getTheme expected to be called with 0 or 1 argument.");
-    
+
     auto& state = core::UnistylesRegistry::get().getState(*_rt);
-    
+
     if (count == 1) {
         helpers::assertThat(rt, args[0].isString(), "UnistylesRuntime.getTheme expected to be called with string.");
-        
+
         auto themeName = args[0].asString(rt).utf8(rt);
-        
+
         helpers::assertThat(rt, state.hasTheme(themeName), "Unistyles: You're trying to get theme '" + themeName + "' but it wasn't registered.");
-        
+
         return state.getJSThemeByName(themeName);
     }
-    
+
     return state.getCurrentJSTheme();
 }
 
@@ -212,7 +212,7 @@ jsi::Value HybridUnistylesRuntime::getMiniRuntimeAsValue(jsi::Runtime& rt) {
     obj.setProperty(rt, "navigationBar", JSIConverter<Dimensions>::toJSI(rt, miniRuntime.navigationBar));
     obj.setProperty(rt, "isPortrait", JSIConverter<bool>::toJSI(rt, miniRuntime.isPortrait));
     obj.setProperty(rt, "isLandscape", JSIConverter<bool>::toJSI(rt, miniRuntime.isLandscape));
-    
+
     return obj;
 }
 
@@ -225,6 +225,14 @@ void HybridUnistylesRuntime::registerPlatformListener(const std::function<void(s
     this->_onDependenciesChange = listener;
 }
 
+void HybridUnistylesRuntime::registerImeListener(const std::function<void()>& listener) {
+    this->_nativePlatform.registerImeListener(listener);
+}
+
+void HybridUnistylesRuntime::unregisterPlatformListeners() {
+    this->_nativePlatform.unregisterPlatformListeners();
+}
+
 void HybridUnistylesRuntime::includeDependenciesForColorSchemeChange(std::vector<UnistyleDependency>& deps) {
     auto& registry = core::UnistylesRegistry::get();
     auto& state = registry.getState(*this->_rt);

package/cxx/hybridObjects/HybridUnistylesRuntime.h

@@ -13,7 +13,8 @@
 namespace margelo::nitro::unistyles {
 
 struct HybridUnistylesRuntime: public HybridUnistylesRuntimeSpec {
-    HybridUnistylesRuntime(Unistyles::HybridNativePlatformSpecCxx nativePlatform, jsi::Runtime& rt) : HybridObject(TAG), _nativePlatform{nativePlatform}, _rt{&rt} {}
+    HybridUnistylesRuntime(Unistyles::HybridNativePlatformSpecCxx 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,
                             const jsi::Value& thisValue,
@@ -55,6 +56,8 @@ struct HybridUnistylesRuntime: public HybridUnistylesRuntimeSpec {
     double getPixelRatio() override;
     double getFontScale() override;
     void registerPlatformListener(const std::function<void(std::vector<UnistyleDependency>)>& listener);
+    void registerImeListener(const std::function<void()>& listener);
+    void unregisterPlatformListeners();
 
     void setTheme(const std::string &themeName) override;
     void setAdaptiveThemes(bool isEnabled) override;
@@ -65,6 +68,7 @@ struct HybridUnistylesRuntime: public HybridUnistylesRuntimeSpec {
     jsi::Runtime& getRuntime();
     void includeDependenciesForColorSchemeChange(std::vector<UnistyleDependency>& deps);
     void calculateNewThemeAndDependencies(std::vector<UnistyleDependency>& deps);
+    std::function<void(std::function<void(jsi::Runtime&)>&&)> runOnJSThread;
 
 private:
     jsi::Runtime* _rt;

package/cxx/parser/Parser.cpp

@@ -15,7 +15,6 @@ void parser::Parser::buildUnistyles(jsi::Runtime& rt, std::shared_ptr<StyleSheet
 
         jsi::Object styleValue = propertyValue.asObject(rt);
 
-
         if (styleValue.isFunction(rt)) {
             styleSheet->unistyles[styleKey] = std::make_shared<UnistyleDynamicFunction>(
                 UnistyleType::DynamicFunction,

package/ios/NativePlatform+ios.swift

@@ -4,13 +4,16 @@ import Foundation
 import Combine
 import NitroModules
 
-typealias CxxListener = (Array<UnistyleDependency>) -> Void
+typealias CxxDependencyListener = (Array<UnistyleDependency>) -> Void
+typealias CxxImeListener = () -> Void
 
 class NativeIOSPlatform: HybridNativePlatformSpec {
     var miniRuntime: UnistylesNativeMiniRuntime?
+    var keyboardAnimation = KeyboardAnimation()
     var cancellables = Set<AnyCancellable>()
 
-    var listeners: Array<CxxListener> = []
+    var dependencyListeners: Array<CxxDependencyListener> = []
+    var imeListeners: Array<CxxImeListener> = []
     var hybridContext = margelo.nitro.HybridContext()
     var memorySize: Int {
         return getSizeOf(self)
@@ -20,10 +23,12 @@ class NativeIOSPlatform: HybridNativePlatformSpec {
         self.miniRuntime = self.buildMiniRuntime()
 
         setupPlatformListeners()
+        setupKeyboardListeners()
     }
 
     deinit {
         removePlatformListeners()
+        removeKeyboardListeners()
     }
 
     func getMiniRuntime() -> UnistylesNativeMiniRuntime {
@@ -32,7 +37,7 @@ class NativeIOSPlatform: HybridNativePlatformSpec {
 
     func buildMiniRuntime() -> UnistylesNativeMiniRuntime {
         let orientation = self.getOrientation()
-        
+
         return UnistylesNativeMiniRuntime(
             colorScheme: self.getColorScheme(),
             screen: self.getScreenDimensions(),
@@ -193,7 +198,13 @@ class NativeIOSPlatform: HybridNativePlatformSpec {
 
             let safeArea = window.safeAreaInsets
 
-            return Insets(top: safeArea.top, bottom: safeArea.bottom, left: safeArea.left, right: safeArea.right, ime: 0)
+            return Insets(
+                top: safeArea.top,
+                bottom: safeArea.bottom,
+                left: safeArea.left,
+                right: safeArea.right,
+                ime: keyboardAnimation.animatedImeInset
+            )
         }
 
         if Thread.isMainThread {
@@ -279,7 +290,7 @@ class NativeIOSPlatform: HybridNativePlatformSpec {
     func getNavigationBarDimensions() -> Dimensions {
         return Dimensions(width: 0, height: 0);
     }
-    
+
     func setStatusBarHidden(isHidden: Bool) throws {
         self.onWindowChange(Notification(name: NSNotification.Name("RCTWindowFrameDidChangeNotification")))
     }

package/ios/NativePlatform+keyboard.swift

@@ -0,0 +1,83 @@
+import Foundation
+
+struct KeyboardAnimation {
+    var animatedImeInset: CGFloat = 0
+    var keyboardHeight: CGFloat = 0
+    var animationDuration: Double = 0
+    var displayLink: CADisplayLink?
+    var startTime: CFTimeInterval = 0
+    var from: CGFloat = 0
+    var to: CGFloat = 0
+}
+
+extension NativeIOSPlatform {
+    func setupKeyboardListeners() {
+        NotificationCenter.default.addObserver(self, selector: #selector(onKeyboardWillShow), name: UIResponder.keyboardWillShowNotification, object: nil)
+        NotificationCenter.default.addObserver(self, selector: #selector(onKeyboardWillHide), name: UIResponder.keyboardWillHideNotification, object: nil)
+    }
+
+    func removeKeyboardListeners() {
+        keyboardAnimation.displayLink?.invalidate()
+
+        NotificationCenter.default.removeObserver(
+             self,
+             name: UIResponder.keyboardWillShowNotification,
+             object: nil
+         )
+         NotificationCenter.default.removeObserver(
+             self,
+             name: UIResponder.keyboardWillHideNotification,
+             object: nil
+         )
+    }
+
+    @objc func onKeyboardWillShow(notification: NSNotification) {
+        guard let frame = notification.userInfo?[UIResponder.keyboardFrameEndUserInfoKey] as? CGRect else { return }
+        guard let duration = notification.userInfo?[UIResponder.keyboardAnimationDurationUserInfoKey] as? Double else { return }
+
+        keyboardAnimation.keyboardHeight = frame.height
+        keyboardAnimation.animationDuration = duration
+
+        startAnimation(toValue: keyboardAnimation.keyboardHeight)
+    }
+
+    @objc func onKeyboardWillHide(notification: NSNotification) {
+        guard let duration = notification.userInfo?[UIResponder.keyboardAnimationDurationUserInfoKey] as? Double else { return }
+
+        keyboardAnimation.animationDuration = duration
+
+        startAnimation(toValue: 0)
+    }
+
+    func startAnimation(toValue targetValue: CGFloat) {
+        keyboardAnimation.startTime = CACurrentMediaTime()
+        keyboardAnimation.displayLink?.invalidate()
+
+        keyboardAnimation.from = keyboardAnimation.animatedImeInset
+        keyboardAnimation.to = targetValue
+
+        if (keyboardAnimation.from == keyboardAnimation.to) {
+            return
+        }
+
+        keyboardAnimation.displayLink = CADisplayLink(target: self, selector: #selector(updateAnimation))
+        keyboardAnimation.displayLink?.add(to: .main, forMode: .default)
+    }
+
+    @objc func updateAnimation() {
+        let elapsedTime = CACurrentMediaTime() - keyboardAnimation.startTime
+        let linearProgress = min(elapsedTime / keyboardAnimation.animationDuration, 1)
+        let easedProgress = 1 - pow(1 - linearProgress, 3)
+
+        // Interpolate between 'from' and 'to'
+        keyboardAnimation.animatedImeInset = keyboardAnimation.from + (keyboardAnimation.to - keyboardAnimation.from) * CGFloat(easedProgress)
+
+        self.emitImeEvent()
+        self.miniRuntime?.insets.ime = keyboardAnimation.animatedImeInset
+
+        if linearProgress >= 1 {
+            keyboardAnimation.displayLink?.invalidate()
+            keyboardAnimation.displayLink = nil
+        }
+    }
+}

package/ios/NativePlatformListener+ios.swift

@@ -13,23 +13,36 @@ extension NativeIOSPlatform {
     }
 
     func removePlatformListeners() {
-        cancellables.removeAll()
+        self.unregisterPlatformListeners()
+    }
+
+    func registerPlatformListener(callback: @escaping (CxxDependencyListener)) throws {
+        self.dependencyListeners.append(callback)
     }
 
-    func registerPlatformListener(callback: @escaping (CxxListener)) throws {
-        listeners.append(callback)
+    func registerImeListener(callback: @escaping (() -> Void)) throws {
+        self.imeListeners.append(callback)
     }
 
     func emitCxxEvent(dependencies: Array<UnistyleDependency>) {
-        self.listeners.forEach { $0(dependencies) }
+        self.dependencyListeners.forEach { $0(dependencies) }
+    }
+
+    func emitImeEvent() {
+        self.imeListeners.forEach { $0() }
+    }
+    
+    func unregisterPlatformListeners() {
+        cancellables.removeAll()
+        dependencyListeners.removeAll()
+        imeListeners.removeAll()
     }
 
     @objc func onWindowChange(_ notification: Notification) {
-        // add small delay (10ms) to make sure all values are up ot date
         guard let currentMiniRuntime = self.miniRuntime else {
             return
         }
-        
+
         let newMiniRuntime = self.buildMiniRuntime()
         let changedDependencies = UnistylesNativeMiniRuntime.diff(lhs: currentMiniRuntime, rhs: newMiniRuntime)
 

package/ios/UnistylesModuleOnLoad.h

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

package/ios/UnistylesModuleOnLoad.mm

@@ -12,6 +12,8 @@ RCT_EXPORT_MODULE(Unistyles)
 
 __weak RCTSurfacePresenter* _surfacePresenter;
 
+ @synthesize runtimeExecutor = _runtimeExecutor;
+
 + (BOOL)requiresMainQueueSetup {
     return YES;
 }
@@ -35,8 +37,16 @@ __weak RCTSurfacePresenter* _surfacePresenter;
 }
 
 - (void)createHybrids:(jsi::Runtime&)rt {
+    auto runOnJSThread = ([executor = _runtimeExecutor](std::function<void(jsi::Runtime& rt)> &&callback) {
+        __block auto objcCallback = callback;
+
+        [executor execute:^(jsi::Runtime& rt){
+            objcCallback(rt);
+        }];
+    });
+
     auto nativePlatform = Unistyles::NativePlatform::create();
-    auto unistylesRuntime = std::make_shared<HybridUnistylesRuntime>(nativePlatform, rt);
+    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/core/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["_useBreakpoint","require","_useTheme"],"sourceRoot":"../../../src","sources":["core/index.js"],"mappings":";;;;;;;;;;;;;;;;;AAAA,IAAAA,cAAA,GAAAC,OAAA;AACA,IAAAC,SAAA,GAAAD,OAAA","ignoreList":[]}
+{"version":3,"names":["_useBreakpoint","require","_useTheme"],"sourceRoot":"../../../src","sources":["core/index.ts"],"mappings":";;;;;;;;;;;;;;;;;AAAA,IAAAA,cAAA,GAAAC,OAAA;AACA,IAAAC,SAAA,GAAAD,OAAA","ignoreList":[]}

package/lib/commonjs/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["_specs","require","Object","keys","forEach","key","prototype","hasOwnProperty","call","_exportNames","exports","defineProperty","enumerable","get","_mq","_core"],"sourceRoot":"../../src","sources":["index.js"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AAAAC,MAAA,CAAAC,IAAA,CAAAH,MAAA,EAAAI,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAC,YAAA,EAAAJ,GAAA;EAAA,IAAAA,GAAA,IAAAK,OAAA,IAAAA,OAAA,CAAAL,GAAA,MAAAL,MAAA,CAAAK,GAAA;EAAAH,MAAA,CAAAS,cAAA,CAAAD,OAAA,EAAAL,GAAA;IAAAO,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAb,MAAA,CAAAK,GAAA;IAAA;EAAA;AAAA;AACA,IAAAS,GAAA,GAAAb,OAAA;AACA,IAAAc,KAAA,GAAAd,OAAA","ignoreList":[]}
+{"version":3,"names":["_specs","require","Object","keys","forEach","key","prototype","hasOwnProperty","call","_exportNames","exports","defineProperty","enumerable","get","_mq","_core"],"sourceRoot":"../../src","sources":["index.ts"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AAAAC,MAAA,CAAAC,IAAA,CAAAH,MAAA,EAAAI,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAC,YAAA,EAAAJ,GAAA;EAAA,IAAAA,GAAA,IAAAK,OAAA,IAAAA,OAAA,CAAAL,GAAA,MAAAL,MAAA,CAAAK,GAAA;EAAAH,MAAA,CAAAS,cAAA,CAAAD,OAAA,EAAAL,GAAA;IAAAO,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAb,MAAA,CAAAK,GAAA;IAAA;EAAA;AAAA;AACA,IAAAS,GAAA,GAAAb,OAAA;AAEA,IAAAc,KAAA,GAAAd,OAAA","ignoreList":[]}

package/lib/commonjs/mq.js

@@ -11,6 +11,7 @@ const getMQValue = value => {
   if (value === null) {
     return 0;
   }
+
   // todo take it from js
   const breakpoints = {
     xs: 0,
@@ -19,9 +20,11 @@ const getMQValue = value => {
     lg: 800,
     xl: 1200
   };
+
   // @ts-ignore
   return breakpoints[value] ?? 0;
 };
+
 /**
  * Utility to create cross-platform media queries
  * @returns - JavaScript symbol to be used in your stylesheet
@@ -42,4 +45,4 @@ const mq = exports.mq = {
     }
   })
 };
-//# sourceMappingURL=mq.js.mapmap
+//# sourceMappingURL=mq.js.map

package/lib/commonjs/mq.js.map

@@ -1,2 +1 @@
-{"version":3,"names":["getMQValue","value","breakpoints","xs","sm","md","lg","xl","mq","exports","only","width","wMin","wMax","Infinity","height","hMin","hMax","and"],"sourceRoot":"../../src","sources":["mq.js"],"mappings":";;;;;;AAAA,MAAMA,UAAU,GAAIC,KAAK,IAAK;EAC1B,IAAI,OAAOA,KAAK,KAAK,QAAQ,EAAE;IAC3B,OAAOA,KAAK;EAChB;EACA,IAAIA,KAAK,KAAK,IAAI,EAAE;IAChB,OAAO,CAAC;EACZ;EACA;EACA,MAAMC,WAAW,GAAG;IAChBC,EAAE,EAAE,CAAC;IACLC,EAAE,EAAE,GAAG;IACPC,EAAE,EAAE,GAAG;IACPC,EAAE,EAAE,GAAG;IACPC,EAAE,EAAE;EACR,CAAC;EACD;EACA,OAAOL,WAAW,CAACD,KAAK,CAAC,IAAI,CAAC;AAClC,CAAC;AACD;AACA;AACA;AACA;AACO,MAAMO,EAAE,GAAAC,OAAA,CAAAD,EAAA,GAAG;EACdE,IAAI,EAAE;IACFC,KAAK,EAAEA,CAACC,IAAI,GAAG,CAAC,EAAEC,IAAI,GAAGC,QAAQ,KAAK,MAAMd,UAAU,CAACY,IAAI,CAAC,KAAKZ,UAAU,CAACa,IAAI,CAAC,GAAG;IACpFE,MAAM,EAAEA,CAACC,IAAI,GAAG,CAAC,EAAEC,IAAI,GAAGH,QAAQ,KAAK,MAAMd,UAAU,CAACgB,IAAI,CAAC,KAAKhB,UAAU,CAACiB,IAAI,CAAC;EACtF,CAAC;EACDN,KAAK,EAAEA,CAACC,IAAI,GAAG,CAAC,EAAEC,IAAI,GAAGC,QAAQ,MAAM;IACnCI,GAAG,EAAE;MACDH,MAAM,EAAEA,CAACC,IAAI,GAAG,CAAC,EAAEC,IAAI,GAAGH,QAAQ,KAAK,MAAMd,UAAU,CAACY,IAAI,CAAC,KAAKZ,UAAU,CAACa,IAAI,CAAC,OAAOb,UAAU,CAACgB,IAAI,CAAC,KAAKhB,UAAU,CAACiB,IAAI,CAAC;IAClI;EACJ,CAAC,CAAC;EACFF,MAAM,EAAEA,CAACC,IAAI,GAAG,CAAC,EAAEC,IAAI,GAAGH,QAAQ,MAAM;IACpCI,GAAG,EAAE;MACDP,KAAK,EAAEA,CAACC,IAAI,GAAG,CAAC,EAAEC,IAAI,GAAGC,QAAQ,KAAK,MAAMd,UAAU,CAACY,IAAI,CAAC,KAAKZ,UAAU,CAACa,IAAI,CAAC,OAAOb,UAAU,CAACgB,IAAI,CAAC,KAAKhB,UAAU,CAACiB,IAAI,CAAC;IACjI;EACJ,CAAC;AACL,CAAC","ignoreList":[]}
-gnoreList":[]}
+{"version":3,"names":["getMQValue","value","breakpoints","xs","sm","md","lg","xl","mq","exports","only","width","wMin","wMax","Infinity","height","hMin","hMax","and"],"sourceRoot":"../../src","sources":["mq.ts"],"mappings":";;;;;;AAsBA,MAAMA,UAAU,GAAIC,KAAwB,IAAK;EAC7C,IAAI,OAAOA,KAAK,KAAK,QAAQ,EAAE;IAC3B,OAAOA,KAAK;EAChB;EAEA,IAAIA,KAAK,KAAK,IAAI,EAAE;IAChB,OAAO,CAAC;EACZ;;EAEA;EACA,MAAMC,WAAW,GAAG;IAChBC,EAAE,EAAE,CAAC;IACLC,EAAE,EAAE,GAAG;IACPC,EAAE,EAAE,GAAG;IACPC,EAAE,EAAE,GAAG;IACPC,EAAE,EAAE;EACR,CAAC;;EAED;EACA,OAAOL,WAAW,CAACD,KAAK,CAAC,IAAI,CAAC;AAClC,CAAC;;AAED;AACA;AACA;AACA;AACO,MAAMO,EAAa,GAAAC,OAAA,CAAAD,EAAA,GAAG;EACzBE,IAAI,EAAE;IACFC,KAAK,EAAEA,CAACC,IAAuB,GAAG,CAAC,EAAEC,IAAa,GAAGC,QAAQ,KAAM,MAAMd,UAAU,CAACY,IAAI,CAAC,KAAKZ,UAAU,CAACa,IAAI,CAAC,GAAyB;IACvIE,MAAM,EAAEA,CAACC,IAAuB,GAAG,CAAC,EAAEC,IAAa,GAAGH,QAAQ,KAAM,MAAMd,UAAU,CAACgB,IAAI,CAAC,KAAKhB,UAAU,CAACiB,IAAI,CAAC;EACnH,CAAC;EACDN,KAAK,EAAEA,CAACC,IAAuB,GAAG,CAAC,EAAEC,IAAa,GAAGC,QAAQ,MAAM;IAC/DI,GAAG,EAAE;MACDH,MAAM,EAAEA,CAACC,IAAuB,GAAG,CAAC,EAAEC,IAAa,GAAGH,QAAQ,KACzD,MAAMd,UAAU,CAACY,IAAI,CAAC,KAAKZ,UAAU,CAACa,IAAI,CAAC,OAAOb,UAAU,CAACgB,IAAI,CAAC,KAAKhB,UAAU,CAACiB,IAAI,CAAC;IAChG;EACJ,CAAC,CAAC;EACFF,MAAM,EAAEA,CAACC,IAAuB,GAAG,CAAC,EAAEC,IAAa,GAAGH,QAAQ,MAAM;IAChEI,GAAG,EAAE;MACDP,KAAK,EAAEA,CAACC,IAAuB,GAAG,CAAC,EAAEC,IAAa,GAAGC,QAAQ,KACxD,MAAMd,UAAU,CAACY,IAAI,CAAC,KAAKZ,UAAU,CAACa,IAAI,CAAC,OAAOb,UAAU,CAACgB,IAAI,CAAC,KAAKhB,UAAU,CAACiB,IAAI,CAAC;IAChG;EACJ,CAAC;AACL,CAAC","ignoreList":[]}

package/lib/commonjs/specs/NativePlatform/NativePlatform.nitro.js

@@ -19,6 +19,7 @@ let UnistyleDependency = exports.UnistyleDependency = /*#__PURE__*/function (Uni
   UnistyleDependency[UnistyleDependency["FontScale"] = 11] = "FontScale";
   UnistyleDependency[UnistyleDependency["StatusBar"] = 12] = "StatusBar";
   UnistyleDependency[UnistyleDependency["NavigationBar"] = 13] = "NavigationBar";
+  UnistyleDependency[UnistyleDependency["Ime"] = 14] = "Ime";
   return UnistyleDependency;
 }({}); // represents any native API that can communicate with Unistyles
 // not available from JS