kylefang/DefinitelyTyped
1
0
Fork 0
mirror of https://github.com/zhigang1992/DefinitelyTyped.git synced 2026-05-16 11:02:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixing broken test due to object-assign type definition change

Browse Source 
Not familiar with redux but merging and `dispatchProps` in `mergeProps` seems valid since `action` is required property of `DispatchProps`  and  should come from somewhere.
This commit is contained in:
Ivo Stratev
2016-08-19 23:19:38 +03:00
committed by GitHub
parent 24b0b62ce0
commit f340b21d40
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
react-redux/react-redux-tests.tsx
View File

@@ -268,8 +268,8 @@ connect(mapStateToProps3)(TodoApp);
// return { todos: state.todos };
//}
function mergeProps(stateProps: TodoState, dispatchProps: DispatchProps, ownProps: TodoProps): DispatchProps & TodoState {
return objectAssign({}, ownProps, {
function mergeProps(stateProps: TodoState, dispatchProps: DispatchProps, ownProps: TodoProps): DispatchProps & TodoState & TodoProps {
return objectAssign({}, ownProps, dispatchProps, {
todos: stateProps.todos[ownProps.userId],
addTodo: (text: string) => dispatchProps.addTodo(ownProps.userId, text)
});