mirror of
https://github.com/penpot/penpot.git
synced 2025-07-21 16:27:20 +02:00
🐛 Fixes problems with hover on elements
This commit is contained in:
parent
4b22615f97
commit
20a7366432
7 changed files with 28 additions and 19 deletions
|
@ -147,7 +147,19 @@
|
||||||
:id (:id group)
|
:id (:id group)
|
||||||
:operations [{:type :set
|
:operations [{:type :set
|
||||||
:attr :masked-group?
|
:attr :masked-group?
|
||||||
:val true}]}
|
:val true}
|
||||||
|
{:type :set
|
||||||
|
:attr :selrect
|
||||||
|
:val (-> shapes first :selrect)}
|
||||||
|
{:type :set
|
||||||
|
:attr :points
|
||||||
|
:val (-> shapes first :points)}
|
||||||
|
{:type :set
|
||||||
|
:attr :transform
|
||||||
|
:val (-> shapes first :transform)}
|
||||||
|
{:type :set
|
||||||
|
:attr :transform-inverse
|
||||||
|
:val (-> shapes first :transform-inverse)}]}
|
||||||
{:type :reg-objects
|
{:type :reg-objects
|
||||||
:page-id page-id
|
:page-id page-id
|
||||||
:shapes [(:id group)]}])
|
:shapes [(:id group)]}])
|
||||||
|
|
|
@ -314,11 +314,8 @@
|
||||||
|
|
||||||
(defn change-hover-state
|
(defn change-hover-state
|
||||||
[id value]
|
[id value]
|
||||||
(letfn [(update-hover [items]
|
(ptk/reify ::change-hover-state
|
||||||
(if value
|
ptk/UpdateEvent
|
||||||
(conj items id)
|
(update [_ state]
|
||||||
(disj items id)))]
|
(let [hover-value (if value #{id} #{})]
|
||||||
(ptk/reify ::change-hover-state
|
(assoc-in state [:workspace-local :hover] hover-value)))))
|
||||||
ptk/UpdateEvent
|
|
||||||
(update [_ state]
|
|
||||||
(update-in state [:workspace-local :hover] (fnil update-hover #{}))))))
|
|
||||||
|
|
|
@ -22,6 +22,6 @@
|
||||||
[:> shape-container {:shape shape
|
[:> shape-container {:shape shape
|
||||||
:on-mouse-down (we/use-mouse-down shape)
|
:on-mouse-down (we/use-mouse-down shape)
|
||||||
:on-context-menu (we/use-context-menu shape)
|
:on-context-menu (we/use-context-menu shape)
|
||||||
:on-pointer-enter (we/use-pointer-enter shape)
|
:on-pointer-over (we/use-pointer-enter shape)
|
||||||
:on-pointer-leave (we/use-pointer-leave shape)}
|
:on-pointer-out (we/use-pointer-leave shape)}
|
||||||
[:& component {:shape shape}]])))
|
[:& component {:shape shape}]])))
|
||||||
|
|
|
@ -73,8 +73,8 @@
|
||||||
:class "workspace-frame-label"
|
:class "workspace-frame-label"
|
||||||
:transform (text-transform label-pos zoom)
|
:transform (text-transform label-pos zoom)
|
||||||
:on-click handle-click
|
:on-click handle-click
|
||||||
:on-pointer-enter handle-pointer-enter
|
:on-pointer-over handle-pointer-enter
|
||||||
:on-pointer-leave handle-pointer-leave}
|
:on-pointer-out handle-pointer-leave}
|
||||||
(:name frame)]))
|
(:name frame)]))
|
||||||
|
|
||||||
(defn make-is-moving-ref
|
(defn make-is-moving-ref
|
||||||
|
|
|
@ -94,7 +94,7 @@
|
||||||
:height height
|
:height height
|
||||||
:on-mouse-down handle-mouse-down
|
:on-mouse-down handle-mouse-down
|
||||||
:on-context-menu handle-context-menu
|
:on-context-menu handle-context-menu
|
||||||
:on-pointer-enter handle-pointer-enter
|
:on-pointer-over handle-pointer-enter
|
||||||
:on-pointer-leave handle-pointer-leave
|
:on-pointer-out handle-pointer-leave
|
||||||
:on-double-click handle-double-click}])]]))))
|
:on-double-click handle-double-click}])]]))))
|
||||||
|
|
||||||
|
|
|
@ -49,8 +49,8 @@
|
||||||
:pointer-events (when editing? "none")
|
:pointer-events (when editing? "none")
|
||||||
:on-mouse-down handle-mouse-down
|
:on-mouse-down handle-mouse-down
|
||||||
:on-context-menu handle-context-menu
|
:on-context-menu handle-context-menu
|
||||||
:on-pointer-enter handle-pointer-enter
|
:on-pointer-over handle-pointer-enter
|
||||||
:on-pointer-leave handle-pointer-leave
|
:on-pointer-out handle-pointer-leave
|
||||||
:on-double-click handle-double-click}
|
:on-double-click handle-double-click}
|
||||||
[:& path/path-shape {:shape shape
|
[:& path/path-shape {:shape shape
|
||||||
:background? true}]]))
|
:background? true}]]))
|
||||||
|
|
|
@ -124,8 +124,8 @@
|
||||||
:style {:fill "transparent"}
|
:style {:fill "transparent"}
|
||||||
:on-mouse-down handle-mouse-down
|
:on-mouse-down handle-mouse-down
|
||||||
:on-context-menu handle-context-menu
|
:on-context-menu handle-context-menu
|
||||||
:on-pointer-enter handle-pointer-enter
|
:on-pointer-over handle-pointer-enter
|
||||||
:on-pointer-leave handle-pointer-leave
|
:on-pointer-out handle-pointer-leave
|
||||||
:on-double-click handle-double-click
|
:on-double-click handle-double-click
|
||||||
:transform (gsh/transform-matrix shape)}])]))
|
:transform (gsh/transform-matrix shape)}])]))
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue