@aws-amplify/ui-react-core 3.0.30 → 3.1.1

package/src/hooks/useDataState.ts

@@ -1,3 +1,4 @@
+import { isFunction } from '@aws-amplify/ui';
 import React from 'react';
 
 export interface DataState<T> {
@@ -7,6 +8,13 @@ export interface DataState<T> {
   message: string | undefined;
 }
 
+export type DataAction<T = any, K = any> = (prevData: T, input: K) => T;
+
+export type AsyncDataAction<T = any, K = any> = (
+  prevData: T,
+  input: K
+) => Promise<T>;
+
 // default state
 const INITIAL_STATE = { hasError: false, isLoading: false, message: undefined };
 const LOADING_STATE = { hasError: false, isLoading: true, message: undefined };
@@ -20,9 +28,13 @@ const resolveMaybeAsync = async <T>(
 };
 
 export default function useDataState<T, K>(
-  action: (prevData: T, ...input: K[]) => T | Promise<T>,
-  initialData: T
-): [state: DataState<T>, handleAction: (...input: K[]) => void] {
+  action: DataAction<T, K> | AsyncDataAction<T, K>,
+  initialData: T,
+  options?: {
+    onSuccess?: (data: T) => void;
+    onError?: (message: string) => void;
+  }
+): [state: DataState<T>, handleAction: (input: K) => void] {
   const [dataState, setDataState] = React.useState<DataState<T>>(() => ({
     ...INITIAL_STATE,
     data: initialData,
@@ -30,20 +42,26 @@ export default function useDataState<T, K>(
 
   const prevData = React.useRef(initialData);
 
-  const handleAction: (...input: K[]) => void = React.useCallback(
-    (...input) => {
+  const { onSuccess, onError } = options ?? {};
+
+  const handleAction: (input: K) => void = React.useCallback(
+    (input) => {
       setDataState(({ data }) => ({ ...LOADING_STATE, data }));
 
-      resolveMaybeAsync(action(prevData.current, ...input))
+      resolveMaybeAsync(action(prevData.current, input))
         .then((data: T) => {
+          if (isFunction(onSuccess)) onSuccess(data);
+
           prevData.current = data;
           setDataState({ ...INITIAL_STATE, data });
         })
         .catch(({ message }: Error) => {
+          if (isFunction(onError)) onError(message);
+
           setDataState(({ data }) => ({ ...ERROR_STATE, data, message }));
         });
     },
-    [action]
+    [action, onError, onSuccess]
   );
 
   return [dataState, handleAction];

package/src/index.ts

@@ -35,6 +35,8 @@ export {
 } from './components';
 
 export {
+  AsyncDataAction,
+  DataAction,
   useDeprecationWarning,
   UseDeprecationWarning,
   useGetUrl,

package/src/utils/createContextUtilities.tsx

@@ -36,7 +36,7 @@ type CreateContextUtilitiesReturn<ContextType, ContextName extends string> = {
     : Key extends `use${string}`
     ? (params?: HookParams) => ContextType
     : Key extends `${string}Context`
-    ? React.Context<ContextType | undefined>
+    ? React.Context<ContextType>
     : never;
 };
 
@@ -89,7 +89,7 @@ type CreateContextUtilitiesReturn<ContextType, ContextName extends string> = {
 export default function createContextUtilities<
   ContextType,
   ContextName extends string = string,
-  Message extends string | undefined = string | undefined
+  Message extends string | undefined = string | undefined,
 >(
   options: ContextOptions<ContextType, ContextName, Message>
 ): CreateContextUtilitiesReturn<ContextType, ContextName> {
@@ -99,7 +99,11 @@ export default function createContextUtilities<
     throw new Error(INVALID_OPTIONS_MESSAGE);
   }
 
+  const contextDisplayName = `${contextName}Context`;
+  const providerDisplayName = `${contextName}Provider`;
+
   const Context = React.createContext<ContextType | undefined>(defaultValue);
+  Context.displayName = contextDisplayName;
 
   function Provider(props: React.PropsWithChildren<ContextType>) {
     const { children, ...context } = props;
@@ -113,8 +117,7 @@ export default function createContextUtilities<
     return <Context.Provider value={value}>{children}</Context.Provider>;
   }
 
-  Provider.displayName = `${contextName}Provider`;
-
+  Provider.displayName = providerDisplayName;
   return {
     [`use${contextName}`]: function (params?: HookParams) {
       const context = React.useContext(Context);
@@ -125,7 +128,7 @@ export default function createContextUtilities<
 
       return context;
     },
-    [`${contextName}Provider`]: Provider,
-    [`${contextName}Context`]: Context,
+    [providerDisplayName]: Provider,
+    [contextDisplayName]: Context,
   } as CreateContextUtilitiesReturn<ContextType, ContextName>;
 }