react-native-unistyles 3.0.0-alpha.15 → 3.0.0-alpha.17

package/cxx/core/UnistylesState.cpp

@@ -88,8 +88,14 @@ int core::UnistylesState::parseColor(jsi::Value& maybeColor) {
         return 0;
     }
     
-    // we must convert it to uint32_t first, otherwise color will be broken
-    uint32_t color = this->_processColorFn.get()->call(*_rt, maybeColor.asString(*_rt)).asNumber();
-
-    return color ? color : 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();
+        
+        this->_colorCache[colorString.utf8(*_rt).c_str()] = color ? color : 0;
+    }
+    
+    return this->_colorCache[colorString.utf8(*_rt).c_str()];
 }

package/cxx/core/UnistylesState.h

@@ -43,6 +43,7 @@ private:
     std::vector<std::string> _registeredThemeNames{};
     std::optional<std::string> _currentThemeName = std::nullopt;
     std::shared_ptr<jsi::Function> _processColorFn;
+    std::unordered_map<std::string, uint32_t> _colorCache{};
 
     friend class UnistylesRegistry;
 };

package/cxx/parser/Parser.cpp

@@ -479,8 +479,8 @@ jsi::Value parser::Parser::getStylesForVariant(jsi::Runtime& rt, const std::stri
         : "default";
     auto hasKey = groupValue.hasProperty(rt, selectedVariantKey);
 
-    if (hasKey && !selectedVariant.has_value()) {
-        // add 'default' selection to variants map
+    if (!hasKey || !selectedVariant.has_value()) {
+        // for no key, add 'default' selection to variants map
         variants.emplace_back(groupName, selectedVariantKey);
     }
 
@@ -621,6 +621,11 @@ RawProps parser::Parser::parseStylesToShadowTreeStyles(jsi::Runtime& rt, const s
     auto& state = core::UnistylesRegistry::get().getState(rt);
 
     for (const auto& unistyleData : unistyles) {
+        if (!unistyleData->parsedStyle.has_value()) {
+            // todo this something happens with large dataset, debug it
+            continue;
+        }
+        
         helpers::enumerateJSIObject(rt, unistyleData->parsedStyle.value(), [&](const std::string& propertyName, jsi::Value& propertyValue){
             if (this->isColor(propertyName)) {
                 return convertedStyles.setProperty(rt, propertyName.c_str(), jsi::Value(state.parseColor(propertyValue)));

package/ios/Unistyles.h

@@ -1,3 +1,4 @@
 #pragma once
 
+#import "jsi/jsi.h"
 #import <React/RCTUtils.h>

package/package.json

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