From be9a10b7e9cb6f483848f00a40875ecd89353628 Mon Sep 17 00:00:00 2001 From: Alexander Rose <alex.rose@rcsb.org> Date: Thu, 15 Nov 2018 17:01:21 -0800 Subject: [PATCH] param controls tweaks --- src/mol-plugin/ui/controls/parameters.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mol-plugin/ui/controls/parameters.tsx b/src/mol-plugin/ui/controls/parameters.tsx index 9a65e23bc..8203bc799 100644 --- a/src/mol-plugin/ui/controls/parameters.tsx +++ b/src/mol-plugin/ui/controls/parameters.tsx @@ -155,7 +155,6 @@ export class ColorControl extends SimpleParam<PD.Color> { export class MultiSelectControl extends React.PureComponent<ParamProps<PD.MultiSelect<any>>> { change(value: PD.MultiSelect<any>['defaultValue'] ) { - console.log(this.props.name, value); this.props.onChange({ name: this.props.name, param: this.props.param, value }); } @@ -222,11 +221,12 @@ export class MappedControl extends React.PureComponent<ParamProps<PD.Mapped<any> render() { const value: PD.Mapped<any>['defaultValue'] = this.props.value; const param = this.props.param.map(value.name); + const label = this.props.param.label || camelCaseToWords(this.props.name); const Mapped = controlFor(param); const select = <SelectControl param={this.props.param.select} isDisabled={this.props.isDisabled} onChange={this.onChangeName} onEnter={this.props.onEnter} - name={'name'} value={value.name} /> + name={label} value={value.name} /> if (!Mapped) { return select; @@ -235,7 +235,7 @@ export class MappedControl extends React.PureComponent<ParamProps<PD.Mapped<any> return <div> {select} <div style={{ borderLeft: '5px solid #777', paddingLeft: '5px' }}> - <Mapped param={param} value={value} name='param' onChange={this.onChangeParam} onEnter={this.props.onEnter} isDisabled={this.props.isDisabled} /> + <Mapped param={param} value={value} name='' onChange={this.onChangeParam} onEnter={this.props.onEnter} isDisabled={this.props.isDisabled} /> </div> </div> } -- GitLab