@lodev09/react-native-true-sheet 3.0.0-beta.3 → 3.0.0-beta.5

package/RNTrueSheet.podspec

@@ -13,8 +13,12 @@ Pod::Spec.new do |s|
   s.platforms    = { :ios => min_ios_version_supported }
   s.source       = { :git => "https://github.com/lodev09/react-native-true-sheet.git", :tag => "#{s.version}" }
 
-  s.source_files = "ios/**/*.{h,m,mm,swift,cpp}"
+  s.source_files = "ios/**/*.{h,m,mm,swift,cpp}", "common/cpp/**/*.{cpp,h}"
   s.private_header_files = "ios/**/*.h"
 
+  s.pod_target_xcconfig = {
+    "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/common/cpp\""
+  }
+
   install_modules_dependencies(s)
 end

package/android/src/main/java/com/lodev09/truesheet/TrueSheetContainerView.kt

@@ -3,6 +3,9 @@ package com.lodev09.truesheet
 import android.annotation.SuppressLint
 import android.view.View
 import androidx.core.view.isNotEmpty
+import com.facebook.react.bridge.WritableNativeMap
+import com.facebook.react.uimanager.PixelUtil.pxToDp
+import com.facebook.react.uimanager.StateWrapper
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.views.view.ReactViewGroup
 
@@ -26,6 +29,53 @@ class TrueSheetContainerView(private val reactContext: ThemedReactContext) :
 
   var delegate: TrueSheetContainerViewDelegate? = null
 
+  private var stateWrapper: StateWrapper? = null
+
+  // Pending dimensions to update when stateWrapper becomes available
+  private var pendingWidth: Int = 0
+  private var pendingHeight: Int = 0
+
+  fun setStateWrapper(wrapper: StateWrapper?) {
+    stateWrapper = wrapper
+
+    if (wrapper == null) return
+
+    // Get dimensions from parent controller and update state if we haven't yet
+    val controller = parent as? TrueSheetViewController
+    if (controller != null && pendingWidth == 0) {
+      val w = controller.width
+      val h = controller.height
+      if (w > 0 && h > 0) {
+        updateState(w, h)
+      }
+    }
+  }
+
+  /**
+   * Update state with container dimensions.
+   * Called by the controller when the dialog size changes.
+   */
+  fun updateState(width: Int, height: Int) {
+    // Skip if dimensions haven't changed
+    if (width == pendingWidth && height == pendingHeight && stateWrapper != null) {
+      return
+    }
+
+    // Store dimensions
+    pendingWidth = width
+    pendingHeight = height
+
+    val sw = stateWrapper ?: return
+
+    val realWidth = width.toFloat().pxToDp()
+    val realHeight = height.toFloat().pxToDp()
+
+    val newStateData = WritableNativeMap()
+    newStateData.putDouble("containerWidth", realWidth.toDouble())
+    newStateData.putDouble("containerHeight", realHeight.toDouble())
+    sw.updateState(newStateData)
+  }
+
   /**
    * Reference to content view (first child)
    */

package/android/src/main/java/com/lodev09/truesheet/TrueSheetContainerViewManager.kt

@@ -1,6 +1,8 @@
 package com.lodev09.truesheet
 
 import com.facebook.react.module.annotations.ReactModule
+import com.facebook.react.uimanager.ReactStylesDiffMap
+import com.facebook.react.uimanager.StateWrapper
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.ViewGroupManager
 
@@ -15,6 +17,11 @@ class TrueSheetContainerViewManager : ViewGroupManager<TrueSheetContainerView>()
 
   override fun createViewInstance(reactContext: ThemedReactContext): TrueSheetContainerView = TrueSheetContainerView(reactContext)
 
+  override fun updateState(view: TrueSheetContainerView, props: ReactStylesDiffMap?, stateWrapper: StateWrapper?): Any? {
+    view.setStateWrapper(stateWrapper)
+    return null
+  }
+
   companion object {
     const val REACT_CLASS = "TrueSheetContainerView"
   }

package/android/src/main/java/com/lodev09/truesheet/TrueSheetView.kt

@@ -18,7 +18,6 @@ import com.lodev09.truesheet.events.DragChangeEvent
 import com.lodev09.truesheet.events.DragEndEvent
 import com.lodev09.truesheet.events.MountEvent
 import com.lodev09.truesheet.events.PositionChangeEvent
-import com.lodev09.truesheet.events.SizeChangeEvent
 import com.lodev09.truesheet.events.WillDismissEvent
 import com.lodev09.truesheet.events.WillPresentEvent
 
@@ -350,14 +349,6 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
     viewController.dismiss()
   }
 
-  override fun viewControllerDidChangeSize(width: Int, height: Int) {
-    // Dispatch size change event to JS
-    val surfaceId = UIManagerHelper.getSurfaceId(this)
-    eventDispatcher?.dispatchEvent(
-      SizeChangeEvent(surfaceId, id, width, height)
-    )
-  }
-
   // ==================== TrueSheetContainerViewDelegate Implementation ====================
 
   override fun containerViewContentDidChangeSize(width: Int, height: Int) {

package/android/src/main/java/com/lodev09/truesheet/TrueSheetViewController.kt

@@ -40,7 +40,6 @@ interface TrueSheetViewControllerDelegate {
   fun viewControllerDidDragChange(index: Int, position: Float)
   fun viewControllerDidDragEnd(index: Int, position: Float)
   fun viewControllerDidChangePosition(index: Int, position: Float, transitioning: Boolean)
-  fun viewControllerDidChangeSize(width: Int, height: Int)
 }
 
 /**
@@ -65,6 +64,9 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
   private val jSTouchDispatcher = JSTouchDispatcher(this)
   private var jSPointerDispatcher: JSPointerDispatcher? = null
 
+  private var viewWidth = 0
+  private var viewHeight = 0
+
   /**
    * Delegate for handling view controller events
    */
@@ -774,6 +776,11 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
 
   override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {
     super.onSizeChanged(w, h, oldw, oldh)
+    viewWidth = w
+    viewHeight = h
+
+    // Update container state with new dimensions
+    containerView?.updateState(viewWidth, viewHeight)
 
     // Only proceed if size actually changed
     if (w == oldw && h == oldh) return
@@ -796,9 +803,6 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
         delegate?.viewControllerDidChangePosition(detentInfo.index, detentInfo.position, transitioning = true)
       }
     }
-
-    // Notify delegate about size change
-    delegate?.viewControllerDidChangeSize(w, h)
   }
 
   override fun handleException(t: Throwable) {

package/android/src/main/java/com/lodev09/truesheet/TrueSheetViewManager.kt

@@ -61,8 +61,7 @@ class TrueSheetViewManager :
       DragBeginEvent.EVENT_NAME to hashMapOf("registrationName" to DragBeginEvent.REGISTRATION_NAME),
       DragChangeEvent.EVENT_NAME to hashMapOf("registrationName" to DragChangeEvent.REGISTRATION_NAME),
       DragEndEvent.EVENT_NAME to hashMapOf("registrationName" to DragEndEvent.REGISTRATION_NAME),
-      PositionChangeEvent.EVENT_NAME to hashMapOf("registrationName" to PositionChangeEvent.REGISTRATION_NAME),
-      SizeChangeEvent.EVENT_NAME to hashMapOf("registrationName" to SizeChangeEvent.REGISTRATION_NAME)
+      PositionChangeEvent.EVENT_NAME to hashMapOf("registrationName" to PositionChangeEvent.REGISTRATION_NAME)
     )
 
   // ==================== Props ====================
@@ -154,6 +153,16 @@ class TrueSheetViewManager :
     view.setEdgeToEdgeFullScreen(edgeToEdgeFullScreen)
   }
 
+  @ReactProp(name = "fitScrollView", defaultBoolean = false)
+  override fun setFitScrollView(view: TrueSheetView, value: Boolean) {
+    // iOS-specific prop - no-op on Android
+  }
+
+  @ReactProp(name = "pageSizing", defaultBoolean = true)
+  override fun setPageSizing(view: TrueSheetView, value: Boolean) {
+    // iOS-specific prop - no-op on Android
+  }
+
   companion object {
     const val REACT_CLASS = "TrueSheetView"
     const val TAG_NAME = "TrueSheet"

package/android/src/main/jni/CMakeLists.txt

@@ -0,0 +1,87 @@
+cmake_minimum_required(VERSION 3.13)
+set(CMAKE_VERBOSE_MAKEFILE ON)
+
+set(LIB_LITERAL TrueSheetSpec)
+set(LIB_TARGET_NAME react_codegen_${LIB_LITERAL})
+
+set(LIB_ANDROID_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../..)
+set(LIB_COMMON_DIR ${LIB_ANDROID_DIR}/../common/cpp)
+set(LIB_ANDROID_GENERATED_JNI_DIR ${LIB_ANDROID_DIR}/build/generated/source/codegen/jni)
+set(LIB_ANDROID_GENERATED_COMPONENTS_DIR ${LIB_ANDROID_GENERATED_JNI_DIR}/react/renderer/components/${LIB_LITERAL})
+
+file(GLOB LIB_CUSTOM_SRCS CONFIGURE_DEPENDS *.cpp ${LIB_COMMON_DIR}/react/renderer/components/${LIB_LITERAL}/*.cpp)
+file(GLOB LIB_CODEGEN_SRCS CONFIGURE_DEPENDS ${LIB_ANDROID_GENERATED_JNI_DIR}/*.cpp ${LIB_ANDROID_GENERATED_COMPONENTS_DIR}/*.cpp)
+
+add_library(
+  ${LIB_TARGET_NAME}
+  SHARED
+  ${LIB_CUSTOM_SRCS}
+  ${LIB_CODEGEN_SRCS}
+)
+
+target_include_directories(
+  ${LIB_TARGET_NAME}
+  PUBLIC
+  .
+  ${LIB_COMMON_DIR}
+  ${LIB_ANDROID_GENERATED_JNI_DIR}
+  ${LIB_ANDROID_GENERATED_COMPONENTS_DIR}
+)
+
+if (REACTNATIVE_MERGED_SO)
+  target_link_libraries(
+    ${LIB_TARGET_NAME}
+    fbjni
+    jsi
+    reactnative
+    log
+  )
+else()
+  target_link_libraries(
+    ${LIB_TARGET_NAME}
+    fbjni
+    folly_runtime
+    glog
+    jsi
+    react_codegen_rncore
+    react_debug
+    react_nativemodule_core
+    react_render_core
+    react_render_debug
+    react_render_graphics
+    react_render_mapbuffer
+    react_render_componentregistry
+    react_utils
+    rrc_view
+    turbomodulejsijni
+    yoga
+    log
+  )
+endif()
+
+target_include_directories(
+  ${CMAKE_PROJECT_NAME}
+  PUBLIC
+  ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+if(ReactAndroid_VERSION_MINOR GREATER_EQUAL 80)
+  target_compile_reactnative_options(${LIB_TARGET_NAME} PUBLIC)
+else()
+  target_compile_options(
+    ${LIB_TARGET_NAME}
+    PRIVATE
+    -fexceptions
+    -frtti
+    -std=c++20
+    -Wall
+  )
+endif()
+
+target_compile_options(
+  ${LIB_TARGET_NAME}
+  PRIVATE
+  -Wpedantic
+  -Wno-gnu-zero-variadic-macro-arguments
+  -Wno-dollar-in-identifier-extension
+)

package/android/src/main/jni/TrueSheetSpec.h

@@ -0,0 +1,17 @@
+#pragma once
+
+#include <ReactCommon/JavaTurboModule.h>
+#include <ReactCommon/TurboModule.h>
+#include <jsi/jsi.h>
+#include <react/renderer/components/TrueSheetSpec/TrueSheetContainerViewComponentDescriptor.h>
+
+namespace facebook {
+namespace react {
+
+JSI_EXPORT
+std::shared_ptr<TurboModule> TrueSheetSpec_ModuleProvider(
+    const std::string &moduleName,
+    const JavaTurboModule::InitParams &params);
+
+} // namespace react
+} // namespace facebook

package/ios/TrueSheetContainerView.mm

@@ -9,14 +9,18 @@
 #ifdef RCT_NEW_ARCH_ENABLED
 
 #import "TrueSheetContainerView.h"
-#import <react/renderer/components/TrueSheetSpec/ComponentDescriptors.h>
 #import <react/renderer/components/TrueSheetSpec/EventEmitters.h>
 #import <react/renderer/components/TrueSheetSpec/Props.h>
 #import <react/renderer/components/TrueSheetSpec/RCTComponentViewHelpers.h>
+#import <react/renderer/components/TrueSheetSpec/TrueSheetContainerViewComponentDescriptor.h>
+#import <react/renderer/components/TrueSheetSpec/TrueSheetContainerViewShadowNode.h>
+#import <react/renderer/components/TrueSheetSpec/TrueSheetContainerViewState.h>
 #import "TrueSheetContentView.h"
 #import "TrueSheetFooterView.h"
 
 #import <React/RCTConversions.h>
+#import <React/RCTLog.h>
+#import <react/renderer/core/State.h>
 
 using namespace facebook::react;
 
@@ -26,6 +30,8 @@ using namespace facebook::react;
 @implementation TrueSheetContainerView {
   TrueSheetContentView *_contentView;
   TrueSheetFooterView *_footerView;
+  TrueSheetContainerViewShadowNode::ConcreteState::Shared _state;
+  CGFloat _lastContainerWidth;
 }
 
 + (ComponentDescriptorProvider)componentDescriptorProvider {
@@ -41,11 +47,49 @@ using namespace facebook::react;
 
     _contentView = nil;
     _footerView = nil;
+    _lastContainerWidth = 0;
   }
   return self;
 }
 
-- (void)dealloc {
+- (void)layoutSubviews {
+  [super layoutSubviews];
+
+  // Override Yoga layout - fill the entire parent (controller's view)
+  if (self.superview) {
+    CGRect parentBounds = self.superview.bounds;
+    if (!CGRectEqualToRect(self.frame, parentBounds)) {
+      self.frame = parentBounds;
+    }
+
+    // Update state with container width so Yoga can use it for children layout
+    [self updateStateIfNeeded];
+  }
+}
+
+- (void)updateStateIfNeeded {
+  if (!self.superview) {
+    return;
+  }
+
+  CGFloat containerWidth = self.superview.bounds.size.width;
+  if (containerWidth > 0 && fabs(containerWidth - _lastContainerWidth) > 0.5) {
+    _lastContainerWidth = containerWidth;
+    [self updateState];
+  }
+}
+
+- (void)updateState {
+  if (!_state) {
+    return;
+  }
+
+  _state->updateState([=](TrueSheetContainerViewShadowNode::ConcreteState::Data const &oldData)
+                        -> TrueSheetContainerViewShadowNode::ConcreteState::SharedData {
+    auto newData = oldData;
+    newData.containerWidth = static_cast<float>(_lastContainerWidth);
+    return std::make_shared<TrueSheetContainerViewShadowNode::ConcreteState::Data const>(newData);
+  });
 }
 
 - (CGFloat)contentHeight {
@@ -64,7 +108,6 @@ using namespace facebook::react;
 
 - (void)setupContentScrollViewPinning:(BOOL)pinned {
   if (_contentView) {
-    NSLog(@"setting up scrollview pinning: %i", pinned);
     [_contentView setupScrollViewPinning:pinned];
   }
 }
@@ -75,7 +118,7 @@ using namespace facebook::react;
   // Handle content view mounting
   if ([childComponentView isKindOfClass:[TrueSheetContentView class]]) {
     if (_contentView != nil) {
-      NSLog(@"TrueSheet: Container can only have one content component.");
+      RCTLogWarn(@"TrueSheet: Container can only have one content component.");
       return;
     }
 
@@ -86,7 +129,7 @@ using namespace facebook::react;
   // Handle footer view mounting
   if ([childComponentView isKindOfClass:[TrueSheetFooterView class]]) {
     if (_footerView != nil) {
-      NSLog(@"TrueSheet: Container can only have one footer component.");
+      RCTLogWarn(@"TrueSheet: Container can only have one footer component.");
       return;
     }
 
@@ -110,6 +153,19 @@ using namespace facebook::react;
   [super updateProps:props oldProps:oldProps];
 }
 
+- (void)updateState:(const State::Shared &)state oldState:(const State::Shared &)oldState {
+  _state = std::static_pointer_cast<TrueSheetContainerViewShadowNode::ConcreteState const>(state);
+
+  // Reset last width when state is updated to ensure we push the correct width
+  // This handles re-presentation of the sheet where state is recreated
+  _lastContainerWidth = 0;
+}
+
+- (void)finalizeUpdates:(RNComponentViewUpdateMask)updateMask {
+  [super finalizeUpdates:updateMask];
+  [self updateStateIfNeeded];
+}
+
 #pragma mark - TrueSheetContentViewDelegate
 
 - (void)contentViewDidChangeSize:(CGSize)newSize {

package/ios/TrueSheetContentView.mm

@@ -53,17 +53,6 @@ using namespace facebook::react;
   }
 }
 
-//- (void)didMoveToSuperview {
-//  [super didMoveToSuperview];
-//
-//  // Setup scroll view pinning after Fabric mounts the view in container
-//  // Ensures proper view hierarchy for scroll detection and pinning
-//  if (self.superview) {
-//    NSLog(@"content has attached");
-////    [self setupScrollViewPinning];
-//  }
-//}
-
 - (void)unpinScrollView {
   // Unpin previous scroll view if exists
   if (_pinnedScrollView) {

package/ios/TrueSheetView.h

@@ -23,22 +23,6 @@ typedef void (^TrueSheetCompletionBlock)(BOOL success, NSError *_Nullable error)
 
 @interface TrueSheetView : RCTViewComponentView
 
-///**
-// * The view controller managing the sheet presentation
-// * Exposed so container can access it
-// */
-//@property (nonatomic, readonly, strong) TrueSheetViewController *controller;
-//
-///**
-// * Whether the sheet is currently presented
-// */
-//@property (nonatomic, readonly) BOOL isPresented;
-//
-///**
-// * The currently active detent index
-// */
-//@property (nonatomic, readonly, strong, nullable) NSNumber *activeIndex;
-
 // TurboModule methods
 - (void)presentAtIndex:(NSInteger)index
               animated:(BOOL)animated

package/ios/TrueSheetView.mm

@@ -22,7 +22,6 @@
 #import "events/OnDragEndEvent.h"
 #import "events/OnMountEvent.h"
 #import "events/OnPositionChangeEvent.h"
-#import "events/OnSizeChangeEvent.h"
 #import "events/OnWillDismissEvent.h"
 #import "events/OnWillPresentEvent.h"
 #import "utils/LayoutUtil.h"
@@ -35,6 +34,7 @@
 
 #import <React/RCTConversions.h>
 #import <React/RCTFabricComponentsPlugins.h>
+#import <React/RCTLog.h>
 #import <React/RCTSurfaceTouchHandler.h>
 #import <React/RCTUtils.h>
 
@@ -216,6 +216,9 @@ using namespace facebook::react;
   // Update grabber
   _controller.grabber = newProps.grabber;
 
+  // Update page sizing
+  _controller.pageSizing = newProps.pageSizing;
+
   // Update dismissible
   _controller.modalInPresentation = !newProps.dismissible;
 
@@ -268,7 +271,7 @@ using namespace facebook::react;
   // Check if it's a container view
   if ([childComponentView isKindOfClass:[TrueSheetContainerView class]]) {
     if (_containerView != nil) {
-      NSLog(@"TrueSheet: Sheet can only have one container component.");
+      RCTLogWarn(@"TrueSheet: Sheet can only have one container component.");
       return;
     }
 
@@ -289,6 +292,10 @@ using namespace facebook::react;
     // Ensure container is above background view
     [_controller.view bringSubviewToFront:_containerView];
 
+    // Force layout pass immediately so container gets correct width on mount
+    // This pushes the width to Yoga before the sheet is presented
+    [_controller.view layoutIfNeeded];
+
     // Get initial content height from container
     CGFloat contentHeight = [_containerView contentHeight];
     if (contentHeight > 0) {
@@ -363,10 +370,6 @@ using namespace facebook::react;
   _controller.activeDetentIndex = index;
 
   [OnWillPresentEvent emit:_eventEmitter index:index position:position];
-
-  // Emit onChangeSize event to layout our container on JS
-  CGSize controllerSize = _controller.view.frame.size;
-  [OnSizeChangeEvent emit:_eventEmitter width:controllerSize.width height:controllerSize.height];
 }
 
 - (void)viewControllerDidPresent {
@@ -418,10 +421,6 @@ using namespace facebook::react;
   [OnPositionChangeEvent emit:_eventEmitter index:index position:position transitioning:transitioning];
 }
 
-- (void)viewControllerDidChangeSize:(CGSize)size {
-  [OnSizeChangeEvent emit:_eventEmitter width:size.width height:size.height];
-}
-
 #pragma mark - Private Helpers
 
 - (UIViewController *)findPresentingViewController {
@@ -433,6 +432,10 @@ using namespace facebook::react;
 
   UIViewController *rootViewController = keyWindow.rootViewController;
 
+  if (!rootViewController) {
+    return nil;
+  }
+
   // Find the top-most presented view controller
   while (rootViewController.presentedViewController) {
     UIViewController *presented = rootViewController.presentedViewController;

package/ios/TrueSheetViewController.h

@@ -26,7 +26,6 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)viewControllerDidChangeDetent:(NSInteger)index position:(CGFloat)position;
 - (void)viewControllerDidDrag:(UIGestureRecognizerState)state index:(NSInteger)index position:(CGFloat)position;
 - (void)viewControllerDidChangePosition:(NSInteger)index position:(CGFloat)position transitioning:(BOOL)transitioning;
-- (void)viewControllerDidChangeSize:(CGSize)size;
 
 @end
 
@@ -47,6 +46,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, assign) BOOL dimmed;
 @property (nonatomic, strong, nullable) NSNumber *dimmedDetentIndex;
 @property (nonatomic, copy, nullable) NSString *blurTint;
+@property (nonatomic, assign) BOOL pageSizing;
 @property (nonatomic, assign) BOOL layoutTransitioning;
 @property (nonatomic, assign) BOOL isPresented;
 @property (nonatomic, assign) NSInteger activeDetentIndex;
@@ -57,6 +57,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)setupSheetProps;
 - (NSInteger)currentDetentIndex;
 - (CGFloat)currentPosition;
+- (CGFloat)bottomInset;
 - (CGFloat)currentHeight;
 - (CGFloat)containerHeight;