fix #509
This commit is contained in:
parent
04f040dd48
commit
b3037c7263
|
@ -172,6 +172,8 @@
|
|||
:padding-top 8
|
||||
:padding-bottom 8})
|
||||
|
||||
(def item-height 60)
|
||||
|
||||
(def bottom-info-row
|
||||
{:flex-direction "row"
|
||||
:padding-top 4
|
||||
|
|
|
@ -21,11 +21,10 @@
|
|||
|
||||
(defn- container-animation-logic [{:keys [to-value val]}]
|
||||
(fn [_]
|
||||
(let [to-value @to-value]
|
||||
(anim/start
|
||||
(anim/spring val {:toValue to-value
|
||||
:friction 6
|
||||
:tension 40})))))
|
||||
:tension 40}))))
|
||||
|
||||
(defn overlay [{:keys [on-click-outside]} items]
|
||||
[view {:style st/bottom-info-overlay}
|
||||
|
@ -34,23 +33,18 @@
|
|||
[view nil]]
|
||||
items])
|
||||
|
||||
(defn container [& _]
|
||||
(let [layout-height (r/atom 0)
|
||||
anim-value (anim/create-value 1)
|
||||
context {:to-value layout-height
|
||||
(defn container [height & _]
|
||||
(let [anim-value (anim/create-value 1)
|
||||
context {:to-value height
|
||||
:val anim-value}
|
||||
on-update (container-animation-logic context)]
|
||||
(r/create-class
|
||||
{:component-did-update
|
||||
on-update
|
||||
:reagent-render
|
||||
(fn [& children]
|
||||
@layout-height
|
||||
[animated-view {:style (st/bottom-info-container anim-value)}
|
||||
(into [view {:onLayout (fn [event]
|
||||
(let [height (.. event -nativeEvent -layout -height)]
|
||||
(reset! layout-height height)))}]
|
||||
children)])})))
|
||||
(fn [height & children]
|
||||
[animated-view {:style (st/bottom-info-container height)}
|
||||
(into [view] children)])})))
|
||||
|
||||
(defn message-status-row [{:keys [photo-path name]} {:keys [whisper-identity status]}]
|
||||
[view st/bottom-info-row
|
||||
|
@ -82,12 +76,11 @@
|
|||
(map (fn [{:keys [identity]}]
|
||||
[identity {:whisper-identity identity
|
||||
:status message-status}]))
|
||||
(into {}))]
|
||||
(into {}))
|
||||
statuses (vals (merge participants user-statuses))]
|
||||
[overlay {:on-click-outside #(dispatch [:set-chat-ui-props :show-bottom-info? false])}
|
||||
[container
|
||||
[list-view {:dataSource (-> (merge participants user-statuses)
|
||||
(vals)
|
||||
(lw/to-datasource))
|
||||
[container (* st/item-height (count statuses))
|
||||
[list-view {:dataSource (lw/to-datasource statuses)
|
||||
:enableEmptySections true
|
||||
:renderRow (render-row @contacts)
|
||||
:contentContainerStyle st/bottom-info-list-container}]]]))})))
|
||||
|
|
Loading…
Reference in New Issue