Skip to content

Commit d6ce01f

Browse files
hubab1hubab1
authored andcommitted
fix(research): render project copy sheet
1 parent ae35449 commit d6ce01f

1 file changed

Lines changed: 19 additions & 14 deletions

File tree

OpenASO/Features/KeywordResearch/KeywordResearchProjectCopySheet.swift

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,23 +28,16 @@ struct KeywordResearchProjectCopySheet: View {
2828
}
2929

3030
var body: some View {
31-
NavigationSplitView {
31+
HStack(spacing: 0) {
3232
targetSidebar
33-
.navigationSplitViewColumnWidth(min: 280, ideal: 320, max: 400)
34-
} detail: {
33+
.frame(width: 320)
34+
35+
Divider()
36+
3537
detail
38+
.frame(maxWidth: .infinity, maxHeight: .infinity)
3639
}
37-
.navigationTitle("Copy Research Keywords")
38-
.frame(minWidth: 920, minHeight: 640)
39-
.toolbar {
40-
ToolbarItem(placement: .cancellationAction) {
41-
Button(model.workflowState.isComplete ? "Done" : "Cancel") {
42-
dismiss()
43-
}
44-
.keyboardShortcut(.cancelAction)
45-
.disabled(model.blocksDismissal)
46-
}
47-
}
40+
.frame(minWidth: 860, minHeight: 580)
4841
.task {
4942
guard model.targetLoadState == .idle else { return }
5043
await model.reloadTargets()
@@ -116,6 +109,18 @@ struct KeywordResearchProjectCopySheet: View {
116109
|| model.blocksDismissal
117110
|| model.workflowState.isComplete
118111
)
112+
113+
Button(
114+
model.workflowState.isComplete ? "Done" : "Cancel",
115+
systemImage: model.workflowState.isComplete ? "checkmark" : "xmark"
116+
) {
117+
dismiss()
118+
}
119+
.labelStyle(.iconOnly)
120+
.buttonStyle(.borderless)
121+
.keyboardShortcut(.cancelAction)
122+
.help(model.workflowState.isComplete ? "Done" : "Cancel")
123+
.disabled(model.blocksDismissal)
119124
}
120125
.padding(.horizontal, 14)
121126
.padding(.vertical, 12)

0 commit comments

Comments
 (0)