3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-06-06 02:51:38 +02:00
Code Issues Projects Releases Packages Wiki Activity

✨ Consolidate layout/grid feature

Browse source
This commit is contained in:
Andrey Antukh 2025-04-01 21:15:38 +02:00
parent e6e71e9278
commit 87ef98dad5
2 changed files with 29 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

1
common/src/app/common/features.cljc
View file

@ -106,7 +106,6 @@
(case flag (case flag
:feature-components-v2 "components/v2" :feature-components-v2 "components/v2"
:feature-styles-v2 "styles/v2" :feature-styles-v2 "styles/v2"
:feature-grid-layout "layout/grid"
:feature-fdata-objects-map "fdata/objects-map" :feature-fdata-objects-map "fdata/objects-map"
:feature-fdata-pointer-map "fdata/pointer-map" :feature-fdata-pointer-map "fdata/pointer-map"
:feature-plugins "plugins/runtime" :feature-plugins "plugins/runtime"

69
frontend/src/app/main/ui/workspace/sidebar/options/menus/layout_container.cljs
View file

@ -16,7 +16,6 @@
[app.main.data.workspace :as udw] [app.main.data.workspace :as udw]
[app.main.data.workspace.grid-layout.editor :as dwge] [app.main.data.workspace.grid-layout.editor :as dwge]
[app.main.data.workspace.shape-layout :as dwsl] [app.main.data.workspace.shape-layout :as dwsl]
[app.main.features :as features]
[app.main.refs :as refs] [app.main.refs :as refs]
[app.main.store :as st] [app.main.store :as st]
[app.main.ui.components.dropdown :refer [dropdown]] [app.main.ui.components.dropdown :refer [dropdown]]
@ -976,8 +975,6 @@
grid-justify-content-row (:layout-justify-content values) grid-justify-content-row (:layout-justify-content values)
grid-justify-content-column (:layout-align-content values) grid-justify-content-column (:layout-align-content values)
grid-enabled? (features/use-feature "layout/grid")
on-column-justify-change on-column-justify-change
(mf/use-fn (mf/use-fn
(mf/deps ids) (mf/deps ids)
@ -1007,24 +1004,22 @@
(if (and (not multiple) (:layout values)) (if (and (not multiple) (:layout values))
[:div {:class (stl/css :title-actions)} [:div {:class (stl/css :title-actions)}
(when ^boolean grid-enabled? [:> icon-button* {:variant "ghost"
[:* :aria-label (tr "workspace.shape.menu.add-layout")
[:> icon-button* {:variant "ghost" :on-click on-toggle-dropdown-visibility
:aria-label (tr "workspace.shape.menu.add-layout") :icon "menu"}]
:on-click on-toggle-dropdown-visibility
:icon "menu"}]
[:& dropdown {:show show-dropdown? [:& dropdown {:show show-dropdown?
:on-close on-hide-dropdown} :on-close on-hide-dropdown}
[:div {:class (stl/css :layout-options)} [:div {:class (stl/css :layout-options)}
[:button {:class (stl/css :layout-option) [:button {:class (stl/css :layout-option)
:data-type "flex" :data-type "flex"
:on-click on-add-layout} :on-click on-add-layout}
"Flex layout"] "Flex layout"]
[:button {:class (stl/css :layout-option) [:button {:class (stl/css :layout-option)
:data-type "grid" :data-type "grid"
:on-click on-add-layout} :on-click on-add-layout}
"Grid layout"]]]]) "Grid layout"]]]
(when has-layout? (when has-layout?
[:> icon-button* {:variant "ghost" [:> icon-button* {:variant "ghost"
@ -1033,29 +1028,23 @@
:icon "remove"}])] :icon "remove"}])]
[:div {:class (stl/css :title-actions)} [:div {:class (stl/css :title-actions)}
(if ^boolean grid-enabled? [:> icon-button* {:variant "ghost"
[:* :aria-label (tr "workspace.shape.menu.add-layout")
[:> icon-button* {:variant "ghost" :on-click on-toggle-dropdown-visibility
:aria-label (tr "workspace.shape.menu.add-layout") :icon "add"}]
:on-click on-toggle-dropdown-visibility
:icon "add"}]
[:& dropdown {:show show-dropdown? [:& dropdown {:show show-dropdown?
:on-close on-hide-dropdown} :on-close on-hide-dropdown}
[:div {:class (stl/css :layout-options)} [:div {:class (stl/css :layout-options)}
[:button {:class (stl/css :layout-option) [:button {:class (stl/css :layout-option)
:data-type "flex"
:on-click on-add-layout}
"Flex layout"]
[:button {:class (stl/css :layout-option)
:data-type "grid"
:on-click on-add-layout}
"Grid layout"]]]]
[:button {:class (stl/css :add-layout)
:data-type "flex" :data-type "flex"
:on-click on-add-layout} :on-click on-add-layout}
i/add]) "Flex layout"]
[:button {:class (stl/css :layout-option)
:data-type "grid"
:on-click on-add-layout}
"Grid layout"]]]
(when has-layout? (when has-layout?
[:> icon-button* {:variant "ghost" [:> icon-button* {:variant "ghost"
:aria-label (tr "workspace.shape.menu.delete") :aria-label (tr "workspace.shape.menu.delete")