diff --git a/src/components/containers/UpdateMenuAccordion.js b/src/components/containers/UpdateMenuAccordion.js index 594e588f0..735c1e9fb 100644 --- a/src/components/containers/UpdateMenuAccordion.js +++ b/src/components/containers/UpdateMenuAccordion.js @@ -21,18 +21,12 @@ class UpdateMenuAccordion extends Component { dropdown: _('Dropdown'), buttons: _('Buttons'), }; - const updateMenuType = - localizedType[upd.type] || localizedType.dropdown; - const activeElementLabel = upd.buttons.filter( - b => b._index === upd.active - )[0].label; + const menuType = localizedType[upd.type] || localizedType.dropdown; + const activeBtn = upd.buttons.filter(b => b._index === upd.active)[0]; + const foldName = menuType + (activeBtn ? ': ' + activeBtn.label : ''); return ( - + {children} ); diff --git a/src/default_panels/StyleSlidersPanel.js b/src/default_panels/StyleSlidersPanel.js index 309bdd7ad..fad8e7983 100644 --- a/src/default_panels/StyleSlidersPanel.js +++ b/src/default_panels/StyleSlidersPanel.js @@ -6,6 +6,7 @@ import { Numeric, Radio, PlotlySection, + Dropdown, SliderAccordion, } from '../components'; @@ -31,6 +32,41 @@ const StyleSlidersPanel = (props, {localize: _}) => ( + + + + + + + + + + + + @@ -39,7 +75,7 @@ const StyleSlidersPanel = (props, {localize: _}) => ( - + diff --git a/src/default_panels/StyleUpdateMenusPanel.js b/src/default_panels/StyleUpdateMenusPanel.js index 3ec9001ce..a9154e0de 100644 --- a/src/default_panels/StyleUpdateMenusPanel.js +++ b/src/default_panels/StyleUpdateMenusPanel.js @@ -4,42 +4,71 @@ import { ColorPicker, FontSelector, Numeric, - Radio, PlotlySection, UpdateMenuAccordion, UpdateMenuButtons, + VisibilitySelect, + Radio, } from '../components'; const StyleUpdateMenusPanel = (props, {localize: _}) => ( - - - - - - - - - - - - - - - - - - - - - - + showOn={true} + > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + );