From c14a4e590a5e9d3a92d6e21b4f81d0f64c627dd8 Mon Sep 17 00:00:00 2001
From: Jason Quense <monastic.panic@gmail.com>
Date: Thu, 28 Mar 2019 11:11:42 -0400
Subject: [PATCH] feat: allow return null from useMergeState updater function

---
 src/useMergeState.ts | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/useMergeState.ts b/src/useMergeState.ts
index e06e790..eff7705 100644
--- a/src/useMergeState.ts
+++ b/src/useMergeState.ts
@@ -1,12 +1,12 @@
 import { useState } from 'react'
 
-type Updater<TState> = (state: TState) => Partial<TState>
+type Updater<TState> = (state: TState) => Partial<TState> | null
 
 export type MergeStateSetter<TState> = (
   update: Updater<TState> | Partial<TState> | null
 ) => void
 
-export default function useMergeState<TState>(
+export default function useMergeState<TState extends {}>(
   initialState: TState
 ): [TState, MergeStateSetter<TState>] {
   const [state, setState] = useState<TState>(initialState)
@@ -14,7 +14,10 @@ export default function useMergeState<TState>(
   const updater = (update: Updater<TState> | Partial<TState> | null) => {
     if (update === null) return
     if (typeof update === 'function')
-      setState(state => ({ ...state, ...update(state) }))
+      setState(state => {
+        const nextState = update(state)
+        return nextState == null ? state : { ...state, ...nextState }
+      })
 
     setState(state => ({ ...state, ...update }))
   }