Merge pull request #5883 from woocommerce/fix/5843-dashboard-scroll-glitch

My store tab: fix glitch when scrolling up the dashboard with certain content height

Author: jaclync

WooCommerce/Classes/ViewRelated/Dashboard/DashboardViewController.swift

@@ -88,7 +88,7 @@ final class DashboardViewController: UIViewController {
         return view
     }()
 
-    private var cancellables = Set<AnyCancellable>()
+    private var subscriptions = Set<AnyCancellable>()
 
     // MARK: View Lifecycle
 
@@ -111,6 +111,7 @@ final class DashboardViewController: UIViewController {
         configureBottomJetpackBenefitsBanner()
         observeSiteForUIUpdates()
         observeBottomJetpackBenefitsBannerVisibilityUpdates()
+        observeNavigationBarHeightForStoreNameLabelVisibility()
     }
 
     override func viewWillAppear(_ animated: Bool) {
@@ -294,22 +295,6 @@ private extension DashboardViewController {
 extension DashboardViewController: DashboardUIScrollDelegate {
     func dashboardUIScrollViewDidScroll(_ scrollView: UIScrollView) {
         hiddenScrollView.updateFromScrollViewDidScrollEventForLargeTitleWorkaround(scrollView)
-        showOrHideSubtitle(offset: scrollView.contentOffset.y)
-    }
-
-    private func showOrHideSubtitle(offset: CGFloat) {
-        guard shouldShowStoreNameAsSubtitle else {
-            return
-        }
-        storeNameLabel.isHidden = offset > headerStackView.frame.height
-        if offset < -headerStackView.frame.height {
-            UIView.transition(with: storeNameLabel, duration: Constants.animationDuration,
-                              options: .showHideTransitionViews,
-                              animations: { [weak self] in
-                                guard let self = self else { return }
-                                self.storeNameLabel.isHidden = false
-                          })
-        }
     }
 }
 
@@ -438,7 +423,7 @@ private extension DashboardViewController {
             guard let self = self else { return }
             self.updateUI(site: site)
             self.reloadData(forced: true)
-        }.store(in: &cancellables)
+        }.store(in: &subscriptions)
     }
 
     func observeBottomJetpackBenefitsBannerVisibilityUpdates() {
@@ -462,7 +447,22 @@ private extension DashboardViewController {
                     self.updateJetpackBenefitsBannerVisibility(isBannerVisible: shouldShowJetpackBenefitsBanner, contentView: contentView)
                 }
                 ServiceLocator.stores.dispatch(action)
-            }.store(in: &cancellables)
+            }.store(in: &subscriptions)
+    }
+
+    func observeNavigationBarHeightForStoreNameLabelVisibility() {
+        navigationController?.navigationBar.publisher(for: \.frame, options: [.initial, .new])
+            .map { $0.height }
+            .removeDuplicates()
+            .sink(receiveValue: { [weak self] navigationBarHeight in
+                guard let self = self else { return }
+
+                guard self.shouldShowStoreNameAsSubtitle else {
+                    return
+                }
+                self.storeNameLabel.isHidden = navigationBarHeight <= Constants.collapsedNavigationBarHeight
+            })
+            .store(in: &subscriptions)
     }
 }
 
@@ -476,8 +476,8 @@ private extension DashboardViewController {
     }
 
     enum Constants {
-        static let animationDuration = 0.2
         static let bannerBottomMargin = CGFloat(8)
         static let horizontalMargin = CGFloat(20)
+        static let collapsedNavigationBarHeight = CGFloat(44)
     }
 }