3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-08-02 07:28:24 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/staging' into develop

Browse source
This commit is contained in:
Andrey Antukh 2022-02-22 13:06:09 +01:00
commit a4ef3f770c
39 changed files with 981 additions and 817 deletions
Download patch file Download diff file Expand all files Collapse all files

5
frontend/src/app/main/ui/workspace/context_menu.cljs
View file

@ -103,7 +103,8 @@
(mf/defc context-menu-edit
[]
(let [do-copy (st/emitf (dw/copy-selected))
do-cut (st/emitf (dw/copy-selected) dw/delete-selected)
do-cut (st/emitf (dw/copy-selected)
(dw/delete-selected))
do-paste (st/emitf dw/paste)
do-duplicate (st/emitf (dw/duplicate-selected false))]
[:*
@ -406,7 +407,7 @@
(mf/defc context-menu-delete
[]
(let [do-delete (st/emitf dw/delete-selected)]
(let [do-delete (st/emitf (dw/delete-selected))]
[:& menu-entry {:title (tr "workspace.shape.menu.delete")
:shortcut (sc/get-tooltip :delete)
:on-click do-delete}]))

26
frontend/src/app/main/ui/workspace/viewport/actions.cljs
View file

@ -186,19 +186,23 @@
(st/emit! (ms/->MouseEvent :double-click ctrl? shift? alt?))
(when (and (not drawing-path?) shape)
(cond frame?
(st/emit! (dw/select-shape id shift?))
;; Emit asynchronously so the double click to exit shapes won't break
(timers/schedule
#(when (and (not drawing-path?) shape)
(cond
frame?
(st/emit! (dw/select-shape id shift?))
(and group? (> (count @hover-ids) 1))
(let [selected (get objects (second @hover-ids))]
(reset! hover selected)
(reset! hover-ids (into [] (rest @hover-ids)))
(st/emit! (dw/select-shape (:id selected))))
(and group? (> (count @hover-ids) 1))
(let [selected (get objects (second @hover-ids))]
(reset! hover selected)
(reset! hover-ids (into [] (rest @hover-ids)))
(not= id edition)
(st/emit! (dw/select-shape id)
(dw/start-editing-selected))))))))
(st/emit! (dw/select-shape (:id selected))))
(not= id edition)
(st/emit! (dw/select-shape id)
(dw/start-editing-selected)))))))))
(defn on-context-menu
[hover hover-ids]

4
frontend/src/app/main/ui/workspace/viewport/guides.cljs
View file

@ -36,7 +36,7 @@
(defn use-guide
"Hooks to support drag/drop for existing guides and new guides"
[on-guide-change get-hover-frame zoom {:keys [position axis frame-id]}]
[on-guide-change get-hover-frame zoom {:keys [id position axis frame-id]}]
(let [dragging-ref (mf/use-ref false)
start-ref (mf/use-ref nil)
start-pos-ref (mf/use-ref nil)
@ -52,11 +52,13 @@
on-pointer-enter
(mf/use-callback
(fn []
(st/emit! (dw/set-hover-guide id true))
(swap! state assoc :hover true)))
on-pointer-leave
(mf/use-callback
(fn []
(st/emit! (dw/set-hover-guide id false))
(swap! state assoc :hover false)))
on-pointer-down