github/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2026-07-29 17:36:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3919 from penpot/palba-bugfixing-10

Browse Source 
Bugfixing
This commit is contained in:
Alejandro 2023-12-14 06:34:48 +01:00 committed by GitHub
commit 419cc2e848
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
common/src/app/common/files/validate.cljc
View File

@ -474,7 +474,14 @@
[{:keys [data features] :as file} libraries] [{:keys [data features] :as file} libraries]
(when (contains? features "components/v2") (when (contains? features "components/v2")
(doseq [page (filter :id (ctpl/pages-seq data))] (doseq [page (filter :id (ctpl/pages-seq data))]
(validate-shape! uuid/zero file page libraries)) (let [orphans (->> page
:objects
vals
(filter #(not (contains? (:objects page) (:parent-id %))))
(map :id))]
(validate-shape! uuid/zero file page libraries)
(doseq [shape-id orphans]
(validate-shape! shape-id file page libraries))))
(doseq [component (vals (:components data))] (doseq [component (vals (:components data))]
(validate-component! component file))) (validate-component! component file)))

2
frontend/src/app/main/ui/workspace/sidebar/options/menus/component.cljs
View File

@ -428,7 +428,7 @@
shape (first shapes) shape (first shapes)
id (:id shape) id (:id shape)
shape-name (:name shape) shape-name (:name shape)
component (ctf/resolve-component shape {:id current-file-id :data workspace-data} workspace-libraries) component (ctf/resolve-component shape {:id current-file-id :data workspace-data} workspace-libraries {:include-deleted? true})
main-instance? (if components-v2 (ctk/main-instance? shape) true) main-instance? (if components-v2 (ctk/main-instance? shape) true)
toggle-content toggle-content