@lodev09/react-native-true-sheet 3.6.2 → 3.6.4

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

@@ -46,7 +46,7 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
   // Initial present configuration (set by ViewManager before mount)
   var initialDetentIndex: Int = -1
   var initialDetentAnimated: Boolean = true
-  private var hasInitialPresented: Boolean = false
+  private var pendingInitialPresentation: Boolean = false
 
   var stateWrapper: StateWrapper? = null
     set(value) {
@@ -98,6 +98,11 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
 
   // ==================== View Hierarchy Management ====================
 
+  override fun onAttachedToWindow() {
+    super.onAttachedToWindow()
+    presentInitialDetentIfNeeded()
+  }
+
   override fun addView(child: View?, index: Int) {
     viewController.addView(child, index)
 
@@ -105,13 +110,9 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
       child.delegate = this
       viewController.createSheet()
 
-      if (initialDetentIndex >= 0 && !hasInitialPresented) {
-        hasInitialPresented = true
-        if (initialDetentAnimated) {
-          present(initialDetentIndex, true) { }
-        } else {
-          post { present(initialDetentIndex, false) { } }
-        }
+      if (initialDetentIndex >= 0 && !viewController.isPresented) {
+        pendingInitialPresentation = true
+        presentInitialDetentIfNeeded()
       }
 
       val surfaceId = UIManagerHelper.getSurfaceId(this)
@@ -119,6 +120,19 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
     }
   }
 
+  private fun presentInitialDetentIfNeeded() {
+    if (!pendingInitialPresentation || initialDetentIndex < 0 || viewController.isPresented || !isAttachedToWindow) {
+      return
+    }
+
+    pendingInitialPresentation = false
+    if (initialDetentAnimated) {
+      present(initialDetentIndex, true) { }
+    } else {
+      post { present(initialDetentIndex, false) { } }
+    }
+  }
+
   override fun getChildCount(): Int = viewController.childCount
 
   override fun getChildAt(index: Int): View? = viewController.getChildAt(index)
@@ -154,7 +168,7 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
     TrueSheetStackManager.removeSheet(this)
 
     if (viewController.isPresented) {
-      viewController.dismiss()
+      viewController.dismiss(animated = false)
     }
     viewController.delegate = null
   }

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

@@ -757,7 +757,6 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
 
     val adjustedHalfExpandedHeight = minOf(halfExpandedDetentHeight, maxAvailableHeight)
     val halfExpandedRatio = (adjustedHalfExpandedHeight.toFloat() / realScreenHeight.toFloat())
-      .coerceIn(0f, 0.999f)
 
     val expandedOffset = realScreenHeight - maxDetentHeight
 
@@ -802,7 +801,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
       isFitToContents = fitToContents
       skipCollapsed = false
       setPeekHeight(peekHeight, animate)
-      this.halfExpandedRatio = halfExpandedRatio.coerceIn(0f, 0.999f)
+      this.halfExpandedRatio = halfExpandedRatio.coerceIn(0.01f, 0.999f)
       this.expandedOffset = expandedOffset
     }
   }

package/ios/TrueSheetViewController.mm

@@ -13,6 +13,7 @@
 #import "core/TrueSheetGrabberView.h"
 #import "utils/BlurUtil.h"
 #import "utils/GestureUtil.h"
+#import "utils/PlatformUtil.h"
 #import "utils/WindowUtil.h"
 
 #import <React/RCTLog.h>
@@ -669,6 +670,7 @@
 }
 
 - (void)setupBackground {
+#if RNTS_IPHONE_OS_VERSION_AVAILABLE(26_1)
   BOOL useBackgroundEffect = NO;
   if (@available(iOS 26.1, *)) {
     useBackgroundEffect = !self.isDesignCompatibilityMode;
@@ -692,6 +694,7 @@
       }
     }
   }
+#endif
 
   NSString *effectiveBackgroundBlur = self.backgroundBlur;
   if (@available(iOS 26.0, *)) {
@@ -718,12 +721,14 @@
     [_blurView applyBlurEffect];
   }
 
+#if RNTS_IPHONE_OS_VERSION_AVAILABLE(26_1)
   if (@available(iOS 26.1, *)) {
     if (useBackgroundEffect && self.backgroundColor) {
       self.sheet.backgroundEffect = [UIColorEffect effectWithColor:self.backgroundColor];
       return;
     }
   }
+#endif
 
   self.view.backgroundColor = self.backgroundColor;
 }

package/ios/utils/PlatformUtil.h

@@ -0,0 +1,15 @@
+//
+//  Created by Jovanni Lo (@lodev09)
+//  Copyright (c) 2024-present. All rights reserved.
+//
+//  This source code is licensed under the MIT license found in the
+//  LICENSE file in the root directory of this source tree.
+//
+
+#ifndef PlatformUtil_h
+#define PlatformUtil_h
+
+#define RNTS_IPHONE_OS_VERSION_AVAILABLE(v) \
+  (defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && defined(__IPHONE_##v) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_##v)
+
+#endif /* PlatformUtil_h */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lodev09/react-native-true-sheet",
-  "version": "3.6.2",
+  "version": "3.6.4",
   "description": "The true native bottom sheet experience for your React Native Apps.",
   "source": "./src/index.ts",
   "main": "./lib/module/index.js",