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

🐛 Fixed right click context menu

Browse source
This commit is contained in:
alonso.torres 2020-12-07 17:14:16 +01:00 • committed by Hirunatan
parent 60e6dd7822
commit 34af5e4563
6 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

3
frontend/src/app/main/data/workspace.cljs
View file

@ -1146,7 +1146,8 @@
ptk/WatchEvent ptk/WatchEvent
(watch [_ state stream] (watch [_ state stream]
(rx/of (dws/select-shape (:id shape)))))) (rx/of (dws/deselect-all)
(dws/select-shape (:id shape))))))
(def hide-context-menu (def hide-context-menu
(ptk/reify ::hide-context-menu (ptk/reify ::hide-context-menu

10
frontend/src/app/main/ui/components/dropdown.cljs
View file

@ -31,11 +31,11 @@
on-mount on-mount
(fn [] (fn []
(let [lkey1 (events/listen (dom/get-root) EventType.CLICK on-click) (let [keys [(events/listen js/document EventType.CLICK on-click)
lkey2 (events/listen (dom/get-root) EventType.KEYUP on-keyup)] (events/listen js/document EventType.CONTEXTMENU on-click)
#(do (events/listen js/document EventType.KEYUP on-keyup)]]
(events/unlistenByKey lkey1) #(doseq [key keys]
(events/unlistenByKey lkey2))))] (events/unlistenByKey key))))]
(mf/use-effect on-mount) (mf/use-effect on-mount)
children)) children))

3
frontend/src/app/main/ui/modal.cljs
View file

@ -77,7 +77,8 @@
(fn [] (fn []
(let [keys [(events/listen js/window EventType.POPSTATE on-pop-state) (let [keys [(events/listen js/window EventType.POPSTATE on-pop-state)
(events/listen js/document EventType.KEYDOWN handle-keydown) (events/listen js/document EventType.KEYDOWN handle-keydown)
(events/listen (dom/get-root) EventType.CLICK handle-click-outside)]] (events/listen js/document EventType.CLICK handle-click-outside)
(events/listen js/document EventType.CONTEXTMENU handle-click-outside)]]
#(doseq [key keys] #(doseq [key keys]
(events/unlistenByKey key))))) (events/unlistenByKey key)))))

2
frontend/src/app/main/ui/workspace/shapes/path/editor.cljs
View file

@ -186,7 +186,7 @@
(mf/use-layout-effect (mf/use-layout-effect
(fn [] (fn []
(let [keys [(events/listen (dom/get-root) EventType.CLICK handle-click-outside)]] (let [keys [(events/listen js/document EventType.CLICK handle-click-outside)]]
#(doseq [key keys] #(doseq [key keys]
(events/unlistenByKey key))))) (events/unlistenByKey key)))))

4
frontend/src/app/main/ui/workspace/shapes/text/editor.cljs
View file

@ -203,8 +203,8 @@
on-mount on-mount
(fn [] (fn []
(let [lkey1 (events/listen (dom/get-root) EventType.CLICK on-click-outside) (let [lkey1 (events/listen js/document EventType.CLICK on-click-outside)
lkey2 (events/listen (dom/get-root) EventType.KEYUP on-key-up)] lkey2 (events/listen js/document EventType.KEYUP on-key-up)]
(st/emit! (dwt/assign-editor id editor) (st/emit! (dwt/assign-editor id editor)
(dwc/start-undo-transaction)) (dwc/start-undo-transaction))

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

@ -248,7 +248,6 @@
(mf/use-callback (mf/use-callback
(fn [event] (fn [event]
(dom/prevent-default event) (dom/prevent-default event)
(dom/stop-propagation event)
(let [position (dom/get-client-position event)] (let [position (dom/get-client-position event)]
(st/emit! (dw/show-context-menu {:position position}))))) (st/emit! (dw/show-context-menu {:position position})))))
@ -287,7 +286,6 @@
on-click on-click
(mf/use-callback (mf/use-callback
(fn [event] (fn [event]
(dom/stop-propagation 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)]