Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-02-13 10:38:13 -05:00
Code Issues Activity

🐛 Fix right sidebar component options menu

Browse source
This commit is contained in:
Andrés Moya 2023-01-19 16:54:30 +01:00
parent dc89610d07
commit 8c6f07ab65
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -36,6 +36,7 @@
main-instance? (if components-v2
(:main-instance? values)
true)
main-component? (:main-instance? values)
local-component? (= library-id current-file-id)
workspace-data (deref refs/workspace-data)
workspace-libraries (deref refs/workspace-libraries)
@ -101,7 +102,7 @@
[:& context-menu {:on-close on-menu-close
:show (:menu-open @local)
:options
(if main-instance?
(if main-component?
[[(tr "workspace.shape.menu.show-in-assets") do-show-in-assets]]
(if local-component?
(if is-dangling?

5
frontend/src/app/main/ui/workspace/sidebar/options/shapes/frame.cljs
View file

@ -11,6 +11,7 @@
[app.main.refs :as refs]
[app.main.ui.workspace.sidebar.options.menus.blur :refer [blur-menu]]
[app.main.ui.workspace.sidebar.options.menus.color-selection :refer [color-selection-menu]]
[app.main.ui.workspace.sidebar.options.menus.component :refer [component-attrs component-menu]]
[app.main.ui.workspace.sidebar.options.menus.constraints :refer [constraint-attrs constraints-menu]]
[app.main.ui.workspace.sidebar.options.menus.fill :refer [fill-attrs-shape fill-menu]]
[app.main.ui.workspace.sidebar.options.menus.frame-grid :refer [frame-grid]]
@ -33,6 +34,7 @@
constraint-values (select-keys shape constraint-attrs)
layout-container-values (select-keys shape layout-container-flex-attrs)
layout-item-values (select-keys shape layout-item-attrs)
[comp-ids comp-values] [[(:id shape)] (select-keys shape component-attrs)]
is-layout-child-ref (mf/use-memo (mf/deps ids) #(refs/is-layout-child? ids))
is-layout-child? (mf/deref is-layout-child-ref)
@ -42,6 +44,9 @@
:values measure-values
:type type
:shape shape}]
[:& component-menu {:ids comp-ids
:values comp-values
:shape-name (:name shape)}]
(when (not is-layout-child?)
[:& constraints-menu {:ids ids
:values constraint-values}])