Merge branch 'charlesmchen/imageEditorVsFirstResponder' into release/2.38.0

SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift

@@ -328,7 +328,9 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC
     }
 
     private func updateControlVisibility() {
-        if !shouldHideControls, !isFirstResponder {
+        let hasPresentedView = self.presentedViewController != nil
+
+        if !shouldHideControls, !isFirstResponder, !hasPresentedView {
             becomeFirstResponder()
         }
         bottomToolView.shouldHideControls = shouldHideControls

SignalMessaging/Views/ImageEditor/ImageEditorBrushViewController.swift

@@ -119,6 +119,11 @@ public class ImageEditorBrushViewController: OWSViewController {
         return true
     }
 
+    @objc
+    override public var canBecomeFirstResponder: Bool {
+        return true
+    }
+
     // MARK: - Actions
 
     @objc func didTapUndo(sender: UIButton) {

SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift

@@ -242,6 +242,11 @@ class ImageEditorCropViewController: OWSViewController {
         return true
     }
 
+    @objc
+    override public var canBecomeFirstResponder: Bool {
+        return true
+    }
+
     private static let desiredCornerSize: CGFloat = 24
     private static let minCropSize: CGFloat = desiredCornerSize * 2
     private var cornerSize = CGSize.zero
@@ -407,10 +412,6 @@ class ImageEditorCropViewController: OWSViewController {
         panGestureRecognizer.shouldBeRequiredToFail(by: pinchGestureRecognizer)
     }
 
-    override public var canBecomeFirstResponder: Bool {
-        return true
-    }
-
     // MARK: - Gestures
 
     private class func unitTranslation(oldLocationView: CGPoint,

SignalMessaging/Views/ImageEditor/ImageEditorTextViewController.swift

@@ -239,6 +239,11 @@ public class ImageEditorTextViewController: OWSViewController, VAlignTextViewDel
         return true
     }
 
+    @objc
+    override public var canBecomeFirstResponder: Bool {
+        return true
+    }
+
     // MARK: - Pinch Gesture
 
     private var pinchFontStart: UIFont?