fix(usemodel): accept falsy value

Author: ArrayZoneYour

__test__/lane/lane.spec.ts

@@ -29,6 +29,42 @@ describe('lane model', () => {
     })
   })
 
+  test('false value can be accepted', async () => {
+    const { useStore } = createStore(() => {
+      const [count, setCount] = useModel(true)
+      return { count, setCount }
+    })
+
+    let renderTimes = 0
+    const { result, rerender } = renderHook(() => {
+      const { count, setCount } = useStore()
+      renderTimes += 1
+      return { renderTimes, count, setCount }
+    })
+    await act(async () => {
+      expect(renderTimes).toEqual(1)
+      expect(result.current.count).toBe(true)
+    })
+
+    await act(async () => {
+      await result.current.setCount(false)
+    })
+
+    await act(() => {
+      expect(renderTimes).toEqual(2)
+      expect(result.current.count).toBe(false)
+    })
+
+    await act(() => {
+      rerender()
+    })
+
+    await act(() => {
+      expect(renderTimes).toEqual(3)
+      expect(result.current.count).toBe(false)
+    })
+  })
+
   test('multiple models', async () => {
     const { useStore } = createStore(() => {
       const [count, setCount] = useModel(1)

src/index.d.ts

@@ -96,7 +96,7 @@ interface BaseContext<S = {}, P = any> {
 
 interface InnerContext<S = {}> extends BaseContext<S> {
   // Actions with function type context will always invoke current component's reload.
-  type?: 'function' | 'outer' | 'class'
+  type?: 'function' | 'outer' | 'class' | 'useModel'
   __hash?: string
 }
 

src/index.tsx

@@ -27,7 +27,7 @@ function useModel<S>(state: S): [S, (state: S) => void] {
   const storeId = Global.currentStoreId
   const index = Global.mutableState[storeId].count
   Global.mutableState[storeId].count += 1
-  if (!Global.mutableState[storeId][index]) {
+  if (!Global.mutableState[storeId].hasOwnProperty(index)) {
     Global.mutableState[storeId][index] = state
   }
 
@@ -44,7 +44,7 @@ function useModel<S>(state: S): [S, (state: S) => void] {
       modelName: '__' + storeId,
       newState: {},
       params: undefined,
-      type: 'outer'
+      type: 'useModel'
     }
     Global.mutableState[storeId][index] = state
     return await applyMiddlewares(actionMiddlewares, context)

src/middlewares.ts

@@ -59,7 +59,14 @@ const getNewStateWithCache = (maxTime: number = 5000): Middleware => async (
 }
 
 const setNewState: Middleware = async (context, restMiddlewares) => {
-  const { modelName, newState, next, Global, disableSelectorUpdate } = context
+  const {
+    modelName,
+    newState,
+    next,
+    Global,
+    disableSelectorUpdate,
+    type
+  } = context
   if (Global.Setter.functionSetter[modelName] && !disableSelectorUpdate) {
     Object.keys(Global.Setter.functionSetter[modelName]).map((key) => {
       const setter = Global.Setter.functionSetter[modelName][key]
@@ -70,8 +77,8 @@ const setNewState: Middleware = async (context, restMiddlewares) => {
       }
     })
   }
-  if (newState) {
-    setPartialState(modelName, newState)
+  if (newState || type === 'useModel') {
+    setPartialState(modelName, newState || {})
     return await next(restMiddlewares)
   }
 }