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

Extend list components to set separator? with same default behavior 

- base-list props private and takes additional separator arg
- flat-list and section-list extended with separator? key that defaults to true
This commit is contained in:
Oskar Thorén 2017-10-12 13:31:39 +02:00
parent 5267d55ec8
commit 1df074c100
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/status_im/components/list/views.cljs
View File

@ -75,24 +75,25 @@
(defn- section-separator [] (defn- section-separator []
[rn/view lst/section-separator]) [rn/view lst/section-separator])
(defn base-list-props [render-fn empty-component] (defn- base-list-props [render-fn empty-component separator?]
(merge {:keyExtractor (fn [_ i] i)} (merge {:keyExtractor (fn [_ i] i)}
(when render-fn {:renderItem (wrap-render-fn render-fn)}) (when render-fn {:renderItem (wrap-render-fn render-fn)})
(when p/ios? {:ItemSeparatorComponent (fn [] (r/as-element [separator]))}) (when (and p/ios? separator?) {:ItemSeparatorComponent (fn [] (r/as-element [separator]))})
; TODO(jeluard) Does not work with our current ReactNative version ;; TODO(jeluard) Does not work with our current ReactNative version
(when empty-component {:ListEmptyComponent (r/as-element [empty-component])}))) (when empty-component {:ListEmptyComponent (r/as-element [empty-component])})))
(defn flat-list (defn flat-list
"A wrapper for FlatList. "A wrapper for FlatList.
See https://facebook.github.io/react-native/docs/flatlist.html" See https://facebook.github.io/react-native/docs/flatlist.html"
[{:keys [data render-fn empty-component] :as props}] [{:keys [data render-fn empty-component separator?] :as props
:or {separator? true}}]
{:pre [(or (nil? data) {:pre [(or (nil? data)
(sequential? data))]} (sequential? data))]}
(if (and (empty? data) empty-component) (if (and (empty? data) empty-component)
;; TODO(jeluard) remove when native :ListEmptyComponent is supported ;; TODO(jeluard) remove when native :ListEmptyComponent is supported
empty-component empty-component
[flat-list-class [flat-list-class
(merge (base-list-props render-fn empty-component) (merge (base-list-props render-fn empty-component separator?)
{:data (clj->js data)} {:data (clj->js data)}
props)])) props)]))
@ -116,11 +117,13 @@
(defn section-list (defn section-list
"A wrapper for SectionList. "A wrapper for SectionList.
See https://facebook.github.io/react-native/docs/sectionlist.html" See https://facebook.github.io/react-native/docs/sectionlist.html"
[{:keys [sections render-fn empty-component render-section-header-fn] :or {render-section-header-fn default-render-section-header} :as props}] [{:keys [sections render-fn empty-component render-section-header-fn separator?] :as props
:or {render-section-header-fn default-render-section-header
separator? true}}]
(if (and (every? #(empty? (:data %)) sections) empty-component) (if (and (every? #(empty? (:data %)) sections) empty-component)
empty-component empty-component
[section-list-class [section-list-class
(merge (base-list-props render-fn empty-component) (merge (base-list-props render-fn empty-component separator?)
{:sections (clj->js (map wrap-per-section-render-fn sections)) {:sections (clj->js (map wrap-per-section-render-fn sections))
:renderSectionHeader (wrap-render-section-header-fn render-section-header-fn)} :renderSectionHeader (wrap-render-section-header-fn render-section-header-fn)}
(when p/ios? {:SectionSeparatorComponent (fn [] (r/as-element [section-separator]))}) (when p/ios? {:SectionSeparatorComponent (fn [] (r/as-element [section-separator]))})