From b00b6707e9f55c4dfc31e4ebfadb4ec51382ecfb Mon Sep 17 00:00:00 2001 From: Stephenie Harris Date: Fri, 8 Jan 2021 12:24:11 -0700 Subject: [PATCH 1/3] Enable scrolling and interaction on message field. --- .../ViewRelated/People/People.storyboard | 28 +++++++------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/WordPress/Classes/ViewRelated/People/People.storyboard b/WordPress/Classes/ViewRelated/People/People.storyboard index 054974b6e5a6..776da64c027b 100644 --- a/WordPress/Classes/ViewRelated/People/People.storyboard +++ b/WordPress/Classes/ViewRelated/People/People.storyboard @@ -335,27 +335,19 @@ - - + + - + - - + + - - - Lorem ipsum dolor sit er elit lamet, consectetaur cillium adipisicing pecu, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. - - - - - - - - + + - + + @@ -397,7 +389,7 @@ - + From c6a23d934fd851f3cbda6296d42eb38984f57fcc Mon Sep 17 00:00:00 2001 From: Stephenie Harris Date: Fri, 8 Jan 2021 12:24:37 -0700 Subject: [PATCH 2/3] When message field is tapped, show the message text entry view. --- .../People/InvitePersonViewController.swift | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/WordPress/Classes/ViewRelated/People/InvitePersonViewController.swift b/WordPress/Classes/ViewRelated/People/InvitePersonViewController.swift index e8f48231f979..bdf0e097319e 100644 --- a/WordPress/Classes/ViewRelated/People/InvitePersonViewController.swift +++ b/WordPress/Classes/ViewRelated/People/InvitePersonViewController.swift @@ -431,6 +431,7 @@ private extension InvitePersonViewController { messageTextView.font = WPStyleGuide.tableviewTextFont() messageTextView.textColor = .text messageTextView.backgroundColor = .listForeground + messageTextView.delegate = self } func setupPlaceholderLabel() { @@ -493,3 +494,16 @@ private extension InvitePersonViewController { placeholderLabel?.isHidden = !messageTextView.text.isEmpty } } + +// MARK: - UITextViewDelegate + +extension InvitePersonViewController: UITextViewDelegate { + func textViewShouldBeginEditing(_ textView: UITextView) -> Bool { + // This calls the segue in People.storyboard + // that shows the SettingsMultiTextViewController. + performSegue(withIdentifier: "message", sender: nil) + return false + } + +} + From c15283cd20a8e419840a892fad382cc888acf9b3 Mon Sep 17 00:00:00 2001 From: Stephenie Harris Date: Fri, 8 Jan 2021 12:32:56 -0700 Subject: [PATCH 3/3] lint fixes. --- .../ViewRelated/People/InvitePersonViewController.swift | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/WordPress/Classes/ViewRelated/People/InvitePersonViewController.swift b/WordPress/Classes/ViewRelated/People/InvitePersonViewController.swift index bdf0e097319e..1a33720d4ba7 100644 --- a/WordPress/Classes/ViewRelated/People/InvitePersonViewController.swift +++ b/WordPress/Classes/ViewRelated/People/InvitePersonViewController.swift @@ -504,6 +504,5 @@ extension InvitePersonViewController: UITextViewDelegate { performSegue(withIdentifier: "message", sender: nil) return false } - -} +}