Dismiss keyboard when opening mute chat drawer (#18486)
This commit is contained in:
parent
6e22e63158
commit
da192dcdb3
|
@ -151,7 +151,6 @@
|
||||||
:icon :i/pin
|
:icon :i/pin
|
||||||
:counter-value pins-count
|
:counter-value pins-count
|
||||||
:on-press (fn []
|
:on-press (fn []
|
||||||
(rf/dispatch [:dismiss-keyboard])
|
|
||||||
(rf/dispatch [:pin-message/show-pins-bottom-sheet
|
(rf/dispatch [:pin-message/show-pins-bottom-sheet
|
||||||
chat-id]))}
|
chat-id]))}
|
||||||
{:accessibility-label :action-button-mute
|
{:accessibility-label :action-button-mute
|
||||||
|
|
|
@ -147,13 +147,13 @@
|
||||||
|
|
||||||
(rf/defn show-bottom-sheet
|
(rf/defn show-bottom-sheet
|
||||||
{:events [:show-bottom-sheet]}
|
{:events [:show-bottom-sheet]}
|
||||||
[{:keys [db]} content]
|
[{:keys [db] :as cofx} content]
|
||||||
(let [{:keys [sheets hide?]} (:bottom-sheet db)]
|
(let [{:keys [sheets hide?]} (:bottom-sheet db)]
|
||||||
(rf/merge {:db (update-in db [:bottom-sheet :sheets] #(conj % content))}
|
(rf/merge cofx
|
||||||
|
{:db (update-in db [:bottom-sheet :sheets] #(conj % content))
|
||||||
|
:dismiss-keyboard nil}
|
||||||
#(when-not hide?
|
#(when-not hide?
|
||||||
(if (seq sheets)
|
(if (seq sheets) (hide-bottom-sheet %) {:show-bottom-sheet nil})))))
|
||||||
(hide-bottom-sheet %)
|
|
||||||
{:show-bottom-sheet nil})))))
|
|
||||||
|
|
||||||
;; LEGACY (should be removed in status 2.0)
|
;; LEGACY (should be removed in status 2.0)
|
||||||
(rf/defn hide-signing-sheet
|
(rf/defn hide-signing-sheet
|
||||||
|
|
Loading…
Reference in New Issue