concentric-sheet 1.0.0 → 1.0.1

package/README.md

@@ -1,6 +1,12 @@
-# ConcentricSheet
+# Concentric Sheet
 
-Nitro-powered React Native `Modal` replacement for iOS sheet presentation.
+
+
+https://github.com/user-attachments/assets/df69aee2-a0cc-477c-9425-aee1dacd7f1d
+
+
+
+React Native (iOS only) `Modal` replacement for iOS sheet presentation.
 
 This package keeps React Native's `Modal` behavior, and adds runtime access to
 native `UIViewController` / `UISheetPresentationController` options such as:

package/ios/SheetModalController.swift

@@ -1,9 +1,23 @@
 import Foundation
+import ObjectiveC.runtime
 import UIKit
 
 public final class SheetModalController: HybridSheetModalControllerSpec {
+  private static var didInstallModalHostHooks = false
+  private static weak var sharedInstance: SheetModalController?
+  private static var cachedPresentedModalConfig: PresentedModalConfig?
+
   public override init() {
     super.init()
+    Self.sharedInstance = self
+    Self.installModalHostHooksIfNeeded()
+  }
+
+  public func cachePresentedModalConfig(config: PresentedModalConfig) throws -> Bool {
+    return try onMainThread {
+      Self.cachedPresentedModalConfig = config
+      return true
+    }
   }
 
   public func applyPresentedModalConfig(config: PresentedModalConfig) throws -> Bool {
@@ -12,55 +26,7 @@ public final class SheetModalController: HybridSheetModalControllerSpec {
         return false
       }
 
-      var didApply = false
-      if let isModalInPresentation = config.isModalInPresentation {
-        controller.isModalInPresentation = isModalInPresentation
-        didApply = true
-      }
-      if config.preferredContentWidth != nil || config.preferredContentHeight != nil {
-        var preferredContentSize = controller.preferredContentSize
-        if let width = config.preferredContentWidth {
-          preferredContentSize.width = CGFloat(width)
-        }
-        if let height = config.preferredContentHeight {
-          preferredContentSize.height = CGFloat(height)
-        }
-        controller.preferredContentSize = preferredContentSize
-        didApply = true
-      }
-      if let modalViewBackground = config.modalViewBackground {
-        applyModalViewBackground(modalViewBackground, to: controller)
-        didApply = true
-      }
-      if let cornerConfiguration = config.cornerConfiguration {
-        if #available(iOS 26.0, *) {
-          let didFullyApply = applyCornerConfiguration(cornerConfiguration, to: controller)
-          didApply = didApply || didFullyApply
-        } else {
-          didApply = true
-        }
-      }
-
-      if let sheetConfig = config.sheet {
-        if #available(iOS 15.0, *), let sheet = controller.sheetPresentationController {
-          applySheetConfig(sheetConfig, to: sheet)
-          if #available(iOS 26.0, *),
-            let cornerConfiguration = config.cornerConfiguration
-          {
-            // Corner configuration is authoritative when provided.
-            // For concentric/capsule we clear preferredCornerRadius so UIKit can
-            // use its own sheet geometry instead of a forced fixed radius.
-            sheet.preferredCornerRadius = derivedSheetCornerRadius(from: cornerConfiguration)
-          } else if sheetConfig.preferredCornerRadius == nil {
-            sheet.preferredCornerRadius = nil
-          }
-          didApply = true
-        } else {
-          return false
-        }
-      }
-
-      return didApply || config.sheet == nil
+      return applyConfig(config, to: controller)
     }
   }
 
@@ -77,6 +43,58 @@ public final class SheetModalController: HybridSheetModalControllerSpec {
     }
   }
 
+  private func applyConfig(_ config: PresentedModalConfig, to controller: UIViewController) -> Bool {
+    var didApply = false
+    if let isModalInPresentation = config.isModalInPresentation {
+      controller.isModalInPresentation = isModalInPresentation
+      didApply = true
+    }
+    if config.preferredContentWidth != nil || config.preferredContentHeight != nil {
+      var preferredContentSize = controller.preferredContentSize
+      if let width = config.preferredContentWidth {
+        preferredContentSize.width = CGFloat(width)
+      }
+      if let height = config.preferredContentHeight {
+        preferredContentSize.height = CGFloat(height)
+      }
+      controller.preferredContentSize = preferredContentSize
+      didApply = true
+    }
+    if let modalViewBackground = config.modalViewBackground {
+      applyModalViewBackground(modalViewBackground, to: controller)
+      didApply = true
+    }
+    if let cornerConfiguration = config.cornerConfiguration {
+      if #available(iOS 26.0, *) {
+        let didFullyApply = applyCornerConfiguration(cornerConfiguration, to: controller)
+        didApply = didApply || didFullyApply
+      } else {
+        didApply = true
+      }
+    }
+
+    if let sheetConfig = config.sheet {
+      if #available(iOS 15.0, *), let sheet = controller.sheetPresentationController {
+        applySheetConfig(sheetConfig, to: sheet)
+        if #available(iOS 26.0, *),
+          let cornerConfiguration = config.cornerConfiguration
+        {
+          // Corner configuration is authoritative when provided.
+          // For concentric/capsule we clear preferredCornerRadius so UIKit can
+          // use its own sheet geometry instead of a forced fixed radius.
+          sheet.preferredCornerRadius = derivedSheetCornerRadius(from: cornerConfiguration)
+        } else if sheetConfig.preferredCornerRadius == nil {
+          sheet.preferredCornerRadius = nil
+        }
+        didApply = true
+      } else {
+        return false
+      }
+    }
+
+    return didApply || config.sheet == nil
+  }
+
   @available(iOS 15.0, *)
   private func applySheetConfig(
     _ config: SheetPresentationConfig,
@@ -291,4 +309,74 @@ public final class SheetModalController: HybridSheetModalControllerSpec {
 
     return nil
   }
+
+    // TODO: super hacky find better solution 🤷‍♂️
+  @MainActor
+  fileprivate static func preconfigurePresentedControllerIfNeeded(_ controller: UIViewController) {
+    guard isReactNativeModalHostController(controller) else { return }
+    guard let config = cachedPresentedModalConfig else { return }
+    _ = sharedInstance?.applyConfig(config, to: controller)
+    // One-shot consume so this config cannot leak to unrelated RN modals.
+    cachedPresentedModalConfig = nil
+  }
+
+    // TODO: super hacky find better solution 🤷‍♂️
+  private static func isReactNativeModalHostController(_ controller: UIViewController) -> Bool {
+    let className = NSStringFromClass(type(of: controller))
+    return className.contains("ModalHostViewController")
+  }
+
+    // TODO: super hacky find better solution 🤷‍♂️
+  private static func installModalHostHooksIfNeeded() {
+    guard !didInstallModalHostHooks else { return }
+    didInstallModalHostHooks = true
+
+    let classNames = ["RCTFabricModalHostViewController", "RCTModalHostViewController"]
+    for className in classNames {
+      guard let cls = NSClassFromString(className) else { continue }
+      swizzleViewWillAppear(on: cls)
+    }
+  }
+
+    // TODO: super hacky find better solution 🤷‍♂️
+  private static func swizzleViewWillAppear(on cls: AnyClass) {
+    let originalSelector = #selector(UIViewController.viewWillAppear(_:))
+    let swizzledSelector = #selector(UIViewController.ncs_modalHost_viewWillAppear(_:))
+
+    guard
+      let originalMethod = class_getInstanceMethod(cls, originalSelector),
+      let swizzledMethod = class_getInstanceMethod(UIViewController.self, swizzledSelector)
+    else {
+      return
+    }
+
+    let didAddMethod = class_addMethod(
+      cls,
+      swizzledSelector,
+      method_getImplementation(swizzledMethod),
+      method_getTypeEncoding(swizzledMethod)
+    )
+
+    guard didAddMethod,
+      let classSwizzledMethod = class_getInstanceMethod(cls, swizzledSelector)
+    else {
+      return
+    }
+
+    method_exchangeImplementations(originalMethod, classSwizzledMethod)
+  }
+}
+
+private extension UIViewController {
+  @objc
+  func ncs_modalHost_viewWillAppear(_ animated: Bool) {
+    if Thread.isMainThread {
+      SheetModalController.preconfigurePresentedControllerIfNeeded(self)
+    } else {
+      DispatchQueue.main.sync {
+        SheetModalController.preconfigurePresentedControllerIfNeeded(self)
+      }
+    }
+    ncs_modalHost_viewWillAppear(animated)
+  }
 }

package/lib/NativeSheetModal.js

@@ -111,6 +111,14 @@ export function Modal(props) {
         };
         attempt();
     }, [clearRetryTimeout, nativeConfig, visible]);
+    useEffect(() => {
+        if (Platform.OS !== 'ios')
+            return;
+        const controller = getSheetModalController();
+        if (controller == null)
+            return;
+        controller.cachePresentedModalConfig(nativeConfig);
+    }, [nativeConfig, visible]);
     useEffect(() => {
         applyNativeConfigWithRetry();
     }, [applyNativeConfigWithRetry]);

package/lib/specs/SheetModalController.nitro.d.ts

@@ -29,6 +29,7 @@ export interface PresentedModalConfig {
 export interface SheetModalController extends HybridObject<{
     ios: 'swift';
 }> {
+    cachePresentedModalConfig(config: PresentedModalConfig): boolean;
     applyPresentedModalConfig(config: PresentedModalConfig): boolean;
     dismissPresentedModal(animated: boolean): boolean;
 }

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

@@ -84,6 +84,14 @@ namespace margelo::nitro::concentricsheet {
 
   public:
     // Methods
+    inline bool cachePresentedModalConfig(const PresentedModalConfig& config) override {
+      auto __result = _swiftPart.cachePresentedModalConfig(std::forward<decltype(config)>(config));
+      if (__result.hasError()) [[unlikely]] {
+        std::rethrow_exception(__result.error());
+      }
+      auto __value = std::move(__result.value());
+      return __value;
+    }
     inline bool applyPresentedModalConfig(const PresentedModalConfig& config) override {
       auto __result = _swiftPart.applyPresentedModalConfig(std::forward<decltype(config)>(config));
       if (__result.hasError()) [[unlikely]] {

package/nitrogen/generated/ios/swift/HybridSheetModalControllerSpec.swift

@@ -13,6 +13,7 @@ public protocol HybridSheetModalControllerSpec_protocol: HybridObject {
   
 
   // Methods
+  func cachePresentedModalConfig(config: PresentedModalConfig) throws -> Bool
   func applyPresentedModalConfig(config: PresentedModalConfig) throws -> Bool
   func dismissPresentedModal(animated: Bool) throws -> Bool
 }

package/nitrogen/generated/ios/swift/HybridSheetModalControllerSpec_cxx.swift

@@ -124,6 +124,18 @@ open class HybridSheetModalControllerSpec_cxx {
   
 
   // Methods
+  @inline(__always)
+  public final func cachePresentedModalConfig(config: PresentedModalConfig) -> bridge.Result_bool_ {
+    do {
+      let __result = try self.__implementation.cachePresentedModalConfig(config: config)
+      let __resultCpp = __result
+      return bridge.create_Result_bool_(__resultCpp)
+    } catch (let __error) {
+      let __exceptionPtr = __error.toCpp()
+      return bridge.create_Result_bool_(__exceptionPtr)
+    }
+  }
+  
   @inline(__always)
   public final func applyPresentedModalConfig(config: PresentedModalConfig) -> bridge.Result_bool_ {
     do {

package/nitrogen/generated/shared/c++/HybridSheetModalControllerSpec.cpp

@@ -14,6 +14,7 @@ namespace margelo::nitro::concentricsheet {
     HybridObject::loadHybridMethods();
     // load custom methods/properties
     registerHybrids(this, [](Prototype& prototype) {
+      prototype.registerHybridMethod("cachePresentedModalConfig", &HybridSheetModalControllerSpec::cachePresentedModalConfig);
       prototype.registerHybridMethod("applyPresentedModalConfig", &HybridSheetModalControllerSpec::applyPresentedModalConfig);
       prototype.registerHybridMethod("dismissPresentedModal", &HybridSheetModalControllerSpec::dismissPresentedModal);
     });

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

@@ -49,6 +49,7 @@ namespace margelo::nitro::concentricsheet {
 
     public:
       // Methods
+      virtual bool cachePresentedModalConfig(const PresentedModalConfig& config) = 0;
       virtual bool applyPresentedModalConfig(const PresentedModalConfig& config) = 0;
       virtual bool dismissPresentedModal(bool animated) = 0;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "concentric-sheet",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "concentric-sheet",
   "main": "lib/index",
   "module": "lib/index",

package/src/NativeSheetModal.tsx

@@ -173,6 +173,13 @@ export function Modal(props: NativeSheetModalProps) {
     attempt()
   }, [clearRetryTimeout, nativeConfig, visible])
 
+  useEffect(() => {
+    if (Platform.OS !== 'ios') return
+    const controller = getSheetModalController()
+    if (controller == null) return
+    controller.cachePresentedModalConfig(nativeConfig)
+  }, [nativeConfig, visible])
+
   useEffect(() => {
     applyNativeConfigWithRetry()
   }, [applyNativeConfigWithRetry])

package/src/specs/SheetModalController.nitro.ts

@@ -36,6 +36,7 @@ export interface PresentedModalConfig {
 }
 
 export interface SheetModalController extends HybridObject<{ ios: 'swift' }> {
+  cachePresentedModalConfig(config: PresentedModalConfig): boolean
   applyPresentedModalConfig(config: PresentedModalConfig): boolean
   dismissPresentedModal(animated: boolean): boolean
 }