Skip to content
This repository was archived by the owner on May 15, 2022. It is now read-only.

Commit 8009edf

Browse files
rohan-deshpanderohan-deshpande
committed
Removed unused prop from DatNumber
1 parent 06827cc commit 8009edf

File tree

2 files changed

+76
-36
lines changed

2 files changed

+76
-36
lines changed

‎dev/src/react-dat-gui/components/DatNumber.js

Lines changed: 38 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,15 @@ export default class DatNumber extends Component {
1616
path: PropTypes.string,
1717
label: PropTypes.string,
1818
labelWidth: PropTypes.number,
19-
customLabelWidth: PropTypes.number,
2019
liveUpdate: PropTypes.bool,
2120
onUpdate: PropTypes.func,
2221
_onUpdateValue: PropTypes.func,
23-
disableSlider: PropTypes.bool,
22+
disableSlider: PropTypes.bool
2423
};
2524

2625
state = {
27-
value: this.getValue(),
28-
}
26+
value: this.getValue()
27+
};
2928

3029
componentWillReceiveProps(nextProps) {
3130
this.setState({
@@ -39,9 +38,14 @@ export default class DatNumber extends Component {
3938

4039
applyConstraints(value) {
4140
const { min, max, step } = this.props;
42-
const [ hasMin, hasMax, hasStep ] = [ isFinite(min), isFinite(max), isFinite(step) ];
43-
const decimalPlaces = (hasStep && !isInteger(step)) ? step.toString().split('.')[1].length : 0;
44-
let [ isMin, isMax ] = [ false, false ];
41+
const [hasMin, hasMax, hasStep] = [
42+
isFinite(min),
43+
isFinite(max),
44+
isFinite(step)
45+
];
46+
const decimalPlaces =
47+
hasStep && !isInteger(step) ? step.toString().split('.')[1].length : 0;
48+
let [isMin, isMax] = [false, false];
4549

4650
value = toNumber(value);
4751

@@ -66,11 +70,11 @@ export default class DatNumber extends Component {
6670

6771
handleChange = event => {
6872
this.setState({ value: event.target.value }, this.update);
69-
}
73+
};
7074

7175
handleFocus = () => {
7276
document.addEventListener('keydown', this.handleKeyDown);
73-
}
77+
};
7478

7579
/**
7680
* @deprecated This has been deprecated for now and is no longer applied to the
@@ -83,7 +87,7 @@ export default class DatNumber extends Component {
8387
window.getSelection().removeAllRanges();
8488

8589
this.setState({ value }, this.update);
86-
}
90+
};
8791

8892
handleKeyDown = event => {
8993
const key = event.keyCode || event.which;
@@ -93,23 +97,24 @@ export default class DatNumber extends Component {
9397

9498
this.setState({ value }, this.update);
9599
}
96-
}
100+
};
97101

98102
handleSliderUpdate = (value, isLive) => {
99103
const constrained = this.applyConstraints(value);
100-
const shouldUpdate = (!isLive || this.props.liveUpdate);
104+
const shouldUpdate = !isLive || this.props.liveUpdate;
101105

102106
this.setState({ value: constrained }, () => {
103107
if (shouldUpdate) {
104108
this.update();
105109
}
106110
});
107-
}
111+
};
108112

109113
update() {
110114
const { value } = this.state;
111115

112-
this.props._onUpdateValue && this.props._onUpdateValue(this.props.path, toNumber(value));
116+
this.props._onUpdateValue &&
117+
this.props._onUpdateValue(this.props.path, toNumber(value));
113118
this.props.onUpdate && this.props.onUpdate(toNumber(value));
114119
}
115120

@@ -129,18 +134,33 @@ export default class DatNumber extends Component {
129134
}
130135

131136
render() {
132-
const { min, max, path, label, labelWidth, step, disableSlider } = this.props;
137+
const {
138+
min,
139+
max,
140+
path,
141+
label,
142+
labelWidth,
143+
step,
144+
disableSlider
145+
} = this.props;
133146
const labelText = isString(label) ? label : path;
134147
const hasSlider = isFinite(min) && isFinite(max);
135148
const controlsWidth = 100 - labelWidth;
136-
const inputWidth = hasSlider && disableSlider !== true ? Math.round(controlsWidth / 3) : controlsWidth;
149+
const inputWidth =
150+
hasSlider && disableSlider !== true
151+
? Math.round(controlsWidth / 3)
152+
: controlsWidth;
137153
const sliderWidth = controlsWidth - inputWidth;
138154

139155
return (
140156
<li className="cr number">
141157
<label>
142-
<span className="label-text" style={{ width: `${labelWidth}%` }}>{labelText}</span>
143-
{hasSlider && disableSlider !== true ? this.renderSlider(sliderWidth) : null}
158+
<span className="label-text" style={{ width: `${labelWidth}%` }}>
159+
{labelText}
160+
</span>
161+
{hasSlider && disableSlider !== true
162+
? this.renderSlider(sliderWidth)
163+
: null}
144164
<input
145165
type="number"
146166
step={step}

‎src/components/DatNumber.js

Lines changed: 38 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,15 @@ export default class DatNumber extends Component {
1616
path: PropTypes.string,
1717
label: PropTypes.string,
1818
labelWidth: PropTypes.number,
19-
customLabelWidth: PropTypes.number,
2019
liveUpdate: PropTypes.bool,
2120
onUpdate: PropTypes.func,
2221
_onUpdateValue: PropTypes.func,
23-
disableSlider: PropTypes.bool,
22+
disableSlider: PropTypes.bool
2423
};
2524

2625
state = {
27-
value: this.getValue(),
28-
}
26+
value: this.getValue()
27+
};
2928

3029
componentWillReceiveProps(nextProps) {
3130
this.setState({
@@ -39,9 +38,14 @@ export default class DatNumber extends Component {
3938

4039
applyConstraints(value) {
4140
const { min, max, step } = this.props;
42-
const [ hasMin, hasMax, hasStep ] = [ isFinite(min), isFinite(max), isFinite(step) ];
43-
const decimalPlaces = (hasStep && !isInteger(step)) ? step.toString().split('.')[1].length : 0;
44-
let [ isMin, isMax ] = [ false, false ];
41+
const [hasMin, hasMax, hasStep] = [
42+
isFinite(min),
43+
isFinite(max),
44+
isFinite(step)
45+
];
46+
const decimalPlaces =
47+
hasStep && !isInteger(step) ? step.toString().split('.')[1].length : 0;
48+
let [isMin, isMax] = [false, false];
4549

4650
value = toNumber(value);
4751

@@ -66,11 +70,11 @@ export default class DatNumber extends Component {
6670

6771
handleChange = event => {
6872
this.setState({ value: event.target.value }, this.update);
69-
}
73+
};
7074

7175
handleFocus = () => {
7276
document.addEventListener('keydown', this.handleKeyDown);
73-
}
77+
};
7478

7579
/**
7680
* @deprecated This has been deprecated for now and is no longer applied to the
@@ -83,7 +87,7 @@ export default class DatNumber extends Component {
8387
window.getSelection().removeAllRanges();
8488

8589
this.setState({ value }, this.update);
86-
}
90+
};
8791

8892
handleKeyDown = event => {
8993
const key = event.keyCode || event.which;
@@ -93,23 +97,24 @@ export default class DatNumber extends Component {
9397

9498
this.setState({ value }, this.update);
9599
}
96-
}
100+
};
97101

98102
handleSliderUpdate = (value, isLive) => {
99103
const constrained = this.applyConstraints(value);
100-
const shouldUpdate = (!isLive || this.props.liveUpdate);
104+
const shouldUpdate = !isLive || this.props.liveUpdate;
101105

102106
this.setState({ value: constrained }, () => {
103107
if (shouldUpdate) {
104108
this.update();
105109
}
106110
});
107-
}
111+
};
108112

109113
update() {
110114
const { value } = this.state;
111115

112-
this.props._onUpdateValue && this.props._onUpdateValue(this.props.path, toNumber(value));
116+
this.props._onUpdateValue &&
117+
this.props._onUpdateValue(this.props.path, toNumber(value));
113118
this.props.onUpdate && this.props.onUpdate(toNumber(value));
114119
}
115120

@@ -129,18 +134,33 @@ export default class DatNumber extends Component {
129134
}
130135

131136
render() {
132-
const { min, max, path, label, labelWidth, step, disableSlider } = this.props;
137+
const {
138+
min,
139+
max,
140+
path,
141+
label,
142+
labelWidth,
143+
step,
144+
disableSlider
145+
} = this.props;
133146
const labelText = isString(label) ? label : path;
134147
const hasSlider = isFinite(min) && isFinite(max);
135148
const controlsWidth = 100 - labelWidth;
136-
const inputWidth = hasSlider && disableSlider !== true ? Math.round(controlsWidth / 3) : controlsWidth;
149+
const inputWidth =
150+
hasSlider && disableSlider !== true
151+
? Math.round(controlsWidth / 3)
152+
: controlsWidth;
137153
const sliderWidth = controlsWidth - inputWidth;
138154

139155
return (
140156
<li className="cr number">
141157
<label>
142-
<span className="label-text" style={{ width: `${labelWidth}%` }}>{labelText}</span>
143-
{hasSlider && disableSlider !== true ? this.renderSlider(sliderWidth) : null}
158+
<span className="label-text" style={{ width: `${labelWidth}%` }}>
159+
{labelText}
160+
</span>
161+
{hasSlider && disableSlider !== true
162+
? this.renderSlider(sliderWidth)
163+
: null}
144164
<input
145165
type="number"
146166
step={step}

0 commit comments

Comments
 (0)