[NavigationDrawer] Add ability to change the maximumInitialDrawerHeig…

…ht after drawer has been presented. PiperOrigin-RevId: 292305019
material-components · Jan 30, 2020 · 19c1712 · 19c1712
1 parent 62fc063
commit 19c1712
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 0 deletions.
diff --git a/components/NavigationDrawer/src/MDCBottomDrawerPresentationController.m b/components/NavigationDrawer/src/MDCBottomDrawerPresentationController.m
@@ -341,6 +341,12 @@ - (void)setTrackingScrollView:(UIScrollView *)trackingScrollView {
   self.bottomDrawerContainerViewController.trackingScrollView = trackingScrollView;
 }
 
+- (void)setMaximumInitialDrawerHeight:(CGFloat)maximumInitialDrawerHeight {
+  _maximumInitialDrawerHeight = maximumInitialDrawerHeight;
+  self.bottomDrawerContainerViewController.maximumInitialDrawerHeight =
+      self.maximumInitialDrawerHeight;
+}
+
 - (BOOL)contentReachesFullscreen {
   return self.bottomDrawerContainerViewController.contentReachesFullscreen;
 }

diff --git a/components/NavigationDrawer/src/private/MDCBottomDrawerContainerViewController.m b/components/NavigationDrawer/src/private/MDCBottomDrawerContainerViewController.m
@@ -185,6 +185,7 @@ @implementation MDCBottomDrawerContainerViewController {
   CGFloat _contentVCPreferredContentSizeHeightCached;
   CGFloat _headerVCPerferredContentSizeHeightCached;
   CGFloat _scrollToContentOffsetY;
+  CGFloat _maximumInitialDrawerHeight;
   BOOL _shouldPresentAtFullscreen;
 }
 
@@ -373,6 +374,18 @@ - (CGFloat)maximumInitialDrawerHeight {
   return _maximumInitialDrawerHeight + [self bottomSafeAreaInsetsToAdjustInitialDrawerHeight];
 }
 
+- (void)setMaximumInitialDrawerHeight:(CGFloat)maximumInitialDrawerHeight {
+  _maximumInitialDrawerHeight = maximumInitialDrawerHeight;
+
+  if (_contentHeaderTopInset != NSNotFound) {
+    _contentHeaderTopInset = NSNotFound;
+    _contentHeightSurplus = NSNotFound;
+    _addedContentHeight = NSNotFound;
+    [self cacheLayoutCalculations];
+    [self setupLayout];
+  }
+}
+
 - (void)addScrollViewObserver {
   if (self.scrollViewObserved) {
     return;

diff --git a/components/NavigationDrawer/tests/unit/MDCNavigationDrawerScrollViewTests.m b/components/NavigationDrawer/tests/unit/MDCNavigationDrawerScrollViewTests.m
@@ -1089,6 +1089,25 @@ - (void)testSettingTrackingScrollViewAfterInit {
   XCTAssertEqualObjects(drawerContainer.trackingScrollView, newTrackingScrollView);
 }
 
+- (void)testUpdatingMaximumInitialDrawerHeightWithLargePreferredContentSize {
+  // Given
+  CGRect fakeRect = CGRectMake(0, 0, 250, 500);
+  self.fakeBottomDrawer.originalPresentingViewController.view.bounds = fakeRect;
+  self.fakeBottomDrawer.contentViewController.preferredContentSize = CGSizeMake(250, 1000);
+
+  // When
+  self.fakeBottomDrawer.maximumInitialDrawerHeight = 100;
+
+  // Then
+  XCTAssertEqualWithAccuracy(self.fakeBottomDrawer.contentHeaderTopInset, 400, 0.001);
+
+  // When
+  self.fakeBottomDrawer.maximumInitialDrawerHeight = 300;
+
+  // Then
+  XCTAssertEqualWithAccuracy(self.fakeBottomDrawer.contentHeaderTopInset, 200, 0.001);
+}
+
 - (void)testUpdatingPreferredContentSizeWithLargeMaximumInitialDrawerHeight {
   // Given
   CGRect fakeRect = CGRectMake(0, 0, 250, 500);