fix: add fixes for VariableContext

Author: marklawlor

cpp/HybridStyleRegistry.cpp

@@ -71,10 +71,30 @@ namespace margelo::nitro::cssnitro {
         });
     }
 
-    void HybridStyleRegistry::setRootVariable(const std::string &name,
-                                              const std::vector<HybridRootVariableRule> &value) {
-        // Call setTopLevelVariable with key="root"
-        VariableContext::setTopLevelVariable("root", name, value);
+    void HybridStyleRegistry::setRootVariables(const std::shared_ptr<AnyMap> &variables) {
+        VariableContext::createContext("root", "root");
+
+        // Loop over all entries in the AnyMap
+        for (const auto &entry: variables->getMap()) {
+            const std::string &key = entry.first;
+            const AnyValue &value = entry.second;
+
+            // Call setTopLevelVariable with key="root"
+            VariableContext::setTopLevelVariable("root", key, value);
+        }
+    }
+
+    void HybridStyleRegistry::setUniversalVariables(const std::shared_ptr<AnyMap> &variables) {
+        VariableContext::createContext("universal", "root");
+
+        // Loop over all entries in the AnyMap
+        for (const auto &entry: variables->getMap()) {
+            const std::string &key = entry.first;
+            const AnyValue &value = entry.second;
+
+            // Call setTopLevelVariable with key="universal"
+            VariableContext::setTopLevelVariable("universal", key, value);
+        }
     }
 
     Declarations HybridStyleRegistry::getDeclarations(const std::string &componentId,

cpp/HybridStyleRegistry.hpp

@@ -43,8 +43,9 @@ namespace margelo::nitro::cssnitro {
 
         void addStyleSheet(const HybridStyleSheet &stylesheet) override;
 
-        void setRootVariable(const std::string &name,
-                             const std::vector<HybridRootVariableRule> &value) override;
+        void setRootVariables(const std::shared_ptr<AnyMap> &variables) override;
+
+        void setUniversalVariables(const std::shared_ptr<AnyMap> &variables) override;
 
         Declarations getDeclarations(const std::string &componentId, const std::string &classNames,
                                      const std::string &variableScope,

cpp/VariableContext.cpp

@@ -8,6 +8,12 @@ namespace margelo::nitro::cssnitro {
     std::unordered_map<std::string, VariableContext::Context> VariableContext::contexts;
 
     void VariableContext::createContext(const std::string &key, const std::string &parent) {
+        // Check if context already exists
+        if (contexts.find(key) != contexts.end()) {
+            // Context already exists, don't overwrite it
+            return;
+        }
+
         // Create a new context with the specified parent
         Context ctx;
         ctx.parent = parent;
@@ -45,6 +51,13 @@ namespace margelo::nitro::cssnitro {
                 if (!std::holds_alternative<std::monostate>(result)) {
                     return result;
                 }
+            } else {
+                // Variable doesn't exist in this context, create a new Observable with nullptr
+                auto observable = reactnativecss::Observable<AnyValue>::create(AnyValue());
+                valueMap[name] = observable;
+
+                // Subscribe to the observable by calling get()
+                get(*observable);
             }
         }
         return std::nullopt;
@@ -159,13 +172,13 @@ namespace margelo::nitro::cssnitro {
     }
 
     void VariableContext::setTopLevelVariable(const std::string &key, const std::string &name,
-                                              const std::vector<HybridRootVariableRule> &value) {
-        // Create a new Computed that returns "yellow" for now
+                                              const AnyValue &value) {
+        // Create a new Computed that returns the provided value
         auto computed = reactnativecss::Computed<AnyValue>::create(
-                [](const AnyValue &prev, reactnativecss::Effect::GetProxy &get) -> AnyValue {
+                [value](const AnyValue &prev, reactnativecss::Effect::GetProxy &get) -> AnyValue {
                     (void) prev;
                     (void) get;
-                    return AnyValue("yellow");
+                    return value;
                 },
                 AnyValue() // Initial value
         );

cpp/VariableContext.hpp

@@ -14,9 +14,6 @@ namespace margelo::nitro::cssnitro {
 
     using AnyValue = ::margelo::nitro::AnyValue;
 
-    // Forward declaration
-    struct HybridRootVariableRule;
-
     class VariableContext {
     public:
         // Value can be either Observable or Computed
@@ -52,9 +49,9 @@ namespace margelo::nitro::cssnitro {
         static void setVariable(const std::string &key, const std::string &name,
                                 std::shared_ptr<reactnativecss::Computed<AnyValue>> computed);
 
-        // Set a top-level variable (creates a Computed from HybridRootVariableRule)
+        // Set a top-level variable (creates a Computed from AnyValue)
         static void setTopLevelVariable(const std::string &key, const std::string &name,
-                                        const std::vector<HybridRootVariableRule> &value);
+                                        const AnyValue &value);
 
     private:
         VariableContext() = delete; // Static-only class

src/specs/StyleRegistry/HybridStyleRegistry.nitro.ts

@@ -7,7 +7,8 @@ export type HybridStyleRegistry = StyleRegistry & RawStyleRegistry;
 export interface StyleRegistry
   extends HybridObject<{ ios: "c++"; android: "c++" }> {
   setClassname(classname: string, styleRule: HybridStyleRule[]): void;
-  setRootVariable(name: string, value: HybridRootVariableRule[]): void;
+  setRootVariables(variables: AnyMap): void;
+  setUniversalVariables(variables: AnyMap): void;
   addStyleSheet(stylesheet: HybridStyleSheet): void;
   getDeclarations(
     componentId: string,
@@ -131,12 +132,3 @@ interface HybridStyleRule {
 }
 
 type SpecificityArray = number[];
-
-/******************************    Variables    *******************************/
-
-interface HybridRootVariableRule {
-  d: AnyMap;
-
-  /** MediaQuery */
-  m?: AnyMap;
-}