@onekeyfe/react-native-native-sheet 3.0.132 → 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
@@ -257,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
@@ -321,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"
@@ -381,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(),
@@ -477,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),
@@ -764,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,
@@ -826,6 +887,7 @@ class NativeSheetView(
 
   private fun handleDialogDismissed() {
     val child = contentChild
+    clearPendingImeFocus()
     clearWindowInsetsObservation()
     navigationBarBackgroundView?.let { view ->
       (view.parent as? ViewGroup)?.removeView(view)
@@ -843,6 +905,7 @@ class NativeSheetView(
     extendsIntoNavigationBar = false
     navigationBarBackgroundColor = Color.TRANSPARENT
     preImeBottomSheetBottomPx = null
+    userDrivenSheetSlide = false
     dimAnimator?.cancel()
     dimAnimator = null
     heightAnimator?.cancel()

package/ios/NativeSheetContainerView.swift

@@ -304,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?
@@ -340,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 {
@@ -358,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
@@ -466,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)
   }
 
@@ -527,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
@@ -534,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()
@@ -672,7 +709,7 @@ private final class NativeSheetContentWrapperView: UIView {
     if let controller = presentedController {
       moveContent(to: controller.view)
     } else {
-      moveContent(to: self)
+      stageContent()
     }
   }
 
@@ -749,7 +786,7 @@ 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
@@ -773,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/package.json

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