3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-05-10 07:37:35 +02:00
Code Issues Projects Releases Packages Wiki Activity

✨ Disable feature toggle for layout flex

Browse source
This commit is contained in:
alonso.torres 2022-12-01 16:39:29 +01:00 • committed by Alonso Torres
parent 32350bcf87
commit e53e715861
3 changed files with 4 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -7,7 +7,6 @@
(ns app.main.ui.workspace.sidebar.options.shapes.frame (ns app.main.ui.workspace.sidebar.options.shapes.frame
(:require (:require
[app.common.types.shape.layout :as ctl] [app.common.types.shape.layout :as ctl]
[app.main.features :as features]
[app.main.refs :as refs] [app.main.refs :as refs]
[app.main.ui.workspace.sidebar.options.menus.blur :refer [blur-menu]] [app.main.ui.workspace.sidebar.options.menus.blur :refer [blur-menu]]
[app.main.ui.workspace.sidebar.options.menus.constraints :refer [constraint-attrs constraints-menu]] [app.main.ui.workspace.sidebar.options.menus.constraints :refer [constraint-attrs constraints-menu]]
@ -26,8 +25,6 @@
(let [ids [(:id shape)] (let [ids [(:id shape)]
type (:type shape) type (:type shape)
layout-active? (features/use-feature :auto-layout)
stroke-values (select-keys shape stroke-attrs) stroke-values (select-keys shape stroke-attrs)
layer-values (select-keys shape layer-attrs) layer-values (select-keys shape layer-attrs)
measure-values (select-measure-keys shape) measure-values (select-measure-keys shape)
@ -46,10 +43,9 @@
(when (not is-layout-child?) (when (not is-layout-child?)
[:& constraints-menu {:ids ids [:& constraints-menu {:ids ids
:values constraint-values}]) :values constraint-values}])
(when (or layout-active? is-layout-container?) [:& layout-container-menu {:type type :ids [(:id shape)] :values layout-container-values}]
[:& layout-container-menu {:type type :ids [(:id shape)] :values layout-container-values}])
(when (and layout-active? (or is-layout-child? is-layout-container?)) (when (or is-layout-child? is-layout-container?)
[:& layout-item-menu [:& layout-item-menu
{:ids ids {:ids ids
:type type :type type

6
frontend/src/app/main/ui/workspace/sidebar/options/shapes/group.cljs
View file

@ -7,7 +7,6 @@
(ns app.main.ui.workspace.sidebar.options.shapes.group (ns app.main.ui.workspace.sidebar.options.shapes.group
(:require (:require
[app.common.data :as d] [app.common.data :as d]
[app.main.features :as features]
[app.main.refs :as refs] [app.main.refs :as refs]
[app.main.ui.workspace.sidebar.options.menus.blur :refer [blur-menu]] [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.color-selection :refer [color-selection-menu]]
@ -34,7 +33,6 @@
shared-libs (unchecked-get props "shared-libs") shared-libs (unchecked-get props "shared-libs")
objects (->> shape-with-children (group-by :id) (d/mapm (fn [_ v] (first v)))) objects (->> shape-with-children (group-by :id) (d/mapm (fn [_ v] (first v))))
file-id (unchecked-get props "file-id") file-id (unchecked-get props "file-id")
layout-active? (features/use-feature :auto-layout)
layout-container-values (select-keys shape layout-container-flex-attrs) layout-container-values (select-keys shape layout-container-flex-attrs)
ids [(:id shape)] ids [(:id shape)]
is-layout-child-ref (mf/use-memo (mf/deps ids) #(refs/is-layout-child? ids)) is-layout-child-ref (mf/use-memo (mf/deps ids) #(refs/is-layout-child? ids))
@ -56,8 +54,8 @@
[:div.options [:div.options
[:& measures-menu {:type type :ids measure-ids :values measure-values :shape shape}] [:& measures-menu {:type type :ids measure-ids :values measure-values :shape shape}]
[:& component-menu {:ids comp-ids :values comp-values :shape-name (:name shape)}] [:& component-menu {:ids comp-ids :values comp-values :shape-name (:name shape)}]
(when layout-active? [:& layout-container-menu {:type type :ids [(:id shape)] :values layout-container-values}]
[:& layout-container-menu {:type type :ids [(:id shape)] :values layout-container-values}])
(when is-layout-child? (when is-layout-child?
[:& layout-item-menu [:& layout-item-menu
{:type type {:type type

3
frontend/src/features.cljs
View file

@ -9,9 +9,6 @@
(:require (:require
[app.main.features :as features])) [app.main.features :as features]))
(defn ^:export autolayout []
(features/toggle-feature! :auto-layout))
(defn ^:export components-v2 [] (defn ^:export components-v2 []
(features/toggle-feature! :components-v2)) (features/toggle-feature! :components-v2))