Skip to content

Commit 87435d0

Browse files
AxesSelector only handles context
PR review comment suggested that until override via props is necessary we implement only the necessary context
1 parent 84429f0 commit 87435d0

File tree

1 file changed

+4
-20
lines changed

1 file changed

+4
-20
lines changed

src/components/fields/AxesSelector.js

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,21 @@ import Field from './Field';
22
import PropTypes from 'prop-types';
33
import RadioBlocks from '../widgets/RadioBlocks';
44
import React, {Component} from 'react';
5-
import {connectToContainer} from '../../lib';
65

76
export default class AxesSelector extends Component {
87
constructor(props, context) {
98
super(props, context);
109

11-
if (!props.axesTargetHandler && !context.axesTargetHandler) {
10+
if (!context.axesTargetHandler) {
1211
throw new Error(
13-
'AxesSelector must be nested within a connectAxesToPlot component ' +
14-
'or passed axesTargetHandler and axesOptions props'
12+
'AxesSelector must be nested within a connectAxesToPlot component'
1513
);
1614
}
1715
}
1816

1917
render() {
20-
let axesTargetHandler, axesOptions, axesTarget;
21-
if (this.props.axesTargetHandler) {
22-
axesTargetHandler = this.props.axesTargetHandler;
23-
axesOptions = this.props.axesOptions;
24-
axesTarget = this.props.axesTarget;
25-
} else {
26-
axesTargetHandler = this.context.axesTargetHandler;
27-
axesOptions = this.context.axesOptions;
28-
axesTarget = this.context.axesTarget;
29-
}
18+
const {axesTargetHandler, axesOptions, axesTarget} = this.context;
19+
3020
return (
3121
<Field {...this.props}>
3222
<RadioBlocks
@@ -39,12 +29,6 @@ export default class AxesSelector extends Component {
3929
}
4030
}
4131

42-
AxesSelector.propTypes = {
43-
axesTargetHandler: PropTypes.func,
44-
axesOptions: PropTypes.array,
45-
axesTarget: PropTypes.string,
46-
};
47-
4832
AxesSelector.contextTypes = {
4933
axesTargetHandler: PropTypes.func,
5034
axesOptions: PropTypes.array,

0 commit comments

Comments
 (0)