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

[Fixes #6665] Wrap view child elements when needed 

Signed-off-by: Julien Eluard <julien.eluard@gmail.com>
This commit is contained in:
Julien Eluard 2018-11-09 10:07:11 +01:00
parent 26ec3f8cd7
commit 2f8414b982
No known key found for this signature in database
GPG Key ID: 6FD7DB5437FCBEF6
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/status_im/extensions/core.cljs
View File

@ -172,11 +172,6 @@
:on-press #(re-frame/dispatch [:browser.ui/message-link-pressed uri])} :on-press #(re-frame/dispatch [:browser.ui/message-link-pressed uri])}
uri]) uri])
(defn text [o & children]
(if (map? o)
[react/text o children]
(into [react/text {} o] children)))
(defn list [{:keys [data item-view]}] (defn list [{:keys [data item-view]}]
[list/flat-list {:data data :key-fn (fn [_ i] (str i)) :render-fn item-view}]) [list/flat-list {:data data :key-fn (fn [_ i] (str i)) :render-fn item-view}])
@ -186,8 +181,21 @@
:style {:padding 0} :style {:padding 0}
:on-value-change #(re-frame/dispatch (on-change {:value %}))}]]) :on-value-change #(re-frame/dispatch (on-change {:value %}))}]])
(defn text [o & children]
(if (map? o)
[react/text o children]
(into [react/text {} o] children)))
(defn- wrap-view-child [child]
(if (vector? child) child [text {} child]))
(defn view [o & children]
(if (map? o)
[react/view o (map wrap-view-child children)]
(into [react/view {} (wrap-view-child o)] (map wrap-view-child children))))
(def capacities (def capacities
{:components {'view {:value react/view} {:components {'view {:value view}
'text {:value text} 'text {:value text}
'touchable-opacity {:value touchable-opacity :properties {:on-press :event}} 'touchable-opacity {:value touchable-opacity :properties {:on-press :event}}
'image {:value image :properties {:uri :string}} 'image {:value image :properties {:uri :string}}