[types] Missing type in setValue hook

Author: jamesgpearce

src/ui-react.d.ts

@@ -29,6 +29,7 @@ import {
   CellIdsListener,
   CellListener,
   MapCell,
+  MapValue,
   Row,
   RowIdsListener,
   RowListener,
@@ -2088,10 +2089,10 @@ export function useSetPartialValuesCallback<Parameter>(
  */
 export function useSetValueCallback<Parameter>(
   valueId: Id,
-  getValue: (parameter: Parameter, store: Store) => Value,
+  getValue: (parameter: Parameter, store: Store) => Value | MapValue,
   getValueDeps?: React.DependencyList,
   storeOrStoreId?: StoreOrStoreId,
-  then?: (store: Store, value: Value) => void,
+  then?: (store: Store, value: Value | MapValue) => void,
   thenDeps?: React.DependencyList,
 ): ParameterizedCallback<Parameter>;
 

src/ui-react/hooks.ts

@@ -21,6 +21,7 @@ import {
   CellIdsListener,
   CellListener,
   MapCell,
+  MapValue,
   Row,
   RowIdsListener,
   RowListener,
@@ -235,21 +236,21 @@ const useListener = (
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [thing, ...preArgs, ...listenerDeps, ...postArgs]);
 
-const useSetCallback = <Parameter, Value>(
+const useSetCallback = <Parameter, Thing>(
   storeOrStoreId: StoreOrStoreId | undefined,
   settable: string,
-  get: (parameter: Parameter, store: Store) => Value,
+  get: (parameter: Parameter, store: Store) => Thing,
   getDeps: React.DependencyList = [],
-  then: (store: Store, value: Value) => void = getUndefined,
+  then: (store: Store, thing: Thing) => void = getUndefined,
   thenDeps: React.DependencyList = [],
   ...args: Ids
 ): ParameterizedCallback<Parameter> => {
   const store = useStoreOrStoreId(storeOrStoreId);
   return useCallback(
     (parameter) =>
       ifNotUndefined(store, (store: any) =>
-        ifNotUndefined(get(parameter as any, store), (value: Value) =>
-          then(store['set' + settable](...args, value), value),
+        ifNotUndefined(get(parameter as any, store), (thing: Thing) =>
+          then(store['set' + settable](...args, thing), thing),
         ),
       ),
     // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -534,10 +535,10 @@ export const useSetPartialValuesCallback: typeof useSetPartialValuesCallbackDecl
 
 export const useSetValueCallback: typeof useSetValueCallbackDecl = <Parameter>(
   valueId: Id,
-  getValue: (parameter: Parameter, store: Store) => Value,
+  getValue: (parameter: Parameter, store: Store) => Value | MapValue,
   getValueDeps?: React.DependencyList,
   storeOrStoreId?: StoreOrStoreId,
-  then?: (store: Store, value: Value) => void,
+  then?: (store: Store, value: Value | MapValue) => void,
   thenDeps?: React.DependencyList,
 ): ParameterizedCallback<Parameter> =>
   useSetCallback(

test/unit/hooks.test.tsx

@@ -5,6 +5,7 @@ import {
   Checkpoints,
   Id,
   MapCell,
+  MapValue,
   Persister,
   Row,
   Store,
@@ -2064,13 +2065,13 @@ describe('Write Hooks', () => {
   });
 
   test('useSetValueCallback', () => {
-    const then = jest.fn((_store?: Store, _value?: Value) => null);
+    const then = jest.fn((_store?: Store, _value?: Value | MapValue) => null);
     const Test = ({
       value,
       then,
     }: {
       value: number;
-      then: (store?: Store, value?: Value) => void;
+      then: (store?: Store, value?: Value | MapValue) => void;
     }) => {
       return (
         <div