Skip to content

fix: make macOS input field scrollable #131

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: make macOS input field scrollable #131

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 35 additions & 16 deletions Enchanted/UI/macOS/Chat/Components/InputFields_macOS.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ struct InputFieldsView: View {
@State private var selectedImage: Image?
@State private var fileDropActive: Bool = false
@State private var fileSelectingActive: Bool = false
@State private var textFieldHeight: CGFloat = 40
@FocusState private var isFocusedInput: Bool

@MainActor private func sendMessage() {
Expand Down Expand Up @@ -69,27 +70,45 @@ struct InputFieldsView: View {
}

ZStack(alignment: .trailing) {
TextField("Message", text: $message.animation(.easeOut(duration: 0.3)), axis: .vertical)
.focused($isFocusedInput)
.font(.system(size: 14))
.frame(maxWidth:.infinity, minHeight: 40)
.clipped()
.textFieldStyle(.plain)
ScrollViewReader { scrollView in
ScrollView {
TextField("Message",
text: $message.animation(.easeOut(duration: 0.3)),
axis: .vertical)
.focused($isFocusedInput)
.font(.system(size: 14))
.frame(maxWidth:.infinity, minHeight: 40)
.clipped()
.textFieldStyle(.plain)
.overlay {
GeometryReader { geo in
Color.clear.onChange(of: geo.size.height) {
withAnimation {
self.textFieldHeight = geo.size.height
}
}
}
}

#if os(macOS)
.onSubmit {
if NSApp.currentEvent?.modifierFlags.contains(.shift) == true {
message += "\n"
} else {
sendMessage()
.onSubmit {
if NSApp.currentEvent?.modifierFlags.contains(.shift) == true {
message += "\n"
} else {
sendMessage()
}
}
}
#endif
/// TextField bypasses drop area
.allowsHitTesting(!fileDropActive)
/// TextField bypasses drop area
.allowsHitTesting(!fileDropActive)
#if os(macOS)
.addCustomHotkeys(hotkeys)
.addCustomHotkeys(hotkeys)
#endif
.padding(.trailing, 80)
.padding(.trailing, 80)
}
.frame(maxHeight: min(textFieldHeight, 120+10))
// plus 10 to indicate it's scrollable.
}


HStack {
Expand Down