@lodev09/react-native-true-sheet 3.3.0-beta.0 → 3.3.0-beta.2

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

@@ -45,7 +45,7 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
       // Immediately update state with screen width during first state update
       // This ensures we have initial width for content layout before presenting
       if (field == null && value != null) {
-        updateState(viewController.screenWidth, 0)
+        updateState(viewController.screenWidth, viewController.screenHeight)
       }
       field = value
     }
@@ -272,10 +272,6 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
     viewController.sheetBackgroundColor = color
   }
 
-  fun setSoftInputMode(mode: Int) {
-    viewController.setSoftInputMode(mode)
-  }
-
   fun setDismissible(dismissible: Boolean) {
     viewController.dismissible = dismissible
   }
@@ -352,7 +348,8 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
    * Uses post to ensure all layout passes complete before reconfiguring.
    */
   fun updateSheetIfNeeded() {
-    if (!viewController.isPresented || isSheetUpdatePending) return
+    if (!viewController.isPresented) return
+    if (isSheetUpdatePending) return
 
     isSheetUpdatePending = true
     viewController.post {

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

@@ -11,6 +11,7 @@ import android.view.View
 import android.view.WindowManager
 import android.view.accessibility.AccessibilityNodeInfo
 import android.widget.FrameLayout
+import androidx.core.view.ViewCompat
 import androidx.core.view.isNotEmpty
 import androidx.core.view.isVisible
 import com.facebook.react.R
@@ -28,6 +29,7 @@ import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.lodev09.truesheet.core.GrabberOptions
 import com.lodev09.truesheet.core.RNScreensFragmentObserver
 import com.lodev09.truesheet.core.TrueSheetGrabberView
+import com.lodev09.truesheet.core.TrueSheetKeyboardHandler
 import com.lodev09.truesheet.utils.ScreenUtils
 
 data class DetentInfo(val index: Int, val position: Float)
@@ -116,6 +118,8 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
   var currentDetentIndex: Int = -1
     private set
 
+  private var lastStateWidth: Int = 0
+  private var lastStateHeight: Int = 0
   private var isDragging = false
   private var isDismissing = false
   private var isReconfiguring = false
@@ -132,8 +136,11 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
   // MARK: - Configuration Properties
   // ====================================================================
 
-  var screenHeight = 0
-  var screenWidth = 0
+  val screenHeight: Int
+    get() = ScreenUtils.getScreenHeight(reactContext)
+  val screenWidth: Int
+    get() = ScreenUtils.getScreenWidth(reactContext)
+
   var maxSheetHeight: Int? = null
   var detents = mutableListOf(0.5, 1.0)
 
@@ -196,8 +203,6 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
   // ====================================================================
 
   init {
-    screenHeight = ScreenUtils.getScreenHeight(reactContext)
-    screenWidth = ScreenUtils.getScreenWidth(reactContext)
     jSPointerDispatcher = JSPointerDispatcher(this)
   }
 
@@ -219,6 +224,8 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
 
       window?.apply {
         windowAnimation = attributes.windowAnimations
+        // Disable default keyboard avoidance - sheet handles it via setupKeyboardHandler
+        setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_NOTHING)
       }
 
       setupModalObserver()
@@ -248,6 +255,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
       setOnDismissListener(null)
     }
 
+    cleanupKeyboardHandler()
     cleanupModalObserver()
     sheetContainer?.removeView(this)
 
@@ -266,6 +274,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
       resetAnimation()
       setupBackground()
       setupGrabber()
+      setupKeyboardHandler()
 
       sheetContainer?.post {
         bottomSheetView?.let { emitChangePositionDelegate(it, realtime = false) }
@@ -370,26 +379,14 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
   private fun setupModalObserver() {
     rnScreensObserver = RNScreensFragmentObserver(
       reactContext = reactContext,
-      onModalWillPresent = {
-        if (isPresented) {
-          delegate?.viewControllerWillBlur()
-        }
-      },
       onModalPresented = {
         if (isPresented) {
           hideDialog()
-          delegate?.viewControllerDidBlur()
-        }
-      },
-      onModalWillDismiss = {
-        if (isPresented) {
-          delegate?.viewControllerWillFocus()
         }
       },
       onModalDismissed = {
         if (isPresented) {
           showDialog()
-          delegate?.viewControllerDidFocus()
         }
       }
     )
@@ -520,8 +517,6 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
       isFitToContents = false
       maxWidth = DEFAULT_MAX_WIDTH.dpToPx().toInt()
 
-      val oldExpandOffset = expandedOffset
-
       val maxAvailableHeight = realHeight - edgeToEdgeTopInset
 
       setPeekHeight(getDetentHeight(detents[0]), isPresented)
@@ -539,10 +534,14 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
       expandedOffset = maxOf(edgeToEdgeTopInset, realHeight - maxDetentHeight)
       isFitToContents = detents.size < 3 && expandedOffset == 0
 
-      if (oldExpandOffset != expandedOffset || expandedOffset == 0) {
-        val offset = if (expandedOffset == 0) topInset else 0
-        val newHeight = realHeight - expandedOffset - offset
-        delegate?.viewControllerDidChangeSize(width, newHeight)
+      val offset = if (expandedOffset == 0) topInset else 0
+      val newHeight = realHeight - expandedOffset - offset
+      val newWidth = minOf(screenWidth, maxWidth)
+
+      if (lastStateWidth != newWidth || lastStateHeight != newHeight) {
+        lastStateWidth = newWidth
+        lastStateHeight = newHeight
+        delegate?.viewControllerDidChangeSize(newWidth, newHeight)
       }
 
       if (isPresented) {
@@ -569,6 +568,20 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     bottomSheet.addView(grabberView)
   }
 
+  private var keyboardHandler: TrueSheetKeyboardHandler? = null
+
+  /** Sets up keyboard handler for IME transitions. */
+  fun setupKeyboardHandler() {
+    val bottomSheet = bottomSheetView ?: return
+    keyboardHandler = TrueSheetKeyboardHandler(bottomSheet, reactContext) { topInset }
+    keyboardHandler?.setup()
+  }
+
+  fun cleanupKeyboardHandler() {
+    keyboardHandler?.cleanup()
+    keyboardHandler = null
+  }
+
   fun setupBackground() {
     val bottomSheet = bottomSheetView ?: return
 
@@ -634,10 +647,6 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     behavior?.state = getStateForDetentIndex(index)
   }
 
-  fun setSoftInputMode(mode: Int) {
-    dialog?.window?.setSoftInputMode(mode)
-  }
-
   fun getDefaultBackgroundColor(): Int {
     val typedValue = TypedValue()
     return if (reactContext.theme.resolveAttribute(
@@ -883,22 +892,19 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
 
   override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {
     super.onSizeChanged(w, h, oldw, oldh)
+
     if (w == oldw && h == oldh) return
+    if (!isPresented) return
 
     // Skip continuous size changes when fullScreen + edge-to-edge
-    if (h + topInset > screenHeight && isExpanded && oldw == w) {
+    if (h + topInset >= screenHeight && isExpanded && oldw == w) {
       return
     }
 
-    val oldScreenHeight = screenHeight
-    screenHeight = ScreenUtils.getScreenHeight(reactContext)
-
-    if (isPresented && oldScreenHeight != screenHeight && oldScreenHeight > 0) {
+    this.post {
       setupSheetDetents()
-      this.post {
-        positionFooter()
-        bottomSheetView?.let { emitChangePositionDelegate(it, realtime = false) }
-      }
+      positionFooter()
+      bottomSheetView?.let { emitChangePositionDelegate(it, realtime = false) }
     }
   }
 

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

@@ -172,15 +172,6 @@ class TrueSheetViewManager :
     }
   }
 
-  @ReactProp(name = "keyboardMode")
-  override fun setKeyboardMode(view: TrueSheetView, mode: String?) {
-    val softInputMode = when (mode) {
-      "pan" -> WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN
-      else -> WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE
-    }
-    view.setSoftInputMode(softInputMode)
-  }
-
   @ReactProp(name = "blurTint")
   override fun setBlurTint(view: TrueSheetView, tint: String?) {
     // iOS-specific prop - no-op on Android

package/android/src/main/java/com/lodev09/truesheet/core/RNScreensFragmentObserver.kt

@@ -13,9 +13,7 @@ private const val RN_SCREENS_PACKAGE = "com.swmansion.rnscreens"
  */
 class RNScreensFragmentObserver(
   private val reactContext: ReactContext,
-  private val onModalWillPresent: () -> Unit = {},
   private val onModalPresented: () -> Unit,
-  private val onModalWillDismiss: () -> Unit = {},
   private val onModalDismissed: () -> Unit
 ) {
   private var fragmentLifecycleCallback: FragmentManager.FragmentLifecycleCallbacks? = null
@@ -33,14 +31,8 @@ class RNScreensFragmentObserver(
         super.onFragmentStarted(fm, fragment)
 
         if (isModalFragment(fragment) && !activeModalFragments.contains(fragment)) {
-          // Notify willPresent before adding to active set
-          if (activeModalFragments.isEmpty()) {
-            onModalWillPresent()
-          }
-
           activeModalFragments.add(fragment)
 
-          // Notify didPresent after modal is started
           if (activeModalFragments.size == 1) {
             onModalPresented()
           }
@@ -51,14 +43,8 @@ class RNScreensFragmentObserver(
         super.onFragmentStopped(fm, fragment)
 
         if (activeModalFragments.contains(fragment)) {
-          // Notify willDismiss before removing from active set
-          if (activeModalFragments.size == 1) {
-            onModalWillDismiss()
-          }
-
           activeModalFragments.remove(fragment)
 
-          // Notify didDismiss after all modals are dismissed
           if (activeModalFragments.isEmpty()) {
             onModalDismissed()
           }

package/android/src/main/java/com/lodev09/truesheet/core/TrueSheetKeyboardHandler.kt

@@ -0,0 +1,120 @@
+package com.lodev09.truesheet.core
+
+import android.graphics.Rect
+import android.os.Build
+import android.view.View
+import android.view.ViewTreeObserver
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsAnimationCompat
+import androidx.core.view.WindowInsetsCompat
+import com.facebook.react.uimanager.ThemedReactContext
+
+/**
+ * Handles keyboard (IME) for sheet translation.
+ * Uses WindowInsetsAnimationCompat for smooth animation on API 30+,
+ * falls back to ViewTreeObserver on Activity's decor view for API 29 and below.
+ *
+ * @param targetView The view to translate (typically the bottom sheet)
+ * @param reactContext The React context to get the current activity
+ * @param topInset The top safe area inset to respect
+ */
+class TrueSheetKeyboardHandler(
+  private val targetView: View,
+  private val reactContext: ThemedReactContext,
+  private val topInset: () -> Int
+) {
+
+  private var globalLayoutListener: ViewTreeObserver.OnGlobalLayoutListener? = null
+  private var activityRootView: View? = null
+
+  fun setup() {
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+      setupAnimationCallback()
+    } else {
+      setupLegacyListener()
+    }
+  }
+
+  fun cleanup() {
+    globalLayoutListener?.let { listener ->
+      activityRootView?.viewTreeObserver?.removeOnGlobalLayoutListener(listener)
+      globalLayoutListener = null
+      activityRootView = null
+    }
+    ViewCompat.setWindowInsetsAnimationCallback(targetView, null)
+  }
+
+  private fun applyTranslation(imeHeight: Int) {
+    // Cap translation so sheet doesn't move beyond screen bounds
+    val maxTranslation = maxOf(0, targetView.top - topInset())
+    val translation = minOf(imeHeight, maxTranslation)
+    targetView.translationY = -translation.toFloat()
+  }
+
+  /** API 30+ smooth keyboard animation */
+  private fun setupAnimationCallback() {
+    ViewCompat.setWindowInsetsAnimationCallback(
+      targetView,
+      object : WindowInsetsAnimationCompat.Callback(DISPATCH_MODE_CONTINUE_ON_SUBTREE) {
+        private var startImeHeight = 0
+        private var endImeHeight = 0
+
+        private fun getKeyboardHeight(rootInsets: WindowInsetsCompat?): Int {
+          if (rootInsets == null) return 0
+          return rootInsets.getInsets(WindowInsetsCompat.Type.ime()).bottom
+        }
+
+        override fun onPrepare(animation: WindowInsetsAnimationCompat) {
+          startImeHeight = getKeyboardHeight(ViewCompat.getRootWindowInsets(targetView))
+        }
+
+        override fun onStart(
+          animation: WindowInsetsAnimationCompat,
+          bounds: WindowInsetsAnimationCompat.BoundsCompat
+        ): WindowInsetsAnimationCompat.BoundsCompat {
+          endImeHeight = getKeyboardHeight(ViewCompat.getRootWindowInsets(targetView))
+          return bounds
+        }
+
+        override fun onProgress(insets: WindowInsetsCompat, runningAnimations: List<WindowInsetsAnimationCompat>): WindowInsetsCompat {
+          val imeAnimation = runningAnimations.find {
+            it.typeMask and WindowInsetsCompat.Type.ime() != 0
+          } ?: return insets
+
+          val fraction = imeAnimation.interpolatedFraction
+          val currentImeHeight = (startImeHeight + (endImeHeight - startImeHeight) * fraction).toInt()
+          applyTranslation(currentImeHeight)
+
+          return insets
+        }
+
+        override fun onEnd(animation: WindowInsetsAnimationCompat) {
+          applyTranslation(getKeyboardHeight(ViewCompat.getRootWindowInsets(targetView)))
+        }
+      }
+    )
+  }
+
+  /** API 29 and below fallback using ViewTreeObserver on Activity's root view */
+  private fun setupLegacyListener() {
+    val rootView = reactContext.currentActivity?.window?.decorView?.rootView ?: return
+
+    activityRootView = rootView
+
+    globalLayoutListener = ViewTreeObserver.OnGlobalLayoutListener {
+      val rect = Rect()
+      rootView.getWindowVisibleDisplayFrame(rect)
+
+      val screenHeight = rootView.height
+      val keyboardHeight = screenHeight - rect.bottom
+
+      if (keyboardHeight > screenHeight * 0.15) {
+        applyTranslation(keyboardHeight)
+      } else {
+        applyTranslation(0)
+      }
+    }
+
+    rootView.viewTreeObserver.addOnGlobalLayoutListener(globalLayoutListener)
+  }
+}

package/android/src/main/java/com/lodev09/truesheet/utils/ScreenUtils.kt

@@ -67,15 +67,6 @@ object ScreenUtils {
     } ?: Insets(0, 0)
   }
 
-  /**
-   * Calculate the screen height using the same method as React Native's useWindowDimensions.
-   * This returns the window height which automatically accounts for edge-to-edge mode.
-   *
-   * @param reactContext The ReactContext to get resources from
-   * @return Screen height in pixels
-   */
-  fun getScreenHeight(reactContext: ReactContext): Int = reactContext.resources.displayMetrics.heightPixels
-
   /**
    * Get the real physical device screen height, including system bars.
    * This is consistent across all API levels.
@@ -103,6 +94,15 @@ object ScreenUtils {
    */
   fun getScreenWidth(reactContext: ReactContext): Int = reactContext.resources.displayMetrics.widthPixels
 
+  /**
+   * Calculate the screen height using the same method as React Native's useWindowDimensions.
+   * This returns the window height which automatically accounts for edge-to-edge mode.
+   *
+   * @param reactContext The ReactContext to get resources from
+   * @return Screen height in pixels
+   */
+  fun getScreenHeight(reactContext: ReactContext): Int = reactContext.resources.displayMetrics.heightPixels
+
   /**
    * Get the location of a view in screen coordinates
    *

package/ios/TrueSheetContainerView.h

@@ -63,6 +63,16 @@ NS_ASSUME_NONNULL_BEGIN
  */
 - (void)setupContentScrollViewPinning;
 
+/**
+ * Setup keyboard handler for footer
+ */
+- (void)setupKeyboardHandler;
+
+/**
+ * Cleanup keyboard handler for footer
+ */
+- (void)cleanupKeyboardHandler;
+
 @end
 
 NS_ASSUME_NONNULL_END

package/ios/TrueSheetContainerView.mm

@@ -179,6 +179,16 @@ using namespace facebook::react;
   }
 }
 
+#pragma mark - Keyboard Handling
+
+- (void)setupKeyboardHandler {
+  [_footerView setupKeyboardHandler];
+}
+
+- (void)cleanupKeyboardHandler {
+  [_footerView cleanupKeyboardHandler];
+}
+
 @end
 
 Class<RCTComponentViewProtocol> TrueSheetContainerViewCls(void) {

package/ios/TrueSheetFooterView.h

@@ -19,6 +19,8 @@ NS_ASSUME_NONNULL_BEGIN
 @interface TrueSheetFooterView : RCTViewComponentView
 
 - (void)setupConstraintsWithHeight:(CGFloat)height;
+- (void)setupKeyboardHandler;
+- (void)cleanupKeyboardHandler;
 
 @end
 

package/ios/TrueSheetFooterView.mm

@@ -21,6 +21,7 @@ using namespace facebook::react;
 @implementation TrueSheetFooterView {
   CGFloat _lastHeight;
   BOOL _didInitialLayout;
+  NSLayoutConstraint *_bottomConstraint;
 }
 
 + (ComponentDescriptorProvider)componentDescriptorProvider {
@@ -37,6 +38,7 @@ using namespace facebook::react;
 
     _lastHeight = 0;
     _didInitialLayout = NO;
+    _bottomConstraint = nil;
   }
   return self;
 }
@@ -49,12 +51,22 @@ using namespace facebook::react;
 
   // Remove existing constraints before applying new ones
   [LayoutUtil unpinView:self fromParentView:parentView];
+  _bottomConstraint = nil;
 
-  // Pin footer to bottom and sides of container with specific height
-  [LayoutUtil pinView:self
-         toParentView:parentView
-                edges:UIRectEdgeLeft | UIRectEdgeRight | UIRectEdgeBottom
-               height:height];
+  self.translatesAutoresizingMaskIntoConstraints = NO;
+
+  // Pin footer to sides of container
+  [self.leadingAnchor constraintEqualToAnchor:parentView.leadingAnchor].active = YES;
+  [self.trailingAnchor constraintEqualToAnchor:parentView.trailingAnchor].active = YES;
+
+  // Store bottom constraint for keyboard adjustment
+  _bottomConstraint = [self.bottomAnchor constraintEqualToAnchor:parentView.bottomAnchor];
+  _bottomConstraint.active = YES;
+
+  // Apply height constraint
+  if (height > 0) {
+    [self.heightAnchor constraintEqualToConstant:height].active = YES;
+  }
 
   _lastHeight = height;
 }
@@ -89,11 +101,59 @@ using namespace facebook::react;
 - (void)prepareForRecycle {
   [super prepareForRecycle];
 
+  [self cleanupKeyboardHandler];
+
   // Remove footer constraints
   [LayoutUtil unpinView:self fromParentView:self.superview];
 
   _lastHeight = 0;
   _didInitialLayout = NO;
+  _bottomConstraint = nil;
+}
+
+#pragma mark - Keyboard Handling
+
+- (void)setupKeyboardHandler {
+  [[NSNotificationCenter defaultCenter] addObserver:self
+                                           selector:@selector(keyboardWillChangeFrame:)
+                                               name:UIKeyboardWillChangeFrameNotification
+                                             object:nil];
+}
+
+- (void)cleanupKeyboardHandler {
+  [[NSNotificationCenter defaultCenter] removeObserver:self name:UIKeyboardWillChangeFrameNotification object:nil];
+}
+
+- (void)keyboardWillChangeFrame:(NSNotification *)notification {
+  if (!_bottomConstraint) {
+    return;
+  }
+
+  NSDictionary *userInfo = notification.userInfo;
+  CGRect keyboardFrame = [userInfo[UIKeyboardFrameEndUserInfoKey] CGRectValue];
+  NSTimeInterval duration = [userInfo[UIKeyboardAnimationDurationUserInfoKey] doubleValue];
+  UIViewAnimationOptions curve = [userInfo[UIKeyboardAnimationCurveUserInfoKey] unsignedIntegerValue] << 16;
+
+  // Convert keyboard frame to window coordinates
+  UIWindow *window = self.window;
+  if (!window) {
+    return;
+  }
+
+  CGRect keyboardFrameInWindow = [window convertRect:keyboardFrame fromWindow:nil];
+  CGFloat keyboardHeight = window.bounds.size.height - keyboardFrameInWindow.origin.y;
+
+  // Cap to ensure we don't go negative
+  CGFloat bottomOffset = MAX(0, keyboardHeight);
+
+  [UIView animateWithDuration:duration
+                        delay:0
+                      options:curve | UIViewAnimationOptionBeginFromCurrentState
+                   animations:^{
+                     self->_bottomConstraint.constant = -bottomOffset;
+                     [self.superview layoutIfNeeded];
+                   }
+                   completion:nil];
 }
 
 @end

package/ios/TrueSheetView.mm

@@ -427,6 +427,7 @@ using namespace facebook::react;
 }
 
 - (void)viewControllerDidPresentAtIndex:(NSInteger)index position:(CGFloat)position detent:(CGFloat)detent {
+  [_containerView setupKeyboardHandler];
   [TrueSheetLifecycleEvents emitDidPresent:_eventEmitter index:index position:position detent:detent];
 }
 
@@ -451,6 +452,7 @@ using namespace facebook::react;
 }
 
 - (void)viewControllerWillDismiss {
+  [_containerView cleanupKeyboardHandler];
   [TrueSheetLifecycleEvents emitWillDismiss:_eventEmitter];
 }
 

package/ios/TrueSheetViewController.mm

@@ -38,7 +38,6 @@
   TrueSheetGrabberView *_grabberView;
 
   NSMutableArray<NSNumber *> *_resolvedDetentPositions;
-  BOOL _hasPresentedController;
 }
 
 #pragma mark - Initialization
@@ -67,7 +66,6 @@
     _blurInteraction = YES;
     _insetAdjustment = @"automatic";
     _resolvedDetentPositions = [NSMutableArray array];
-    _hasPresentedController = NO;
   }
   return self;
 }
@@ -317,58 +315,6 @@
   _isTrackingPositionFromLayout = NO;
 }
 
-#pragma mark - Presentation Tracking (RN Screens)
-
-- (void)presentViewController:(UIViewController *)viewControllerToPresent
-                     animated:(BOOL)flag
-                   completion:(void (^)(void))completion {
-  BOOL isExternalController = ![viewControllerToPresent isKindOfClass:[TrueSheetViewController class]];
-
-  if (isExternalController && !_hasPresentedController) {
-    _hasPresentedController = YES;
-    if ([self.delegate respondsToSelector:@selector(viewControllerWillBlur)]) {
-      [self.delegate viewControllerWillBlur];
-    }
-  }
-
-  [super presentViewController:viewControllerToPresent
-                      animated:flag
-                    completion:^{
-                      if (isExternalController && self->_hasPresentedController) {
-                        if ([self.delegate respondsToSelector:@selector(viewControllerDidBlur)]) {
-                          [self.delegate viewControllerDidBlur];
-                        }
-                      }
-                      if (completion) {
-                        completion();
-                      }
-                    }];
-}
-
-- (void)dismissViewControllerAnimated:(BOOL)flag completion:(void (^)(void))completion {
-  UIViewController *presented = self.presentedViewController;
-  BOOL isExternalController = presented && ![presented isKindOfClass:[TrueSheetViewController class]];
-
-  if (isExternalController && _hasPresentedController) {
-    if ([self.delegate respondsToSelector:@selector(viewControllerWillFocus)]) {
-      [self.delegate viewControllerWillFocus];
-    }
-  }
-
-  [super dismissViewControllerAnimated:flag
-                            completion:^{
-                              if (isExternalController && self->_hasPresentedController) {
-                                self->_hasPresentedController = NO;
-                                if ([self.delegate respondsToSelector:@selector(viewControllerDidFocus)]) {
-                                  [self.delegate viewControllerDidFocus];
-                                }
-                              }
-                              if (completion) {
-                                completion();
-                              }
-                            }];
-}
-
 #pragma mark - Position & Gesture Handling
 
 - (TrueSheetContentView *)findContentView:(UIView *)view {

package/lib/module/TrueSheet.js

@@ -278,7 +278,6 @@ export class TrueSheet extends PureComponent {
       dimmed = true,
       initialDetentIndex = -1,
       initialDetentAnimated = true,
-      keyboardMode = 'resize',
       dimmedDetentIndex,
       blurTint,
       blurOptions,
@@ -327,7 +326,6 @@ export class TrueSheet extends PureComponent {
       },
       dimmed: dimmed,
       dimmedDetentIndex: dimmedDetentIndex,
-      keyboardMode: keyboardMode,
       initialDetentIndex: initialDetentIndex,
       initialDetentAnimated: initialDetentAnimated,
       dismissible: dismissible,