Skip to content

Commit 04bbae2

Browse files
authored
Merge pull request #447 from plotly/v0.15.0
V0.15.0
2 parents 8a2a595 + 9a2dbb1 commit 04bbae2

File tree

7 files changed

+751
-738
lines changed

7 files changed

+751
-738
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "react-chart-editor",
33
"description": "plotly.js chart editor react component UI",
4-
"version": "0.14.0",
4+
"version": "0.15.0",
55
"author": "Plotly, Inc.",
66
"bugs": {
77
"url": "https://github.com/plotly/react-chart-editor/issues"

scripts/translationKeys/combined-translation-keys.txt

Lines changed: 371 additions & 366 deletions
Large diffs are not rendered by default.

scripts/translationKeys/translation-keys.txt

Lines changed: 371 additions & 366 deletions
Large diffs are not rendered by default.

src/components/containers/UpdateMenuAccordion.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ const UpdateMenuFold = connectUpdateMenuToLayout(PlotlyFold);
88

99
class UpdateMenuAccordion extends Component {
1010
render() {
11-
const {layout: {updatemenus = []}, localize: _} = this.context;
11+
const {fullLayout: {updatemenus = []}, localize: _} = this.context;
1212
const {children} = this.props;
1313

1414
const content =
@@ -21,7 +21,7 @@ class UpdateMenuAccordion extends Component {
2121
const updateMenuType =
2222
localizedType[upd.type] || localizedType.dropdown;
2323
const activeElementLabel = upd.buttons.filter(
24-
b => b.index === upd.active
24+
b => b._index === upd.active
2525
)[0].label;
2626

2727
return (
@@ -52,7 +52,7 @@ class UpdateMenuAccordion extends Component {
5252
}
5353

5454
UpdateMenuAccordion.contextTypes = {
55-
layout: PropTypes.object,
55+
fullLayout: PropTypes.object,
5656
localize: PropTypes.func,
5757
};
5858

src/components/fields/UpdateMenuButtons.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,4 +48,8 @@ UpdateMenuButtons.propTypes = {
4848
updatePlot: PropTypes.func,
4949
};
5050

51+
UpdateMenuButtons.contextTypes = {
52+
localize: PropTypes.func,
53+
};
54+
5155
export default connectToContainer(UpdateMenuButtons);

src/default_panels/GraphCreatePanel.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,7 @@ const GraphCreatePanel = (props, {localize: _}) => {
184184
<Numeric label={_('Sum')} step={10} attr="sum" />
185185
<DataSelector label={_('Text')} attr="text" />
186186
<DataSelector label={_('Color')} attr="marker.color" />
187+
<DataSelector label={'Colors'} attr="marker.colors" />
187188
<Radio
188189
label={_('Transpose')}
189190
attr="transpose"

src/default_panels/StyleTracesPanel.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import {
2525
FillDropdown,
2626
FontSelector,
2727
TextPosition,
28-
DataSelector,
2928
} from '../components';
3029

3130
const StyleTracesPanel = (props, {localize: _}) => (
@@ -145,7 +144,6 @@ const StyleTracesPanel = (props, {localize: _}) => (
145144
/>
146145
<ColorscalePicker label={_('Colorscale')} attr="marker.colorscale" />
147146
<ColorPicker label={_('Color')} attr="marker.color" />
148-
<DataSelector label={'Colors'} attr="marker.colors" />
149147
<NumericFraction label={_('Opacity')} attr="marker.opacity" />
150148
<Numeric label={_('Size')} attr="marker.size" />
151149
<SymbolSelector label={_('Symbol')} attr="marker.symbol" />

0 commit comments

Comments
 (0)