native macOS codings agent orchestrator
Merge pull request #64 from supabitapp/gentle-leopard
Fix repo options Menu not receiving clicks
+39
-34
+39
-34
supacode/Features/Repositories/Views/RepositorySectionView.swift
+39
-34
supacode/Features/Repositories/Views/RepositorySectionView.swift
···
26
26
terminalManager: terminalManager
27
27
)
28
28
} header: {
29
+
let toggleExpanded = {
30
+
if expandedRepoIDs.contains(repository.id) {
31
+
expandedRepoIDs.remove(repository.id)
32
+
} else {
33
+
expandedRepoIDs.insert(repository.id)
34
+
}
35
+
}
29
36
HStack {
30
-
Button {
31
-
if expandedRepoIDs.contains(repository.id) {
32
-
expandedRepoIDs.remove(repository.id)
33
-
} else {
34
-
expandedRepoIDs.insert(repository.id)
35
-
}
36
-
} label: {
37
-
HStack {
38
-
RepoHeaderRow(
39
-
name: repository.name,
40
-
initials: repository.initials,
41
-
isExpanded: isExpanded,
42
-
isRemoving: isRemovingRepository
43
-
)
44
-
Spacer()
45
-
}
46
-
.contentShape(Rectangle())
47
-
}
48
-
.buttonStyle(.plain)
49
-
.disabled(isRemovingRepository)
50
-
.contextMenu {
51
-
Button("Repo Settings") {
52
-
openRepoSettings()
53
-
}
54
-
.help("Repo Settings ")
55
-
Button("Remove Repository") {
56
-
store.send(.requestRemoveRepository(repository.id))
57
-
}
58
-
.help("Remove repository ")
59
-
.disabled(isRemovingRepository)
60
-
}
37
+
RepoHeaderRow(
38
+
name: repository.name,
39
+
initials: repository.initials,
40
+
isExpanded: isExpanded,
41
+
isRemoving: isRemovingRepository
42
+
)
43
+
Spacer()
61
44
if isRemovingRepository {
62
45
ProgressView()
63
46
.controlSize(.small)
···
74
57
.disabled(isRemovingRepository)
75
58
} label: {
76
59
Label("Repository options", systemImage: "ellipsis")
60
+
.labelStyle(.iconOnly)
61
+
.padding(.vertical, 6)
62
+
.contentShape(Rectangle())
77
63
}
78
-
.labelStyle(.iconOnly)
79
64
.buttonStyle(.plain)
80
65
.foregroundStyle(.primary)
81
66
.help("Repository options ")
82
67
.disabled(isRemovingRepository)
83
-
Button("New Worktree", systemImage: "plus") {
68
+
Button {
84
69
store.send(.createRandomWorktreeInRepository(repository.id))
70
+
} label: {
71
+
Label("New Worktree", systemImage: "plus")
72
+
.labelStyle(.iconOnly)
73
+
.padding(.vertical, 6)
74
+
.contentShape(Rectangle())
85
75
}
86
-
.labelStyle(.iconOnly)
87
76
.buttonStyle(.plain)
88
77
.foregroundStyle(.primary)
89
78
.padding(.trailing, 6)
90
79
.help("New Worktree (\(AppShortcuts.newWorktree.display))")
80
+
.disabled(isRemovingRepository)
81
+
}
82
+
.contentShape(Rectangle())
83
+
.onTapGesture {
84
+
toggleExpanded()
85
+
}
86
+
.disabled(isRemovingRepository)
87
+
.contextMenu {
88
+
Button("Repo Settings") {
89
+
openRepoSettings()
90
+
}
91
+
.help("Repo Settings ")
92
+
Button("Remove Repository") {
93
+
store.send(.requestRemoveRepository(repository.id))
94
+
}
95
+
.help("Remove repository ")
91
96
.disabled(isRemovingRepository)
92
97
}
93
98
.padding()