github/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2026-09-08 21:19:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

🔥 Remove obsolete code with object wrapping on components

Browse Source
This commit is contained in:
Andrey Antukh 2025-10-07 18:12:34 +02:00
parent 65a2b10875
commit 21a7ecb3fe
1 changed files with 34 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
common/src/app/common/types/components_list.cljc
View File

@ -8,7 +8,6 @@
(:require (:require
[app.common.data :as d] [app.common.data :as d]
[app.common.data.macros :as dm] [app.common.data.macros :as dm]
[app.common.features :as cfeat]
[app.common.time :as dt] [app.common.time :as dt]
[app.common.types.component :as ctk] [app.common.types.component :as ctk]
[clojure.set :as set])) [clojure.set :as set]))
@ -43,55 +42,53 @@
(defn mod-component (defn mod-component
[file-data {:keys [id name path main-instance-id main-instance-page objects annotation variant-id variant-properties modified-at]}] [file-data {:keys [id name path main-instance-id main-instance-page objects annotation variant-id variant-properties modified-at]}]
(let [wrap-objects-fn cfeat/*wrap-with-objects-map-fn*] (d/update-in-when file-data [:components id]
(d/update-in-when file-data [:components id] (fn [component]
(fn [component] (let [new-comp (cond-> component
(let [objects (some-> objects wrap-objects-fn) (some? name)
new-comp (cond-> component (assoc :name name)
(some? name)
(assoc :name name)
(some? path) (some? path)
(assoc :path path) (assoc :path path)
(some? main-instance-id) (some? main-instance-id)
(assoc :main-instance-id main-instance-id) (assoc :main-instance-id main-instance-id)
(some? main-instance-page) (some? main-instance-page)
(assoc :main-instance-page main-instance-page) (assoc :main-instance-page main-instance-page)
(some? objects) (some? objects)
(assoc :objects objects) (assoc :objects objects)
(some? modified-at) (some? modified-at)
(assoc :modified-at modified-at) (assoc :modified-at modified-at)
(some? annotation) (some? annotation)
(assoc :annotation annotation) (assoc :annotation annotation)
(nil? annotation) (nil? annotation)
(dissoc :annotation) (dissoc :annotation)
(some? variant-id) (some? variant-id)
(assoc :variant-id variant-id) (assoc :variant-id variant-id)
(nil? variant-id) (nil? variant-id)
(dissoc :variant-id) (dissoc :variant-id)
(some? variant-properties) (some? variant-properties)
(assoc :variant-properties variant-properties) (assoc :variant-properties variant-properties)
(nil? variant-properties) (nil? variant-properties)
(dissoc :variant-properties)) (dissoc :variant-properties))
;; The set of properties that doesn't mark a component as touched ;; The set of properties that doesn't mark a component as touched
diff (set/difference diff (set/difference
(ctk/diff-components component new-comp) (ctk/diff-components component new-comp)
#{:annotation :modified-at :variant-id :variant-properties})] #{:annotation :modified-at :variant-id :variant-properties})]
(if (empty? diff) (if (empty? diff)
new-comp new-comp
(touch new-comp))))))) (touch new-comp))))))
(defn get-component (defn get-component
([file-data component-id] ([file-data component-id]