fix: blur the composer input when canceling edit

Author: clauxx

Diff for: src/status_im2/contexts/chat/composer/edit/view.cljs

@@ -11,7 +11,7 @@
     [utils.re-frame :as rf]))
 
 (defn edit-message
-  [state]
+  [{:keys [text-value input-ref]}]
   [rn/view
    {:style               style/container
     :accessibility-label :edit-message}
@@ -30,20 +30,18 @@
     {:size                24
      :icon-only?          true
      :accessibility-label :edit-cancel-button
-     :on-press            (fn []
-                            (utils/cancel-edit-message state)
-                            (rf/dispatch [:chat.ui/cancel-message-edit]))
+     :on-press            #(utils/cancel-edit-message text-value input-ref)
      :type                :outline}
     :i/close]])
 
 (defn- f-view
-  [state]
+  [props]
   (let [edit   (rf/sub [:chats/edit-message])
         height (reanimated/use-shared-value (if edit constants/edit-container-height 0))]
     (rn/use-effect #(reanimated/animate height (if edit constants/edit-container-height 0)) [edit])
     [reanimated/view {:style (reanimated/apply-animations-to-style {:height height} {})}
-     (when edit [edit-message state])]))
+     (when edit [edit-message props])]))
 
 (defn view
-  [state]
-  [:f> f-view state])
+  [props]
+  [:f> f-view props])

Diff for: src/status_im2/contexts/chat/composer/gesture.cljs

@@ -43,8 +43,7 @@
     (reset! emoji-kb-extra-height nil))
   (reset! maximized? false)
   (rf/dispatch [:chat.ui/set-input-maximized false])
-  (when @input-ref
-    (.blur ^js @input-ref)))
+  (utils/blur-input input-ref))
 
 (defn bounce-back
   [{:keys [height saved-height opacity background-y]}
@@ -96,8 +95,8 @@
                                 max-height
                                 bounded-height
                                 saved-height))
-                 (when @input-ref ; sheet at min-height, collapse keyboard
-                   (.blur ^js @input-ref)))))))
+                 ; sheet at min-height, collapse keyboard
+                 (utils/blur-input input-ref))))))
         (gesture/on-end (fn []
                           (let [diff (- (reanimated/get-shared-value height)
                                         (reanimated/get-shared-value saved-height))]

Diff for: src/status_im2/contexts/chat/composer/keyboard.cljs

@@ -4,7 +4,8 @@
     [react-native.async-storage :as async-storage]
     [react-native.core :as rn]
     [react-native.platform :as platform]
-    [react-native.reanimated :as reanimated]))
+    [react-native.reanimated :as reanimated]
+    [status-im2.contexts.chat.composer.utils :as utils]))
 
 (defn get-kb-height
   [curr-height default-height]
@@ -68,8 +69,8 @@
                                    #(handle-emoji-kb-ios % props state animations dimensions)))
   (reset! keyboard-hide-listener (.addListener rn/keyboard
                                                "keyboardDidHide"
-                                               #(when (and platform/android? @input-ref)
-                                                  (.blur ^js @input-ref)))))
+                                               #(when platform/android?
+                                                  (utils/blur-input input-ref)))))
 
 (defn handle-refocus-emoji-kb-ios
   [{:keys [saved-emoji-kb-extra-height]}

Diff for: src/status_im2/contexts/chat/composer/utils.cljs

@@ -99,10 +99,18 @@
        (not reply?)
        (not audio?)))
 
+(defn blur-input
+  [input-ref]
+  (when @input-ref
+    (rf/dispatch [:chat.ui/set-input-focused false])
+    (.blur ^js @input-ref)))
+
 (defn cancel-edit-message
-  [{:keys [text-value]}]
+  [text-value input-ref]
   (reset! text-value "")
-  (rf/dispatch [:chat.ui/set-input-content-height constants/input-height]))
+  (blur-input input-ref)
+  (rf/dispatch [:chat.ui/set-input-content-height constants/input-height])
+  (rf/dispatch [:chat.ui/cancel-message-edit]))
 
 (defn count-lines
   [s]

Diff for: src/status_im2/contexts/chat/composer/view.cljs

@@ -99,7 +99,9 @@
         (when chat-screen-loaded?
           [:<>
            [reply/view state]
-           [edit/view state]])
+           [edit/view
+            {:text-value (:text-value state)
+             :input-ref  (:input-ref props)}]])
         [reanimated/touchable-opacity
          {:active-opacity      1
           :on-press            (fn []
@@ -151,7 +153,8 @@
   (let [window-height (:height (rn/get-window))
         theme         (quo.theme/use-theme-value)
         opacity       (reanimated/use-shared-value 0)
-        background-y  (reanimated/use-shared-value (- window-height)) ; Y position of background overlay
+        background-y  (reanimated/use-shared-value (- window-height)) ; Y position of background
+                                                                      ; overlay
         blur-height   (reanimated/use-shared-value (+ constants/composer-default-height
                                                       (:bottom insets)))
         extra-params  {:insets                            insets