Benature/omnivore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2364 from omnivore-app/fix/ios-note-editor-scrolling

Browse Source 
Fix the texteditor on the notebook view
This commit is contained in:
Jackson Harper
2023-06-15 14:23:43 +08:00
committed by GitHub
parent 9a3673e315 2f35d20562
commit fab9064696
1 changed files with 13 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
apple/OmnivoreKit/Sources/Views/Article/HighlightAnnotationSheet.swift
View File

@ -6,6 +6,12 @@ public struct HighlightAnnotationSheet: View {
@Binding var errorAlertMessage: String?
@Binding var showErrorAlertMessage: Bool
enum FocusField: Hashable {
case textEditor
}
@FocusState private var focusedField: FocusField?
let onSave: () -> Void
let onCancel: () -> Void
@ -25,30 +31,14 @@ public struct HighlightAnnotationSheet: View {
public var body: some View {
VStack {
// HStack {
// Button(LocalText.cancelGeneric, action: onCancel)
// Spacer()
// Text("Note").font(Font.system(size: 18, weight: .bold))
// Spacer()
// Button(LocalText.genericSave) {
// onSave()
// }
// }
// .foregroundColor(.appGrayTextContrast)
ScrollView {
TextEditor(text: $annotation)
.frame(height: 200)
#if os(iOS)
.introspectTextView {
$0.becomeFirstResponder()
}
#endif
}
Spacer()
TextEditor(text: $annotation)
.frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .topLeading)
.focused($focusedField, equals: .textEditor)
.padding(.horizontal)
.task {
focusedField = .textEditor
}
}
.padding()
.navigationTitle("Note")
#if os(iOS)
.navigationBarTitleDisplayMode(.inline)