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

🐛 Fixes some problems with shapes selection

Browse source
This commit is contained in:
alonso.torres 2021-03-23 11:55:22 +01:00
parent ebcb820335
commit 8cf2d4f3a4
2 changed files with 41 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -89,7 +89,7 @@
drawing-path? (and edition (= :draw (get-in edit-path [edition :edit-mode]))) drawing-path? (and edition (= :draw (get-in edit-path [edition :edit-mode])))
text-editing? (and edition (= :text (get-in objects [edition :type]))) text-editing? (and edition (= :text (get-in objects [edition :type])))
on-click (actions/on-click) on-click (actions/on-click hover selected)
on-context-menu (actions/on-context-menu hover) on-context-menu (actions/on-context-menu hover)
on-double-click (actions/on-double-click hover hover-ids objects) on-double-click (actions/on-double-click hover hover-ids objects)
on-drag-enter (actions/on-drag-enter) on-drag-enter (actions/on-drag-enter)
@ -102,7 +102,7 @@
on-pointer-leave (actions/on-pointer-leave in-viewport?) on-pointer-leave (actions/on-pointer-leave in-viewport?)
on-pointer-move (actions/on-pointer-move viewport-ref zoom move-stream) on-pointer-move (actions/on-pointer-move viewport-ref zoom move-stream)
on-pointer-up (actions/on-pointer-up) on-pointer-up (actions/on-pointer-up)
on-move-selected (actions/on-move-selected hover selected) on-move-selected (actions/on-move-selected hover hover-ids selected)
on-frame-enter (actions/on-frame-enter frame-hover) on-frame-enter (actions/on-frame-enter frame-hover)
on-frame-leave (actions/on-frame-leave frame-hover) on-frame-leave (actions/on-frame-leave frame-hover)

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

@ -76,18 +76,19 @@
(dw/start-move-selected)))))))))) (dw/start-move-selected))))))))))
(defn on-move-selected (defn on-move-selected
[hover selected] [hover hover-ids selected]
(mf/use-callback (mf/use-callback
(mf/deps @hover selected) (mf/deps @hover @hover-ids selected)
(fn [bevent] (fn [bevent]
(let [event (.-nativeEvent bevent) (let [event (.-nativeEvent bevent)
shift? (kbd/shift? event) shift? (kbd/shift? event)
left-click? (= 1 (.-which event))] left-click? (= 1 (.-which event))]
(when (and left-click? (when (and left-click?
(not shift?) (not shift?)
(or (not @hover) (or (not @hover)
(contains? selected (:id @hover)) (= :frame (:type @hover))
(contains? selected (:frame-id @hover)))) (some #(contains? selected %) @hover-ids)))
(dom/prevent-default bevent) (dom/prevent-default bevent)
(dom/stop-propagation bevent) (dom/stop-propagation bevent)
(st/emit! (dw/start-move-selected))))))) (st/emit! (dw/start-move-selected)))))))
@ -117,13 +118,21 @@
(reset! frame-hover nil)))) (reset! frame-hover nil))))
(defn on-click (defn on-click
[] [hover selected]
(mf/use-callback (mf/use-callback
(mf/deps @hover selected)
(fn [event] (fn [event]
(let [ctrl? (kbd/ctrl? event) (let [ctrl? (kbd/ctrl? event)
shift? (kbd/shift? event) shift? (kbd/shift? event)
alt? (kbd/alt? event)] alt? (kbd/alt? event)
(st/emit! (ms/->MouseEvent :click ctrl? shift? alt?))))))
hovering? (some? @hover)
frame? (= :frame (:type @hover))
selected? (contains? selected (:id @hover))]
(st/emit! (ms/->MouseEvent :click ctrl? shift? alt?))
(when (and hovering? (not shift?) (not frame?) (not selected?))
(st/emit! (dw/select-shape (:id @hover))))))))
(defn on-double-click (defn on-double-click
[hover hover-ids objects] [hover hover-ids objects]
@ -163,14 +172,19 @@
(defn on-context-menu (defn on-context-menu
[hover] [hover]
(let [{:keys [id]} @hover] (mf/use-callback
(mf/use-callback (mf/deps @hover)
(mf/deps id) (fn [event]
(fn [event] (dom/prevent-default event)
(dom/prevent-default event)
(let [position (dom/get-client-position event)] (let [position (dom/get-client-position event)]
(st/emit! (dw/show-context-menu {:position position ;; Delayed callback because we need to wait to the previous context menu to be closed
:shape @hover}))))))) (timers/schedule
#(st/emit!
(if (some? @hover)
(dw/show-shape-context-menu {:position position
:shape @hover})
(dw/show-context-menu {:position position}))))))))
(defn on-mouse-up (defn on-mouse-up
[disable-paste] [disable-paste]
@ -231,18 +245,20 @@
(defn on-key-down [] (defn on-key-down []
(mf/use-callback (mf/use-callback
(fn [event] (fn [event]
(let [bevent (.getBrowserEvent ^js event) (let [bevent (.getBrowserEvent ^js event)
key (.-keyCode ^js event) key (.-keyCode ^js event)
key (.normalizeKeyCode KeyCodes key) key (.normalizeKeyCode KeyCodes key)
ctrl? (kbd/ctrl? event) ctrl? (kbd/ctrl? event)
shift? (kbd/shift? event) shift? (kbd/shift? event)
alt? (kbd/alt? event) alt? (kbd/alt? event)
meta? (kbd/meta? event) meta? (kbd/meta? event)
target (dom/get-target event)] target (dom/get-target event)
editor? (some? (.closest ^js target ".public-DraftEditor-content"))]
(when-not (.-repeat bevent) (when-not (.-repeat bevent)
(st/emit! (ms/->KeyboardEvent :down key shift? ctrl? alt? meta?)) (st/emit! (ms/->KeyboardEvent :down key shift? ctrl? alt? meta?))
(when (and (kbd/space? event) (when (and (kbd/space? event)
(not editor?)
(not= "rich-text" (obj/get target "className")) (not= "rich-text" (obj/get target "className"))
(not= "INPUT" (obj/get target "tagName")) (not= "INPUT" (obj/get target "tagName"))
(not= "TEXTAREA" (obj/get target "tagName"))) (not= "TEXTAREA" (obj/get target "tagName")))