Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-02-07 06:48:19 -05:00
Code Issues Activity

💄 Adapt frame-wrapper to use new rumext helpers

Browse source
This commit is contained in:
Andrey Antukh 2024-02-27 12:12:17 +01:00 • committed by Alonso Torres
parent b6134e1afe
commit 9c47d34f98
2 changed files with 17 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
frontend/src/app/main/ui/workspace/sidebar/layer_item.cljs
View file

@ -155,14 +155,13 @@
children]))
(mf/defc layer-item
{::mf/wrap-props false
::mf/wrap [mf/memo]}
{::mf/props :obj
::mf/memo true}
[{:keys [index item selected objects sortable? filtered? depth parent-size component-child? highlighted]}]
(let [id (:id item)
blocked? (:blocked item)
hidden? (:hidden item)
drag-disabled* (mf/use-state false)
drag-disabled? (deref drag-disabled*)

41
frontend/src/app/main/ui/workspace/sidebar/layers.cljs
View file

@ -24,7 +24,6 @@
[app.util.globals :as globals]
[app.util.i18n :as i18n :refer [tr]]
[app.util.keyboard :as kbd]
[app.util.object :as obj]
[app.util.timers :as ts]
[beicon.v2.core :as rx]
[cuerdas.core :as str]
@ -36,35 +35,25 @@
;; level frames and try to avoid rerender frames that are does not
;; affected by the selected set.
(mf/defc frame-wrapper
{::mf/wrap-props false}
[props]
(let [selected (obj/get props "selected")
callback (mf/use-var false)
{::mf/props :obj}
[{:keys [selected] :as props}]
(let [disposable (mf/use-var nil)
pending-selected (mf/use-var selected)
current-selected (mf/use-state selected)
props (mf/spread props :selected @current-selected)]
props
(-> props
(obj/clone)
(obj/set! "selected" @current-selected))]
(mf/with-effect [selected]
(reset! pending-selected selected)
(swap! disposable (fn [value]
(when (some? value)
(rx/dispose! value))
(ts/idle-then-raf
(fn []
(reset! current-selected @pending-selected)
(reset! disposable nil)))))
(fn []
(some-> @disposable rx/dispose!)))
(mf/use-effect
(mf/deps selected)
(fn []
;; Change in selected we schedule a idle-then-raf
;; following changes will update the pending but not create
;; a new callbacks
(reset! pending-selected selected)
(when (not @callback)
(reset!
callback
(ts/idle-then-raf
(fn []
(reset! current-selected @pending-selected)
(reset! callback nil)))))
(fn []
(when @callback
(rx/dispose! @callback)))))
[:> layer-item props]))
(mf/defc layers-tree