github/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2026-08-29 08:08:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7868 from penpot/alotor-fix-flex-tools

Browse Source 
🐛 Fix visual feedback on padding/margin/gaps modified
This commit is contained in:
Elena Torró 2025-12-01 17:51:44 +01:00 committed by GitHub
commit 95c0d42d5b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 242 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
frontend/src/app/main/refs.cljs
View File

@ -372,6 +372,9 @@
(def workspace-modifiers (def workspace-modifiers
(l/derived :workspace-modifiers st/state)) (l/derived :workspace-modifiers st/state))
(def workspace-wasm-modifiers
(l/derived :workspace-wasm-modifiers st/state))
(def ^:private workspace-modifiers-with-objects (def ^:private workspace-modifiers-with-objects
(l/derived (l/derived
(fn [state] (fn [state]

80
frontend/src/app/main/ui/flex_controls/gap.cljs
View File

@ -7,6 +7,7 @@
(ns app.main.ui.flex-controls.gap (ns app.main.ui.flex-controls.gap
(:require (:require
[app.common.data :as d] [app.common.data :as d]
[app.common.data.macros :as dm]
[app.common.files.helpers :as cfh] [app.common.files.helpers :as cfh]
[app.common.geom.point :as gpt] [app.common.geom.point :as gpt]
[app.common.geom.shapes :as gsh] [app.common.geom.shapes :as gsh]
@ -29,7 +30,7 @@
(mf/defc gap-display (mf/defc gap-display
[{:keys [frame-id zoom gap-type gap on-pointer-enter on-pointer-leave [{:keys [frame-id zoom gap-type gap on-pointer-enter on-pointer-leave
rect-data hover? selected? mouse-pos hover-value rect-data hover? selected? mouse-pos hover-value
on-move-selected on-context-menu]}] on-move-selected on-context-menu on-change]}]
(let [resizing (mf/use-var nil) (let [resizing (mf/use-var nil)
start (mf/use-var nil) start (mf/use-var nil)
original-value (mf/use-var 0) original-value (mf/use-var 0)
@ -50,12 +51,18 @@
(mf/use-fn (mf/use-fn
(mf/deps frame-id gap-type gap) (mf/deps frame-id gap-type gap)
(fn [pos] (fn [pos]
(let [delta (-> (gpt/to-vec @start pos) (let [delta
(cond-> negate? gpt/negate) (-> (gpt/to-vec @start pos)
(get axis)) (cond-> negate? gpt/negate)
val (int (max (+ @original-value (/ delta zoom)) 0)) (get axis))
val
(int (max (+ @original-value (/ delta zoom)) 0))
layout-gap (assoc gap gap-type val)] layout-gap (assoc gap gap-type val)]
[val (dwm/create-modif-tree [frame-id] (ctm/change-property (ctm/empty) :layout-gap layout-gap))]))) [val
(dwm/create-modif-tree
[frame-id]
(ctm/change-property (ctm/empty) :layout-gap layout-gap))])))
on-lost-pointer-capture on-lost-pointer-capture
(mf/use-fn (mf/use-fn
@ -76,7 +83,7 @@
on-pointer-move on-pointer-move
(mf/use-fn (mf/use-fn
(mf/deps calc-modifiers) (mf/deps calc-modifiers on-change)
(fn [event] (fn [event]
(let [pos (dom/get-client-position event)] (let [pos (dom/get-client-position event)]
(reset! last-pos pos) (reset! last-pos pos)
@ -86,7 +93,9 @@
(reset! hover-value val) (reset! hover-value val)
(if (features/active-feature? @st/state "render-wasm/v1") (if (features/active-feature? @st/state "render-wasm/v1")
(st/emit! (dwm/set-wasm-modifiers modifiers)) (st/emit! (dwm/set-wasm-modifiers modifiers))
(st/emit! (dwm/set-modifiers modifiers))))))))] (st/emit! (dwm/set-modifiers modifiers)))
(when on-change
(on-change modifiers)))))))]
[:g.gap-rect [:g.gap-rect
[:rect.info-area [:rect.info-area
@ -138,10 +147,17 @@
pill-width (/ fcc/flex-display-pill-width zoom) pill-width (/ fcc/flex-display-pill-width zoom)
pill-height (/ fcc/flex-display-pill-height zoom) pill-height (/ fcc/flex-display-pill-height zoom)
workspace-modifiers (mf/deref refs/workspace-modifiers) workspace-modifiers (mf/deref refs/workspace-modifiers)
workspace-wasm-modifiers (mf/deref refs/workspace-wasm-modifiers)
gap-selected (mf/deref refs/workspace-gap-selected) gap-selected (mf/deref refs/workspace-gap-selected)
hover (mf/use-state nil) hover (mf/use-state nil)
hover-value (mf/use-state 0) hover-value (mf/use-state 0)
mouse-pos (mf/use-state nil) mouse-pos (mf/use-state nil)
current-modifiers (mf/use-state nil)
frame
(ctm/apply-structure-modifiers frame (dm/get-in @current-modifiers [frame-id :modifiers]))
padding (:layout-padding frame) padding (:layout-padding frame)
gap (:layout-gap frame) gap (:layout-gap frame)
{:keys [width height x1 y1]} (:selrect frame) {:keys [width height x1 y1]} (:selrect frame)
@ -150,6 +166,12 @@
(reset! hover-value val)) (reset! hover-value val))
on-pointer-leave #(reset! hover nil) on-pointer-leave #(reset! hover nil)
on-change
(mf/use-fn
(fn [modifiers]
(reset! current-modifiers modifiers)))
negate {:column-gap (if flip-x true false) negate {:column-gap (if flip-x true false)
:row-gap (if flip-y true false)} :row-gap (if flip-y true false)}
@ -161,8 +183,16 @@
(= :column-reverse saved-dir)) (= :column-reverse saved-dir))
(drop-last children) (drop-last children)
(rest children)) (rest children))
children-to-display (->> children-to-display children-to-display
(map #(gsh/transform-shape % (get-in workspace-modifiers [(:id %) :modifiers])))) (if (features/active-feature? @st/state "render-wasm/v1")
(let [modifiers (into {} workspace-wasm-modifiers)]
(->> children-to-display
;;(map #(gsh/transform-shape % (get-in workspace-modifiers [(:id %) :modifiers])))
(map (fn [shape]
(gsh/apply-transform shape (get modifiers (:id shape)))))))
(->> children-to-display
(map #(gsh/transform-shape % (get-in workspace-modifiers [(:id %) :modifiers])))))
wrap-blocks wrap-blocks
(let [block-children (->> children (let [block-children (->> children
@ -290,20 +320,22 @@
[:g.gaps {:pointer-events "visible"} [:g.gaps {:pointer-events "visible"}
(for [[index display-item] (d/enumerate (concat display-blocks display-children))] (for [[index display-item] (d/enumerate (concat display-blocks display-children))]
(let [gap-type (:gap-type display-item)] (let [gap-type (:gap-type display-item)]
[:& gap-display {:key (str frame-id index) [:& gap-display
:frame-id frame-id {:key (str frame-id index)
:zoom zoom :frame-id frame-id
:gap-type gap-type :zoom zoom
:gap gap :gap-type gap-type
:on-pointer-enter (partial on-pointer-enter gap-type (get gap gap-type)) :gap gap
:on-pointer-leave on-pointer-leave :on-pointer-enter (partial on-pointer-enter gap-type (get gap gap-type))
:on-move-selected on-move-selected :on-pointer-leave on-pointer-leave
:on-context-menu on-context-menu :on-move-selected on-move-selected
:rect-data display-item :on-context-menu on-context-menu
:hover? (= @hover gap-type) :on-change on-change
:selected? (= gap-selected gap-type) :rect-data display-item
:mouse-pos mouse-pos :hover? (= @hover gap-type)
:hover-value hover-value}])) :selected? (= gap-selected gap-type)
:mouse-pos mouse-pos
:hover-value hover-value}]))
(when @hover (when @hover
[:& fcc/flex-display-pill [:& fcc/flex-display-pill

128
frontend/src/app/main/ui/flex_controls/margin.cljs
View File

@ -6,6 +6,7 @@
(ns app.main.ui.flex-controls.margin (ns app.main.ui.flex-controls.margin
(:require (:require
[app.common.data.macros :as dm]
[app.common.geom.point :as gpt] [app.common.geom.point :as gpt]
[app.common.types.modifiers :as ctm] [app.common.types.modifiers :as ctm]
[app.main.data.workspace.modifiers :as dwm] [app.main.data.workspace.modifiers :as dwm]
@ -19,8 +20,10 @@
[app.util.dom :as dom] [app.util.dom :as dom]
[rumext.v2 :as mf])) [rumext.v2 :as mf]))
(mf/defc margin-display [{:keys [shape-id zoom hover-all? hover-v? hover-h? margin-num margin on-pointer-enter on-pointer-leave (mf/defc margin-display
rect-data hover? selected? mouse-pos hover-value]}] [{:keys [shape-id zoom hover-all? hover-v? hover-h? margin-num margin
on-pointer-enter on-pointer-leave on-change
rect-data hover? selected? mouse-pos hover-value]}]
(let [resizing? (mf/use-var false) (let [resizing? (mf/use-var false)
start (mf/use-var nil) start (mf/use-var nil)
original-value (mf/use-var 0) original-value (mf/use-var 0)
@ -39,6 +42,7 @@
calc-modifiers calc-modifiers
(mf/use-fn (mf/use-fn
(mf/deps shape-id margin-num margin hover-all? hover-v? hover-h?)
(fn [pos] (fn [pos]
(let [delta (let [delta
(-> (gpt/to-vec @start pos) (-> (gpt/to-vec @start pos)
@ -67,7 +71,7 @@
on-lost-pointer-capture on-lost-pointer-capture
(mf/use-fn (mf/use-fn
(mf/deps shape-id margin-num margin) (mf/deps calc-modifiers)
(fn [event] (fn [event]
(dom/release-pointer event) (dom/release-pointer event)
@ -85,7 +89,7 @@
on-pointer-move on-pointer-move
(mf/use-fn (mf/use-fn
(mf/deps shape-id margin-num margin hover-all? hover-v? hover-h?) (mf/deps calc-modifiers on-change)
(fn [event] (fn [event]
(let [pos (dom/get-client-position event)] (let [pos (dom/get-client-position event)]
(reset! mouse-pos (point->viewport pos)) (reset! mouse-pos (point->viewport pos))
@ -95,7 +99,10 @@
(reset! hover-value val) (reset! hover-value val)
(if (features/active-feature? @st/state "render-wasm/v1") (if (features/active-feature? @st/state "render-wasm/v1")
(st/emit! (dwm/set-wasm-modifiers modifiers)) (st/emit! (dwm/set-wasm-modifiers modifiers))
(st/emit! (dwm/set-modifiers modifiers))))))))] (st/emit! (dwm/set-modifiers modifiers)))
(when on-change
(on-change modifiers)))))))]
[:rect.margin-rect [:rect.margin-rect
{:x (:x rect-data) {:x (:x rect-data)
@ -118,6 +125,11 @@
pill-width (/ fcc/flex-display-pill-width zoom) pill-width (/ fcc/flex-display-pill-width zoom)
pill-height (/ fcc/flex-display-pill-height zoom) pill-height (/ fcc/flex-display-pill-height zoom)
margins-selected (mf/deref refs/workspace-margins-selected) margins-selected (mf/deref refs/workspace-margins-selected)
current-modifiers (mf/use-state nil)
shape
(ctm/apply-structure-modifiers shape (dm/get-in @current-modifiers [shape-id :modifiers]))
hover-value (mf/use-state 0) hover-value (mf/use-state 0)
mouse-pos (mf/use-state nil) mouse-pos (mf/use-state nil)
hover (mf/use-state nil) hover (mf/use-state nil)
@ -126,50 +138,67 @@
hover-h? (and (or (= @hover :m2) (= @hover :m4)) shift?) hover-h? (and (or (= @hover :m2) (= @hover :m4)) shift?)
margin (:layout-item-margin shape) margin (:layout-item-margin shape)
{:keys [width height x1 x2 y1 y2]} (:selrect shape) {:keys [width height x1 x2 y1 y2]} (:selrect shape)
on-pointer-enter (fn [hover-type val]
(reset! hover hover-type) on-pointer-enter
(reset! hover-value val)) (mf/use-fn
on-pointer-leave #(reset! hover nil) (fn [hover-type val]
hover? #(or hover-all? (reset! hover hover-type)
(and (or (= % :m1) (= % :m3)) hover-v?) (reset! hover-value val)))
(and (or (= % :m2) (= % :m4)) hover-h?)
(= @hover %)) on-pointer-leave
margin-display-data {:m1 {:key (str shape-id "-m1") (mf/use-fn
:x x1 (fn []
:y (if (:flip-y frame) y2 (- y1 (:m1 margin))) (reset! hover nil)))
:width width
:height (:m1 margin) on-change
:initial-value (:m1 margin) (mf/use-fn
:resize-type :top (fn [modifiers]
:resize-axis :y (reset! current-modifiers modifiers)))
:resize-negate? (:flip-y frame)}
:m2 {:key (str shape-id "-m2") hover?
:x (if (:flip-x frame) (- x1 (:m2 margin)) x2) (fn [value]
:y y1 (or hover-all?
:width (:m2 margin) (and (or (= value :m1) (= value :m3)) hover-v?)
:height height (and (or (= value :m2) (= value :m4)) hover-h?)
:initial-value (:m2 margin) (= @hover value)))
:resize-type :left
:resize-axis :x margin-display-data
:resize-negate? (:flip-x frame)} {:m1 {:key (str shape-id "-m1")
:m3 {:key (str shape-id "-m3") :x x1
:x x1 :y (if (:flip-y frame) y2 (- y1 (:m1 margin)))
:y (if (:flip-y frame) (- y1 (:m3 margin)) y2) :width width
:width width :height (:m1 margin)
:height (:m3 margin) :initial-value (:m1 margin)
:initial-value (:m3 margin) :resize-type :top
:resize-type :top :resize-axis :y
:resize-axis :y :resize-negate? (:flip-y frame)}
:resize-negate? (:flip-y frame)} :m2 {:key (str shape-id "-m2")
:m4 {:key (str shape-id "-m4") :x (if (:flip-x frame) (- x1 (:m2 margin)) x2)
:x (if (:flip-x frame) x2 (- x1 (:m4 margin))) :y y1
:y y1 :width (:m2 margin)
:width (:m4 margin) :height height
:height height :initial-value (:m2 margin)
:initial-value (:m4 margin) :resize-type :left
:resize-type :left :resize-axis :x
:resize-axis :x :resize-negate? (:flip-x frame)}
:resize-negate? (:flip-x frame)}}] :m3 {:key (str shape-id "-m3")
:x x1
:y (if (:flip-y frame) (- y1 (:m3 margin)) y2)
:width width
:height (:m3 margin)
:initial-value (:m3 margin)
:resize-type :top
:resize-axis :y
:resize-negate? (:flip-y frame)}
:m4 {:key (str shape-id "-m4")
:x (if (:flip-x frame) x2 (- x1 (:m4 margin)))
:y y1
:width (:m4 margin)
:height height
:initial-value (:m4 margin)
:resize-type :left
:resize-axis :x
:resize-negate? (:flip-x frame)}}]
[:g.margins {:pointer-events "visible"} [:g.margins {:pointer-events "visible"}
(for [[margin-num rect-data] margin-display-data] (for [[margin-num rect-data] margin-display-data]
@ -184,6 +213,7 @@
:margin margin :margin margin
:on-pointer-enter (partial on-pointer-enter margin-num (get margin margin-num)) :on-pointer-enter (partial on-pointer-enter margin-num (get margin margin-num))
:on-pointer-leave on-pointer-leave :on-pointer-leave on-pointer-leave
:on-change on-change
:rect-data rect-data :rect-data rect-data
:hover? (hover? margin-num) :hover? (hover? margin-num)
:selected? (get margins-selected margin-num) :selected? (get margins-selected margin-num)

165
frontend/src/app/main/ui/flex_controls/padding.cljs
View File

@ -6,6 +6,7 @@
(ns app.main.ui.flex-controls.padding (ns app.main.ui.flex-controls.padding
(:require (:require
[app.common.data.macros :as dm]
[app.common.geom.point :as gpt] [app.common.geom.point :as gpt]
[app.common.types.modifiers :as ctm] [app.common.types.modifiers :as ctm]
[app.main.data.workspace.modifiers :as dwm] [app.main.data.workspace.modifiers :as dwm]
@ -20,8 +21,9 @@
[rumext.v2 :as mf])) [rumext.v2 :as mf]))
(mf/defc padding-display (mf/defc padding-display
[{:keys [frame-id zoom hover-all? hover-v? hover-h? padding-num padding on-pointer-enter on-pointer-leave [{:keys [frame-id zoom hover-all? hover-v? hover-h? padding-num padding on-pointer-enter
rect-data hover? selected? mouse-pos hover-value on-move-selected on-context-menu]}] on-pointer-leave rect-data hover? selected? mouse-pos hover-value on-move-selected
on-context-menu on-change]}]
(let [resizing? (mf/use-var false) (let [resizing? (mf/use-var false)
start (mf/use-var nil) start (mf/use-var nil)
original-value (mf/use-var 0) original-value (mf/use-var 0)
@ -61,10 +63,11 @@
layout-padding-type layout-padding-type
(if (= (:p1 padding) (:p2 padding) (:p3 padding) (:p4 padding)) :simple :multiple)] (if (= (:p1 padding) (:p2 padding) (:p3 padding) (:p4 padding)) :simple :multiple)]
[val [val
(dwm/create-modif-tree [frame-id] (dwm/create-modif-tree
(-> (ctm/empty) [frame-id]
(ctm/change-property :layout-padding layout-padding) (-> (ctm/empty)
(ctm/change-property :layout-padding-type layout-padding-type)))]))) (ctm/change-property :layout-padding layout-padding)
(ctm/change-property :layout-padding-type layout-padding-type)))])))
on-lost-pointer-capture on-lost-pointer-capture
(mf/use-fn (mf/use-fn
@ -86,7 +89,7 @@
on-pointer-move on-pointer-move
(mf/use-fn (mf/use-fn
(mf/deps calc-modifiers) (mf/deps calc-modifiers on-change)
(fn [event] (fn [event]
(let [pos (dom/get-client-position event)] (let [pos (dom/get-client-position event)]
(reset! mouse-pos (point->viewport pos)) (reset! mouse-pos (point->viewport pos))
@ -96,7 +99,10 @@
(reset! hover-value val) (reset! hover-value val)
(if (features/active-feature? @st/state "render-wasm/v1") (if (features/active-feature? @st/state "render-wasm/v1")
(st/emit! (dwm/set-wasm-modifiers modifiers)) (st/emit! (dwm/set-wasm-modifiers modifiers))
(st/emit! (dwm/set-modifiers modifiers))))))))] (st/emit! (dwm/set-modifiers modifiers)))
(when on-change
(on-change modifiers)))))))]
[:g.padding-rect [:g.padding-rect
[:rect.info-area [:rect.info-area
@ -132,77 +138,108 @@
:on-lost-pointer-capture on-lost-pointer-capture :on-lost-pointer-capture on-lost-pointer-capture
:on-pointer-move on-pointer-move :on-pointer-move on-pointer-move
:on-context-menu on-context-menu :on-context-menu on-context-menu
:class (when (or hover? selected?) :class
(if (= (:resize-axis rect-data) :x) (cur/get-dynamic "resize-ew" 0) (cur/get-dynamic "resize-ew" 90))) (when (or hover? selected?)
:style {:fill (if (or hover? selected?) fcc/distance-color "none") (if (= (:resize-axis rect-data) :x)
:opacity (if selected? 0 1)}}])])) (cur/get-dynamic "resize-ew" 0)
(cur/get-dynamic "resize-ew" 90)))
:style
{:fill (if (or hover? selected?) fcc/distance-color "none")
:opacity (if selected? 0 1)}}])]))
(mf/defc padding-rects (mf/defc padding-rects
[{:keys [frame zoom alt? shift? on-move-selected on-context-menu]}] [{:keys [frame zoom alt? shift? on-move-selected on-context-menu]}]
(let [frame-id (:id frame) (let [frame-id (:id frame)
paddings-selected (mf/deref refs/workspace-paddings-selected) paddings-selected (mf/deref refs/workspace-paddings-selected)
current-modifiers (mf/use-state nil)
frame
(ctm/apply-structure-modifiers frame (dm/get-in @current-modifiers [frame-id :modifiers]))
hover-value (mf/use-state 0) hover-value (mf/use-state 0)
mouse-pos (mf/use-state nil) mouse-pos (mf/use-state nil)
hover (mf/use-state nil) hover (mf/use-state nil)
hover-all? (and (not (nil? @hover)) alt?) hover-all? (and (not (nil? @hover)) alt?)
hover-v? (and (or (= @hover :p1) (= @hover :p3)) shift?) hover-v? (and (or (= @hover :p1) (= @hover :p3)) shift?)
hover-h? (and (or (= @hover :p2) (= @hover :p4)) shift?) hover-h? (and (or (= @hover :p2) (= @hover :p4)) shift?)
padding (:layout-padding frame) padding (:layout-padding frame)
{:keys [width height x1 x2 y1 y2]} (:selrect frame) {:keys [width height x1 x2 y1 y2]} (:selrect frame)
on-pointer-enter (fn [hover-type val]
(reset! hover hover-type)
(reset! hover-value val))
on-pointer-leave #(reset! hover nil)
pill-width (/ fcc/flex-display-pill-width zoom) pill-width (/ fcc/flex-display-pill-width zoom)
pill-height (/ fcc/flex-display-pill-height zoom) pill-height (/ fcc/flex-display-pill-height zoom)
hover? #(or hover-all?
(and (or (= % :p1) (= % :p3)) hover-v?)
(and (or (= % :p2) (= % :p4)) hover-h?)
(= @hover %))
negate {:p1 (if (:flip-y frame) true false)
:p2 (if (:flip-x frame) true false)
:p3 (if (:flip-y frame) true false)
:p4 (if (:flip-x frame) true false)}
negate (cond-> negate
(not= :auto (:layout-item-h-sizing frame)) (assoc :p2 (not (:p2 negate)))
(not= :auto (:layout-item-v-sizing frame)) (assoc :p3 (not (:p3 negate))))
padding-rect-data {:p1 {:key (str frame-id "-p1") negate
:x x1 {:p1 (if (:flip-y frame) true false)
:y (if (:flip-y frame) (- y2 (:p1 padding)) y1) :p2 (if (:flip-x frame) true false)
:width width :p3 (if (:flip-y frame) true false)
:height (:p1 padding) :p4 (if (:flip-x frame) true false)}
:initial-value (:p1 padding)
:resize-type (if (:flip-y frame) :bottom :top) negate
:resize-axis :y (cond-> negate
:resize-negate? (:p1 negate)} (not= :auto (:layout-item-h-sizing frame)) (assoc :p2 (not (:p2 negate)))
:p2 {:key (str frame-id "-p2") (not= :auto (:layout-item-v-sizing frame)) (assoc :p3 (not (:p3 negate))))
:x (if (:flip-x frame) x1 (- x2 (:p2 padding)))
:y y1 padding-rect-data
:width (:p2 padding) {:p1 {:key (str frame-id "-p1")
:height height :x x1
:initial-value (:p2 padding) :y (if (:flip-y frame) (- y2 (:p1 padding)) y1)
:resize-type :left :width width
:resize-axis :x :height (:p1 padding)
:resize-negate? (:p2 negate)} :initial-value (:p1 padding)
:p3 {:key (str frame-id "-p3") :resize-type (if (:flip-y frame) :bottom :top)
:x x1 :resize-axis :y
:y (if (:flip-y frame) y1 (- y2 (:p3 padding))) :resize-negate? (:p1 negate)}
:width width :p2 {:key (str frame-id "-p2")
:height (:p3 padding) :x (if (:flip-x frame) x1 (- x2 (:p2 padding)))
:initial-value (:p3 padding) :y y1
:resize-type :bottom :width (:p2 padding)
:resize-axis :y :height height
:resize-negate? (:p3 negate)} :initial-value (:p2 padding)
:p4 {:key (str frame-id "-p4") :resize-type :left
:x (if (:flip-x frame) (- x2 (:p4 padding)) x1) :resize-axis :x
:y y1 :resize-negate? (:p2 negate)}
:width (:p4 padding) :p3 {:key (str frame-id "-p3")
:height height :x x1
:initial-value (:p4 padding) :y (if (:flip-y frame) y1 (- y2 (:p3 padding)))
:resize-type (if (:flip-x frame) :right :left) :width width
:resize-axis :x :height (:p3 padding)
:resize-negate? (:p4 negate)}}] :initial-value (:p3 padding)
:resize-type :bottom
:resize-axis :y
:resize-negate? (:p3 negate)}
:p4 {:key (str frame-id "-p4")
:x (if (:flip-x frame) (- x2 (:p4 padding)) x1)
:y y1
:width (:p4 padding)
:height height
:initial-value (:p4 padding)
:resize-type (if (:flip-x frame) :right :left)
:resize-axis :x
:resize-negate? (:p4 negate)}}
on-pointer-enter
(mf/use-fn
(fn [hover-type val]
(reset! hover hover-type)
(reset! hover-value val)))
on-pointer-leave
(mf/use-fn
(fn []
(reset! hover nil)))
on-change
(mf/use-fn
(fn [modifiers]
(reset! current-modifiers modifiers)))
hover?
(fn [value]
(or hover-all?
(and (or (= value :p1) (= value :p3)) hover-v?)
(and (or (= value :p2) (= value :p4)) hover-h?)
(= @hover value)))]
[:g.paddings {:pointer-events "visible"} [:g.paddings {:pointer-events "visible"}
(for [[padding-num rect-data] padding-rect-data] (for [[padding-num rect-data] padding-rect-data]
@ -221,9 +258,11 @@
:on-pointer-leave on-pointer-leave :on-pointer-leave on-pointer-leave
:on-move-selected on-move-selected :on-move-selected on-move-selected
:on-context-menu on-context-menu :on-context-menu on-context-menu
:on-change on-change
:hover? (hover? padding-num) :hover? (hover? padding-num)
:selected? (get paddings-selected padding-num) :selected? (get paddings-selected padding-num)
:rect-data rect-data}]) :rect-data rect-data}])
(when @hover (when @hover
[:& fcc/flex-display-pill [:& fcc/flex-display-pill
{:height pill-height {:height pill-height

6
frontend/src/app/main/ui/workspace/viewport_wasm.cljs
View File

@ -54,15 +54,11 @@
[app.util.debug :as dbg] [app.util.debug :as dbg]
[app.util.text-editor :as ted] [app.util.text-editor :as ted]
[beicon.v2.core :as rx] [beicon.v2.core :as rx]
[okulary.core :as l]
[promesa.core :as p] [promesa.core :as p]
[rumext.v2 :as mf])) [rumext.v2 :as mf]))
;; --- Viewport ;; --- Viewport
(def workspace-wasm-modifiers
(l/derived :workspace-wasm-modifiers st/state))
(defn apply-modifiers-to-selected (defn apply-modifiers-to-selected
[selected objects modifiers] [selected objects modifiers]
(->> modifiers (->> modifiers
@ -98,7 +94,7 @@
;; DEREFS ;; DEREFS
drawing (mf/deref refs/workspace-drawing) drawing (mf/deref refs/workspace-drawing)
focus (mf/deref refs/workspace-focus-selected) focus (mf/deref refs/workspace-focus-selected)
wasm-modifiers (mf/deref workspace-wasm-modifiers) wasm-modifiers (mf/deref refs/workspace-wasm-modifiers)
workspace-editor-state (mf/deref refs/workspace-editor-state) workspace-editor-state (mf/deref refs/workspace-editor-state)

2
render-wasm/src/shapes/modifiers.rs
View File

@ -290,7 +290,7 @@ fn propagate_reflow(
let mut skip_reflow = false; let mut skip_reflow = false;
if shape.is_layout_horizontal_fill() || shape.is_layout_vertical_fill() { if shape.is_layout_horizontal_fill() || shape.is_layout_vertical_fill() {
if let Some(parent_id) = shape.parent_id { if let Some(parent_id) = shape.parent_id {
if !reflown.contains(&parent_id) { if parent_id != Uuid::nil() && !reflown.contains(&parent_id) {
// If this is a fill layout but the parent has not been reflown yet // If this is a fill layout but the parent has not been reflown yet
// we wait for the next iteration for reflow // we wait for the next iteration for reflow
skip_reflow = true; skip_reflow = true;