@onekeyfe/react-native-native-sheet 3.0.131 → 3.0.133

package/android/src/main/java/com/onekey/nativesheet/NativeSheetView.kt

@@ -17,6 +17,7 @@ import android.view.ViewTreeObserver
 import android.view.Window
 import android.view.WindowManager
 import android.view.animation.AccelerateDecelerateInterpolator
+import android.view.inputmethod.InputMethodManager
 import android.widget.FrameLayout
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowCompat
@@ -51,6 +52,9 @@ internal object NativeSheetStack {
 
   fun present(view: NativeSheetView) {
     compact()
+    deferredDismissals.removeAll {
+      it.first.get() == null || (it.first.get() === view && it.second == "programmatic")
+    }
     if (active.any { it.get() === view } || pending.any { it.get() === view }) {
       return
     }
@@ -254,6 +258,9 @@ class NativeSheetView(
   private var navigationBarBackgroundView: View? = null
   private var navigationBarBackgroundColor = Color.TRANSPARENT
   private var preImeBottomSheetBottomPx: Int? = null
+  private var pendingImeTarget: WeakReference<View>? = null
+  private var windowFocusListener: ViewTreeObserver.OnWindowFocusChangeListener? = null
+  private var userDrivenSheetSlide = false
 
   init {
     visibility = INVISIBLE
@@ -318,7 +325,12 @@ class NativeSheetView(
       background = createSheetBackground(resolvedSheetBackgroundColor)
       clipToOutline = true
     }
-    contentChild?.let { attachChild(content, it, 0) }
+    contentChild?.let { child ->
+      pendingImeTarget = child.findFocus()
+        ?.takeIf { it.onCheckIsTextEditor() }
+        ?.let(::WeakReference)
+      attachChild(content, child, 0)
+    }
     if (showHandle) content.addView(createHandle(), createHandleLayoutParams())
 
     pendingDismissReason = "system"
@@ -378,6 +390,7 @@ class NativeSheetView(
       setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)
       configureEdgeToEdgeWindow(this)
     }
+    restorePendingImeFocus(sheetDialog)
     animateDimAmount(
       sheetDialog,
       dimAmount.coerceIn(0.0, 1.0).toFloat(),
@@ -474,13 +487,25 @@ class NativeSheetView(
       state = BottomSheetBehavior.STATE_EXPANDED
       addBottomSheetCallback(object : BottomSheetBehavior.BottomSheetCallback() {
         override fun onStateChanged(bottomSheet: View, newState: Int) {
-          if (newState == BottomSheetBehavior.STATE_HIDDEN) {
-            pendingDismissReason = "pan"
+          when (newState) {
+            BottomSheetBehavior.STATE_DRAGGING -> userDrivenSheetSlide = true
+            BottomSheetBehavior.STATE_EXPANDED -> {
+              if (userDrivenSheetSlide) {
+                sheetDialog.window?.setDimAmount(
+                  dimAmount.coerceIn(0.0, 1.0).toFloat(),
+                )
+              }
+              userDrivenSheetSlide = false
+            }
+            BottomSheetBehavior.STATE_HIDDEN -> {
+              pendingDismissReason = "pan"
+              userDrivenSheetSlide = false
+            }
           }
         }
 
         override fun onSlide(bottomSheet: View, slideOffset: Float) {
-          if (slideOffset < 1f) {
+          if (userDrivenSheetSlide && slideOffset < 1f) {
             dimAnimator?.cancel()
             sheetDialog.window?.setDimAmount(
               dimAmount.coerceIn(0.0, 1.0).toFloat() * slideOffset.coerceIn(0f, 1f),
@@ -761,6 +786,45 @@ class NativeSheetView(
     return true
   }
 
+  private fun restorePendingImeFocus(sheetDialog: BottomSheetDialog) {
+    val target = pendingImeTarget?.get() ?: return
+    val decorView = sheetDialog.window?.decorView ?: return
+    val showIme = {
+      if (dialog === sheetDialog && target.isAttachedToWindow) {
+        target.requestFocus()
+        target.post {
+          if (dialog === sheetDialog && target.hasFocus()) {
+            val inputMethodManager = reactContext.getSystemService(
+              android.content.Context.INPUT_METHOD_SERVICE,
+            ) as? InputMethodManager
+            inputMethodManager?.showSoftInput(target, InputMethodManager.SHOW_IMPLICIT)
+          }
+        }
+      }
+      clearPendingImeFocus(decorView)
+    }
+    if (decorView.hasWindowFocus()) {
+      showIme()
+      return
+    }
+    val listener = object : ViewTreeObserver.OnWindowFocusChangeListener {
+      override fun onWindowFocusChanged(hasFocus: Boolean) {
+        if (hasFocus) showIme()
+      }
+    }
+    windowFocusListener = listener
+    decorView.viewTreeObserver.addOnWindowFocusChangeListener(listener)
+  }
+
+  private fun clearPendingImeFocus(decorView: View? = dialog?.window?.decorView) {
+    val listener = windowFocusListener
+    if (listener != null && decorView?.viewTreeObserver?.isAlive == true) {
+      decorView.viewTreeObserver.removeOnWindowFocusChangeListener(listener)
+    }
+    windowFocusListener = null
+    pendingImeTarget = null
+  }
+
   internal fun dismissDialogInternal(
     reason: String,
     animated: Boolean,
@@ -768,6 +832,11 @@ class NativeSheetView(
   ) {
     val currentDialog = dialog
     if (currentDialog == null) {
+      if (reason == "security" && committedOpen && !dismissNotified) {
+        dismissedForCurrentOpen = true
+        dismissNotified = true
+        onDismiss?.invoke(reason)
+      }
       completion()
       return
     }
@@ -818,6 +887,7 @@ class NativeSheetView(
 
   private fun handleDialogDismissed() {
     val child = contentChild
+    clearPendingImeFocus()
     clearWindowInsetsObservation()
     navigationBarBackgroundView?.let { view ->
       (view.parent as? ViewGroup)?.removeView(view)
@@ -835,15 +905,17 @@ class NativeSheetView(
     extendsIntoNavigationBar = false
     navigationBarBackgroundColor = Color.TRANSPARENT
     preImeBottomSheetBottomPx = null
+    userDrivenSheetSlide = false
     dimAnimator?.cancel()
     dimAnimator = null
     heightAnimator?.cancel()
     heightAnimator = null
     child?.let { attachChild(this, it, 0) }
     NativeSheetStack.didDismiss(this)
-    if (!dismissNotified) {
+    val reopenedAfterProgrammaticDismiss = pendingDismissReason == "programmatic" && committedOpen
+    dismissedForCurrentOpen = committedOpen && !reopenedAfterProgrammaticDismiss
+    if (!reopenedAfterProgrammaticDismiss && !dismissNotified) {
       dismissNotified = true
-      dismissedForCurrentOpen = committedOpen
       onDismiss?.invoke(pendingDismissReason)
     }
     val completion = dismissalCompletion

package/ios/NativeSheetContainerView.swift

@@ -119,6 +119,12 @@ private final class NativeSheetPresentationCoordinator {
     processPending()
   }
 
+  func cancelDeferredProgrammaticDismissal(_ host: NativeSheetContainerView) {
+    deferredDismissals.removeAll {
+      $0.host.value == nil || ($0.host.value === host && $0.reason == "programmatic")
+    }
+  }
+
   func dismiss(_ host: NativeSheetContainerView, reason: String, animated: Bool) {
     pending.removeAll { $0.value == nil || $0.value === host }
     guard !transitioning else {
@@ -221,7 +227,7 @@ private final class NativeSheetPresentationCoordinator {
         } else {
           self.queueDismiss(
             host,
-            reason: host.securityBlocked ? "security" : "system",
+            reason: host.securityBlocked ? "security" : (host.open ? "system" : "programmatic"),
             animated: false
           )
         }
@@ -298,6 +304,7 @@ private final class NativeSheetViewController: UIViewController,
   private let showHandleValue: Bool
   private let dismissOnBackdropPressValue: Bool
   private let dimAmountValue: CGFloat
+  private let backgroundView = UIView()
   private var backdropTap: UITapGestureRecognizer?
   private var dimmingView: UIView?
   private var heightAnimator: UIViewPropertyAnimator?
@@ -334,10 +341,18 @@ private final class NativeSheetViewController: UIViewController,
   }
 
   override func loadView() {
-    view = UIView()
-    view.backgroundColor = backgroundColorValue
-    view.clipsToBounds = true
-    host.attachTouchHandler(to: view)
+    let rootView = UIView()
+    rootView.backgroundColor = backgroundColorValue
+    rootView.clipsToBounds = true
+    if #available(iOS 26.0, *) {
+      backgroundView.frame = rootView.bounds
+      backgroundView.autoresizingMask = [.flexibleWidth, .flexibleHeight]
+      backgroundView.backgroundColor = backgroundColorValue
+      backgroundView.isUserInteractionEnabled = false
+      rootView.addSubview(backgroundView)
+    }
+    view = rootView
+    host.attachTouchHandler(to: rootView)
   }
 
   deinit {
@@ -352,11 +367,15 @@ private final class NativeSheetViewController: UIViewController,
     super.viewDidLoad()
     host.moveContent(to: view)
     guard let sheet = sheetPresentationController else { return }
-    sheet.detents = [
-      .custom(identifier: detentIdentifier) { [weak self] context in
-        min(max(self?.targetHeight ?? 1, 1), context.maximumDetentValue)
-      },
-    ]
+    let detent = UISheetPresentationController.Detent.custom(
+      identifier: detentIdentifier
+    ) { [weak self] context in
+      min(max(self?.targetHeight ?? 1, 1), context.maximumDetentValue)
+    }
+    if #available(iOS 26.1, *) {
+      detent.backgroundEffect = UIColorEffect(color: backgroundColorValue)
+    }
+    sheet.detents = [detent]
     sheet.selectedDetentIdentifier = detentIdentifier
     sheet.largestUndimmedDetentIdentifier = detentIdentifier
     sheet.prefersGrabberVisible = showHandleValue
@@ -460,6 +479,11 @@ private final class NativeSheetViewController: UIViewController,
   override func viewDidLayoutSubviews() {
     super.viewDidLayoutSubviews()
     removePresentationShadow()
+    if #available(iOS 26.0, *) {
+      DispatchQueue.main.async { [weak self] in
+        self?.removePresentationShadow()
+      }
+    }
     host.layoutPresentedContent(in: view.bounds)
   }
 
@@ -521,6 +545,10 @@ private final class NativeSheetViewController: UIViewController,
   private func clearShadow(on shadowView: UIView) {
     CATransaction.begin()
     CATransaction.setDisableActions(true)
+    if #available(iOS 26.0, *),
+       NSStringFromClass(type(of: shadowView)).contains("UIDropShadowView") {
+      compensateForPresentationScale(in: shadowView)
+    }
     shadowView.layer.shadowOpacity = 0
     shadowView.layer.shadowRadius = 0
     shadowView.layer.shadowColor = UIColor.clear.cgColor
@@ -528,6 +556,21 @@ private final class NativeSheetViewController: UIViewController,
     CATransaction.commit()
   }
 
+  @available(iOS 26.0, *)
+  private func compensateForPresentationScale(in shadowView: UIView) {
+    guard var surfaceView = view else { return }
+    while let parent = surfaceView.superview, parent !== shadowView {
+      surfaceView = parent
+    }
+    guard surfaceView.superview === shadowView else { return }
+    let transform = shadowView.transform
+    guard abs(transform.a) > 0.001, abs(transform.d) > 0.001 else { return }
+    surfaceView.transform = CGAffineTransform(
+      scaleX: 1 / transform.a,
+      y: 1 / transform.d
+    )
+  }
+
   private func startSuppressingPresentationShadow() {
     shadowSuppressionDisplayLink?.invalidate()
     removePresentationShadow()
@@ -666,7 +709,7 @@ private final class NativeSheetContentWrapperView: UIView {
     if let controller = presentedController {
       moveContent(to: controller.view)
     } else {
-      moveContent(to: self)
+      stageContent()
     }
   }
 
@@ -683,6 +726,7 @@ private final class NativeSheetContentWrapperView: UIView {
     committedOpen = open
     if openChanged && open {
       dismissNotified = false
+      NativeSheetPresentationCoordinator.shared.cancelDeferredProgrammaticDismissal(self)
     }
     if !open {
       dismissedForCurrentOpen = false
@@ -696,7 +740,9 @@ private final class NativeSheetContentWrapperView: UIView {
     } else if window != nil,
               (openChanged || presentedController == nil),
               !dismissedForCurrentOpen {
-      NativeSheetPresentationCoordinator.shared.present(self)
+      if presentedController == nil || presentedController?.isBeingDismissed == true {
+        NativeSheetPresentationCoordinator.shared.present(self)
+      }
     } else if let controller = presentedController, !dismissedForCurrentOpen {
       let shouldAnimate = controller.presentingViewController != nil
         && !controller.isBeingPresented
@@ -740,12 +786,14 @@ private final class NativeSheetContentWrapperView: UIView {
   fileprivate func finishDismiss(reason: String) {
     if let child = contentChild {
       child.autoresizingMask = []
-      moveContent(to: self)
+      stageContent()
     }
     let hadController = presentedController != nil
     presentedController = nil
-    dismissedForCurrentOpen = committedOpen
-    if hadController && !dismissNotified {
+    let reopenedAfterProgrammaticDismiss = reason == "programmatic" && committedOpen
+    dismissedForCurrentOpen = committedOpen && !reopenedAfterProgrammaticDismiss
+    let shouldNotify = hadController || (reason == "security" && committedOpen)
+    if shouldNotify && !reopenedAfterProgrammaticDismiss && !dismissNotified {
       dismissNotified = true
       onDismiss?(["reason": reason])
     }
@@ -762,6 +810,16 @@ private final class NativeSheetContentWrapperView: UIView {
     contentWrapperView.frame = parent.bounds
   }
 
+  private func stageContent() {
+    if #available(iOS 26.0, *) {
+      contentWrapperView.removeFromSuperview()
+      contentWrapperView.frame = bounds
+      contentWrapperView.layoutIfNeeded()
+    } else {
+      moveContent(to: self)
+    }
+  }
+
   fileprivate func layoutPresentedContent(in bounds: CGRect) {
     contentWrapperView.frame = bounds
   }

package/lib/module/NativeSheetRegistry.js

@@ -150,9 +150,19 @@ export function requestSecurityDismissAllNativeSheets() {
   if (securityFallbackTimer) {
     clearTimeout(securityFallbackTimer);
   }
+  const fallbackEntryIds = presentedEntries.map(entry => entry.id);
   securityFallbackTimer = setTimeout(() => {
     securityFallbackTimer = undefined;
-    finishAllNativeSheetRegistryEntries('security');
+    fallbackEntryIds.forEach(id => {
+      const pendingEntry = entries.find(entry => entry.id === id);
+      if (!pendingEntry) {
+        return;
+      }
+      finishNativeSheetRegistryEntry(id, 'security');
+      pendingEntry.options.onAnimationComplete?.({
+        open: false
+      });
+    });
   }, 500);
 }
 export function setNativeSheetRegistryBlocked(blockerId, blocked) {

package/lib/module/NativeSheetRegistry.js.map

@@ -1 +1 @@
-{"version":3,"names":["PRESENTATION_CLOSE_FALLBACK_MS","nextId","entries","listeners","Set","securityFallbackTimer","closeFallbackTimers","Map","registryBlockers","clearCloseFallbackTimer","id","timer","get","clearTimeout","delete","emitChange","forEach","listener","subscribeNativeSheetRegistry","add","getNativeSheetRegistrySnapshot","addNativeSheetRegistryEntry","options","content","size","onOpenChange","onDismiss","onAnimationComplete","open","entry","presentationRequested","closeNativeSheetRegistryEntry","find","item","filter","map","has","set","setTimeout","pendingEntry","finishNativeSheetRegistryEntry","markNativeSheetRegistryEntryPresentationRequested","reason","finishAllNativeSheetRegistryEntries","currentEntries","length","requestSecurityDismissAllNativeSheets","unpresentedEntries","presentedEntries","undefined","setNativeSheetRegistryBlocked","blockerId","blocked","wasBlocked","resetNativeSheetRegistryForTests","clear"],"sourceRoot":"../../src","sources":["NativeSheetRegistry.ts"],"mappings":";;AAcA,MAAMA,8BAA8B,GAAG,KAAK;AAE5C,IAAIC,MAAM,GAAG,CAAC;AACd,IAAIC,OAA4C,GAAG,EAAE;AACrD,MAAMC,SAAS,GAAG,IAAIC,GAAG,CAAmB,CAAC;AAC7C,IAAIC,qBAAgE;AACpE,MAAMC,mBAAmB,GAAG,IAAIC,GAAG,CAAwC,CAAC;AAC5E,MAAMC,gBAAgB,GAAG,IAAIJ,GAAG,CAAS,CAAC;AAE1C,SAASK,uBAAuBA,CAACC,EAAU,EAAE;EAC3C,MAAMC,KAAK,GAAGL,mBAAmB,CAACM,GAAG,CAACF,EAAE,CAAC;EACzC,IAAIC,KAAK,EAAE;IACTE,YAAY,CAACF,KAAK,CAAC;IACnBL,mBAAmB,CAACQ,MAAM,CAACJ,EAAE,CAAC;EAChC;AACF;AAEA,SAASK,UAAUA,CAAA,EAAG;EACpBZ,SAAS,CAACa,OAAO,CAAEC,QAAQ,IAAKA,QAAQ,CAAC,CAAC,CAAC;AAC7C;AAEA,OAAO,SAASC,4BAA4BA,CAACD,QAA0B,EAAE;EACvEd,SAAS,CAACgB,GAAG,CAACF,QAAQ,CAAC;EACvB,OAAO,MAAMd,SAAS,CAACW,MAAM,CAACG,QAAQ,CAAC;AACzC;AAEA,OAAO,SAASG,8BAA8BA,CAAA,EAAG;EAC/C,OAAOlB,OAAO;AAChB;AAEA,OAAO,SAASmB,2BAA2BA,CACzCC,OAA+B,EAC/BC,OAAkB,EAClB;EACA,MAAMb,EAAE,GAAGT,MAAM;EACjBA,MAAM,IAAI,CAAC;EACX,IAAIO,gBAAgB,CAACgB,IAAI,GAAG,CAAC,EAAE;IAC7BF,OAAO,CAACG,YAAY,GAAG,IAAI,CAAC;IAC5BH,OAAO,CAACG,YAAY,GAAG,KAAK,CAAC;IAC7BH,OAAO,CAACI,SAAS,GAAG,UAAU,CAAC;IAC/BJ,OAAO,CAACK,mBAAmB,GAAG;MAAEC,IAAI,EAAE;IAAM,CAAC,CAAC;IAC9C,OAAOlB,EAAE;EACX;EACA,MAAMmB,KAA+B,GAAG;IACtCnB,EAAE;IACFkB,IAAI,EAAE,IAAI;IACVE,qBAAqB,EAAE,KAAK;IAC5BP,OAAO;IACPD;EACF,CAAC;EACDpB,OAAO,GAAG,CAAC,GAAGA,OAAO,EAAE2B,KAAK,CAAC;EAC7BP,OAAO,CAACG,YAAY,GAAG,IAAI,CAAC;EAC5BV,UAAU,CAAC,CAAC;EACZ,OAAOL,EAAE;AACX;AAEA,OAAO,SAASqB,6BAA6BA,CAACrB,EAAU,EAAE;EACxD,MAAMmB,KAAK,GAAG3B,OAAO,CAAC8B,IAAI,CAAEC,IAAI,IAAKA,IAAI,CAACvB,EAAE,KAAKA,EAAE,CAAC;EACpD,IAAI,CAACmB,KAAK,IAAI,CAACA,KAAK,CAACD,IAAI,EAAE;IACzB;EACF;EACAC,KAAK,CAACP,OAAO,CAACG,YAAY,GAAG,KAAK,CAAC;EACnC,IAAI,CAACI,KAAK,CAACC,qBAAqB,EAAE;IAChC5B,OAAO,GAAGA,OAAO,CAACgC,MAAM,CAAED,IAAI,IAAKA,IAAI,CAACvB,EAAE,KAAKA,EAAE,CAAC;IAClDmB,KAAK,CAACP,OAAO,CAACI,SAAS,GAAG,cAAc,CAAC;IACzCG,KAAK,CAACP,OAAO,CAACK,mBAAmB,GAAG;MAAEC,IAAI,EAAE;IAAM,CAAC,CAAC;EACtD,CAAC,MAAM;IACL1B,OAAO,GAAGA,OAAO,CAACiC,GAAG,CAAEF,IAAI,IACzBA,IAAI,CAACvB,EAAE,KAAKA,EAAE,GAAG;MAAE,GAAGuB,IAAI;MAAEL,IAAI,EAAE;IAAM,CAAC,GAAGK,IAC9C,CAAC;IACD,IAAI,CAAC3B,mBAAmB,CAAC8B,GAAG,CAAC1B,EAAE,CAAC,EAAE;MAChCJ,mBAAmB,CAAC+B,GAAG,CACrB3B,EAAE,EACF4B,UAAU,CAAC,MAAM;QACfhC,mBAAmB,CAACQ,MAAM,CAACJ,EAAE,CAAC;QAC9B,MAAM6B,YAAY,GAAGrC,OAAO,CAAC8B,IAAI,CAAEC,IAAI,IAAKA,IAAI,CAACvB,EAAE,KAAKA,EAAE,CAAC;QAC3D,IAAI,CAAC6B,YAAY,EAAE;UACjB;QACF;QACAC,8BAA8B,CAAC9B,EAAE,EAAE,cAAc,CAAC;QAClD6B,YAAY,CAACjB,OAAO,CAACK,mBAAmB,GAAG;UAAEC,IAAI,EAAE;QAAM,CAAC,CAAC;MAC7D,CAAC,EAAE5B,8BAA8B,CACnC,CAAC;IACH;EACF;EACAe,UAAU,CAAC,CAAC;AACd;AAEA,OAAO,SAAS0B,iDAAiDA,CAAC/B,EAAU,EAAE;EAC5ER,OAAO,GAAGA,OAAO,CAACiC,GAAG,CAAEN,KAAK,IAC1BA,KAAK,CAACnB,EAAE,KAAKA,EAAE,IAAI,CAACmB,KAAK,CAACC,qBAAqB,GAC3C;IAAE,GAAGD,KAAK;IAAEC,qBAAqB,EAAE;EAAK,CAAC,GACzCD,KACN,CAAC;AACH;AAEA,OAAO,SAASW,8BAA8BA,CAC5C9B,EAAU,EACVgC,MAAgC,EAChC;EACA,MAAMb,KAAK,GAAG3B,OAAO,CAAC8B,IAAI,CAAEC,IAAI,IAAKA,IAAI,CAACvB,EAAE,KAAKA,EAAE,CAAC;EACpD,IAAI,CAACmB,KAAK,EAAE;IACV;EACF;EACApB,uBAAuB,CAACC,EAAE,CAAC;EAC3B,IAAImB,KAAK,CAACD,IAAI,EAAE;IACdC,KAAK,CAACP,OAAO,CAACG,YAAY,GAAG,KAAK,CAAC;EACrC;EACAvB,OAAO,GAAGA,OAAO,CAACgC,MAAM,CAAED,IAAI,IAAKA,IAAI,CAACvB,EAAE,KAAKA,EAAE,CAAC;EAClDmB,KAAK,CAACP,OAAO,CAACI,SAAS,GAAGgB,MAAM,CAAC;EACjC3B,UAAU,CAAC,CAAC;AACd;AAEA,OAAO,SAAS4B,mCAAmCA,CACjDD,MAAgC,EAChC;EACA,MAAME,cAAc,GAAG1C,OAAO;EAC9B,IAAI,CAAC0C,cAAc,CAACC,MAAM,EAAE;IAC1B;EACF;EACA3C,OAAO,GAAG,EAAE;EACZ0C,cAAc,CAAC5B,OAAO,CAAEa,KAAK,IAAK;IAChCpB,uBAAuB,CAACoB,KAAK,CAACnB,EAAE,CAAC;IACjC,IAAImB,KAAK,CAACD,IAAI,EAAE;MACdC,KAAK,CAACP,OAAO,CAACG,YAAY,GAAG,KAAK,CAAC;IACrC;IACAI,KAAK,CAACP,OAAO,CAACI,SAAS,GAAGgB,MAAM,CAAC;IACjCb,KAAK,CAACP,OAAO,CAACK,mBAAmB,GAAG;MAAEC,IAAI,EAAE;IAAM,CAAC,CAAC;EACtD,CAAC,CAAC;EACFb,UAAU,CAAC,CAAC;AACd;AAEA,OAAO,SAAS+B,qCAAqCA,CAAA,EAAG;EACtD,IAAI,CAAC5C,OAAO,CAAC2C,MAAM,EAAE;IACnB;EACF;EACA,MAAME,kBAAkB,GAAG7C,OAAO,CAACgC,MAAM,CACtCL,KAAK,IAAK,CAACA,KAAK,CAACC,qBACpB,CAAC;EACD,MAAMkB,gBAAgB,GAAG9C,OAAO,CAACgC,MAAM,CACpCL,KAAK,IAAKA,KAAK,CAACC,qBACnB,CAAC;EACDiB,kBAAkB,CAAC/B,OAAO,CAAEa,KAAK,IAAK;IACpC,IAAIA,KAAK,CAACD,IAAI,EAAE;MACdC,KAAK,CAACP,OAAO,CAACG,YAAY,GAAG,KAAK,CAAC;IACrC;IACAI,KAAK,CAACP,OAAO,CAACI,SAAS,GAAG,UAAU,CAAC;IACrCG,KAAK,CAACP,OAAO,CAACK,mBAAmB,GAAG;MAAEC,IAAI,EAAE;IAAM,CAAC,CAAC;EACtD,CAAC,CAAC;EACF1B,OAAO,GAAG8C,gBAAgB,CAACb,GAAG,CAAEN,KAAK,IAAK;IACxC,IAAIA,KAAK,CAACD,IAAI,EAAE;MACdC,KAAK,CAACP,OAAO,CAACG,YAAY,GAAG,KAAK,CAAC;MACnC,OAAO;QAAE,GAAGI,KAAK;QAAED,IAAI,EAAE;MAAM,CAAC;IAClC;IACA,OAAOC,KAAK;EACd,CAAC,CAAC;EACFd,UAAU,CAAC,CAAC;EACZ,IAAI,CAACb,OAAO,CAAC2C,MAAM,EAAE;IACnB;EACF;EACA,IAAIxC,qBAAqB,EAAE;IACzBQ,YAAY,CAACR,qBAAqB,CAAC;EACrC;EACAA,qBAAqB,GAAGiC,UAAU,CAAC,MAAM;IACvCjC,qBAAqB,GAAG4C,SAAS;IACjCN,mCAAmC,CAAC,UAAU,CAAC;EACjD,CAAC,EAAE,GAAG,CAAC;AACT;AAEA,OAAO,SAASO,6BAA6BA,CAC3CC,SAAiB,EACjBC,OAAgB,EAChB;EACA,MAAMC,UAAU,GAAG7C,gBAAgB,CAACgB,IAAI,GAAG,CAAC;EAC5C,IAAI4B,OAAO,EAAE;IACX5C,gBAAgB,CAACW,GAAG,CAACgC,SAAS,CAAC;EACjC,CAAC,MAAM;IACL3C,gBAAgB,CAACM,MAAM,CAACqC,SAAS,CAAC;EACpC;EACA,IAAI,CAACE,UAAU,IAAI7C,gBAAgB,CAACgB,IAAI,GAAG,CAAC,EAAE;IAC5CsB,qCAAqC,CAAC,CAAC;EACzC;AACF;AAEA,OAAO,SAASQ,gCAAgCA,CAAA,EAAG;EACjD,IAAIjD,qBAAqB,EAAE;IACzBQ,YAAY,CAACR,qBAAqB,CAAC;IACnCA,qBAAqB,GAAG4C,SAAS;EACnC;EACA3C,mBAAmB,CAACU,OAAO,CAACH,YAAY,CAAC;EACzCP,mBAAmB,CAACiD,KAAK,CAAC,CAAC;EAC3BrD,OAAO,GAAG,EAAE;EACZD,MAAM,GAAG,CAAC;EACVO,gBAAgB,CAAC+C,KAAK,CAAC,CAAC;EACxBpD,SAAS,CAACoD,KAAK,CAAC,CAAC;AACnB","ignoreList":[]}
+{"version":3,"names":["PRESENTATION_CLOSE_FALLBACK_MS","nextId","entries","listeners","Set","securityFallbackTimer","closeFallbackTimers","Map","registryBlockers","clearCloseFallbackTimer","id","timer","get","clearTimeout","delete","emitChange","forEach","listener","subscribeNativeSheetRegistry","add","getNativeSheetRegistrySnapshot","addNativeSheetRegistryEntry","options","content","size","onOpenChange","onDismiss","onAnimationComplete","open","entry","presentationRequested","closeNativeSheetRegistryEntry","find","item","filter","map","has","set","setTimeout","pendingEntry","finishNativeSheetRegistryEntry","markNativeSheetRegistryEntryPresentationRequested","reason","finishAllNativeSheetRegistryEntries","currentEntries","length","requestSecurityDismissAllNativeSheets","unpresentedEntries","presentedEntries","fallbackEntryIds","undefined","setNativeSheetRegistryBlocked","blockerId","blocked","wasBlocked","resetNativeSheetRegistryForTests","clear"],"sourceRoot":"../../src","sources":["NativeSheetRegistry.ts"],"mappings":";;AAcA,MAAMA,8BAA8B,GAAG,KAAK;AAE5C,IAAIC,MAAM,GAAG,CAAC;AACd,IAAIC,OAA4C,GAAG,EAAE;AACrD,MAAMC,SAAS,GAAG,IAAIC,GAAG,CAAmB,CAAC;AAC7C,IAAIC,qBAAgE;AACpE,MAAMC,mBAAmB,GAAG,IAAIC,GAAG,CAAwC,CAAC;AAC5E,MAAMC,gBAAgB,GAAG,IAAIJ,GAAG,CAAS,CAAC;AAE1C,SAASK,uBAAuBA,CAACC,EAAU,EAAE;EAC3C,MAAMC,KAAK,GAAGL,mBAAmB,CAACM,GAAG,CAACF,EAAE,CAAC;EACzC,IAAIC,KAAK,EAAE;IACTE,YAAY,CAACF,KAAK,CAAC;IACnBL,mBAAmB,CAACQ,MAAM,CAACJ,EAAE,CAAC;EAChC;AACF;AAEA,SAASK,UAAUA,CAAA,EAAG;EACpBZ,SAAS,CAACa,OAAO,CAAEC,QAAQ,IAAKA,QAAQ,CAAC,CAAC,CAAC;AAC7C;AAEA,OAAO,SAASC,4BAA4BA,CAACD,QAA0B,EAAE;EACvEd,SAAS,CAACgB,GAAG,CAACF,QAAQ,CAAC;EACvB,OAAO,MAAMd,SAAS,CAACW,MAAM,CAACG,QAAQ,CAAC;AACzC;AAEA,OAAO,SAASG,8BAA8BA,CAAA,EAAG;EAC/C,OAAOlB,OAAO;AAChB;AAEA,OAAO,SAASmB,2BAA2BA,CACzCC,OAA+B,EAC/BC,OAAkB,EAClB;EACA,MAAMb,EAAE,GAAGT,MAAM;EACjBA,MAAM,IAAI,CAAC;EACX,IAAIO,gBAAgB,CAACgB,IAAI,GAAG,CAAC,EAAE;IAC7BF,OAAO,CAACG,YAAY,GAAG,IAAI,CAAC;IAC5BH,OAAO,CAACG,YAAY,GAAG,KAAK,CAAC;IAC7BH,OAAO,CAACI,SAAS,GAAG,UAAU,CAAC;IAC/BJ,OAAO,CAACK,mBAAmB,GAAG;MAAEC,IAAI,EAAE;IAAM,CAAC,CAAC;IAC9C,OAAOlB,EAAE;EACX;EACA,MAAMmB,KAA+B,GAAG;IACtCnB,EAAE;IACFkB,IAAI,EAAE,IAAI;IACVE,qBAAqB,EAAE,KAAK;IAC5BP,OAAO;IACPD;EACF,CAAC;EACDpB,OAAO,GAAG,CAAC,GAAGA,OAAO,EAAE2B,KAAK,CAAC;EAC7BP,OAAO,CAACG,YAAY,GAAG,IAAI,CAAC;EAC5BV,UAAU,CAAC,CAAC;EACZ,OAAOL,EAAE;AACX;AAEA,OAAO,SAASqB,6BAA6BA,CAACrB,EAAU,EAAE;EACxD,MAAMmB,KAAK,GAAG3B,OAAO,CAAC8B,IAAI,CAAEC,IAAI,IAAKA,IAAI,CAACvB,EAAE,KAAKA,EAAE,CAAC;EACpD,IAAI,CAACmB,KAAK,IAAI,CAACA,KAAK,CAACD,IAAI,EAAE;IACzB;EACF;EACAC,KAAK,CAACP,OAAO,CAACG,YAAY,GAAG,KAAK,CAAC;EACnC,IAAI,CAACI,KAAK,CAACC,qBAAqB,EAAE;IAChC5B,OAAO,GAAGA,OAAO,CAACgC,MAAM,CAAED,IAAI,IAAKA,IAAI,CAACvB,EAAE,KAAKA,EAAE,CAAC;IAClDmB,KAAK,CAACP,OAAO,CAACI,SAAS,GAAG,cAAc,CAAC;IACzCG,KAAK,CAACP,OAAO,CAACK,mBAAmB,GAAG;MAAEC,IAAI,EAAE;IAAM,CAAC,CAAC;EACtD,CAAC,MAAM;IACL1B,OAAO,GAAGA,OAAO,CAACiC,GAAG,CAAEF,IAAI,IACzBA,IAAI,CAACvB,EAAE,KAAKA,EAAE,GAAG;MAAE,GAAGuB,IAAI;MAAEL,IAAI,EAAE;IAAM,CAAC,GAAGK,IAC9C,CAAC;IACD,IAAI,CAAC3B,mBAAmB,CAAC8B,GAAG,CAAC1B,EAAE,CAAC,EAAE;MAChCJ,mBAAmB,CAAC+B,GAAG,CACrB3B,EAAE,EACF4B,UAAU,CAAC,MAAM;QACfhC,mBAAmB,CAACQ,MAAM,CAACJ,EAAE,CAAC;QAC9B,MAAM6B,YAAY,GAAGrC,OAAO,CAAC8B,IAAI,CAAEC,IAAI,IAAKA,IAAI,CAACvB,EAAE,KAAKA,EAAE,CAAC;QAC3D,IAAI,CAAC6B,YAAY,EAAE;UACjB;QACF;QACAC,8BAA8B,CAAC9B,EAAE,EAAE,cAAc,CAAC;QAClD6B,YAAY,CAACjB,OAAO,CAACK,mBAAmB,GAAG;UAAEC,IAAI,EAAE;QAAM,CAAC,CAAC;MAC7D,CAAC,EAAE5B,8BAA8B,CACnC,CAAC;IACH;EACF;EACAe,UAAU,CAAC,CAAC;AACd;AAEA,OAAO,SAAS0B,iDAAiDA,CAAC/B,EAAU,EAAE;EAC5ER,OAAO,GAAGA,OAAO,CAACiC,GAAG,CAAEN,KAAK,IAC1BA,KAAK,CAACnB,EAAE,KAAKA,EAAE,IAAI,CAACmB,KAAK,CAACC,qBAAqB,GAC3C;IAAE,GAAGD,KAAK;IAAEC,qBAAqB,EAAE;EAAK,CAAC,GACzCD,KACN,CAAC;AACH;AAEA,OAAO,SAASW,8BAA8BA,CAC5C9B,EAAU,EACVgC,MAAgC,EAChC;EACA,MAAMb,KAAK,GAAG3B,OAAO,CAAC8B,IAAI,CAAEC,IAAI,IAAKA,IAAI,CAACvB,EAAE,KAAKA,EAAE,CAAC;EACpD,IAAI,CAACmB,KAAK,EAAE;IACV;EACF;EACApB,uBAAuB,CAACC,EAAE,CAAC;EAC3B,IAAImB,KAAK,CAACD,IAAI,EAAE;IACdC,KAAK,CAACP,OAAO,CAACG,YAAY,GAAG,KAAK,CAAC;EACrC;EACAvB,OAAO,GAAGA,OAAO,CAACgC,MAAM,CAAED,IAAI,IAAKA,IAAI,CAACvB,EAAE,KAAKA,EAAE,CAAC;EAClDmB,KAAK,CAACP,OAAO,CAACI,SAAS,GAAGgB,MAAM,CAAC;EACjC3B,UAAU,CAAC,CAAC;AACd;AAEA,OAAO,SAAS4B,mCAAmCA,CACjDD,MAAgC,EAChC;EACA,MAAME,cAAc,GAAG1C,OAAO;EAC9B,IAAI,CAAC0C,cAAc,CAACC,MAAM,EAAE;IAC1B;EACF;EACA3C,OAAO,GAAG,EAAE;EACZ0C,cAAc,CAAC5B,OAAO,CAAEa,KAAK,IAAK;IAChCpB,uBAAuB,CAACoB,KAAK,CAACnB,EAAE,CAAC;IACjC,IAAImB,KAAK,CAACD,IAAI,EAAE;MACdC,KAAK,CAACP,OAAO,CAACG,YAAY,GAAG,KAAK,CAAC;IACrC;IACAI,KAAK,CAACP,OAAO,CAACI,SAAS,GAAGgB,MAAM,CAAC;IACjCb,KAAK,CAACP,OAAO,CAACK,mBAAmB,GAAG;MAAEC,IAAI,EAAE;IAAM,CAAC,CAAC;EACtD,CAAC,CAAC;EACFb,UAAU,CAAC,CAAC;AACd;AAEA,OAAO,SAAS+B,qCAAqCA,CAAA,EAAG;EACtD,IAAI,CAAC5C,OAAO,CAAC2C,MAAM,EAAE;IACnB;EACF;EACA,MAAME,kBAAkB,GAAG7C,OAAO,CAACgC,MAAM,CACtCL,KAAK,IAAK,CAACA,KAAK,CAACC,qBACpB,CAAC;EACD,MAAMkB,gBAAgB,GAAG9C,OAAO,CAACgC,MAAM,CACpCL,KAAK,IAAKA,KAAK,CAACC,qBACnB,CAAC;EACDiB,kBAAkB,CAAC/B,OAAO,CAAEa,KAAK,IAAK;IACpC,IAAIA,KAAK,CAACD,IAAI,EAAE;MACdC,KAAK,CAACP,OAAO,CAACG,YAAY,GAAG,KAAK,CAAC;IACrC;IACAI,KAAK,CAACP,OAAO,CAACI,SAAS,GAAG,UAAU,CAAC;IACrCG,KAAK,CAACP,OAAO,CAACK,mBAAmB,GAAG;MAAEC,IAAI,EAAE;IAAM,CAAC,CAAC;EACtD,CAAC,CAAC;EACF1B,OAAO,GAAG8C,gBAAgB,CAACb,GAAG,CAAEN,KAAK,IAAK;IACxC,IAAIA,KAAK,CAACD,IAAI,EAAE;MACdC,KAAK,CAACP,OAAO,CAACG,YAAY,GAAG,KAAK,CAAC;MACnC,OAAO;QAAE,GAAGI,KAAK;QAAED,IAAI,EAAE;MAAM,CAAC;IAClC;IACA,OAAOC,KAAK;EACd,CAAC,CAAC;EACFd,UAAU,CAAC,CAAC;EACZ,IAAI,CAACb,OAAO,CAAC2C,MAAM,EAAE;IACnB;EACF;EACA,IAAIxC,qBAAqB,EAAE;IACzBQ,YAAY,CAACR,qBAAqB,CAAC;EACrC;EACA,MAAM4C,gBAAgB,GAAGD,gBAAgB,CAACb,GAAG,CAAEN,KAAK,IAAKA,KAAK,CAACnB,EAAE,CAAC;EAClEL,qBAAqB,GAAGiC,UAAU,CAAC,MAAM;IACvCjC,qBAAqB,GAAG6C,SAAS;IACjCD,gBAAgB,CAACjC,OAAO,CAAEN,EAAE,IAAK;MAC/B,MAAM6B,YAAY,GAAGrC,OAAO,CAAC8B,IAAI,CAAEH,KAAK,IAAKA,KAAK,CAACnB,EAAE,KAAKA,EAAE,CAAC;MAC7D,IAAI,CAAC6B,YAAY,EAAE;QACjB;MACF;MACAC,8BAA8B,CAAC9B,EAAE,EAAE,UAAU,CAAC;MAC9C6B,YAAY,CAACjB,OAAO,CAACK,mBAAmB,GAAG;QAAEC,IAAI,EAAE;MAAM,CAAC,CAAC;IAC7D,CAAC,CAAC;EACJ,CAAC,EAAE,GAAG,CAAC;AACT;AAEA,OAAO,SAASuB,6BAA6BA,CAC3CC,SAAiB,EACjBC,OAAgB,EAChB;EACA,MAAMC,UAAU,GAAG9C,gBAAgB,CAACgB,IAAI,GAAG,CAAC;EAC5C,IAAI6B,OAAO,EAAE;IACX7C,gBAAgB,CAACW,GAAG,CAACiC,SAAS,CAAC;EACjC,CAAC,MAAM;IACL5C,gBAAgB,CAACM,MAAM,CAACsC,SAAS,CAAC;EACpC;EACA,IAAI,CAACE,UAAU,IAAI9C,gBAAgB,CAACgB,IAAI,GAAG,CAAC,EAAE;IAC5CsB,qCAAqC,CAAC,CAAC;EACzC;AACF;AAEA,OAAO,SAASS,gCAAgCA,CAAA,EAAG;EACjD,IAAIlD,qBAAqB,EAAE;IACzBQ,YAAY,CAACR,qBAAqB,CAAC;IACnCA,qBAAqB,GAAG6C,SAAS;EACnC;EACA5C,mBAAmB,CAACU,OAAO,CAACH,YAAY,CAAC;EACzCP,mBAAmB,CAACkD,KAAK,CAAC,CAAC;EAC3BtD,OAAO,GAAG,EAAE;EACZD,MAAM,GAAG,CAAC;EACVO,gBAAgB,CAACgD,KAAK,CAAC,CAAC;EACxBrD,SAAS,CAACqD,KAAK,CAAC,CAAC;AACnB","ignoreList":[]}

package/lib/typescript/src/NativeSheetRegistry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NativeSheetRegistry.d.ts","sourceRoot":"","sources":["../../../src/NativeSheetRegistry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAEvC,OAAO,KAAK,EAAE,wBAAwB,EAAE,sBAAsB,EAAE,MAAM,SAAS,CAAC;AAEhF,MAAM,WAAW,wBAAwB;IACvC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,OAAO,CAAC;IACd,qBAAqB,EAAE,OAAO,CAAC;IAC/B,OAAO,EAAE,SAAS,CAAC;IACnB,OAAO,EAAE,sBAAsB,CAAC;CACjC;AAED,KAAK,gBAAgB,GAAG,MAAM,IAAI,CAAC;AAuBnC,wBAAgB,4BAA4B,CAAC,QAAQ,EAAE,gBAAgB,iBAGtE;AAED,wBAAgB,8BAA8B,wCAE7C;AAED,wBAAgB,2BAA2B,CACzC,OAAO,EAAE,sBAAsB,EAC/B,OAAO,EAAE,SAAS,UAsBnB;AAED,wBAAgB,6BAA6B,CAAC,EAAE,EAAE,MAAM,QA8BvD;AAED,wBAAgB,iDAAiD,CAAC,EAAE,EAAE,MAAM,QAM3E;AAED,wBAAgB,8BAA8B,CAC5C,EAAE,EAAE,MAAM,EACV,MAAM,EAAE,wBAAwB,QAajC;AAED,wBAAgB,mCAAmC,CACjD,MAAM,EAAE,wBAAwB,QAgBjC;AAED,wBAAgB,qCAAqC,SAmCpD;AAED,wBAAgB,6BAA6B,CAC3C,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,OAAO,QAWjB;AAED,wBAAgB,gCAAgC,SAW/C"}
+{"version":3,"file":"NativeSheetRegistry.d.ts","sourceRoot":"","sources":["../../../src/NativeSheetRegistry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAEvC,OAAO,KAAK,EAAE,wBAAwB,EAAE,sBAAsB,EAAE,MAAM,SAAS,CAAC;AAEhF,MAAM,WAAW,wBAAwB;IACvC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,OAAO,CAAC;IACd,qBAAqB,EAAE,OAAO,CAAC;IAC/B,OAAO,EAAE,SAAS,CAAC;IACnB,OAAO,EAAE,sBAAsB,CAAC;CACjC;AAED,KAAK,gBAAgB,GAAG,MAAM,IAAI,CAAC;AAuBnC,wBAAgB,4BAA4B,CAAC,QAAQ,EAAE,gBAAgB,iBAGtE;AAED,wBAAgB,8BAA8B,wCAE7C;AAED,wBAAgB,2BAA2B,CACzC,OAAO,EAAE,sBAAsB,EAC/B,OAAO,EAAE,SAAS,UAsBnB;AAED,wBAAgB,6BAA6B,CAAC,EAAE,EAAE,MAAM,QA8BvD;AAED,wBAAgB,iDAAiD,CAAC,EAAE,EAAE,MAAM,QAM3E;AAED,wBAAgB,8BAA8B,CAC5C,EAAE,EAAE,MAAM,EACV,MAAM,EAAE,wBAAwB,QAajC;AAED,wBAAgB,mCAAmC,CACjD,MAAM,EAAE,wBAAwB,QAgBjC;AAED,wBAAgB,qCAAqC,SA2CpD;AAED,wBAAgB,6BAA6B,CAC3C,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,OAAO,QAWjB;AAED,wBAAgB,gCAAgC,SAW/C"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/react-native-native-sheet",
-  "version": "3.0.131",
+  "version": "3.0.133",
   "description": "Native bottom sheet host for arbitrary React Native content",
   "source": "./src/index.tsx",
   "main": "./lib/module/index.js",

package/src/NativeSheetRegistry.ts

@@ -175,9 +175,17 @@ export function requestSecurityDismissAllNativeSheets() {
   if (securityFallbackTimer) {
     clearTimeout(securityFallbackTimer);
   }
+  const fallbackEntryIds = presentedEntries.map((entry) => entry.id);
   securityFallbackTimer = setTimeout(() => {
     securityFallbackTimer = undefined;
-    finishAllNativeSheetRegistryEntries('security');
+    fallbackEntryIds.forEach((id) => {
+      const pendingEntry = entries.find((entry) => entry.id === id);
+      if (!pendingEntry) {
+        return;
+      }
+      finishNativeSheetRegistryEntry(id, 'security');
+      pendingEntry.options.onAnimationComplete?.({ open: false });
+    });
   }, 500);
 }