From 9284745896872d12f300c32e44f91321c8e41d94 Mon Sep 17 00:00:00 2001
From: Arkadiusz Kubaczkowski <arek.kubaczkowski@gmail.com>
Date: Thu, 4 Jun 2026 10:49:11 +0200
Subject: [PATCH] fix(adapters): recover gorhom from dropped onChange; drop
 dead swmansion guard
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

gorhom: under rapid open/close (switch then an immediate dismiss), gorhom can
drop its onChange, leaving a re-revealed sheet stuck in 'opening'. That
permanently trips the open() guard (hasOpeningInGroup), so every later open is
a no-op. Report opened from the animated index as a reliable backstop
(idempotent via the status guard).

swmansion: onSettle is now optimistic (fires when the animation starts), so a
settle at the collapsed detent only ever follows a real close. The
closeRequestedRef guard is dead — drop it and handle the settle directly.

example: ScannerSheet (persistent) now uses the swmansion adapter, covering the
swmansion + persistent (defaultIndex < 0) path.
---
 example/src/sheets/ScannerSheet.tsx           | 168 ++++++++++--------
 .../gorhom-sheet/GorhomSheetAdapter.tsx       |  17 +-
 .../swmansion/SwmansionSheetAdapter.tsx       |   9 +-
 3 files changed, 102 insertions(+), 92 deletions(-)

diff --git a/example/src/sheets/ScannerSheet.tsx b/example/src/sheets/ScannerSheet.tsx
index c37b609..b02648d 100644
--- a/example/src/sheets/ScannerSheet.tsx
+++ b/example/src/sheets/ScannerSheet.tsx
@@ -1,4 +1,3 @@
-import type { BottomSheetMethods } from '@gorhom/bottom-sheet/lib/typescript/types';
 import { forwardRef, useCallback, useState } from 'react';
 import { StyleSheet, Text, View } from 'react-native';
 import {
@@ -6,11 +5,13 @@ import {
   useBottomSheetManager,
 } from 'react-native-bottom-sheet-stack';
 
-import { Badge, Button, SecondaryButton, Sheet } from '../components';
+import type { SheetAdapterRef } from '../../../src/adapter.types';
+import { SwmansionSheetAdapter } from '../../../src/adapters/swmansion';
+import { Badge, Button, SecondaryButton } from '../components';
 import { ScannerNestedSheet1 } from './ScannerNestedSheets';
 import { colors, sharedStyles } from '../styles/theme';
 
-export const ScannerSheet = forwardRef<BottomSheetMethods>((_, ref) => {
+export const ScannerSheet = forwardRef<SheetAdapterRef>((_, ref) => {
   const { close, params } = useBottomSheetContext<'scanner-sheet'>();
   const { open } = useBottomSheetManager();
   const [isScanning, setIsScanning] = useState(false);
@@ -39,92 +40,101 @@ export const ScannerSheet = forwardRef<BottomSheetMethods>((_, ref) => {
   }, []);
 
   return (
-    <Sheet ref={ref} enableDynamicSizing>
-      <View style={styles.badgeRow}>
-        <Badge label="Persistent" color={colors.cyan} />
-        <Badge
-          label={sourceLabel}
-          color={
-            params?.source === 'navigation' ? colors.purple : colors.primary
-          }
-        />
-      </View>
-      <Text style={sharedStyles.h1}>{title}</Text>
-      <Text style={sharedStyles.text}>
-        This sheet is always mounted (keepMounted). It opens instantly without
-        mount delay and preserves state between open/close cycles.
-      </Text>
+    <SwmansionSheetAdapter ref={ref} detents={[0, 'content']} handle>
+      <View style={styles.content}>
+        <View style={styles.badgeRow}>
+          <Badge label="Persistent" color={colors.cyan} />
+          <Badge
+            label={sourceLabel}
+            color={
+              params?.source === 'navigation' ? colors.purple : colors.primary
+            }
+          />
+        </View>
+        <Text style={sharedStyles.h1}>{title}</Text>
+        <Text style={sharedStyles.text}>
+          This sheet is always mounted (keepMounted). It opens instantly without
+          mount delay and preserves state between open/close cycles.
+        </Text>
 
-      {/* Scanner viewport */}
-      <View style={styles.scannerViewport}>
-        {isScanning ? (
-          <View style={styles.scanningOverlay}>
-            <View style={styles.scanLine} />
-            <Text style={styles.scanningText}>Scanning...</Text>
-          </View>
-        ) : scanResult ? (
-          <View style={styles.resultContainer}>
-            <Text style={styles.resultLabel}>Scanned Code:</Text>
-            <Text style={styles.resultValue}>{scanResult}</Text>
-          </View>
-        ) : (
-          <View style={styles.placeholderContainer}>
-            <Text style={styles.placeholderIcon}>[ ]</Text>
-            <Text style={styles.placeholderText}>Ready to scan</Text>
-          </View>
-        )}
-      </View>
+        {/* Scanner viewport */}
+        <View style={styles.scannerViewport}>
+          {isScanning ? (
+            <View style={styles.scanningOverlay}>
+              <View style={styles.scanLine} />
+              <Text style={styles.scanningText}>Scanning...</Text>
+            </View>
+          ) : scanResult ? (
+            <View style={styles.resultContainer}>
+              <Text style={styles.resultLabel}>Scanned Code:</Text>
+              <Text style={styles.resultValue}>{scanResult}</Text>
+            </View>
+          ) : (
+            <View style={styles.placeholderContainer}>
+              <Text style={styles.placeholderIcon}>[ ]</Text>
+              <Text style={styles.placeholderText}>Ready to scan</Text>
+            </View>
+          )}
+        </View>
 
-      {/* Actions */}
-      <View style={styles.actions}>
-        {scanResult ? (
-          <>
-            <Button title="Scan Again" onPress={handleReset} />
-            <Button
-              title="Open Nested Sheet"
-              onPress={() =>
-                open(<ScannerNestedSheet1 />, {
-                  scaleBackground: true,
-                  mode: 'switch',
-                })
-              }
-            />
-            <SecondaryButton title="Close" onPress={close} />
-          </>
-        ) : (
-          <>
-            <Button
-              title={isScanning ? 'Scanning...' : 'Start Scan'}
-              onPress={isScanning ? () => {} : handleStartScan}
-            />
-            <Button
-              title="Open Nested Sheet"
-              onPress={() =>
-                open(<ScannerNestedSheet1 />, {
-                  scaleBackground: true,
-                  mode: 'switch',
-                })
-              }
-            />
-            <SecondaryButton title="Close" onPress={close} />
-          </>
-        )}
-      </View>
+        {/* Actions */}
+        <View style={styles.actions}>
+          {scanResult ? (
+            <>
+              <Button title="Scan Again" onPress={handleReset} />
+              <Button
+                title="Open Nested Sheet"
+                onPress={() =>
+                  open(<ScannerNestedSheet1 />, {
+                    scaleBackground: true,
+                    mode: 'switch',
+                  })
+                }
+              />
+              <SecondaryButton title="Close" onPress={close} />
+            </>
+          ) : (
+            <>
+              <Button
+                title={isScanning ? 'Scanning...' : 'Start Scan'}
+                onPress={isScanning ? () => {} : handleStartScan}
+              />
+              <Button
+                title="Open Nested Sheet"
+                onPress={() =>
+                  open(<ScannerNestedSheet1 />, {
+                    scaleBackground: true,
+                    mode: 'switch',
+                  })
+                }
+              />
+              <SecondaryButton title="Close" onPress={close} />
+            </>
+          )}
+        </View>
 
-      {/* Info box */}
-      <View style={styles.infoBox}>
-        <Text style={styles.infoText}>
-          Try closing and reopening - the sheet appears instantly because it's
-          pre-mounted with keepMounted flag.
-        </Text>
+        {/* Info box */}
+        <View style={styles.infoBox}>
+          <Text style={styles.infoText}>
+            Try closing and reopening - the sheet appears instantly because it's
+            pre-mounted with keepMounted flag.
+          </Text>
+        </View>
       </View>
-    </Sheet>
+    </SwmansionSheetAdapter>
   );
 });
 
 ScannerSheet.displayName = 'ScannerSheet';
 
 const styles = StyleSheet.create({
+  content: {
+    backgroundColor: colors.surface,
+    paddingHorizontal: 20,
+    paddingTop: 8,
+    paddingBottom: 32,
+    gap: 8,
+  },
   badgeRow: {
     flexDirection: 'row',
     gap: 8,
diff --git a/src/adapters/gorhom-sheet/GorhomSheetAdapter.tsx b/src/adapters/gorhom-sheet/GorhomSheetAdapter.tsx
index 4948d7b..c1691bd 100644
--- a/src/adapters/gorhom-sheet/GorhomSheetAdapter.tsx
+++ b/src/adapters/gorhom-sheet/GorhomSheetAdapter.tsx
@@ -5,6 +5,7 @@ import BottomSheetOriginal, {
 import type { BottomSheetMethods } from '@gorhom/bottom-sheet/lib/typescript/types';
 import React, { useEffect, useImperativeHandle, useRef } from 'react';
 import { useAnimatedReaction } from 'react-native-reanimated';
+import { scheduleOnRN } from 'react-native-worklets';
 
 import type { SheetAdapterRef } from '../../adapter.types';
 import {
@@ -57,6 +58,9 @@ export const GorhomSheetAdapter = React.forwardRef<
       return () => setBackdrop(id, true);
     }, [id, usesCustomBackdrop, setBackdrop]);
 
+    const { handleDismiss, handleOpened, handleClosed } =
+      createSheetEventHandlers(id);
+
     useImperativeHandle(
       ref,
       () => ({
@@ -68,14 +72,18 @@ export const GorhomSheetAdapter = React.forwardRef<
 
     useAnimatedReaction(
       () => contextAnimatedIndex.value,
-      (value) => {
+      (value, prev) => {
         externalAnimatedIndex?.set(value);
+        // gorhom can drop its onChange under rapid open/close interruptions
+        // (e.g. switch then immediate dismiss), leaving the sheet stuck mid-open.
+        // The animated index is the reliable signal: report opened when it
+        // crosses into an open snap point (idempotent via the status guard).
+        if (typeof prev === 'number' && prev < 0 && value >= 0) {
+          scheduleOnRN(handleOpened);
+        }
       }
     );
 
-    const { handleDismiss, handleOpened, handleClosed } =
-      createSheetEventHandlers(id);
-
     useBackHandler(id, handleDismiss);
 
     const wrappedOnAnimate: BottomSheetProps['onAnimate'] = (
@@ -96,7 +104,6 @@ export const GorhomSheetAdapter = React.forwardRef<
       position,
       type
     ) => {
-      // index >= 0 means sheet reached a valid snap point (opened)
       if (index >= 0) {
         handleOpened();
       }
diff --git a/src/adapters/swmansion/SwmansionSheetAdapter.tsx b/src/adapters/swmansion/SwmansionSheetAdapter.tsx
index bb929ce..c2fcd12 100644
--- a/src/adapters/swmansion/SwmansionSheetAdapter.tsx
+++ b/src/adapters/swmansion/SwmansionSheetAdapter.tsx
@@ -4,7 +4,6 @@ import React, {
   type ReactNode,
   useEffect,
   useImperativeHandle,
-  useRef,
   useState,
 } from 'react';
 import {
@@ -356,9 +355,6 @@ export const SwmansionSheetAdapter = React.forwardRef<
       );
     }
 
-    // Guards against reporting the initial collapsed-detent settle as a close.
-    const hasOpenedRef = useRef(false);
-
     useImperativeHandle(
       ref,
       () => ({
@@ -370,11 +366,8 @@ export const SwmansionSheetAdapter = React.forwardRef<
 
     const handleNativeSettle = (settledIndex: number) => {
       if (settledIndex <= 0) {
-        if (hasOpenedRef.current) {
-          handleClosed();
-        }
+        handleClosed();
       } else {
-        hasOpenedRef.current = true;
         handleOpened();
       }
       onSettle?.(settledIndex);