Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion TablePro/Views/AIChat/AIChatPanelView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -405,11 +405,11 @@ struct AIChatPanelView: View {
.font(.caption)
.foregroundStyle(.secondary)
.frame(maxWidth: .infinity, alignment: .leading)
.accessibilityLabel(String(localized: "Choose AI provider and model"))
}
.menuStyle(.button)
.buttonStyle(.borderless)
.help(String(localized: "Choose AI provider and model"))
.accessibilityLabel(String(localized: "Choose AI provider and model"))
}
}

Expand Down
2 changes: 1 addition & 1 deletion TablePro/Views/Export/ExportDialog.swift
Original file line number Diff line number Diff line change
Expand Up @@ -323,12 +323,12 @@ struct ExportDialog: View {
}
} label: {
Image(systemName: "bookmark")
.accessibilityLabel(String(localized: "Saved selections"))
}
.menuStyle(.button)
.buttonStyle(.borderless)
.fixedSize()
.help(String(localized: "Saved selections"))
.accessibilityLabel(String(localized: "Saved selections"))
.popover(isPresented: $isNamingProfile, arrowEdge: .bottom) {
VStack(alignment: .leading, spacing: 10) {
Text("Name this selection")
Expand Down
1 change: 1 addition & 0 deletions TablePro/Views/Results/ForeignKeyPickerView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@ struct ForeignKeyPickerView: View {
row(for: entry)
.contentShape(Rectangle())
.onTapGesture { commit(entry) }
.accessibilityElement(children: .contain)
.accessibilityAddTraits(.isButton)
.accessibilityAction { commit(entry) }
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,13 +96,13 @@ struct JSONRowInspectorView: View {
.foregroundStyle(.secondary)
.frame(width: 22, height: 20)
.contentShape(Rectangle())
.accessibilityLabel(String(localized: "JSON view options"))
}
.menuStyle(.button)
.buttonStyle(.borderless)
.menuIndicator(.hidden)
.fixedSize()
.help(String(localized: "JSON view options"))
.accessibilityLabel(String(localized: "JSON view options"))
}

// MARK: - Tree
Expand Down
2 changes: 1 addition & 1 deletion TablePro/Views/UsersRoles/PrivilegeChecklistView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -66,14 +66,14 @@ struct PrivilegeChecklistView: View {
Button(String(localized: "Revoke All")) { setAll(false) }
} label: {
Image(systemName: "ellipsis.circle")
.accessibilityLabel(String(localized: "Bulk actions"))
}
.menuStyle(.button)
.buttonStyle(.borderless)
.menuIndicator(.hidden)
.fixedSize()
.disabled(viewModel.privilegeSections.isEmpty)
.help(String(localized: "Bulk actions"))
.accessibilityLabel(String(localized: "Bulk actions"))
}

// MARK: - Content
Expand Down
12 changes: 6 additions & 6 deletions TableProUITests/QueryRunUITests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -256,17 +256,17 @@ final class QueryRunUITests: UITestCase {
typeQuery("COMMIT; SELECT * FROM run_all_kept_probe;", in: app)
openRunMenu(in: app).menuItems["Run All Statements"].click()

/// The failed batch leaves its banner up and "Result 3 of 3" in the chooser until this one
/// lands, so only two results with no banner over them say the commit and the read both ran.
let chooser = window.descendants(matching: .any)
.matching(identifier: "result-set-menu")
.firstMatch
XCTAssertTrue(
waitForPredicate(timeout: 30) { chooser.title.contains("2") || banner.exists },
"The commit and the read must both run: got \(chooser.title) \(bannerText(banner))"
)
XCTAssertFalse(
banner.exists,
waitForPredicate(timeout: 30) {
!banner.exists && chooser.exists && chooser.title.contains("2")
},
"The transaction must still be open to commit, and its table must have survived the failure: "
+ "got \(bannerText(banner))"
+ "got \(chooser.exists ? chooser.title : "") \(bannerText(banner))"
)
}

Expand Down
Loading