mirror of
https://github.com/penpot/penpot.git
synced 2026-05-16 13:33:45 +00:00
d09985edee
Steps to reproduce: paste an SVG authored in Inkscape (or any editor that follows the inkscape:label convention) into a penpot file. The group/element names visible in the source editor are dropped — penpot shows generic auto-ids like 'g1234' or 'path5678' instead. Root cause: parse-svg-element in common/src/app/common/files/shapes_ builder.cljc derived the shape name from (or (:id attrs) (tag->name tag)). Inkscape stores user-given element labels in the inkscape:label and sodipodi:label namespaced attributes while id holds an auto- generated technical id, so the operator's chosen name was always overridden by the technical id when present. tubax/xml->clj (the SVG parser the import pipeline already uses for upload, paste, and library import) keeps namespaced attributes as :prefix:name keywords — the same shape this file already reads :xlink:href from on line 134, and that app.common.svg uses for the xlink: namespace at lines 300-307. Fix: extract the name-resolution logic into a public resolve-element- name helper that prefers :inkscape:label, then :sodipodi:label, then :id, then (tag->name tag). Existing SVGs that don't carry either label namespace fall through the same chain as before, so the behaviour for non-Inkscape-authored SVGs is unchanged. This restores the behaviour dfelinto's penpot-icon-generator-plugin relies on (linked from the issue body) — that plugin reads element names from the imported SVG to map Blender icons to penpot components. Tests: 6 deftest blocks in common/test/common_tests/files/shapes_ builder_test.cljc covering the priority order (inkscape > sodipodi > id > tag), each fallback in isolation, and the empty-attrs case. Registered in common-tests.runner. Closes #7869 Co-authored-by: Andrey Antukh <niwi@niwi.nz>
53 lines
2.4 KiB
Clojure
53 lines
2.4 KiB
Clojure
;; This Source Code Form is subject to the terms of the Mozilla Public
|
|
;; License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
;;
|
|
;; Copyright (c) KALEIDOS INC
|
|
|
|
(ns common-tests.files.shapes-builder-test
|
|
(:require
|
|
[app.common.files.shapes-builder :as sb]
|
|
[clojure.test :as t]))
|
|
|
|
;; Regression for https://github.com/penpot/penpot/issues/7869.
|
|
;; ``parse-svg-element`` used to derive the shape name from
|
|
;; ``(or (:id attrs) (tag->name tag))`` which dropped Inkscape-authored
|
|
;; labels. ``tubax/xml->clj`` (the SVG parser the rest of the import
|
|
;; pipeline already feeds these maps to) keeps namespaced attributes as
|
|
;; ``:prefix:name`` keywords — same shape the codebase already reads
|
|
;; ``:xlink:href`` from in this file (line 134) and in
|
|
;; ``app.common.svg``.
|
|
|
|
(t/deftest resolve-element-name-prefers-inkscape-label
|
|
(t/is (= "Layer 1"
|
|
(sb/resolve-element-name :g {:inkscape:label "Layer 1"
|
|
:id "g1234"}))))
|
|
|
|
(t/deftest resolve-element-name-prefers-sodipodi-label-when-no-inkscape-label
|
|
(t/is (= "phone-icon"
|
|
(sb/resolve-element-name :path {:sodipodi:label "phone-icon"
|
|
:id "path5678"}))))
|
|
|
|
(t/deftest resolve-element-name-falls-back-to-id-when-no-label-namespace
|
|
(t/is (= "manual-id"
|
|
(sb/resolve-element-name :rect {:id "manual-id"}))))
|
|
|
|
(t/deftest resolve-element-name-falls-back-to-tag-name-when-no-id-and-no-label
|
|
;; The tag->name mapping returns generic names for known SVG element
|
|
;; tags. Asserting on the call result here (rather than a hardcoded
|
|
;; string) keeps the test stable if the tag->name mapping is updated.
|
|
(t/is (some? (sb/resolve-element-name :rect {})))
|
|
(t/is (string? (sb/resolve-element-name :rect {}))))
|
|
|
|
(t/deftest resolve-element-name-inkscape-label-wins-over-sodipodi-and-id
|
|
;; Both label conventions and an id present together; the priority is
|
|
;; inkscape > sodipodi > id > tag, matching the order operators expect
|
|
;; (Inkscape's own UI shows ``inkscape:label`` as the canonical name).
|
|
(t/is (= "user-name"
|
|
(sb/resolve-element-name :g {:inkscape:label "user-name"
|
|
:sodipodi:label "stale-label"
|
|
:id "g1"}))))
|
|
|
|
(t/deftest resolve-element-name-empty-attrs-uses-tag-fallback
|
|
(t/is (some? (sb/resolve-element-name :path {}))))
|