Skip to content
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

Jump to bottom

fix(ComposeMessageView): Scroll behavior #863

Merged
merged 2 commits into from
Jul 7, 2023
Merged

fix(ComposeMessageView): Scroll behavior #863

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fbd4953
fix(ComposeMessageView): scroll follows editor's height
valentinperignon Jul 7, 2023
213b715
feat(MessageComposeView): Scroll to top when autocompletion is enabled
valentinperignon Jul 7, 2023
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
12 changes: 6 additions & 6 deletions Mail/Helpers/RichTextEditor.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import WebKit
struct RichTextEditor: UIViewRepresentable {
typealias UIViewType = MailEditorView

@ObservedObject var model: RichTextEditorModel
@Binding var model: RichTextEditorModel
@Binding var body: String
@Binding var isShowingCamera: Bool
@Binding var isShowingFileSelection: Bool
Expand All @@ -37,12 +37,12 @@ struct RichTextEditor: UIViewRepresentable {
let blockRemoteContent: Bool
var alert: ObservedObject<NewMessageAlert>.Wrapper

init(model: RichTextEditorModel, body: Binding<String>,
init(model: Binding<RichTextEditorModel>, body: Binding<String>,
alert: ObservedObject<NewMessageAlert>.Wrapper,
isShowingCamera: Binding<Bool>, isShowingFileSelection: Binding<Bool>, isShowingPhotoLibrary: Binding<Bool>,
becomeFirstResponder: Binding<Bool>,
blockRemoteContent: Bool) {
_model = ObservedObject(wrappedValue: model)
_model = model
_body = body
self.alert = alert
_isShowingCamera = isShowingCamera
Expand Down Expand Up @@ -146,9 +146,9 @@ extension SQTextEditorView {
}
}

class RichTextEditorModel: ObservableObject {
@Published var cursorPosition: CGFloat = 0
@Published var height: CGFloat = 0
struct RichTextEditorModel {
var cursorPosition: CGFloat = 0
var height: CGFloat = 0
}

class MailEditorView: SQTextEditorView {
Expand Down
6 changes: 3 additions & 3 deletions Mail/Views/New Message/ComposeMessageBodyView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,9 @@ struct ComposeMessageBodyView: View {
@State private var isShowingFileSelection = false
@State private var isShowingPhotoLibrary = false

@StateObject private var editorModel = RichTextEditorModel()

@ObservedRealmObject var draft: Draft

@Binding var editorModel: RichTextEditorModel
@Binding var isLoadingContent: Bool
@Binding var editorFocus: Bool

Expand All @@ -48,7 +47,7 @@ struct ComposeMessageBodyView: View {
AttachmentsHeaderView(attachmentsManager: attachmentsManager)

RichTextEditor(
model: editorModel,
model: $editorModel,
body: $draft.body,
alert: $alert,
isShowingCamera: $isShowingCamera,
Expand Down Expand Up @@ -87,6 +86,7 @@ struct ComposeMessageBodyView_Previews: PreviewProvider {
@Environment(\.dismiss) var dismiss

ComposeMessageBodyView(draft: Draft(),
editorModel: .constant(RichTextEditorModel()),
isLoadingContent: .constant(false),
editorFocus: .constant(false),
attachmentsManager: AttachmentsManager(
Expand Down
22 changes: 22 additions & 0 deletions Mail/Views/New Message/ComposeMessageView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,9 @@ struct ComposeMessageView: View {
@State private var autocompletionType: ComposeViewFieldType?
@State private var editorFocus = false

@State private var editorModel = RichTextEditorModel()
@State private var scrollView: UIScrollView?

@StateObject private var attachmentsManager: AttachmentsManager
@StateObject private var alert = NewMessageAlert()

Expand Down Expand Up @@ -144,6 +147,7 @@ struct ComposeMessageView: View {
if autocompletionType == nil && !isLoadingContent {
ComposeMessageBodyView(
draft: draft,
editorModel: $editorModel,
isLoadingContent: $isLoadingContent,
editorFocus: $editorFocus,
attachmentsManager: attachmentsManager,
Expand Down Expand Up @@ -184,8 +188,26 @@ struct ComposeMessageView: View {
}
}
.introspectScrollView { scrollView in
guard self.scrollView != scrollView else { return }
self.scrollView = scrollView
scrollView.keyboardDismissMode = .interactive
}
.onChange(of: editorModel.height) { _ in
guard let scrollView else { return }

let fullSize = scrollView.contentSize.height
let realPosition = (fullSize - editorModel.height) + editorModel.cursorPosition

guard realPosition >= 0 else { return }
let rect = CGRect(x: 0, y: realPosition, width: 1, height: 1)
scrollView.scrollRectToVisible(rect, animated: true)
}
.onChange(of: autocompletionType) { newValue in
guard newValue != nil else { return }

let rectTop = CGRect(x: 0, y: 0, width: 1, height: 1)
scrollView?.scrollRectToVisible(rectTop, animated: true)
}
.navigationTitle(MailResourcesStrings.Localizable.buttonNewMessage)
.navigationBarTitleDisplayMode(.inline)
.toolbar {
Expand Down