Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-02-13 10:38:13 -05:00
Code Issues Activity

Fix unexpected flash on history dialog in some situations.

Browse source 
When latest history item is selected multiple times.
This commit is contained in:
Andrey Antukh 2017-02-28 18:23:13 +01:00
parent 1954aebb48
commit 1782d34d4a
No known key found for this signature in database
GPG key ID: 4DFEBCB8316A8B95
3 changed files with 81 additions and 95 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
frontend/src/uxbox/main/data/history.cljs
View file

@ -147,22 +147,30 @@
;; --- Deselect Page History
(defrecord DeselectPageHistory [id]
(defrecord DeselectPageHistory [id ^:mutable noop]
ptk/UpdateEvent
(update [_ state]
(let [packed (get-in state [:packed-pages id])]
(-> (udp/assoc-page state packed)
(assoc-in [:workspace :history :deselecting] true)
(assoc-in [:workspace :history :selected] nil))))
(let [selected (get-in state [:workspace :history :selected])]
(if (nil? selected)
(do
(set! noop true)
state)
(let [packed (get-in state [:packed-pages id])]
(-> (udp/assoc-page state packed)
(assoc-in [:workspace :history :deselecting] true)
(assoc-in [:workspace :history :selected] nil))))))
ptk/WatchEvent
(watch [_ state s]
(->> (rx/of #(assoc-in % [:workspace :history :deselecting] false))
(rx/delay 500))))
(if noop
(rx/empty)
(->> (rx/of #(assoc-in % [:workspace :history :deselecting] false))
(rx/delay 500)))))
(defn deselect-page-history
[id]
(DeselectPageHistory. id))
{:pre [(uuid? id)]}
(DeselectPageHistory. id false))
;; --- History Item Updated

4
frontend/src/uxbox/main/refs.cljs
View file

@ -78,6 +78,10 @@
(-> (l/key :edition)
(l/derive workspace)))
(def history
(-> (l/key :history)
(l/derive workspace)))
(defn selected-modifiers
[id]
{:pre [(uuid? id)]}

148
frontend/src/uxbox/main/ui/workspace/sidebar/history.cljs
View file

@ -2,13 +2,11 @@
;; License, v. 2.0. If a copy of the MPL was not distributed with this
;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
;;
;; Copyright (c) 2015-2016 Andrey Antukh <niwi@niwi.nz>
;; Copyright (c) 2015-2016 Juan de la Cruz <delacruzgarciajuan@gmail.com>
;; Copyright (c) 2015-2017 Andrey Antukh <niwi@niwi.nz>
;; Copyright (c) 2015-2017 Juan de la Cruz <delacruzgarciajuan@gmail.com>
(ns uxbox.main.ui.workspace.sidebar.history
(:require [sablono.core :as html :refer-macros [html]]
[rum.core :as rum]
[lentes.core :as l]
(:require [lentes.core :as l]
[potok.core :as ptk]
[uxbox.main.store :as st]
[uxbox.main.refs :as refs]
@ -18,10 +16,11 @@
[uxbox.builtins.icons :as i]
[uxbox.util.i18n :refer (tr)]
[uxbox.util.router :as r]
[uxbox.util.mixins :as mx :include-macros true]
[uxbox.util.time :as dt]
[uxbox.util.data :refer (read-string)]
[uxbox.util.dom :as dom]))
[uxbox.util.dom :as dom]
[uxbox.util.mixins :as mx :include-macros true]
[uxbox.util.time :as dt]))
;; --- Lenses
@ -31,8 +30,9 @@
;; --- History Item (Component)
(defn history-item-render
[own item selected]
(mx/defc history-item
{:mixins [mx/static]}
[item selected]
(letfn [(on-select [event]
(dom/prevent-default event)
(st/emit! (udh/select-page-history (:version item))))
@ -44,24 +44,18 @@
:pinned (not (:pinned item)))]
(st/emit! (udh/update-history-item item))))]
(let [selected? (= (:version item) selected)]
(html
[:li {:class (when selected? "current") :on-click on-select}
[:div.pin-icon {:on-click on-pinned
:class (when (:pinned item) "selected")}
i/pin]
[:span (str "Version " (:version item)
" (" (dt/timeago (:created-at item)) ")")]]))))
(def history-item
(mx/component
{:render history-item-render
:name "history-item"
:mixins [mx/static]}))
[:li {:class (when selected? "current") :on-click on-select}
[:div.pin-icon {:on-click on-pinned
:class (when (:pinned item) "selected")}
i/pin]
[:span (str "Version " (:version item)
" (" (dt/timeago (:created-at item)) ")")]])))
;; --- History List (Component)
(defn history-list-render
[own page history]
(mx/defc history-list
{:mixins [mx/static]}
[page history]
(letfn [(on-select [event]
(dom/prevent-default event)
(st/emit! (udh/deselect-page-history (:id page))))
@ -74,87 +68,67 @@
(let [selected (:selected history)
show-more? (pos? (:min-version history))]
(html
[:ul.history-content
[:li {:class (when-not selected "current")
:on-click on-select}
[:div.pin-icon i/pin]
[:ul.history-content
[:li {:class (when-not selected "current")
:on-click on-select}
[:div.pin-icon i/pin]
[:span (str "Version " (:version page) " (current)")]]
(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?
[:li {:on-click on-load-more}
[:a.btn-primary.btn-small
"view more"]])]))))
(def history-list
(mx/component
{:render history-list-render
:name "history-list"
:mixins [mx/static]}))
(for [version (:items history)
:let [item (get-in history [:by-version version])]]
(-> (history-item item selected)
(mx/with-key (str (:id item)))))
(if show-more?
[:li {:on-click on-load-more}
[:a.btn-primary.btn-small
"view more"]])])))
;; --- History Pinned List (Component)
(defn history-pinned-list-render
[own history]
(html
[:ul.history-content
(for [version (:pinned-items history)
:let [item (get-in history [:by-version version])]]
(-> (history-item item (:selected history))
(rum/with-key (str (:id item)))))]))
(def history-pinned-list
(mx/component
{:render history-pinned-list-render
:name "history-pinned-list"
:mixins [mx/static]}))
(mx/defc history-pinned-list
{:mixins [mx/static]}
[history]
[:ul.history-content
(for [version (:pinned-items history)
:let [item (get-in history [:by-version version])]]
(-> (history-item item (:selected history))
(mx/with-key (str (:id item)))))])
;; --- History Toolbox (Component)
(defn history-toolbox-render
[own]
(let [local (:rum/local own)
page (mx/react refs/selected-page)
history (mx/react history-ref)
(mx/defcs history-toolbox
{:mixins [mx/static mx/reactive (mx/local)]}
[{:keys [rum/local] :as own}]
(let [page (mx/react refs/selected-page)
history (mx/react refs/history)
section (:section @local :main)
close #(st/emit! (dw/toggle-flag :document-history))
main? (= section :main)
pinned? (= section :pinned)
show-main #(swap! local assoc :section :main)
show-pinned #(swap! local assoc :section :pinned)]
(html
[:div.document-history.tool-window
[:div.tool-window-bar
[:div.tool-window-icon i/undo-history]
[:span (tr "ds.document-history")]
[:div.tool-window-close {:on-click close} i/close]]
[:div.tool-window-content
[:ul.history-tabs
[:li {:on-click show-main
:class (when main? "selected")}
"History"]
[:li {:on-click show-pinned
:class (when pinned? "selected")}
"Pinned"]]
(if (= section :pinned)
(history-pinned-list history)
(history-list page history))]])))
(def history-toolbox
(mx/component
{:render history-toolbox-render
:name "document-history-toolbox"
:mixins [mx/static mx/reactive (mx/local)]}))
[:div.document-history.tool-window
[:div.tool-window-bar
[:div.tool-window-icon i/undo-history]
[:span (tr "ds.document-history")]
[:div.tool-window-close {:on-click close} i/close]]
[:div.tool-window-content
[:ul.history-tabs
[:li {:on-click show-main
:class (when main? "selected")}
"History"]
[:li {:on-click show-pinned
:class (when pinned? "selected")}
"Pinned"]]
(if (= section :pinned)
(history-pinned-list history)
(history-list page history))]]))
;; --- History Dialog
(mx/defc history-dialog
{:mixins [mx/static mx/reactive]}
[page]
(let [history (mx/react history-ref)
(let [history (mx/react refs/history)
version (:selected history)
on-accept #(st/emit! (udh/apply-selected-history page))
on-cancel #(st/emit! (udh/deselect-page-history page))]