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

🐛 Fix delete component from assets panel in v2

Browse source
This commit is contained in:
Andrés Moya 2022-09-30 14:24:18 +02:00
parent 8f786407af
commit 243e29fdb4
3 changed files with 167 additions and 147 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -16,6 +16,7 @@
[app.common.pages.helpers :as cph] [app.common.pages.helpers :as cph]
[app.common.spec :as us] [app.common.spec :as us]
[app.common.types.color :as ctc] [app.common.types.color :as ctc]
[app.common.types.components-list :as ctkl]
[app.common.types.container :as ctn] [app.common.types.container :as ctn]
[app.common.types.file :as ctf] [app.common.types.file :as ctf]
[app.common.types.pages-list :as ctpl] [app.common.types.pages-list :as ctpl]
@ -29,6 +30,7 @@
[app.main.data.workspace.groups :as dwg] [app.main.data.workspace.groups :as dwg]
[app.main.data.workspace.libraries-helpers :as dwlh] [app.main.data.workspace.libraries-helpers :as dwlh]
[app.main.data.workspace.selection :as dws] [app.main.data.workspace.selection :as dws]
[app.main.data.workspace.shapes :as dwsh]
[app.main.data.workspace.state-helpers :as wsh] [app.main.data.workspace.state-helpers :as wsh]
[app.main.data.workspace.undo :as dwu] [app.main.data.workspace.undo :as dwu]
[app.main.features :as features] [app.main.features :as features]
@ -402,13 +404,16 @@
(ptk/reify ::delete-component (ptk/reify ::delete-component
ptk/WatchEvent ptk/WatchEvent
(watch [it state _] (watch [it state _]
(let [data (get state :workspace-data) (let [data (get state :workspace-data)]
components-v2 (features/active-feature? state :components-v2) (if (features/active-feature? state :components-v2)
changes (-> (pcb/empty-changes it) (let [component (ctkl/get-component data id)
page (ctpl/get-page data (:main-instance-page component))
shape (ctn/get-shape page (:main-instance-id component))]
(rx/of (dwsh/delete-shapes (:id page) #{(:id shape)})))
(let [changes (-> (pcb/empty-changes it)
(pcb/with-library-data data) (pcb/with-library-data data)
(pcb/delete-component id components-v2))] (pcb/delete-component id false))]
(rx/of (dch/commit-changes changes))))))))
(rx/of (dch/commit-changes changes))))))
(defn restore-component (defn restore-component
"Restore a deleted component, with the given id, on the current file library." "Restore a deleted component, with the given id, on the current file library."
@ -554,11 +559,14 @@
page-id (:current-page-id state) page-id (:current-page-id state)
container (cph/get-container file :page page-id) container (cph/get-container file :page page-id)
components-v2
(features/active-feature? state :components-v2)
changes changes
(-> (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))] (dwlh/generate-sync-shape-direct 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)

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

@ -177,7 +177,8 @@
:file (pretty-file file-id state) :file (pretty-file file-id state)
:library (pretty-file library-id state)) :library (pretty-file library-id state))
(let [file (wsh/get-file state file-id)] (let [file (wsh/get-file state file-id)
components-v2 (get-in file [:options :components-v2])]
(loop [pages (vals (get file :pages-index)) (loop [pages (vals (get file :pages-index))
changes (pcb/empty-changes it)] changes (pcb/empty-changes it)]
(if-let [page (first pages)] (if-let [page (first pages)]
@ -189,7 +190,8 @@
asset-id asset-id
library-id library-id
state state
(cph/make-container page :page)))) (cph/make-container page :page)
components-v2)))
changes)))) changes))))
(defn generate-sync-library (defn generate-sync-library
@ -198,7 +200,7 @@
the given library. the given library.
If an asset id is given, only shapes linked to this particular asset will If an asset id is given, only shapes linked to this particular asset will
be syncrhonized." be synchronized."
[it file-id asset-type asset-id library-id state] [it file-id asset-type asset-id library-id state]
(s/assert #{:colors :components :typographies} asset-type) (s/assert #{:colors :components :typographies} asset-type)
(s/assert (s/nilable ::us/uuid) asset-id) (s/assert (s/nilable ::us/uuid) asset-id)
@ -211,7 +213,8 @@
:file (pretty-file file-id state) :file (pretty-file file-id state)
:library (pretty-file library-id state)) :library (pretty-file library-id state))
(let [file (wsh/get-file state file-id)] (let [file (wsh/get-file state file-id)
components-v2 (get-in file [:options :components-v2])]
(loop [local-components (vals (get file :components)) (loop [local-components (vals (get file :components))
changes (pcb/empty-changes it)] changes (pcb/empty-changes it)]
(if-let [local-component (first local-components)] (if-let [local-component (first local-components)]
@ -223,13 +226,14 @@
asset-id asset-id
library-id library-id
state state
(cph/make-container local-component :component)))) (cph/make-container local-component :component)
components-v2)))
changes)))) changes))))
(defn- generate-sync-container (defn- generate-sync-container
"Generate changes to synchronize all shapes in a particular container (a page "Generate changes to synchronize all shapes in a particular container (a page
or a component) that use assets of the given type in the given library." or a component) that use assets of the given type in the given library."
[it asset-type asset-id library-id state container] [it asset-type asset-id library-id state container components-v2]
(if (cph/page? container) (if (cph/page? container)
(log/debug :msg "Sync page in local file" :page-id (:id container)) (log/debug :msg "Sync page in local file" :page-id (:id container))
@ -248,7 +252,8 @@
library-id library-id
state state
container container
shape)) shape
components-v2))
changes)))) changes))))
(defmulti uses-assets? (defmulti uses-assets?
@ -276,16 +281,16 @@
(defmulti generate-sync-shape (defmulti generate-sync-shape
"Generate changes to synchronize one shape from all assets of the given type "Generate changes to synchronize one shape from all assets of the given type
that is using, in the given library." that is using, in the given library."
(fn [asset-type _changes _library-id _state _container _shape] asset-type)) (fn [asset-type _changes _library-id _state _container _shape _components-v2] asset-type))
(defmethod generate-sync-shape :components (defmethod generate-sync-shape :components
[_ changes _library-id state container shape] [_ changes _library-id state container shape components-v2]
(let [shape-id (:id shape) (let [shape-id (:id shape)
libraries (wsh/get-libraries state)] libraries (wsh/get-libraries state)]
(generate-sync-shape-direct changes libraries container shape-id false))) (generate-sync-shape-direct changes 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 _]
(log/debug :msg "Sync colors of shape" :shape (:name shape)) (log/debug :msg "Sync colors of shape" :shape (:name shape))
;; Synchronize a shape that uses some colors of the library. The value of the ;; Synchronize a shape that uses some colors of the library. The value of the
@ -296,7 +301,7 @@
#(ctc/sync-shape-colors % library-id library-colors)))) #(ctc/sync-shape-colors % library-id library-colors))))
(defmethod generate-sync-shape :typographies (defmethod generate-sync-shape :typographies
[_ changes library-id state container shape] [_ changes library-id state container shape _]
(log/debug :msg "Sync typographies of shape" :shape (:name shape)) (log/debug :msg "Sync typographies of shape" :shape (:name shape))
;; Synchronize a shape that uses some typographies of the library. The attributes ;; Synchronize a shape that uses some typographies of the library. The attributes
@ -442,7 +447,7 @@
(defn generate-sync-shape-direct (defn generate-sync-shape-direct
"Generate changes to synchronize one shape that the root of a component "Generate changes to synchronize one shape that 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?] [changes libraries container shape-id reset? components-v2]
(log/debug :msg "Sync shape direct" :shape (str shape-id) :reset? reset?) (log/debug :msg "Sync shape direct" :shape (str shape-id) :reset? reset?)
(let [shape-inst (ctn/get-shape container shape-id) (let [shape-inst (ctn/get-shape container shape-id)
component (cph/get-component libraries component (cph/get-component libraries
@ -466,20 +471,25 @@
root-inst root-inst
root-main root-main
reset? reset?
initial-root?) initial-root?
components-v2)
; If the component is not found, because the master component has been ; If the component is not found, because the master component has been
; deleted or the library unlinked, detach the instance. ; deleted or the library unlinked, do nothing in v2 or detach in v1.
(generate-detach-instance changes container shape-id)))) (if components-v2
changes
(generate-detach-instance changes container shape-id)))))
(defn- generate-sync-shape-direct-recursive (defn- generate-sync-shape-direct-recursive
[changes container shape-inst component shape-main root-inst root-main reset? initial-root?] [changes container shape-inst component shape-main root-inst root-main reset? initial-root? components-v2]
(log/debug :msg "Sync shape direct recursive" (log/debug :msg "Sync shape direct recursive"
:shape (str (:name shape-inst)) :shape (str (:name shape-inst))
:component (:name component)) :component (:name component))
(if (nil? shape-main) (if (nil? shape-main)
;; This should not occur, but protect against it in any case ;; This should not occur, but protect against it in any case
(generate-detach-instance changes container (:id shape-inst)) (if components-v2
changes
(generate-detach-instance changes container (:id shape-inst)))
(let [omit-touched? (not reset?) (let [omit-touched? (not reset?)
clear-remote-synced? (and initial-root? reset?) clear-remote-synced? (and initial-root? reset?)
set-remote-synced? (and (not initial-root?) reset?) set-remote-synced? (and (not initial-root?) reset?)
@ -545,7 +555,8 @@
root-inst root-inst
root-main root-main
reset? reset?
initial-root?)) initial-root?
components-v2))
moved (fn [changes child-inst child-main] moved (fn [changes child-inst child-main]
(move-shape (move-shape

7
frontend/src/app/main/data/workspace/shapes.cljs
View file

@ -131,13 +131,14 @@
(rx/empty)))))) (rx/empty))))))
(defn delete-shapes (defn delete-shapes
[ids] ([ids] (delete-shapes nil ids))
([page-id ids]
(us/assert ::us/set-of-uuid ids) (us/assert ::us/set-of-uuid ids)
(ptk/reify ::delete-shapes (ptk/reify ::delete-shapes
ptk/WatchEvent ptk/WatchEvent
(watch [it state _] (watch [it state _]
(let [file-id (:current-file-id state) (let [file-id (:current-file-id state)
page-id (:current-page-id state) page-id (or page-id (:current-page-id state))
file (wsh/get-file state file-id) file (wsh/get-file state file-id)
page (wsh/lookup-page state page-id) page (wsh/lookup-page state page-id)
objects (wsh/lookup-page-objects state page-id) objects (wsh/lookup-page-objects state page-id)
@ -265,7 +266,7 @@
(rx/of (dc/detach-comment-thread ids) (rx/of (dc/detach-comment-thread ids)
(dwsl/update-layout-positions all-parents) (dwsl/update-layout-positions all-parents)
(dch/commit-changes changes)))))) (dch/commit-changes changes)))))))
(defn- viewport-center (defn- viewport-center
[state] [state]