react-native-unistyles 2.8.0-beta.1 → 2.8.0-beta.2

package/cxx/UnistylesRuntime.cpp

@@ -1,407 +1,36 @@
 #include "UnistylesRuntime.h"
-
+#include "Macros.h"
 #include <string>
-#include <vector>
-#include <algorithm>
 
-#pragma region HostObject
+using namespace facebook;
 
-std::vector<jsi::PropNameID> UnistylesRuntime::getPropertyNames(jsi::Runtime& runtime) {
+std::vector<jsi::PropNameID> UnistylesRuntime::getPropertyNames(jsi::Runtime& rt) {
     std::vector<jsi::PropNameID> properties;
+    std::for_each(this->getters.begin(), this->getters.end(), [&](const auto& it){
+        properties.push_back(jsi::PropNameID::forUtf8(rt, std::string(it.first)));
+    });
 
-    // getters
-    properties.push_back(jsi::PropNameID::forUtf8(runtime, std::string("screenWidth")));
-    properties.push_back(jsi::PropNameID::forUtf8(runtime, std::string("screenHeight")));
-    properties.push_back(jsi::PropNameID::forUtf8(runtime, std::string("contentSizeCategory")));
-    properties.push_back(jsi::PropNameID::forUtf8(runtime, std::string("hasAdaptiveThemes")));
-    properties.push_back(jsi::PropNameID::forUtf8(runtime, std::string("themeName")));
-    properties.push_back(jsi::PropNameID::forUtf8(runtime, std::string("breakpoint")));
-    properties.push_back(jsi::PropNameID::forUtf8(runtime, std::string("colorScheme")));
-    properties.push_back(jsi::PropNameID::forUtf8(runtime, std::string("sortedBreakpointPairs")));
-    properties.push_back(jsi::PropNameID::forUtf8(runtime, std::string("useBreakpoints")));
-    properties.push_back(jsi::PropNameID::forUtf8(runtime, std::string("useTheme")));
-    properties.push_back(jsi::PropNameID::forUtf8(runtime, std::string("updateTheme")));
-    properties.push_back(jsi::PropNameID::forUtf8(runtime, std::string("useAdaptiveThemes")));
-    properties.push_back(jsi::PropNameID::forUtf8(runtime, std::string("addPlugin")));
-    properties.push_back(jsi::PropNameID::forUtf8(runtime, std::string("removePlugin")));
-    properties.push_back(jsi::PropNameID::forUtf8(runtime, std::string("enabledPlugins")));
-    properties.push_back(jsi::PropNameID::forUtf8(runtime, std::string("insets")));
-    properties.push_back(jsi::PropNameID::forUtf8(runtime, std::string("statusBar")));
-    properties.push_back(jsi::PropNameID::forUtf8(runtime, std::string("navigationBar")));
-
-    // setters
-    properties.push_back(jsi::PropNameID::forUtf8(runtime, std::string("themes")));
+    std::for_each(this->setters.begin(), this->setters.end(), [&](const auto& it){
+        properties.push_back(jsi::PropNameID::forUtf8(rt, std::string(it.first)));
+    });
 
     return properties;
 }
 
-jsi::Value UnistylesRuntime::get(jsi::Runtime& runtime, const jsi::PropNameID& propNameId) {
-    std::string propName = propNameId.utf8(runtime);
-
-    if (propName == "screenWidth") {
-        return jsi::Value(this->screen.width);
-    }
-
-    if (propName == "screenHeight") {
-        return jsi::Value(this->screen.height);
-    }
-
-    if (propName == "hasAdaptiveThemes") {
-        return jsi::Value(this->hasAdaptiveThemes);
-    }
-
-    if (propName == "contentSizeCategory") {
-        return jsi::Value(jsi::String::createFromUtf8(runtime, this->contentSizeCategory));
-    }
-
-    if (propName == "themeName") {
-        return !this->themeName.empty()
-            ? jsi::Value(jsi::String::createFromUtf8(runtime, this->themeName))
-            : this->getThemeOrFail(runtime);
-    }
-
-    if (propName == "breakpoint") {
-        return !this->breakpoint.empty()
-            ? jsi::Value(jsi::String::createFromUtf8(runtime, this->breakpoint))
-            : jsi::Value::undefined();
-    }
-
-    if (propName == "colorScheme") {
-        return jsi::Value(jsi::String::createFromUtf8(runtime, this->colorScheme));
-    }
-
-    if (propName == "enabledPlugins") {
-        auto jsiArray = facebook::jsi::Array(runtime, this->pluginNames.size());
-
-        for (size_t i = 0; i < this->pluginNames.size(); i++) {
-            jsiArray.setValueAtIndex(runtime, i, facebook::jsi::String::createFromUtf8(runtime, this->pluginNames[i]));
-        }
-
-        return jsiArray;
-    }
-
-    if (propName == "sortedBreakpointPairs") {
-        std::unique_ptr<jsi::Array> sortedBreakpointEntriesArray = std::make_unique<jsi::Array>(runtime, this->sortedBreakpointPairs.size());
-
-        for (size_t i = 0; i < this->sortedBreakpointPairs.size(); ++i) {
-            std::unique_ptr<jsi::Array> pairArray = std::make_unique<jsi::Array>(runtime, 2);
-            jsi::String nameValue = jsi::String::createFromUtf8(runtime, this->sortedBreakpointPairs[i].first);
-
-            pairArray->setValueAtIndex(runtime, 0, nameValue);
-            pairArray->setValueAtIndex(runtime, 1, jsi::Value(this->sortedBreakpointPairs[i].second));
-            sortedBreakpointEntriesArray->setValueAtIndex(runtime, i, *pairArray);
-        }
-
-        return jsi::Value(runtime, *sortedBreakpointEntriesArray);
-    }
-
-    if (propName == "addPlugin") {
-        return jsi::Function::createFromHostFunction(
-            runtime,
-            jsi::PropNameID::forAscii(runtime, "addPlugin"),
-            1,
-            [this](jsi::Runtime &runtime, const jsi::Value &thisVal, const jsi::Value *arguments, size_t count) -> jsi::Value {
-                std::string pluginName = arguments[0].asString(runtime).utf8(runtime);
-                bool notify = arguments[1].asBool();
-
-                this->pluginNames.push_back(pluginName);
-
-                // registry enabled plugins won't notify listeners
-                if (notify) {
-                    this->onPluginChangeCallback();
-                }
+jsi::Value UnistylesRuntime::get(jsi::Runtime& rt, const jsi::PropNameID& propNameId) {
+    auto method = this->getters.find(propNameId.utf8(rt));
 
-                return jsi::Value::undefined();
-            }
-        );
-    }
-
-    if (propName == "removePlugin") {
-        return jsi::Function::createFromHostFunction(
-            runtime,
-            jsi::PropNameID::forAscii(runtime, "removePlugin"),
-            1,
-            [this](jsi::Runtime &runtime, const jsi::Value &thisVal, const jsi::Value *arguments, size_t count) -> jsi::Value {
-                std::string pluginName = arguments[0].asString(runtime).utf8(runtime);
-
-                auto it = std::find(this->pluginNames.begin(), this->pluginNames.end(), pluginName);
-
-                if (it != this->pluginNames.end()) {
-                    this->pluginNames.erase(it);
-                    this->onPluginChangeCallback();
-                }
-
-                return jsi::Value::undefined();
-            }
-        );
-    }
-
-    if (propName == "useBreakpoints") {
-        return jsi::Function::createFromHostFunction(
-            runtime,
-            jsi::PropNameID::forAscii(runtime, "useBreakpoints"),
-            1,
-            [this](jsi::Runtime &runtime, const jsi::Value &thisVal, const jsi::Value *arguments, size_t count) -> jsi::Value {
-                jsi::Object breakpointsObj = arguments[0].asObject(runtime);
-                jsi::Array propertyNames = breakpointsObj.getPropertyNames(runtime);
-                std::vector<std::pair<std::string, double>> sortedBreakpointEntriesVec;
-
-                for (size_t i = 0; i < propertyNames.size(runtime); ++i) {
-                    jsi::Value propNameValue = propertyNames.getValueAtIndex(runtime, i);
-                    std::string name = propNameValue.asString(runtime).utf8(runtime);
-                    jsi::PropNameID propNameID = jsi::PropNameID::forUtf8(runtime, name);
-                    jsi::Value value = breakpointsObj.getProperty(runtime, propNameID);
-
-                    if (value.isNumber()) {
-                        double breakpointValue = value.asNumber();
-                        sortedBreakpointEntriesVec.push_back(std::make_pair(name, breakpointValue));
-                    }
-                }
-
-                std::sort(sortedBreakpointEntriesVec.begin(), sortedBreakpointEntriesVec.end(), [](const std::pair<std::string, double>& a, const std::pair<std::string, double>& b) {
-                    return a.second < b.second;
-                });
-
-                if (sortedBreakpointEntriesVec.size() == 0) {
-                    throw jsi::JSError(runtime, UnistylesErrorBreakpointsCannotBeEmpty);
-                }
-
-                if (sortedBreakpointEntriesVec.at(0).second != 0) {
-                    throw jsi::JSError(runtime, UnistylesErrorBreakpointsMustStartFromZero);
-                }
-
-                this->sortedBreakpointPairs = sortedBreakpointEntriesVec;
-
-                std::string breakpoint = this->getBreakpointFromScreenWidth(this->screen.width, sortedBreakpointEntriesVec);
-
-                this->breakpoint = breakpoint;
-
-                return jsi::Value::undefined();
-            }
-        );
-    }
-
-    if (propName == "useTheme") {
-        return jsi::Function::createFromHostFunction(runtime,
-            jsi::PropNameID::forAscii(runtime, "useTheme"),
-            1,
-            [this](jsi::Runtime &runtime, const jsi::Value &thisVal, const jsi::Value *arguments, size_t count) -> jsi::Value {
-                std::string themeName = arguments[0].asString(runtime).utf8(runtime);
-
-                if (this->themeName != themeName) {
-                    this->themeName = themeName;
-                    this->onThemeChangeCallback(themeName);
-                }
-
-                return jsi::Value::undefined();
-            }
-        );
-    }
-
-    if (propName == "updateTheme") {
-        return jsi::Function::createFromHostFunction(runtime,
-            jsi::PropNameID::forAscii(runtime, "updateTheme"),
-            1,
-            [this](jsi::Runtime &runtime, const jsi::Value &thisVal, const jsi::Value *arguments, size_t count) -> jsi::Value {
-                std::string themeName = arguments[0].asString(runtime).utf8(runtime);
-
-                if (this->themeName == themeName) {
-                    this->onThemeChangeCallback(themeName);
-                }
-
-                return jsi::Value::undefined();
-            }
-        );
-    }
-
-    if (propName == "useAdaptiveThemes") {
-        return jsi::Function::createFromHostFunction(runtime,
-            jsi::PropNameID::forAscii(runtime, "useAdaptiveThemes"),
-            1,
-            [this](jsi::Runtime &runtime, const jsi::Value &thisVal, const jsi::Value *arguments, size_t count) -> jsi::Value {
-                bool enableAdaptiveThemes = arguments[0].asBool();
-            
-                if (enableAdaptiveThemes && this->colorScheme == UnistylesUnspecifiedScheme) {
-                    throw jsi::JSError(runtime, UnistylesErrorAdaptiveThemesNotSupported);
-                }
-
-                this->hasAdaptiveThemes = enableAdaptiveThemes;
-
-                if (!enableAdaptiveThemes || !this->supportsAutomaticColorScheme) {
-                    return jsi::Value::undefined();
-                }
-
-                if (this->themeName != this->colorScheme) {
-                    this->themeName = this->colorScheme;
-                    this->onThemeChangeCallback(this->themeName);
-                }
-
-                return jsi::Value::undefined();
-            }
-        );
-    }
-
-    if (propName == "insets") {
-        auto insets = jsi::Object(runtime);
-
-        insets.setProperty(runtime, "top", this->insets.top);
-        insets.setProperty(runtime, "bottom", this->insets.bottom);
-        insets.setProperty(runtime, "left", this->insets.left);
-        insets.setProperty(runtime, "right", this->insets.right);
-
-        return insets;
-    }
-
-    if (propName == "statusBar") {
-        auto statusBar = jsi::Object(runtime);
-        auto setStatusBarColorFunction = jsi::Function::createFromHostFunction(runtime,
-           jsi::PropNameID::forAscii(runtime, "setColor"),
-           1,
-           [this](jsi::Runtime &runtime, const jsi::Value &thisVal, const jsi::Value *arguments, size_t count) -> jsi::Value {
-               std::string color = arguments[0].asString(runtime).utf8(runtime);
-
-               if (this->onSetStatusBarColorCallback.has_value()) {
-                   this->onSetStatusBarColorCallback.value()(color);
-               }
-
-               return jsi::Value::undefined();
-           }
-        );
-
-        statusBar.setProperty(runtime, "width", this->statusBar.width);
-        statusBar.setProperty(runtime, "height", this->statusBar.height);
-        statusBar.setProperty(runtime, "setColor", setStatusBarColorFunction);
-
-        return statusBar;
-    }
-
-    if (propName == "navigationBar") {
-        auto navigationBarValue = jsi::Object(runtime);
-        auto setNavigationBarColorFunction = jsi::Function::createFromHostFunction(runtime,
-           jsi::PropNameID::forAscii(runtime, "setColor"),
-           1,
-           [this](jsi::Runtime &runtime, const jsi::Value &thisVal, const jsi::Value *arguments, size_t count) -> jsi::Value {
-               std::string color = arguments[0].asString(runtime).utf8(runtime);
-
-               if (this->onSetStatusBarColorCallback.has_value()) {
-                   this->onSetNavigationBarColorCallback.value()(color);
-               }
-
-               return jsi::Value::undefined();
-           }
-        );
-
-        navigationBarValue.setProperty(runtime, "width", this->navigationBar.width);
-        navigationBarValue.setProperty(runtime, "height", this->navigationBar.height);
-        navigationBarValue.setProperty(runtime, "setColor", setNavigationBarColorFunction);
-
-        return navigationBarValue;
+    if (method != this->getters.cend()) {
+        return method->second(rt, method->first);
     }
 
     return jsi::Value::undefined();
 }
 
-void UnistylesRuntime::set(jsi::Runtime& runtime, const jsi::PropNameID& propNameId, const jsi::Value& value) {
-    std::string propName = propNameId.utf8(runtime);
-
-    if (propName == "themes" && value.isObject()) {
-        jsi::Array themes = value.asObject(runtime).asArray(runtime);
-        std::vector<std::string> themesVector;
-        size_t length = themes.size(runtime);
-
-        for (size_t i = 0; i < length; ++i) {
-            jsi::Value element = themes.getValueAtIndex(runtime, i);
-
-            if (element.isString()) {
-                std::string theme = element.asString(runtime).utf8(runtime);
-                themesVector.push_back(theme);
-            }
-        }
-
-        if (themesVector.size() == 0) {
-            throw jsi::JSError(runtime, UnistylesErrorThemesCannotBeEmpty);
-        }
-
-        this->themes = themesVector;
-        this->themeName = "";
-
-        bool hasLightTheme = std::find(themesVector.begin(), themesVector.end(), "light") != themesVector.end();
-        bool hasDarkTheme = std::find(themesVector.begin(), themesVector.end(), "dark") != themesVector.end();
-
-        this->supportsAutomaticColorScheme = hasLightTheme && hasDarkTheme;
-
-        return;
-    }
-}
-
-#pragma endregion
-#pragma region Helpers
-
-std::string UnistylesRuntime::getBreakpointFromScreenWidth(int width, const std::vector<std::pair<std::string, double>>& sortedBreakpointPairs) {
-    for (size_t i = 0; i < sortedBreakpointPairs.size(); ++i) {
-        const auto& [key, value] = sortedBreakpointPairs[i];
-        const double maxVal = (i + 1 < sortedBreakpointPairs.size()) ? sortedBreakpointPairs[i + 1].second : std::numeric_limits<double>::infinity();
-
-        if (width >= value && width < maxVal) {
-            return key;
-        }
-    }
-
-    return sortedBreakpointPairs.empty() ? "" : sortedBreakpointPairs.back().first;
-}
-
-void UnistylesRuntime::handleScreenSizeChange(Dimensions& screen, Insets& insets, Dimensions& statusBar, Dimensions& navigationBar) {
-    std::string breakpoint = this->getBreakpointFromScreenWidth(screen.width, this->sortedBreakpointPairs);
-    bool hasDifferentBreakpoint = this->breakpoint != breakpoint;
-    bool hasDifferentScreenDimensions = this->screen.width != screen.width || this->screen.height != screen.height;
-    bool hasDifferentInsets = this->insets.top != insets.top || this->insets.bottom != insets.bottom || this->insets.left != insets.left || this->insets.right != insets.right;
-
-    // we don't need to check statusBar/navigationBar as they will only change on orientation change witch is equal to hasDifferentScreenDimensions
-    bool shouldNotify = hasDifferentBreakpoint || hasDifferentScreenDimensions || hasDifferentInsets;
-
-    this->breakpoint = breakpoint;
-    this->screen = {screen.width, screen.height};
-    this->insets = {insets.top, insets.bottom, insets.left, insets.right};
-    this->statusBar = {statusBar.width, statusBar.height};
-    this->navigationBar = {navigationBar.width, navigationBar.height};
+void UnistylesRuntime::set(jsi::Runtime& rt, const jsi::PropNameID& propNameId, const jsi::Value& value) {
+    auto method = this->setters.find(propNameId.utf8(rt));
 
-    std::string orientation = screen.width > screen.height
-        ? UnistylesOrientationLandscape
-        : UnistylesOrientationPortrait;
-
-    if (shouldNotify) {
-        this->onLayoutChangeCallback(breakpoint, orientation, screen, statusBar, insets, navigationBar);
+    if (method != this->setters.cend()) {
+        method->second(rt, value);
     }
 }
-
-void UnistylesRuntime::handleAppearanceChange(std::string colorScheme) {
-    this->colorScheme = colorScheme;
-
-    if (!this->supportsAutomaticColorScheme || !this->hasAdaptiveThemes) {
-        return;
-    }
-
-    if (this->themeName != this->colorScheme) {
-        this->onThemeChangeCallback(this->colorScheme);
-        this->themeName = this->colorScheme;
-    }
-}
-
-void UnistylesRuntime::handleContentSizeCategoryChange(std::string contentSizeCategory) {
-    this->contentSizeCategory = contentSizeCategory;
-    this->onContentSizeCategoryChangeCallback(contentSizeCategory);
-}
-
-jsi::Value UnistylesRuntime::getThemeOrFail(jsi::Runtime& runtime) {
-    if (this->themes.size() == 1) {
-        std::string themeName = this->themes.at(0);
-
-        this->themeName = themeName;
-
-        return jsi::String::createFromUtf8(runtime, themeName);
-    }
-
-    return jsi::Value().undefined();
-}
-
-#pragma endregion

package/cxx/UnistylesRuntime.h

@@ -1,108 +1,69 @@
 #pragma once
 
+#include "UnistylesModel.h"
+#include "Macros.h"
+#include <ReactCommon/CallInvoker.h>
 #include <jsi/jsi.h>
-#include <vector>
-#include <map>
-#include <optional>
 
 using namespace facebook;
 
-const std::string UnistylesOrientationPortrait = "portrait";
-const std::string UnistylesOrientationLandscape = "landscape";
+using Getter = std::function<jsi::Value(jsi::Runtime& rt, std::string)>;
+using Setter = std::function<std::optional<jsi::Value>(jsi::Runtime& rt, const jsi::Value&)>;
 
-const std::string UnistylesDarkScheme = "dark";
-const std::string UnistylesLightScheme = "light";
-const std::string UnistylesUnspecifiedScheme = "unspecified";
+struct JSI_EXPORT UnistylesRuntime : public jsi::HostObject, UnistylesModel {
+    UnistylesRuntime(jsi::Runtime& rt, std::shared_ptr<react::CallInvoker> callInvoker) : UnistylesModel(rt, callInvoker) {
+        this->getters = {
+            {"screenWidth", BIND_FN(getScreenWidth)},
+            {"screenHeight", BIND_FN(getScreenHeight)},
+            {"contentSizeCategory", BIND_FN(getContentSizeCategory)},
+            {"hasAdaptiveThemes", BIND_FN(hasEnabledAdaptiveThemes)},
+            {"themeName", BIND_FN(getThemeName)},
+            {"breakpoint", BIND_FN(getCurrentBreakpoint)},
+            {"colorScheme", BIND_FN(getColorScheme)},
+            {"sortedBreakpointPairs", BIND_FN(getSortedBreakpointPairs)},
+            {"useBreakpoints", BIND_FN(setBreakpoints)},
+            {"useTheme", BIND_FN(setActiveTheme)},
+            {"updateTheme", BIND_FN(updateTheme)},
+            {"useAdaptiveThemes", BIND_FN(useAdaptiveThemes)},
+            {"addPlugin", BIND_FN(addPlugin)},
+            {"removePlugin", BIND_FN(removePlugin)},
+            {"enabledPlugins", BIND_FN(getEnabledPlugins)},
+            {"insets", BIND_FN(getInsets)},
+            {"statusBar", BIND_FN(getStatusBar)},
+            {"navigationBar", BIND_FN(getNavigationBar)}
+        };
 
-const std::string UnistylesErrorBreakpointsCannotBeEmpty = "You are trying to register empty breakpoints object";
-const std::string UnistylesErrorBreakpointsMustStartFromZero = "You are trying to register breakpoints that don't start from 0";
-const std::string UnistylesErrorThemesCannotBeEmpty = "You are trying to register empty themes object";
-const std::string UnistylesErrorAdaptiveThemesNotSupported = "Your platform doesn't support adaptive themes";
+        this->setters = {
+            {"themes", BIND_FN(setThemes)}
+        };
+    };
 
-struct Dimensions {
-    int width;
-    int height;
-};
-
-struct Insets {
-    int top;
-    int bottom;
-    int left;
-    int right;
-};
+    jsi::Value getScreenWidth(jsi::Runtime&, std::string);
+    jsi::Value getScreenHeight(jsi::Runtime&, std::string);
+    jsi::Value getContentSizeCategory(jsi::Runtime&, std::string);
+    jsi::Value hasEnabledAdaptiveThemes(jsi::Runtime&, std::string);
+    jsi::Value getThemeName(jsi::Runtime&, std::string);
+    jsi::Value getCurrentBreakpoint(jsi::Runtime&, std::string);
+    jsi::Value getColorScheme(jsi::Runtime&, std::string);
+    jsi::Value getSortedBreakpointPairs(jsi::Runtime&, std::string);
+    jsi::Value setBreakpoints(jsi::Runtime&, std::string);
+    jsi::Value setActiveTheme(jsi::Runtime&, std::string);
+    jsi::Value updateTheme(jsi::Runtime&, std::string);
+    jsi::Value useAdaptiveThemes(jsi::Runtime&, std::string);
+    jsi::Value addPlugin(jsi::Runtime&, std::string);
+    jsi::Value removePlugin(jsi::Runtime&, std::string);
+    jsi::Value getEnabledPlugins(jsi::Runtime&, std::string);
+    jsi::Value getInsets(jsi::Runtime&, std::string);
+    jsi::Value getStatusBar(jsi::Runtime&, std::string);
+    jsi::Value getNavigationBar(jsi::Runtime&, std::string);
 
-class JSI_EXPORT UnistylesRuntime : public jsi::HostObject {
-private:
-    std::function<void(std::string)> onThemeChangeCallback;
-    std::function<void(std::string breakpoint, std::string orientation, Dimensions& screen, Dimensions& statusBar, Insets& insets, Dimensions& navigationBar)> onLayoutChangeCallback;
-    std::function<void(std::string)> onContentSizeCategoryChangeCallback;
-    std::function<void()> onPluginChangeCallback;
-    std::optional<std::function<void(std::string)>> onSetStatusBarColorCallback;
-    std::optional<std::function<void(std::string)>> onSetNavigationBarColorCallback;
-    
-    Dimensions screen;
-    Dimensions statusBar;
-    Dimensions navigationBar;
-    Insets insets;
-    std::string colorScheme;
-    std::string contentSizeCategory;
-    
-public:
-    UnistylesRuntime(
-        Dimensions screen,
-        std::string colorScheme,
-        std::string contentSizeCategory,
-        Insets insets,
-        Dimensions statusBar,
-        Dimensions navigationBar
-     ): screen(screen),
-        colorScheme(colorScheme),
-        contentSizeCategory(contentSizeCategory),
-        insets(insets),
-        statusBar(statusBar),
-        navigationBar(navigationBar) {}
+    std::optional<jsi::Value> setThemes(jsi::Runtime&, const jsi::Value&);
 
-    bool hasAdaptiveThemes;
-    bool supportsAutomaticColorScheme;
-    
-    std::string themeName;
-    std::string breakpoint;
-    std::vector<std::string> pluginNames;
-    std::vector<std::string> themes;
-    std::vector<std::pair<std::string, double>> sortedBreakpointPairs;
-    
-    void onThemeChange(std::function<void(std::string)> callback) {
-        this->onThemeChangeCallback = callback;
-    }
-    
-    void onLayoutChange(std::function<void(std::string breakpoint, std::string orientation, Dimensions& screen, Dimensions& statusBar, Insets& insets, Dimensions& navigationBar)> callback) {
-        this->onLayoutChangeCallback = callback;
-    }
-    
-    void onPluginChange(std::function<void()> callback) {
-        this->onPluginChangeCallback = callback;
-    }
-    
-    void onContentSizeCategoryChange(std::function<void(std::string)> callback) {
-        this->onContentSizeCategoryChangeCallback = callback;
-    }
-    
-    void onSetStatusBarColor(std::function<void(std::string color)> callback) {
-        this->onSetStatusBarColorCallback = callback;
-    }
-    
-    void onSetNavigationBarColor(std::function<void(std::string color)> callback) {
-        this->onSetNavigationBarColorCallback = callback;
-    }
+    jsi::Value get(jsi::Runtime&, const jsi::PropNameID&) override;
+    void set(jsi::Runtime&, const jsi::PropNameID&, const jsi::Value&) override;
+    std::vector<jsi::PropNameID> getPropertyNames(jsi::Runtime&) override;
 
-    jsi::Value get(jsi::Runtime&, const jsi::PropNameID& name) override;
-    void set(jsi::Runtime& runtime, const jsi::PropNameID& propNameId, const jsi::Value& value) override;
-    std::vector<jsi::PropNameID> getPropertyNames(jsi::Runtime& runtime) override;
-
-    void handleScreenSizeChange(Dimensions& screen, Insets& insets, Dimensions& statusBar, Dimensions& navigationBar);
-    void handleAppearanceChange(std::string colorScheme);
-    void handleContentSizeCategoryChange(std::string contentSizeCategory);
-
-    jsi::Value getThemeOrFail(jsi::Runtime&);
-    std::string getBreakpointFromScreenWidth(int width, const std::vector<std::pair<std::string, double>>& sortedBreakpointEntries);
+private:
+    std::map<std::string, Getter> getters;
+    std::map<std::string, Setter> setters;
 };

package/ios/UnistylesModule.h

@@ -1,5 +1,6 @@
 #import <React/RCTBridgeModule.h>
 #import <React/RCTEventEmitter.h>
+#import <ReactCommon/RCTRuntimeExecutor.h>
 #import <string>
 
 #if TARGET_OS_OSX
@@ -12,6 +13,13 @@
     #import "Platform_visionOS.h"
 #endif
 
+@interface RCTBridge (BridgeWithRuntime)
+
+- (void *)runtime;
+- (std::shared_ptr<facebook::react::CallInvoker>)jsCallInvoker;
+
+@end
+
 @interface UnistylesModule : RCTEventEmitter<RCTBridgeModule>
 
 @property (nonatomic, assign) BOOL hasListeners;