Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-01-24 23:49:45 -05:00
Code Issues Activity

Merge pull request #3331 from penpot/hiru-restore-comp-missing-lib

Browse source 
🐛 Disallow restore component when the library has been detached
This commit is contained in:
Pablo Alba 2023-06-21 16:46:16 +02:00 • committed by GitHub
commit 4f02cc3e86
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
frontend/src/app/main/ui/workspace/context_menu.cljs
View file

@ -461,6 +461,8 @@
is-dangling? (nil? (if local-component?
(ctkl/get-component workspace-data component-id)
(ctf/get-component workspace-libraries component-file component-id)))
lib-exists? (and (not local-component?)
(some? (get workspace-libraries component-file)))
do-add-component #(st/emit! (dwl/add-component))
do-add-multiple-components #(st/emit! (dwl/add-multiple-components))
@ -568,7 +570,7 @@
(when can-update-main?
[:& menu-entry {:title (tr "workspace.shape.menu.reset-overrides")
:on-click do-reset-component}])
(when components-v2
(when (and components-v2 lib-exists?)
[:& menu-entry {:title (tr "workspace.shape.menu.restore-main")
:on-click do-restore-component}])]
[:*

5
frontend/src/app/main/ui/workspace/sidebar/options/menus/component.cljs
View file

@ -167,6 +167,9 @@
(ctkl/get-component workspace-data component-id)
(ctf/get-component workspace-libraries library-id component-id))
is-dangling? (nil? component)
lib-exists? (and (not local-component?)
(some? (get workspace-libraries library-id)))
on-menu-click
(mf/use-callback
@ -251,7 +254,7 @@
[[(tr "workspace.shape.menu.detach-instance") do-detach-component]
(when can-update-main?
[(tr "workspace.shape.menu.reset-overrides") do-reset-component])
(when components-v2
(when (and components-v2 lib-exists?)
[(tr "workspace.shape.menu.restore-main") do-restore-component])]
[[(tr "workspace.shape.menu.detach-instance") do-detach-component]
(when can-update-main?