@lodev09/react-native-true-sheet 3.1.0-beta.0 → 3.1.0-beta.10

package/android/src/main/java/com/lodev09/truesheet/core/RNScreensFragmentObserver.kt

@@ -13,7 +13,9 @@ private const val RN_SCREENS_PACKAGE = "com.swmansion.rnscreens"
  */
 class RNScreensFragmentObserver(
   private val reactContext: ReactContext,
+  private val onModalWillPresent: () -> Unit = {},
   private val onModalPresented: () -> Unit,
+  private val onModalWillDismiss: () -> Unit = {},
   private val onModalDismissed: () -> Unit
 ) {
   private var fragmentLifecycleCallback: FragmentManager.FragmentLifecycleCallbacks? = null
@@ -27,13 +29,18 @@ class RNScreensFragmentObserver(
     val fragmentManager = activity.supportFragmentManager
 
     fragmentLifecycleCallback = object : FragmentManager.FragmentLifecycleCallbacks() {
-      override fun onFragmentAttached(fm: FragmentManager, fragment: Fragment, context: android.content.Context) {
-        super.onFragmentAttached(fm, fragment, context)
+      override fun onFragmentStarted(fm: FragmentManager, fragment: Fragment) {
+        super.onFragmentStarted(fm, fragment)
+
+        if (isModalFragment(fragment) && !activeModalFragments.contains(fragment)) {
+          // Notify willPresent before adding to active set
+          if (activeModalFragments.isEmpty()) {
+            onModalWillPresent()
+          }
 
-        if (isModalFragment(fragment)) {
           activeModalFragments.add(fragment)
 
-          // Notify when the first modal is attached
+          // Notify didPresent after modal is started
           if (activeModalFragments.size == 1) {
             onModalPresented()
           }
@@ -44,9 +51,14 @@ class RNScreensFragmentObserver(
         super.onFragmentStopped(fm, fragment)
 
         if (activeModalFragments.contains(fragment)) {
+          // Notify willDismiss before removing from active set
+          if (activeModalFragments.size == 1) {
+            onModalWillDismiss()
+          }
+
           activeModalFragments.remove(fragment)
 
-          // Notify when all modals are dismissed
+          // Notify didDismiss after all modals are dismissed
           if (activeModalFragments.isEmpty()) {
             onModalDismissed()
           }

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

@@ -28,36 +28,12 @@ target_include_directories(
   ${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_link_libraries(
+  ${LIB_TARGET_NAME}
+  ReactAndroid::reactnative
+  ReactAndroid::jsi
+  fbjni::fbjni
+)
 
 target_include_directories(
   ${CMAKE_PROJECT_NAME}

package/android/src/main/res/anim/true_sheet_slide_in.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <set xmlns:android="http://schemas.android.com/apk/res/android">
     <translate
-        android:duration="200"
+        android:duration="250"
         android:fromYDelta="20%p"
         android:toYDelta="0"
-        android:interpolator="@android:interpolator/fast_out_slow_in" />
+        android:interpolator="@android:interpolator/decelerate_cubic" />
     <alpha
-        android:duration="200"
+        android:duration="150"
         android:fromAlpha="0.0"
         android:toAlpha="1.0"
-        android:interpolator="@android:interpolator/fast_out_slow_in" />
+        android:interpolator="@android:interpolator/decelerate_cubic" />
 </set>

package/android/src/main/res/anim/true_sheet_slide_out.xml

@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <set xmlns:android="http://schemas.android.com/apk/res/android">
     <translate
-        android:duration="150"
+        android:duration="200"
         android:fromYDelta="0"
         android:toYDelta="20%p"
-        android:interpolator="@android:interpolator/fast_out_slow_in" />
+        android:interpolator="@android:interpolator/accelerate_cubic" />
     <alpha
         android:duration="150"
+        android:startOffset="50"
         android:fromAlpha="1.0"
         android:toAlpha="0.0"
-        android:interpolator="@android:interpolator/fast_out_slow_in" />
+        android:interpolator="@android:interpolator/accelerate_cubic" />
 </set>

package/ios/TrueSheetContainerView.mm

@@ -181,4 +181,8 @@ using namespace facebook::react;
 
 @end
 
+Class<RCTComponentViewProtocol> TrueSheetContainerViewCls(void) {
+  return TrueSheetContainerView.class;
+}
+
 #endif

package/ios/TrueSheetContentView.mm

@@ -196,4 +196,8 @@ using namespace facebook::react;
 
 @end
 
+Class<RCTComponentViewProtocol> TrueSheetContentViewCls(void) {
+  return TrueSheetContentView.class;
+}
+
 #endif

package/ios/TrueSheetFooterView.mm

@@ -98,4 +98,8 @@ using namespace facebook::react;
 
 @end
 
+Class<RCTComponentViewProtocol> TrueSheetFooterViewCls(void) {
+  return TrueSheetFooterView.class;
+}
+
 #endif

package/ios/TrueSheetHeaderView.mm

@@ -57,4 +57,8 @@ using namespace facebook::react;
 
 @end
 
+Class<RCTComponentViewProtocol> TrueSheetHeaderViewCls(void) {
+  return TrueSheetHeaderView.class;
+}
+
 #endif

package/ios/TrueSheetModule.mm

@@ -46,6 +46,7 @@ RCT_EXPORT_MODULE(TrueSheetModule)
 
 - (void)presentByRef:(double)viewTag
                index:(double)index
+            animated:(BOOL)animated
              resolve:(RCTPromiseResolveBlock)resolve
               reject:(RCTPromiseRejectBlock)reject {
   RCTExecuteOnMainQueue(^{
@@ -57,7 +58,7 @@ RCT_EXPORT_MODULE(TrueSheetModule)
     }
 
     [trueSheetView presentAtIndex:(NSInteger)index
-                         animated:YES
+                         animated:animated
                        completion:^(BOOL success, NSError *_Nullable error) {
                          if (success) {
                            resolve(nil);
@@ -68,7 +69,10 @@ RCT_EXPORT_MODULE(TrueSheetModule)
   });
 }
 
-- (void)dismissByRef:(double)viewTag resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject {
+- (void)dismissByRef:(double)viewTag
+            animated:(BOOL)animated
+             resolve:(RCTPromiseResolveBlock)resolve
+              reject:(RCTPromiseRejectBlock)reject {
   RCTExecuteOnMainQueue(^{
     TrueSheetView *trueSheetView = [TrueSheetModule getTrueSheetViewByTag:@((NSInteger)viewTag)];
 
@@ -77,7 +81,7 @@ RCT_EXPORT_MODULE(TrueSheetModule)
       return;
     }
 
-    [trueSheetView dismissAnimated:YES
+    [trueSheetView dismissAnimated:animated
                         completion:^(BOOL success, NSError *_Nullable error) {
                           if (success) {
                             resolve(nil);
@@ -92,8 +96,23 @@ RCT_EXPORT_MODULE(TrueSheetModule)
               index:(double)index
             resolve:(RCTPromiseResolveBlock)resolve
              reject:(RCTPromiseRejectBlock)reject {
-  // Resize is just present with a different index
-  [self presentByRef:viewTag index:index resolve:resolve reject:reject];
+  RCTExecuteOnMainQueue(^{
+    TrueSheetView *trueSheetView = [TrueSheetModule getTrueSheetViewByTag:@((NSInteger)viewTag)];
+
+    if (!trueSheetView) {
+      reject(@"SHEET_NOT_FOUND", [NSString stringWithFormat:@"No sheet found with tag %d", (int)viewTag], nil);
+      return;
+    }
+
+    [trueSheetView resizeToIndex:(NSInteger)index
+                      completion:^(BOOL success, NSError *_Nullable error) {
+                        if (success) {
+                          resolve(nil);
+                        } else {
+                          reject(@"RESIZE_FAILED", error.localizedDescription ?: @"Failed to resize sheet", error);
+                        }
+                      }];
+  });
 }
 
 #pragma mark - Helper Methods

package/ios/TrueSheetView.h

@@ -30,6 +30,8 @@ typedef void (^TrueSheetCompletionBlock)(BOOL success, NSError *_Nullable error)
 
 - (void)dismissAnimated:(BOOL)animated completion:(nullable TrueSheetCompletionBlock)completion;
 
+- (void)resizeToIndex:(NSInteger)index completion:(nullable TrueSheetCompletionBlock)completion;
+
 @end
 
 NS_ASSUME_NONNULL_END

package/ios/TrueSheetView.mm

@@ -223,7 +223,7 @@ using namespace facebook::react;
       [self->_controller setupSheetDetents];
       [self->_controller applyActiveDetent];
     }];
-    [_controller updateDraggable];
+    [_controller setupDraggable];
   } else if (_initialDetentIndex >= 0) {
     [self presentAtIndex:_initialDetentIndex animated:_initialDetentAnimated completion:nil];
   }
@@ -356,12 +356,24 @@ using namespace facebook::react;
                                   }];
 }
 
+- (void)resizeToIndex:(NSInteger)index completion:(nullable TrueSheetCompletionBlock)completion {
+  if (!_controller.isPresented) {
+    RCTLogWarn(@"TrueSheet: Cannot resize. Sheet is not presented.");
+    if (completion) {
+      completion(YES, nil);
+    }
+    return;
+  }
+
+  [self presentAtIndex:index animated:YES completion:completion];
+}
+
 #pragma mark - TrueSheetContainerViewDelegate
 
 /**
  * Debounced sheet update to handle rapid content/header size changes.
  */
-- (void)updateSheetIfNeeded {
+- (void)setupSheetDetentsForSizeChange {
   if (!_controller.isPresented || _isSheetUpdatePending)
     return;
 
@@ -371,19 +383,19 @@ using namespace facebook::react;
     self->_isSheetUpdatePending = NO;
 
     [self->_controller.sheetPresentationController animateChanges:^{
-      [self->_controller setupSheetDetents];
+      [self->_controller setupSheetDetentsForSizeChange];
     }];
   });
 }
 
 - (void)containerViewContentDidChangeSize:(CGSize)newSize {
   _controller.contentHeight = @(newSize.height);
-  [self updateSheetIfNeeded];
+  [self setupSheetDetentsForSizeChange];
 }
 
 - (void)containerViewHeaderDidChangeSize:(CGSize)newSize {
   _controller.headerHeight = @(newSize.height);
-  [self updateSheetIfNeeded];
+  [self setupSheetDetentsForSizeChange];
 }
 
 #pragma mark - TrueSheetViewControllerDelegate

package/ios/TrueSheetViewController.h

@@ -69,9 +69,10 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)applyActiveDetent;
 - (void)setupActiveDetentWithIndex:(NSInteger)index;
 - (void)resizeToDetentIndex:(NSInteger)index;
-- (void)setupSheetDetents;
 - (void)setupSheetProps;
-- (void)updateDraggable;
+- (void)setupSheetDetents;
+- (void)setupSheetDetentsForSizeChange;
+- (void)setupDraggable;
 
 @end