react-native-unistyles 3.0.8 → 3.0.10

package/README.md

@@ -21,14 +21,14 @@ yarn add react-native-unistyles
 Install dependencies:
 
 ```shell
-yarn add react-native-edge-to-edge react-native-nitro-modules@0.27.2
+yarn add react-native-edge-to-edge react-native-nitro-modules@0.28.0
 ```
 
 > To avoid unexpected behavior, always use a fixed version of `react-native-nitro-modules`
 
 | react-native-unistyles | react-native-nitro-modules |
 |------------------------|----------------------------|
-| 3.0.0                  | 0.27.2                     |
+| 3.0.0                  | 0.28.0                     |
 
 Then follow [installation guides](https://unistyl.es/v3/start/getting-started) for your platform.
 

package/android/CMakeLists.txt

@@ -5,6 +5,10 @@ project(unistyles)
 file(GLOB_RECURSE CORE_SRC RELATIVE ${CMAKE_SOURCE_DIR} "../cxx/**/*.cpp")
 file(GLOB_RECURSE PLATFORM_SRC RELATIVE ${CMAKE_SOURCE_DIR} "./src/main/cxx/*.cpp")
 
+if(ReactAndroid_VERSION_MINOR GREATER_EQUAL 80)
+    target_compile_reactnative_options(unistyles PRIVATE)
+endif()
+
 add_library(unistyles
     SHARED
     ${CORE_SRC}
@@ -35,6 +39,6 @@ set_target_properties(unistyles PROPERTIES
 
 # For React Native 0.76 and above, we don't need to link anything
 # as NitroModules will automatically add ReactAndroid::reactnative prefab
-if (ReactAndroid_VERSION_MINOR LESS 76)
-    message(FATAL_ERROR "Unistyles 3.0 requires min. React Native version to be 0.76")
+if (ReactAndroid_VERSION_MINOR LESS 78)
+    message(FATAL_ERROR "Unistyles 3.0 requires min. React Native version to be 0.78")
 endif ()

package/cxx/hybridObjects/HybridShadowRegistry.cpp

@@ -6,7 +6,7 @@ using namespace facebook::react;
 jsi::Value HybridShadowRegistry::link(jsi::Runtime &rt, const jsi::Value &thisValue, const jsi::Value *args, size_t count) {
     helpers::assertThat(rt, count == 2, "Unistyles: Invalid babel transform 'ShadowRegistry link' expected 2 arguments.");
 
-    ShadowNode::Shared shadowNodeWrapper = shadowNodeFromValue(rt, args[0]);
+    auto shadowNodeWrapper = getShadowNodeFromRef(rt, args[0]);
 
     std::vector<core::Unistyle::Shared> unistyleWrappers = core::unistyleFromValue(rt, args[1]);
     std::vector<std::vector<folly::dynamic>> arguments;
@@ -98,7 +98,7 @@ jsi::Value HybridShadowRegistry::link(jsi::Runtime &rt, const jsi::Value &thisVa
 jsi::Value HybridShadowRegistry::unlink(jsi::Runtime &rt, const jsi::Value &thisValue, const jsi::Value *args, size_t count) {
     helpers::assertThat(rt, count == 1, "Unistyles: Invalid babel transform 'ShadowRegistry unlink' expected 1 argument.");
 
-    ShadowNode::Shared shadowNodeWrapper = shadowNodeFromValue(rt, args[0]);
+    auto shadowNodeWrapper = getShadowNodeFromRef(rt, args[0]);
 
     auto& registry = core::UnistylesRegistry::get();
 
@@ -108,7 +108,7 @@ jsi::Value HybridShadowRegistry::unlink(jsi::Runtime &rt, const jsi::Value &this
 }
 
 jsi::Value HybridShadowRegistry::flush(jsi::Runtime &rt, const jsi::Value &thisValue, const jsi::Value *args, size_t count) {
-    shadow::ShadowTreeManager::updateShadowTree(UIManagerBinding::getBinding(rt)->getUIManager().getShadowTreeRegistry());
+    shadow::ShadowTreeManager::updateShadowTree(rt);
 
     return jsi::Value::undefined();
 }
@@ -137,3 +137,11 @@ jsi::Value HybridShadowRegistry::getScopedTheme(jsi::Runtime &rt, const jsi::Val
         ? jsi::String::createFromUtf8(rt, maybeScopedTheme.value())
         : jsi::Value::undefined();
 }
+
+std::shared_ptr<const core::ShadowNode> HybridShadowRegistry::getShadowNodeFromRef(jsi::Runtime& rt, const jsi::Value& maybeRef) {
+#if REACT_NATIVE_VERSION_MINOR >= 81
+    return Bridging<std::shared_ptr<const ShadowNode>>::fromJs(rt, maybeRef);
+#else
+    return shadowNodeFromValue(rt, maybeRef);
+#endif
+}

package/cxx/hybridObjects/HybridShadowRegistry.h

@@ -6,6 +6,7 @@
 #include "UnistylesState.h"
 #include "UnistylesRegistry.h"
 #include "ShadowTreeManager.h"
+#include <cxxreact/ReactNativeVersion.h>
 
 namespace margelo::nitro::unistyles {
 
@@ -45,6 +46,8 @@ struct HybridShadowRegistry: public HybridUnistylesShadowRegistrySpec {
             prototype.registerRawHybridMethod("getScopedTheme", 0, &HybridShadowRegistry::getScopedTheme);
         });
     };
+    
+    std::shared_ptr<const core::ShadowNode> getShadowNodeFromRef(jsi::Runtime& rt, const jsi::Value& maybeRef);
 
 private:
     std::shared_ptr<HybridUnistylesRuntime> _unistylesRuntime;

package/cxx/hybridObjects/HybridStyleSheet.cpp

@@ -296,7 +296,7 @@ void HybridStyleSheet::onPlatformDependenciesChange(std::vector<UnistyleDependen
     parser.rebuildShadowLeafUpdates(rt, dependencyMap);
 
     this->notifyJSListeners(dependencies);
-    shadow::ShadowTreeManager::updateShadowTree(UIManagerBinding::getBinding(rt)->getUIManager().getShadowTreeRegistry());
+    shadow::ShadowTreeManager::updateShadowTree(rt);
 }
 
 void HybridStyleSheet::onPlatformNativeDependenciesChange(std::vector<UnistyleDependency> dependencies, UnistylesNativeMiniRuntime miniRuntime) {
@@ -352,7 +352,7 @@ void HybridStyleSheet::onPlatformNativeDependenciesChange(std::vector<UnistyleDe
         parser.rebuildShadowLeafUpdates(rt, dependencyMap);
 
         this->notifyJSListeners(unistyleDependencies);
-        shadow::ShadowTreeManager::updateShadowTree(UIManagerBinding::getBinding(rt)->getUIManager().getShadowTreeRegistry());
+        shadow::ShadowTreeManager::updateShadowTree(rt);
     });
 }
 
@@ -381,7 +381,7 @@ void HybridStyleSheet::onImeChange(UnistylesNativeMiniRuntime miniRuntime) {
         parser.rebuildShadowLeafUpdates(rt, dependencyMap);
 
         this->notifyJSListeners(dependencies);
-        shadow::ShadowTreeManager::updateShadowTree(UIManagerBinding::getBinding(rt)->getUIManager().getShadowTreeRegistry());
+        shadow::ShadowTreeManager::updateShadowTree(rt);
     });
 }
 

package/cxx/shadowTree/ShadowTreeManager.cpp

@@ -6,7 +6,7 @@ using namespace facebook;
 
 using AffectedNodes = std::unordered_map<const ShadowNodeFamily*, std::unordered_set<int>>;
 
-void shadow::ShadowTreeManager::updateShadowTree(const ShadowTreeRegistry& shadowTreeRegistry) {
+void shadow::ShadowTreeManager::updateShadowTree(jsi::Runtime& rt) {
     auto& registry = core::UnistylesRegistry::get();
 
     registry.trafficController.withLock([&](){
@@ -16,6 +16,21 @@ void shadow::ShadowTreeManager::updateShadowTree(const ShadowTreeRegistry& shado
             return;
         }
 
+#if REACT_NATIVE_VERSION_MINOR >= 81
+        std::unordered_map<Tag, folly::dynamic> tagToProps;
+
+        for (const auto& [family, props] : updates) {
+            tagToProps.insert({family->getTag(), props});
+
+            // Store in native props system to preserve during Reanimated cloning
+            const_cast<ShadowNodeFamily*>(family)->nativeProps_DEPRECATED =
+                std::make_unique<folly::dynamic>(props);
+        }
+
+        UIManagerBinding::getBinding(rt)->getUIManager().updateShadowTree(tagToProps);
+#else
+        const auto& shadowTreeRegistry = UIManagerBinding::getBinding(rt)->getUIManager().getShadowTreeRegistry();
+
         shadowTreeRegistry.enumerate([&updates](const ShadowTree& shadowTree, bool& stop){
             // we could iterate via updates and create multiple commits
             // but it can cause performance issues for hundreds of nodes
@@ -23,6 +38,12 @@ void shadow::ShadowTreeManager::updateShadowTree(const ShadowTreeRegistry& shado
             auto transaction = [&updates](const RootShadowNode& oldRootShadowNode) {
                 auto affectedNodes = shadow::ShadowTreeManager::findAffectedNodes(oldRootShadowNode, updates);
 
+                for (const auto& [family, props] : updates) {
+                    // Merge props to fix glitches caused by REA updates
+                    const_cast<ShadowNodeFamily*>(family)->nativeProps_DEPRECATED =
+                        std::make_unique<folly::dynamic>(props);
+                }
+
                 return  std::static_pointer_cast<RootShadowNode>(shadow::ShadowTreeManager::cloneShadowTree(
                     oldRootShadowNode,
                     updates,
@@ -36,12 +57,12 @@ void shadow::ShadowTreeManager::updateShadowTree(const ShadowTreeRegistry& shado
             // mountSynchronously: must be true as this is update from C++ not React
             shadowTree.commit(transaction, {false, true});
 
-
             // for now we're assuming single surface, can be improved in the future
             // stop = true means stop enumerating next shadow tree
             // so in other words first shadow tree is our desired tree
             stop = true;
         });
+#endif
     });
 }
 
@@ -80,15 +101,41 @@ AffectedNodes shadow::ShadowTreeManager::findAffectedNodes(const RootShadowNode&
     return affectedNodes;
 }
 
+Props::Shared shadow::ShadowTreeManager::computeUpdatedProps(const ShadowNode &shadowNode, ShadowLeafUpdates& updates) {
+    const auto family = &shadowNode.getFamily();
+    const auto rawPropsIt = updates.find(family);
+
+    if (rawPropsIt == updates.end()) {
+        return ShadowNodeFragment::propsPlaceholder();
+    }
+
+    const auto& componentDescriptor = shadowNode.getComponentDescriptor();
+    const auto& props = shadowNode.getProps();
+
+    PropsParserContext propsParserContext{
+        shadowNode.getSurfaceId(),
+        *shadowNode.getContextContainer()
+    };
+
+    folly::dynamic newProps = rawPropsIt->second == nullptr
+        ? folly::dynamic::object()
+        : rawPropsIt->second;
+
+    return componentDescriptor.cloneProps(
+        propsParserContext,
+        props,
+        RawProps(newProps)
+    );
+}
+
 // based on Reanimated algorithm
 // clone affected nodes recursively, inject props and commit tree
-ShadowNode::Unshared shadow::ShadowTreeManager::cloneShadowTree(const ShadowNode &shadowNode, ShadowLeafUpdates& updates, AffectedNodes& affectedNodes) {
+std::shared_ptr<ShadowNode> shadow::ShadowTreeManager::cloneShadowTree(const ShadowNode &shadowNode, ShadowLeafUpdates& updates, AffectedNodes& affectedNodes) {
     const auto family = &shadowNode.getFamily();
-    const auto rawPropsIt = updates.find(family);
     const auto childrenIt = affectedNodes.find(family);
 
     // Only copy children if we need to update them
-    std::shared_ptr<ShadowNode::ListOfShared> childrenPtr;
+    std::shared_ptr<std::vector<std::shared_ptr<const ShadowNode>>> childrenPtr;
     const auto& originalChildren = shadowNode.getChildren();
 
     if (childrenIt != affectedNodes.end()) {
@@ -98,42 +145,16 @@ ShadowNode::Unshared shadow::ShadowTreeManager::cloneShadowTree(const ShadowNode
             children[index] = cloneShadowTree(*children[index], updates, affectedNodes);
         }
 
-        childrenPtr = std::make_shared<ShadowNode::ListOfShared>(std::move(children));
+        childrenPtr = std::make_shared<std::vector<std::shared_ptr<const ShadowNode>>>(std::move(children));
     } else {
-        childrenPtr = std::make_shared<ShadowNode::ListOfShared>(originalChildren);
+        childrenPtr = std::make_shared<std::vector<std::shared_ptr<const ShadowNode>>>(originalChildren);
     }
 
-    Props::Shared updatedProps = nullptr;
-
-    if (rawPropsIt != updates.end()) {
-        const auto& componentDescriptor = shadowNode.getComponentDescriptor();
-        const auto& props = shadowNode.getProps();
-
-        PropsParserContext propsParserContext{
-            shadowNode.getSurfaceId(),
-            *shadowNode.getContextContainer()
-        };
-
-        folly::dynamic newProps;
-        #ifdef ANDROID
-            auto safeProps = rawPropsIt->second == nullptr
-                ? folly::dynamic::object()
-                : rawPropsIt->second;
-            newProps = folly::dynamic::merge(props->rawProps, safeProps);
-        #else
-            newProps = rawPropsIt->second;
-        #endif
-
-        updatedProps = componentDescriptor.cloneProps(
-            propsParserContext,
-            props,
-            RawProps(newProps)
-        );
-    }
+    Props::Shared updatedProps = computeUpdatedProps(shadowNode, updates);
 
     return shadowNode.clone({
-        updatedProps ? updatedProps : ShadowNodeFragment::propsPlaceholder(),
-        childrenPtr,
-        shadowNode.getState()
+        .props = updatedProps,
+        .children = childrenPtr,
+        .state = shadowNode.getState()
     });
 }

package/cxx/shadowTree/ShadowTreeManager.h

@@ -6,6 +6,7 @@
 #include <ranges>
 #include "ShadowLeafUpdate.h"
 #include "UnistylesRegistry.h"
+#include <cxxreact/ReactNativeVersion.h>
 
 namespace margelo::nitro::unistyles::shadow {
 
@@ -15,9 +16,10 @@ using namespace facebook;
 using AffectedNodes = std::unordered_map<const ShadowNodeFamily *, std::unordered_set<int>>;
 
 struct ShadowTreeManager {
-    static void updateShadowTree(const ShadowTreeRegistry& shadowTreeRegistry);
+    static void updateShadowTree(jsi::Runtime& rt);
     static AffectedNodes findAffectedNodes(const RootShadowNode& rootNode, ShadowLeafUpdates& updates);
-    static ShadowNode::Unshared cloneShadowTree(const ShadowNode &shadowNode, ShadowLeafUpdates& updates, AffectedNodes& affectedNodes);
+    static std::shared_ptr<ShadowNode> cloneShadowTree(const ShadowNode& shadowNode, ShadowLeafUpdates& updates, AffectedNodes& affectedNodes);
+    static Props::Shared computeUpdatedProps(const ShadowNode &shadowNode, ShadowLeafUpdates& updates);
 };
 
 }

package/nitrogen/generated/android/c++/JColorScheme.hpp

@@ -29,7 +29,7 @@ namespace margelo::nitro::unistyles {
     [[nodiscard]]
     ColorScheme toCpp() const {
       static const auto clazz = javaClassStatic();
-      static const auto fieldOrdinal = clazz->getField<int>("_ordinal");
+      static const auto fieldOrdinal = clazz->getField<int>("value");
       int ordinal = this->getFieldValue(fieldOrdinal);
       return static_cast<ColorScheme>(ordinal);
     }

package/nitrogen/generated/android/c++/JHybridNativePlatformSpec.hpp

@@ -29,6 +29,7 @@ namespace margelo::nitro::unistyles {
     // C++ constructor (called from Java via `initHybrid()`)
     explicit JHybridNativePlatformSpec(jni::alias_ref<jhybridobject> jThis) :
       HybridObject(HybridNativePlatformSpec::TAG),
+      HybridBase(jThis),
       _javaPart(jni::make_global(jThis)) {}
 
   public:

package/nitrogen/generated/android/c++/JOrientation.hpp

@@ -29,7 +29,7 @@ namespace margelo::nitro::unistyles {
     [[nodiscard]]
     Orientation toCpp() const {
       static const auto clazz = javaClassStatic();
-      static const auto fieldOrdinal = clazz->getField<int>("_ordinal");
+      static const auto fieldOrdinal = clazz->getField<int>("value");
       int ordinal = this->getFieldValue(fieldOrdinal);
       return static_cast<Orientation>(ordinal);
     }

package/nitrogen/generated/android/c++/JUnistyleDependency.hpp

@@ -29,7 +29,7 @@ namespace margelo::nitro::unistyles {
     [[nodiscard]]
     UnistyleDependency toCpp() const {
       static const auto clazz = javaClassStatic();
-      static const auto fieldOrdinal = clazz->getField<int>("_ordinal");
+      static const auto fieldOrdinal = clazz->getField<int>("value");
       int ordinal = this->getFieldValue(fieldOrdinal);
       return static_cast<UnistyleDependency>(ordinal);
     }

package/nitrogen/generated/android/kotlin/com/margelo/nitro/unistyles/ColorScheme.kt

@@ -15,12 +15,8 @@ import com.facebook.proguard.annotations.DoNotStrip
  */
 @DoNotStrip
 @Keep
-enum class ColorScheme {
-  DARK,
-  LIGHT,
-  UNSPECIFIED;
-
-  @DoNotStrip
-  @Keep
-  private val _ordinal = ordinal
+enum class ColorScheme(@DoNotStrip @Keep val value: Int) {
+  DARK(0),
+  LIGHT(1),
+  UNSPECIFIED(2);
 }

package/nitrogen/generated/android/kotlin/com/margelo/nitro/unistyles/Dimensions.kt

@@ -21,7 +21,11 @@ data class Dimensions
   @DoNotStrip
   @Keep
   constructor(
+    @DoNotStrip
+    @Keep
     val width: Double,
+    @DoNotStrip
+    @Keep
     val height: Double
   ) {
   /* main constructor */

package/nitrogen/generated/android/kotlin/com/margelo/nitro/unistyles/Insets.kt

@@ -21,10 +21,20 @@ data class Insets
   @DoNotStrip
   @Keep
   constructor(
+    @DoNotStrip
+    @Keep
     val top: Double,
+    @DoNotStrip
+    @Keep
     val bottom: Double,
+    @DoNotStrip
+    @Keep
     val left: Double,
+    @DoNotStrip
+    @Keep
     val right: Double,
+    @DoNotStrip
+    @Keep
     val ime: Double
   ) {
   /* main constructor */

package/nitrogen/generated/android/kotlin/com/margelo/nitro/unistyles/Orientation.kt

@@ -15,11 +15,7 @@ import com.facebook.proguard.annotations.DoNotStrip
  */
 @DoNotStrip
 @Keep
-enum class Orientation {
-  PORTRAIT,
-  LANDSCAPE;
-
-  @DoNotStrip
-  @Keep
-  private val _ordinal = ordinal
+enum class Orientation(@DoNotStrip @Keep val value: Int) {
+  PORTRAIT(0),
+  LANDSCAPE(1);
 }

package/nitrogen/generated/android/kotlin/com/margelo/nitro/unistyles/UnistyleDependency.kt

@@ -15,25 +15,21 @@ import com.facebook.proguard.annotations.DoNotStrip
  */
 @DoNotStrip
 @Keep
-enum class UnistyleDependency {
-  THEME,
-  THEMENAME,
-  ADAPTIVETHEMES,
-  BREAKPOINTS,
-  VARIANTS,
-  COLORSCHEME,
-  DIMENSIONS,
-  ORIENTATION,
-  CONTENTSIZECATEGORY,
-  INSETS,
-  PIXELRATIO,
-  FONTSCALE,
-  STATUSBAR,
-  NAVIGATIONBAR,
-  IME,
-  RTL;
-
-  @DoNotStrip
-  @Keep
-  private val _ordinal = ordinal
+enum class UnistyleDependency(@DoNotStrip @Keep val value: Int) {
+  THEME(0),
+  THEMENAME(1),
+  ADAPTIVETHEMES(2),
+  BREAKPOINTS(3),
+  VARIANTS(4),
+  COLORSCHEME(5),
+  DIMENSIONS(6),
+  ORIENTATION(7),
+  CONTENTSIZECATEGORY(8),
+  INSETS(9),
+  PIXELRATIO(10),
+  FONTSCALE(11),
+  STATUSBAR(12),
+  NAVIGATIONBAR(13),
+  IME(14),
+  RTL(15);
 }

package/nitrogen/generated/android/kotlin/com/margelo/nitro/unistyles/UnistylesNativeMiniRuntime.kt

@@ -21,16 +21,38 @@ data class UnistylesNativeMiniRuntime
   @DoNotStrip
   @Keep
   constructor(
+    @DoNotStrip
+    @Keep
     val colorScheme: ColorScheme,
+    @DoNotStrip
+    @Keep
     val screen: Dimensions,
+    @DoNotStrip
+    @Keep
     val contentSizeCategory: String,
+    @DoNotStrip
+    @Keep
     val insets: Insets,
+    @DoNotStrip
+    @Keep
     val pixelRatio: Double,
+    @DoNotStrip
+    @Keep
     val fontScale: Double,
+    @DoNotStrip
+    @Keep
     val rtl: Boolean,
+    @DoNotStrip
+    @Keep
     val statusBar: Dimensions,
+    @DoNotStrip
+    @Keep
     val navigationBar: Dimensions,
+    @DoNotStrip
+    @Keep
     val isPortrait: Boolean,
+    @DoNotStrip
+    @Keep
     val isLandscape: Boolean
   ) {
   /* main constructor */

package/nitrogen/generated/ios/Unistyles-Swift-Cxx-Bridge.cpp

@@ -29,12 +29,12 @@ namespace margelo::nitro::unistyles::bridge::swift {
     };
   }
   
-  // pragma MARK: std::shared_ptr<margelo::nitro::unistyles::HybridNativePlatformSpec>
-  std::shared_ptr<margelo::nitro::unistyles::HybridNativePlatformSpec> create_std__shared_ptr_margelo__nitro__unistyles__HybridNativePlatformSpec_(void* _Nonnull swiftUnsafePointer) {
+  // pragma MARK: std::shared_ptr<HybridNativePlatformSpec>
+  std::shared_ptr<HybridNativePlatformSpec> create_std__shared_ptr_HybridNativePlatformSpec_(void* _Nonnull swiftUnsafePointer) {
     Unistyles::HybridNativePlatformSpec_cxx swiftPart = Unistyles::HybridNativePlatformSpec_cxx::fromUnsafe(swiftUnsafePointer);
     return std::make_shared<margelo::nitro::unistyles::HybridNativePlatformSpecSwift>(swiftPart);
   }
-  void* _Nonnull get_std__shared_ptr_margelo__nitro__unistyles__HybridNativePlatformSpec_(std__shared_ptr_margelo__nitro__unistyles__HybridNativePlatformSpec_ cppType) {
+  void* _Nonnull get_std__shared_ptr_HybridNativePlatformSpec_(std__shared_ptr_HybridNativePlatformSpec_ cppType) {
     std::shared_ptr<margelo::nitro::unistyles::HybridNativePlatformSpecSwift> swiftWrapper = std::dynamic_pointer_cast<margelo::nitro::unistyles::HybridNativePlatformSpecSwift>(cppType);
     #ifdef NITRO_DEBUG
     if (swiftWrapper == nullptr) [[unlikely]] {

package/nitrogen/generated/ios/Unistyles-Swift-Cxx-Bridge.hpp

@@ -103,17 +103,17 @@ namespace margelo::nitro::unistyles::bridge::swift {
     return Func_void_UnistylesNativeMiniRuntime_Wrapper(std::move(value));
   }
   
-  // pragma MARK: std::shared_ptr<margelo::nitro::unistyles::HybridNativePlatformSpec>
+  // pragma MARK: std::shared_ptr<HybridNativePlatformSpec>
   /**
-   * Specialized version of `std::shared_ptr<margelo::nitro::unistyles::HybridNativePlatformSpec>`.
+   * Specialized version of `std::shared_ptr<HybridNativePlatformSpec>`.
    */
-  using std__shared_ptr_margelo__nitro__unistyles__HybridNativePlatformSpec_ = std::shared_ptr<margelo::nitro::unistyles::HybridNativePlatformSpec>;
-  std::shared_ptr<margelo::nitro::unistyles::HybridNativePlatformSpec> create_std__shared_ptr_margelo__nitro__unistyles__HybridNativePlatformSpec_(void* _Nonnull swiftUnsafePointer);
-  void* _Nonnull get_std__shared_ptr_margelo__nitro__unistyles__HybridNativePlatformSpec_(std__shared_ptr_margelo__nitro__unistyles__HybridNativePlatformSpec_ cppType);
+  using std__shared_ptr_HybridNativePlatformSpec_ = std::shared_ptr<HybridNativePlatformSpec>;
+  std::shared_ptr<HybridNativePlatformSpec> create_std__shared_ptr_HybridNativePlatformSpec_(void* _Nonnull swiftUnsafePointer);
+  void* _Nonnull get_std__shared_ptr_HybridNativePlatformSpec_(std__shared_ptr_HybridNativePlatformSpec_ cppType);
   
-  // pragma MARK: std::weak_ptr<margelo::nitro::unistyles::HybridNativePlatformSpec>
-  using std__weak_ptr_margelo__nitro__unistyles__HybridNativePlatformSpec_ = std::weak_ptr<margelo::nitro::unistyles::HybridNativePlatformSpec>;
-  inline std__weak_ptr_margelo__nitro__unistyles__HybridNativePlatformSpec_ weakify_std__shared_ptr_margelo__nitro__unistyles__HybridNativePlatformSpec_(const std::shared_ptr<margelo::nitro::unistyles::HybridNativePlatformSpec>& strong) { return strong; }
+  // pragma MARK: std::weak_ptr<HybridNativePlatformSpec>
+  using std__weak_ptr_HybridNativePlatformSpec_ = std::weak_ptr<HybridNativePlatformSpec>;
+  inline std__weak_ptr_HybridNativePlatformSpec_ weakify_std__shared_ptr_HybridNativePlatformSpec_(const std::shared_ptr<HybridNativePlatformSpec>& strong) { return strong; }
   
   // pragma MARK: Result<Insets>
   using Result_Insets_ = Result<Insets>;

package/nitrogen/generated/ios/swift/HybridNativePlatformSpec_cxx.swift

@@ -33,7 +33,7 @@ open class HybridNativePlatformSpec_cxx {
   /**
    * Holds a weak pointer to the C++ class that wraps the Swift class.
    */
-  private var __cxxPart: bridge.std__weak_ptr_margelo__nitro__unistyles__HybridNativePlatformSpec_
+  private var __cxxPart: bridge.std__weak_ptr_HybridNativePlatformSpec_
 
   /**
    * Create a new `HybridNativePlatformSpec_cxx` that wraps the given `HybridNativePlatformSpec`.
@@ -72,15 +72,15 @@ open class HybridNativePlatformSpec_cxx {
 
   /**
    * Gets (or creates) the C++ part of this Hybrid Object.
-   * The C++ part is a `std::shared_ptr<margelo::nitro::unistyles::HybridNativePlatformSpec>`.
+   * The C++ part is a `std::shared_ptr<HybridNativePlatformSpec>`.
    */
-  public func getCxxPart() -> bridge.std__shared_ptr_margelo__nitro__unistyles__HybridNativePlatformSpec_ {
+  public func getCxxPart() -> bridge.std__shared_ptr_HybridNativePlatformSpec_ {
     let cachedCxxPart = self.__cxxPart.lock()
     if cachedCxxPart.__convertToBool() {
       return cachedCxxPart
     } else {
-      let newCxxPart = bridge.create_std__shared_ptr_margelo__nitro__unistyles__HybridNativePlatformSpec_(self.toUnsafe())
-      __cxxPart = bridge.weakify_std__shared_ptr_margelo__nitro__unistyles__HybridNativePlatformSpec_(newCxxPart)
+      let newCxxPart = bridge.create_std__shared_ptr_HybridNativePlatformSpec_(self.toUnsafe())
+      __cxxPart = bridge.weakify_std__shared_ptr_HybridNativePlatformSpec_(newCxxPart)
       return newCxxPart
     }
   }

package/nitrogen/generated/shared/c++/ColorScheme.hpp

@@ -38,26 +38,24 @@ namespace margelo::nitro::unistyles {
 
 namespace margelo::nitro {
 
-  using namespace margelo::nitro::unistyles;
-
   // C++ ColorScheme <> JS ColorScheme (union)
   template <>
-  struct JSIConverter<ColorScheme> final {
-    static inline ColorScheme fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
+  struct JSIConverter<margelo::nitro::unistyles::ColorScheme> final {
+    static inline margelo::nitro::unistyles::ColorScheme fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
       std::string unionValue = JSIConverter<std::string>::fromJSI(runtime, arg);
       switch (hashString(unionValue.c_str(), unionValue.size())) {
-        case hashString("dark"): return ColorScheme::DARK;
-        case hashString("light"): return ColorScheme::LIGHT;
-        case hashString("unspecified"): return ColorScheme::UNSPECIFIED;
+        case hashString("dark"): return margelo::nitro::unistyles::ColorScheme::DARK;
+        case hashString("light"): return margelo::nitro::unistyles::ColorScheme::LIGHT;
+        case hashString("unspecified"): return margelo::nitro::unistyles::ColorScheme::UNSPECIFIED;
         default: [[unlikely]]
           throw std::invalid_argument("Cannot convert \"" + unionValue + "\" to enum ColorScheme - invalid value!");
       }
     }
-    static inline jsi::Value toJSI(jsi::Runtime& runtime, ColorScheme arg) {
+    static inline jsi::Value toJSI(jsi::Runtime& runtime, margelo::nitro::unistyles::ColorScheme arg) {
       switch (arg) {
-        case ColorScheme::DARK: return JSIConverter<std::string>::toJSI(runtime, "dark");
-        case ColorScheme::LIGHT: return JSIConverter<std::string>::toJSI(runtime, "light");
-        case ColorScheme::UNSPECIFIED: return JSIConverter<std::string>::toJSI(runtime, "unspecified");
+        case margelo::nitro::unistyles::ColorScheme::DARK: return JSIConverter<std::string>::toJSI(runtime, "dark");
+        case margelo::nitro::unistyles::ColorScheme::LIGHT: return JSIConverter<std::string>::toJSI(runtime, "light");
+        case margelo::nitro::unistyles::ColorScheme::UNSPECIFIED: return JSIConverter<std::string>::toJSI(runtime, "unspecified");
         default: [[unlikely]]
           throw std::invalid_argument("Cannot convert ColorScheme to JS - invalid value: "
                                     + std::to_string(static_cast<int>(arg)) + "!");

package/nitrogen/generated/shared/c++/Dimensions.hpp

@@ -41,19 +41,17 @@ namespace margelo::nitro::unistyles {
 
 namespace margelo::nitro {
 
-  using namespace margelo::nitro::unistyles;
-
   // C++ Dimensions <> JS Dimensions (object)
   template <>
-  struct JSIConverter<Dimensions> final {
-    static inline Dimensions fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
+  struct JSIConverter<margelo::nitro::unistyles::Dimensions> final {
+    static inline margelo::nitro::unistyles::Dimensions fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
       jsi::Object obj = arg.asObject(runtime);
-      return Dimensions(
+      return margelo::nitro::unistyles::Dimensions(
         JSIConverter<double>::fromJSI(runtime, obj.getProperty(runtime, "width")),
         JSIConverter<double>::fromJSI(runtime, obj.getProperty(runtime, "height"))
       );
     }
-    static inline jsi::Value toJSI(jsi::Runtime& runtime, const Dimensions& arg) {
+    static inline jsi::Value toJSI(jsi::Runtime& runtime, const margelo::nitro::unistyles::Dimensions& arg) {
       jsi::Object obj(runtime);
       obj.setProperty(runtime, "width", JSIConverter<double>::toJSI(runtime, arg.width));
       obj.setProperty(runtime, "height", JSIConverter<double>::toJSI(runtime, arg.height));

package/nitrogen/generated/shared/c++/Insets.hpp

@@ -44,14 +44,12 @@ namespace margelo::nitro::unistyles {
 
 namespace margelo::nitro {
 
-  using namespace margelo::nitro::unistyles;
-
   // C++ Insets <> JS Insets (object)
   template <>
-  struct JSIConverter<Insets> final {
-    static inline Insets fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
+  struct JSIConverter<margelo::nitro::unistyles::Insets> final {
+    static inline margelo::nitro::unistyles::Insets fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
       jsi::Object obj = arg.asObject(runtime);
-      return Insets(
+      return margelo::nitro::unistyles::Insets(
         JSIConverter<double>::fromJSI(runtime, obj.getProperty(runtime, "top")),
         JSIConverter<double>::fromJSI(runtime, obj.getProperty(runtime, "bottom")),
         JSIConverter<double>::fromJSI(runtime, obj.getProperty(runtime, "left")),
@@ -59,7 +57,7 @@ namespace margelo::nitro {
         JSIConverter<double>::fromJSI(runtime, obj.getProperty(runtime, "ime"))
       );
     }
-    static inline jsi::Value toJSI(jsi::Runtime& runtime, const Insets& arg) {
+    static inline jsi::Value toJSI(jsi::Runtime& runtime, const margelo::nitro::unistyles::Insets& arg) {
       jsi::Object obj(runtime);
       obj.setProperty(runtime, "top", JSIConverter<double>::toJSI(runtime, arg.top));
       obj.setProperty(runtime, "bottom", JSIConverter<double>::toJSI(runtime, arg.bottom));

package/nitrogen/generated/shared/c++/Orientation.hpp

@@ -37,24 +37,22 @@ namespace margelo::nitro::unistyles {
 
 namespace margelo::nitro {
 
-  using namespace margelo::nitro::unistyles;
-
   // C++ Orientation <> JS Orientation (union)
   template <>
-  struct JSIConverter<Orientation> final {
-    static inline Orientation fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
+  struct JSIConverter<margelo::nitro::unistyles::Orientation> final {
+    static inline margelo::nitro::unistyles::Orientation fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
       std::string unionValue = JSIConverter<std::string>::fromJSI(runtime, arg);
       switch (hashString(unionValue.c_str(), unionValue.size())) {
-        case hashString("portrait"): return Orientation::PORTRAIT;
-        case hashString("landscape"): return Orientation::LANDSCAPE;
+        case hashString("portrait"): return margelo::nitro::unistyles::Orientation::PORTRAIT;
+        case hashString("landscape"): return margelo::nitro::unistyles::Orientation::LANDSCAPE;
         default: [[unlikely]]
           throw std::invalid_argument("Cannot convert \"" + unionValue + "\" to enum Orientation - invalid value!");
       }
     }
-    static inline jsi::Value toJSI(jsi::Runtime& runtime, Orientation arg) {
+    static inline jsi::Value toJSI(jsi::Runtime& runtime, margelo::nitro::unistyles::Orientation arg) {
       switch (arg) {
-        case Orientation::PORTRAIT: return JSIConverter<std::string>::toJSI(runtime, "portrait");
-        case Orientation::LANDSCAPE: return JSIConverter<std::string>::toJSI(runtime, "landscape");
+        case margelo::nitro::unistyles::Orientation::PORTRAIT: return JSIConverter<std::string>::toJSI(runtime, "portrait");
+        case margelo::nitro::unistyles::Orientation::LANDSCAPE: return JSIConverter<std::string>::toJSI(runtime, "landscape");
         default: [[unlikely]]
           throw std::invalid_argument("Cannot convert Orientation to JS - invalid value: "
                                     + std::to_string(static_cast<int>(arg)) + "!");

package/nitrogen/generated/shared/c++/UnistyleDependency.hpp

@@ -46,16 +46,14 @@ namespace margelo::nitro::unistyles {
 
 namespace margelo::nitro {
 
-  using namespace margelo::nitro::unistyles;
-
   // C++ UnistyleDependency <> JS UnistyleDependency (enum)
   template <>
-  struct JSIConverter<UnistyleDependency> final {
-    static inline UnistyleDependency fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
+  struct JSIConverter<margelo::nitro::unistyles::UnistyleDependency> final {
+    static inline margelo::nitro::unistyles::UnistyleDependency fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
       int enumValue = JSIConverter<int>::fromJSI(runtime, arg);
-      return static_cast<UnistyleDependency>(enumValue);
+      return static_cast<margelo::nitro::unistyles::UnistyleDependency>(enumValue);
     }
-    static inline jsi::Value toJSI(jsi::Runtime& runtime, UnistyleDependency arg) {
+    static inline jsi::Value toJSI(jsi::Runtime& runtime, margelo::nitro::unistyles::UnistyleDependency arg) {
       int enumValue = static_cast<int>(arg);
       return JSIConverter<int>::toJSI(runtime, enumValue);
     }

package/nitrogen/generated/shared/c++/UnistylesCxxMiniRuntime.hpp

@@ -62,44 +62,42 @@ namespace margelo::nitro::unistyles {
 
 namespace margelo::nitro {
 
-  using namespace margelo::nitro::unistyles;
-
   // C++ UnistylesCxxMiniRuntime <> JS UnistylesCxxMiniRuntime (object)
   template <>
-  struct JSIConverter<UnistylesCxxMiniRuntime> final {
-    static inline UnistylesCxxMiniRuntime fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
+  struct JSIConverter<margelo::nitro::unistyles::UnistylesCxxMiniRuntime> final {
+    static inline margelo::nitro::unistyles::UnistylesCxxMiniRuntime fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
       jsi::Object obj = arg.asObject(runtime);
-      return UnistylesCxxMiniRuntime(
+      return margelo::nitro::unistyles::UnistylesCxxMiniRuntime(
         JSIConverter<std::optional<std::string>>::fromJSI(runtime, obj.getProperty(runtime, "themeName")),
         JSIConverter<std::optional<std::string>>::fromJSI(runtime, obj.getProperty(runtime, "breakpoint")),
         JSIConverter<bool>::fromJSI(runtime, obj.getProperty(runtime, "hasAdaptiveThemes")),
-        JSIConverter<ColorScheme>::fromJSI(runtime, obj.getProperty(runtime, "colorScheme")),
-        JSIConverter<Dimensions>::fromJSI(runtime, obj.getProperty(runtime, "screen")),
+        JSIConverter<margelo::nitro::unistyles::ColorScheme>::fromJSI(runtime, obj.getProperty(runtime, "colorScheme")),
+        JSIConverter<margelo::nitro::unistyles::Dimensions>::fromJSI(runtime, obj.getProperty(runtime, "screen")),
         JSIConverter<std::string>::fromJSI(runtime, obj.getProperty(runtime, "contentSizeCategory")),
-        JSIConverter<Insets>::fromJSI(runtime, obj.getProperty(runtime, "insets")),
+        JSIConverter<margelo::nitro::unistyles::Insets>::fromJSI(runtime, obj.getProperty(runtime, "insets")),
         JSIConverter<double>::fromJSI(runtime, obj.getProperty(runtime, "pixelRatio")),
         JSIConverter<double>::fromJSI(runtime, obj.getProperty(runtime, "fontScale")),
         JSIConverter<bool>::fromJSI(runtime, obj.getProperty(runtime, "rtl")),
-        JSIConverter<Dimensions>::fromJSI(runtime, obj.getProperty(runtime, "statusBar")),
-        JSIConverter<Dimensions>::fromJSI(runtime, obj.getProperty(runtime, "navigationBar")),
+        JSIConverter<margelo::nitro::unistyles::Dimensions>::fromJSI(runtime, obj.getProperty(runtime, "statusBar")),
+        JSIConverter<margelo::nitro::unistyles::Dimensions>::fromJSI(runtime, obj.getProperty(runtime, "navigationBar")),
         JSIConverter<bool>::fromJSI(runtime, obj.getProperty(runtime, "isPortrait")),
         JSIConverter<bool>::fromJSI(runtime, obj.getProperty(runtime, "isLandscape"))
       );
     }
-    static inline jsi::Value toJSI(jsi::Runtime& runtime, const UnistylesCxxMiniRuntime& arg) {
+    static inline jsi::Value toJSI(jsi::Runtime& runtime, const margelo::nitro::unistyles::UnistylesCxxMiniRuntime& arg) {
       jsi::Object obj(runtime);
       obj.setProperty(runtime, "themeName", JSIConverter<std::optional<std::string>>::toJSI(runtime, arg.themeName));
       obj.setProperty(runtime, "breakpoint", JSIConverter<std::optional<std::string>>::toJSI(runtime, arg.breakpoint));
       obj.setProperty(runtime, "hasAdaptiveThemes", JSIConverter<bool>::toJSI(runtime, arg.hasAdaptiveThemes));
-      obj.setProperty(runtime, "colorScheme", JSIConverter<ColorScheme>::toJSI(runtime, arg.colorScheme));
-      obj.setProperty(runtime, "screen", JSIConverter<Dimensions>::toJSI(runtime, arg.screen));
+      obj.setProperty(runtime, "colorScheme", JSIConverter<margelo::nitro::unistyles::ColorScheme>::toJSI(runtime, arg.colorScheme));
+      obj.setProperty(runtime, "screen", JSIConverter<margelo::nitro::unistyles::Dimensions>::toJSI(runtime, arg.screen));
       obj.setProperty(runtime, "contentSizeCategory", JSIConverter<std::string>::toJSI(runtime, arg.contentSizeCategory));
-      obj.setProperty(runtime, "insets", JSIConverter<Insets>::toJSI(runtime, arg.insets));
+      obj.setProperty(runtime, "insets", JSIConverter<margelo::nitro::unistyles::Insets>::toJSI(runtime, arg.insets));
       obj.setProperty(runtime, "pixelRatio", JSIConverter<double>::toJSI(runtime, arg.pixelRatio));
       obj.setProperty(runtime, "fontScale", JSIConverter<double>::toJSI(runtime, arg.fontScale));
       obj.setProperty(runtime, "rtl", JSIConverter<bool>::toJSI(runtime, arg.rtl));
-      obj.setProperty(runtime, "statusBar", JSIConverter<Dimensions>::toJSI(runtime, arg.statusBar));
-      obj.setProperty(runtime, "navigationBar", JSIConverter<Dimensions>::toJSI(runtime, arg.navigationBar));
+      obj.setProperty(runtime, "statusBar", JSIConverter<margelo::nitro::unistyles::Dimensions>::toJSI(runtime, arg.statusBar));
+      obj.setProperty(runtime, "navigationBar", JSIConverter<margelo::nitro::unistyles::Dimensions>::toJSI(runtime, arg.navigationBar));
       obj.setProperty(runtime, "isPortrait", JSIConverter<bool>::toJSI(runtime, arg.isPortrait));
       obj.setProperty(runtime, "isLandscape", JSIConverter<bool>::toJSI(runtime, arg.isLandscape));
       return obj;
@@ -112,15 +110,15 @@ namespace margelo::nitro {
       if (!JSIConverter<std::optional<std::string>>::canConvert(runtime, obj.getProperty(runtime, "themeName"))) return false;
       if (!JSIConverter<std::optional<std::string>>::canConvert(runtime, obj.getProperty(runtime, "breakpoint"))) return false;
       if (!JSIConverter<bool>::canConvert(runtime, obj.getProperty(runtime, "hasAdaptiveThemes"))) return false;
-      if (!JSIConverter<ColorScheme>::canConvert(runtime, obj.getProperty(runtime, "colorScheme"))) return false;
-      if (!JSIConverter<Dimensions>::canConvert(runtime, obj.getProperty(runtime, "screen"))) return false;
+      if (!JSIConverter<margelo::nitro::unistyles::ColorScheme>::canConvert(runtime, obj.getProperty(runtime, "colorScheme"))) return false;
+      if (!JSIConverter<margelo::nitro::unistyles::Dimensions>::canConvert(runtime, obj.getProperty(runtime, "screen"))) return false;
       if (!JSIConverter<std::string>::canConvert(runtime, obj.getProperty(runtime, "contentSizeCategory"))) return false;
-      if (!JSIConverter<Insets>::canConvert(runtime, obj.getProperty(runtime, "insets"))) return false;
+      if (!JSIConverter<margelo::nitro::unistyles::Insets>::canConvert(runtime, obj.getProperty(runtime, "insets"))) return false;
       if (!JSIConverter<double>::canConvert(runtime, obj.getProperty(runtime, "pixelRatio"))) return false;
       if (!JSIConverter<double>::canConvert(runtime, obj.getProperty(runtime, "fontScale"))) return false;
       if (!JSIConverter<bool>::canConvert(runtime, obj.getProperty(runtime, "rtl"))) return false;
-      if (!JSIConverter<Dimensions>::canConvert(runtime, obj.getProperty(runtime, "statusBar"))) return false;
-      if (!JSIConverter<Dimensions>::canConvert(runtime, obj.getProperty(runtime, "navigationBar"))) return false;
+      if (!JSIConverter<margelo::nitro::unistyles::Dimensions>::canConvert(runtime, obj.getProperty(runtime, "statusBar"))) return false;
+      if (!JSIConverter<margelo::nitro::unistyles::Dimensions>::canConvert(runtime, obj.getProperty(runtime, "navigationBar"))) return false;
       if (!JSIConverter<bool>::canConvert(runtime, obj.getProperty(runtime, "isPortrait"))) return false;
       if (!JSIConverter<bool>::canConvert(runtime, obj.getProperty(runtime, "isLandscape"))) return false;
       return true;

package/nitrogen/generated/shared/c++/UnistylesNativeMiniRuntime.hpp

@@ -58,38 +58,36 @@ namespace margelo::nitro::unistyles {
 
 namespace margelo::nitro {
 
-  using namespace margelo::nitro::unistyles;
-
   // C++ UnistylesNativeMiniRuntime <> JS UnistylesNativeMiniRuntime (object)
   template <>
-  struct JSIConverter<UnistylesNativeMiniRuntime> final {
-    static inline UnistylesNativeMiniRuntime fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
+  struct JSIConverter<margelo::nitro::unistyles::UnistylesNativeMiniRuntime> final {
+    static inline margelo::nitro::unistyles::UnistylesNativeMiniRuntime fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
       jsi::Object obj = arg.asObject(runtime);
-      return UnistylesNativeMiniRuntime(
-        JSIConverter<ColorScheme>::fromJSI(runtime, obj.getProperty(runtime, "colorScheme")),
-        JSIConverter<Dimensions>::fromJSI(runtime, obj.getProperty(runtime, "screen")),
+      return margelo::nitro::unistyles::UnistylesNativeMiniRuntime(
+        JSIConverter<margelo::nitro::unistyles::ColorScheme>::fromJSI(runtime, obj.getProperty(runtime, "colorScheme")),
+        JSIConverter<margelo::nitro::unistyles::Dimensions>::fromJSI(runtime, obj.getProperty(runtime, "screen")),
         JSIConverter<std::string>::fromJSI(runtime, obj.getProperty(runtime, "contentSizeCategory")),
-        JSIConverter<Insets>::fromJSI(runtime, obj.getProperty(runtime, "insets")),
+        JSIConverter<margelo::nitro::unistyles::Insets>::fromJSI(runtime, obj.getProperty(runtime, "insets")),
         JSIConverter<double>::fromJSI(runtime, obj.getProperty(runtime, "pixelRatio")),
         JSIConverter<double>::fromJSI(runtime, obj.getProperty(runtime, "fontScale")),
         JSIConverter<bool>::fromJSI(runtime, obj.getProperty(runtime, "rtl")),
-        JSIConverter<Dimensions>::fromJSI(runtime, obj.getProperty(runtime, "statusBar")),
-        JSIConverter<Dimensions>::fromJSI(runtime, obj.getProperty(runtime, "navigationBar")),
+        JSIConverter<margelo::nitro::unistyles::Dimensions>::fromJSI(runtime, obj.getProperty(runtime, "statusBar")),
+        JSIConverter<margelo::nitro::unistyles::Dimensions>::fromJSI(runtime, obj.getProperty(runtime, "navigationBar")),
         JSIConverter<bool>::fromJSI(runtime, obj.getProperty(runtime, "isPortrait")),
         JSIConverter<bool>::fromJSI(runtime, obj.getProperty(runtime, "isLandscape"))
       );
     }
-    static inline jsi::Value toJSI(jsi::Runtime& runtime, const UnistylesNativeMiniRuntime& arg) {
+    static inline jsi::Value toJSI(jsi::Runtime& runtime, const margelo::nitro::unistyles::UnistylesNativeMiniRuntime& arg) {
       jsi::Object obj(runtime);
-      obj.setProperty(runtime, "colorScheme", JSIConverter<ColorScheme>::toJSI(runtime, arg.colorScheme));
-      obj.setProperty(runtime, "screen", JSIConverter<Dimensions>::toJSI(runtime, arg.screen));
+      obj.setProperty(runtime, "colorScheme", JSIConverter<margelo::nitro::unistyles::ColorScheme>::toJSI(runtime, arg.colorScheme));
+      obj.setProperty(runtime, "screen", JSIConverter<margelo::nitro::unistyles::Dimensions>::toJSI(runtime, arg.screen));
       obj.setProperty(runtime, "contentSizeCategory", JSIConverter<std::string>::toJSI(runtime, arg.contentSizeCategory));
-      obj.setProperty(runtime, "insets", JSIConverter<Insets>::toJSI(runtime, arg.insets));
+      obj.setProperty(runtime, "insets", JSIConverter<margelo::nitro::unistyles::Insets>::toJSI(runtime, arg.insets));
       obj.setProperty(runtime, "pixelRatio", JSIConverter<double>::toJSI(runtime, arg.pixelRatio));
       obj.setProperty(runtime, "fontScale", JSIConverter<double>::toJSI(runtime, arg.fontScale));
       obj.setProperty(runtime, "rtl", JSIConverter<bool>::toJSI(runtime, arg.rtl));
-      obj.setProperty(runtime, "statusBar", JSIConverter<Dimensions>::toJSI(runtime, arg.statusBar));
-      obj.setProperty(runtime, "navigationBar", JSIConverter<Dimensions>::toJSI(runtime, arg.navigationBar));
+      obj.setProperty(runtime, "statusBar", JSIConverter<margelo::nitro::unistyles::Dimensions>::toJSI(runtime, arg.statusBar));
+      obj.setProperty(runtime, "navigationBar", JSIConverter<margelo::nitro::unistyles::Dimensions>::toJSI(runtime, arg.navigationBar));
       obj.setProperty(runtime, "isPortrait", JSIConverter<bool>::toJSI(runtime, arg.isPortrait));
       obj.setProperty(runtime, "isLandscape", JSIConverter<bool>::toJSI(runtime, arg.isLandscape));
       return obj;
@@ -99,15 +97,15 @@ namespace margelo::nitro {
         return false;
       }
       jsi::Object obj = value.getObject(runtime);
-      if (!JSIConverter<ColorScheme>::canConvert(runtime, obj.getProperty(runtime, "colorScheme"))) return false;
-      if (!JSIConverter<Dimensions>::canConvert(runtime, obj.getProperty(runtime, "screen"))) return false;
+      if (!JSIConverter<margelo::nitro::unistyles::ColorScheme>::canConvert(runtime, obj.getProperty(runtime, "colorScheme"))) return false;
+      if (!JSIConverter<margelo::nitro::unistyles::Dimensions>::canConvert(runtime, obj.getProperty(runtime, "screen"))) return false;
       if (!JSIConverter<std::string>::canConvert(runtime, obj.getProperty(runtime, "contentSizeCategory"))) return false;
-      if (!JSIConverter<Insets>::canConvert(runtime, obj.getProperty(runtime, "insets"))) return false;
+      if (!JSIConverter<margelo::nitro::unistyles::Insets>::canConvert(runtime, obj.getProperty(runtime, "insets"))) return false;
       if (!JSIConverter<double>::canConvert(runtime, obj.getProperty(runtime, "pixelRatio"))) return false;
       if (!JSIConverter<double>::canConvert(runtime, obj.getProperty(runtime, "fontScale"))) return false;
       if (!JSIConverter<bool>::canConvert(runtime, obj.getProperty(runtime, "rtl"))) return false;
-      if (!JSIConverter<Dimensions>::canConvert(runtime, obj.getProperty(runtime, "statusBar"))) return false;
-      if (!JSIConverter<Dimensions>::canConvert(runtime, obj.getProperty(runtime, "navigationBar"))) return false;
+      if (!JSIConverter<margelo::nitro::unistyles::Dimensions>::canConvert(runtime, obj.getProperty(runtime, "statusBar"))) return false;
+      if (!JSIConverter<margelo::nitro::unistyles::Dimensions>::canConvert(runtime, obj.getProperty(runtime, "navigationBar"))) return false;
       if (!JSIConverter<bool>::canConvert(runtime, obj.getProperty(runtime, "isPortrait"))) return false;
       if (!JSIConverter<bool>::canConvert(runtime, obj.getProperty(runtime, "isLandscape"))) return false;
       return true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-unistyles",
-  "version": "3.0.8",
+  "version": "3.0.10",
   "description": "Level up your React Native StyleSheet",
   "scripts": {
     "test": "NODE_ENV=babel-test jest ./plugin",
@@ -148,11 +148,11 @@
     "husky": "9.1.7",
     "jest": "29.7.0",
     "metro-react-native-babel-preset": "0.77.0",
-    "nitro-codegen": "0.27.2",
+    "nitro-codegen": "0.28.0",
     "react": "19.1.0",
     "react-native": "0.79.2",
     "react-native-builder-bob": "0.40.10",
-    "react-native-nitro-modules": "0.27.2",
+    "react-native-nitro-modules": "0.28.0",
     "react-native-reanimated": "3.17.5",
     "react-native-web": "0.20.0",
     "react-test-renderer": "19.1.0",