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

🐛 Fix repeated names when duplicating object trees.

Browse source
This commit is contained in:
Andrés Moya 2021-07-16 13:54:55 +02:00
parent 3ed593e4b6
commit 008134fde8
2 changed files with 28 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGES.md
View file

@ -7,6 +7,7 @@
### :bug: Bugs fixed ### :bug: Bugs fixed
- Add scroll bar to Teams menu [Taiga #1894](https://tree.taiga.io/project/penpot/issue/1894). - Add scroll bar to Teams menu [Taiga #1894](https://tree.taiga.io/project/penpot/issue/1894).
- Fix repeated names when duplicating artboards or groups [Taiga #1892](https://tree.taiga.io/project/penpot/issue/1892).
### :arrow_up: Deps updates ### :arrow_up: Deps updates
### :boom: Breaking changes ### :boom: Breaking changes

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

@ -257,8 +257,6 @@
(declare prepare-duplicate-frame-change) (declare prepare-duplicate-frame-change)
(declare prepare-duplicate-shape-change) (declare prepare-duplicate-shape-change)
(def ^:private change->name #(get-in % [:obj :name]))
(defn update-indices (defn update-indices
"Fixes the indices for a set of changes after a duplication. We need to "Fixes the indices for a set of changes after a duplication. We need to
fix the indices to take into the account the movement of indices. fix the indices to take into the account the movement of indices.
@ -290,19 +288,19 @@
"Prepare objects to paste: generate new id, give them unique names, "Prepare objects to paste: generate new id, give them unique names,
move to the position of mouse pointer, and find in what frame they move to the position of mouse pointer, and find in what frame they
fit." fit."
[objects page-id names ids delta] [objects page-id unames ids delta]
(loop [names names (let [unames (volatile! unames)
ids (seq ids) update-unames! (fn [new-name] (vswap! unames conj new-name))]
chgs []] (loop [ids (seq ids)
(if ids chgs []]
(let [id (first ids) (if ids
result (prepare-duplicate-change objects page-id names id delta) (let [id (first ids)
result (if (vector? result) result [result])] result (prepare-duplicate-change objects page-id unames update-unames! id delta)
(recur result (if (vector? result) result [result])]
(into names (map change->name) result) (recur
(next ids) (next ids)
(into chgs result))) (into chgs result)))
chgs))) chgs))))
(defn duplicate-changes-update-indices (defn duplicate-changes-update-indices
"Parses the change set when duplicating to set-up the appropiate indices" "Parses the change set when duplicating to set-up the appropiate indices"
@ -317,32 +315,32 @@
(-> changes (update-indices index-map)))) (-> changes (update-indices index-map))))
(defn- prepare-duplicate-change (defn- prepare-duplicate-change
[objects page-id names id delta] [objects page-id unames update-unames! id delta]
(let [obj (get objects id)] (let [obj (get objects id)]
(if (= :frame (:type obj)) (if (= :frame (:type obj))
(prepare-duplicate-frame-change objects page-id names obj delta) (prepare-duplicate-frame-change objects page-id unames update-unames! obj delta)
(prepare-duplicate-shape-change objects page-id names obj delta (:frame-id obj) (:parent-id obj))))) (prepare-duplicate-shape-change objects page-id unames update-unames! obj delta (:frame-id obj) (:parent-id obj)))))
(defn- prepare-duplicate-shape-change (defn- prepare-duplicate-shape-change
[objects page-id names obj delta frame-id parent-id] [objects page-id unames update-unames! obj delta frame-id parent-id]
(when (some? obj) (when (some? obj)
(let [id (uuid/next) (let [id (uuid/next)
name (dwc/generate-unique-name names (:name obj)) name (dwc/generate-unique-name @unames (:name obj))
_ (update-unames! name)
renamed-obj (assoc obj :id id :name name) renamed-obj (assoc obj :id id :name name)
moved-obj (geom/move renamed-obj delta) moved-obj (geom/move renamed-obj delta)
parent-id (or parent-id frame-id) parent-id (or parent-id frame-id)
children-changes children-changes
(loop [names names (loop [result []
result []
cid (first (:shapes obj)) cid (first (:shapes obj))
cids (rest (:shapes obj))] cids (rest (:shapes obj))]
(if (nil? cid) (if (nil? cid)
result result
(let [obj (get objects cid) (let [obj (get objects cid)
changes (prepare-duplicate-shape-change objects page-id names obj delta frame-id id)] changes (prepare-duplicate-shape-change objects page-id unames update-unames! obj delta frame-id id)]
(recur (recur
(into names (map change->name changes))
(into result changes) (into result changes)
(first cids) (first cids)
(rest cids))))) (rest cids)))))
@ -361,11 +359,13 @@
children-changes)))) children-changes))))
(defn- prepare-duplicate-frame-change (defn- prepare-duplicate-frame-change
[objects page-id names obj delta] [objects page-id unames update-unames! obj delta]
(let [frame-id (uuid/next) (let [frame-id (uuid/next)
frame-name (dwc/generate-unique-name names (:name obj)) frame-name (dwc/generate-unique-name @unames (:name obj))
_ (update-unames! frame-name)
sch (->> (map #(get objects %) (:shapes obj)) sch (->> (map #(get objects %) (:shapes obj))
(mapcat #(prepare-duplicate-shape-change objects page-id names % delta frame-id frame-id))) (mapcat #(prepare-duplicate-shape-change objects page-id unames update-unames! % delta frame-id frame-id)))
frame (-> obj frame (-> obj
(assoc :id frame-id) (assoc :id frame-id)