3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-06-01 00:11:39 +02:00
Code Issues Projects Releases Packages Wiki Activity

♻️ Move libraries_helpers to common

Browse source
This commit is contained in:
Pablo Alba 2024-04-19 12:53:23 +02:00
parent e1cd6d04d9
commit 2e18ce9323
4 changed files with 71 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -12,6 +12,7 @@
[app.common.files.changes-builder :as pcb]
[app.common.files.helpers :as cfh]
[app.common.files.libraries-common-helpers :as cflch]
[app.common.files.libraries-helpers :as cflh]
[app.common.files.shapes-helpers :as cfsh]
[app.common.geom.point :as gpt]
[app.common.logging :as log]
@ -29,7 +30,6 @@
[app.main.data.workspace :as-alias dw]
[app.main.data.workspace.changes :as dch]
[app.main.data.workspace.groups :as dwg]
[app.main.data.workspace.libraries-helpers :as dwlh]
[app.main.data.workspace.notifications :as-alias dwn]
[app.main.data.workspace.selection :as dws]
[app.main.data.workspace.shapes :as dwsh]
@ -54,6 +54,13 @@
;; Change this to :info :debug or :trace to debug this module, or :warn to reset to default
(log/set-level! :warn)
(defn- pretty-file
[file-id state]
(if (= file-id (:current-file-id state))
"<local>"
(str "<" (get-in state [:workspace-libraries file-id :name]) ">")))
(defn- log-changes
[changes file]
(let [extract-change
@ -472,7 +479,7 @@
[new-component-shape new-component-shapes ; <- null in components-v2
new-main-instance-shape new-main-instance-shapes]
(dwlh/duplicate-component component new-component-id (:data library))
(cflh/duplicate-component component new-component-id (:data library))
changes (-> (pcb/empty-changes it nil)
(pcb/with-page main-instance-page)
@ -525,7 +532,7 @@
current-page (dm/get-in state [:workspace-data :pages-index page-id])
objects (wsh/lookup-page-objects state page-id)
library-data (wsh/get-file state library-id)
{:keys [changes shape]} (dwlh/prepare-restore-component library-data component-id current-page it)
{:keys [changes shape]} (cflh/prepare-restore-component library-data component-id current-page it)
parent-id (:parent-id shape)
objects (cond-> (assoc objects (:id shape) shape)
(not (nil? parent-id))
@ -574,7 +581,7 @@
(pcb/with-objects objects))
[new-shape changes]
(dwlh/generate-instantiate-component changes
(cflh/generate-instantiate-component changes
objects
file-id
component-id
@ -606,7 +613,7 @@
changes (-> (pcb/empty-changes it)
(pcb/with-container container)
(pcb/with-objects (:objects container))
(dwlh/generate-detach-instance container libraries id))]
(cflh/generate-detach-instance container libraries id))]
(rx/of (dch/commit-changes changes))))))
@ -642,7 +649,7 @@
changes (when can-detach?
(reduce
(fn [changes id]
(dwlh/generate-detach-instance changes container libraries id))
(cflh/generate-detach-instance changes container libraries id))
(-> (pcb/empty-changes it)
(pcb/with-container container)
(pcb/with-objects objects))
@ -731,7 +738,7 @@
(-> (pcb/empty-changes it)
(pcb/with-container container)
(pcb/with-objects (:objects container))
(dwlh/generate-sync-shape-direct file-full libraries container (:id head) false components-v2))]
(cflh/generate-sync-shape-direct file-full libraries container (:id head) false components-v2))]
(log/debug :msg "SYNC-head finished" :js/rchanges (log-changes
(:redo-changes changes)
@ -767,7 +774,7 @@
(-> (pcb/empty-changes it)
(pcb/with-container container)
(pcb/with-objects (:objects container))
(dwlh/generate-sync-shape-direct file-full libraries container id true components-v2))]
(cflh/generate-sync-shape-direct file-full libraries container id true components-v2))]
(log/debug :msg "RESET-COMPONENT finished" :js/rchanges (log-changes
(:redo-changes changes)
@ -823,7 +830,7 @@
(-> (pcb/empty-changes it)
(pcb/set-undo-group undo-group)
(pcb/with-container container)
(dwlh/generate-sync-shape-inverse full-file libraries container id components-v2))
(cflh/generate-sync-shape-inverse full-file libraries container id components-v2))
file-id (:component-file shape)
file (wsh/get-file state file-id)
@ -947,7 +954,7 @@
inside-comp? (ctn/in-any-component? objects parent)
[new-shape changes]
(dwlh/generate-instantiate-component changes
(cflh/generate-instantiate-component changes
objects
(:id file)
id-new-component
@ -978,7 +985,7 @@
;; We need to set the same index as the original shape
(pcb/change-parent (:parent-id shape) [new-shape] index {:component-swap true
:ignore-touched true})
(dwlh/change-touched new-shape
(cflh/change-touched new-shape
shape
(ctn/make-container page :page)
{}))]
@ -1039,7 +1046,7 @@
(watch [_ state _]
(let [undo-id (js/Symbol)]
(log/info :msg "COMPONENT-SWAP"
:file (dwlh/pretty-file file-id state)
:file (pretty-file file-id state)
:id-new-component id-new-component
:undo-id undo-id)
(rx/concat
@ -1092,12 +1099,15 @@
(watch [it state _]
(when (and (some? file-id) (some? library-id)) ; Prevent race conditions while navigating out of the file
(log/info :msg "SYNC-FILE"
:file (dwlh/pretty-file file-id state)
:library (dwlh/pretty-file library-id state)
:file (pretty-file file-id state)
:library (pretty-file library-id state)
:asset-type asset-type
:asset-id asset-id
:undo-group undo-group)
(let [file (wsh/get-file state file-id)
libraries (wsh/get-libraries state)
current-file-id (:current-file-id state)
sync-components? (or (nil? asset-type) (= asset-type :components))
sync-colors? (or (nil? asset-type) (= asset-type :colors))
@ -1108,22 +1118,22 @@
(-> (pcb/empty-changes it)
(pcb/set-undo-group undo-group))
[(when sync-components?
(dwlh/generate-sync-library it file-id :components asset-id library-id state))
(cflh/generate-sync-library it file-id :components asset-id library-id libraries current-file-id))
(when sync-colors?
(dwlh/generate-sync-library it file-id :colors asset-id library-id state))
(cflh/generate-sync-library it file-id :colors asset-id library-id libraries current-file-id))
(when sync-typographies?
(dwlh/generate-sync-library it file-id :typographies asset-id library-id state))])
(cflh/generate-sync-library it file-id :typographies asset-id library-id libraries current-file-id))])
file-changes (reduce
pcb/concat-changes
(-> (pcb/empty-changes it)
(pcb/set-undo-group undo-group))
[(when sync-components?
(dwlh/generate-sync-file it file-id :components asset-id library-id state))
(cflh/generate-sync-file it file-id :components asset-id library-id libraries current-file-id))
(when sync-colors?
(dwlh/generate-sync-file it file-id :colors asset-id library-id state))
(cflh/generate-sync-file it file-id :colors asset-id library-id libraries current-file-id))
(when sync-typographies?
(dwlh/generate-sync-file it file-id :typographies asset-id library-id state))])
(cflh/generate-sync-file it file-id :typographies asset-id library-id libraries current-file-id))])
changes (pcb/concat-changes library-changes file-changes)

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

File diff suppressed because it is too large Load diff

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

@ -12,6 +12,7 @@
[app.common.files.focus :as cpf]
[app.common.files.helpers :as cfh]
[app.common.files.libraries-common-helpers :as cflch]
[app.common.files.libraries-helpers :as cflh]
[app.common.geom.point :as gpt]
[app.common.geom.rect :as grc]
[app.common.geom.shapes :as gsh]
@ -28,7 +29,6 @@
[app.main.data.modal :as md]
[app.main.data.workspace.changes :as dch]
[app.main.data.workspace.collapse :as dwc]
[app.main.data.workspace.libraries-helpers :as dwlh]
[app.main.data.workspace.specialized-panel :as-alias dwsp]
[app.main.data.workspace.state-helpers :as wsh]
[app.main.data.workspace.undo :as dwu]
@ -435,7 +435,7 @@
(gpt/subtract (-> origin-frame :selrect gpt/point)))
instantiate-component
#(dwlh/generate-instantiate-component changes
#(cflh/generate-instantiate-component changes
objects
file-id
(:component-id component-root)
@ -448,7 +448,7 @@
{})
restore-component
#(let [restore (dwlh/prepare-restore-component changes library-data (:component-id component-root) it page delta (:id component-root) parent-id frame-id)]
#(let [restore (cflh/prepare-restore-component changes library-data (:component-id component-root) it page delta (:id component-root) parent-id frame-id)]
[(:shape restore) (:changes restore)])
[_shape changes]

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

@ -123,6 +123,15 @@
(get state :workspace-data)
(dm/get-in state [:workspace-libraries file-id :data])))
(defn get-file-full
"Get the data content of the given file (it may be the current file
or one library)."
[state file-id]
(if (= file-id (:current-file-id state))
(-> (get state :workspace-file)
(assoc :data (get state :workspace-data)))
(dm/get-in state [:workspace-libraries file-id :data])))
(defn get-libraries
"Retrieve all libraries, including the local file."
[state]