tyiu/damus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit f7a0370824.
This commit is contained in:
William Casarin
2023-05-30 19:29:23 -07:00
parent 6eecb5ef26
commit cfa1e13887
1 changed files with 24 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
damus/Views/PostView.swift
View File

@@ -207,16 +207,13 @@ struct PostView: View {
}
}
func TextEntry(scrollViewGeometry: GeometryProxy) -> some View {
GeometryReader { (geometry: GeometryProxy) in
var TextEntry: some View {
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
@@ -232,7 +229,6 @@ struct PostView: View {
}
}
}
}
var TopBar: some View {
VStack {
@@ -301,12 +297,12 @@ struct PostView: View {
}
}
func Editor(deviceSize: GeometryProxy, scrollViewGeometry: GeometryProxy) -> some View {
func Editor(deviceSize: 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(scrollViewGeometry: scrollViewGeometry)
TextEntry
}
.frame(height: deviceSize.size.height * multiply_factor)
.id("post")
@@ -331,20 +327,18 @@ struct PostView: View {
TopBar
ScrollViewReader { scroller in
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)
Editor(deviceSize: deviceSize)
}
.frame(maxHeight: searching == nil ? .infinity : 70)
.onAppear {
scroll_to_event(scroller: scroller, id: "post", delay: 1.0, animate: true, anchor: .top)
}
}
}
// This if-block observes @ for tagging
if let searching {