Fix partial TermGroup decoration (#1705)

* Fix TermGroup decoration

* Fix partial getTermGroupProps calls
This commit is contained in:
CHaBou 2017-03-27 21:40:42 +02:00 committed by Guillermo Rauch
parent 900c5b3ac9
commit 6f2a77f655
2 changed files with 8 additions and 5 deletions

View file

@ -1,7 +1,7 @@
import React from 'react'; import React from 'react';
import {connect} from 'react-redux'; import {connect} from 'react-redux';
import Component from '../component'; import Component from '../component';
import {decorate, getTermProps} from '../utils/plugins'; import {decorate, getTermProps, getTermGroupProps} from '../utils/plugins';
import {resizeTermGroup} from '../actions/term-groups'; import {resizeTermGroup} from '../actions/term-groups';
import Term_ from './term'; import Term_ from './term';
import SplitPane_ from './split-pane'; import SplitPane_ from './split-pane';
@ -97,11 +97,11 @@ class TermGroup_ extends Component {
} }
const groups = childGroups.map(child => { const groups = childGroups.map(child => {
const props = Object.assign({}, this.props, { const props = getTermGroupProps(child.uid, this.props.parentProps, Object.assign({}, this.props, {
termGroup: child termGroup: child
}); }));
return (<TermGroup return (<DecoratedTermGroup
key={child.uid} key={child.uid}
{...props} {...props}
/>); />);
@ -124,4 +124,6 @@ const TermGroup = connect(
}) })
)(TermGroup_); )(TermGroup_);
const DecoratedTermGroup = decorate(TermGroup, 'TermGroup');
export default TermGroup; export default TermGroup;

View file

@ -101,7 +101,8 @@ export default class Terms extends Component {
onTitle: this.props.onTitle, onTitle: this.props.onTitle,
onData: this.props.onData, onData: this.props.onData,
onURLAbort: this.props.onURLAbort, onURLAbort: this.props.onURLAbort,
quickEdit: this.props.quickEdit quickEdit: this.props.quickEdit,
parentProps: this.props
}); });
return ( return (