status-im
/
status-react
mirror of https://github.com/status-im/status-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

[#5984] Keyboard overlaps message input in public modal chat screen on iPhone 

Signed-off-by: Andrey Shovkoplyas <motor4ik@gmail.com>
This commit is contained in:
Andrey Shovkoplyas 2018-09-25 14:32:48 +02:00
parent 764bbf1e2c
commit 4ab7ccdffd
No known key found for this signature in database
GPG Key ID: EAAB7C8622D860A4
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
components/src/status_im/ui/components/react.cljs
View File

@ -287,5 +287,8 @@
(views/letsubs [] (views/letsubs []
(let [main-screen-view (create-main-screen-view current-view)] (let [main-screen-view (create-main-screen-view current-view)]
[main-screen-view styles/flex [main-screen-view styles/flex
[keyboard-avoiding-view {:flex 1 :flex-direction :column} [(if (= current-view :chat-modal)
view
keyboard-avoiding-view)
{:flex 1 :flex-direction :column}
(apply vector view styles/flex components)]]))) (apply vector view styles/flex components)]])))

8
src/status_im/ui/screens/chat/input/input.cljs
View File

@ -102,12 +102,12 @@
[vi/icon :icons/input-commands {:container-style style/input-commands-icon [vi/icon :icons/input-commands {:container-style style/input-commands-icon
:color :dark}]]]))) :color :dark}]]])))
(defview input-container [modal?] (defview input-container []
(letsubs [margin [:chat-input-margin] (letsubs [margin [:chat-input-margin]
{:keys [input-text]} [:get-current-chat] {:keys [input-text]} [:get-current-chat]
result-box [:get-current-chat-ui-prop :result-box]] result-box [:get-current-chat-ui-prop :result-box]]
(let [single-line-input? (:singleLineInput result-box)] (let [single-line-input? (:singleLineInput result-box)]
[react/view {:style (style/root (if modal? 0 margin)) [react/view {:style (style/root margin)
:on-layout #(let [h (-> (.-nativeEvent %) :on-layout #(let [h (-> (.-nativeEvent %)
(.-layout) (.-layout)
(.-height))] (.-height))]
@ -119,9 +119,9 @@
[commands-button] [commands-button]
[send-button/send-button-view])]]))) [send-button/send-button-view])]])))
(defn container [modal?] (defn container []
[react/view [react/view
[parameter-box/parameter-box-view] [parameter-box/parameter-box-view]
[suggestions/suggestions-view] [suggestions/suggestions-view]
[validation-messages/validation-messages-view] [validation-messages/validation-messages-view]
[input-container modal?]]) [input-container]])

2
src/status_im/ui/screens/chat/views.cljs
View File

@ -153,7 +153,7 @@
[messages-view-animation [messages-view-animation
[messages-view group-chat modal?]] [messages-view group-chat modal?]]
[react/view style/message-view-preview]) [react/view style/message-view-preview])
[input/container modal?] [input/container]
(when show-bottom-info? (when show-bottom-info?
[bottom-info/bottom-info-view]) [bottom-info/bottom-info-view])
(when show-message-options? (when show-message-options?