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

🐛 Fix naming of duplicated objects in copy&paste and others

Browse source
This commit is contained in:
Andrés Moya 2021-08-12 16:43:32 +02:00 • committed by Andrey Antukh
parent 58f0ad999c
commit a377c602cc
5 changed files with 16 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

10
frontend/src/app/main/data/workspace/common.cljs
View file

@ -68,16 +68,14 @@
(defn generate-unique-name (defn generate-unique-name
"A unique name generator" "A unique name generator"
([used basename] [used basename]
(generate-unique-name used basename false))
([used basename prefix-first?]
(s/assert ::set-of-string used) (s/assert ::set-of-string used)
(s/assert ::us/string basename) (s/assert ::us/string basename)
(if-not (contains? used basename)
basename
(let [[prefix initial] (extract-numeric-suffix basename)] (let [[prefix initial] (extract-numeric-suffix basename)]
(loop [counter initial] (loop [counter initial]
(let [candidate (if (and (= 1 counter) prefix-first?) (let [candidate (str prefix "-" counter)]
(str prefix)
(str prefix "-" counter))]
(if (contains? used candidate) (if (contains? used candidate)
(recur (inc counter)) (recur (inc counter))
candidate)))))) candidate))))))

4
frontend/src/app/main/data/workspace/groups.cljs
View file

@ -182,7 +182,7 @@
shapes (shapes-for-grouping objects selected)] shapes (shapes-for-grouping objects selected)]
(when-not (empty? shapes) (when-not (empty? shapes)
(let [[group rchanges uchanges] (let [[group rchanges uchanges]
(prepare-create-group objects page-id shapes "Group" false)] (prepare-create-group objects page-id shapes "Group-1" false)]
(rx/of (dch/commit-changes {:redo-changes rchanges (rx/of (dch/commit-changes {:redo-changes rchanges
:undo-changes uchanges :undo-changes uchanges
:origin it}) :origin it})
@ -221,7 +221,7 @@
(if (and (= (count shapes) 1) (if (and (= (count shapes) 1)
(= (:type (first shapes)) :group)) (= (:type (first shapes)) :group))
[(first shapes) [] []] [(first shapes) [] []]
(prepare-create-group objects page-id shapes "Group" true)) (prepare-create-group objects page-id shapes "Group-1" true))
rchanges (d/concat rchanges rchanges (d/concat rchanges
[{:type :mod-obj [{:type :mod-obj

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

@ -129,7 +129,7 @@
(if (and (= (count shapes) 1) (if (and (= (count shapes) 1)
(= (:type (first shapes)) :group)) (= (:type (first shapes)) :group))
[(first shapes) [] []] [(first shapes) [] []]
(dwg/prepare-create-group objects page-id shapes "Component" true)) (dwg/prepare-create-group objects page-id shapes "Component-1" true))
[new-shape new-shapes updated-shapes] [new-shape new-shapes updated-shapes]
(make-component-shape group objects file-id) (make-component-shape group objects file-id)

2
frontend/src/app/main/data/workspace/svg_upload.cljs
View file

@ -331,7 +331,7 @@
(let [{:keys [tag attrs]} element-data (let [{:keys [tag attrs]} element-data
attrs (usvg/format-styles attrs) attrs (usvg/format-styles attrs)
element-data (cond-> element-data (map? element-data) (assoc :attrs attrs)) element-data (cond-> element-data (map? element-data) (assoc :attrs attrs))
name (dwc/generate-unique-name unames (or (:id attrs) (tag->name tag)) true) name (dwc/generate-unique-name unames (or (:id attrs) (tag->name tag)))
att-refs (usvg/find-attr-references attrs) att-refs (usvg/find-attr-references attrs)
references (usvg/find-def-references (:defs svg-data) att-refs) references (usvg/find-def-references (:defs svg-data) att-refs)

2
frontend/test/app/test_helpers/pages.cljs
View file

@ -80,7 +80,7 @@
:obj shape}])))) :obj shape}]))))
(defn group-shapes (defn group-shapes
([state label ids] (group-shapes state label ids "Group")) ([state label ids] (group-shapes state label ids "Group-1"))
([state label ids prefix] ([state label ids prefix]
(let [page (current-page state) (let [page (current-page state)
shapes (dwg/shapes-for-grouping (:objects page) ids)] shapes (dwg/shapes-for-grouping (:objects page) ids)]