Add AutoresizingCustomTextEditor

Author: intitni

Core/Sources/ChatGPTChatTab/ChatPanel.swift

@@ -540,26 +540,14 @@ struct ChatPanelInputArea: View {
                 removeDuplicates: {
                     $0.typedMessage == $1.typedMessage && $0.focusedField == $1.focusedField
             }) { viewStore in
-                ZStack(alignment: .center) {
-                    // a hack to support dynamic height of TextEditor
-                    Text(
-                        viewStore.state.typedMessage.isEmpty ? "Hi" : viewStore.state.typedMessage
-                    ).opacity(0)
-                        .font(.system(size: 14))
-                        .frame(maxWidth: .infinity, maxHeight: 400)
-                        .padding(.top, 1)
-                        .padding(.bottom, 2)
-                        .padding(.horizontal, 4)
-
-                    CustomTextEditor(
-                        text: viewStore.$typedMessage,
-                        font: .systemFont(ofSize: 14),
-                        onSubmit: { viewStore.send(.sendButtonTapped) },
-                        completions: chatAutoCompletion
-                    )
-                    .padding(.top, 1)
-                    .padding(.bottom, -1)
-                }
+                AutoresizingCustomTextEditor(
+                    text: viewStore.$typedMessage,
+                    font: .systemFont(ofSize: 14),
+                    isEditable: true,
+                    maxHeight: 400,
+                    onSubmit: { viewStore.send(.sendButtonTapped) },
+                    completions: chatAutoCompletion
+                )
                 .focused($focusedField, equals: .textField)
                 .bind(viewStore.$focusedField, to: $focusedField)
                 .padding(8)

Core/Sources/SuggestionWidget/SuggestionPanelContent/PromptToCodePanel.swift

@@ -372,27 +372,15 @@ extension PromptToCodePanel {
                     )
                 }
             ) { viewStore in
-                ZStack(alignment: .center) {
-                    // a hack to support dynamic height of TextEditor
-                    Text(viewStore.state.prompt.isEmpty ? "Hi" : viewStore.state.prompt)
-                        .opacity(0)
-                        .font(.system(size: 14))
-                        .frame(maxWidth: .infinity, maxHeight: 400)
-                        .padding(.top, 1)
-                        .padding(.bottom, 2)
-                        .padding(.horizontal, 4)
-
-                    CustomTextEditor(
-                        text: viewStore.$prompt,
-                        font: .systemFont(ofSize: 14),
-                        isEditable: !viewStore.state.isResponding,
-                        onSubmit: { viewStore.send(.modifyCodeButtonTapped) }
-                    )
-                    .padding(.top, 1)
-                    .padding(.bottom, -1)
-                    .opacity(viewStore.state.isResponding ? 0.5 : 1)
-                    .disabled(viewStore.state.isResponding)
-                }
+                AutoresizingCustomTextEditor(
+                    text: viewStore.$prompt,
+                    font: .systemFont(ofSize: 14),
+                    isEditable: !viewStore.state.isResponding,
+                    maxHeight: 400,
+                    onSubmit: { viewStore.send(.modifyCodeButtonTapped) }
+                )
+                .opacity(viewStore.state.isResponding ? 0.5 : 1)
+                .disabled(viewStore.state.isResponding)
                 .focused($focusField, equals: .textField)
                 .bind(viewStore.$focusField, to: $focusField)
             }

Tool/Package.swift

@@ -61,6 +61,7 @@ let package = Package(
         ),
         .package(url: "https://github.com/apple/swift-syntax.git", branch: "main"),
         .package(url: "https://github.com/GottaGetSwifty/CodableWrappers", from: "2.0.7"),
+        .package(url: "https://github.com/krzyzanowskim/STTextView", from: "0.8.21"),
 
         // TreeSitter
         .package(url: "https://github.com/intitni/SwiftTreeSitter.git", branch: "main"),
@@ -185,6 +186,7 @@ let package = Package(
             dependencies: [
                 "Highlightr",
                 "Preferences",
+                .product(name: "STTextView", package: "STTextView"),
             ]
         ),
         .testTarget(name: "SharedUIComponentsTests", dependencies: ["SharedUIComponents"]),

Tool/Sources/SharedUIComponents/CustomTextEditor.swift

@@ -1,5 +1,52 @@
 import SwiftUI
 
+public struct AutoresizingCustomTextEditor: View {
+    @Binding public var text: String
+    public let font: NSFont
+    public let isEditable: Bool
+    public let maxHeight: Double
+    public let onSubmit: () -> Void
+    public var completions: (_ text: String, _ words: [String], _ range: NSRange) -> [String]
+
+    public init(
+        text: Binding<String>,
+        font: NSFont,
+        isEditable: Bool,
+        maxHeight: Double,
+        onSubmit: @escaping () -> Void,
+        completions: @escaping (_ text: String, _ words: [String], _ range: NSRange)
+            -> [String] = { _, _, _ in [] }
+    ) {
+        _text = text
+        self.font = font
+        self.isEditable = isEditable
+        self.maxHeight = maxHeight
+        self.onSubmit = onSubmit
+        self.completions = completions
+    }
+
+    public var body: some View {
+        ZStack(alignment: .center) {
+            // a hack to support dynamic height of TextEditor
+            Text(text.isEmpty ? "Hi" : text).opacity(0)
+                .font(.init(font))
+                .frame(maxWidth: .infinity, maxHeight: maxHeight)
+                .padding(.top, 1)
+                .padding(.bottom, 2)
+                .padding(.horizontal, 4)
+
+            CustomTextEditor(
+                text: $text,
+                font: font,
+                onSubmit: onSubmit,
+                completions: completions
+            )
+            .padding(.top, 1)
+            .padding(.bottom, -1)
+        }
+    }
+}
+
 public struct CustomTextEditor: NSViewRepresentable {
     public func makeCoordinator() -> Coordinator {
         Coordinator(self)