Scroll to the current session instead of just scrolling to the top

zats · zats · commit 4863c9303df2 · 2018-03-05T20:22:41.000-08:00
diff --git a/trySwift/RootTabBar/RootTabBarController.swift b/trySwift/RootTabBar/RootTabBarController.swift
@@ -33,7 +33,13 @@ class RootTabBarController: UITabBarController, UITabBarControllerDelegate {
           scrollableToTop.scrollAfterTabTap()
         // or we find the topmost scroll view and scroll it to the top
         } else {
-          firstController.view.findScrollSubview()?.setContentOffset(.zero, animated: true)
+          if let firstController = navigationController.viewControllers.first {
+            if let scrollableToTop = firstController as? ScrollableToTop {
+              scrollableToTop.scrollAfterTabTap()
+            } else {
+              firstController.view.findScrollSubview()?.setContentOffset(.zero, animated: true)
+            }
+          }
         }
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,13 @@ class RootTabBarController: UITabBarController, UITabBarControllerDelegate {`
`33`	`33`	`scrollableToTop.scrollAfterTabTap()`
`34`	`34`	`// or we find the topmost scroll view and scroll it to the top`
`35`	`35`	`} else {`
`36`		`- firstController.view.findScrollSubview()?.setContentOffset(.zero, animated: true)`
	`36`	`+ if let firstController = navigationController.viewControllers.first {`
	`37`	`+ if let scrollableToTop = firstController as? ScrollableToTop {`
	`38`	`+ scrollableToTop.scrollAfterTabTap()`
	`39`	`+ } else {`
	`40`	`+ firstController.view.findScrollSubview()?.setContentOffset(.zero, animated: true)`
	`41`	`+ }`
	`42`	`+ }`
`37`	`43`	`}`
`38`	`44`	`}`
`39`	`45`	`}`