damus

commit f7a03708245b4385002a168c56a07967b71c5694
parent fe4277e817fba60bd05f36e8f2fbd0f87b25311d
Author: gladiusKatana <garthsnyder@protonmail.com>
Date:   Mon, 29 May 2023 10:45:43 -0400

Add .frame & .position modifiers to TextEntry using ScrollView geometry

Closes: #1201
Changelog-Fixed: Fix issue where cursor dissapears when typing long message

Diffstat:
M
damus/Views/PostView.swift
 | 
54
++++++++++++++++++++++++++++++------------------------

1 file changed, 30 insertions(+), 24 deletions(-)
diff --git a/damus/Views/PostView.swift b/damus/Views/PostView.swift
@@ -207,25 +207,29 @@ struct PostView: View {
         }
     }
     
-    var TextEntry: some View {
-        ZStack(alignment: .topLeading) {
-            TextViewWrapper(attributedText: $post, postTextViewCanScroll: $postTextViewCanScroll, cursorIndex: newCursorIndex, getFocusWordForMention: { word, range in
-                focusWordAttributes = (word, range)
-                self.newCursorIndex = nil
-            })
+    func TextEntry(scrollViewGeometry: GeometryProxy) -> some View {
+        GeometryReader { (geometry: GeometryProxy) in
+            ZStack(alignment: .topLeading) {
+                TextViewWrapper(attributedText: $post, postTextViewCanScroll: $postTextViewCanScroll, cursorIndex: newCursorIndex, getFocusWordForMention: { word, range in
+                    focusWordAttributes = (word, range)
+                    self.newCursorIndex = nil
+                })
                 .environmentObject(tagModel)
+                .frame(maxHeight: scrollViewGeometry.size.height)
+                .position(x: geometry.frame(in: .local).midX, y: scrollViewGeometry.frame(in: .local).midY)
                 .focused($focus)
                 .textInputAutocapitalization(.sentences)
                 .onChange(of: post) { p in
                     post_changed(post: p, media: uploadedMedias)
                 }
-            
-            if post.string.isEmpty {
-                Text(POST_PLACEHOLDER)
-                    .padding(.top, 8)
-                    .padding(.leading, 4)
-                    .foregroundColor(Color(uiColor: .placeholderText))
-                    .allowsHitTesting(false)
+                
+                if post.string.isEmpty {
+                    Text(POST_PLACEHOLDER)
+                        .padding(.top, 8)
+                        .padding(.leading, 4)
+                        .foregroundColor(Color(uiColor: .placeholderText))
+                        .allowsHitTesting(false)
+                }
             }
         }
     }
@@ -297,12 +301,12 @@ struct PostView: View {
         }
     }
     
-    func Editor(deviceSize: GeometryProxy) -> some View {
+    func Editor(deviceSize: GeometryProxy, scrollViewGeometry: GeometryProxy) -> some View {
         VStack(alignment: .leading, spacing: 0) {
             HStack(alignment: .top) {
                 ProfilePicView(pubkey: damus_state.pubkey, size: PFP_SIZE, highlight: .none, profiles: damus_state.profiles, disable_animation: damus_state.settings.disable_animation)
                 
-                TextEntry
+                TextEntry(scrollViewGeometry: scrollViewGeometry)
             }
             .frame(height: deviceSize.size.height * multiply_factor)
             .id("post")
@@ -327,16 +331,18 @@ struct PostView: View {
                 TopBar
                 
                 ScrollViewReader { scroller in
-                    ScrollView {
-                        if case .replying_to(let replying_to) = self.action {
-                            ReplyView(replying_to: replying_to, damus: damus_state, originalReferences: $originalReferences, references: $references)
+                    GeometryReader { (geometry: GeometryProxy) in
+                        ScrollView {
+                            if case .replying_to(let replying_to) = self.action {
+                                ReplyView(replying_to: replying_to, damus: damus_state, originalReferences: $originalReferences, references: $references)
+                            }
+                            
+                            Editor(deviceSize: deviceSize, scrollViewGeometry: geometry)
+                        }
+                        .frame(maxHeight: searching == nil ? .infinity : 70)
+                        .onAppear {
+                            scroll_to_event(scroller: scroller, id: "post", delay: 1.0, animate: true, anchor: .top)
                         }
-                        
-                        Editor(deviceSize: deviceSize)
-                    }
-                    .frame(maxHeight: searching == nil ? .infinity : 70)
-                    .onAppear {
-                        scroll_to_event(scroller: scroller, id: "post", delay: 1.0, animate: true, anchor: .top)
                     }
                 }