fix(android): dead state after rapid present/dismiss (#593)

* fix(android,ios): dead state after rapid present/dismiss (#590)

* docs: update changelog for #593

Author: lodev09

CHANGELOG.md

@@ -10,6 +10,7 @@
 ### 🐛 Bug fixes
 
 - **iOS**: Fixed keyboard scroll positioning when sheet auto-expands from a smaller detent. ([#592](https://github.com/lodev09/react-native-true-sheet/pull/592) by [@lodev09](https://github.com/lodev09))
+- **Android**: Fixed dead state after rapid present/dismiss cycles. ([#593](https://github.com/lodev09/react-native-true-sheet/pull/593) by [@lodev09](https://github.com/lodev09))
 - **iOS**: Fixed position change not emitting when detent or index changed. ([#584](https://github.com/lodev09/react-native-true-sheet/pull/584) by [@lodev09](https://github.com/lodev09))
 - **Android**: Use RN `BackHandler` for back press detection for reliability across Android versions. ([#580](https://github.com/lodev09/react-native-true-sheet/pull/580) by [@lodev09](https://github.com/lodev09))
 

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

@@ -119,9 +119,6 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
 
     if (child is TrueSheetContainerView) {
       child.delegate = this
-      viewController.createSheet()
-      setupScrollable()
-
       val surfaceId = UIManagerHelper.getSurfaceId(this)
       eventDispatcher?.dispatchEvent(MountEvent(surfaceId, id))
     }
@@ -349,11 +346,8 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
       return
     }
 
-    if (viewController.coordinatorLayout == null || viewController.sheetView == null) {
-      RNLog.w(reactContext, "TrueSheet: sheet is not ready. Ensure it is mounted before presenting.")
-      promiseCallback()
-      return
-    }
+    viewController.createSheet()
+    setupScrollable()
 
     // Dismiss keyboard if focused view is within a sheet or if target detent will be dimmed
     val parentSheet = TrueSheetStackManager.getTopmostSheet()

example/shared/src/components/Button.tsx

@@ -4,11 +4,12 @@ import { BUTTON_HEIGHT, DARK_BLUE, SPACING } from '../utils';
 
 interface ButtonProps extends PressableProps {
   text: string;
+  hint?: string;
   loading?: boolean;
 }
 
 export const Button = (props: ButtonProps) => {
-  const { text, style, loading, ...rest } = props;
+  const { text, hint, style, loading, ...rest } = props;
   return (
     <Pressable
       style={(state) => [
@@ -19,6 +20,7 @@ export const Button = (props: ButtonProps) => {
       {...rest}
     >
       <Text style={styles.text}>{text}</Text>
+      {hint && <Text style={styles.hint}>{hint}</Text>}
       {loading && <ActivityIndicator style={styles.loader} size="small" color="#fff" />}
     </Pressable>
   );
@@ -39,6 +41,10 @@ const styles = StyleSheet.create({
   text: {
     color: '#fff',
   },
+  hint: {
+    fontSize: 10,
+    color: 'rgba(255, 255, 255, 0.5)',
+  },
   loader: {
     position: 'absolute',
     right: SPACING,

example/shared/src/components/sheets/FlatListSheet.tsx

@@ -28,10 +28,7 @@ export const FlatListSheet = forwardRef<TrueSheet, FlatListSheetProps>((props, r
         </Header>
       }
       onDidDismiss={() => console.log('Sheet FlatList dismissed!')}
-      onDidPresent={() => {
-        console.log(`Sheet FlatList presented!`);
-        scrollRef.current?.scrollToOffset({ offset: 99999, animated: true });
-      }}
+      onDidPresent={() => console.log(`Sheet FlatList presented!`)}
       footer={<Footer text="OPEN BLANK SHEET" onPress={() => testRef.current?.present()} />}
       {...props}
     >

example/shared/src/screens/MapScreen.tsx

@@ -78,6 +78,14 @@ const MapScreenInner = ({
     console.log('basic sheet presented');
   };
 
+  const rapidPresentDismiss = async () => {
+    for (let i = 0; i < 5; i++) {
+      await basicSheet.current?.present(0);
+      await basicSheet.current?.dismiss();
+    }
+    await basicSheet.current?.present(0);
+  };
+
   const presentScrollViewSheet = () => {
     setScrollViewLoading(true);
     requestAnimationFrame(async () => {
@@ -166,7 +174,12 @@ const MapScreenInner = ({
           <Text style={styles.title}>True Sheet</Text>
           <Text style={styles.subtitle}>The true native bottom sheet experience.</Text>
         </View>
-        <Button text="TrueSheet View" onPress={() => presentBasicSheet(0)} />
+        <Button
+          text="TrueSheet View"
+          hint="Long press to stress test"
+          onPress={() => presentBasicSheet(0)}
+          onLongPress={rapidPresentDismiss}
+        />
         <Button text="Open Modal" onPress={onNavigateToModal} />
         <Button text="Sheet Navigator" onPress={onNavigateToSheetStack} />
         {isTablet && (

ios/TrueSheetView.mm

@@ -261,11 +261,7 @@ - (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &
   _insetAdjustment = (NSInteger)newProps.insetAdjustment;
   _controller.insetAdjustment = _insetAdjustment;
 
-  if (_containerView) {
-    _containerView.scrollableEnabled = _scrollable;
-    _containerView.insetAdjustment = _insetAdjustment;
-    _containerView.scrollableOptions = _scrollableOptions;
-  }
+  [self setupScrollable];
 }
 
 - (void)updateState:(const State::Shared &)state oldState:(const State::Shared &)oldState {
@@ -314,9 +310,7 @@ - (void)finalizeUpdates:(RNComponentViewUpdateMask)updateMask {
   if (!(updateMask & RNComponentViewUpdateMaskProps) || !_controller)
     return;
 
-  if (_containerView) {
-    [_containerView setupScrollable];
-  }
+  [self setupScrollable];
 
   if (_controller.isPresented) {
     [self applySheetPropsUpdate];
@@ -384,11 +378,6 @@ - (void)mountChildComponentView:(UIView<RCTComponentViewProtocol> *)childCompone
     _controller.headerHeight = @(headerHeight);
   }
 
-  _containerView.scrollableEnabled = _scrollable;
-  _containerView.insetAdjustment = _insetAdjustment;
-  _containerView.scrollableOptions = _scrollableOptions;
-  [_containerView setupScrollable];
-
   if (_eventEmitter) {
     [TrueSheetLifecycleEvents emitMount:_eventEmitter];
   } else {
@@ -449,6 +438,8 @@ - (void)presentAtIndex:(NSInteger)index
   [_controller setupSheetDetents];
   [_controller setupActiveDetentWithIndex:index];
 
+  [self setupScrollable];
+
   [_screensEventObserver capturePresenterScreenFromView:self];
   [_screensEventObserver startObservingWithState:_state.get()->getData()];
 
@@ -575,7 +566,7 @@ - (void)containerViewHeaderDidChangeSize:(CGSize)newSize {
 
 // When the ScrollView changes (e.g. conditional remount), re-pin the new ScrollView.
 - (void)containerViewScrollViewDidChange {
-  [_containerView setupScrollable];
+  [self setupScrollable];
 }
 
 #pragma mark - TrueSheetViewControllerDelegate
@@ -697,6 +688,16 @@ - (void)presenterScreenWillAppear {
 
 #pragma mark - Private Helpers
 
+- (void)setupScrollable {
+  if (!_containerView)
+    return;
+
+  _containerView.scrollableEnabled = _scrollable;
+  _containerView.insetAdjustment = _insetAdjustment;
+  _containerView.scrollableOptions = _scrollableOptions;
+  [_containerView setupScrollable];
+}
+
 - (void)applySheetPropsUpdate {
   BOOL pendingLayoutUpdate = _pendingLayoutUpdate;
   _pendingLayoutUpdate = NO;