Improving Utility Area Terminal

Author: SoreGus

CodeEdit/Features/UtilityArea/TerminalUtility/Delegates/NewGroupDropDelegate.swift

@@ -0,0 +1,63 @@
+//
+//  NewGroupDropDelegate.swift
+//  CodeEdit
+//
+//  Created by Gustavo Soré on 30/06/25.
+//
+
+import SwiftUI
+import UniformTypeIdentifiers
+
+/// Drop delegate responsible for handling the case when a terminal is dropped
+/// outside of any existing group — i.e., it should create a new group with the dropped terminal.
+struct NewGroupDropDelegate: DropDelegate {
+    /// The view model that manages terminal groups and selection state.
+    let viewModel: UtilityAreaViewModel
+
+    /// Validates whether the drop operation includes terminal data that this delegate can handle.
+    ///
+    /// - Parameter info: The drop information provided by the system.
+    /// - Returns: `true` if the drop contains a valid terminal item type.
+    func validateDrop(info: DropInfo) -> Bool {
+        info.hasItemsConforming(to: [UTType.terminal.identifier])
+    }
+
+    /// Performs the drop by creating a new group and moving the terminal into it.
+    ///
+    /// - Parameter info: The drop information containing the dragged item.
+    /// - Returns: `true` if the drop was successfully handled.
+    func performDrop(info: DropInfo) -> Bool {
+        // Extract the first item provider that conforms to the terminal type.
+        guard let item = info.itemProviders(for: [UTType.terminal.identifier]).first else {
+            return false
+        }
+
+        // Load and decode the terminal drag information.
+        item.loadDataRepresentation(forTypeIdentifier: UTType.terminal.identifier) { data, _ in
+            guard let data = data,
+                  let dragInfo = try? JSONDecoder().decode(TerminalDragInfo.self, from: data),
+                  let terminal = viewModel.terminalGroups
+                      .flatMap({ $0.terminals })
+                      .first(where: { $0.id == dragInfo.terminalID }) else {
+                return
+            }
+
+            // Perform the group creation and terminal movement on the main thread.
+            DispatchQueue.main.async {
+                withAnimation(.easeInOut(duration: 0.2)) {
+                    // Optional logic to clean up old location (if needed).
+                    viewModel.finalizeMoveTerminal(terminal, toGroup: UUID(), before: nil)
+
+                    // Create a new group containing the dropped terminal.
+                    viewModel.createGroup(with: [terminal])
+
+                    // Reset drag-related state.
+                    viewModel.dragOverTerminalID = nil
+                    viewModel.draggedTerminalID = nil
+                }
+            }
+        }
+
+        return true
+    }
+}

CodeEdit/Features/UtilityArea/TerminalUtility/Delegates/TerminalDropDelegate.swift

@@ -0,0 +1,96 @@
+//
+//  TerminalDropDelegate.swift
+//  CodeEdit
+//
+//  Created by Gustavo Soré on 30/06/25.
+//
+
+import SwiftUI
+import UniformTypeIdentifiers
+
+/// Handles drop interactions for a terminal inside a specific group,
+/// allowing for reordering or moving between groups.
+struct TerminalDropDelegate: DropDelegate {
+    /// The ID of the group where the drop target resides.
+    let groupID: UUID
+
+    /// The shared view model managing terminal groups and selection state.
+    let viewModel: UtilityAreaViewModel
+
+    /// The ID of the terminal that is the drop destination, or `nil` if dropping at the end.
+    let destinationTerminalID: UUID?
+
+    /// Validates if the drop contains terminal data.
+    ///
+    /// - Parameter info: The current drop context.
+    /// - Returns: `true` if the item conforms to the terminal type.
+    func validateDrop(info: DropInfo) -> Bool {
+        info.hasItemsConforming(to: [UTType.terminal.identifier])
+    }
+
+    /// Called when the drop enters a new target.
+    /// Sets the drag state in the view model for UI feedback.
+    ///
+    /// - Parameter info: The drop context.
+    func dropEntered(info: DropInfo) {
+        guard let item = info.itemProviders(for: [UTType.terminal.identifier]).first else { return }
+
+        item.loadDataRepresentation(forTypeIdentifier: UTType.terminal.identifier) { data, _ in
+            guard let data = data,
+                  let dragInfo = try? JSONDecoder().decode(TerminalDragInfo.self, from: data) else { return }
+
+            DispatchQueue.main.async {
+                withAnimation {
+                    viewModel.draggedTerminalID = dragInfo.terminalID
+                    viewModel.dragOverTerminalID = destinationTerminalID
+                }
+            }
+        }
+    }
+
+    /// Called continuously as the drop is updated over the view.
+    /// Updates drag-over visual feedback.
+    ///
+    /// - Parameter info: The drop context.
+    /// - Returns: A drop proposal that defines the type of drop operation (e.g., move).
+    func dropUpdated(info: DropInfo) -> DropProposal? {
+        DispatchQueue.main.async {
+            withAnimation(.easeInOut(duration: 0.2)) {
+                viewModel.dragOverTerminalID = destinationTerminalID
+            }
+        }
+
+        return DropProposal(operation: .move)
+    }
+
+    /// Called when the drop is performed.
+    /// Decodes the dragged terminal and triggers its relocation in the model.
+    ///
+    /// - Parameter info: The drop context with the drag payload.
+    /// - Returns: `true` if the drop was handled successfully.
+    func performDrop(info: DropInfo) -> Bool {
+        guard let item = info.itemProviders(for: [UTType.terminal.identifier]).first else { return false }
+
+        item.loadDataRepresentation(forTypeIdentifier: UTType.terminal.identifier) { data, _ in
+            guard let data = data,
+                  let dragInfo = try? JSONDecoder().decode(TerminalDragInfo.self, from: data),
+                  let terminal = viewModel.terminalGroups
+                      .flatMap({ $0.terminals })
+                      .first(where: { $0.id == dragInfo.terminalID }) else { return }
+
+            DispatchQueue.main.async {
+                withAnimation(.easeInOut(duration: 0.2)) {
+                    viewModel.finalizeMoveTerminal(
+                        terminal,
+                        toGroup: groupID,
+                        before: destinationTerminalID
+                    )
+                    viewModel.dragOverTerminalID = nil
+                    viewModel.draggedTerminalID = nil
+                }
+            }
+        }
+
+        return true
+    }
+}

CodeEdit/Features/UtilityArea/TerminalUtility/UtilityAreaTerminalGroupView.swift

@@ -8,21 +8,33 @@
 import SwiftUI
 import UniformTypeIdentifiers
 
+/// A view that displays a terminal group with a header and a list of its terminals.
+/// Supports editing the group name, collapsing, drag-and-drop, and inline terminal row management.
 struct UtilityAreaTerminalGroupView: View {
+    /// The index of the group within the terminalGroups array.
     let index: Int
+
+    /// Whether this group is currently selected in the UI.
     let isGroupSelected: Bool
+
+    /// The shared view model that manages terminal groups and their state.
     @EnvironmentObject private var utilityAreaViewModel: UtilityAreaViewModel
+
+    /// Manages focus on a specific terminal row for keyboard navigation or editing.
     @FocusState private var focusedTerminalID: UUID?
 
     var body: some View {
         VStack(alignment: .leading, spacing: 0) {
-            HStack(spacing: 4) {
 
+            // MARK: - Group Header
+
+            HStack(spacing: 4) {
                 Image(systemName: "square.on.square")
                     .font(.system(size: 14, weight: .medium))
                     .frame(width: 20, height: 20)
                     .foregroundStyle(.primary.opacity(0.6))
 
+                // Editable group name when in edit mode
                 if utilityAreaViewModel.editingGroupID == utilityAreaViewModel.terminalGroups[index].id {
                     TextField("", text: Binding(
                         get: { utilityAreaViewModel.terminalGroups[index].name },
@@ -47,7 +59,12 @@ struct UtilityAreaTerminalGroupView: View {
                         utilityAreaViewModel.editingGroupID = nil
                     }
                 } else {
-                    Text(utilityAreaViewModel.terminalGroups[index].name.isEmpty ? "terminals" : utilityAreaViewModel.terminalGroups[index].name)
+                    // Display group name normally
+                    Text(
+                        utilityAreaViewModel.terminalGroups[index].name.isEmpty
+                            ? "terminals"
+                            : utilityAreaViewModel.terminalGroups[index].name
+                    )
                         .lineLimit(1)
                         .truncationMode(.middle)
                         .font(.system(size: 13, weight: .regular))
@@ -63,7 +80,12 @@ struct UtilityAreaTerminalGroupView: View {
 
                 Spacer()
 
-                Image(systemName: utilityAreaViewModel.terminalGroups[index].isCollapsed ? "chevron.right" : "chevron.down")
+                // Expand/collapse toggle
+                Image(
+                    systemName: utilityAreaViewModel.terminalGroups[index].isCollapsed
+                        ? "chevron.right"
+                        : "chevron.down"
+                )
                     .font(.system(size: 11, weight: .medium))
                     .foregroundColor(.secondary)
             }
@@ -76,8 +98,7 @@ struct UtilityAreaTerminalGroupView: View {
                 }
             }
             .onDrag {
-//                utilityAreaViewModel.draggedTerminalID = terminal.id
-
+                // Optional: dragging the entire group (stubbed terminal ID)
                 let dragInfo = TerminalDragInfo(terminalID: .init())
                 let provider = NSItemProvider()
                 do {
@@ -90,10 +111,13 @@ struct UtilityAreaTerminalGroupView: View {
                         return nil
                     }
                 } catch {
-                    print("❌ Erro ao codificar dragInfo: \(error)")
+                    print("❌ Failed to encode dragInfo: \(error)")
                 }
                 return provider
             }
+
+            // MARK: - Terminal Rows (if group is expanded)
+
             if !utilityAreaViewModel.terminalGroups[index].isCollapsed {
                 VStack(spacing: 0) {
                     ForEach(utilityAreaViewModel.terminalGroups[index].terminals, id: \.id) { terminal in
@@ -107,17 +131,15 @@ struct UtilityAreaTerminalGroupView: View {
 
                                 let dragInfo = TerminalDragInfo(terminalID: terminal.id)
                                 let provider = NSItemProvider()
-                                do {
-                                    let data = try JSONEncoder().encode(dragInfo)
-                                    provider.registerDataRepresentation(
-                                        forTypeIdentifier: UTType.terminal.identifier,
-                                        visibility: .all
-                                    ) { completion in
-                                        completion(data, nil)
-                                        return nil
-                                    }
-                                } catch {
-                                    print("❌ Erro ao codificar dragInfo: \(error)")
+                                guard let data = try? JSONEncoder().encode(dragInfo) else {
+                                    return provider
+                                }
+                                provider.registerDataRepresentation(
+                                    forTypeIdentifier: UTType.terminal.identifier,
+                                    visibility: .all
+                                ) { completion in
+                                    completion(data, nil)
+                                    return nil
                                 }
                                 return provider
                             }
@@ -130,7 +152,10 @@ struct UtilityAreaTerminalGroupView: View {
                                 )
                             )
                             .transition(.opacity.combined(with: .move(edge: .top)))
-                            .animation(.easeInOut(duration: 0.2), value: utilityAreaViewModel.terminalGroups[index].isCollapsed)
+                            .animation(
+                                .easeInOut(duration: 0.2),
+                                value: utilityAreaViewModel.terminalGroups[index].isCollapsed
+                            )
                         }
                     }
                 }
@@ -147,6 +172,9 @@ struct UtilityAreaTerminalGroupView: View {
     }
 }
 
+// MARK: - Preview
+
+/// Preview provider for `UtilityAreaTerminalGroupView`, showing a mock terminal group with two terminals.
 struct TerminalGroupViewPreviews: PreviewProvider {
     static var previews: some View {
         let terminal = UtilityAreaTerminal(
@@ -165,7 +193,7 @@ struct TerminalGroupViewPreviews: PreviewProvider {
 
         let utilityAreaViewModel = UtilityAreaViewModel()
         utilityAreaViewModel.terminalGroups = [
-            UtilityAreaTerminalGroup(name: "Grupo de Preview", terminals: [terminal, terminal2])
+            UtilityAreaTerminalGroup(name: "Preview Group", terminals: [terminal, terminal2])
         ]
         utilityAreaViewModel.selectedTerminals = [terminal.id]
 
@@ -182,6 +210,7 @@ struct TerminalGroupViewPreviews: PreviewProvider {
     }
 }
 
+// Wrapper view to render the preview group.
 private struct TerminalGroupViewPreviewWrapper: View {
     @EnvironmentObject var utilityAreaViewModel: UtilityAreaViewModel
     @FocusState private var focusedTerminalID: UUID?