diff --git a/src/components/fields/ErrorBars.js b/src/components/fields/ErrorBars.js index 51597aa75..4985a122c 100644 --- a/src/components/fields/ErrorBars.js +++ b/src/components/fields/ErrorBars.js @@ -77,9 +77,9 @@ class ErrorBars extends Component { onOptionChange={this.updatePlot} activeOption={this.getMode()} options={[ + {label: _('None'), value: 'hidden'}, {label: _('Symmetric'), value: 'symmetric'}, {label: _('Asymmetric'), value: 'asymmetric'}, - {label: _('Hidden'), value: 'hidden'}, ]} /> diff --git a/src/components/fields/derived.js b/src/components/fields/derived.js index 7fdb95479..9430333b2 100644 --- a/src/components/fields/derived.js +++ b/src/components/fields/derived.js @@ -461,7 +461,7 @@ export const TextPosition = connectToContainer(UnconnectedDropdown, { {label: _('Bottom Center'), value: 'bottom center'}, {label: _('Bottom Right'), value: 'bottom right'}, ]; - if (context.container.type === 'pie') { + if (context.container.type === 'pie' || context.container.type === 'bar') { options = [ {label: _('Inside'), value: 'inside'}, {label: _('Outside'), value: 'outside'}, @@ -477,11 +477,7 @@ export const TextPosition = connectToContainer(UnconnectedDropdown, { export const HoverInfo = connectToContainer(UnconnectedFlaglist, { modifyPlotProps: (props, context, plotProps) => { const {localize: _, container} = context; - let options = [ - {label: _('X'), value: 'x'}, - {label: _('Y'), value: 'y'}, - {label: _('Name'), value: 'name'}, - ]; + let options = [{label: _('X'), value: 'x'}, {label: _('Y'), value: 'y'}]; if ( [ @@ -496,24 +492,13 @@ export const HoverInfo = connectToContainer(UnconnectedFlaglist, { 'mesh3d', ].includes(container.type) ) { - options = [ - {label: _('X'), value: 'x'}, - {label: _('Y'), value: 'y'}, - {label: _('Z'), value: 'z'}, - {label: _('Name'), value: 'name'}, - ]; - } - - if (container.mode && container.mode.includes('text')) { - options.push({label: _('Text'), value: 'text'}); + options.push({label: _('Z'), value: 'z'}); } if (container.type === 'choropleth') { options = [ {label: _('Location'), value: 'location'}, {label: _('Values'), value: 'z'}, - {label: _('Text'), value: 'text'}, - {label: _('Name'), value: 'name'}, ]; } @@ -522,8 +507,6 @@ export const HoverInfo = connectToContainer(UnconnectedFlaglist, { {label: _('Longitude'), value: 'loc'}, {label: _('Latitude'), value: 'lat'}, {label: _('Location'), value: 'location'}, - {label: _('Text'), value: 'text'}, - {label: _('Name'), value: 'name'}, ]; } @@ -531,8 +514,6 @@ export const HoverInfo = connectToContainer(UnconnectedFlaglist, { options = [ {label: _('Longitude'), value: 'loc'}, {label: _('Latitude'), value: 'lat'}, - {label: _('Text'), value: 'text'}, - {label: _('Name'), value: 'name'}, ]; } @@ -541,8 +522,6 @@ export const HoverInfo = connectToContainer(UnconnectedFlaglist, { {label: _('A'), value: 'a'}, {label: _('B'), value: 'b'}, {label: _('C'), value: 'c'}, - {label: _('Text'), value: 'text'}, - {label: _('Name'), value: 'name'}, ]; } @@ -554,8 +533,6 @@ export const HoverInfo = connectToContainer(UnconnectedFlaglist, { options = [ {label: _('R'), value: 'r'}, {label: _('Theta'), value: 'theta'}, - {label: _('Text'), value: 'text'}, - {label: _('Name'), value: 'name'}, ]; } @@ -564,11 +541,15 @@ export const HoverInfo = connectToContainer(UnconnectedFlaglist, { {label: _('Label'), value: 'label'}, {label: _('Value'), value: 'value'}, {label: _('Percent'), value: 'percent'}, - {label: _('Text'), value: 'text'}, - {label: _('Name'), value: 'name'}, ]; } + if (container.text) { + options.push({label: _('Text'), value: 'text'}); + } + + options.push({label: _('Trace name'), value: 'name'}); + plotProps.options = options; }, }); diff --git a/src/default_panels/GraphCreatePanel.js b/src/default_panels/GraphCreatePanel.js index bcb5c2120..f9aadb64c 100644 --- a/src/default_panels/GraphCreatePanel.js +++ b/src/default_panels/GraphCreatePanel.js @@ -3,7 +3,6 @@ import PropTypes from 'prop-types'; import { DataSelector, Dropdown, - ErrorBars, Radio, PlotlySection, LayoutSection, @@ -103,18 +102,6 @@ const GraphCreatePanel = (props, {localize: _}) => { - - - - - - - - - - - - diff --git a/src/default_panels/StyleTracesPanel.js b/src/default_panels/StyleTracesPanel.js index e2feb8825..8841ba11d 100644 --- a/src/default_panels/StyleTracesPanel.js +++ b/src/default_panels/StyleTracesPanel.js @@ -26,6 +26,7 @@ import { MarkerSize, MarkerColor, MultiColorPicker, + ErrorBars, DataSelector, VisibilitySelect, } from '../components'; @@ -354,13 +355,14 @@ const StyleTracesPanel = (props, {localize: _}) => ( 'pie', 'scatter3d', 'scatterternary', + 'bar', ]} > + - @@ -616,6 +618,24 @@ const StyleTracesPanel = (props, {localize: _}) => ( clearable={false} /> + + + + + + + + + + + + );