Fix #8526: Fix the issue of the share button disappearing

ns-vasilev · Dec 17, 2023 · 608db68 · 608db68
1 parent a9f0557
commit 608db68
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/Sources/Brave/Frontend/Browser/BrowserViewController.swift b/Sources/Brave/Frontend/Browser/BrowserViewController.swift
@@ -651,7 +651,7 @@ public class BrowserViewController: UIViewController {
       let webView = tab.webView {
       updateURLBar()
       navigationToolbar.updateBackStatus(webView.canGoBack)
-      navigationToolbar.updateForwardStatus(webView.canGoForward)
+        updateForwardStatusIfNeeded(webView: webView)
       topToolbar.locationView.loading = tab.loading
     }
 
@@ -1789,11 +1789,12 @@ public class BrowserViewController: UIViewController {
 
       navigationToolbar.updateBackStatus(canGoBack)
     case .canGoForward:
-      guard tab === tabManager.selectedTab, let canGoForward = change?[.newKey] as? Bool else {
+        guard tab === tabManager.selectedTab, let canGoForward = change?[.newKey] as? Bool else {
         break
       }
-
-      navigationToolbar.updateForwardStatus(canGoForward)
+
+        navigationToolbar.updateForwardStatus(canGoForward)
+//        updateForwardStatus(canGoForward: canGoForward)
     case .hasOnlySecureContent:
       guard let tab = tabManager[webView] else {
         break
@@ -1913,6 +1914,14 @@ public class BrowserViewController: UIViewController {
     }
   }
 
+    func updateForwardStatusIfNeeded(webView: WKWebView) {
+        if let forwardListItem = webView.backForwardList.forwardList.first, forwardListItem.url.isReaderModeURL {
+            navigationToolbar.updateForwardStatus(false)
+        } else {
+            navigationToolbar.updateForwardStatus(webView.canGoForward)
+        }
+    }
+
   func updateUIForReaderHomeStateForTab(_ tab: Tab) {
     updateURLBar()
     toolbarVisibilityViewModel.toolbarState = .expanded

diff --git a/...e/Frontend/Browser/BrowserViewController/BrowserViewController+WKNavigationDelegate.swift b/...e/Frontend/Browser/BrowserViewController/BrowserViewController+WKNavigationDelegate.swift
@@ -666,6 +666,8 @@ extension BrowserViewController: WKNavigationDelegate {
     if tabManager.selectedTab === tab {
       updateUIForReaderHomeStateForTab(tab)
     }
+
+      updateForwardStatusIfNeeded(webView: webView)
   }
 
   public func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {