diff --git a/src/components/dialog/edit-widget-control-creator.js b/src/components/dialog/edit-widget-control-creator.js index 0ac9502..5a4f716 100644 --- a/src/components/dialog/edit-widget-control-creator.js +++ b/src/components/dialog/edit-widget-control-creator.js @@ -125,8 +125,8 @@ export default function createControls(widgetType = null, widget = null, session handleChange(e)} />, handleChange(e)} />, handleChange(e)} />, - handleChange(e)} />, - handleChange(e)} /> + handleChange(e)} />, + handleChange(e)} /> ); break; case 'Button': diff --git a/src/components/dialog/edit-widget-number-control.js b/src/components/dialog/edit-widget-number-control.js index 0977756..15b4c67 100644 --- a/src/components/dialog/edit-widget-number-control.js +++ b/src/components/dialog/edit-widget-number-control.js @@ -40,7 +40,7 @@ class EditWidgetNumberControl extends Component { return ( {this.props.label} - this.props.handleChange(e)} /> + this.props.handleChange(e)} /> ); diff --git a/src/components/widget-slider.js b/src/components/widget-slider.js index 8599b8c..2f37fd9 100644 --- a/src/components/widget-slider.js +++ b/src/components/widget-slider.js @@ -38,7 +38,6 @@ class WidgetSlider extends Component { super(props); this.state = { - value: Number.parseFloat(this.props.widget.default_value), unit: '' }; } @@ -49,14 +48,14 @@ class WidgetSlider extends Component { } // Update value - if (nextProps.widget.value && this.state.value !== nextProps.widget.value) { + if (nextProps.widget.default_value && this.state.value === undefined) { this.setState({ - value: nextProps.widget.value, + value: nextProps.widget.default_value, }); } // Update unit - if (nextProps.widget.simulationModel && this.state.unit !== nextProps.simulationModel.inputMapping[nextProps.widget.signal].type) { + if (nextProps.widget.simulationModel && nextProps.simulationModel.inputMapping && this.state.unit !== nextProps.simulationModel.inputMapping[nextProps.widget.signal].type) { this.setState({ unit: nextProps.simulationModel.inputMapping[nextProps.widget.signal].type }); @@ -95,14 +94,12 @@ class WidgetSlider extends Component { let isVertical = this.props.widget.orientation === WidgetSlider.OrientationTypes.VERTICAL.value; let fields = { - 'name': this.props.widget.name, - 'control': this.valueIsChanging(v) } onAfterChange={ (v) => this.valueChanged(v) }/>, - 'value': Number.parseFloat(this.state.value).toPrecision(3) + name: this.props.widget.name, + control: this.valueIsChanging(v) } onAfterChange={ (v) => this.valueChanged(v) }/>, + value: { Number.parseFloat(this.state.value).toPrecision(3) }, + unit: { this.state.unit } } - if (this.props.widget.showUnit) - fields.value += ' [' + this.state.unit + ']'; - var widgetClasses = classNames({ 'slider-widget': true, 'full': true, @@ -121,7 +118,8 @@ class WidgetSlider extends Component {
{ fields.control } - { fields.value } + { fields.value } + { this.props.widget.showUnit && fields.unit }
) );