3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-05-26 04:56:14 +02:00
Code Issues Projects Releases Packages Wiki Activity

🐛 Fix problem with move+alt

Browse source
This commit is contained in:
alonso.torres 2021-10-04 10:51:13 +02:00 • committed by Andrey Antukh
parent f9082e18e2
commit 68e3d53cb7
5 changed files with 28 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

4
frontend/src/app/main/data/workspace/selection.cljs
View file

@ -428,14 +428,14 @@
delta (gpt/subtract new-pos (gpt/point obj))] delta (gpt/subtract new-pos (gpt/point obj))]
delta)))) delta))))
(def duplicate-selected (defn duplicate-selected [move-delta?]
(ptk/reify ::duplicate-selected (ptk/reify ::duplicate-selected
ptk/WatchEvent ptk/WatchEvent
(watch [it state _] (watch [it state _]
(let [page-id (:current-page-id state) (let [page-id (:current-page-id state)
objects (wsh/lookup-page-objects state page-id) objects (wsh/lookup-page-objects state page-id)
selected (wsh/lookup-selected state) selected (wsh/lookup-selected state)
delta (if (= (count selected) 1) delta (if (and move-delta? (= (count selected) 1))
(let [obj (get objects (first selected))] (let [obj (get objects (first selected))]
(calc-duplicate-delta obj state objects)) (calc-duplicate-delta obj state objects))
(gpt/point 0 0)) (gpt/point 0 0))

2
frontend/src/app/main/data/workspace/shortcuts.cljs
View file

@ -119,7 +119,7 @@
:duplicate {:tooltip (ds/meta "D") :duplicate {:tooltip (ds/meta "D")
:command (ds/c-mod "d") :command (ds/c-mod "d")
:fn #(st/emit! dw/duplicate-selected)} :fn #(st/emit! (dw/duplicate-selected true))}
:undo {:tooltip (ds/meta "Z") :undo {:tooltip (ds/meta "Z")
:command (ds/c-mod "z") :command (ds/c-mod "z")

2
frontend/src/app/main/data/workspace/transforms.cljs
View file

@ -505,7 +505,7 @@
(if alt? (if alt?
;; When alt is down we start a duplicate+move ;; When alt is down we start a duplicate+move
(rx/of (start-move-duplicate initial) (rx/of (start-move-duplicate initial)
dws/duplicate-selected) (dws/duplicate-selected false))
;; Otherwise just plain old move ;; Otherwise just plain old move
(rx/of (start-move initial selected))))))))))) (rx/of (start-move initial selected)))))))))))

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

@ -109,7 +109,7 @@
current-file-id (mf/use-ctx ctx/current-file-id) current-file-id (mf/use-ctx ctx/current-file-id)
do-duplicate (st/emitf dw/duplicate-selected) do-duplicate (st/emitf (dw/duplicate-selected false))
do-delete (st/emitf dw/delete-selected) do-delete (st/emitf dw/delete-selected)
do-copy (st/emitf (dw/copy-selected)) 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)

31
frontend/src/app/main/ui/workspace/viewport/hooks.cljs
View file

@ -117,10 +117,16 @@
over-shapes-stream over-shapes-stream
(mf/use-memo (mf/use-memo
(fn [] (fn []
(rx/merge
(->> move-stream (->> move-stream
;; When transforming shapes we stop querying the worker ;; When transforming shapes we stop querying the worker
(rx/filter #(not (some? (mf/ref-val transform-ref)))) (rx/filter #(not (some? (mf/ref-val transform-ref))))
(rx/switch-map query-point))))] (rx/switch-map query-point))
(->> move-stream
;; When transforming shapes we stop querying the worker
(rx/filter #(some? (mf/ref-val transform-ref)))
(rx/map (constantly nil))))))]
;; Refresh the refs on a value change ;; Refresh the refs on a value change
(mf/use-effect (mf/use-effect
@ -147,19 +153,22 @@
over-shapes-stream over-shapes-stream
(mf/deps page-id objects @ctrl?) (mf/deps page-id objects @ctrl?)
(fn [ids] (fn [ids]
(let [selected (mf/ref-val selected-ref) (let [is-group?
remove-id? (into #{} (mapcat #(cp/get-parents % objects)) selected)
is-group?
(fn [id] (fn [id]
(contains? #{:group :bool} (get-in objects [id :type]))) (contains? #{:group :bool} (get-in objects [id :type])))
remove-id? selected (mf/ref-val selected-ref)
(if @ctrl?
(d/concat remove-id? (filterv is-group? ids)) remove-xfm (mapcat #(cp/get-parents % objects))
remove-id?) remove-id? (cond-> (into #{} remove-xfm selected)
ids (->> ids (filterv (comp not remove-id?)))] @ctrl?
(reset! hover (get objects (first ids))) (d/concat (filterv is-group? ids)))
ids (->> ids (filterv (comp not remove-id?)))
hover-shape (get objects (first ids))]
(reset! hover hover-shape)
(reset! hover-ids ids)))))) (reset! hover-ids ids))))))
(defn setup-viewport-modifiers [modifiers selected objects render-ref] (defn setup-viewport-modifiers [modifiers selected objects render-ref]