react-native-unistyles 3.0.0-alpha.3 → 3.0.0-alpha.31

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

@@ -21,10 +21,8 @@ import com.margelo.nitro.core.*
 @Keep
 @Suppress("RedundantSuppression", "KotlinJniMissingFunction", "PropertyName", "RedundantUnitReturnType", "unused")
 abstract class HybridNativePlatformSpec: HybridObject() {
-  protected val TAG = "HybridNativePlatformSpec"
-
   @DoNotStrip
-  val mHybridData: HybridData = initHybrid()
+  private var mHybridData: HybridData = initHybrid()
 
   init {
     // Pass this `HybridData` through to it's base class,
@@ -32,6 +30,13 @@ abstract class HybridNativePlatformSpec: HybridObject() {
     super.updateNative(mHybridData)
   }
 
+  /**
+   * Call from a child class to initialize HybridData with a child.
+   */
+  override fun updateNative(hybridData: HybridData) {
+    mHybridData = hybridData
+  }
+
   // Properties
   
 
@@ -111,9 +116,24 @@ abstract class HybridNativePlatformSpec: HybridObject() {
   @DoNotStrip
   @Keep
   private fun registerPlatformListener(callback: Func_void_std__vector_UnistyleDependency_): Unit {
-    val result = registerPlatformListener(callback.toLambda())
-    return result
+    val __result = registerPlatformListener(callback.toLambda())
+    return __result
   }
+  
+  @DoNotStrip
+  @Keep
+  abstract fun registerImeListener(callback: () -> Unit): Unit
+  
+  @DoNotStrip
+  @Keep
+  private fun registerImeListener(callback: Func_void): Unit {
+    val __result = registerImeListener(callback.toLambda())
+    return __result
+  }
+  
+  @DoNotStrip
+  @Keep
+  abstract fun unregisterPlatformListeners(): Unit
 
   private external fun initHybrid(): HybridData
 

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

@@ -29,5 +29,6 @@ enum class UnistyleDependency {
   PIXELRATIO,
   FONTSCALE,
   STATUSBAR,
-  NAVIGATIONBAR
+  NAVIGATIONBAR,
+  IME
 }

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

@@ -25,5 +25,6 @@ data class UnistylesNativeMiniRuntime(
   val rtl: Boolean,
   val statusBar: Dimensions,
   val navigationBar: Dimensions,
-  val orientation: Orientation
+  val isPortrait: Boolean,
+  val isLandscape: Boolean
 )

package/nitrogen/generated/android/unistyles+autolinking.cmake

@@ -47,6 +47,18 @@ target_link_libraries(
         unistyles
         fbjni::fbjni                              # <-- Facebook C++ JNI helpers
         ReactAndroid::jsi                         # <-- RN: JSI
-        ReactAndroid::react_nativemodule_core     # <-- RN: TurboModules Core
         react-native-nitro-modules::NitroModules  # <-- NitroModules Core :)
 )
+
+# Link react-native (different prefab between RN 0.75 and RN 0.76)
+if(ReactAndroid_VERSION_MINOR GREATER_EQUAL 76)
+    target_link_libraries(
+        unistyles
+        ReactAndroid::reactnative                 # <-- RN: Native Modules umbrella prefab
+    )
+else()
+    target_link_libraries(
+        unistyles
+        ReactAndroid::react_nativemodule_core     # <-- RN: TurboModules Core
+    )
+endif()

package/nitrogen/generated/android/{UnistylesOnLoad.cpp → unistylesOnLoad.cpp}

@@ -1,11 +1,11 @@
 ///
-/// UnistylesOnLoad.cpp
+/// unistylesOnLoad.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
 /// Copyright © 2024 Marc Rousavy @ Margelo
 ///
 
-#include "UnistylesOnLoad.hpp"
+#include "unistylesOnLoad.hpp"
 
 #include <jni.h>
 #include <fbjni/fbjni.h>
@@ -13,6 +13,7 @@
 
 #include "JHybridNativePlatformSpec.hpp"
 #include "JFunc_void_std__vector_UnistyleDependency_.hpp"
+#include "JFunc_void.hpp"
 
 namespace margelo::nitro::unistyles {
 
@@ -25,6 +26,7 @@ int initialize(JavaVM* vm) {
     // Register native JNI methods
     margelo::nitro::unistyles::JHybridNativePlatformSpec::registerNatives();
     margelo::nitro::unistyles::JFunc_void_std__vector_UnistyleDependency_::registerNatives();
+    margelo::nitro::unistyles::JFunc_void::registerNatives();
 
     // Register Nitro Hybrid Objects
     

package/nitrogen/generated/android/{UnistylesOnLoad.hpp → unistylesOnLoad.hpp}

@@ -1,5 +1,5 @@
 ///
-/// UnistylesOnLoad.hpp
+/// unistylesOnLoad.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
 /// Copyright © 2024 Marc Rousavy @ Margelo

package/nitrogen/generated/ios/Unistyles+autolinking.rb

@@ -24,7 +24,7 @@ def add_nitrogen_files(spec)
 
   spec.dependency "NitroModules"
 
-  current_source_files = spec.attributes_hash['source_files'] || []
+  current_source_files = Array(spec.attributes_hash['source_files'])
   spec.source_files = current_source_files + [
     # Generated cross-platform specs
     "nitrogen/generated/shared/**/*.{h,hpp,c,cpp,swift}",
@@ -32,7 +32,7 @@ def add_nitrogen_files(spec)
     "nitrogen/generated/ios/**/*.{h,hpp,c,cpp,mm,swift}",
   ]
 
-  current_public_header_files = spec.attributes_hash['public_header_files'] || []
+  current_public_header_files = Array(spec.attributes_hash['public_header_files'])
   spec.public_header_files = current_public_header_files + [
     # Generated specs
     "nitrogen/generated/shared/**/*.{h,hpp}",
@@ -40,7 +40,7 @@ def add_nitrogen_files(spec)
     "nitrogen/generated/ios/Unistyles-Swift-Cxx-Bridge.hpp"
   ]
 
-  current_private_header_files = spec.attributes_hash['private_header_files'] || []
+  current_private_header_files = Array(spec.attributes_hash['private_header_files'])
   spec.private_header_files = current_private_header_files + [
     # iOS specific specs
     "nitrogen/generated/ios/c++/**/*.{h,hpp}",
@@ -52,5 +52,7 @@ def add_nitrogen_files(spec)
     "CLANG_CXX_LANGUAGE_STANDARD" => "c++20",
     # Enables C++ <-> Swift interop (by default it's only C)
     "SWIFT_OBJC_INTEROP_MODE" => "objcxx",
+    # Enables stricter modular headers
+    "DEFINES_MODULE" => "YES",
   })
 end

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

@@ -6,3 +6,28 @@
 ///
 
 #include "Unistyles-Swift-Cxx-Bridge.hpp"
+
+// Include C++ implementation defined types
+#include "HybridNativePlatformSpecSwift.hpp"
+#include "Unistyles-Swift-Cxx-Umbrella.hpp"
+#include <NitroModules/HybridContext.hpp>
+
+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) {
+    Unistyles::HybridNativePlatformSpecCxx swiftPart = Unistyles::HybridNativePlatformSpecCxxUnsafe::fromUnsafe(swiftUnsafePointer);
+    return HybridContext::getOrCreate<margelo::nitro::unistyles::HybridNativePlatformSpecSwift>(swiftPart);
+  }
+  void* _Nonnull get_std__shared_ptr_margelo__nitro__unistyles__HybridNativePlatformSpec_(std__shared_ptr_margelo__nitro__unistyles__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]] {
+      throw std::runtime_error("Class \"HybridNativePlatformSpec\" is not implemented in Swift!");
+    }
+  #endif
+    Unistyles::HybridNativePlatformSpecCxx swiftPart = swiftWrapper->getSwiftPart();
+    return Unistyles::HybridNativePlatformSpecCxxUnsafe::toUnsafe(swiftPart);
+  }
+
+} // namespace margelo::nitro::unistyles::bridge::swift

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

@@ -8,28 +8,21 @@
 #pragma once
 
 // Forward declarations of C++ defined types
+// Forward declaration of `HybridNativePlatformSpec` to properly resolve imports.
+namespace margelo::nitro::unistyles { class HybridNativePlatformSpec; }
 // Forward declaration of `UnistyleDependency` to properly resolve imports.
 namespace margelo::nitro::unistyles { enum class UnistyleDependency; }
 
+// Forward declarations of Swift defined types
+// Forward declaration of `HybridNativePlatformSpecCxx` to properly resolve imports.
+namespace Unistyles { class HybridNativePlatformSpecCxx; }
+
 // Include C++ defined types
-#if __has_include("UnistyleDependency.hpp")
- #include "UnistyleDependency.hpp"
-#endif
-#if __has_include(<functional>)
- #include <functional>
-#endif
-#if __has_include(<memory>)
- #include <memory>
-#endif
-#if __has_include(<optional>)
- #include <optional>
-#endif
-#if __has_include(<string>)
- #include <string>
-#endif
-#if __has_include(<vector>)
- #include <vector>
-#endif
+#include "HybridNativePlatformSpec.hpp"
+#include "UnistyleDependency.hpp"
+#include <functional>
+#include <memory>
+#include <vector>
 
 /**
  * Contains specialized versions of C++ templated types so they can be accessed from Swift,
@@ -37,6 +30,7 @@ namespace margelo::nitro::unistyles { enum class UnistyleDependency; }
  */
 namespace margelo::nitro::unistyles::bridge::swift {
 
+  // pragma MARK: std::vector<UnistyleDependency>
   /**
    * Specialized version of `std::vector<UnistyleDependency>`.
    */
@@ -47,6 +41,7 @@ namespace margelo::nitro::unistyles::bridge::swift {
     return vector;
   }
   
+  // pragma MARK: std::function<void(const std::vector<UnistyleDependency>& /* dependencies */)>
   /**
    * Specialized version of `std::function<void(const std::vector<UnistyleDependency>&)>`.
    */
@@ -54,18 +49,17 @@ namespace margelo::nitro::unistyles::bridge::swift {
   /**
    * Wrapper class for a `std::function<void(const std::vector<UnistyleDependency>& / * dependencies * /)>`, this can be used from Swift.
    */
-  class Func_void_std__vector_UnistyleDependency__Wrapper {
+  class Func_void_std__vector_UnistyleDependency__Wrapper final {
   public:
-    explicit Func_void_std__vector_UnistyleDependency__Wrapper(const std::function<void(const std::vector<UnistyleDependency>& /* dependencies */)>& func): function(func) {}
-    explicit Func_void_std__vector_UnistyleDependency__Wrapper(std::function<void(const std::vector<UnistyleDependency>& /* dependencies */)>&& func): function(std::move(func)) {}
-  
-    void call(std::vector<UnistyleDependency> dependencies) const {
-      function(dependencies);
+    explicit Func_void_std__vector_UnistyleDependency__Wrapper(const std::function<void(const std::vector<UnistyleDependency>& /* dependencies */)>& func): _function(func) {}
+    explicit Func_void_std__vector_UnistyleDependency__Wrapper(std::function<void(const std::vector<UnistyleDependency>& /* dependencies */)>&& func): _function(std::move(func)) {}
+    inline void call(std::vector<UnistyleDependency> dependencies) const {
+      _function(dependencies);
     }
-  
-    std::function<void(const std::vector<UnistyleDependency>& /* dependencies */)> function;
+  private:
+    std::function<void(const std::vector<UnistyleDependency>& /* dependencies */)> _function;
   };
-  inline Func_void_std__vector_UnistyleDependency_ create_Func_void_std__vector_UnistyleDependency_(void* closureHolder, void(*call)(void* /* closureHolder */, std::vector<UnistyleDependency>), void(*destroy)(void*)) {
+  inline Func_void_std__vector_UnistyleDependency_ create_Func_void_std__vector_UnistyleDependency_(void* _Nonnull closureHolder, void(* _Nonnull call)(void* _Nonnull /* closureHolder */, std::vector<UnistyleDependency>), void(* _Nonnull destroy)(void* _Nonnull)) {
     std::shared_ptr<void> sharedClosureHolder(closureHolder, destroy);
     return Func_void_std__vector_UnistyleDependency_([sharedClosureHolder, call](const std::vector<UnistyleDependency>& dependencies) -> void {
       call(sharedClosureHolder.get(), dependencies);
@@ -75,12 +69,40 @@ namespace margelo::nitro::unistyles::bridge::swift {
     return std::make_shared<Func_void_std__vector_UnistyleDependency__Wrapper>(value);
   }
   
+  // pragma MARK: std::function<void()>
   /**
-   * Specialized version of `std::optional<std::string>`.
+   * Specialized version of `std::function<void()>`.
    */
-  using std__optional_std__string_ = std::optional<std::string>;
-  inline std::optional<std::string> create_std__optional_std__string_(const std::string& value) {
-    return std::optional<std::string>(value);
+  using Func_void = std::function<void()>;
+  /**
+   * Wrapper class for a `std::function<void()>`, this can be used from Swift.
+   */
+  class Func_void_Wrapper final {
+  public:
+    explicit Func_void_Wrapper(const std::function<void()>& func): _function(func) {}
+    explicit Func_void_Wrapper(std::function<void()>&& func): _function(std::move(func)) {}
+    inline void call() const {
+      _function();
+    }
+  private:
+    std::function<void()> _function;
+  };
+  inline Func_void create_Func_void(void* _Nonnull closureHolder, void(* _Nonnull call)(void* _Nonnull /* closureHolder */), void(* _Nonnull destroy)(void* _Nonnull)) {
+    std::shared_ptr<void> sharedClosureHolder(closureHolder, destroy);
+    return Func_void([sharedClosureHolder, call]() -> void {
+      call(sharedClosureHolder.get());
+    });
+  }
+  inline std::shared_ptr<Func_void_Wrapper> share_Func_void(const Func_void& value) {
+    return std::make_shared<Func_void_Wrapper>(value);
   }
+  
+  // pragma MARK: std::shared_ptr<margelo::nitro::unistyles::HybridNativePlatformSpec>
+  /**
+   * Specialized version of `std::shared_ptr<margelo::nitro::unistyles::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);
 
 } // namespace margelo::nitro::unistyles::bridge::swift

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

@@ -14,24 +14,12 @@ namespace margelo::nitro::unistyles { enum class ColorScheme; }
 namespace margelo::nitro::unistyles { struct Dimensions; }
 // Forward declaration of `HybridNativePlatformSpec` to properly resolve imports.
 namespace margelo::nitro::unistyles { class HybridNativePlatformSpec; }
-// Forward declaration of `HybridUnistylesNavigationBarSpec` to properly resolve imports.
-namespace margelo::nitro::unistyles { class HybridUnistylesNavigationBarSpec; }
-// Forward declaration of `HybridUnistylesRuntimeSpec` to properly resolve imports.
-namespace margelo::nitro::unistyles { class HybridUnistylesRuntimeSpec; }
-// Forward declaration of `HybridUnistylesShadowRegistrySpec` to properly resolve imports.
-namespace margelo::nitro::unistyles { class HybridUnistylesShadowRegistrySpec; }
-// Forward declaration of `HybridUnistylesStatusBarSpec` to properly resolve imports.
-namespace margelo::nitro::unistyles { class HybridUnistylesStatusBarSpec; }
-// Forward declaration of `HybridUnistylesStyleSheetSpec` to properly resolve imports.
-namespace margelo::nitro::unistyles { class HybridUnistylesStyleSheetSpec; }
 // Forward declaration of `Insets` to properly resolve imports.
 namespace margelo::nitro::unistyles { struct Insets; }
 // Forward declaration of `Orientation` to properly resolve imports.
 namespace margelo::nitro::unistyles { enum class Orientation; }
 // Forward declaration of `UnistyleDependency` to properly resolve imports.
 namespace margelo::nitro::unistyles { enum class UnistyleDependency; }
-// Forward declaration of `UnistylesCxxMiniRuntime` to properly resolve imports.
-namespace margelo::nitro::unistyles { struct UnistylesCxxMiniRuntime; }
 // Forward declaration of `UnistylesNativeMiniRuntime` to properly resolve imports.
 namespace margelo::nitro::unistyles { struct UnistylesNativeMiniRuntime; }
 
@@ -39,19 +27,12 @@ namespace margelo::nitro::unistyles { struct UnistylesNativeMiniRuntime; }
 #include "ColorScheme.hpp"
 #include "Dimensions.hpp"
 #include "HybridNativePlatformSpec.hpp"
-#include "HybridUnistylesNavigationBarSpec.hpp"
-#include "HybridUnistylesRuntimeSpec.hpp"
-#include "HybridUnistylesShadowRegistrySpec.hpp"
-#include "HybridUnistylesStatusBarSpec.hpp"
-#include "HybridUnistylesStyleSheetSpec.hpp"
 #include "Insets.hpp"
 #include "Orientation.hpp"
 #include "UnistyleDependency.hpp"
-#include "UnistylesCxxMiniRuntime.hpp"
 #include "UnistylesNativeMiniRuntime.hpp"
 #include <functional>
 #include <memory>
-#include <optional>
 #include <string>
 #include <vector>
 
@@ -67,16 +48,6 @@ namespace margelo::nitro::unistyles { struct UnistylesNativeMiniRuntime; }
 // Forward declarations of Swift defined types
 // Forward declaration of `HybridNativePlatformSpecCxx` to properly resolve imports.
 namespace Unistyles { class HybridNativePlatformSpecCxx; }
-// Forward declaration of `HybridUnistylesNavigationBarSpecCxx` to properly resolve imports.
-namespace Unistyles { class HybridUnistylesNavigationBarSpecCxx; }
-// Forward declaration of `HybridUnistylesRuntimeSpecCxx` to properly resolve imports.
-namespace Unistyles { class HybridUnistylesRuntimeSpecCxx; }
-// Forward declaration of `HybridUnistylesShadowRegistrySpecCxx` to properly resolve imports.
-namespace Unistyles { class HybridUnistylesShadowRegistrySpecCxx; }
-// Forward declaration of `HybridUnistylesStatusBarSpecCxx` to properly resolve imports.
-namespace Unistyles { class HybridUnistylesStatusBarSpecCxx; }
-// Forward declaration of `HybridUnistylesStyleSheetSpecCxx` to properly resolve imports.
-namespace Unistyles { class HybridUnistylesStyleSheetSpecCxx; }
 
 // Include Swift defined types
 #if __has_include("Unistyles-Swift.h")

package/nitrogen/generated/ios/c++/HybridNativePlatformSpecSwift.hpp

@@ -55,7 +55,7 @@ namespace margelo::nitro::unistyles {
    * the future, HybridNativePlatformSpecCxx can directly inherit from the C++ class HybridNativePlatformSpec
    * to simplify the whole structure and memory management.
    */
-  class HybridNativePlatformSpecSwift final: public HybridNativePlatformSpec {
+  class HybridNativePlatformSpecSwift: public virtual HybridNativePlatformSpec {
   public:
     // Constructor from a Swift instance
     explicit HybridNativePlatformSpecSwift(const Unistyles::HybridNativePlatformSpecCxx& swiftPart):
@@ -143,6 +143,12 @@ namespace margelo::nitro::unistyles {
     inline void registerPlatformListener(const std::function<void(const std::vector<UnistyleDependency>& /* dependencies */)>& callback) override {
       _swiftPart.registerPlatformListener(callback);
     }
+    inline void registerImeListener(const std::function<void()>& callback) override {
+      _swiftPart.registerImeListener(callback);
+    }
+    inline void unregisterPlatformListeners() override {
+      _swiftPart.unregisterPlatformListeners();
+    }
 
   private:
     Unistyles::HybridNativePlatformSpecCxx _swiftPart;

package/nitrogen/generated/ios/swift/HybridNativePlatformSpec.swift

@@ -27,7 +27,7 @@ import NitroModules
  * }
  * ```
  */
-public protocol HybridNativePlatformSpec: HybridObjectSpec {
+public protocol HybridNativePlatformSpec: AnyObject, HybridObjectSpec {
   // Properties
   
 
@@ -50,16 +50,6 @@ public protocol HybridNativePlatformSpec: HybridObjectSpec {
   func setImmersiveMode(isEnabled: Bool) throws -> Void
   func getMiniRuntime() throws -> UnistylesNativeMiniRuntime
   func registerPlatformListener(callback: @escaping ((_ dependencies: [UnistyleDependency]) -> Void)) throws -> Void
-}
-
-public extension HybridNativePlatformSpec {
-  /**
-   * Create a new instance of HybridNativePlatformSpecCxx for the given HybridNativePlatformSpec.
-   *
-   * Instances of HybridNativePlatformSpecCxx can be accessed from C++, and contain
-   * additional required bridging code for C++ <> Swift interop.
-   */
-  func createCxxBridge() -> HybridNativePlatformSpecCxx {
-    return HybridNativePlatformSpecCxx(self)
-  }
+  func registerImeListener(callback: @escaping (() -> Void)) throws -> Void
+  func unregisterPlatformListeners() throws -> Void
 }