✨ New chat message box

This is now an auto-expanding TextEditor with the sidebars hidden until absolutely needed

Author: Robdel12

DraftPatch/Components/ChatBox.swift

@@ -21,6 +21,7 @@ struct ChatBoxView: View {
   @State private var selectedText: String?
   @State private var lineNumbers: (start: Int, end: Int)?
   @State private var fileName: String?
+  @State private var textEditorHeight: CGFloat = 15
 
   var draftingText: String {
     guard let app = selectedDraftApp else { return "" }
@@ -66,34 +67,13 @@ struct ChatBoxView: View {
         }
       }
 
-      TextField(thinking ? "Sending..." : "Draft a message", text: $userMessage, axis: .vertical)
-        .accessibilityIdentifier("Chatbox")
-        .multilineTextAlignment(.leading)
-        .font(.system(size: 14, weight: .regular, design: .rounded))
-        .textFieldStyle(PlainTextFieldStyle())
-        .focused($isTextFieldFocused)
-        .disabled(thinking)
-        .onAppear {
-          updateSelectedTextDetails()
-          DispatchQueue.main.async {
-            isTextFieldFocused = true
-          }
-        }
-        .onReceive(NotificationCenter.default.publisher(for: NSApplication.didBecomeActiveNotification)) {
-          _ in
-          updateSelectedTextDetails()
-        }
-        .onKeyPress { keyPress in
-          if keyPress.modifiers == .shift && keyPress.key == .return {
-            userMessage += "\n"
-            return .handled
-          } else if keyPress.modifiers.isEmpty && keyPress.key == .return {
-            onSubmit()
-            return .handled
-          } else {
-            return .ignored
-          }
-        }
+      ChatBoxEditor(
+        userMessage: $userMessage,
+        isTextFieldFocused: $isTextFieldFocused,
+        thinking: thinking,
+        onSubmit: onSubmit,
+        updateSelectedTextDetails: updateSelectedTextDetails
+      )
 
       Divider()
 

DraftPatch/Components/ChatBoxEditor.swift

@@ -0,0 +1,71 @@
+//
+//  ChatBoxEditor.swift
+//  DraftPatch
+//
+//  Created by Robert DeLuca on 3/13/25.
+//
+
+import Combine
+import SwiftUI
+
+struct ChatBoxEditor: View {
+  @Binding var userMessage: String
+  @FocusState.Binding var isTextFieldFocused: Bool
+  @State private var textEditorHeight: CGFloat = 20
+
+  let thinking: Bool
+  let onSubmit: () -> Void
+  let updateSelectedTextDetails: () -> Void
+
+  var body: some View {
+    ZStack(alignment: .topLeading) {
+      if userMessage.isEmpty {
+        Text(thinking ? "Sending..." : "Draft a message")
+          .font(.system(size: 14, weight: .regular, design: .rounded))
+          .foregroundColor(.gray)
+          .padding(0)
+          .padding(.leading, 5)
+          .frame(maxWidth: .infinity, alignment: .leading)
+      }
+
+      Text(userMessage.isEmpty ? " " : userMessage)
+        .font(.system(size: 14, weight: .regular, design: .rounded))
+        .padding(8)
+        .frame(maxWidth: .infinity)
+        .background(
+          GeometryReader { geometry in
+            Color.clear
+              .onAppear { textEditorHeight = max(15, geometry.size.height + 16) }
+              .onChange(of: userMessage) {
+                textEditorHeight = max(15, geometry.size.height + 16)
+              }
+          }
+        )
+        .opacity(0)
+
+      CustomTextEditor(text: $userMessage, isFocused: $isTextFieldFocused, thinking: thinking)
+        .frame(minHeight: 15, maxHeight: textEditorHeight)
+        .font(.system(size: 14, weight: .regular, design: .rounded))
+        .disabled(thinking)
+        .accessibilityLabel(thinking ? "Sending..." : "Draft a message")
+        .onAppear {
+          updateSelectedTextDetails()
+          DispatchQueue.main.async {
+            isTextFieldFocused = true
+          }
+        }
+        .onReceive(NotificationCenter.default.publisher(for: NSApplication.didBecomeActiveNotification)) {
+          _ in
+          updateSelectedTextDetails()
+        }
+        .onKeyPress { keyPress in
+          if keyPress.modifiers.isEmpty && keyPress.key == .return {
+            onSubmit()
+            return .handled
+          } else {
+            return .ignored
+          }
+        }
+    }
+  }
+}

DraftPatch/Components/CustomTextEditor.swift

@@ -0,0 +1,74 @@
+//
+//  CustomTextEditor.swift
+//  DraftPatch
+//
+//  Created by Robert DeLuca on 3/13/25.
+//
+
+import AppKit
+import SwiftUI
+
+struct CustomTextEditor: NSViewRepresentable {
+  @Binding var text: String
+  @FocusState.Binding var isFocused: Bool
+
+  var isEditable: Bool = true
+  var thinking: Bool = false
+
+  class Coordinator: NSObject, NSTextViewDelegate {
+    var parent: CustomTextEditor
+
+    init(_ parent: CustomTextEditor) {
+      self.parent = parent
+    }
+
+    func textDidChange(_ notification: Notification) {
+      if let textView = notification.object as? NSTextView {
+        DispatchQueue.main.async {
+          self.parent.text = textView.string
+        }
+      }
+    }
+  }
+
+  func makeCoordinator() -> Coordinator {
+    Coordinator(self)
+  }
+
+  func makeNSView(context: Context) -> NSScrollView {
+    let scrollView = NSScrollView()
+    scrollView.hasVerticalScroller = true
+    scrollView.autohidesScrollers = true
+    scrollView.hasHorizontalScroller = false
+    scrollView.drawsBackground = false
+    scrollView.scrollerStyle = .overlay
+
+    let textView = NSTextView()
+    textView.delegate = context.coordinator
+    textView.isEditable = isEditable
+    textView.font = NSFont.systemFont(ofSize: 14)
+    textView.backgroundColor = .clear
+    textView.drawsBackground = false
+    textView.isRichText = false
+    textView.allowsUndo = true
+    textView.isHorizontallyResizable = false
+    textView.autoresizingMask = [.width, .height]
+    textView.setAccessibilityIdentifier("Chatbox")
+    textView.setAccessibilityLabel(thinking ? "Sending..." : "Draft a message")
+
+    scrollView.documentView = textView
+    return scrollView
+  }
+
+  func updateNSView(_ nsView: NSScrollView, context: Context) {
+    if let textView = nsView.documentView as? NSTextView {
+      if textView.string != text {
+        textView.string = text
+      }
+
+      if isFocused {
+        nsView.window?.makeFirstResponder(textView)
+      }
+    }
+  }
+}

DraftPatch/Services/ClaudeService.swift renamed to DraftPatch/Services/LLMs/ClaudeService.swift

@@ -19,22 +19,22 @@ struct DraftPatchCommands: Commands {
     }
 
     CommandGroup(before: .textEditing) {
-      Button("Toggle drafting") {
+      Button("Toggle Drafting") {
         viewModel.toggleDrafting()
       }
       .keyboardShortcut("d", modifiers: .command)
     }
 
     CommandGroup(before: .textEditing) {
-      Button("Select model") {
+      Button("Select Model") {
         // Hacky, letting it fall through to the pickers shortcut modifier
         // TODO: Move popover state to view model?
       }
       .keyboardShortcut("e", modifiers: .command)
     }
 
     CommandGroup(replacing: .appSettings) {
-      Button("Preferences...") {
+      Button("Settings...") {
         viewModel.showSettings.toggle()
       }
       .keyboardShortcut(",", modifiers: .command)

DraftPatch/Services/GeminiService.swift renamed to DraftPatch/Services/LLMs/GeminiService.swift

@@ -87,7 +87,7 @@ final class DraftPatchUITests: XCTestCase {
     let title = app.staticTexts["New Conversation"]
     XCTAssertTrue(title.waitForExistence(timeout: 2), "The chat title is not 'New Conversation'")
 
-    let messageField = app.textFields["Chatbox"]
+    let messageField = app.textViews["Chatbox"]
     XCTAssertTrue(messageField.waitForExistence(timeout: 2), "Chat input field is not visible")
 
     let messageText = "Hello, how are you?"
@@ -119,7 +119,7 @@ final class DraftPatchUITests: XCTestCase {
     let title = app.staticTexts["New Conversation"]
     XCTAssertTrue(title.waitForExistence(timeout: 2), "The chat title is not 'New Conversation'")
 
-    let messageField = app.textFields["Chatbox"]
+    let messageField = app.textViews["Chatbox"]
     XCTAssertTrue(messageField.waitForExistence(timeout: 2), "Chat input field is not visible")
 
     let messageText = "Hello, how are you?"
@@ -192,7 +192,7 @@ final class DraftPatchUITests: XCTestCase {
     XCTAssertTrue(title.waitForExistence(timeout: 2), "The chat title is not 'New Conversation'")
 
     // Send a new chat message
-    let messageField = app.textFields["Chatbox"]
+    let messageField = app.textViews["Chatbox"]
     XCTAssertTrue(messageField.waitForExistence(timeout: 2), "Chat input field is not visible")
 
     let messageText = "Test message"
@@ -269,7 +269,7 @@ final class DraftPatchUITests: XCTestCase {
     let title = app.staticTexts["New Conversation"]
     XCTAssertTrue(title.waitForExistence(timeout: 2), "The chat title is not 'New Conversation'")
 
-    let messageField = app.textFields["Chatbox"]
+    let messageField = app.textViews["Chatbox"]
     XCTAssertTrue(messageField.waitForExistence(timeout: 2), "Chat input field is not visible")
 
     let messageText = "Hello!"