Fix toolbar appearing when empty

FLEXTool · Mar 30, 2021 · 8f9a6e8 · 8f9a6e8
1 parent c37270e
commit 8f9a6e8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/Classes/Core/Controllers/FLEXNavigationController.m b/Classes/Core/Controllers/FLEXNavigationController.m
@@ -20,6 +20,7 @@ - (void)_setDelegate:(id)delegate;
 @interface FLEXNavigationController ()
 @property (nonatomic, readonly) BOOL toolbarWasHidden;
 @property (nonatomic) BOOL waitingToAddTab;
+@property (nonatomic, readonly) BOOL canShowToolbar;
 @property (nonatomic) BOOL didSetupPendingDismissButtons;
 @property (nonatomic) UISwipeGestureRecognizer *navigationBarSwipeGesture;
 @end
@@ -99,6 +100,10 @@ - (void)dismissAnimated {
     [self.presentingViewController dismissViewControllerAnimated:YES completion:nil];
 }
 
+- (BOOL)canShowToolbar {
+    return self.topViewController.toolbarItems.count;
+}
+
 - (void)addNavigationBarItemsToViewController:(UINavigationItem *)navigationItem {
     if (!self.presentingViewController) {
         return;
@@ -156,7 +161,7 @@ - (void)handleNavigationBarTap:(UIGestureRecognizer *)sender {
     }
 
     if (sender.state == UIGestureRecognizerStateRecognized) {
-        if (self.toolbarHidden) {
+        if (self.toolbarHidden && self.canShowToolbar) {
             [self setToolbarHidden:NO animated:YES];
         }
     }
@@ -172,7 +177,7 @@ - (BOOL)gestureRecognizer:(UIGestureRecognizer *)g1 shouldBeRequiredToFailByGest
 
 - (void)_gestureRecognizedInteractiveHide:(UIPanGestureRecognizer *)sender {
     if (sender.state == UIGestureRecognizerStateRecognized) {
-        BOOL show = self.topViewController.toolbarItems.count;
+        BOOL show = self.canShowToolbar;
         CGFloat yTranslation = [sender translationInView:self.view].y;
         CGFloat yVelocity = [sender velocityInView:self.view].y;
         if (yVelocity > 2000) {

diff --git a/Classes/Core/Controllers/FLEXTableViewController.m b/Classes/Core/Controllers/FLEXTableViewController.m
@@ -238,7 +238,7 @@ - (void)viewDidLoad {
     self.tableView.keyboardDismissMode = UIScrollViewKeyboardDismissModeOnDrag;
 
     // Toolbar
-    self.navigationController.toolbarHidden = NO;
+    self.navigationController.toolbarHidden = self.toolbarItems.count > 0;
     self.navigationController.hidesBarsOnSwipe = YES;
 
     // On iOS 13, the root view controller shows it's search bar no matter what.