react-native-unistyles 3.0.0-alpha.4 → 3.0.0-alpha.5

package/cxx/core/UnistylesRegistry.cpp

@@ -117,6 +117,7 @@ void core::UnistylesRegistry::removeStyleSheet(int tag) {
     
 DependencyMap core::UnistylesRegistry::buildDependencyMap(std::vector<UnistyleDependency>& deps) {
     DependencyMap dependencyMap;
+    std::set<UnistyleDependency> uniqueDependencies(deps.begin(), deps.end());
  
     for (const auto& styleSheet : this->_styleSheetRegistry) {
         for (const auto& [_, unistyle] : styleSheet->unistyles) {
@@ -125,8 +126,8 @@ DependencyMap core::UnistylesRegistry::buildDependencyMap(std::vector<UnistyleDe
             bool hasAnyOfDependencies = std::any_of(
                 unistyle->dependencies.begin(),
                 unistyle->dependencies.end(),
-                [&deps](UnistyleDependency dep) {
-                    return std::find(deps.begin(), deps.end(), dep) != deps.end();
+                [&uniqueDependencies](UnistyleDependency dep) {
+                    return std::find(uniqueDependencies.begin(), uniqueDependencies.end(), dep) != uniqueDependencies.end();
                 }
             );
             

package/cxx/core/UnistylesRegistry.h

@@ -1,5 +1,6 @@
 #pragma once
 
+#include "set"
 #include <jsi/jsi.h>
 #include <react/renderer/uimanager/UIManager.h>
 #include <unordered_map>

package/cxx/hybridObjects/HybridStyleSheet.cpp

@@ -221,9 +221,17 @@ void HybridStyleSheet::loadExternalMethods(const jsi::Value& thisValue, jsi::Run
 void HybridStyleSheet::onPlatformDependenciesChange(std::vector<UnistyleDependency> dependencies) {
     auto& registry = core::UnistylesRegistry::get();
     auto parser = parser::Parser(this->_unistylesRuntime);
-    auto dependencyMap = registry.buildDependencyMap(dependencies);
     auto& rt = this->_unistylesRuntime->getRuntime();
 
+    // 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);
+    
+    if (colorSchemeIt != dependencies.end()) {
+        this->_unistylesRuntime->includeDependenciesForColorSchemeChange(dependencies);
+    }
+  
+    auto dependencyMap = registry.buildDependencyMap(dependencies);
+
     if (dependencyMap.size() == 0) {
         return;
     }

package/cxx/hybridObjects/HybridUnistylesRuntime.cpp

@@ -71,7 +71,7 @@ void HybridUnistylesRuntime::setAdaptiveThemes(bool isEnabled) {
 
     std::vector<UnistyleDependency> changedDependencies{};
 
-    changedDependencies.reserve(5);
+    changedDependencies.reserve(3);
 
     bool hadAdaptiveThemes = this->getHasAdaptiveThemes();
 
@@ -92,6 +92,11 @@ void HybridUnistylesRuntime::setAdaptiveThemes(bool isEnabled) {
 
     // if user enabled adaptive themes, then we need to make sure
     // we selected theme based on color scheme
+    this->calculateNewThemeAndDependencies(changedDependencies);
+    this->_onDependenciesChange(changedDependencies);
+};
+
+void HybridUnistylesRuntime::calculateNewThemeAndDependencies(std::vector<UnistyleDependency>& changedDependencies) {
     auto& state = core::UnistylesRegistry::get().getState(*_rt);
     auto colorScheme = this->getColorScheme();
     auto currentThemeName = this->getThemeName();
@@ -105,9 +110,7 @@ void HybridUnistylesRuntime::setAdaptiveThemes(bool isEnabled) {
 
         state.setTheme(nextTheme);
     }
-
-    this->_onDependenciesChange(changedDependencies);
-};
+}
 
 jsi::Value HybridUnistylesRuntime::updateTheme(jsi::Runtime &rt, const jsi::Value &thisValue, const jsi::Value *args, size_t count) {
     helpers::assertThat(rt, count == 2, "UnistylesRuntime.updateTheme expected to be called with 2 arguments.");
@@ -201,3 +204,15 @@ void HybridUnistylesRuntime::registerPlatformListener(const std::function<void(s
     this->_nativePlatform.registerPlatformListener(listener);
     this->_onDependenciesChange = listener;
 }
+
+void HybridUnistylesRuntime::includeDependenciesForColorSchemeChange(std::vector<UnistyleDependency>& deps) {
+    auto& registry = core::UnistylesRegistry::get();
+    auto& state = registry.getState(*this->_rt);
+
+    // ignore color scheme changes if user has no adaptive themes
+    if (!state.hasAdaptiveThemes()) {
+        return;
+    }
+
+    this->calculateNewThemeAndDependencies(deps);
+}

package/cxx/hybridObjects/HybridUnistylesRuntime.h

@@ -58,6 +58,8 @@ struct HybridUnistylesRuntime: public HybridUnistylesRuntimeSpec {
     UnistylesCxxMiniRuntime getMiniRuntime() override;
     jsi::Value getMiniRuntimeAsValue(jsi::Runtime& rt);
     jsi::Runtime& getRuntime();
+    void includeDependenciesForColorSchemeChange(std::vector<UnistyleDependency>& deps);
+    void calculateNewThemeAndDependencies(std::vector<UnistyleDependency>& deps);
 
 private:
     jsi::Runtime* _rt;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-unistyles",
-  "version": "3.0.0-alpha.4",
+  "version": "3.0.0-alpha.5",
   "description": "Level up your React Native StyleSheet",
   "scripts": {
     "test": "jest",