Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-01-10 08:50:57 -05:00
Code Issues Activity

Improved history state layout.

Browse source
This commit is contained in:
Andrey Antukh 2016-04-03 10:07:26 +03:00
parent aeff49b3e6
commit e32188f593
2 changed files with 38 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/uxbox/data/history.cljs
View file

@ -19,14 +19,20 @@
[uxbox.state.project :as stpr]
[uxbox.ui.messages :as uum]
[uxbox.util.datetime :as dt]
[uxbox.util.data :refer (without-keys replace-by-id)]))
[uxbox.util.data :refer (without-keys
replace-by-id
index-by)]))
;; --- Pinned Page History Fetched
(declare update-history-index)
(defrecord PinnedPageHistoryFetched [history]
rs/UpdateEvent
(-apply-update [_ state]
(assoc-in state [:workspace :history :pinned-items] history)))
(-> state
(assoc-in [:workspace :history :pinned-items] (mapv :version history))
(update-history-index history true))))
;; --- Fetch Pinned Page History
@ -52,12 +58,22 @@
(defrecord PageHistoryFetched [history append?]
rs/UpdateEvent
(-apply-update [_ state]
(let [items (into [] history)
minv (apply min (map :version history))
state (assoc-in state [:workspace :history :min-version] minv)]
(if-not append?
(assoc-in state [:workspace :history :items] items)
(update-in state [:workspace :history :items] #(reduce conj % items))))))
(letfn [(update-counters [state items]
(-> (assoc state :min-version (apply min items))
(assoc :max-version (apply max items))))
(update-lists [state items]
(if append?
(update state :items #(reduce conj %1 items))
(assoc state :items items)))]
(let [items (mapv :version history)
hstate (-> (get-in state [:workspace :history] {})
(update-counters items)
(update-lists items))]
(-> state
(assoc-in [:workspace :history] hstate)
(update-history-index history append?))))))
;; --- Fetch Page History
@ -217,3 +233,13 @@
(defn update-history-item
[item]
(UpdateHistoryItem. item))
;; --- Helpers
(defn- update-history-index
[state history append?]
(let [index (index-by history :version)]
(if append?
(update-in state [:workspace :history :by-version] merge index)
(assoc-in state [:workspace :history :by-version] index))))

12
src/uxbox/ui/workspace/sidebar/history.cljs
View file

@ -81,7 +81,8 @@
:on-click on-select}
[:div.pin-icon i/pin]
[:span (str "Version " (:version page) " (current)")]]
(for [item (:items history)]
(for [version (:items history)
:let [item (get-in history [:by-version version])]]
(-> (history-item item selected)
(rum/with-key (str (:id item)))))
(if show-more?
@ -113,16 +114,11 @@
[own history]
(html
[:ul.history-content
(for [item (:pinned-items history)]
(for [version (:pinned-items history)
:let [item (get-in history [:by-version version])]]
(-> (history-item item (:selected history))
(rum/with-key (str (:id item)))))]))
;; [:li
;; [:span "Version 02/02/2016 12:33h"]
;; [:div.page-actions
;; [:a i/pencil]
;; [:a i/trash]]]]))
(def history-pinned-list
(mx/component
{:render history-pinned-list-render