From 2e2ce6bcfe112832fc7215449d00bfa2a7ba70ce Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Tue, 5 Sep 2023 16:24:00 +0200 Subject: [PATCH] :lipstick: Add cosmetic improvements to some workspace frame related components --- .../app/main/ui/workspace/shapes/frame.cljs | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/frontend/src/app/main/ui/workspace/shapes/frame.cljs b/frontend/src/app/main/ui/workspace/shapes/frame.cljs index 32040ccbcd..95767bca38 100644 --- a/frontend/src/app/main/ui/workspace/shapes/frame.cljs +++ b/frontend/src/app/main/ui/workspace/shapes/frame.cljs @@ -77,16 +77,18 @@ {::mf/wrap [#(mf/memo' % check-props)] ::mf/wrap-props false} [props] - (let [shape (unchecked-get props "shape") - frame-id (:id shape) - objects (wsh/lookup-page-objects @st/state) - node-ref (mf/use-ref nil) - modifiers-ref (mf/use-memo (mf/deps frame-id) #(refs/workspace-modifiers-by-frame-id frame-id)) - modifiers (mf/deref modifiers-ref)] + (let [shape (unchecked-get props "shape") + objects (wsh/lookup-page-objects @st/state) + + frame-id (dm/get-prop shape :id) + + node-ref (mf/use-ref nil) + modifiers* (mf/with-memo [frame-id] + (refs/workspace-modifiers-by-frame-id frame-id)) + modifiers (mf/deref modifiers*)] (fdm/use-dynamic-modifiers objects (mf/ref-val node-ref) modifiers) - (let [shape (unchecked-get props "shape")] - [:& frame-shape {:shape shape :ref node-ref}]))))) + [:& frame-shape {:shape shape :ref node-ref}])))) (defn root-frame-wrapper-factory