Skip to content
This repository was archived by the owner on Feb 24, 2025. It is now read-only.

Commit 65f241e

Browse files
ayoyayoy
authored
Display Next Steps cards on HTML New Tab Page (#3621)
Task/Issue URL: https://app.asana.com/0/72649045549333/1208246350498752/f Description: This change adds Next Steps cards section on HTML New Tab Page. The change from native NTP is that Next Steps section can't be controlled by the user.
1 parent 687c5db commit 65f241e

15 files changed

+723
-25
lines changed

‎DuckDuckGo.xcodeproj/project.pbxproj

+26
Original file line numberDiff line numberDiff line change
@@ -1107,6 +1107,10 @@
11071107
372217822B33380700B8E9C2 /* TestUtils in Frameworks */ = {isa = PBXBuildFile; productRef = 372217812B33380700B8E9C2 /* TestUtils */; };
11081108
3723A94F2CE7400D00A0C59A /* NewTabPageRMFClient.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3723A94E2CE73FDD00A0C59A /* NewTabPageRMFClient.swift */; };
11091109
3723A9502CE7400D00A0C59A /* NewTabPageRMFClient.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3723A94E2CE73FDD00A0C59A /* NewTabPageRMFClient.swift */; };
1110+
3724ED8B2CFE6A290043626A /* NewTabPageNextStepsCardsProviding.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3724ED8A2CFE6A120043626A /* NewTabPageNextStepsCardsProviding.swift */; };
1111+
3724ED8C2CFE6A290043626A /* NewTabPageNextStepsCardsProviding.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3724ED8A2CFE6A120043626A /* NewTabPageNextStepsCardsProviding.swift */; };
1112+
3724ED8E2CFE6B3F0043626A /* NewTabPageNextStepsCardsClientTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3724ED8D2CFE6B330043626A /* NewTabPageNextStepsCardsClientTests.swift */; };
1113+
3724ED8F2CFE6B3F0043626A /* NewTabPageNextStepsCardsClientTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3724ED8D2CFE6B330043626A /* NewTabPageNextStepsCardsClientTests.swift */; };
11101114
37269EFB2B332F9E005E8E46 /* Common in Frameworks */ = {isa = PBXBuildFile; productRef = 37269EFA2B332F9E005E8E46 /* Common */; };
11111115
37269EFD2B332FAC005E8E46 /* Common in Frameworks */ = {isa = PBXBuildFile; productRef = 37269EFC2B332FAC005E8E46 /* Common */; };
11121116
37269EFF2B332FBB005E8E46 /* Common in Frameworks */ = {isa = PBXBuildFile; productRef = 37269EFE2B332FBB005E8E46 /* Common */; };
@@ -1248,6 +1252,8 @@
12481252
37BF3F22286F0A7A00BD9014 /* PinnedTabsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37BF3F1F286F0A7A00BD9014 /* PinnedTabsView.swift */; };
12491253
37C9F78C2CF1C776004D73A1 /* PrivacyStatsTabExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37C9F78B2CF1C770004D73A1 /* PrivacyStatsTabExtension.swift */; };
12501254
37C9F78D2CF1C776004D73A1 /* PrivacyStatsTabExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37C9F78B2CF1C770004D73A1 /* PrivacyStatsTabExtension.swift */; };
1255+
37CB368B2CFA5AF100E5E5FA /* NewTabPageNextStepsCardsClient.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37CB368A2CFA5AEC00E5E5FA /* NewTabPageNextStepsCardsClient.swift */; };
1256+
37CB368C2CFA5AF100E5E5FA /* NewTabPageNextStepsCardsClient.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37CB368A2CFA5AEC00E5E5FA /* NewTabPageNextStepsCardsClient.swift */; };
12511257
37CBCA9A2A8966E60050218F /* SyncSettingsAdapter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37CBCA992A8966E60050218F /* SyncSettingsAdapter.swift */; };
12521258
37CBCA9B2A8966E60050218F /* SyncSettingsAdapter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37CBCA992A8966E60050218F /* SyncSettingsAdapter.swift */; };
12531259
37CC53EC27E8A4D10028713D /* PreferencesDataClearingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37CC53EB27E8A4D10028713D /* PreferencesDataClearingView.swift */; };
@@ -3665,6 +3671,8 @@
36653671
37219B392CBFD4F300C9D7A8 /* NewTabPageSearchBoxExperiment+Logger.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NewTabPageSearchBoxExperiment+Logger.swift"; sourceTree = "<group>"; };
36663672
37219B3C2CC27DB300C9D7A8 /* NewTabPageSearchBoxExperimentTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewTabPageSearchBoxExperimentTests.swift; sourceTree = "<group>"; };
36673673
3723A94E2CE73FDD00A0C59A /* NewTabPageRMFClient.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewTabPageRMFClient.swift; sourceTree = "<group>"; };
3674+
3724ED8A2CFE6A120043626A /* NewTabPageNextStepsCardsProviding.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewTabPageNextStepsCardsProviding.swift; sourceTree = "<group>"; };
3675+
3724ED8D2CFE6B330043626A /* NewTabPageNextStepsCardsClientTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewTabPageNextStepsCardsClientTests.swift; sourceTree = "<group>"; };
36683676
372A0FEB2B2379310033BF7F /* SyncMetricsEventsHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SyncMetricsEventsHandler.swift; sourceTree = "<group>"; };
36693677
372BC2A02A4AFA47001D8FD5 /* SyncCredentialsAdapter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SyncCredentialsAdapter.swift; sourceTree = "<group>"; };
36703678
372ED7C12CDD4815002287EC /* NewTabPageUserContentController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewTabPageUserContentController.swift; sourceTree = "<group>"; };
@@ -3761,6 +3769,7 @@
37613769
37BF3F1E286F0A7A00BD9014 /* PinnedTabsViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PinnedTabsViewModel.swift; sourceTree = "<group>"; };
37623770
37BF3F1F286F0A7A00BD9014 /* PinnedTabsView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PinnedTabsView.swift; sourceTree = "<group>"; };
37633771
37C9F78B2CF1C770004D73A1 /* PrivacyStatsTabExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrivacyStatsTabExtension.swift; sourceTree = "<group>"; };
3772+
37CB368A2CFA5AEC00E5E5FA /* NewTabPageNextStepsCardsClient.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewTabPageNextStepsCardsClient.swift; sourceTree = "<group>"; };
37643773
37CBCA992A8966E60050218F /* SyncSettingsAdapter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SyncSettingsAdapter.swift; sourceTree = "<group>"; };
37653774
37CC53EB27E8A4D10028713D /* PreferencesDataClearingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PreferencesDataClearingView.swift; sourceTree = "<group>"; };
37663775
37CC53F327E8D4620028713D /* NSPathControlView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NSPathControlView.swift; sourceTree = "<group>"; };
@@ -5857,6 +5866,7 @@
58575866
children = (
58585867
37F8E2322CEE363D002F0141 /* NewTabPageContextMenuPresenting.swift */,
58595868
3723A94E2CE73FDD00A0C59A /* NewTabPageRMFClient.swift */,
5869+
37CB36892CFA5ADA00E5E5FA /* NextStepsCards */,
58605870
37F1E32D2CEF2DDD00130142 /* Favorites */,
58615871
37DF370B2CF3CEF5005ED34B /* PrivacyStats */,
58625872
379B5AEB2CEA26C600B9F5D7 /* NewTabPageConfigurationClient.swift */,
@@ -5875,6 +5885,7 @@
58755885
3767880E2CECD5A200F59D83 /* NewTabPageUserScriptTests.swift */,
58765886
3767880B2CECCB6C00F59D83 /* NewTabPageActionsManagerTests.swift */,
58775887
376788112CECF03000F59D83 /* NewTabPageRMFClientTests.swift */,
5888+
3724ED8D2CFE6B330043626A /* NewTabPageNextStepsCardsClientTests.swift */,
58785889
37F1E32E2CEF4A2C00130142 /* NewTabPageFavoritesClientTests.swift */,
58795890
378D62562CEF801A0056BBD8 /* NewTabPageFavoritesModelTests.swift */,
58805891
37FC2A1A2CF903A70048E226 /* NewTabPagePrivacyStatsClientTests.swift */,
@@ -6039,6 +6050,15 @@
60396050
path = PrivacyStats;
60406051
sourceTree = "<group>";
60416052
};
6053+
37CB36892CFA5ADA00E5E5FA /* NextStepsCards */ = {
6054+
isa = PBXGroup;
6055+
children = (
6056+
3724ED8A2CFE6A120043626A /* NewTabPageNextStepsCardsProviding.swift */,
6057+
37CB368A2CFA5AEC00E5E5FA /* NewTabPageNextStepsCardsClient.swift */,
6058+
);
6059+
path = NextStepsCards;
6060+
sourceTree = "<group>";
6061+
};
60426062
37CD54C027F2FDD100F1F7B9 /* Model */ = {
60436063
isa = PBXGroup;
60446064
children = (
@@ -11701,6 +11721,7 @@
1170111721
3706FB80293F65D500E42796 /* NSAlert+ActiveDownloadsTermination.swift in Sources */,
1170211722
B677FC552B064A9C0099EB04 /* DataImportViewModel.swift in Sources */,
1170311723
D64A5FF92AEA5C2B00B6D6E7 /* HomeButtonMenuFactory.swift in Sources */,
11724+
3724ED8B2CFE6A290043626A /* NewTabPageNextStepsCardsProviding.swift in Sources */,
1170411725
4BE3A6C22C16BEB1003FC378 /* VPNRedditSessionWorkaround.swift in Sources */,
1170511726
3707C717294B5D0F00682A9F /* FindInPageTabExtension.swift in Sources */,
1170611727
3706FB81293F65D500E42796 /* IndexPathExtension.swift in Sources */,
@@ -12161,6 +12182,7 @@
1216112182
3706FC77293F65D500E42796 /* PageObserverUserScript.swift in Sources */,
1216212183
4BF0E5132AD25A2600FFEC9E /* DuckDuckGoUserAgent.swift in Sources */,
1216312184
3706FC78293F65D500E42796 /* SecureVaultReporter.swift in Sources */,
12185+
37CB368C2CFA5AF100E5E5FA /* NewTabPageNextStepsCardsClient.swift in Sources */,
1216412186
3706FC79293F65D500E42796 /* NSImageExtensions.swift in Sources */,
1216512187
3706FEBD293F6EFF00E42796 /* BWCommand.swift in Sources */,
1216612188
C172E7302C9329D300521D9A /* FlippedView.swift in Sources */,
@@ -12588,6 +12610,7 @@
1258812610
CD33012A2C887B1C009AA127 /* URLTokenValidatorTests.swift in Sources */,
1258912611
9F0660742BECC71200B8EEF1 /* SubscriptionAttributionPixelHandlerTests.swift in Sources */,
1259012612
9FBD847B2BB3EC3300220859 /* MockAttributionOriginProvider.swift in Sources */,
12613+
3724ED8F2CFE6B3F0043626A /* NewTabPageNextStepsCardsClientTests.swift in Sources */,
1259112614
56A214B02CB583BF00E5BC0E /* TrackerMessageProviderTests.swift in Sources */,
1259212615
3706FE82293F661700E42796 /* MockStatisticsStore.swift in Sources */,
1259312616
9FBD84712BB3DD8400220859 /* MockAttributionsPixelHandler.swift in Sources */,
@@ -13076,6 +13099,7 @@
1307613099
B62B483E2ADE48DE000DECE5 /* ArrayBuilder.swift in Sources */,
1307713100
4B92929B26670D2A00AD2C21 /* BookmarkOutlineViewDataSource.swift in Sources */,
1307813101
56D145EB29E6C99B00E3488A /* DataImportStatusProviding.swift in Sources */,
13102+
37CB368B2CFA5AF100E5E5FA /* NewTabPageNextStepsCardsClient.swift in Sources */,
1307913103
843965122C6F2FFE004C8899 /* NSDragOperationExtension.swift in Sources */,
1308013104
31D5375C291D944100407A95 /* PasswordManagementBitwardenItemView.swift in Sources */,
1308113105
1D9297BF2C1B062900A38521 /* ApplicationUpdateDetector.swift in Sources */,
@@ -13093,6 +13117,7 @@
1309313117
B6E3E5542BBFCEE300A41922 /* NoDownloadsCellView.swift in Sources */,
1309413118
3768D8382C24BFF5004120AE /* RemoteMessageView.swift in Sources */,
1309513119
4BBDEE9428FC14760092FAA6 /* ConnectBitwardenViewController.swift in Sources */,
13120+
3724ED8C2CFE6A290043626A /* NewTabPageNextStepsCardsProviding.swift in Sources */,
1309613121
1DDF076428F815AD00EDFBE3 /* BWManager.swift in Sources */,
1309713122
9833912F27AAA3CE00DAF119 /* AppTrackerDataSetProvider.swift in Sources */,
1309813123
B65211252B29A42C00B30633 /* BookmarkStoreMock.swift in Sources */,
@@ -14109,6 +14134,7 @@
1410914134
B6106BAF26A7C6180013B453 /* PermissionStoreMock.swift in Sources */,
1411014135
4B98D27A28D95F1A003C2B6F /* ChromiumFaviconsReaderTests.swift in Sources */,
1411114136
9F0660732BECC71200B8EEF1 /* SubscriptionAttributionPixelHandlerTests.swift in Sources */,
14137+
3724ED8E2CFE6B3F0043626A /* NewTabPageNextStepsCardsClientTests.swift in Sources */,
1411214138
BDCB66D82C7CE1A600E8ABC9 /* VPNFeedbackFormViewModelTests.swift in Sources */,
1411314139
567A23E12C89B1EE0010F66C /* BrowserTabViewControllerOnboardingTests.swift in Sources */,
1411414140
986189E62A7CFB3E001B4519 /* LocalBookmarkStoreSavingTests.swift in Sources */,

‎DuckDuckGo/HomePage/Model/HomePageContinueSetUpModel.swift

+44-10
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import AppKit
2020
import BrowserServicesKit
21+
import Combine
2122
import Common
2223
import Foundation
2324
import PixelKit
@@ -26,6 +27,20 @@ import Subscription
2627
import NetworkProtection
2728
import NetworkProtectionUI
2829

30+
protocol ContinueSetUpModelTabOpening {
31+
@MainActor
32+
func openTab(_ tab: Tab)
33+
}
34+
35+
struct TabCollectionViewModelTabOpener: ContinueSetUpModelTabOpening {
36+
let tabCollectionViewModel: TabCollectionViewModel
37+
38+
@MainActor
39+
func openTab(_ tab: Tab) {
40+
tabCollectionViewModel.insertOrAppend(tab: tab, selected: true)
41+
}
42+
}
43+
2944
extension HomePage.Models {
3045

3146
static let newHomePageTabOpen = Notification.Name("newHomePageAppOpen")
@@ -49,7 +64,7 @@ extension HomePage.Models {
4964
private let defaultBrowserProvider: DefaultBrowserProvider
5065
private let dockCustomizer: DockCustomization
5166
private let dataImportProvider: DataImportStatusProviding
52-
private let tabCollectionViewModel: TabCollectionViewModel
67+
private let tabOpener: ContinueSetUpModelTabOpening
5368
private let emailManager: EmailManager
5469
private let duckPlayerPreferences: DuckPlayerPreferencesPersistor
5570
private let subscriptionManager: SubscriptionManager
@@ -58,9 +73,13 @@ extension HomePage.Models {
5873
var shouldShowAllFeatures: Bool {
5974
didSet {
6075
updateVisibleMatrix()
76+
shouldShowAllFeaturesSubject.send(shouldShowAllFeatures)
6177
}
6278
}
6379

80+
let shouldShowAllFeaturesPublisher: AnyPublisher<Bool, Never>
81+
private let shouldShowAllFeaturesSubject = PassthroughSubject<Bool, Never>()
82+
6483
struct Settings {
6584
@UserDefaultsWrapper(key: .homePageShowMakeDefault, defaultValue: true)
6685
var shouldShowMakeDefaultSetting: Bool
@@ -102,36 +121,43 @@ extension HomePage.Models {
102121

103122
lazy var listOfFeatures = settings.isFirstSession ? firstRunFeatures : randomisedFeatures
104123

105-
private var featuresMatrix: [[FeatureType]] = [[]] {
124+
@Published var featuresMatrix: [[FeatureType]] = [[]] {
106125
didSet {
107126
updateVisibleMatrix()
108127
}
109128
}
110129

111130
@Published var visibleFeaturesMatrix: [[FeatureType]] = [[]]
112131

113-
init(defaultBrowserProvider: DefaultBrowserProvider,
114-
dockCustomizer: DockCustomization,
115-
dataImportProvider: DataImportStatusProviding,
116-
tabCollectionViewModel: TabCollectionViewModel,
132+
init(defaultBrowserProvider: DefaultBrowserProvider = SystemDefaultBrowserProvider(),
133+
dockCustomizer: DockCustomization = DockCustomizer(),
134+
dataImportProvider: DataImportStatusProviding = BookmarksAndPasswordsImportStatusProvider(),
135+
tabOpener: ContinueSetUpModelTabOpening,
117136
emailManager: EmailManager = EmailManager(),
118-
duckPlayerPreferences: DuckPlayerPreferencesPersistor,
137+
duckPlayerPreferences: DuckPlayerPreferencesPersistor = DuckPlayerPreferencesUserDefaultsPersistor(),
119138
privacyConfigurationManager: PrivacyConfigurationManaging = AppPrivacyFeatures.shared.contentBlocking.privacyConfigurationManager,
120139
subscriptionManager: SubscriptionManager = Application.appDelegate.subscriptionManager) {
140+
121141
self.defaultBrowserProvider = defaultBrowserProvider
122142
self.dockCustomizer = dockCustomizer
123143
self.dataImportProvider = dataImportProvider
124-
self.tabCollectionViewModel = tabCollectionViewModel
144+
self.tabOpener = tabOpener
125145
self.emailManager = emailManager
126146
self.duckPlayerPreferences = duckPlayerPreferences
127147
self.privacyConfigurationManager = privacyConfigurationManager
128148
self.subscriptionManager = subscriptionManager
129149
self.settings = .init()
130150

151+
shouldShowAllFeaturesPublisher = shouldShowAllFeaturesSubject.removeDuplicates().eraseToAnyPublisher()
152+
131153
refreshFeaturesMatrix()
132154

133155
NotificationCenter.default.addObserver(self, selector: #selector(newTabOpenNotification(_:)), name: HomePage.Models.newHomePageTabOpen, object: nil)
134156
NotificationCenter.default.addObserver(self, selector: #selector(windowDidBecomeKey(_:)), name: NSWindow.didBecomeKeyNotification, object: nil)
157+
158+
// HTML NTP doesn't refresh on appear so we have to connect to the appear signal
159+
// (the notification in this case) to trigger a refresh.
160+
NotificationCenter.default.addObserver(self, selector: #selector(refreshFeaturesForHTMLNewTabPage(_:)), name: .newTabPageWebViewDidAppear, object: nil)
135161
}
136162

137163
@MainActor func performAction(for featureType: FeatureType) {
@@ -166,14 +192,14 @@ extension HomePage.Models {
166192
private func performDuckPlayerAction() {
167193
if let videoUrl = URL(string: duckPlayerURL) {
168194
let tab = Tab(content: .url(videoUrl, source: .link), shouldLoadInBackground: true)
169-
tabCollectionViewModel.append(tab: tab)
195+
tabOpener.openTab(tab)
170196
}
171197
}
172198

173199
@MainActor
174200
private func performEmailProtectionAction() {
175201
let tab = Tab(content: .url(EmailUrls().emailProtectionLink, source: .ui), shouldLoadInBackground: true)
176-
tabCollectionViewModel.append(tab: tab)
202+
tabOpener.openTab(tab)
177203
}
178204

179205
func performDockAction() {
@@ -243,6 +269,14 @@ extension HomePage.Models {
243269
}
244270

245271
@objc private func windowDidBecomeKey(_ notification: Notification) {
272+
// Async dispatch allows default browser setting to propagate
273+
// after being changed in the system dialog
274+
DispatchQueue.main.async {
275+
self.refreshFeaturesMatrix()
276+
}
277+
}
278+
279+
@objc private func refreshFeaturesForHTMLNewTabPage(_ notification: Notification) {
246280
refreshFeaturesMatrix()
247281
}
248282

‎DuckDuckGo/HomePage/View/ContinueSetUpView.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ extension HomePage.Views {
292292
defaultBrowserProvider: SystemDefaultBrowserProvider(),
293293
dockCustomizer: DockCustomizer(),
294294
dataImportProvider: BookmarksAndPasswordsImportStatusProvider(),
295-
tabCollectionViewModel: TabCollectionViewModel(),
295+
tabOpener: TabCollectionViewModelTabOpener(tabCollectionViewModel: TabCollectionViewModel()),
296296
duckPlayerPreferences: DuckPlayerPreferencesUserDefaultsPersistor()
297297
))
298298
}

‎DuckDuckGo/HomePage/View/HomePageSettings/HomePageSettingsView.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ extension HomePage.Views.BackgroundCategoryView {
247247
defaultBrowserProvider: SystemDefaultBrowserProvider(),
248248
dockCustomizer: DockCustomizer(),
249249
dataImportProvider: BookmarksAndPasswordsImportStatusProvider(),
250-
tabCollectionViewModel: TabCollectionViewModel(),
250+
tabOpener: TabCollectionViewModelTabOpener(tabCollectionViewModel: TabCollectionViewModel()),
251251
duckPlayerPreferences: DuckPlayerPreferencesUserDefaultsPersistor()
252252
))
253253
.environmentObject(HomePage.Models.FavoritesModel(
@@ -276,7 +276,7 @@ extension HomePage.Views.BackgroundCategoryView {
276276
defaultBrowserProvider: SystemDefaultBrowserProvider(),
277277
dockCustomizer: DockCustomizer(),
278278
dataImportProvider: BookmarksAndPasswordsImportStatusProvider(),
279-
tabCollectionViewModel: TabCollectionViewModel(),
279+
tabOpener: TabCollectionViewModelTabOpener(tabCollectionViewModel: TabCollectionViewModel()),
280280
duckPlayerPreferences: DuckPlayerPreferencesUserDefaultsPersistor()
281281
))
282282
.environmentObject(HomePage.Models.FavoritesModel(

‎DuckDuckGo/HomePage/View/HomePageViewController.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ final class HomePageViewController: NSViewController {
171171
defaultBrowserProvider: SystemDefaultBrowserProvider(),
172172
dockCustomizer: DockCustomizer(),
173173
dataImportProvider: BookmarksAndPasswordsImportStatusProvider(),
174-
tabCollectionViewModel: tabCollectionViewModel,
174+
tabOpener: TabCollectionViewModelTabOpener(tabCollectionViewModel: tabCollectionViewModel),
175175
duckPlayerPreferences: DuckPlayerPreferencesUserDefaultsPersistor()
176176
)
177177
}

‎DuckDuckGo/NewTabPage/NewTabPageActionsManager.swift

+8
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,16 @@ extension NewTabPageActionsManager {
130130
self.init(scriptClients: [
131131
NewTabPageConfigurationClient(appearancePreferences: appearancePreferences),
132132
NewTabPageRMFClient(remoteMessageProvider: activeRemoteMessageModel, openURLHandler: openURLHandler),
133+
NewTabPageNextStepsCardsClient(model: HomePage.Models.ContinueSetUpModel(tabOpener: NewTabPageTabOpener())),
133134
NewTabPageFavoritesClient(favoritesModel: NewTabPageFavoritesModel()),
134135
NewTabPagePrivacyStatsClient(model: privacyStatsModel)
135136
])
136137
}
137138
}
139+
140+
struct NewTabPageTabOpener: ContinueSetUpModelTabOpening {
141+
@MainActor
142+
func openTab(_ tab: Tab) {
143+
WindowControllersManager.shared.lastKeyMainWindowController?.mainViewController.tabCollectionViewModel.insertOrAppend(tab: tab, selected: true)
144+
}
145+
}

0 commit comments

Comments
 (0)