feat: make useModel default to models namespace

kayak · Aug 8, 2019 · f3cd4aa · f3cd4aa
1 parent a26f71f
commit f3cd4aa
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/__tests__/hooks/useModel.tsx b/__tests__/hooks/useModel.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import {combineModelReducers, Model, useModel} from '../../src';
-import {createStore} from 'redux';
+import {combineReducers, createStore} from 'redux';
 import {Provider} from 'react-redux';
 import {mount} from 'enzyme';
 
@@ -26,7 +26,7 @@ describe('useModel', () => {
       scopes: [],
       fields: {},
     });
-    store = createStore(combineModelReducers([articleModel]));
+    store = createStore(combineReducers({ models: combineModelReducers([articleModel])}));
     store.dispatch(articleModel.actions().set(articleModel.defaultScope, 1, [{id: 1, title: 'title'}]));
     component = mount(
       <Provider store={store}>

diff --git a/src/hooks/useModel.ts b/src/hooks/useModel.ts
@@ -6,7 +6,7 @@ import { Data } from '../data';
 export function useModel(model: Model, namespace: string=''): Record<string, (ScopeId) => any> {
   const dispatch: DispatchProp = useDispatch();
   const state = useSelector(
-    (state: Record<string, any>) => namespace === '' ? state : state['models']
+    (state: Record<string, any>) => namespace === '' ? state['models'] : state[namespace]
   ) as object;
 
   return React.useMemo(() => {