Fix bug that was causing messy animation when a keyboard is going to …

…appear after the bottom sheet dismisses. PiperOrigin-RevId: 351804762
material-components · Jan 14, 2021 · 4deaee1 · 4deaee1
1 parent 2d6db96
commit 4deaee1
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/components/BottomSheet/src/MDCBottomSheetPresentationController.m b/components/BottomSheet/src/MDCBottomSheetPresentationController.m
@@ -17,6 +17,7 @@
 #import <WebKit/WebKit.h>
 
 #import "private/MDCSheetContainerView.h"
+#import "MDCBottomSheetController.h"
 #import "MDCBottomSheetPresentationControllerDelegate.h"
 #import "MDCSheetContainerViewDelegate.h"
 #import "MaterialMath.h"
@@ -228,6 +229,7 @@ - (void)dismissPresentedControllerIfNecessary:(UITapGestureRecognizer *)tapRecog
     return;
   }
 
+  self.sheetView.willBeDismissed = YES;
   id<MDCBottomSheetPresentationControllerDelegate> strongDelegate = self.delegate;
   [self.presentingViewController
       dismissViewControllerAnimated:YES

diff --git a/components/BottomSheet/src/private/MDCSheetContainerView.h b/components/BottomSheet/src/private/MDCSheetContainerView.h
@@ -22,6 +22,7 @@
 @property(nonatomic, weak, nullable) id<MDCSheetContainerViewDelegate> delegate;
 @property(nonatomic, readonly) MDCSheetState sheetState;
 @property(nonatomic) CGFloat preferredSheetHeight;
+@property(nonatomic) BOOL willBeDismissed;
 
 /**
  When set to false, the bottom sheet controller can't be dismissed by dragging the sheet down.

diff --git a/components/BottomSheet/src/private/MDCSheetContainerView.m b/components/BottomSheet/src/private/MDCSheetContainerView.m
@@ -14,6 +14,7 @@
 
 #import "MDCSheetContainerView.h"
 
+#import "MDCSheetState.h"
 #import "MDCDraggableView.h"
 #import "MDCDraggableViewDelegate.h"
 #import "MDCSheetBehavior.h"
@@ -60,6 +61,7 @@ - (instancetype)initWithFrame:(CGRect)frame
                    scrollView:(UIScrollView *)scrollView {
   self = [super initWithFrame:frame];
   if (self) {
+    self.willBeDismissed = NO;
     if (UIAccessibilityIsVoiceOverRunning()) {
       _sheetState = MDCSheetStateExtended;
     } else {
@@ -358,7 +360,12 @@ - (void)sheetBehaviorDidUpdate {
 
 - (void)keyboardStateChangedWithNotification:(__unused NSNotification *)notification {
   if (self.window) {
-    [self animatePaneWithInitialVelocity:CGPointZero];
+    // Only add animation if the view is not set to be dismissed with the new keyboard. Otherwise,
+    // the view will first adjust height to fit above the keyboard and then dismiss, which appears
+    // glitchy on the screen.
+    if (!self.willBeDismissed) {
+      [self animatePaneWithInitialVelocity:CGPointZero];
+    }
   }
 }