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

Merge pull request #3566 from penpot/superalex-fix-rulers

Browse source 
🐛 Bugfixing
This commit is contained in:
Andrey Antukh 2023-08-29 13:05:48 +02:00 • committed by GitHub
commit d8a42bf3c1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 27 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -448,7 +448,7 @@
:use-for-thumbnail?) :use-for-thumbnail?)
(cond-> (cond->
(or group? bool?) (or frame? group? bool?)
(assoc :shapes [])) (assoc :shapes []))
(gsh/move delta) (gsh/move delta)

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

@ -10,6 +10,7 @@
[app.util.dom :as dom] [app.util.dom :as dom]
[app.util.globals :as globals] [app.util.globals :as globals]
[app.util.keyboard :as kbd] [app.util.keyboard :as kbd]
[app.util.timers :as tm]
[goog.events :as events] [goog.events :as events]
[goog.object :as gobj] [goog.object :as gobj]
[rumext.v2 :as mf]) [rumext.v2 :as mf])
@ -18,24 +19,26 @@
(mf/defc dropdown' (mf/defc dropdown'
{::mf/wrap-props false} {::mf/wrap-props false}
[props] [props]
(let [children (gobj/get props "children") (let [children (gobj/get props "children")
on-close (gobj/get props "on-close") on-close (gobj/get props "on-close")
ref (gobj/get props "container") container-ref (gobj/get props "container")
listening-ref (mf/use-ref nil)
on-click on-click
(fn [event] (fn [event]
(let [target (dom/get-target event) (when (mf/ref-val listening-ref)
(let [target (dom/get-target event)
;; MacOS ctrl+click sends two events: context-menu and click. ;; MacOS ctrl+click sends two events: context-menu and click.
;; In order to not have two handlings we ignore ctrl+click for this platform ;; In order to not have two handlings we ignore ctrl+click for this platform
mac-ctrl-click? (and (cfg/check-platform? :macos) (kbd/ctrl? event))] mac-ctrl-click? (and (cfg/check-platform? :macos) (kbd/ctrl? event))]
(when (and (not mac-ctrl-click?) (when (and (not mac-ctrl-click?)
(not (.-data-no-close ^js target))) (not (.-data-no-close ^js target)))
(if ref (if container-ref
(let [parent (mf/ref-val ref)] (let [parent (mf/ref-val container-ref)]
(when-not (or (not parent) (.contains parent target)) (when-not (or (not parent) (.contains parent target))
(on-close))) (on-close)))
(on-close))))) (on-close))))))
on-keyup on-keyup
(fn [event] (fn [event]
@ -47,8 +50,8 @@
(let [keys [(events/listen globals/document EventType.CLICK on-click) (let [keys [(events/listen globals/document EventType.CLICK on-click)
(events/listen globals/document EventType.CONTEXTMENU on-click) (events/listen globals/document EventType.CONTEXTMENU on-click)
(events/listen globals/document EventType.KEYUP on-keyup)]] (events/listen globals/document EventType.KEYUP on-keyup)]]
#(doseq [key keys] (tm/schedule #(mf/set-ref-val! listening-ref true))
(events/unlistenByKey key))))] #(run! events/unlistenByKey keys)))]
(mf/use-effect on-mount) (mf/use-effect on-mount)
children)) children))

4
frontend/src/app/main/ui/viewer/inspect/render.cljs
View file

@ -170,7 +170,9 @@
(mf/use-memo (mf/deps objects) (mf/use-memo (mf/deps objects)
#(svg-raw-container-factory objects))] #(svg-raw-container-factory objects))]
(when (and shape (not (:hidden shape))) (when (and shape (not (:hidden shape)))
(let [shape (gsh/translate-to-frame shape frame) (let [shape (if frame
(gsh/translate-to-frame shape frame)
shape)
opts #js {:shape shape opts #js {:shape shape
:frame frame}] :frame frame}]
(case (:type shape) (case (:type shape)

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

@ -56,7 +56,8 @@
(.setPointerCapture target (.-pointerId bevent)))) (.setPointerCapture target (.-pointerId bevent))))
(when (or (dom/class? (dom/get-target bevent) "viewport-controls") (when (or (dom/class? (dom/get-target bevent) "viewport-controls")
(dom/child? (dom/get-target bevent) (dom/query ".viewport-controls"))) (dom/class? (dom/get-target bevent) "viewport-selrect")
(dom/child? (dom/get-target bevent) (dom/query ".grid-layout-editor")))
(dom/stop-propagation bevent) (dom/stop-propagation bevent)
@ -161,7 +162,7 @@
(fn [event] (fn [event]
(when (and (nil? selrect) (when (and (nil? selrect)
(or (dom/class? (dom/get-target event) "viewport-controls") (or (dom/class? (dom/get-target event) "viewport-controls")
(dom/child? (dom/get-target event) (dom/query ".viewport-controls")) (dom/child? (dom/get-target event) (dom/query ".grid-layout-editor"))
(dom/class? (dom/get-target event) "viewport-selrect"))) (dom/class? (dom/get-target event) "viewport-selrect")))
(let [ctrl? (kbd/ctrl? event) (let [ctrl? (kbd/ctrl? event)
shift? (kbd/shift? event) shift? (kbd/shift? event)
@ -236,7 +237,7 @@
(dom/prevent-default event) (dom/prevent-default event)
(when-not workspace-read-only? (when-not workspace-read-only?
(when (or (dom/class? (dom/get-target event) "viewport-controls") (when (or (dom/class? (dom/get-target event) "viewport-controls")
(dom/child? (dom/get-target event) (dom/query ".viewport-controls")) (dom/child? (dom/get-target event) (dom/query ".grid-layout-editor"))
(dom/class? (dom/get-target event) "viewport-selrect") (dom/class? (dom/get-target event) "viewport-selrect")
workspace-read-only?) workspace-read-only?)
(let [position (dom/get-client-position event)] (let [position (dom/get-client-position event)]