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

🐛 Fix when right click on a selected text shows artboard contextual menu

Browse source
This commit is contained in:
alonso.torres 2021-03-29 20:15:49 +02:00 • committed by Andrey Antukh
parent 60f6093357
commit 62ed2221e9
2 changed files with 53 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGES.md
View file

@ -68,6 +68,7 @@
- Fix layout problem for editable selects [Taiga #1488](https://tree.taiga.io/project/penpot/issue/1488) - Fix layout problem for editable selects [Taiga #1488](https://tree.taiga.io/project/penpot/issue/1488)
- Fix artboard title wasn't move when resizing [Taiga #1479](https://tree.taiga.io/project/penpot/issue/1479) - Fix artboard title wasn't move when resizing [Taiga #1479](https://tree.taiga.io/project/penpot/issue/1479)
- Fix titles in viewer thumbnails too long [Taiga #1474](https://tree.taiga.io/project/penpot/issue/1474) - Fix titles in viewer thumbnails too long [Taiga #1474](https://tree.taiga.io/project/penpot/issue/1474)
- Fix when right click on a selected text shows artboard contextual menu [Taiga #1226](https://tree.taiga.io/project/penpot/issue/1226)
### :arrow_up: Deps updates ### :arrow_up: Deps updates

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

@ -34,6 +34,7 @@
(mf/use-callback (mf/use-callback
(mf/deps id blocked hidden type drawing-tool text-editing? edition selected) (mf/deps id blocked hidden type drawing-tool text-editing? edition selected)
(fn [bevent] (fn [bevent]
(when (dom/class? (dom/get-target bevent) "viewport-controls")
(dom/stop-propagation bevent) (dom/stop-propagation bevent)
(let [event (.-nativeEvent bevent) (let [event (.-nativeEvent bevent)
@ -73,7 +74,7 @@
(st/emit! (when (or shift? (not selected?)) (st/emit! (when (or shift? (not selected?))
(dw/select-shape id shift?)) (dw/select-shape id shift?))
(when (not shift?) (when (not shift?)
(dw/start-move-selected)))))))))) (dw/start-move-selected)))))))))))
(defn on-move-selected (defn on-move-selected
[hover hover-ids selected] [hover hover-ids selected]
@ -122,6 +123,7 @@
(mf/use-callback (mf/use-callback
(mf/deps @hover selected) (mf/deps @hover selected)
(fn [event] (fn [event]
(when (dom/class? (dom/get-target event) "viewport-controls")
(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)
@ -132,7 +134,7 @@
(st/emit! (ms/->MouseEvent :click ctrl? shift? alt?)) (st/emit! (ms/->MouseEvent :click ctrl? shift? alt?))
(when (and hovering? (not shift?) (not frame?) (not selected?)) (when (and hovering? (not shift?) (not frame?) (not selected?))
(st/emit! (dw/select-shape (:id @hover)))))))) (st/emit! (dw/select-shape (:id @hover)))))))))
(defn on-double-click (defn on-double-click
[hover hover-ids drawing-path? objects] [hover hover-ids drawing-path? objects]
@ -176,6 +178,7 @@
(mf/use-callback (mf/use-callback
(mf/deps @hover) (mf/deps @hover)
(fn [event] (fn [event]
(when (dom/class? (dom/get-target event) "viewport-controls")
(dom/prevent-default event) (dom/prevent-default event)
(let [position (dom/get-client-position event)] (let [position (dom/get-client-position event)]
@ -185,7 +188,7 @@
(if (some? @hover) (if (some? @hover)
(dw/show-shape-context-menu {:position position (dw/show-shape-context-menu {:position position
:shape @hover}) :shape @hover})
(dw/show-context-menu {:position position})))))))) (dw/show-context-menu {:position position})))))))))
(defn on-mouse-up (defn on-mouse-up
[disable-paste] [disable-paste]