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

Tap in input filed has no effect if message was sent with Enter [ui-refresh] (#999)

This commit is contained in:
alwx 2017-04-15 10:46:37 +03:00 committed by Roman Volosovskyi
parent 4633a23c17
commit e24df409e8
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/status_im/chat/handlers/input.cljs
View File

@ -142,6 +142,7 @@
:address current-account-id}]
(dispatch [:set-chat-input-text nil chat-id])
(dispatch [:set-chat-input-metadata nil chat-id])
(dispatch [:set-chat-ui-props :sending-in-progress? false])
(cond
command-message
(dispatch [:check-commands-handlers! data])

1
src/status_im/chat/handlers/send_message.cljs
View File

@ -168,7 +168,6 @@
(assoc :to chat-id :message-type :user-message))
params' (assoc params :message message'')]
(dispatch [:update-message-overhead! chat-id network-status])
(dispatch [:set-chat-ui-props :sending-in-progress? false])
(dispatch [::add-message params'])
(dispatch [::save-message! params'])))))

2
src/status_im/chat/styles/input/input.cljs
View File

@ -77,7 +77,7 @@
:top 0
:padding-top -3}})
(defnstyle input-password-text [left]
(defnstyle seq-input-text [left]
{:min-width 200
:font-size 14
:position :absolute

15
src/status_im/chat/views/input/input.cljs
View File

@ -66,13 +66,14 @@
:editable (not @sending-in-progress?)
:on-blur #(do (dispatch [:set-chat-ui-props :input-focused? false])
(set-layout-height 0))
:on-change-text #(when-not (str/includes? % "\n")
:on-change-text #(if-not (str/includes? % "\n")
(do (dispatch [:set-chat-input-text %])
(dispatch [:load-chat-parameter-box (:command @command)])
(when (not @command)
(dispatch [:set-chat-input-metadata nil])
(dispatch [:set-chat-ui-props :result-box nil]))
(dispatch [:set-chat-ui-props :validation-messages nil])))
(dispatch [:set-chat-ui-props :validation-messages nil]))
(dispatch [:send-current-message]))
:on-content-size-change #(let [h (-> (.-nativeEvent %)
(.-contentSize)
(.-height))]
@ -124,20 +125,22 @@
nil))
(defn- seq-input [_]
(let [command (subscribe [:selected-chat-command])
arg-pos (subscribe [:current-chat-argument-position])
seq-arg-input-text (subscribe [:chat :seq-argument-input-text])]
(let [command (subscribe [:selected-chat-command])
arg-pos (subscribe [:current-chat-argument-position])
seq-arg-input-text (subscribe [:chat :seq-argument-input-text])
sending-in-progress? (subscribe [:chat-ui-props :sending-in-progress?])]
(fn [{:keys [command-width]}]
(when (get-in @command [:command :sequential-params])
(let [{:keys [placeholder hidden type]} (get-in @command [:command :params @arg-pos])]
[text-input (merge {:ref #(dispatch [:set-chat-ui-props :seq-input-ref %])
:style (style/input-password-text command-width)
:style (style/seq-input-text command-width)
:default-value (or @seq-arg-input-text "")
:on-change-text #(do (dispatch [:set-chat-seq-arg-input-text %])
(dispatch [:set-chat-ui-props :validation-messages nil]))
:secure-text-entry hidden
:placeholder placeholder
:blur-on-submit false
:editable (not @sending-in-progress?)
:on-submit-editing (fn []
(when-not (str/blank? @seq-arg-input-text)
(dispatch [:send-seq-argument]))