Merge branch 'release-candidate' into stable

Author: galiak11

CHANGELOG.md

@@ -1,3 +1,15 @@
+# 124.0.1
+
+This patch release fixes a bug in BottomNavigation.
+
+## Component changes
+
+### BottomNavigation
+
+* [Update hidden state logic to address a race condition occurring when showing/hiding the navigation bar multiple times before the animation ends.](https://github.com/material-components/material-components-ios/commit/4f12b7da7121408e46a4ffbe09204e7a5575eabb) (German Rodriguez)
+
+---
+
 # 124.0.0
 
 In this release `MDCTextField` and its associated classes and protocols are deprecated. We also deleted the Pesto example application and cleaned up pre iOS 12 checks in the library.

MaterialComponents.podspec

@@ -2,7 +2,7 @@ load 'scripts/generated/icons.rb'
 
 Pod::Spec.new do |mdc|
   mdc.name         = "MaterialComponents"
-  mdc.version      = "124.0.0"
+  mdc.version      = "124.0.1"
   mdc.authors      = "The Material Components authors."
   mdc.summary      = "A collection of stand-alone production-ready UI libraries focused on design details."
   mdc.homepage     = "https://github.com/material-components/material-components-ios"
@@ -106,7 +106,7 @@ Pod::Spec.new do |mdc|
     component.dependency "MDFInternationalization"
     component.dependency "MaterialComponents/Palettes"
     component.dependency "MaterialComponents/private/Application"
-    component.dependency "MotionAnimator", "~> 2.0"
+    component.dependency "MotionAnimator", "~> 4.0"
 
     component.test_spec 'UnitTests' do |unit_tests|
       unit_tests.source_files = [

MaterialComponentsEarlGreyTests.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "MaterialComponentsEarlGreyTests"
-  s.version      = "124.0.0"
+  s.version      = "124.0.1"
   s.authors      = "The Material Components authors."
   s.summary      = "This spec is an aggregate of all the Material Components EarlGrey tests."
   s.description  = "This spec is made for use in the MDC Catalog."

MaterialComponentsExamples.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "MaterialComponentsExamples"
-  s.version      = "124.0.0"
+  s.version      = "124.0.1"
   s.authors      = "The Material Components authors."
   s.summary      = "This spec is an aggregate of all the Material Components examples."
   s.description  = "This spec is made for use in the MDC Catalog. Used in conjunction with CatalogByConvention we create our Material Catalog."

MaterialComponentsSnapshotTests.podspec

@@ -53,7 +53,7 @@ end
 
 Pod::Spec.new do |s|
   s.name         = "MaterialComponentsSnapshotTests"
-  s.version      = "124.0.0"
+  s.version      = "124.0.1"
   s.authors      = "The Material Components authors."
   s.summary      = "This spec is an aggregate of all the Material Components snapshot tests."
   s.homepage     = "https://github.com/material-components/material-components-ios"

VERSION

@@ -1 +1 @@
-124.0.0
+124.0.1

catalog/MDCCatalog/Info.plist

@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>124.0.0</string>
+	<string>124.0.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>124.0.0</string>
+	<string>124.0.1</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UIAppFonts</key>

catalog/MDCDragons/Info.plist

@@ -15,9 +15,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>124.0.0</string>
+	<string>124.0.1</string>
 	<key>CFBundleVersion</key>
-	<string>124.0.0</string>
+	<string>124.0.1</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UILaunchStoryboardName</key>

catalog/MaterialCatalog/MaterialCatalog.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "MaterialCatalog"
-  s.version      = "124.0.0"
+  s.version      = "124.0.1"
   s.summary      = "Helper Objective-C classes for the MDC catalog."
   s.description  = "This spec is made for use in the MDC Catalog."
   s.homepage     = "https://github.com/material-components/material-components-ios"

components/BottomNavigation/src/MDCBottomNavigationBarController.m

@@ -266,19 +266,17 @@ - (void)setNavigationBarHidden:(BOOL)hidden animated:(BOOL)animated {
   self.navigationBarBottomAnchorConstraint.constant =
       hidden ? CGRectGetHeight(navigationBar.frame) : 0;
 
-  void (^completionBlock)(BOOL) = nil;
-
-  if (hidden && animated) {
-    // For animated hides we deffer updating the nav-bar hidden state until the animation finishes.
-    completionBlock = ^(BOOL finished) {
-      if (finished) {
-        // Hide the view to avoid visual artifacts on rotations.
-        navigationBar.hidden = hidden;
-      }
-    };
-  } else {
-    // Update `hidden` state immediately for unhide or non-animated transitions to ensure it gets
-    // applied in the same run loop.
+  void (^completionBlock)(BOOL) = ^(BOOL finished) {
+    // Update the end hidden state of the navigation bar if it was not interrupted (the end state
+    // matches the current state). Otherwise an already scheduled animation will take care of this.
+    if (finished && !hidden != !self.navigationBarItemsBottomAnchorConstraint.active) {
+      navigationBar.hidden = hidden;
+    }
+  };
+
+  // Immediatelly update the navigation bar's hidden state when it is going to become visible to be
+  // able to see the animation).
+  if (!hidden) {
     navigationBar.hidden = hidden;
   }