3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-07-21 20:47:14 +02:00
Code Issues Projects Releases Packages Wiki Activity

🐛 Do recursive swap-slot finding

Browse source
This commit is contained in:
Andrés Moya 2024-03-07 13:09:43 +01:00 • committed by Alejandro Alonso
parent bad0fb912b
commit 2c740df767
4 changed files with 45 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

20
common/src/app/common/types/file.cljc
View file

@ -204,7 +204,7 @@
(defn find-ref-shape (defn find-ref-shape
"Locate the nearest component in the local file or libraries, and retrieve the shape "Locate the nearest component in the local file or libraries, and retrieve the shape
referenced by the instance shape." referenced by the instance shape."
[file page libraries shape & {:keys [include-deleted? with-context?] :or {include-deleted? false with-context? false}}] [file container libraries shape & {:keys [include-deleted? with-context?] :or {include-deleted? false with-context? false}}]
(let [find-ref-shape-in-head (let [find-ref-shape-in-head
(fn [head-shape] (fn [head-shape]
(let [component-file (find-component-file file libraries (:component-file head-shape)) (let [component-file (find-component-file file libraries (:component-file head-shape))
@ -213,7 +213,7 @@
(when (some? component) (when (some? component)
(get-ref-shape (:data component-file) component shape :with-context? with-context?))))] (get-ref-shape (:data component-file) component shape :with-context? with-context?))))]
(some find-ref-shape-in-head (ctn/get-parent-heads (:objects page) shape)))) (some find-ref-shape-in-head (ctn/get-parent-heads (:objects container) shape))))
(defn find-ref-component (defn find-ref-component
"Locate the nearest component in the local file or libraries that is referenced by the "Locate the nearest component in the local file or libraries that is referenced by the
@ -265,14 +265,13 @@
(true? (= (:id component) (:id ref-component))))) (true? (= (:id component) (:id ref-component)))))
(defn find-swap-slot (defn find-swap-slot
[shape page file libraries] [shape container file libraries]
(dm/assert! "expected shape is head" (ctk/instance-head? shape))
;; (js/console.log "find-swap-slot" (clj->js shape)) ;; (js/console.log "find-swap-slot" (clj->js shape))
(if-let [swap-slot (ctk/get-swap-slot shape)] (if-let [swap-slot (ctk/get-swap-slot shape)]
;; (do (js/console.log "uno" (str swap-slot)) swap-slot) ;; (do (js/console.log "uno" (str swap-slot)) swap-slot)
swap-slot swap-slot
(let [ref-shape (find-ref-shape file (let [ref-shape (find-ref-shape file
page container
libraries libraries
shape shape
:include-deleted? true :include-deleted? true
@ -292,11 +291,12 @@
(find-swap-slot ref-shape ref-container ref-file libraries))))))) (find-swap-slot ref-shape ref-container ref-file libraries)))))))
(defn match-swap-slot? (defn match-swap-slot?
[shape-main shape-inst page-inst page-main file libraries] [shape-main shape-inst container-inst container-main file libraries]
(let [slot-main (find-swap-slot shape-main page-main file libraries) (let [slot-main (find-swap-slot shape-main container-main file libraries)
slot-inst (find-swap-slot shape-inst page-inst file libraries)] slot-inst (find-swap-slot shape-inst container-inst file libraries)]
(or (= slot-main slot-inst) (when (some? slot-inst)
(= (:id shape-main) slot-inst)))) (or (= slot-main slot-inst)
(= (:id shape-main) slot-inst)))))
(defn get-component-shapes (defn get-component-shapes
"Retrieve all shapes of the component" "Retrieve all shapes of the component"

6
frontend/src/app/main/data/workspace/libraries.cljs
View file

@ -699,6 +699,7 @@
(watch [it state _] (watch [it state _]
(log/info :msg "RESET-COMPONENT of shape" :id (str id)) (log/info :msg "RESET-COMPONENT of shape" :id (str id))
(let [file (wsh/get-local-file state) (let [file (wsh/get-local-file state)
file-full (wsh/get-local-file-full state)
libraries (wsh/get-libraries state) libraries (wsh/get-libraries state)
page-id (:current-page-id state) page-id (:current-page-id state)
@ -711,7 +712,7 @@
(-> (pcb/empty-changes it) (-> (pcb/empty-changes it)
(pcb/with-container container) (pcb/with-container container)
(pcb/with-objects (:objects container)) (pcb/with-objects (:objects container))
(dwlh/generate-sync-shape-direct libraries container id true components-v2))] (dwlh/generate-sync-shape-direct file-full libraries container id true components-v2))]
(log/debug :msg "RESET-COMPONENT finished" :js/rchanges (log-changes (log/debug :msg "RESET-COMPONENT finished" :js/rchanges (log-changes
(:redo-changes changes) (:redo-changes changes)
@ -750,6 +751,7 @@
(log/info :msg "UPDATE-COMPONENT of shape" :id (str id) :undo-group undo-group) (log/info :msg "UPDATE-COMPONENT of shape" :id (str id) :undo-group undo-group)
(let [page-id (get state :current-page-id) (let [page-id (get state :current-page-id)
local-file (wsh/get-local-file state) local-file (wsh/get-local-file state)
full-file (wsh/get-local-file-full state)
container (cfh/get-container local-file :page page-id) container (cfh/get-container local-file :page page-id)
shape (ctn/get-shape container id) shape (ctn/get-shape container id)
components-v2 (features/active-feature? state "components/v2")] components-v2 (features/active-feature? state "components/v2")]
@ -761,7 +763,7 @@
(-> (pcb/empty-changes it) (-> (pcb/empty-changes it)
(pcb/set-undo-group undo-group) (pcb/set-undo-group undo-group)
(pcb/with-container container) (pcb/with-container container)
(dwlh/generate-sync-shape-inverse libraries container id components-v2)) (dwlh/generate-sync-shape-inverse full-file libraries container id components-v2))
file-id (:component-file shape) file-id (:component-file shape)
file (wsh/get-file state file-id) file (wsh/get-file state file-id)

35
frontend/src/app/main/data/workspace/libraries_helpers.cljs
View file

@ -425,8 +425,9 @@
(defmethod generate-sync-shape :components (defmethod generate-sync-shape :components
[_ changes _library-id state container shape components-v2] [_ changes _library-id state container shape components-v2]
(let [shape-id (:id shape) (let [shape-id (:id shape)
file (wsh/get-local-file-full state)
libraries (wsh/get-libraries state)] libraries (wsh/get-libraries state)]
(generate-sync-shape-direct changes libraries container shape-id false components-v2))) (generate-sync-shape-direct changes file libraries container shape-id false components-v2)))
(defmethod generate-sync-shape :colors (defmethod generate-sync-shape :colors
[_ changes library-id state _ shape _] [_ changes library-id state _ shape _]
@ -594,7 +595,7 @@
(defn generate-sync-shape-direct (defn generate-sync-shape-direct
"Generate changes to synchronize one shape that is the root of a component "Generate changes to synchronize one shape that is the root of a component
instance, and all its children, from the given component." instance, and all its children, from the given component."
[changes libraries container shape-id reset? components-v2] [changes file libraries container shape-id reset? components-v2]
(log/debug :msg "Sync shape direct" :shape-inst (str shape-id) :reset? reset?) (log/debug :msg "Sync shape direct" :shape-inst (str shape-id) :reset? reset?)
(let [shape-inst (ctn/get-shape container shape-id) (let [shape-inst (ctn/get-shape container shape-id)
library (dm/get-in libraries [(:component-file shape-inst) :data]) library (dm/get-in libraries [(:component-file shape-inst) :data])
@ -623,6 +624,8 @@
shape-inst shape-inst
component component
library library
file
libraries
shape-main shape-main
root-inst root-inst
root-main root-main
@ -655,7 +658,7 @@
nil)))))) nil))))))
(defn- generate-sync-shape-direct-recursive (defn- generate-sync-shape-direct-recursive
[changes container shape-inst component library shape-main root-inst root-main reset? initial-root? redirect-shaperef components-v2] [changes container shape-inst component library file libraries shape-main root-inst root-main reset? initial-root? redirect-shaperef components-v2]
(log/debug :msg "Sync shape direct recursive" (log/debug :msg "Sync shape direct recursive"
:shape-inst (str (:name shape-inst) " " (pretty-uuid (:id shape-inst))) :shape-inst (str (:name shape-inst) " " (pretty-uuid (:id shape-inst)))
:component (:name component)) :component (:name component))
@ -752,6 +755,8 @@
child-inst child-inst
component component
library library
file
libraries
child-main child-main
root-inst root-inst
root-main root-main
@ -782,6 +787,10 @@
(compare-children changes (compare-children changes
children-inst children-inst
children-main children-main
container
component-container
file
libraries
only-inst only-inst
only-main only-main
both both
@ -812,7 +821,7 @@
(defn generate-sync-shape-inverse (defn generate-sync-shape-inverse
"Generate changes to update the component a shape is linked to, from "Generate changes to update the component a shape is linked to, from
the values in the shape and all its children." the values in the shape and all its children."
[changes libraries container shape-id components-v2] [changes file libraries container shape-id components-v2]
(log/debug :msg "Sync shape inverse" :shape (str shape-id)) (log/debug :msg "Sync shape inverse" :shape (str shape-id))
(let [redirect-shaperef (partial redirect-shaperef container libraries) (let [redirect-shaperef (partial redirect-shaperef container libraries)
shape-inst (ctn/get-shape container shape-id) shape-inst (ctn/get-shape container shape-id)
@ -843,6 +852,8 @@
shape-inst shape-inst
component component
library library
file
libraries
shape-main shape-main
root-inst root-inst
root-main root-main
@ -852,7 +863,7 @@
changes))) changes)))
(defn- generate-sync-shape-inverse-recursive (defn- generate-sync-shape-inverse-recursive
[changes container shape-inst component library shape-main root-inst root-main initial-root? redirect-shaperef components-v2] [changes container shape-inst component library file libraries shape-main root-inst root-main initial-root? redirect-shaperef components-v2]
(log/trace :msg "Sync shape inverse recursive" (log/trace :msg "Sync shape inverse recursive"
:shape (str (:name shape-inst)) :shape (str (:name shape-inst))
:component (:name component)) :component (:name component))
@ -935,6 +946,8 @@
child-inst child-inst
component component
library library
file
libraries
child-main child-main
root-inst root-inst
root-main root-main
@ -962,6 +975,10 @@
(compare-children changes (compare-children changes
children-inst children-inst
children-main children-main
container
component-container
file
libraries
only-inst only-inst
only-main only-main
both both
@ -986,7 +1003,7 @@
;; ---- Operation generation helpers ---- ;; ---- Operation generation helpers ----
(defn- compare-children (defn- compare-children
[changes children-inst children-main only-inst-cb only-main-cb both-cb swapped-cb moved-cb inverse? reset?] [changes children-inst children-main container-inst container-main file libraries only-inst-cb only-main-cb both-cb swapped-cb moved-cb inverse? reset?]
(log/trace :msg "Compare children") (log/trace :msg "Compare children")
(loop [children-inst (seq (or children-inst [])) (loop [children-inst (seq (or children-inst []))
children-main (seq (or children-main [])) children-main (seq (or children-main []))
@ -1007,7 +1024,7 @@
:else :else
(if (or (ctk/is-main-of? child-main child-inst) (if (or (ctk/is-main-of? child-main child-inst)
(ctk/match-swap-slot? child-main child-inst)) (ctf/match-swap-slot? child-main child-inst container-inst container-main file libraries))
(recur (next children-inst) (recur (next children-inst)
(next children-main) (next children-main)
(if (or (ctk/is-main-of? child-main child-inst) reset?) (if (or (ctk/is-main-of? child-main child-inst) reset?)
@ -1015,10 +1032,10 @@
(swapped-cb changes child-inst child-main))) (swapped-cb changes child-inst child-main)))
(let [child-inst' (d/seek #(or (ctk/is-main-of? child-main %) (let [child-inst' (d/seek #(or (ctk/is-main-of? child-main %)
(ctk/match-swap-slot? child-main %)) (ctf/match-swap-slot? child-main % container-inst container-main file libraries))
children-inst) children-inst)
child-main' (d/seek #(or (ctk/is-main-of? % child-inst) child-main' (d/seek #(or (ctk/is-main-of? % child-inst)
(ctk/match-swap-slot? % child-inst)) (ctf/match-swap-slot? % child-inst container-inst container-main file libraries))
children-main)] children-main)]
(cond (cond
(nil? child-inst') (nil? child-inst')

5
frontend/src/app/main/data/workspace/state_helpers.cljs
View file

@ -110,6 +110,11 @@
[state] [state]
(get state :workspace-data)) (get state :workspace-data))
(defn get-local-file-full
[state]
(-> (get state :workspace-file)
(assoc :data (get state :workspace-data))))
(defn get-file (defn get-file
"Get the data content of the given file (it may be the current file "Get the data content of the given file (it may be the current file
or one library)." or one library)."