The open-source Arc replacement for macOS. Spaces, pinned tabs, split view, Little Windows and Arc's shortcuts on Chromium, with your Arc sidebar imported in one go.
The Site Control Center's sliders show without extensions, in the sidebar's URL field and the toolbar, as in Arc (#226)
Victor8dbd6d1ee8b6
diff --git a/Packages/CraCore/Sources/CraCore/ToolbarComposition.swift b/Packages/CraCore/Sources/CraCore/ToolbarComposition.swiftindex 196b792..72210fc 100644--- a/Packages/CraCore/Sources/CraCore/ToolbarComposition.swift+++ b/Packages/CraCore/Sources/CraCore/ToolbarComposition.swift@@ -1,3 +1,4 @@+import CoreGraphicsimport Foundation/// Which buttons Arc's toolbar carries, in order, for a pane's state; PaneToolbarView makes@@ -13,6 +14,10 @@ import Foundation/// and close; the other panes show only Arc's essential controls (`onlyShowEssentialControls`:/// ← →, the address and close) until the pointer is over their bar (Arc's `onHover` toolbar/// blueprint), which reveals the rest.+///+/// The Extensions button (Arc's sliders) opens the Site Control Center: Share, Boost, Capture,+/// the extensions with their "+" and the site's settings. It is there with no extension+/// installed too, in the toolbar and in the sidebar's URL field (GitHub #226).public struct ToolbarComposition: Equatable, Sendable {public enum Kind: Equatable, Sendable { case noTab, emptyPane, normal, developer }@@ -39,7 +44,7 @@ public struct ToolbarComposition: Equatable, Sendable {/// `hovered`: the pointer is over this bar, which reveals an unfocused pane's controls.public init(kind: Kind, inSplit: Bool, sidebarVisible: Bool, focusedPane: Bool, hovered: Bool = false, canGoBack: Bool,- canGoForward: Bool, isLoading: Bool, pinnedExtensions: [String], hasExtensions: Bool) {+ canGoForward: Bool, isLoading: Bool, pinnedExtensions: [String]) {// Arc's essential controls only: a split pane that neither has the focus nor the pointer.let essentialOnly = inSplit && !focusedPane && !hovered// Never in a split pane or an empty one.@@ -59,7 +64,7 @@ public struct ToolbarComposition: Equatable, Sendable {// split); also on the no-tab bar.if !essentialOnly, kind != .emptyPane {right += pinnedExtensions.map(Item.pinnedExtension)- if hasExtensions { right.append(.extensions) }+ right.append(.extensions)if !inSplit { right.append(.addSplit) }}if inSplit {@@ -68,4 +73,12 @@ public struct ToolbarComposition: Equatable, Sendable {right.append(.closePane)}}++ /// The sidebar's URL field while the toolbar is hidden, shown on hover over the header: the+ /// pinned extensions while they leave the address its room (else they go in the grid over the+ /// favorites), Copy Link, then the Site Control Center's sliders (Arc 1.171, GitHub #226).+ public static func urlFieldAccessories(pinnedExtensions: [String], fieldWidth: CGFloat) -> [Item] {+ let pins = PinnedExtensionGrid.fitsInURLField(count: pinnedExtensions.count, fieldWidth: fieldWidth) ? pinnedExtensions : []+ return pins.map(Item.pinnedExtension) + [.copyURL, .extensions]+ }}diff --git a/Packages/CraCore/Tests/CraCoreTests/ToolbarCompositionTests.swift b/Packages/CraCore/Tests/CraCoreTests/ToolbarCompositionTests.swiftindex f93578d..fb9fda2 100644--- a/Packages/CraCore/Tests/CraCoreTests/ToolbarCompositionTests.swift+++ b/Packages/CraCore/Tests/CraCoreTests/ToolbarCompositionTests.swift@@ -6,23 +6,37 @@ struct ToolbarCompositionTests {typealias T = ToolbarCompositionprivate func bar(_ kind: T.Kind, split: Bool = false, sidebar: Bool = false, focused: Bool = true, hovered: Bool = false,- back: Bool = false, forward: Bool = false, loading: Bool = false, pinned: [String] = [],- extensions: Bool = false) -> T {+ back: Bool = false, forward: Bool = false, loading: Bool = false, pinned: [String] = []) -> T {T(kind: kind, inSplit: split, sidebarVisible: sidebar, focusedPane: focused, hovered: hovered, canGoBack: back,- canGoForward: forward, isLoading: loading, pinnedExtensions: pinned, hasExtensions: extensions)+ canGoForward: forward, isLoading: loading, pinnedExtensions: pinned)}/// The full bar with the sidebar hidden: the toggle first, then ← → ↻ (#50).@Test(.bug("https://github.com/VictorKildahl/cra/issues/50"))func theFullBar() {- let full = bar(.normal, back: true, loading: true, pinned: ["a", "b"], extensions: true)+ let full = bar(.normal, back: true, loading: true, pinned: ["a", "b"])// Toggle, ← → and ↻ (an ✕ while loading); pinned extensions, Extensions, Split View.#expect(full.left == [.toggleSidebar, .back(enabled: true), .forward(enabled: false), .reload(loading: true, enabled: true)])#expect(full.right == [.pinnedExtension("a"), .pinnedExtension("b"), .extensions, .addSplit])}- @Test func noExtensionsButtonWithoutExtensions() {- #expect(bar(.normal).right == [.addSplit])+ /// With no extension installed the sliders still open the Site Control Center (Share, Boost,+ /// Capture, the site's settings), as in Arc (#226).+ @Test(.bug("https://github.com/VictorKildahl/cra/issues/226"))+ func theSlidersShowWithoutExtensions() {+ #expect(bar(.normal).right == [.extensions, .addSplit])+ #expect(bar(.normal, split: true).right == [.extensions, .splitOptions, .closePane])+ }++ /// The sidebar's URL field (toolbar hidden): pins while they fit, Copy Link, then the sliders,+ /// with or without extensions (#226).+ @Test(.bug("https://github.com/VictorKildahl/cra/issues/226"))+ func theURLFieldHasTheSlidersWithoutExtensions() {+ #expect(T.urlFieldAccessories(pinnedExtensions: [], fieldWidth: 224) == [.copyURL, .extensions])+ #expect(T.urlFieldAccessories(pinnedExtensions: ["a", "b"], fieldWidth: 224)+ == [.pinnedExtension("a"), .pinnedExtension("b"), .copyURL, .extensions])+ // Too many to leave the address its room: they go in the grid over the favorites.+ #expect(T.urlFieldAccessories(pinnedExtensions: ["a", "b", "c", "d", "e"], fieldWidth: 224) == [.copyURL, .extensions])}/// With the sidebar shown its header carries the toggle and the bar has none (#50).@@ -36,36 +50,36 @@ struct ToolbarCompositionTests {@Test(.bug("https://github.com/VictorKildahl/cra/issues/178")) func theFocusedPaneHasEverythingButTheToggleAndSplitView() {// Arc 1.171 (#178): ← → ↻ · address · pinned extensions · Extensions · options · close.- let pane = bar(.normal, split: true, back: true, loading: true, pinned: ["a"], extensions: true)+ let pane = bar(.normal, split: true, back: true, loading: true, pinned: ["a"])#expect(pane.left == [.back(enabled: true), .forward(enabled: false), .reload(loading: true, enabled: true)])#expect(pane.right == [.pinnedExtension("a"), .extensions, .splitOptions, .closePane])}@Test(.bug("https://github.com/VictorKildahl/cra/issues/178")) func anUnfocusedPaneShowsOnlyTheEssentials() {// Arc's onlyShowEssentialControls: ← →, the address and close.- let pane = bar(.normal, split: true, focused: false, back: true, pinned: ["a"], extensions: true)+ let pane = bar(.normal, split: true, focused: false, back: true, pinned: ["a"])#expect(pane.left == [.back(enabled: true), .forward(enabled: false)])#expect(pane.right == [.closePane])}@Test(.bug("https://github.com/VictorKildahl/cra/issues/178")) func hoveringAnUnfocusedPaneRevealsItsControls() {// Arc's onHover blueprint: the focused pane's set, so a click that focuses it moves nothing.- let pane = bar(.normal, split: true, focused: false, hovered: true, pinned: ["a"], extensions: true)+ let pane = bar(.normal, split: true, focused: false, hovered: true, pinned: ["a"])#expect(pane.left == [.back(enabled: false), .forward(enabled: false), .reload(loading: false, enabled: true)])#expect(pane.right == [.pinnedExtension("a"), .extensions, .splitOptions, .closePane])- #expect(pane == bar(.normal, split: true, pinned: ["a"], extensions: true))+ #expect(pane == bar(.normal, split: true, pinned: ["a"]))}@Test(.bug("https://github.com/VictorKildahl/cra/issues/178")) func hoverChangesNothingOutsideASplit() {- let a = bar(.normal, pinned: ["a"], extensions: true)- #expect(bar(.normal, hovered: true, pinned: ["a"], extensions: true) == a)- #expect(bar(.normal, focused: false, pinned: ["a"], extensions: true) == a)+ let a = bar(.normal, pinned: ["a"])+ #expect(bar(.normal, hovered: true, pinned: ["a"]) == a)+ #expect(bar(.normal, focused: false, pinned: ["a"]) == a)}@Test(.bug("https://github.com/VictorKildahl/cra/issues/178")) func anEmptyPaneHasGreyedNavigationAndClose() {for focused in [true, false] {for hovered in [true, false] {- let pane = bar(.emptyPane, split: true, focused: focused, hovered: hovered, pinned: ["a"], extensions: true)+ let pane = bar(.emptyPane, split: true, focused: focused, hovered: hovered, pinned: ["a"])#expect(pane.left == [.back(enabled: false), .forward(enabled: false)])#expect(pane.right == [.closePane])}@@ -73,7 +87,7 @@ struct ToolbarCompositionTests {}@Test func noTabGreysTheNavigation() {- let noTab = bar(.noTab, pinned: ["a"], extensions: true)+ let noTab = bar(.noTab, pinned: ["a"])#expect(noTab.left == [.toggleSidebar, .back(enabled: false), .forward(enabled: false), .reload(loading: false, enabled: false)])#expect(noTab.right == [.pinnedExtension("a"), .extensions, .addSplit])}@@ -84,6 +98,6 @@ struct ToolbarCompositionTests {// Copy · divider · Console, Network, Inspect before the right end (Arc 1.170, #88).let dev = bar(.developer, pinned: ["a"])#expect(dev.left == [.toggleSidebar])- #expect(dev.right == [.copyURL, .divider, .console, .network, .inspect, .pinnedExtension("a"), .addSplit])+ #expect(dev.right == [.copyURL, .divider, .console, .network, .inspect, .pinnedExtension("a"), .extensions, .addSplit])}}diff --git a/Sources/Cra/App/AppDelegate.swift b/Sources/Cra/App/AppDelegate.swiftindex b5458c6..e8bccf7 100644--- a/Sources/Cra/App/AppDelegate.swift+++ b/Sources/Cra/App/AppDelegate.swift@@ -877,6 +877,9 @@ final class AppDelegate: NSObject, NSApplicationDelegate, NSMenuItemValidation {return}if dict["siteControls"] != nil { main.debugSiteControls(); return }+ // The sidebar's URL field (toolbar hidden): hovered, and a press on one of its buttons (#226).+ if let v = dict["urlFieldHover"] { main.debugURLFieldHover(v == "1"); return }+ if let name = dict["urlFieldPress"] { main.debugURLFieldPress(name); return }// The n-th space icon's tip, without a pointer.if let n = dict["spaceTip"].flatMap({ Int($0) }), let content = main.window?.contentView {ArcTooltipController.shared.debugShowSpaceTip(n, in: content)diff --git a/Sources/Cra/UI/PaneToolbarView.swift b/Sources/Cra/UI/PaneToolbarView.swiftindex ee3cf9d..298c8dd 100644--- a/Sources/Cra/UI/PaneToolbarView.swift+++ b/Sources/Cra/UI/PaneToolbarView.swift@@ -32,7 +32,6 @@ final class PaneToolbarView: NSView {var path = ""var sidebarVisible = truevar pinned: [Ext] = []- var hasExtensions = false/// A WebKit page's service: its extension buttons dim (none run there).var protectedMedia: String?var fill = NSColor.clear@@ -176,7 +175,6 @@ final class PaneToolbarView: NSView {let profile = item.map { store.profileDirectoryName(item: $0.id) }?? store.profileDirectoryName(space: store.focusedSpaceID(window: ui.windowID))let entries = extensions.entries(inProfile: profile)- m.hasExtensions = !entries.isEmptym.pinned = extensions.pinnedIDs(inProfile: profile).compactMap { id inentries.first { $0.extensionID == id }.map {Model.Ext(id: id, name: $0.name, icon: extensions.toolbarIcon(for: $0, profile: profile, tab: m.tabID),@@ -272,7 +270,7 @@ final class PaneToolbarView: NSView {hairline.layer?.backgroundColor = m.hairline?.cgColorlet bar = ToolbarComposition(kind: m.kind, inSplit: m.inSplit, sidebarVisible: m.sidebarVisible, focusedPane: m.focusedPane,hovered: m.hovered, canGoBack: m.canGoBack, canGoForward: m.canGoForward, isLoading: m.isLoading,- pinnedExtensions: m.pinned.map(\.id), hasExtensions: m.hasExtensions)+ pinnedExtensions: m.pinned.map(\.id))// The no-tab bar and an empty pane show navigation that does nothing (Arc greys it out).let wide = m.kind == .noTab || m.kind == .emptyPanefunc view(_ item: ToolbarComposition.Item) -> NSView {diff --git a/Sources/Cra/UI/Sidebar/List/SidebarView.swift b/Sources/Cra/UI/Sidebar/List/SidebarView.swiftindex f538a3f..75c0a0b 100644--- a/Sources/Cra/UI/Sidebar/List/SidebarView.swift+++ b/Sources/Cra/UI/Sidebar/List/SidebarView.swift@@ -14,6 +14,10 @@ final class SidebarView: NSView {/// The URL field's sliders button (screen rect), nil while the toolbar has it.var siteControlsButtonFrameOnScreen: NSRect? { topBar.siteControlsButtonFrameOnScreen }+ /// Scenario hooks (#226): the URL field as if the pointer were over the header, and a press on+ /// one of its buttons. nil while the toolbar has the address.+ func debugURLFieldHover(_ on: Bool) -> [ToolbarComposition.Item]? { topBar.debugURLFieldHover(on) }+ func debugURLFieldPress(_ item: ToolbarComposition.Item) -> Bool { topBar.debugURLFieldPress(item) }private let pager: SpacePagerViewprivate let trayHost: DownloadsTrayViewprivate let player: NowPlayingTrayView@@ -315,6 +319,14 @@ final class SidebarTopBarView: NSView {return NSRect(x: f.maxX - 5 - 28, y: f.minY + (f.height - 28) / 2, width: 28, height: 28)}private var hoverHeader = false { didSet { if hoverHeader != oldValue { pill.showAccessories = hoverHeader } } }++ func debugURLFieldHover(_ on: Bool) -> [ToolbarComposition.Item]? {+ hoverHeader = on+ layoutSubtreeIfNeeded()+ return pill.isHidden ? nil : pill.shownItems+ }++ func debugURLFieldPress(_ item: ToolbarComposition.Item) -> Bool { !pill.isHidden && pill.debugPress(item) }private var syncQueued = falsevar preferredHeight: CGFloat { CraMetrics.titleAreaHeight + (compact ? 2 + 36 + 8 : 0) }@@ -419,7 +431,7 @@ final class SidebarTopBarView: NSView {}}pill.show(text: text, url: url, hasTab: tab != nil, colors: colors, active: active,- pinned: pinned, hasExtensions: !entries.isEmpty, protectedMedia: tab.flatMap { ui.navState(for: $0.id).protectedMedia })+ pinned: pinned, protectedMedia: tab.flatMap { ui.navState(for: $0.id).protectedMedia })}needsLayout = trueif wasCompact != compact { superview?.superview?.needsLayout = true }@@ -525,10 +537,12 @@ final class SidebarURLPill: NSView {private let label = NSTextField.sidebarLabel(size: 13)private let tip: ArcTooltipAnchorViewprivate var accessories: [NSView] = []+ /// What each of `accessories` is, in order.+ private(set) var shownItems: [ToolbarComposition.Item] = []private var hovering = false { didSet { if hovering != oldValue { refreshFill() } } }private var colors = SidebarColors()private var hasTab = false- private var model: (pinned: [(String, String, NSImage?)], hasExtensions: Bool, active: Bool)?+ private var model: (pinned: [(String, String, NSImage?)], active: Bool)?override init(frame: NSRect) {tip = ArcTooltipAnchorView(frame: .zero)@@ -549,14 +563,14 @@ final class SidebarURLPill: NSView {override var mouseDownCanMoveWindow: Bool { false }func show(text: String, url: String, hasTab: Bool, colors: SidebarColors, active: Bool,- pinned: [(String, String, NSImage?)], hasExtensions: Bool, protectedMedia: String? = nil) {+ pinned: [(String, String, NSImage?)], protectedMedia: String? = nil) {self.protectedMedia = protectedMediaself.colors = colorsself.hasTab = hasTabtip.text = urllabel.stringValue = textlabel.textColor = hasTab ? colors.textPrimary : colors.textTertiary- model = (pinned, hasExtensions, active)+ model = (pinned, active)refreshAccessories(animated: false)refreshFill()needsLayout = true@@ -571,29 +585,38 @@ final class SidebarURLPill: NSView {/// A WebKit page's service: the pins dim and say why (docs/protected-media.md).private var protectedMedia: String?- /// Arc's URL-bar accessories: pinned extensions (while they leave the address room), Copy- /// Link, then the site controls.+ /// Arc's URL-bar accessories (ToolbarComposition.urlFieldAccessories): pinned extensions+ /// (while they leave the address room), Copy Link, then the Site Control Center's sliders,+ /// which show with no extension installed too (#226).private func refreshAccessories(animated: Bool) {accessories.forEach { $0.removeFromSuperview() }accessories = []+ shownItems = []guard showAccessories, hasTab, let m = model, let actions else { needsLayout = true; return }pinsInField = PinnedExtensionGrid.fitsInURLField(count: m.pinned.count, fieldWidth: bounds.width)- for (id, _, icon) in pinsInField ? m.pinned : [] {- let b = ToolbarGlyphButton()- // Arc's pinned extension buttons have no tooltip (#106), unless they can't run here.- b.configure(symbol: nil, image: icon, help: protectedMedia.map(ExtensionStore.offOnProtectedMedia) ?? "",- enabled: protectedMedia == nil, width: 28, iconSize: 16, tint: colors.textSecondary)- b.action = { actions.runExtension(id) }- b.menuProvider = { ExtensionStore.shared.entries.first { $0.extensionID == id }.map(ExtensionsMenu.iconMenu) }- accessories.append(b)- }- let copy = SidebarGlyphButton(symbol: "link", size: 28, height: 28, iconSize: 14, weight: .regular, help: "Copy URL (⇧⌘C)", colors: colors) { actions.performAction("copyURL") }- copy.active = m.active- accessories.append(copy)- if m.hasExtensions {- let e = SidebarGlyphButton(symbol: "slider.horizontal.2.square", size: 28, height: 28, iconSize: 15, weight: .regular, help: "Extensions", colors: colors) { actions.showExtensionsMenu() }- e.active = m.active- accessories.append(e)+ let icons = Dictionary(m.pinned.map { ($0.0, $0.2) }, uniquingKeysWith: { a, _ in a })+ for item in ToolbarComposition.urlFieldAccessories(pinnedExtensions: m.pinned.map(\.0), fieldWidth: bounds.width) {+ switch item {+ case .pinnedExtension(let id):+ let b = ToolbarGlyphButton()+ // Arc's pinned extension buttons have no tooltip (#106), unless they can't run here.+ b.configure(symbol: nil, image: icons[id] ?? nil, help: protectedMedia.map(ExtensionStore.offOnProtectedMedia) ?? "",+ enabled: protectedMedia == nil, width: 28, iconSize: 16, tint: colors.textSecondary)+ b.action = { actions.runExtension(id) }+ b.menuProvider = { ExtensionStore.shared.entries.first { $0.extensionID == id }.map(ExtensionsMenu.iconMenu) }+ accessories.append(b)+ case .copyURL:+ let copy = SidebarGlyphButton(symbol: "link", size: 28, height: 28, iconSize: 14, weight: .regular, help: "Copy URL (⇧⌘C)", colors: colors) { actions.performAction("copyURL") }+ copy.active = m.active+ accessories.append(copy)+ case .extensions:+ let e = SidebarGlyphButton(symbol: "slider.horizontal.2.square", size: 28, height: 28, iconSize: 15, weight: .regular, help: "Extensions", colors: colors) { actions.showExtensionsMenu() }+ e.active = m.active+ accessories.append(e)+ default:+ continue+ }+ shownItems.append(item)}for v in accessories {addSubview(v)@@ -639,6 +662,17 @@ final class SidebarURLPill: NSView {guard bounds.contains(convert(event.locationInWindow, from: nil)) else { return }actions?.openCommandBar(hasTab ? .editURL : .newTab)}++ /// Runs the shown button's own action, as a click on it would (scenario hook, #226).+ func debugPress(_ item: ToolbarComposition.Item) -> Bool {+ guard let i = shownItems.firstIndex(of: item) else { return false }+ switch accessories[i] {+ case let b as SidebarGlyphButton: b.action()+ case let b as ToolbarGlyphButton: b.action()+ default: return false+ }+ return true+ }}// MARK: - Dockdiff --git a/Sources/Cra/UI/Windows/MainWindowController.swift b/Sources/Cra/UI/Windows/MainWindowController.swiftindex 853c95c..7790f31 100644--- a/Sources/Cra/UI/Windows/MainWindowController.swift+++ b/Sources/Cra/UI/Windows/MainWindowController.swift@@ -2613,6 +2613,32 @@ final class MainWindowController: NSWindowController, NSWindowDelegate, BrowserMfunc debugSiteControlsShown() -> Bool { siteControlCenter.isShown}+ /// Scenario hooks (#226): the sidebar's URL field hovered, its buttons logged as+ /// "url field: copyURL extensions" ("url field: none" while the toolbar has the address).+ func debugURLFieldHover(_ on: Bool) {+ let items = (shell.sidebarHost as? SidebarView)?.debugURLFieldHover(on)+ CraLog.note("url field: " + (items.map { $0.map(Self.debugName).joined(separator: " ") } ?? "none"))+ }++ /// A press on the URL field's button by name ("siteControls", "copyURL"), then whether the+ /// Site Control Center is open once it had time to (it waits up to 0.3 s on the page).+ func debugURLFieldPress(_ name: String) {+ let item: ToolbarComposition.Item = name == "copyURL" ? .copyURL : .extensions+ let pressed = (shell.sidebarHost as? SidebarView)?.debugURLFieldPress(item) == true+ DispatchQueue.main.asyncAfter(deadline: .now() + 0.6) { [weak self] in+ CraLog.note("url field press \(name): pressed \(pressed), site control center \(self?.siteControlCenter.isShown == true ? "shown" : "not shown")")+ }+ }++ private static func debugName(_ item: ToolbarComposition.Item) -> String {+ switch item {+ case .pinnedExtension(let id): return "pin:" + id+ case .copyURL: return "copyURL"+ case .extensions: return "siteControls"+ default: return String(describing: item)+ }+ }+private func openTab(_ url: String) {store.createTab(url: url, select: true, window: windowID)showWindow(nil)diff --git a/Tests/Scenarios/site-controls-no-extensions.scenario b/Tests/Scenarios/site-controls-no-extensions.scenarionew file mode 100644index 0000000..fc792e4--- /dev/null+++ b/Tests/Scenarios/site-controls-no-extensions.scenario@@ -0,0 +1,22 @@+# No extension installed and the toolbar hidden (Cra's default): hovering the sidebar's header+# shows Copy Link and the Site Control Center's sliders in the URL field, and a press on the+# sliders opens the Site Control Center (Share, Boost, Capture, settings), as in Arc. Until+# 0.1.33 the sliders showed only with an extension installed, so there was no way in (#226).+# Then View > Show Toolbar: the toolbar carries the sliders without extensions too.+# promise: #226+budget rss=600 stalls50=6+cra://debug?windowSize=1280x800+cra://open?url=${PAGE}?n=sitecontrols+wait 3+cra://debug?urlFieldHover=1+expect-log url field: copyURL siteControls$+cra://debug?urlFieldPress=siteControls+wait 1+expect-log url field press siteControls: pressed true, site control center shown+cra://debug?urlFieldHover=0+cra://action/toggleToolbar+wait 1+cra://debug?urlFieldHover=1+expect-log url field: none+cra://action/toggleToolbar+wait 1diff --git a/Tests/promises.lock b/Tests/promises.lockindex 931c69a..290b2d7 100644--- a/Tests/promises.lock+++ b/Tests/promises.lock@@ -43,7 +43,7 @@#49 Packages/CraCore/Tests/CraCoreTests/TabSearchScopeTests.swift::nothingTypedListsByRecency 535e122471df#49 Packages/CraCore/Tests/CraCoreTests/TabSearchScopeTests.swift::percentAloneOffersTheScope dce33dc44297#49 Packages/CraCore/Tests/CraCoreTests/TabSearchScopeTests.swift::typedRanksByMatchThenRecency baeabb72626c-#50 Packages/CraCore/Tests/CraCoreTests/ToolbarCompositionTests.swift::theFullBar 53b4dec5d2fb+#50 Packages/CraCore/Tests/CraCoreTests/ToolbarCompositionTests.swift::theFullBar 6b2a5984c98c#50 Packages/CraCore/Tests/CraCoreTests/ToolbarCompositionTests.swift::theShownSidebarCarriesTheToggle 083c181ed9ac#50 Tests/CommandBarGlyphTests.swift::leadingGlyph 3e90bfdbd048#50 Tests/Scenarios/toolbar-chrome.scenario 1fa8505c4e49@@ -82,7 +82,7 @@#88 Packages/CraCore/Tests/CraCoreTests/DismissingClickTests.swift::theNextClickOpens 9cf0eeb51035#88 Packages/CraCore/Tests/CraCoreTests/SidebarModelTests.swift::sidebarSubtitle 879c6c151d6d#88 Packages/CraCore/Tests/CraCoreTests/SidebarModelTests.swift::toolbarShowsTheHostOnlyUnlessAsked f6ce32167e2f-#88 Packages/CraCore/Tests/CraCoreTests/ToolbarCompositionTests.swift::theDeveloperBar 74ae28676b62+#88 Packages/CraCore/Tests/CraCoreTests/ToolbarCompositionTests.swift::theDeveloperBar 97f0c8752c57#88 Tests/PolicyTests.swift::devToolsToggle 5786fe494c6e#88 Tests/Scenarios/toolbar-chrome.scenario 1fa8505c4e49#90 Packages/CraCore/Tests/CraCoreTests/ConnectionSecurityTests.swift::aCertificateErrorIsNotSecure f7e423ddd42a@@ -271,11 +271,11 @@#176 Packages/CraCore/Tests/CraCoreTests/FavoritesLayoutTests.swift::slotUnderThePointer bb151154628a#176 Packages/CraCore/Tests/CraCoreTests/FavoritesLayoutTests.swift::tilesMoveAlongPastTheOpenSlot e3dab87749f3#178 Packages/CraCore/Tests/CraCoreTests/ShippedWindowsTests.swift::anAutoSpaceRingsTheFocusedPaneInOneColour 8b1715afe8fe-#178 Packages/CraCore/Tests/CraCoreTests/ToolbarCompositionTests.swift::anEmptyPaneHasGreyedNavigationAndClose 930d3981aac7-#178 Packages/CraCore/Tests/CraCoreTests/ToolbarCompositionTests.swift::anUnfocusedPaneShowsOnlyTheEssentials e9c33c42d93c-#178 Packages/CraCore/Tests/CraCoreTests/ToolbarCompositionTests.swift::hoverChangesNothingOutsideASplit e27252b048eb-#178 Packages/CraCore/Tests/CraCoreTests/ToolbarCompositionTests.swift::hoveringAnUnfocusedPaneRevealsItsControls 20813c06cf54-#178 Packages/CraCore/Tests/CraCoreTests/ToolbarCompositionTests.swift::theFocusedPaneHasEverythingButTheToggleAndSplitView 7084f9f48a51+#178 Packages/CraCore/Tests/CraCoreTests/ToolbarCompositionTests.swift::anEmptyPaneHasGreyedNavigationAndClose a4a18af791fa+#178 Packages/CraCore/Tests/CraCoreTests/ToolbarCompositionTests.swift::anUnfocusedPaneShowsOnlyTheEssentials 3385f4080393+#178 Packages/CraCore/Tests/CraCoreTests/ToolbarCompositionTests.swift::hoverChangesNothingOutsideASplit 57223bed474f+#178 Packages/CraCore/Tests/CraCoreTests/ToolbarCompositionTests.swift::hoveringAnUnfocusedPaneRevealsItsControls fc9e5d65b314+#178 Packages/CraCore/Tests/CraCoreTests/ToolbarCompositionTests.swift::theFocusedPaneHasEverythingButTheToggleAndSplitView fcfbb7d66933#178 Packages/CraCore/Tests/CraCoreTests/ToolbarExtensionFitTests.swift::aShortAddressNeverCostsTheSliders 0707b2c34d24#178 Packages/CraCore/Tests/CraCoreTests/ToolbarExtensionFitTests.swift::everythingStaysWhileTheAddressFits 26ae324e1a1c#178 Packages/CraCore/Tests/CraCoreTests/ToolbarExtensionFitTests.swift::missingButtonsAreNotHidden 707555c4dc46@@ -351,4 +351,7 @@#220 Tests/Scenarios/blank-window.scenario cac94fd094a6#220 Tests/StoreTests.swift::blankWindowWithoutItsWindow 0de383e3d544#220 Tests/StoreTests.swift::blankWindows 2703cb42812a+#226 Packages/CraCore/Tests/CraCoreTests/ToolbarCompositionTests.swift::theSlidersShowWithoutExtensions e4ea26d65d01+#226 Packages/CraCore/Tests/CraCoreTests/ToolbarCompositionTests.swift::theURLFieldHasTheSlidersWithoutExtensions a7173c578717+#226 Tests/Scenarios/site-controls-no-extensions.scenario c1c5b5365539#227 Tests/Scenarios/quit-during-web-store-install.scenario a3e3b0c8eb2b