Skip to content
Snippets Groups Projects
Commit 0156c2c9 authored by Alexander Rose's avatar Alexander Rose
Browse files

wip, params

parent 233fcb5d
No related branches found
No related tags found
No related merge requests found
...@@ -216,7 +216,7 @@ export class GroupControl extends React.PureComponent<GroupWrapperProps> { ...@@ -216,7 +216,7 @@ export class GroupControl extends React.PureComponent<GroupWrapperProps> {
type MappedWrapperProps = { name: string, value: PD.Mapped<any>['defaultValue'], param: PD.Mapped<any>, onChange: ParamOnChange, onEnter?: () => void, isEnabled?: boolean } type MappedWrapperProps = { name: string, value: PD.Mapped<any>['defaultValue'], param: PD.Mapped<any>, onChange: ParamOnChange, onEnter?: () => void, isEnabled?: boolean }
export class MappedControl extends React.PureComponent<MappedWrapperProps> { export class MappedControl extends React.PureComponent<MappedWrapperProps> {
change(value: PD.Mapped<any>['defaultValue'] ) { change(value: PD.Mapped<any>['defaultValue']) {
this.props.onChange({ name: this.props.name, param: this.props.param, value }); this.props.onChange({ name: this.props.name, param: this.props.param, value });
} }
...@@ -239,9 +239,10 @@ export class MappedControl extends React.PureComponent<MappedWrapperProps> { ...@@ -239,9 +239,10 @@ export class MappedControl extends React.PureComponent<MappedWrapperProps> {
name={'name'} value={value.name} /> name={'name'} value={value.name} />
<div style={{ borderLeft: '5px solid #777', paddingLeft: '5px' }}> <div style={{ borderLeft: '5px solid #777', paddingLeft: '5px' }}>
{param.type === 'group' {param.type === 'group'
? <GroupControl param={param} value={value} name='param' onChange={this.onChangeParam} onEnter={this.props.onEnter} isEnabled={this.props.isEnabled} /> ? <GroupControl param={param} value={value} name='param' onChange={this.onChangeParam} onEnter={this.props.onEnter} isEnabled={this.props.isEnabled} />
: param.type === 'mapped' || param.type === 'value' ? null : param.type === 'mapped' || param.type === 'value'
: <ParamWrapper control={controlFor(param)} param={param} onChange={this.onChangeParam} onEnter={this.props.onEnter} isEnabled={this.props.isEnabled} name={'value'} value={value} />} ? null
: <ParamWrapper control={controlFor(param)} param={param} onChange={this.onChangeParam} onEnter={this.props.onEnter} isEnabled={this.props.isEnabled} name={'value'} value={value} />}
</div> </div>
</div> </div>
} }
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
import { Color as ColorData } from './color'; import { Color as ColorData } from './color';
import { shallowClone, shallowEqual } from 'mol-util'; import { shallowClone, shallowEqual } from 'mol-util';
import { Vec2 } from 'mol-math/linear-algebra'; import { Vec2 } from 'mol-math/linear-algebra';
import { deepClone } from './object';
export namespace ParamDefinition { export namespace ParamDefinition {
export interface Info { export interface Info {
...@@ -142,7 +143,7 @@ export namespace ParamDefinition { ...@@ -142,7 +143,7 @@ export namespace ParamDefinition {
} }
export function clone<P extends Params>(params: P): P { export function clone<P extends Params>(params: P): P {
return shallowClone(params) return deepClone(params)
} }
/** /**
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment