Skip to content
Merged
Changes from all commits
Commits
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
9 changes: 5 additions & 4 deletions src/addons/container.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import React from 'react';
import Container from '../Container';
import getDisplayName from './getDisplayName';

function defaultTransformProps({ state, actions }) {
return { ...state, ...actions };
function defaultTransformProps({ props, state, actions }) {
return { ...props, ...state, ...actions };
}

export default function container(
Expand All @@ -14,10 +14,11 @@ export default function container(
static displayName = `ReduxContainer(${getDisplayName(DecoratedComponent)})`;

render() {
const {props} = this

return (
<Container actions={actions} stores={stores}>
{props => <DecoratedComponent {...this.props}
{...transformProps(props)} />}
{({state, actions}) => <DecoratedComponent {...transformProps({props, state, actions})} />}
</Container>
);
}
Expand Down