Merge branch 'main' into fix/terminal-deleting-wrong-tab

Author: thecoolwinter

CodeEdit.xcodeproj/project.pbxproj

@@ -59,5 +59,7 @@ struct ActivityViewer: View {
                     .opacity(0.1)
             }
         }
+        .accessibilityElement(children: .contain)
+        .accessibilityLabel("Activity Viewer")
     }
 }

CodeEdit/Features/ActivityViewer/ActivityViewer.swift

@@ -50,6 +50,11 @@ struct CECircularProgressView: View {
                         .font(.caption)
                 }
             }
+            .accessibilityElement()
+            .accessibilityAddTraits(.updatesFrequently)
+            .accessibilityValue(
+                progress != nil ? Text(progress!, format: .percent) : Text("working")
+            )
     }
 }
 

CodeEdit/Features/ActivityViewer/Notifications/CECircularProgressView.swift

@@ -51,7 +51,8 @@ struct TaskNotificationView: View {
                 .padding(.trailing, 3)
                 .popover(isPresented: $isPresented, arrowEdge: .bottom) {
                     TaskNotificationsDetailView(taskNotificationHandler: taskNotificationHandler)
-                }.onTapGesture {
+                }
+                .onTapGesture {
                     self.isPresented.toggle()
                 }
             }

CodeEdit/Features/ActivityViewer/Notifications/TaskNotificationView.swift

@@ -10,6 +10,7 @@ import SwiftUI
 struct OptionMenuItemView: View {
     var label: String
     var action: () -> Void
+
     var body: some View {
         HStack {
             Text(label)
@@ -22,6 +23,11 @@ struct OptionMenuItemView: View {
         .onTapGesture {
             action()
         }
+        .accessibilityElement()
+        .accessibilityAction {
+            action()
+        }
+        .accessibilityLabel(label)
     }
 }
 

CodeEdit/Features/ActivityViewer/Tasks/OptionMenuItemView.swift

@@ -21,15 +21,18 @@ struct SchemeDropDownView: View {
         workspaceSettingsManager.settings.project.projectName
     }
 
+    /// Resolves the name one step further than `workspaceName`.
+    var workspaceDisplayName: String {
+        workspaceName.isEmpty
+        ? (workspaceFileManager?.workspaceItem.fileName() ?? "No Project found")
+        : workspaceName
+    }
+
     var body: some View {
         HStack(spacing: 6) {
             Image(systemName: "folder.badge.gearshape")
                 .imageScale(.medium)
-            Text(
-                workspaceName.isEmpty
-                ? (workspaceFileManager?.workspaceItem.fileName() ?? "No Project found")
-                : workspaceName
-            )
+            Text(workspaceDisplayName)
         }
         .font(.subheadline)
         .padding(.trailing, 11.5)
@@ -54,31 +57,19 @@ struct SchemeDropDownView: View {
             self.isHoveringScheme = hovering
         })
         .instantPopover(isPresented: $isSchemePopOverPresented, arrowEdge: .bottom) {
-            VStack(alignment: .leading, spacing: 0) {
-                WorkspaceMenuItemView(
-                    workspaceFileManager: workspaceFileManager,
-                    item: workspaceFileManager?.workspaceItem
-                )
-                Divider()
-                    .padding(.vertical, 5)
-                Group {
-                    OptionMenuItemView(label: "Add Folder...") {
-                        // TODO: Implment Add Folder
-                        print("NOT IMPLEMENTED")
-                    }
-                    OptionMenuItemView(label: "Workspace Settings...") {
-                        NSApp.sendAction(
-                            #selector(CodeEditWindowController.openWorkspaceSettings(_:)), to: nil, from: nil
-                        )
-                    }
-                }
-            }
-            .font(.subheadline)
-            .padding(5)
-            .frame(minWidth: 215)
+            popoverContent
         }
         .onTapGesture {
-            self.isSchemePopOverPresented.toggle()
+            isSchemePopOverPresented.toggle()
+        }
+        .accessibilityElement(children: .combine)
+        .accessibilityAddTraits(.isButton)
+        .accessibilityIdentifier("SchemeDropdown")
+        .accessibilityValue(workspaceDisplayName)
+        .accessibilityLabel("Active Scheme")
+        .accessibilityHint("Open the active scheme menu")
+        .accessibilityAction {
+            isSchemePopOverPresented.toggle()
         }
     }
 
@@ -97,6 +88,32 @@ struct SchemeDropDownView: View {
         .font(.system(size: 8, weight: .semibold, design: .default))
         .padding(.top, 0.5)
     }
+
+    @ViewBuilder var popoverContent: some View {
+        VStack(alignment: .leading, spacing: 0) {
+            WorkspaceMenuItemView(
+                workspaceFileManager: workspaceFileManager,
+                item: workspaceFileManager?.workspaceItem
+            )
+            Divider()
+                .padding(.vertical, 5)
+            Group {
+                OptionMenuItemView(label: "Add Folder...") {
+                    // TODO: Implment Add Folder
+                    print("NOT IMPLEMENTED")
+                }
+                .disabled(true)
+                OptionMenuItemView(label: "Workspace Settings...") {
+                    NSApp.sendAction(
+                        #selector(CodeEditWindowController.openWorkspaceSettings(_:)), to: nil, from: nil
+                    )
+                }
+            }
+        }
+        .font(.subheadline)
+        .padding(5)
+        .frame(minWidth: 215)
+    }
 }
 
 // #Preview {

CodeEdit/Features/ActivityViewer/Tasks/SchemeDropDownView.swift

@@ -38,12 +38,21 @@ struct TaskDropDownView: View {
         .onHover { hovering in
             self.isHoveringTasks = hovering
         }
-        .instantPopover(isPresented: $isTaskPopOverPresented, arrowEdge: .bottom) {
+        .instantPopover(isPresented: $isTaskPopOverPresented, arrowEdge: .top) {
             taskPopoverContent
         }
         .onTapGesture {
             self.isTaskPopOverPresented.toggle()
         }
+        .accessibilityElement(children: .combine)
+        .accessibilityAddTraits(.isButton)
+        .accessibilityIdentifier("TaskDropdown")
+        .accessibilityValue(taskManager.selectedTask?.name ?? "Create Tasks")
+        .accessibilityLabel("Active Task")
+        .accessibilityHint("Open the active task menu")
+        .accessibilityAction {
+            isTaskPopOverPresented = true
+        }
     }
 
     private var backgroundColor: some View {
@@ -71,7 +80,9 @@ struct TaskDropDownView: View {
         VStack(alignment: .leading, spacing: 0) {
             if !taskManager.availableTasks.isEmpty {
                 ForEach(taskManager.availableTasks, id: \.id) { task in
-                    TasksPopoverMenuItem(taskManager: taskManager, task: task)
+                    TasksPopoverMenuItem(taskManager: taskManager, task: task) {
+                        isTaskPopOverPresented = false
+                    }
                 }
                 Divider()
                     .padding(.vertical, 5)

CodeEdit/Features/ActivityViewer/Tasks/TaskDropDownView.swift

@@ -27,5 +27,7 @@ struct TaskView: View {
                 .frame(width: 5, height: 5)
                 .padding(.trailing, 2.5)
         }
+        .accessibilityElement()
+        .accessibilityLabel(task.name)
     }
 }

CodeEdit/Features/ActivityViewer/Tasks/TaskView.swift

@@ -7,12 +7,13 @@
 
 import SwiftUI
 
+/// - Note: This view **cannot** use the `dismiss` environment value to dismiss the sheet. It has to negate the boolean
+///         value that presented it initially.
+///         See ``SwiftUI/View/instantPopover(isPresented:arrowEdge:content:)``
 struct TasksPopoverMenuItem: View {
-    @Environment(\.dismiss)
-    private var dismiss
-
     @ObservedObject var taskManager: TaskManager
     var task: CETask
+    var dismiss: () -> Void
 
     var body: some View {
         HStack(spacing: 5) {
@@ -22,11 +23,12 @@ struct TasksPopoverMenuItem: View {
         .padding(.vertical, 4)
         .padding(.horizontal, 8)
         .modifier(DropdownMenuItemStyleModifier())
-        .onTapGesture {
-            taskManager.selectedTaskID = task.id
-            dismiss()
-        }
+        .onTapGesture(perform: selectAction)
         .clipShape(RoundedRectangle(cornerRadius: 5))
+        .accessibilityElement()
+        .accessibilityLabel(task.name)
+        .accessibilityAction(.default, selectAction)
+        .accessibilityAddTraits(taskManager.selectedTaskID == task.id ? [.isSelected] : [])
     }
 
     private var selectionIndicator: some View {
@@ -52,4 +54,9 @@ struct TasksPopoverMenuItem: View {
             }
         }
     }
+
+    private func selectAction() {
+        taskManager.selectedTaskID = task.id
+        dismiss()
+    }
 }

CodeEdit/Features/ActivityViewer/Tasks/TasksPopoverMenuItem.swift

@@ -30,8 +30,10 @@ struct WorkspaceMenuItemView: View {
         .padding(.vertical, 4)
         .padding(.horizontal, 8)
         .modifier(DropdownMenuItemStyleModifier())
-        .onTapGesture { }
+        .onTapGesture { } // add accessibility action when this is filled in
         .clipShape(RoundedRectangle(cornerRadius: 5))
+        .accessibilityElement()
+        .accessibilityLabel(item?.name ?? "")
     }
 }