github/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2026-09-06 12:09:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

🐛 Fix position of annotation for variants (#7306)

Browse Source
This commit is contained in:
Luis de Dios 2025-09-12 14:05:36 +02:00 committed by GitHub
parent 4dc0f3b4eb
commit 9e2d3b1fa1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1016,12 +1016,6 @@
(when swap-opened? (when swap-opened?
[:> component-swap* {:shapes copies}]) [:> component-swap* {:shapes copies}])
(when (and (not swap-opened?) (not multi))
[:> component-annotation* {:id id
:shape shape
:component component
:rerender-fn rerender-fn}])
(when (and is-variant? (when (and is-variant?
(not main-instance?) (not main-instance?)
(not (:deleted component)) (not (:deleted component))
@ -1037,6 +1031,12 @@
:shapes shapes :shapes shapes
:data data}]) :data data}])
(when (and (not swap-opened?) (not multi))
[:> component-annotation* {:id id
:shape shape
:component component
:rerender-fn rerender-fn}])
(when (and multi all-main? (not any-variant?)) (when (and multi all-main? (not any-variant?))
[:button {:class (stl/css :combine-variant-button) [:button {:class (stl/css :combine-variant-button)
:on-click on-combine-as-variants} :on-click on-combine-as-variants}