Commit `52faf7192c`

52faf7192c3afff5d52a11e264a5be9a799cb585

parent: 045cba839a

Verified · cmc

cmc <hello@cleberg.net> · 2026-09-22 21:10 UTC

views: share the chip row and the label picker

Merge requests are about to carry labels too; both screens use one
copy.

Layout: unified · split

gitbay/Views/Issues/IssueView.swift +6 −37

	@@ -91,9 +91,9 @@ struct IssueView: View {
91	@ViewBuilder	91	@ViewBuilder
92	private func triageSection(_ issue: IssueDetail) -> some View {	92	private func triageSection(_ issue: IssueDetail) -> some View {
93	Section("Labels") {	93	Section("Labels") {
94	labelFlow(issue.labels ?? [], color: { model.colors.color($0) }, remove: { label in	94	RemovableChips(items: issue.labels ?? [], idPrefix: "issue-label",
95	Task { await model.removeLabel(label) }	95	disabled: model.working, color: { model.colors.color($0) },
96	})	96	remove: { label in Task { await model.removeLabel(label) } })
97	HStack {	97	HStack {
98	TextField("Add label", text: $editingLabel)	98	TextField("Add label", text: $editingLabel)
99	.autocorrectionDisabled()	99	.autocorrectionDisabled()
	@@ -109,9 +109,9 @@ struct IssueView: View {
109	}	109	}
110	}	110	}
111	Section("Assignees") {	111	Section("Assignees") {
112	labelFlow(issue.assignees ?? [], remove: { user in	112	RemovableChips(items: issue.assignees ?? [], idPrefix: "issue-assignee",
113	Task { await model.removeAssignee(user) }	113	disabled: model.working,
114	})	114	remove: { user in Task { await model.removeAssignee(user) } })
115	HStack {	115	HStack {
116	TextField("Assign user", text: $editingAssignee)	116	TextField("Assign user", text: $editingAssignee)
117	.autocorrectionDisabled()	117	.autocorrectionDisabled()
	@@ -152,37 +152,6 @@ struct IssueView: View {
152	}	152	}
153	}	153	}
154		154
155	@ViewBuilder
156	private func labelFlow(
157	_ items: [String],
158	color: @escaping (String) -> Color = { _ in .secondary },
159	remove: @escaping (String) -> Void
160	) -> some View {
161	if !items.isEmpty {
162	ScrollView(.horizontal, showsIndicators: false) {
163	HStack(spacing: 6) {
164	ForEach(items, id: \.self) { item in
165	HStack(spacing: 3) {
166	Text(item)
167	Button {
168	remove(item)
169	} label: {
170	Image(systemName: "xmark.circle.fill")
171	.foregroundStyle(.tertiary)
172	}
173	.disabled(model.working)
174	}
175	.font(.gbSans(.caption))
176	.padding(.horizontal, 8)
177	.padding(.vertical, 3)
178	.background(color(item).opacity(0.07), in: gbChipShape)
179	.overlay(gbChipShape.stroke(color(item).opacity(0.35), lineWidth: 1))
180	}
181	}
182	}
183	}
184	}
185
186	private func commentsSection(_ comments: [IssueDetail.Comment]) -> some View {	155	private func commentsSection(_ comments: [IssueDetail.Comment]) -> some View {
187	Section("Comments") {	156	Section("Comments") {
188	ForEach(comments) { comment in	157	ForEach(comments) { comment in

gitbay/Views/Shared/FilterSheet.swift +19 −6

 /// The issue and MR lists' filter sheet. A `Form` with the fields both
 /// lists share — author and milestone — plus an `extra` slot for the
-/// rows only issues have, since `mr list` takes neither `--label` nor
+/// rows each list adds: the label picker on both, and an assignee field
-/// `--assignee`.
+/// on issues only, since `mr list` takes no `--assignee`.
 struct FilterSheet<Extra: View>: View {
     let title: String
     }
 }
-/// The label and assignee rows the issue list's sheet adds through
+/// The label picker both lists' sheets add through `FilterSheet`'s
-/// `FilterSheet`'s `extra` slot.
+/// `extra` slot.
-struct IssueFilterExtra: View {
+struct LabelFilterSection: View {
     @Binding var label: String?
-    @Binding var assignee: String?
     let labels: [IssueLabel]
     let colors: LabelColors
             }
             .accessibilityIdentifier("filter-label-menu")
         }
+    }
+}
+/// The label and assignee rows the issue list's sheet adds through
+/// `FilterSheet`'s `extra` slot.
+struct IssueFilterExtra: View {
+    @Binding var label: String?
+    @Binding var assignee: String?
+    let labels: [IssueLabel]
+    let colors: LabelColors
+    var body: some View {
+        LabelFilterSection(label: $label, labels: labels, colors: colors)
         Section("Assignee") {
             TextField("Username", text: $assignee.orEmpty)
                 .autocorrectionDisabled()

gitbay/Views/Shared/RemovableChips.swift added +40

@@ -0,0 +1,40 @@
	1	import SwiftUI
	2
	3	/// A horizontal row of chips, each with a remove button: an issue's
	4	/// labels and assignees, a merge request's labels. The remove button is
	5	/// identified as `<idPrefix>-remove-<item>`.
	6	struct RemovableChips: View {
	7
	8	let items: [String]
	9	let idPrefix: String
	10	let disabled: Bool
	11	var color: (String) -> Color = { _ in .secondary }
	12	let remove: (String) -> Void
	13
	14	var body: some View {
	15	if !items.isEmpty {
	16	ScrollView(.horizontal, showsIndicators: false) {
	17	HStack(spacing: 6) {
	18	ForEach(items, id: \.self) { item in
	19	HStack(spacing: 3) {
	20	Text(item)
	21	Button {
	22	remove(item)
	23	} label: {
	24	Image(systemName: "xmark.circle.fill")
	25	.foregroundStyle(.tertiary)
	26	}
	27	.disabled(disabled)
	28	.accessibilityIdentifier("\(idPrefix)-remove-\(item)")
	29	}
	30	.font(.gbSans(.caption))
	31	.padding(.horizontal, 8)
	32	.padding(.vertical, 3)
	33	.background(color(item).opacity(0.07), in: gbChipShape)
	34	.overlay(gbChipShape.stroke(color(item).opacity(0.35), lineWidth: 1))
	35	}
	36	}
	37	}
	38	}
	39	}
	40	}

Commit 52faf7192c

Commit `52faf7192c`