Merge branch 'release-candidate' into stable

Author: bryanoltman

CHANGELOG.md

@@ -4,7 +4,8 @@ In this major release, we deleted the `rippleAllowsSelection` property from MDCC
 
 ## API changes
 
-`rippleAllowsSelection` has been deleted from MDCChipView.
+* Chips: `rippleAllowsSelection` has been deleted from MDCChipView.
+* NavigationDrawer: `shouldDismissOnAccessibilityPerformEscape` property added to allow VoiceOver users to dismiss the Navigation Drawer using the VoiceOver dismiss gesture.
 
 ## Component changes
 
@@ -14,6 +15,7 @@ In this major release, we deleted the `rippleAllowsSelection` property from MDCC
 
 ## Multi-component changes
 
+* [Optional dismiss on accessibilityPerformEscape.](https://github.com/material-components/material-components-ios/commit/e79fd9b19188be0a23263e3f0c5dc11105534412) (Nobody)
 * [Add containerRadius support to filled text field](https://github.com/material-components/material-components-ios/commit/0907c196231629d9af7e86feeed86748ec96a20f) (Andrew Overton)
 * [Internal change](https://github.com/material-components/material-components-ios/commit/9f62e64603adc68475ee3d21981dd79cdaff1129) (Yarden Eitan)
 

components/NavigationDrawer/src/MDCBottomDrawerViewController.h

@@ -115,6 +115,15 @@
  */
 @property(nonatomic, assign) BOOL dismissOnBackgroundTap;
 
+/**
+ A flag allowing clients to opt-out of the drawer closing when user uses accessibility escape
+ gesture. If set to NO, you can alternatively set an accessibility escape action by implementing the
+ @c accessibilityPerformEscape method in your provided contentViewController.
+
+ @default YES The drawer dismisses on z-gesture.
+ */
+@property(nonatomic, assign) BOOL shouldDismissOnAccessibilityPerformEscape;
+
 /**
  A flag allowing clients to opt-in to handling background touch events.
 

components/NavigationDrawer/src/MDCBottomDrawerViewController.m

@@ -71,6 +71,7 @@ - (void)commonMDCBottomDrawerViewControllerInit {
   _mdc_overrideBaseElevation = -1;
 
   _dismissOnBackgroundTap = YES;
+  _shouldDismissOnAccessibilityPerformEscape = YES;
   _shouldForwardBackgroundTouchEvents = NO;
   _shouldDisplayMobileLandscapeFullscreen = YES;
   _isDrawerClosed = YES;
@@ -334,6 +335,10 @@ - (void)setShouldAdjustOnContentSizeChange:(BOOL)shouldAdjustOnContentSizeChange
 
 // Adds the Z gesture for dismissal.
 - (BOOL)accessibilityPerformEscape {
+  if (!self.shouldDismissOnAccessibilityPerformEscape) {
+    return NO;
+  }
+
   [self.presentingViewController dismissViewControllerAnimated:YES completion:nil];
   return YES;
 }

components/NavigationDrawer/tests/unit/MDCNavigationDrawerTest.m

@@ -277,4 +277,17 @@ - (void)testMaximumDrawerHeightBeingSetUpdatesTheUnderlyingPresentationControlle
   }
 }
 
+- (void)testDefaultShouldDismissOnAccessibilityPerformEscape {
+  // Default
+  XCTAssertTrue([self.navigationDrawer accessibilityPerformEscape]);
+}
+
+- (void)testSettingShouldDismissOnAccessibilityPerformEscape {
+  // When
+  self.navigationDrawer.shouldDismissOnAccessibilityPerformEscape = NO;
+
+  // Then
+  XCTAssertFalse([self.navigationDrawer accessibilityPerformEscape]);
+}
+
 @end