@aws-amplify/ui-react-core 2.1.19 → 2.1.21

package/dist/esm/Authenticator/context/AuthenticatorProvider.mjs

@@ -1,9 +1,29 @@
+import { __awaiter } from '../../node_modules/tslib/tslib.es6.mjs';
 import React, { useContext, useMemo, useEffect } from 'react';
 import { useInterpret } from '@xstate/react';
-import { createAuthenticatorMachine, listenToAuthHub } from '@aws-amplify/ui';
+import { Auth } from 'aws-amplify';
+import { createAuthenticatorMachine, listenToAuthHub, defaultAuthHubHandler } from '@aws-amplify/ui';
 import { AuthenticatorContext } from './AuthenticatorContext.mjs';
 
+const createHubHandler = (options) => (data, service) => __awaiter(void 0, void 0, void 0, function* () {
+    yield defaultAuthHubHandler(data, service, options);
+});
 function AuthenticatorProvider({ children, }) {
+    // `authStatus` is exposed by `useAuthenticator` but should not be derived directly from the
+    // state machine as the machine only updates on `Authenticator` initiated events, which
+    // leads to scenarios where the state machine `authStatus` gets "stuck". For exmample,
+    // if a user was to sign in using `Auth.signIn` directly rather than using `Authenticator`
+    const [authStatus, setAuthStatus] = React.useState('configuring');
+    // only run on first render
+    React.useEffect(() => {
+        Auth.currentAuthenticatedUser()
+            .then(() => {
+            setAuthStatus('authenticated');
+        })
+            .catch(() => {
+            setAuthStatus('unauthenticated');
+        });
+    }, []);
     /**
      * Based on use cases, developer might already have added another Provider
      * outside Authenticator. In that case, we sync the two providers by just
@@ -13,10 +33,16 @@ function AuthenticatorProvider({ children, }) {
      */
     const parentProviderVal = useContext(AuthenticatorContext);
     const service = useInterpret(createAuthenticatorMachine);
-    const value = useMemo(() => (!parentProviderVal ? { service } : parentProviderVal), [parentProviderVal, service]);
+    const value = useMemo(() => (!parentProviderVal ? { authStatus, service } : parentProviderVal), [authStatus, parentProviderVal, service]);
     const { service: activeService } = value;
     useEffect(() => {
-        const unsubscribe = listenToAuthHub(activeService);
+        const onSignIn = () => {
+            setAuthStatus('authenticated');
+        };
+        const onSignOut = () => {
+            setAuthStatus('unauthenticated');
+        };
+        const unsubscribe = listenToAuthHub(activeService, createHubHandler({ onSignIn, onSignOut }));
         return unsubscribe;
     }, [activeService]);
     return (React.createElement(AuthenticatorContext.Provider, { value: value }, children));

package/dist/esm/Authenticator/hooks/useAuthenticator/useAuthenticator.mjs

@@ -2,6 +2,7 @@ import { __rest } from '../../../node_modules/tslib/tslib.es6.mjs';
 import React, { useCallback } from 'react';
 import { useSelector } from '@xstate/react';
 import { getServiceFacade } from '@aws-amplify/ui';
+import 'aws-amplify';
 import { AuthenticatorContext } from '../../context/AuthenticatorContext.mjs';
 import { USE_AUTHENTICATOR_ERROR } from './constants.mjs';
 import { getQRFields, getMachineFields, getTotpSecretCodeCallback, getComparator, defaultComparator } from './utils.mjs';
@@ -18,6 +19,9 @@ function useAuthenticator(selector) {
     const { send } = service;
     const xstateSelector = useCallback((state) => (Object.assign({}, getServiceFacade({ send, state }))), [send]);
     const comparator = selector ? getComparator(selector) : defaultComparator;
+    // the purpose of `context.authStatus`is to intentionally override `facade.authStatus`. `facade.authStatus` does
+    // not update on external sign in events (for example when a user is not using the `Authenticator`).
+    const { authStatus } = context;
     const facade = useSelector(service, xstateSelector, comparator);
     const { route, totpSecretCode, unverifiedContactMethods, user } = facade, rest = __rest(facade, ["route", "totpSecretCode", "unverifiedContactMethods", "user"]);
     // do not memoize output. `service.getSnapshot` reference remains stable preventing
@@ -27,7 +31,8 @@ function useAuthenticator(selector) {
     const QRFields = route === 'setupTOTP' ? getQRFields(serviceSnapshot) : null;
     // legacy `formFields` values required until form state is removed from state machine
     const fields = getMachineFields(route, serviceSnapshot, unverifiedContactMethods);
-    return Object.assign(Object.assign({}, rest), { route,
+    return Object.assign(Object.assign({}, rest), { authStatus,
+        route,
         totpSecretCode,
         unverifiedContactMethods,
         user,

package/dist/index.js

@@ -4,8 +4,8 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var React = require('react');
 var react = require('@xstate/react');
-var ui = require('@aws-amplify/ui');
 var awsAmplify = require('aws-amplify');
+var ui = require('@aws-amplify/ui');
 var notifications = require('@aws-amplify/notifications');
 var core = require('@aws-amplify/core');
 
@@ -13,32 +13,6 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 
-/**
- * AuthenticatorContext serves static reference to the auth machine service.
- *
- * https://xstate.js.org/docs/recipes/react.html#context-provider
- */
-const AuthenticatorContext = React__default["default"].createContext(null);
-
-function AuthenticatorProvider({ children, }) {
-    /**
-     * Based on use cases, developer might already have added another Provider
-     * outside Authenticator. In that case, we sync the two providers by just
-     * passing the parent value.
-     *
-     * TODO(BREAKING): enforce only one provider in App tree
-     */
-    const parentProviderVal = React.useContext(AuthenticatorContext);
-    const service = react.useInterpret(ui.createAuthenticatorMachine);
-    const value = React.useMemo(() => (!parentProviderVal ? { service } : parentProviderVal), [parentProviderVal, service]);
-    const { service: activeService } = value;
-    React.useEffect(() => {
-        const unsubscribe = ui.listenToAuthHub(activeService);
-        return unsubscribe;
-    }, [activeService]);
-    return (React__default["default"].createElement(AuthenticatorContext.Provider, { value: value }, children));
-}
-
 /******************************************************************************
 Copyright (c) Microsoft Corporation.
 
@@ -76,6 +50,56 @@ function __awaiter(thisArg, _arguments, P, generator) {
     });
 }
 
+/**
+ * AuthenticatorContext serves static reference to the auth machine service.
+ *
+ * https://xstate.js.org/docs/recipes/react.html#context-provider
+ */
+const AuthenticatorContext = React__default["default"].createContext(null);
+
+const createHubHandler = (options) => (data, service) => __awaiter(void 0, void 0, void 0, function* () {
+    yield ui.defaultAuthHubHandler(data, service, options);
+});
+function AuthenticatorProvider({ children, }) {
+    // `authStatus` is exposed by `useAuthenticator` but should not be derived directly from the
+    // state machine as the machine only updates on `Authenticator` initiated events, which
+    // leads to scenarios where the state machine `authStatus` gets "stuck". For exmample,
+    // if a user was to sign in using `Auth.signIn` directly rather than using `Authenticator`
+    const [authStatus, setAuthStatus] = React__default["default"].useState('configuring');
+    // only run on first render
+    React__default["default"].useEffect(() => {
+        awsAmplify.Auth.currentAuthenticatedUser()
+            .then(() => {
+            setAuthStatus('authenticated');
+        })
+            .catch(() => {
+            setAuthStatus('unauthenticated');
+        });
+    }, []);
+    /**
+     * Based on use cases, developer might already have added another Provider
+     * outside Authenticator. In that case, we sync the two providers by just
+     * passing the parent value.
+     *
+     * TODO(BREAKING): enforce only one provider in App tree
+     */
+    const parentProviderVal = React.useContext(AuthenticatorContext);
+    const service = react.useInterpret(ui.createAuthenticatorMachine);
+    const value = React.useMemo(() => (!parentProviderVal ? { authStatus, service } : parentProviderVal), [authStatus, parentProviderVal, service]);
+    const { service: activeService } = value;
+    React.useEffect(() => {
+        const onSignIn = () => {
+            setAuthStatus('authenticated');
+        };
+        const onSignOut = () => {
+            setAuthStatus('unauthenticated');
+        };
+        const unsubscribe = ui.listenToAuthHub(activeService, createHubHandler({ onSignIn, onSignOut }));
+        return unsubscribe;
+    }, [activeService]);
+    return (React__default["default"].createElement(AuthenticatorContext.Provider, { value: value }, children));
+}
+
 const USE_AUTHENTICATOR_ERROR = '`useAuthenticator` must be used inside an `Authenticator.Provider`.';
 
 const COMPONENT_ROUTE_KEYS = [
@@ -193,6 +217,9 @@ function useAuthenticator(selector) {
     const { send } = service;
     const xstateSelector = React.useCallback((state) => (Object.assign({}, ui.getServiceFacade({ send, state }))), [send]);
     const comparator = selector ? getComparator(selector) : defaultComparator;
+    // the purpose of `context.authStatus`is to intentionally override `facade.authStatus`. `facade.authStatus` does
+    // not update on external sign in events (for example when a user is not using the `Authenticator`).
+    const { authStatus } = context;
     const facade = react.useSelector(service, xstateSelector, comparator);
     const { route, totpSecretCode, unverifiedContactMethods, user } = facade, rest = __rest(facade, ["route", "totpSecretCode", "unverifiedContactMethods", "user"]);
     // do not memoize output. `service.getSnapshot` reference remains stable preventing
@@ -202,7 +229,8 @@ function useAuthenticator(selector) {
     const QRFields = route === 'setupTOTP' ? getQRFields(serviceSnapshot) : null;
     // legacy `formFields` values required until form state is removed from state machine
     const fields = getMachineFields(route, serviceSnapshot, unverifiedContactMethods);
-    return Object.assign(Object.assign({}, rest), { route,
+    return Object.assign(Object.assign({}, rest), { authStatus,
+        route,
         totpSecretCode,
         unverifiedContactMethods,
         user,

package/dist/types/Authenticator/context/AuthenticatorContext.d.ts

@@ -1,9 +1,9 @@
 import React from 'react';
-import { AuthInterpreter } from '@aws-amplify/ui';
+import { AuthInterpreter, AuthStatus } from '@aws-amplify/ui';
 /**
  * Authenticator React.Context type
  */
-declare type AuthenticatorContextType = {
+type AuthenticatorContextType = {
     service: AuthInterpreter;
 };
 /**
@@ -11,5 +11,7 @@ declare type AuthenticatorContextType = {
  *
  * https://xstate.js.org/docs/recipes/react.html#context-provider
  */
-export declare const AuthenticatorContext: React.Context<AuthenticatorContextType | null>;
+export declare const AuthenticatorContext: React.Context<(AuthenticatorContextType & {
+    authStatus: AuthStatus;
+}) | null>;
 export {};

package/dist/types/Authenticator/hooks/types.d.ts

@@ -1,31 +1,31 @@
 import React from 'react';
 import { AuthChallengeName, AuthenticatorServiceFacade, LegacyFormFieldOptions } from '@aws-amplify/ui';
 import { UseAuthenticator } from './useAuthenticator';
-export declare type AuthenticatorRouteComponentKey = 'confirmResetPassword' | 'confirmSignIn' | 'confirmSignUp' | 'confirmVerifyUser' | 'forceNewPassword' | 'resetPassword' | 'setupTOTP' | 'signIn' | 'signUp' | 'verifyUser';
-export declare type AuthenticatorLegacyField = LegacyFormFieldOptions;
-export declare type AuthenticatorLegacyFields = AuthenticatorLegacyField[];
+export type AuthenticatorRouteComponentKey = 'confirmResetPassword' | 'confirmSignIn' | 'confirmSignUp' | 'confirmVerifyUser' | 'forceNewPassword' | 'resetPassword' | 'setupTOTP' | 'signIn' | 'signUp' | 'verifyUser';
+export type AuthenticatorLegacyField = LegacyFormFieldOptions;
+export type AuthenticatorLegacyFields = AuthenticatorLegacyField[];
 /**
  * These are the "facades" that we provide, which contains contexts respective
  * to current authenticator state.
  */
-export declare type AuthenticatorMachineContext = AuthenticatorServiceFacade;
-export declare type AuthenticatorMachineContextKey = keyof AuthenticatorMachineContext;
-export declare type AuthenticatorRouteComponentName = Capitalize<AuthenticatorRouteComponentKey>;
+export type AuthenticatorMachineContext = AuthenticatorServiceFacade;
+export type AuthenticatorMachineContextKey = keyof AuthenticatorMachineContext;
+export type AuthenticatorRouteComponentName = Capitalize<AuthenticatorRouteComponentKey>;
 interface HeaderProps {
     children?: React.ReactNode;
 }
 interface FooterProps {
     children?: React.ReactNode;
 }
-declare type FormFieldsProps = {
+type FormFieldsProps = {
     isPending: UseAuthenticator['isPending'];
     validationErrors?: UseAuthenticator['validationErrors'];
 };
-export declare type FooterComponent<Props = {}> = React.ComponentType<FooterProps & Props>;
-export declare type FormFieldsComponent<FieldType, Props = {}> = React.ComponentType<FormFieldsProps & {
+export type FooterComponent<Props = {}> = React.ComponentType<FooterProps & Props>;
+export type FormFieldsComponent<FieldType, Props = {}> = React.ComponentType<FormFieldsProps & {
     fields: FieldType[];
 } & Props>;
-export declare type HeaderComponent<Props = {}> = React.ComponentType<HeaderProps & Props>;
+export type HeaderComponent<Props = {}> = React.ComponentType<HeaderProps & Props>;
 export interface ComponentSlots<FieldType = {}> {
     Footer: FooterComponent;
     Header: HeaderComponent;
@@ -34,7 +34,7 @@ export interface ComponentSlots<FieldType = {}> {
 /**
  * Common component prop types used for both RWA and RNA implementations
  */
-export declare type CommonRouteProps = {
+export type CommonRouteProps = {
     error?: UseAuthenticator['error'];
     isPending: UseAuthenticator['isPending'];
     handleBlur: UseAuthenticator['updateBlur'];
@@ -44,45 +44,45 @@ export declare type CommonRouteProps = {
 /**
  * Base Route component props
  */
-export declare type ConfirmResetPasswordBaseProps<FieldType = {}> = {
+export type ConfirmResetPasswordBaseProps<FieldType = {}> = {
     resendCode: UseAuthenticator['resendCode'];
     validationErrors?: UseAuthenticator['validationErrors'];
 } & CommonRouteProps & ComponentSlots<FieldType>;
-export declare type ConfirmSignInBaseProps<FieldType = {}> = {
+export type ConfirmSignInBaseProps<FieldType = {}> = {
     challengeName: AuthChallengeName;
     toSignIn: UseAuthenticator['toSignIn'];
 } & CommonRouteProps & ComponentSlots<FieldType>;
-export declare type ConfirmSignUpBaseProps<FieldType = {}> = {
+export type ConfirmSignUpBaseProps<FieldType = {}> = {
     codeDeliveryDetails: UseAuthenticator['codeDeliveryDetails'];
     resendCode: UseAuthenticator['resendCode'];
 } & CommonRouteProps & ComponentSlots<FieldType>;
-export declare type ConfirmVerifyUserProps<FieldType = {}> = {
+export type ConfirmVerifyUserProps<FieldType = {}> = {
     skipVerification: UseAuthenticator['skipVerification'];
 } & CommonRouteProps & ComponentSlots<FieldType>;
-export declare type ForceResetPasswordBaseProps<FieldType = {}> = {
+export type ForceResetPasswordBaseProps<FieldType = {}> = {
     toSignIn: UseAuthenticator['toSignIn'];
     validationErrors?: UseAuthenticator['validationErrors'];
 } & CommonRouteProps & ComponentSlots<FieldType>;
-export declare type ResetPasswordBaseProps<FieldType = {}> = {
+export type ResetPasswordBaseProps<FieldType = {}> = {
     toSignIn: UseAuthenticator['toSignIn'];
 } & CommonRouteProps & ComponentSlots<FieldType>;
-export declare type SetupTOTPBaseProps<FieldType = {}> = {
+export type SetupTOTPBaseProps<FieldType = {}> = {
     toSignIn: UseAuthenticator['toSignIn'];
     totpSecretCode: UseAuthenticator['totpSecretCode'];
 } & CommonRouteProps & ComponentSlots<FieldType>;
-export declare type SignInBaseProps<FieldType = {}> = {
+export type SignInBaseProps<FieldType = {}> = {
     hideSignUp?: boolean;
     toFederatedSignIn: UseAuthenticator['toFederatedSignIn'];
     toResetPassword: UseAuthenticator['toResetPassword'];
     toSignUp: UseAuthenticator['toSignUp'];
 } & CommonRouteProps & ComponentSlots<FieldType>;
-export declare type SignUpBaseProps<FieldType = {}> = {
+export type SignUpBaseProps<FieldType = {}> = {
     hideSignIn?: boolean;
     toFederatedSignIn: UseAuthenticator['toFederatedSignIn'];
     toSignIn: UseAuthenticator['toSignIn'];
     validationErrors?: UseAuthenticator['validationErrors'];
 } & CommonRouteProps & ComponentSlots<FieldType>;
-export declare type VerifyUserProps<FieldType = {}> = {
+export type VerifyUserProps<FieldType = {}> = {
     skipVerification: UseAuthenticator['skipVerification'];
 } & CommonRouteProps & ComponentSlots<FieldType>;
 export interface DefaultProps<FieldType = {}> {
@@ -100,24 +100,24 @@ export interface DefaultProps<FieldType = {}> {
 /**
  * common types extended for default component types/implementations and override component types
  */
-declare type BaseComponent<ComponentRouteProps = {}, FieldType = {}, Props = {}> = React.ComponentType<ComponentSlots<FieldType> & ComponentRouteProps & {
+type BaseComponent<ComponentRouteProps = {}, FieldType = {}, Props = {}> = React.ComponentType<ComponentSlots<FieldType> & ComponentRouteProps & {
     fields: FieldType[];
 } & Props>;
 /**
  * Authenticator Route Component Default types
  */
-export declare type Defaults<FieldType = {}, PlatformProps = {}> = {
+export type Defaults<FieldType = {}, PlatformProps = {}> = {
     [Key in AuthenticatorRouteComponentName]: BaseComponent<DefaultProps<FieldType>[Key], FieldType, PlatformProps> & ComponentSlots<FieldType>;
 };
-export declare type Overrides<FieldType = {}, PlatformProps = {}> = {
+export type Overrides<FieldType = {}, PlatformProps = {}> = {
     [Key in AuthenticatorRouteComponentName]?: BaseComponent<DefaultProps<FieldType>[Key], FieldType, PlatformProps>;
 };
 /**
  * Default Route Component union type
  */
-export declare type DefaultComponentType<FieldType = {}> = Defaults<FieldType>[keyof Defaults<FieldType>];
+export type DefaultComponentType<FieldType = {}> = Defaults<FieldType>[keyof Defaults<FieldType>];
 /**
  * Default Route Component union type
  */
-export declare type DefaultPropsType<FieldType = {}> = DefaultProps<FieldType>[keyof DefaultProps<FieldType>];
+export type DefaultPropsType<FieldType = {}> = DefaultProps<FieldType>[keyof DefaultProps<FieldType>];
 export {};

package/dist/types/Authenticator/hooks/useAuthenticator/types.d.ts

@@ -3,17 +3,17 @@ import { AuthenticatorServiceFacade, LegacyFormFieldOptions } from '@aws-amplify
  * These are the "facades" that we provide, which contains contexts respective
  * to current authenticator state.
  */
-declare type AuthenticatorMachineContext = AuthenticatorServiceFacade;
-declare type AuthenticatorMachineContextKey = keyof AuthenticatorMachineContext;
-export declare type AuthenticatorRouteComponentKey = 'signIn' | 'signUp' | 'forceNewPassword' | 'confirmResetPassword' | 'confirmSignIn' | 'confirmSignUp' | 'confirmVerifyUser' | 'resetPassword' | 'setupTOTP' | 'verifyUser';
-export declare type AuthenticatorLegacyFields = LegacyFormFieldOptions[];
+type AuthenticatorMachineContext = AuthenticatorServiceFacade;
+type AuthenticatorMachineContextKey = keyof AuthenticatorMachineContext;
+export type AuthenticatorRouteComponentKey = 'signIn' | 'signUp' | 'forceNewPassword' | 'confirmResetPassword' | 'confirmSignIn' | 'confirmSignUp' | 'confirmVerifyUser' | 'resetPassword' | 'setupTOTP' | 'verifyUser';
+export type AuthenticatorLegacyFields = LegacyFormFieldOptions[];
 /**
  * Inspired from https://xstate.js.org/docs/packages/xstate-react/#useselector-actor-selector-compare-getsnapshot.
  *
  * Selector accepts current facade values and returns an array of
  * desired value(s) that should trigger re-render.
  */
-export declare type UseAuthenticatorSelector = (context: AuthenticatorMachineContext) => AuthenticatorMachineContext[AuthenticatorMachineContextKey][];
+export type UseAuthenticatorSelector = (context: AuthenticatorMachineContext) => AuthenticatorMachineContext[AuthenticatorMachineContextKey][];
 export interface UseAuthenticator extends AuthenticatorServiceFacade {
     /** @deprecated For internal use only */
     fields: AuthenticatorLegacyFields;
@@ -25,5 +25,5 @@ export interface UseAuthenticator extends AuthenticatorServiceFacade {
         totpUsername?: string;
     } | null;
 }
-export declare type Comparator = (currentMachineContext: AuthenticatorMachineContext, nextMachineContext: AuthenticatorMachineContext) => boolean;
+export type Comparator = (currentMachineContext: AuthenticatorMachineContext, nextMachineContext: AuthenticatorMachineContext) => boolean;
 export {};

package/dist/types/Authenticator/hooks/useAuthenticatorRoute/types.d.ts

@@ -1,36 +1,36 @@
 import { AuthenticatorMachineContext, AuthenticatorMachineContextKey, AuthenticatorRouteComponentName, CommonRouteProps, ConfirmResetPasswordBaseProps, ConfirmSignInBaseProps, ConfirmSignUpBaseProps, Defaults, DefaultProps, ForceResetPasswordBaseProps, ResetPasswordBaseProps, SetupTOTPBaseProps, SignInBaseProps, SignUpBaseProps, VerifyUserProps, ConfirmVerifyUserProps } from '../types';
-export declare type UseAuthenticatorRouteParams<FieldType> = {
+export type UseAuthenticatorRouteParams<FieldType> = {
     components: Defaults<FieldType>;
 };
-export declare type UseAuthenticatorRoute<ComponentName extends AuthenticatorRouteComponentName, FieldType = {}> = {
+export type UseAuthenticatorRoute<ComponentName extends AuthenticatorRouteComponentName, FieldType = {}> = {
     Component: Defaults<FieldType>[ComponentName];
     props: DefaultProps<FieldType>[ComponentName];
 };
-export declare type UseAuthenticatorRouteDefault<FieldType> = {
+export type UseAuthenticatorRouteDefault<FieldType> = {
     Component: Defaults<FieldType>[AuthenticatorRouteComponentName];
     props: DefaultProps<FieldType>[AuthenticatorRouteComponentName];
 };
-declare type ExtractMachineKey<RouteProps> = Extract<AuthenticatorMachineContextKey, keyof RouteProps>;
-export declare type FormEventHandlerMachineKey = 'updateBlur' | 'updateForm' | 'submitForm';
-export declare type FormEventHandlerPropKey = `handleBlur` | `handleChange` | `handleSubmit`;
-export declare type CommonRouteMachineKey = ExtractMachineKey<CommonRouteProps> | FormEventHandlerMachineKey;
+type ExtractMachineKey<RouteProps> = Extract<AuthenticatorMachineContextKey, keyof RouteProps>;
+export type FormEventHandlerMachineKey = 'updateBlur' | 'updateForm' | 'submitForm';
+export type FormEventHandlerPropKey = `handleBlur` | `handleChange` | `handleSubmit`;
+export type CommonRouteMachineKey = ExtractMachineKey<CommonRouteProps> | FormEventHandlerMachineKey;
 /**
  * `route` sub-component machine selector key types
  */
-export declare type ConfirmResetPasswordMachineKey = ExtractMachineKey<ConfirmResetPasswordBaseProps> | CommonRouteMachineKey;
-export declare type ConfirmSignInMachineKey = ExtractMachineKey<ConfirmSignInBaseProps> | CommonRouteMachineKey | 'user';
-export declare type ConfirmSignUpMachineKey = ExtractMachineKey<ConfirmSignUpBaseProps> | CommonRouteMachineKey;
-export declare type ConfirmVerifyUserMachineKey = ExtractMachineKey<ConfirmVerifyUserProps> | CommonRouteMachineKey;
-export declare type ForceNewPasswordMachineKey = ExtractMachineKey<ForceResetPasswordBaseProps> | CommonRouteMachineKey;
-export declare type ResetPasswordMachineKey = ExtractMachineKey<ResetPasswordBaseProps> | CommonRouteMachineKey;
-export declare type SetupTOTPMachineKey = ExtractMachineKey<SetupTOTPBaseProps> | CommonRouteMachineKey;
-export declare type SignInMachineKey = ExtractMachineKey<SignInBaseProps> | CommonRouteMachineKey;
-export declare type SignUpMachineKey = ExtractMachineKey<SignUpBaseProps> | CommonRouteMachineKey;
-export declare type VerifyUserMachineKey = ExtractMachineKey<VerifyUserProps> | CommonRouteMachineKey;
+export type ConfirmResetPasswordMachineKey = ExtractMachineKey<ConfirmResetPasswordBaseProps> | CommonRouteMachineKey;
+export type ConfirmSignInMachineKey = ExtractMachineKey<ConfirmSignInBaseProps> | CommonRouteMachineKey | 'user';
+export type ConfirmSignUpMachineKey = ExtractMachineKey<ConfirmSignUpBaseProps> | CommonRouteMachineKey;
+export type ConfirmVerifyUserMachineKey = ExtractMachineKey<ConfirmVerifyUserProps> | CommonRouteMachineKey;
+export type ForceNewPasswordMachineKey = ExtractMachineKey<ForceResetPasswordBaseProps> | CommonRouteMachineKey;
+export type ResetPasswordMachineKey = ExtractMachineKey<ResetPasswordBaseProps> | CommonRouteMachineKey;
+export type SetupTOTPMachineKey = ExtractMachineKey<SetupTOTPBaseProps> | CommonRouteMachineKey;
+export type SignInMachineKey = ExtractMachineKey<SignInBaseProps> | CommonRouteMachineKey;
+export type SignUpMachineKey = ExtractMachineKey<SignUpBaseProps> | CommonRouteMachineKey;
+export type VerifyUserMachineKey = ExtractMachineKey<VerifyUserProps> | CommonRouteMachineKey;
 /**
  * machine values with machine form event handlers keys mapped to UI form event handlers
  */
-export declare type ConvertedMachineProps = Omit<AuthenticatorMachineContext, FormEventHandlerMachineKey> & {
+export type ConvertedMachineProps = Omit<AuthenticatorMachineContext, FormEventHandlerMachineKey> & {
     handleBlur: AuthenticatorMachineContext['updateBlur'];
     handleChange: AuthenticatorMachineContext['updateForm'];
     handleSubmit: AuthenticatorMachineContext['submitForm'];

package/dist/types/InAppMessaging/hooks/useMessage/types.d.ts

@@ -9,8 +9,8 @@ export interface UseMessageParams<PlatformStyleProps> {
     components: Components<PlatformStyleProps>;
     onMessageAction: OnMessageAction;
 }
-declare type MessageComponent<PlatformStyleProps> = BannerMessageComponent<PlatformStyleProps> | CarouselMessageComponent<PlatformStyleProps> | FullScreenMessageComponent<PlatformStyleProps> | ModalMessageComponent<PlatformStyleProps>;
-declare type MessageProps<PlatformStyleProps> = BannerMessageCommonProps<PlatformStyleProps> | CarouselMessageCommonProps<PlatformStyleProps> | FullScreenMessageCommonProps<PlatformStyleProps> | ModalMessageCommonProps<PlatformStyleProps>;
+type MessageComponent<PlatformStyleProps> = BannerMessageComponent<PlatformStyleProps> | CarouselMessageComponent<PlatformStyleProps> | FullScreenMessageComponent<PlatformStyleProps> | ModalMessageComponent<PlatformStyleProps>;
+type MessageProps<PlatformStyleProps> = BannerMessageCommonProps<PlatformStyleProps> | CarouselMessageCommonProps<PlatformStyleProps> | FullScreenMessageCommonProps<PlatformStyleProps> | ModalMessageCommonProps<PlatformStyleProps>;
 export interface UseMessage<PlatformStyleProps> {
     Component: MessageComponent<PlatformStyleProps>;
     props: MessageProps<PlatformStyleProps>;

package/dist/types/InAppMessaging/types.d.ts

@@ -1,14 +1,14 @@
 import React from 'react';
 import { InAppMessage, InAppMessageAction, InAppMessageButton, InAppMessageContent, InAppMessageImage, InAppMessageLayout, InAppMessageStyle, InAppMessageTextAlign } from '@aws-amplify/notifications';
-export declare type Message = InAppMessage;
-export declare type MessageAction = InAppMessageAction;
-export declare type MessageButton = InAppMessageButton;
-export declare type MessageContent = InAppMessageContent;
-export declare type MessageImage = InAppMessageImage;
-export declare type MessageLayout = InAppMessageLayout;
-export declare type MessageStyle = InAppMessageStyle;
-export declare type MessageTextAlign = InAppMessageTextAlign;
-export declare type OnMessageAction = (params: {
+export type Message = InAppMessage;
+export type MessageAction = InAppMessageAction;
+export type MessageButton = InAppMessageButton;
+export type MessageContent = InAppMessageContent;
+export type MessageImage = InAppMessageImage;
+export type MessageLayout = InAppMessageLayout;
+export type MessageStyle = InAppMessageStyle;
+export type MessageTextAlign = InAppMessageTextAlign;
+export type OnMessageAction = (params: {
     action: MessageAction;
     url?: string | undefined;
 }) => void;
@@ -27,8 +27,8 @@ export interface MessageCommonProps<PlatformStyleProps> {
     onDisplay?: () => void;
     style?: PlatformStyleProps;
 }
-export declare type BannerMessageLayouts = 'BOTTOM_BANNER' | 'MIDDLE_BANNER' | 'TOP_BANNER';
-export declare type MessageComponentPosition = 'bottom' | 'middle' | 'top';
+export type BannerMessageLayouts = 'BOTTOM_BANNER' | 'MIDDLE_BANNER' | 'TOP_BANNER';
+export type MessageComponentPosition = 'bottom' | 'middle' | 'top';
 export interface BannerMessageCommonProps<PlatformStyleProps> extends MessageCommonProps<PlatformStyleProps>, MessageContentProps {
     position?: MessageComponentPosition;
 }
@@ -46,7 +46,7 @@ export interface MessagePayloadStyle {
     primaryButton?: MessageStyle;
     secondaryButton?: MessageStyle;
 }
-export declare type BannerMessageComponent<PlatformStyleProps> = React.ComponentType<BannerMessageCommonProps<PlatformStyleProps>>;
-export declare type CarouselMessageComponent<PlatformStyleProps> = React.ComponentType<CarouselMessageCommonProps<PlatformStyleProps>>;
-export declare type FullScreenMessageComponent<PlatformStyleProps> = React.ComponentType<FullScreenMessageCommonProps<PlatformStyleProps>>;
-export declare type ModalMessageComponent<PlatformStyleProps> = React.ComponentType<ModalMessageCommonProps<PlatformStyleProps>>;
+export type BannerMessageComponent<PlatformStyleProps> = React.ComponentType<BannerMessageCommonProps<PlatformStyleProps>>;
+export type CarouselMessageComponent<PlatformStyleProps> = React.ComponentType<CarouselMessageCommonProps<PlatformStyleProps>>;
+export type FullScreenMessageComponent<PlatformStyleProps> = React.ComponentType<FullScreenMessageCommonProps<PlatformStyleProps>>;
+export type ModalMessageComponent<PlatformStyleProps> = React.ComponentType<ModalMessageCommonProps<PlatformStyleProps>>;

package/dist/types/InAppMessaging/utils/handleMessageAction.d.ts

@@ -1,5 +1,5 @@
 import { MessageAction } from '../types';
-export declare type HandleMessageLinkAction = (url: string) => void | Promise<void>;
+export type HandleMessageLinkAction = (url: string) => void | Promise<void>;
 interface HandleMessageActionParams {
     action: MessageAction;
     handleMessageLinkAction: HandleMessageLinkAction;

package/package.json

@@ -1,13 +1,14 @@
 {
   "name": "@aws-amplify/ui-react-core",
-  "version": "2.1.19",
+  "version": "2.1.21",
   "main": "dist/index.js",
   "module": "dist/esm/index.mjs",
   "react-native": "dist/index.js",
   "exports": {
     ".": {
       "import": "./dist/esm/index.mjs",
-      "require": "./dist/index.js"
+      "require": "./dist/index.js",
+      "types": "./dist/types/index.d.ts"
     },
     "./package.json": "./package.json"
   },
@@ -30,7 +31,7 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@aws-amplify/ui": "5.6.0",
+    "@aws-amplify/ui": "5.6.2",
     "@xstate/react": "3.0.1",
     "lodash": "4.17.21",
     "xstate": "^4.33.6"
@@ -40,6 +41,7 @@
     "react": ">= 16.14.0"
   },
   "devDependencies": {
+    "@aws-amplify/eslint-config-amplify-ui": "0.0.0",
     "@rollup/plugin-typescript": "^8.3.1",
     "@testing-library/react": "^12.0.0",
     "@testing-library/react-hooks": "^7.0.2",
@@ -48,7 +50,6 @@
     "@types/react-dom": "^17.0.13",
     "@types/react-test-renderer": "^17.0.1",
     "eslint": "^8.4.1",
-    "eslint-config-amplify-ui": "0.0.0",
     "jest": "^27.0.4",
     "prettier": "2.4.1",
     "react": "^17.0.2",