Skip to content

Remove unwanted props from connected component. #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
10xjs merged 1 commit into from
Dec 23, 2016
Merged

Remove unwanted props from connected component. #8

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 30 additions & 12 deletions src/connect.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,10 @@ import {componentsShape, renderMapShape, getDisplayName} from './util';
export default ({scope, ...defaultProps} = {}) => (WrappedComponent) => {
class Connect extends Component {
static propTypes = {
dispatch: PropTypes.func.isRequired,
___relocation___: PropTypes.shape({
___relocationDispatch___: {
removeComponent: PropTypes.func.isRequired,
},
___relocationState___: PropTypes.shape({
components: componentsShape.isRequired,
renderMap: renderMapShape.isRequired,
}).isRequired,
Expand All @@ -39,12 +41,9 @@ export default ({scope, ...defaultProps} = {}) => (WrappedComponent) => {
this.context.router.push(path);
}

removeComponent(id) {
return this.props.dispatch(removeComponent(id));
}

render() {
const {components, renderMap} = this.props.___relocation___;
const {components, renderMap} = this.props.___relocationState___;
const {removeComponent} = this.props.___relocationDispatch___;

const inRenderMap = (component) =>
typeof renderMap[component.type] === 'function';
Expand All @@ -67,7 +66,7 @@ export default ({scope, ...defaultProps} = {}) => (WrappedComponent) => {
// The component object does not have a `remove` property, or it has
// a truthy value that is not a function. Either case indicates that
// it should use the default remove handler.
removeHandler = () => this.removeComponent(component.id);
removeHandler = () => removeComponent(component.id);
}

let pathRemoveHandler = null;
Expand Down Expand Up @@ -119,8 +118,16 @@ export default ({scope, ...defaultProps} = {}) => (WrappedComponent) => {
// Assign remove handler functions.
.map(assignRemoveHandler);

/* eslint-disable no-unused-vars */
const {
___relocationState___,
___relocationDispatch___,
...childProps,
} = this.props;
/* eslint-enable no-unused-vars */

const mergedProps = {
...this.props,
...childProps,
...scope
? {[scope]: {components: currentComponents}}
: {components: currentComponents},
Expand All @@ -145,14 +152,25 @@ export default ({scope, ...defaultProps} = {}) => (WrappedComponent) => {
: props;

return {
// Put everything in a ___relocation___ namespace to avoid possible
// Put everything in a ___relocationState___ namespace to avoid possible
// conflict with existing props.
___relocation___: {
___relocationState___: {
components: getMergedComponents(state, selectorProps),
renderMap: components,
},
};
};

return connect(mapState)(hoistStatics(Connect, WrappedComponent));
const mapDispatch = (dispatch) => ({
// Put everything in a ___relocationDispatch___ namespace to avoid
// possible conflict with existing props.
___relocationDispatch___: {
removeComponent: (id) => dispatch(removeComponent(id)),
},
});

return connect(
mapState,
mapDispatch,
)(hoistStatics(Connect, WrappedComponent));
};