@aws-amplify/ui-react 6.15.2 → 6.15.4

package/dist/{Field-Cq088Vbv.js → Field-B8Bw-DBK.js}

@@ -670,10 +670,10 @@ const defaultViewBox = { minX: 0, minY: 0, width: 24, height: 24 };
 const IconPrimitive = ({ className, 
 // as can be used to render other icon react components too
 as = 'svg', fill = 'currentColor', pathData, viewBox = defaultViewBox, children, paths, ...rest }, ref) => {
-    const minX = viewBox.minX ? viewBox.minX : defaultViewBox.minX;
-    const minY = viewBox.minY ? viewBox.minY : defaultViewBox.minY;
-    const width = viewBox.width ? viewBox.width : defaultViewBox.width;
-    const height = viewBox.height ? viewBox.height : defaultViewBox.height;
+    const minX = viewBox.minX ?? defaultViewBox.minX;
+    const minY = viewBox.minY ?? defaultViewBox.minY;
+    const width = viewBox.width ?? defaultViewBox.width;
+    const height = viewBox.height ?? defaultViewBox.height;
     // An icon can be drawn in 3 ways:
     // 1. Pass it children which should be valid SVG elements
     // 2. Pass an array of path-like objects to `paths` prop
@@ -1065,7 +1065,15 @@ const FieldsetContext = React__namespace.createContext({
  * fieldsets and input controls. `useFieldset` passes the disabled state down
  * via context.
  */
-const useFieldset = () => React__namespace.useContext(FieldsetContext);
+const useFieldset = (fallback) => {
+    const ctx = React__namespace.useContext(FieldsetContext);
+    let value = ctx.isFieldsetDisabled;
+    // cannot use nullish `??` since isFieldsetDisabled can be `false`
+    if (value === undefined || value === false) {
+        value = fallback;
+    }
+    return { isFieldsetDisabled: value };
+};
 
 const FlexPrimitive = ({ className, children, ...rest }, ref) => (React__namespace.createElement(View, { className: ui.classNames(ui.ComponentClassName.Flex, className), ref: ref, ...rest }, children));
 /**
@@ -1133,10 +1141,7 @@ const ButtonPrimitive = ({ className, children, colorTheme, isFullWidth = false,
     const colorThemeModifier = supportedVariations.includes(variation) && colorTheme
         ? `${variation ?? 'outlined'}--${colorTheme}`
         : undefined;
-    const { isFieldsetDisabled } = useFieldset();
-    const shouldBeDisabled = isFieldsetDisabled
-        ? isFieldsetDisabled
-        : isDisabled ?? isLoading ?? rest['disabled'];
+    const { isFieldsetDisabled: shouldBeDisabled } = useFieldset(isDisabled ?? isLoading ?? rest['disabled']);
     const componentClasses = ui.classNames(ui.ComponentClassName.Button, ui.ComponentClassName.FieldGroupControl, ui.classNameModifier(ui.ComponentClassName.Button, variation), ui.classNameModifier(ui.ComponentClassName.Button, colorThemeModifier), ui.classNameModifier(ui.ComponentClassName.Button, size), ui.classNameModifierByFlag(ui.ComponentClassName.Button, 'disabled', shouldBeDisabled), ui.classNameModifierByFlag(ui.ComponentClassName.Button, 'loading', isLoading), ui.classNameModifierByFlag(ui.ComponentClassName.Button, 'fullwidth', isFullWidth), className);
     return (React__namespace.createElement(View, { ref: ref, as: "button", className: componentClasses, isDisabled: shouldBeDisabled, type: type, ...rest }, isLoading ? (React__namespace.createElement(Flex, { as: "span", className: ui.ComponentClassName.ButtonLoaderWrapper },
         React__namespace.createElement(Loader, { size: size }),

package/dist/esm/components/Authenticator/shared/ConfirmSignInFooter.mjs

@@ -7,13 +7,19 @@ import { isOtpChallenge } from '../utils.mjs';
 
 const { getConfirmText, getConfirmingText, getBackToSignInText, getResendCodeText, } = authenticatorTextUtil;
 const ConfirmSignInFooter = () => {
-    const { isPending, toSignIn, challengeName, resendCode } = useAuthenticator((context) => [
+    const { isPending, toSignIn, challengeName, resendCode, selectedAuthMethod, availableAuthMethods, } = useAuthenticator((context) => [
         context.isPending,
         context.toSignIn,
         context.challengeName,
         context.resendCode,
+        context.selectedAuthMethod,
+        context.availableAuthMethods,
     ]);
-    const showResendCode = isOtpChallenge(challengeName) && resendCode;
+    // Only show "Resend Code" for passwordless (USER_AUTH) flows.
+    // Password-based sign-in does not support resending MFA codes.
+    const hasPasswordlessMethod = (!!selectedAuthMethod && selectedAuthMethod !== 'PASSWORD') ||
+        !!availableAuthMethods?.some((m) => m !== 'PASSWORD');
+    const showResendCode = isOtpChallenge(challengeName) && hasPasswordlessMethod && resendCode;
     return (React__default.createElement(Flex, { direction: "column" },
         React__default.createElement(Button, { isDisabled: isPending, type: "submit", variation: "primary", isLoading: isPending, loadingText: getConfirmingText() }, getConfirmText()),
         showResendCode && (React__default.createElement(Button, { onClick: resendCode, type: "button" }, getResendCodeText())),

package/dist/esm/primitives/Button/Button.mjs

@@ -15,10 +15,7 @@ const ButtonPrimitive = ({ className, children, colorTheme, isFullWidth = false,
     const colorThemeModifier = supportedVariations.includes(variation) && colorTheme
         ? `${variation ?? 'outlined'}--${colorTheme}`
         : undefined;
-    const { isFieldsetDisabled } = useFieldset();
-    const shouldBeDisabled = isFieldsetDisabled
-        ? isFieldsetDisabled
-        : isDisabled ?? isLoading ?? rest['disabled'];
+    const { isFieldsetDisabled: shouldBeDisabled } = useFieldset(isDisabled ?? isLoading ?? rest['disabled']);
     const componentClasses = classNames(ComponentClassName.Button, ComponentClassName.FieldGroupControl, classNameModifier(ComponentClassName.Button, variation), classNameModifier(ComponentClassName.Button, colorThemeModifier), classNameModifier(ComponentClassName.Button, size), classNameModifierByFlag(ComponentClassName.Button, 'disabled', shouldBeDisabled), classNameModifierByFlag(ComponentClassName.Button, 'loading', isLoading), classNameModifierByFlag(ComponentClassName.Button, 'fullwidth', isFullWidth), className);
     return (React.createElement(View, { ref: ref, as: "button", className: componentClasses, isDisabled: shouldBeDisabled, type: type, ...rest }, isLoading ? (React.createElement(Flex, { as: "span", className: ComponentClassName.ButtonLoaderWrapper },
         React.createElement(Loader, { size: size }),

package/dist/esm/primitives/Checkbox/Checkbox.mjs

@@ -20,8 +20,7 @@ const CheckboxPrimitive = ({ checked: controlledChecked, className, defaultCheck
     const { styleProps, rest } = splitPrimitiveProps(_rest);
     const [focused, setFocused] = React.useState(false);
     const icons = useIcons('checkbox');
-    const { isFieldsetDisabled } = useFieldset();
-    const shouldBeDisabled = isFieldsetDisabled ? isFieldsetDisabled : isDisabled;
+    const { isFieldsetDisabled: shouldBeDisabled } = useFieldset(isDisabled);
     const isControlled = controlledChecked !== undefined;
     const [localChecked, setLocalChecked] = React.useState(() => 
     // if controlled, initialize to `controlledChecked` else `defaultChecked`

package/dist/esm/primitives/Fieldset/Fieldset.mjs

@@ -7,10 +7,9 @@ import { VisuallyHidden } from '../VisuallyHidden/VisuallyHidden.mjs';
 import { useFieldset, FieldsetContext } from './useFieldset.mjs';
 
 const FieldsetPrimitive = ({ children, className, isDisabled, legend, legendHidden, size, testId, variation = 'plain', ...rest }, ref) => {
-    const { isFieldsetDisabled } = useFieldset();
+    const { isFieldsetDisabled: shouldBeDisabled } = useFieldset(isDisabled);
     // Fieldsets that are nested within a disabled Fieldset should
     // also be disabled.
-    const shouldBeDisabled = isFieldsetDisabled ? isFieldsetDisabled : isDisabled;
     const value = React.useMemo(() => ({
         isFieldsetDisabled: shouldBeDisabled,
     }), [shouldBeDisabled]);

package/dist/esm/primitives/Fieldset/useFieldset.mjs

@@ -8,6 +8,14 @@ const FieldsetContext = React.createContext({
  * fieldsets and input controls. `useFieldset` passes the disabled state down
  * via context.
  */
-const useFieldset = () => React.useContext(FieldsetContext);
+const useFieldset = (fallback) => {
+    const ctx = React.useContext(FieldsetContext);
+    let value = ctx.isFieldsetDisabled;
+    // cannot use nullish `??` since isFieldsetDisabled can be `false`
+    if (value === undefined || value === false) {
+        value = fallback;
+    }
+    return { isFieldsetDisabled: value };
+};
 
 export { FieldsetContext, useFieldset };

package/dist/esm/primitives/Icon/Icon.mjs

@@ -7,10 +7,10 @@ const defaultViewBox = { minX: 0, minY: 0, width: 24, height: 24 };
 const IconPrimitive = ({ className, 
 // as can be used to render other icon react components too
 as = 'svg', fill = 'currentColor', pathData, viewBox = defaultViewBox, children, paths, ...rest }, ref) => {
-    const minX = viewBox.minX ? viewBox.minX : defaultViewBox.minX;
-    const minY = viewBox.minY ? viewBox.minY : defaultViewBox.minY;
-    const width = viewBox.width ? viewBox.width : defaultViewBox.width;
-    const height = viewBox.height ? viewBox.height : defaultViewBox.height;
+    const minX = viewBox.minX ?? defaultViewBox.minX;
+    const minY = viewBox.minY ?? defaultViewBox.minY;
+    const width = viewBox.width ?? defaultViewBox.width;
+    const height = viewBox.height ?? defaultViewBox.height;
     // An icon can be drawn in 3 ways:
     // 1. Pass it children which should be valid SVG elements
     // 2. Pass an array of path-like objects to `paths` prop

package/dist/esm/primitives/Input/Input.mjs

@@ -6,8 +6,8 @@ import { primitiveWithForwardRef } from '../utils/primitiveWithForwardRef.mjs';
 
 const InputPrimitive = ({ autoComplete, checked, className, defaultChecked, defaultValue, id, isDisabled, isReadOnly, isRequired, size, type = 'text', hasError = false, value, variation, ...rest }, ref) => {
     const componentClasses = classNames(ComponentClassName.Input, ComponentClassName.FieldGroupControl, classNameModifier(ComponentClassName.Input, variation), classNameModifierByFlag(ComponentClassName.Input, 'error', hasError), classNameModifier(ComponentClassName.Input, size), className);
-    const { isFieldsetDisabled } = useFieldset();
-    return (React.createElement(View, { "aria-invalid": hasError, as: "input", autoComplete: autoComplete, checked: checked, className: componentClasses, defaultChecked: defaultChecked, defaultValue: defaultValue, isDisabled: isFieldsetDisabled ? isFieldsetDisabled : isDisabled, id: id, readOnly: isReadOnly, ref: ref, required: isRequired, type: type, value: value, ...rest }));
+    const { isFieldsetDisabled } = useFieldset(isDisabled);
+    return (React.createElement(View, { "aria-invalid": hasError, as: "input", autoComplete: autoComplete, checked: checked, className: componentClasses, defaultChecked: defaultChecked, defaultValue: defaultValue, isDisabled: isFieldsetDisabled, id: id, readOnly: isReadOnly, ref: ref, required: isRequired, type: type, value: value, ...rest }));
 };
 const Input = primitiveWithForwardRef(InputPrimitive);
 Input.displayName = 'Input';

package/dist/esm/primitives/Message/MessageDismiss.mjs

@@ -20,7 +20,7 @@ const MessageDismissPrimitive = ({ onDismiss, dismissLabel, hasIcon = true, chil
     }, [setDismissed, onDismiss]);
     return (React.createElement(Button, { variation: "link", colorTheme: "overlay", className: classNames(ComponentClassName.MessageDismiss, className), ref: ref, onClick: dismissMessage, ...rest },
         hasIcon ? icons?.close ?? React.createElement(IconClose, { "aria-hidden": "true" }) : null,
-        children ? (children) : (React.createElement(VisuallyHidden, null, dismissLabel ? dismissLabel : ComponentText.Message.dismissLabel))));
+        children ?? (React.createElement(VisuallyHidden, null, dismissLabel ?? ComponentText.Message.dismissLabel))));
 };
 const MessageDismiss = primitiveWithForwardRef(MessageDismissPrimitive);
 MessageDismiss.displayName = 'MessageContent';

package/dist/esm/primitives/Radio/Radio.mjs

@@ -9,17 +9,12 @@ import { primitiveWithForwardRef } from '../utils/primitiveWithForwardRef.mjs';
 
 const RadioPrimitive = ({ children, className, id, isDisabled = false, testId, value, labelPosition: radioLabelPosition, ...rest }, ref) => {
     const { currentValue, defaultValue, name, hasError, isGroupDisabled = false, isRequired, isReadOnly, onChange, size, labelPosition: groupLabelPosition, } = useRadioGroupContext();
-    const { isFieldsetDisabled } = useFieldset();
-    const shouldBeDisabled = isFieldsetDisabled
-        ? isFieldsetDisabled
-        : isGroupDisabled || isDisabled || (isReadOnly && defaultValue !== value);
+    const { isFieldsetDisabled: shouldBeDisabled } = useFieldset(isGroupDisabled || isDisabled || (isReadOnly && defaultValue !== value));
     // for controlled component
     const checked = currentValue !== undefined ? value === currentValue : undefined;
     // for uncontrolled component
     const defaultChecked = defaultValue !== undefined ? value === defaultValue : undefined;
-    const labelPosition = radioLabelPosition
-        ? radioLabelPosition
-        : groupLabelPosition;
+    const labelPosition = radioLabelPosition ?? groupLabelPosition;
     return (React.createElement(Flex, { as: "label", className: classNames(ComponentClassName.Radio, classNameModifierByFlag(ComponentClassName.Radio, `disabled`, shouldBeDisabled), labelPosition ? `amplify-label-${labelPosition}` : null, className) },
         children && (React.createElement(Text, { as: "span", className: classNames(ComponentClassName.RadioLabel, classNameModifierByFlag(ComponentClassName.RadioLabel, `disabled`, shouldBeDisabled)) }, children)),
         React.createElement(Input, { checked: checked, className: classNames(ComponentClassName.VisuallyHidden, ComponentClassName.RadioInput), defaultChecked: defaultChecked, hasError: hasError, id: id, isDisabled: shouldBeDisabled, isReadOnly: isReadOnly, isRequired: isRequired, onChange: onChange, ref: ref, type: "radio", name: name, value: value, ...rest }),

package/dist/esm/primitives/Select/Select.mjs

@@ -16,11 +16,11 @@ const SelectPrimitive = ({ autoComplete, className, size, variation, value, defa
     const isExpanded = isMultiple || selectSize > 1;
     const componentClasses = classNames(ComponentClassName.Select, ComponentClassName.FieldGroupControl, classNameModifier(ComponentClassName.Select, size), classNameModifier(ComponentClassName.Select, variation), classNameModifierByFlag(ComponentClassName.Select, 'error', hasError), classNameModifierByFlag(ComponentClassName.Select, 'expanded', isExpanded), className);
     const icons = useIcons('select');
-    const { isFieldsetDisabled } = useFieldset();
+    const { isFieldsetDisabled } = useFieldset(isDisabled);
     return (React.createElement(View, { className: ComponentClassName.SelectWrapper },
         React.createElement(View, { "aria-invalid": hasError, as: "select", autoComplete: autoComplete, value: value, defaultValue: shouldSetDefaultPlaceholderValue
                 ? DEFAULT_PLACEHOLDER_VALUE
-                : defaultValue, isDisabled: isFieldsetDisabled ? isFieldsetDisabled : isDisabled, multiple: isMultiple, size: selectSize, required: isRequired, className: componentClasses, ref: ref, ...rest },
+                : defaultValue, isDisabled: isFieldsetDisabled, multiple: isMultiple, size: selectSize, required: isRequired, className: componentClasses, ref: ref, ...rest },
             placeholder && React.createElement("option", { value: "" }, placeholder),
             children),
         isExpanded ? null : (React.createElement(Flex, { className: classNames(ComponentClassName.SelectIcon, classNameModifier(ComponentClassName.SelectIcon, size)), color: iconColor, "aria-hidden": "true" }, icon ?? icons?.expand ?? React.createElement(IconExpandMore, null)))));

package/dist/esm/primitives/SliderField/SliderField.mjs

@@ -22,7 +22,7 @@ const SLIDER_ROOT_TEST_ID = 'slider-root';
 const SLIDER_TRACK_TEST_ID = 'slider-track';
 const SLIDER_RANGE_TEST_ID = 'slider-range';
 const SliderFieldPrimitive = ({ ariaValuetext, className, defaultValue = 0, descriptiveText, emptyTrackColor, errorMessage, filledTrackColor, formatValue, hasError = false, id, isDisabled, isValueHidden = false, label, labelHidden = false, onChange, orientation = 'horizontal', outerEndComponent, outerStartComponent, testId, thumbColor, trackSize, value, size, ..._rest }, ref) => {
-    const { isFieldsetDisabled } = useFieldset();
+    const { isFieldsetDisabled: disabled } = useFieldset(isDisabled);
     const fieldId = useStableId(id);
     const stableId = useStableId();
     const descriptionId = descriptiveText
@@ -32,7 +32,6 @@ const SliderFieldPrimitive = ({ ariaValuetext, className, defaultValue = 0, desc
         ? getUniqueComponentId(stableId, ERROR_SUFFIX)
         : undefined;
     const ariaDescribedBy = createSpaceSeparatedIds([errorId, descriptionId]);
-    const disabled = isFieldsetDisabled ? isFieldsetDisabled : isDisabled;
     const { styleProps, rest } = splitPrimitiveProps(_rest);
     const isControlled = value !== undefined;
     const [currentValue, setCurrentValue] = React.useState(isControlled ? value : defaultValue);

package/dist/esm/primitives/SwitchField/SwitchField.mjs

@@ -21,8 +21,7 @@ const SwitchFieldPrimitive = ({ className, defaultChecked, id, isChecked, isDisa
         defaultChecked,
         isDisabled,
     });
-    const { isFieldsetDisabled } = useFieldset();
-    const shouldBeDisabled = isFieldsetDisabled ? isFieldsetDisabled : isDisabled;
+    const { isFieldsetDisabled: shouldBeDisabled } = useFieldset(isDisabled);
     const fieldId = useStableId(id);
     const wrapperClasses = classNames(ComponentClassName.SwitchTrack, classNameModifierByFlag(ComponentClassName.SwitchTrack, 'checked', isOn), classNameModifierByFlag(ComponentClassName.SwitchTrack, 'disabled', shouldBeDisabled), classNameModifierByFlag(ComponentClassName.SwitchTrack, 'focused', isFocused), classNameModifierByFlag(ComponentClassName.SwitchTrack, 'error', hasError));
     const componentClasses = classNames(ComponentClassName.SwitchThumb, classNameModifierByFlag(ComponentClassName.SwitchThumb, 'checked', isOn), classNameModifierByFlag(ComponentClassName.SwitchThumb, 'disabled', shouldBeDisabled));

package/dist/esm/primitives/TextArea/TextArea.mjs

@@ -6,8 +6,8 @@ import { primitiveWithForwardRef } from '../utils/primitiveWithForwardRef.mjs';
 
 const TextAreaPrimitive = ({ className, isDisabled, isReadOnly, isRequired, size, hasError = false, variation, ...rest }, ref) => {
     const componentClasses = classNames(ComponentClassName.Textarea, ComponentClassName.FieldGroupControl, classNameModifier(ComponentClassName.Textarea, variation), classNameModifier(ComponentClassName.Textarea, size), classNameModifierByFlag(ComponentClassName.Textarea, 'error', hasError), className);
-    const { isFieldsetDisabled } = useFieldset();
-    return (React.createElement(View, { "aria-invalid": hasError, as: "textarea", className: componentClasses, disabled: isFieldsetDisabled ? isFieldsetDisabled : isDisabled, readOnly: isReadOnly, ref: ref, required: isRequired, ...rest }));
+    const { isFieldsetDisabled } = useFieldset(isDisabled);
+    return (React.createElement(View, { "aria-invalid": hasError, as: "textarea", className: componentClasses, disabled: isFieldsetDisabled, readOnly: isReadOnly, ref: ref, required: isRequired, ...rest }));
 };
 const TextArea = primitiveWithForwardRef(TextAreaPrimitive);
 TextArea.displayName = 'TextArea';

package/dist/esm/version.mjs

@@ -1,3 +1,3 @@
-const VERSION = '6.15.2';
+const VERSION = '6.15.4';
 
 export { VERSION };

package/dist/index.js

@@ -6,7 +6,7 @@ var React = require('react');
 var isEqual = require('lodash/isEqual.js');
 var uiReactCore = require('@aws-amplify/ui-react-core');
 var ui = require('@aws-amplify/ui');
-var Field = require('./Field-Cq088Vbv.js');
+var Field = require('./Field-B8Bw-DBK.js');
 require('aws-amplify/storage');
 var debounce = require('lodash/debounce.js');
 var reactDropdownMenu = require('@radix-ui/react-dropdown-menu');
@@ -401,8 +401,8 @@ FieldGroup.displayName = 'FieldGroup';
 
 const InputPrimitive = ({ autoComplete, checked, className, defaultChecked, defaultValue, id, isDisabled, isReadOnly, isRequired, size, type = 'text', hasError = false, value, variation, ...rest }, ref) => {
     const componentClasses = ui.classNames(ui.ComponentClassName.Input, ui.ComponentClassName.FieldGroupControl, ui.classNameModifier(ui.ComponentClassName.Input, variation), ui.classNameModifierByFlag(ui.ComponentClassName.Input, 'error', hasError), ui.classNameModifier(ui.ComponentClassName.Input, size), className);
-    const { isFieldsetDisabled } = Field.useFieldset();
-    return (React__namespace.createElement(Field.View, { "aria-invalid": hasError, as: "input", autoComplete: autoComplete, checked: checked, className: componentClasses, defaultChecked: defaultChecked, defaultValue: defaultValue, isDisabled: isFieldsetDisabled ? isFieldsetDisabled : isDisabled, id: id, readOnly: isReadOnly, ref: ref, required: isRequired, type: type, value: value, ...rest }));
+    const { isFieldsetDisabled } = Field.useFieldset(isDisabled);
+    return (React__namespace.createElement(Field.View, { "aria-invalid": hasError, as: "input", autoComplete: autoComplete, checked: checked, className: componentClasses, defaultChecked: defaultChecked, defaultValue: defaultValue, isDisabled: isFieldsetDisabled, id: id, readOnly: isReadOnly, ref: ref, required: isRequired, type: type, value: value, ...rest }));
 };
 const Input = Field.primitiveWithForwardRef(InputPrimitive);
 Input.displayName = 'Input';
@@ -759,8 +759,7 @@ const CheckboxPrimitive = ({ checked: controlledChecked, className, defaultCheck
     const { styleProps, rest } = splitPrimitiveProps(_rest);
     const [focused, setFocused] = React__namespace.useState(false);
     const icons = Field.useIcons('checkbox');
-    const { isFieldsetDisabled } = Field.useFieldset();
-    const shouldBeDisabled = isFieldsetDisabled ? isFieldsetDisabled : isDisabled;
+    const { isFieldsetDisabled: shouldBeDisabled } = Field.useFieldset(isDisabled);
     const isControlled = controlledChecked !== undefined;
     const [localChecked, setLocalChecked] = React__namespace.useState(() => 
     // if controlled, initialize to `controlledChecked` else `defaultChecked`
@@ -1335,10 +1334,9 @@ const Accordion = Object.assign(Field.primitiveWithForwardRef(AccordionPrimitive
 Accordion.displayName = 'Accordion';
 
 const FieldsetPrimitive = ({ children, className, isDisabled, legend, legendHidden, size, testId, variation = 'plain', ...rest }, ref) => {
-    const { isFieldsetDisabled } = Field.useFieldset();
+    const { isFieldsetDisabled: shouldBeDisabled } = Field.useFieldset(isDisabled);
     // Fieldsets that are nested within a disabled Fieldset should
     // also be disabled.
-    const shouldBeDisabled = isFieldsetDisabled ? isFieldsetDisabled : isDisabled;
     const value = React__namespace.useMemo(() => ({
         isFieldsetDisabled: shouldBeDisabled,
     }), [shouldBeDisabled]);
@@ -1457,7 +1455,7 @@ const MessageDismissPrimitive = ({ onDismiss, dismissLabel, hasIcon = true, chil
     }, [setDismissed, onDismiss]);
     return (React__namespace.createElement(Field.Button, { variation: "link", colorTheme: "overlay", className: ui.classNames(ui.ComponentClassName.MessageDismiss, className), ref: ref, onClick: dismissMessage, ...rest },
         hasIcon ? icons?.close ?? React__namespace.createElement(Field.IconClose, { "aria-hidden": "true" }) : null,
-        children ? (children) : (React__namespace.createElement(VisuallyHidden, null, dismissLabel ? dismissLabel : Field.ComponentText.Message.dismissLabel))));
+        children ?? (React__namespace.createElement(VisuallyHidden, null, dismissLabel ?? Field.ComponentText.Message.dismissLabel))));
 };
 const MessageDismiss = Field.primitiveWithForwardRef(MessageDismissPrimitive);
 MessageDismiss.displayName = 'MessageContent';
@@ -1535,11 +1533,11 @@ const SelectPrimitive = ({ autoComplete, className, size, variation, value, defa
     const isExpanded = isMultiple || selectSize > 1;
     const componentClasses = ui.classNames(ui.ComponentClassName.Select, ui.ComponentClassName.FieldGroupControl, ui.classNameModifier(ui.ComponentClassName.Select, size), ui.classNameModifier(ui.ComponentClassName.Select, variation), ui.classNameModifierByFlag(ui.ComponentClassName.Select, 'error', hasError), ui.classNameModifierByFlag(ui.ComponentClassName.Select, 'expanded', isExpanded), className);
     const icons = Field.useIcons('select');
-    const { isFieldsetDisabled } = Field.useFieldset();
+    const { isFieldsetDisabled } = Field.useFieldset(isDisabled);
     return (React__namespace.createElement(Field.View, { className: ui.ComponentClassName.SelectWrapper },
         React__namespace.createElement(Field.View, { "aria-invalid": hasError, as: "select", autoComplete: autoComplete, value: value, defaultValue: shouldSetDefaultPlaceholderValue
                 ? DEFAULT_PLACEHOLDER_VALUE
-                : defaultValue, isDisabled: isFieldsetDisabled ? isFieldsetDisabled : isDisabled, multiple: isMultiple, size: selectSize, required: isRequired, className: componentClasses, ref: ref, ...rest },
+                : defaultValue, isDisabled: isFieldsetDisabled, multiple: isMultiple, size: selectSize, required: isRequired, className: componentClasses, ref: ref, ...rest },
             placeholder && React__namespace.createElement("option", { value: "" }, placeholder),
             children),
         isExpanded ? null : (React__namespace.createElement(Field.Flex, { className: ui.classNames(ui.ComponentClassName.SelectIcon, ui.classNameModifier(ui.ComponentClassName.SelectIcon, size)), color: iconColor, "aria-hidden": "true" }, icon ?? icons?.expand ?? React__namespace.createElement(Field.IconExpandMore, null)))));
@@ -1630,17 +1628,12 @@ const useRadioGroupContext = () => {
 
 const RadioPrimitive = ({ children, className, id, isDisabled = false, testId, value, labelPosition: radioLabelPosition, ...rest }, ref) => {
     const { currentValue, defaultValue, name, hasError, isGroupDisabled = false, isRequired, isReadOnly, onChange, size, labelPosition: groupLabelPosition, } = useRadioGroupContext();
-    const { isFieldsetDisabled } = Field.useFieldset();
-    const shouldBeDisabled = isFieldsetDisabled
-        ? isFieldsetDisabled
-        : isGroupDisabled || isDisabled || (isReadOnly && defaultValue !== value);
+    const { isFieldsetDisabled: shouldBeDisabled } = Field.useFieldset(isGroupDisabled || isDisabled || (isReadOnly && defaultValue !== value));
     // for controlled component
     const checked = currentValue !== undefined ? value === currentValue : undefined;
     // for uncontrolled component
     const defaultChecked = defaultValue !== undefined ? value === defaultValue : undefined;
-    const labelPosition = radioLabelPosition
-        ? radioLabelPosition
-        : groupLabelPosition;
+    const labelPosition = radioLabelPosition ?? groupLabelPosition;
     return (React__namespace.createElement(Field.Flex, { as: "label", className: ui.classNames(ui.ComponentClassName.Radio, ui.classNameModifierByFlag(ui.ComponentClassName.Radio, `disabled`, shouldBeDisabled), labelPosition ? `amplify-label-${labelPosition}` : null, className) },
         children && (React__namespace.createElement(Field.Text, { as: "span", className: ui.classNames(ui.ComponentClassName.RadioLabel, ui.classNameModifierByFlag(ui.ComponentClassName.RadioLabel, `disabled`, shouldBeDisabled)) }, children)),
         React__namespace.createElement(Input, { checked: checked, className: ui.classNames(ui.ComponentClassName.VisuallyHidden, ui.ComponentClassName.RadioInput), defaultChecked: defaultChecked, hasError: hasError, id: id, isDisabled: shouldBeDisabled, isReadOnly: isReadOnly, isRequired: isRequired, onChange: onChange, ref: ref, type: "radio", name: name, value: value, ...rest }),
@@ -1760,7 +1753,7 @@ const SLIDER_ROOT_TEST_ID = 'slider-root';
 const SLIDER_TRACK_TEST_ID = 'slider-track';
 const SLIDER_RANGE_TEST_ID = 'slider-range';
 const SliderFieldPrimitive = ({ ariaValuetext, className, defaultValue = 0, descriptiveText, emptyTrackColor, errorMessage, filledTrackColor, formatValue, hasError = false, id, isDisabled, isValueHidden = false, label, labelHidden = false, onChange, orientation = 'horizontal', outerEndComponent, outerStartComponent, testId, thumbColor, trackSize, value, size, ..._rest }, ref) => {
-    const { isFieldsetDisabled } = Field.useFieldset();
+    const { isFieldsetDisabled: disabled } = Field.useFieldset(isDisabled);
     const fieldId = Field.useStableId(id);
     const stableId = Field.useStableId();
     const descriptionId = descriptiveText
@@ -1770,7 +1763,6 @@ const SliderFieldPrimitive = ({ ariaValuetext, className, defaultValue = 0, desc
         ? getUniqueComponentId(stableId, ERROR_SUFFIX)
         : undefined;
     const ariaDescribedBy = createSpaceSeparatedIds([errorId, descriptionId]);
-    const disabled = isFieldsetDisabled ? isFieldsetDisabled : isDisabled;
     const { styleProps, rest } = splitPrimitiveProps(_rest);
     const isControlled = value !== undefined;
     const [currentValue, setCurrentValue] = React__namespace.useState(isControlled ? value : defaultValue);
@@ -1998,8 +1990,7 @@ const SwitchFieldPrimitive = ({ className, defaultChecked, id, isChecked, isDisa
         defaultChecked,
         isDisabled,
     });
-    const { isFieldsetDisabled } = Field.useFieldset();
-    const shouldBeDisabled = isFieldsetDisabled ? isFieldsetDisabled : isDisabled;
+    const { isFieldsetDisabled: shouldBeDisabled } = Field.useFieldset(isDisabled);
     const fieldId = Field.useStableId(id);
     const wrapperClasses = ui.classNames(ui.ComponentClassName.SwitchTrack, ui.classNameModifierByFlag(ui.ComponentClassName.SwitchTrack, 'checked', isOn), ui.classNameModifierByFlag(ui.ComponentClassName.SwitchTrack, 'disabled', shouldBeDisabled), ui.classNameModifierByFlag(ui.ComponentClassName.SwitchTrack, 'focused', isFocused), ui.classNameModifierByFlag(ui.ComponentClassName.SwitchTrack, 'error', hasError));
     const componentClasses = ui.classNames(ui.ComponentClassName.SwitchThumb, ui.classNameModifierByFlag(ui.ComponentClassName.SwitchThumb, 'checked', isOn), ui.classNameModifierByFlag(ui.ComponentClassName.SwitchThumb, 'disabled', shouldBeDisabled));
@@ -2194,8 +2185,8 @@ Tabs.displayName = 'Tabs';
 
 const TextAreaPrimitive = ({ className, isDisabled, isReadOnly, isRequired, size, hasError = false, variation, ...rest }, ref) => {
     const componentClasses = ui.classNames(ui.ComponentClassName.Textarea, ui.ComponentClassName.FieldGroupControl, ui.classNameModifier(ui.ComponentClassName.Textarea, variation), ui.classNameModifier(ui.ComponentClassName.Textarea, size), ui.classNameModifierByFlag(ui.ComponentClassName.Textarea, 'error', hasError), className);
-    const { isFieldsetDisabled } = Field.useFieldset();
-    return (React__namespace.createElement(Field.View, { "aria-invalid": hasError, as: "textarea", className: componentClasses, disabled: isFieldsetDisabled ? isFieldsetDisabled : isDisabled, readOnly: isReadOnly, ref: ref, required: isRequired, ...rest }));
+    const { isFieldsetDisabled } = Field.useFieldset(isDisabled);
+    return (React__namespace.createElement(Field.View, { "aria-invalid": hasError, as: "textarea", className: componentClasses, disabled: isFieldsetDisabled, readOnly: isReadOnly, ref: ref, required: isRequired, ...rest }));
 };
 const TextArea = Field.primitiveWithForwardRef(TextAreaPrimitive);
 TextArea.displayName = 'TextArea';
@@ -2472,7 +2463,7 @@ const defaultDeleteUserDisplayText = {
     warningText: 'Deleting your account is not reversible. You will lose access to your account and all data associated with it.',
 };
 
-const VERSION = '6.15.2';
+const VERSION = '6.15.4';
 
 const logger$2 = ui.getLogger('AccountSettings');
 const getIsDisabled = (formValues, validationError) => {
@@ -2895,13 +2886,19 @@ const isOtpChallenge = (challengeName) => !!challengeName &&
 
 const { getConfirmText, getConfirmingText, getBackToSignInText: getBackToSignInText$2, getResendCodeText: getResendCodeText$1, } = ui.authenticatorTextUtil;
 const ConfirmSignInFooter = () => {
-    const { isPending, toSignIn, challengeName, resendCode } = uiReactCore.useAuthenticator((context) => [
+    const { isPending, toSignIn, challengeName, resendCode, selectedAuthMethod, availableAuthMethods, } = uiReactCore.useAuthenticator((context) => [
         context.isPending,
         context.toSignIn,
         context.challengeName,
         context.resendCode,
+        context.selectedAuthMethod,
+        context.availableAuthMethods,
     ]);
-    const showResendCode = isOtpChallenge(challengeName) && resendCode;
+    // Only show "Resend Code" for passwordless (USER_AUTH) flows.
+    // Password-based sign-in does not support resending MFA codes.
+    const hasPasswordlessMethod = (!!selectedAuthMethod && selectedAuthMethod !== 'PASSWORD') ||
+        !!availableAuthMethods?.some((m) => m !== 'PASSWORD');
+    const showResendCode = isOtpChallenge(challengeName) && hasPasswordlessMethod && resendCode;
     return (React__namespace["default"].createElement(Field.Flex, { direction: "column" },
         React__namespace["default"].createElement(Field.Button, { isDisabled: isPending, type: "submit", variation: "primary", isLoading: isPending, loadingText: getConfirmingText() }, getConfirmText()),
         showResendCode && (React__namespace["default"].createElement(Field.Button, { onClick: resendCode, type: "button" }, getResendCodeText$1())),

package/dist/internal.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var Field = require('./Field-Cq088Vbv.js');
+var Field = require('./Field-B8Bw-DBK.js');
 var React = require('react');
 var Storage = require('aws-amplify/storage');
 var ui = require('@aws-amplify/ui');

package/dist/styles/modal.css

@@ -73,9 +73,12 @@
   overflow-y: auto;
   box-sizing: border-box;
   list-style: disc;
+  display: flex;
+  flex-direction: column;
+  gap: var(--amplify-space-xxs);
 }
 
 .amplify-modal__list-item.amplify-modal__list-item {
+  display: list-item;
   margin-bottom: var(--amplify-space-xxs);
-  box-sizing: border-box;
 }

package/dist/styles/modal.layer.css

@@ -74,10 +74,13 @@
   overflow-y: auto;
   box-sizing: border-box;
   list-style: disc;
+  display: flex;
+  flex-direction: column;
+  gap: var(--amplify-space-xxs);
 }
 
 .amplify-modal__list-item.amplify-modal__list-item {
+  display: list-item;
   margin-bottom: var(--amplify-space-xxs);
-  box-sizing: border-box;
 }
 }

package/dist/styles.css

@@ -4891,11 +4891,14 @@ html[dir=rtl] .amplify-field-group__inner-start {
   overflow-y: auto;
   box-sizing: border-box;
   list-style: disc;
+  display: flex;
+  flex-direction: column;
+  gap: var(--amplify-space-xxs);
 }
 
 .amplify-modal__list-item.amplify-modal__list-item {
+  display: list-item;
   margin-bottom: var(--amplify-space-xxs);
-  box-sizing: border-box;
 }
 
 .amplify-pagination {

package/dist/styles.layer.css

@@ -4892,11 +4892,14 @@ html[dir=rtl] .amplify-field-group__inner-start {
   overflow-y: auto;
   box-sizing: border-box;
   list-style: disc;
+  display: flex;
+  flex-direction: column;
+  gap: var(--amplify-space-xxs);
 }
 
 .amplify-modal__list-item.amplify-modal__list-item {
+  display: list-item;
   margin-bottom: var(--amplify-space-xxs);
-  box-sizing: border-box;
 }
 
 .amplify-pagination {

package/dist/types/helpers/constants.d.ts

@@ -1,3 +1,3 @@
-export declare const AMPLIFY_SYMBOL: Symbol;
+export declare const AMPLIFY_SYMBOL: symbol;
 export declare const ERROR_SUFFIX = "error";
 export declare const DESCRIPTION_SUFFIX = "description";

package/dist/types/primitives/Fieldset/useFieldset.d.ts

@@ -8,5 +8,5 @@ export declare const FieldsetContext: React.Context<FieldsetContextType>;
  * fieldsets and input controls. `useFieldset` passes the disabled state down
  * via context.
  */
-export declare const useFieldset: () => FieldsetContextType;
+export declare const useFieldset: (fallback?: boolean) => FieldsetContextType;
 export {};

package/dist/types/primitives/types/index.d.ts

@@ -1,50 +1,50 @@
-export * from './autocomplete';
-export * from './alert';
-export * from './badge';
-export * from './base';
-export * from './breadcrumbs';
-export * from './button';
-export * from './buttonGroup';
-export * from './card';
-export * from './checkboxField';
-export * from './collection';
-export * from './divider';
-export * from './field';
-export * from './fieldGroup';
-export * from './fieldGroupIcon';
-export * from './fieldset';
-export * from './flex';
-export * from './heading';
-export * from './highlightMatch';
-export * from './icon';
-export * from './input';
-export * from './image';
-export * from './label';
-export * from './link';
-export * from './loader';
-export * from './menu';
-export * from './message';
-export * from './pagination';
-export * from './passwordField';
-export * from './phoneNumberField';
-export * from './placeholder';
-export * from './radio';
-export * from './radioGroupField';
-export * from './rating';
-export * from './scrollView';
-export * from './searchField';
-export * from './selectField';
-export * from './sliderField';
-export * from './stepperField';
+export type * from './autocomplete';
+export type * from './alert';
+export type * from './badge';
+export type * from './base';
+export type * from './breadcrumbs';
+export type * from './button';
+export type * from './buttonGroup';
+export type * from './card';
+export type * from './checkboxField';
+export type * from './collection';
+export type * from './divider';
+export type * from './field';
+export type * from './fieldGroup';
+export type * from './fieldGroupIcon';
+export type * from './fieldset';
+export type * from './flex';
+export type * from './heading';
+export type * from './highlightMatch';
+export type * from './icon';
+export type * from './input';
+export type * from './image';
+export type * from './label';
+export type * from './link';
+export type * from './loader';
+export type * from './menu';
+export type * from './message';
+export type * from './pagination';
+export type * from './passwordField';
+export type * from './phoneNumberField';
+export type * from './placeholder';
+export type * from './radio';
+export type * from './radioGroupField';
+export type * from './rating';
+export type * from './scrollView';
+export type * from './searchField';
+export type * from './selectField';
+export type * from './sliderField';
+export type * from './stepperField';
 export * from './style';
-export * from './switchField';
-export * from './table';
-export * from './text';
-export * from './textArea';
-export * from './textAreaField';
-export * from './textField';
-export * from './toggleButton';
-export * from './toggleButtonGroup';
-export * from './view';
-export * from './visuallyHidden';
-export * from './grid';
+export type * from './switchField';
+export type * from './table';
+export type * from './text';
+export type * from './textArea';
+export type * from './textAreaField';
+export type * from './textField';
+export type * from './toggleButton';
+export type * from './toggleButtonGroup';
+export type * from './view';
+export type * from './visuallyHidden';
+export type * from './grid';

package/dist/types/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "6.15.2";
+export declare const VERSION = "6.15.4";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/ui-react",
-  "version": "6.15.2",
+  "version": "6.15.4",
   "main": "dist/index.js",
   "module": "dist/esm/index.mjs",
   "exports": {
@@ -56,13 +56,13 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@aws-amplify/ui": "6.15.2",
-    "@aws-amplify/ui-react-core": "3.6.2",
+    "@aws-amplify/ui": "6.15.4",
+    "@aws-amplify/ui-react-core": "3.6.4",
     "@radix-ui/react-direction": "^1.1.0",
     "@radix-ui/react-dropdown-menu": "^2.1.10",
     "@radix-ui/react-slider": "^1.3.2",
     "@xstate/react": "^3.2.2",
-    "lodash": "4.17.23",
+    "lodash": "4.18.1",
     "qrcode": "1.5.0",
     "tslib": "^2.5.2"
   },