Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-01-23 23:18:48 -05:00
Code Issues Activity

Port copy & move tooltips to icons page.

Browse source
This commit is contained in:
Andrey Antukh 2016-11-08 17:15:56 +01:00
parent 6b85b459d7
commit eae616b823
No known key found for this signature in database
GPG key ID: 4DFEBCB8316A8B95
3 changed files with 46 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/uxbox/main/data/icons.cljs
View file

@ -356,14 +356,17 @@
(defrecord CopySelected [id]
rs/WatchEvent
(-apply-watch [_ state stream]
(let [selected (get-in state [:dashboard :icons :selected])
selected (map #(get-in state [:icons %]) selected)]
(let [selected (get-in state [:dashboard :icons :selected])]
(rx/merge
(->> (rx/from-coll selected)
(rx/map #(get-in state [:icons %]))
(rx/map #(dissoc % :id))
(rx/map #(assoc % :collection id))
(rx/flat-map #(rp/req :create/icon %))
(rx/map :payload)
(rx/map icon-created)))))
(rx/map icon-created))
(->> (rx/from-coll selected)
(rx/map deselect-icon))))))
(defn copy-selected
[id]

72
src/uxbox/main/ui/dashboard/icons.cljs
View file

@ -64,11 +64,6 @@
(-> (l/key :icons)
(l/derive st/state)))
;; (defn- focus-collection
;; [id]
;; (-> (l/key id)
;; (l/derive collections-map-ref)))
;; --- Page Title
(mx/defcs page-title
@ -210,42 +205,23 @@
:type "file"
:on-change on-file-selected}]]))
(mx/defc grid-options-copy
(mx/defc grid-options-tooltip
{:mixins [mx/reactive mx/static]}
[current-coll]
{:pre [(uuid? current-coll)]}
[& {:keys [selected on-select title]}]
{:pre [(uuid? selected)
(fn? on-select)
(string? title)]}
(let [colls (mx/react collections-ref)
colls (->> (vals colls)
(filter #(= :own (:type %)))
(remove #(= current-coll (:id %)))
(remove #(= selected (:id %)))
(sort-by :name colls))
on-select (fn [event id]
(dom/prevent-default event)
(rs/emit! (di/copy-selected id)))]
(dom/stop-propagation event)
(on-select id))]
[:ul.move-list
[:li.title "Copy to library"]
[:li [:a {:href "#" :on-click #(on-select % nil)} "Storage"]]
(for [coll colls
:let [id (:id coll)
name (:name coll)]]
[:li {:key (str id)}
[:a {:on-click #(on-select % id)} name]])]))
(mx/defc grid-options-move
{:mixins [mx/reactive mx/static]}
[current-coll]
{:pre [(uuid? current-coll)]}
(let [colls (mx/react collections-ref)
colls (->> (vals colls)
(filter #(= :own (:type %)))
(remove #(= current-coll (:id %)))
(sort-by :name colls))
on-select (fn [event id]
(println "on-select" event id)
(dom/prevent-default event)
(rs/emit! (di/move-selected id)))]
[:ul.move-list
[:li.title "Move to library"]
[:li.title title]
[:li [:a {:href "#" :on-click #(on-select % nil)} "Storage"]]
(for [coll colls
:let [id (:id coll)
@ -266,15 +242,35 @@
(on-toggle-copy [event]
(swap! local update :show-copy-tooltip not))
(on-toggle-move [event]
(swap! local update :show-move-tooltip not))]
(swap! local update :show-move-tooltip not))
(on-copy [selected]
(println "copy from" id "to" selected)
(swap! local assoc
:show-move-tooltip false
:show-copy-tooltip false)
(rs/emit! (di/copy-selected selected)))
(on-move [selected]
(swap! local assoc
:show-move-tooltip false
:show-copy-tooltip false)
(rs/emit! (di/move-selected selected)))]
;; MULTISELECT OPTIONS BAR
[:div.multiselect-bar
(if editable?
[:div.multiselect-nav
[:span.move-item.tooltip.tooltip-top
{:alt "Move items" :on-click on-toggle-move}
{:on-click on-toggle-copy :alt "Copy"}
(when (:show-copy-tooltip @local)
(grid-options-tooltip :selected id
:title "Copy to library"
:on-select on-copy))
i/organize]
[:span.move-item.tooltip.tooltip-top
{:on-click on-toggle-move :alt "Move"}
(when (:show-move-tooltip @local)
(grid-options-move id))
(grid-options-tooltip :selected id
:title "Move to library"
:on-select on-move))
i/organize]
[:span.move-item.tooltip.tooltip-top
{:alt "Rename"}
@ -287,7 +283,9 @@
[:span.move-item.tooltip.tooltip-top
{:on-click on-toggle-copy}
(when (:show-copy-tooltip @local)
(grid-options-copy id))
(grid-options-tooltip :selected id
:title "Copy to library"
:on-select on-copy))
i/organize]])])))
(mx/defc grid-item

2
src/uxbox/main/ui/dashboard/images.cljs
View file

@ -211,7 +211,6 @@
:type "file"
:on-change on-file-selected}]])))
(mx/defc grid-options-tooltip
{:mixins [mx/reactive mx/static]}
[& {:keys [selected on-select title]}]
@ -250,7 +249,6 @@
(on-toggle-move [event]
(swap! local update :show-move-tooltip not))
(on-copy [selected]
(println "copy from" id "to" selected)
(swap! local assoc
:show-move-tooltip false
:show-copy-tooltip false)