Merge branch 'main' of github.com:duckduckgo/macos-browser into sabri…

…na/new-onboarding
duckduckgo · Jul 1, 2024 · 6c7c70d · 6c7c70d
2 parents a4e271e + 5fccf8e
commit 6c7c70d
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/DuckDuckGo/BookmarksBar/View/BookmarksBar.storyboard b/DuckDuckGo/BookmarksBar/View/BookmarksBar.storyboard
@@ -59,7 +59,7 @@
                                 <rect key="frame" x="0.0" y="-2" width="676" height="5"/>
                             </box>
                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Pbn-uk-iJf">
-                                <rect key="frame" x="1" y="11" width="174" height="32"/>
+                                <rect key="frame" x="7" y="11" width="174" height="32"/>
                                 <buttonCell key="cell" type="push" title="Import Bookmarks..." bezelStyle="rounded" image="square.and.arrow.down" catalog="system" imagePosition="leading" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="CgH-qm-9us">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="system"/>
@@ -77,7 +77,7 @@
                             <constraint firstItem="cjE-4p-vxI" firstAttribute="centerX" secondItem="R54-3G-cms" secondAttribute="centerX" id="T6z-7g-NZA"/>
                             <constraint firstAttribute="trailing" secondItem="Mgr-xJ-Pl5" secondAttribute="trailing" constant="8" id="UCG-Ww-dsY"/>
                             <constraint firstAttribute="trailing" secondItem="X6g-3K-JDi" secondAttribute="trailing" id="ZaK-nU-eHk"/>
-                            <constraint firstItem="Pbn-uk-iJf" firstAttribute="leading" secondItem="R54-3G-cms" secondAttribute="leading" constant="8" id="bPU-D0-qHa"/>
+                            <constraint firstItem="Pbn-uk-iJf" firstAttribute="leading" secondItem="R54-3G-cms" secondAttribute="leading" constant="14" id="bPU-D0-qHa"/>
                             <constraint firstItem="Pbn-uk-iJf" firstAttribute="centerY" secondItem="R54-3G-cms" secondAttribute="centerY" id="cPZ-VT-0aI"/>
                             <constraint firstItem="Mgr-xJ-Pl5" firstAttribute="centerY" secondItem="R54-3G-cms" secondAttribute="centerY" constant="-1" id="eoh-hW-GcD"/>
                             <constraint firstItem="D39-Of-BIh" firstAttribute="leading" secondItem="R54-3G-cms" secondAttribute="leading" id="hOd-Bz-o5j"/>

diff --git a/DuckDuckGo/Common/Extensions/URLExtension.swift b/DuckDuckGo/Common/Extensions/URLExtension.swift
@@ -341,7 +341,7 @@ extension URL {
     }
 
     var isExternalSchemeLink: Bool {
-        return ![.https, .http, .about, .file, .blob, .data, .ftp, .javascript].contains(navigationalScheme)
+        return ![.https, .http, .about, .file, .blob, .data, .ftp, .javascript, .duck].contains(navigationalScheme)
     }
 
     // MARK: - DuckDuckGo

diff --git a/DuckDuckGo/Tab/Model/Tab.swift b/DuckDuckGo/Tab/Model/Tab.swift
@@ -618,15 +618,15 @@ protocol NewWindowPolicyDecisionMaker {
     @MainActor
     @discardableResult
     func goBack() -> ExpectedNavigation? {
-        guard canGoBack else {
+        guard canGoBack, let backItem = webView.backForwardList.backItem else {
             if canBeClosedWithBack {
                 delegate?.closeTab(self)
             }
             return nil
         }
 
         userInteractionDialog = nil
-        let navigation = webView.navigator()?.goBack(withExpectedNavigationType: .backForward(distance: -1))
+        let navigation = webView.navigator()?.go(to: backItem, withExpectedNavigationType: .backForward(distance: -1))
         // update TabContent source to .historyEntry on navigation
         navigation?.appendResponder(willStart: { [weak self] navigation in
             guard let self,
@@ -640,10 +640,10 @@ protocol NewWindowPolicyDecisionMaker {
     @MainActor
     @discardableResult
     func goForward() -> ExpectedNavigation? {
-        guard canGoForward else { return nil }
+        guard canGoForward, let forwardItem = webView.backForwardList.forwardItem else { return nil }
 
         userInteractionDialog = nil
-        let navigation = webView.navigator()?.goForward(withExpectedNavigationType: .backForward(distance: 1))
+        let navigation = webView.navigator()?.go(to: forwardItem, withExpectedNavigationType: .backForward(distance: 1))
         // update TabContent source to .historyEntry on navigation
         navigation?.appendResponder(willStart: { [weak self] navigation in
             guard let self,

diff --git a/LocalPackages/DataBrokerProtection/Package.swift b/LocalPackages/DataBrokerProtection/Package.swift
@@ -29,7 +29,7 @@ let package = Package(
             targets: ["DataBrokerProtection"])
     ],
     dependencies: [
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "164.0.0"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "164.0.1"),
         .package(path: "../SwiftUIExtensions"),
         .package(path: "../XPCHelper"),
     ],

diff --git a/LocalPackages/NetworkProtectionMac/Package.swift b/LocalPackages/NetworkProtectionMac/Package.swift
@@ -32,7 +32,7 @@ let package = Package(
         .library(name: "VPNAppLauncher", targets: ["VPNAppLauncher"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "164.0.0"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "164.0.1"),
         .package(url: "https://github.com/airbnb/lottie-spm", exact: "4.4.1"),
         .package(path: "../AppLauncher"),
         .package(path: "../UDSHelper"),

diff --git a/LocalPackages/SubscriptionUI/Package.swift b/LocalPackages/SubscriptionUI/Package.swift
@@ -12,7 +12,7 @@ let package = Package(
             targets: ["SubscriptionUI"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "164.0.0"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "164.0.1"),
         .package(path: "../SwiftUIExtensions")
     ],
     targets: [