Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-01-24 07:29:08 -05:00
Code Issues Activity

Merge remote-tracking branch 'origin/staging' into develop

Browse source
This commit is contained in:
Andrey Antukh 2021-04-06 15:07:29 +02:00
commit 8f51450f7e
4 changed files with 20 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
frontend/src/app/main/ui/workspace/shapes.cljs
View file

@ -76,8 +76,7 @@
shape (-> (geom/transform-shape shape) shape (-> (geom/transform-shape shape)
(geom/translate-to-frame frame)) (geom/translate-to-frame frame))
opts #js {:shape shape opts #js {:shape shape
:frame frame :frame frame}
:pointer-events (when (:blocked shape) "none")}
svg-element? (and (= (:type shape) :svg-raw) svg-element? (and (= (:type shape) :svg-raw)
(not= :svg (get-in shape [:content :tag])))] (not= :svg (get-in shape [:content :tag])))]

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

@ -92,7 +92,7 @@
(and (some? drawing-obj) (= :path (:type drawing-obj)))) (and (some? drawing-obj) (= :path (:type drawing-obj))))
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 hover selected edition drawing-path?) on-click (actions/on-click hover selected edition drawing-path? drawing-tool)
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 drawing-path? objects) on-double-click (actions/on-double-click hover hover-ids drawing-path? objects)
on-drag-enter (actions/on-drag-enter) on-drag-enter (actions/on-drag-enter)
@ -117,7 +117,7 @@
show-draw-area? drawing-obj show-draw-area? drawing-obj
show-gradient-handlers? (= (count selected) 1) show-gradient-handlers? (= (count selected) 1)
show-grids? (contains? layout :display-grid) show-grids? (contains? layout :display-grid)
show-outlines? (and (nil? transform) (not edition) (not drawing-obj)) show-outlines? (and (nil? transform) (not edition) (not drawing-obj) (not (#{:comments :path} drawing-tool)))
show-pixel-grid? (>= zoom 8) show-pixel-grid? (>= zoom 8)
show-presence? page-id show-presence? page-id
show-prototypes? (= options-mode :prototype) show-prototypes? (= options-mode :prototype)

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

@ -34,7 +34,8 @@
(mf/use-callback (mf/use-callback
(mf/deps id blocked hidden type drawing-tool text-editing? edition edit-path selected) (mf/deps id blocked hidden type drawing-tool text-editing? edition edit-path selected)
(fn [bevent] (fn [bevent]
(when (dom/class? (dom/get-target bevent) "viewport-controls") (when (or (dom/class? (dom/get-target bevent) "viewport-controls")
(dom/class? (dom/get-target bevent) "viewport-selrect"))
(dom/stop-propagation bevent) (dom/stop-propagation bevent)
(let [event (.-nativeEvent bevent) (let [event (.-nativeEvent bevent)
@ -58,9 +59,9 @@
(when (and (not= edition id) text-editing?) (when (and (not= edition id) text-editing?)
(st/emit! dw/clear-edition-mode)) (st/emit! dw/clear-edition-mode))
(when (and (or (not edition) (not= edition id)) (not blocked) (not hidden)) (when (and (or (not edition) (not= edition id)) (not blocked) (not hidden) (not (#{:comments :path} drawing-tool)))
(cond (cond
(and drawing-tool (not (#{:comments :path} drawing-tool))) drawing-tool
(st/emit! (dd/start-drawing drawing-tool)) (st/emit! (dd/start-drawing drawing-tool))
(and edit-path (contains? edit-path edition)) (and edit-path (contains? edit-path edition))
@ -119,11 +120,12 @@
(reset! frame-hover nil)))) (reset! frame-hover nil))))
(defn on-click (defn on-click
[hover selected edition drawing-path?] [hover selected edition drawing-path? drawing-tool]
(mf/use-callback (mf/use-callback
(mf/deps @hover selected edition drawing-path?) (mf/deps @hover selected edition drawing-path? drawing-tool)
(fn [event] (fn [event]
(when (dom/class? (dom/get-target event) "viewport-controls") (when (or (dom/class? (dom/get-target event) "viewport-controls")
(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)
alt? (kbd/alt? event) alt? (kbd/alt? event)
@ -133,7 +135,13 @@
selected? (contains? selected (:id @hover))] selected? (contains? selected (:id @hover))]
(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?) (not edition) (not drawing-path?)) (when (and hovering?
(not shift?)
(not frame?)
(not selected?)
(not edition)
(not drawing-path?)
(not (#{:comments :path} drawing-tool)))
(st/emit! (dw/select-shape (:id @hover))))))))) (st/emit! (dw/select-shape (:id @hover)))))))))
(defn on-double-click (defn on-double-click

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

@ -26,7 +26,8 @@
[{:keys [shape zoom tool] :as props}] [{:keys [shape zoom tool] :as props}]
[:g.draw-area [:g.draw-area
[:& shapes/shape-wrapper {:shape shape}] [:g {:style {:pointer-events "none"}}
[:& shapes/shape-wrapper {:shape shape}]]
(case tool (case tool
:path [:& path-editor {:shape shape :zoom zoom}] :path [:& path-editor {:shape shape :zoom zoom}]