Merge pull request #1941 from artsy/orta-scrolls_to_top

Use the ARTopMenuViewController to turn on/off scrolls to top on views
artsy · Oct 19, 2016 · 6faa7fd · 6faa7fd
2 parents 90cf0e1 + d0312a1
commit 6faa7fd
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/Artsy/View_Controllers/Util/ARBrowseViewController.m b/Artsy/View_Controllers/Util/ARBrowseViewController.m
@@ -29,7 +29,7 @@ - (void)setupTitleLabel
 /////////////////
 
 
-@interface ARBrowseViewController () <UICollectionViewDataSource, UICollectionViewDelegate, UICollectionViewDelegateFlowLayout>
+@interface ARBrowseViewController () <UICollectionViewDataSource, UICollectionViewDelegate, UICollectionViewDelegateFlowLayout, ARMenuAwareViewController>
 @property (nonatomic, strong, readonly) NSArray *menuLinks;
 @end
 
@@ -47,6 +47,11 @@ - (void)viewDidLoad
     [super viewDidLoad];
 }
 
+- (UIScrollView *)menuAwareScrollView
+{
+    return self.collectionView;
+}
+
 - (void)viewDidAppear:(BOOL)animated
 {
     [super viewDidAppear:animated];

diff --git a/Artsy/Views/Utilities/ARTabContentView.m b/Artsy/Views/Utilities/ARTabContentView.m
@@ -3,6 +3,7 @@
 #import "ARDispatchManager.h"
 #import "ARNavigationController.h"
 #import "UIView+HitTestExpansion.h"
+#import "ARMenuAwareViewController.h"
 
 #import <ObjectiveSugar/ObjectiveSugar.h>
 
@@ -143,7 +144,7 @@ - (void)forceSetCurrentViewIndex:(NSInteger)index animated:(BOOL)animated
     BOOL isARNavigationController = [self.currentNavigationController isKindOfClass:ARNavigationController.class];
 
     // If selecting search button, toggle search VC
-    if ([self.dataSource searchButtonAtIndex:index] && isARNavigationController) {
+    if (isARNavigationController && [self.dataSource searchButtonAtIndex:index]) {
         [(ARNavigationController *)self.currentNavigationController toggleSearch];
         return;
     }
@@ -168,10 +169,15 @@ - (void)forceSetCurrentViewIndex:(NSInteger)index animated:(BOOL)animated
     nextViewInitialFrame.origin.x = direction * CGRectGetWidth(self.superview.bounds);
     oldViewEndFrame.origin.x = -direction * CGRectGetWidth(self.superview.bounds);
 
-    __block UIViewController *oldViewController = self.currentNavigationController;
+    __block UINavigationController *oldViewController = self.currentNavigationController;
     _previousViewIndex = self.currentViewIndex;
     _currentViewIndex = index;
 
+    // Ensure there is only one scrollview that has `scrollsToTop`
+    if (isARNavigationController && [oldViewController.topViewController conformsToProtocol:@protocol(ARMenuAwareViewController)]) {
+        [(id)oldViewController.topViewController menuAwareScrollView].scrollsToTop = NO;
+    }
+
     // Get the next View Controller, add to self
     _currentNavigationController = [self navigationControllerForIndex:index];
     self.currentNavigationController.view.frame = nextViewInitialFrame;
@@ -206,6 +212,11 @@ - (void)forceSetCurrentViewIndex:(NSInteger)index animated:(BOOL)animated
             [self addSubview:self.currentNavigationController.view];
             [self.currentNavigationController endAppearanceTransition];
 
+            // Ensure there is only one scrollview that has `scrollsToTop`
+            if (isARNavigationController && [self.currentNavigationController.topViewController conformsToProtocol:@protocol(ARMenuAwareViewController)]) {
+                [(id)self.currentNavigationController.topViewController menuAwareScrollView].scrollsToTop = YES;
+            }
+
             animationBlock();
             completionBlock(YES);
         }