@codecademy/gamut 67.6.4 → 67.6.5-alpha.9b8a7f.0

package/dist/Form/styles/Radio-styles.js

@@ -1,11 +1,5 @@
 import { css, theme, timing, transitionConcat, variant } from '@codecademy/gamut-styles';
 import { formBaseComponentStyles, formFieldBaseDisabledStyles, InputSelectors } from '.';
-export const radioWrapper = css({
-  margin: '0.25rem 0',
-  width: '100%',
-  fontWeight: 'normal',
-  display: 'flex'
-});
 const consistentLabelStyles = {
   content: '""',
   display: 'block',

package/dist/Form/styles/shared-system-props.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 export type conditionalStyleProps = {
     error?: boolean;
     activated?: boolean;
@@ -91,6 +92,12 @@ export declare const formBaseFieldStylesObject: {
 export declare const formBaseFieldStyles: (props: {
     theme?: import("@emotion/react").Theme | undefined;
 }) => import("@codecademy/variance").CSSObject;
+export declare const InputWrapper: import("@emotion/styled").StyledComponent<{
+    theme?: import("@emotion/react").Theme | undefined;
+    as?: import("react").ElementType<any, keyof import("react").JSX.IntrinsicElements> | undefined;
+} & {
+    theme?: import("@emotion/react").Theme | undefined;
+}, import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, {}>;
 export declare const formFieldStyles: (props: {
     theme?: import("@emotion/react").Theme | undefined;
 }) => import("@codecademy/variance").CSSObject;

package/dist/Form/styles/shared-system-props.js

@@ -1,3 +1,4 @@
+import _styled from "@emotion/styled/base";
 import { css, theme, transitionConcat, variant } from '@codecademy/gamut-styles';
 export let InputSelectors = /*#__PURE__*/function (InputSelectors) {
   InputSelectors["HOVER"] = "&:hover";
@@ -66,6 +67,16 @@ export const formBaseFieldStylesObject = {
   }
 };
 export const formBaseFieldStyles = css(formBaseFieldStylesObject);
+const inputWrapper = css({
+  margin: '0.25rem 0',
+  width: '100%',
+  fontWeight: 'normal',
+  display: 'flex'
+});
+export const InputWrapper = /*#__PURE__*/_styled("div", {
+  target: "e1o3jdqp0",
+  label: "InputWrapper"
+})(inputWrapper, process.env.NODE_ENV === "production" ? "" : "/*# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9Gb3JtL3N0eWxlcy9zaGFyZWQtc3lzdGVtLXByb3BzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQXNHNEIiLCJmaWxlIjoiLi4vLi4vLi4vc3JjL0Zvcm0vc3R5bGVzL3NoYXJlZC1zeXN0ZW0tcHJvcHMudHMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQge1xuICBjc3MsXG4gIHRoZW1lLFxuICB0cmFuc2l0aW9uQ29uY2F0LFxuICB2YXJpYW50LFxufSBmcm9tICdAY29kZWNhZGVteS9nYW11dC1zdHlsZXMnO1xuaW1wb3J0IHN0eWxlZCBmcm9tICdAZW1vdGlvbi9zdHlsZWQnO1xuXG5leHBvcnQgdHlwZSBjb25kaXRpb25hbFN0eWxlUHJvcHMgPSB7XG4gIGVycm9yPzogYm9vbGVhbjtcbiAgYWN0aXZhdGVkPzogYm9vbGVhbjtcbiAgaXNGb2N1c2VkPzogYm9vbGVhbiB8IG51bGw7XG4gIGlzRGlzYWJsZWQ/OiBib29sZWFuIHwgbnVsbDtcbn07XG5cbmV4cG9ydCBlbnVtIElucHV0U2VsZWN0b3JzIHtcbiAgSE9WRVIgPSAnJjpob3ZlcicsXG4gIEFDVElWRSA9ICcmOmFjdGl2ZScsXG4gIFBMQUNFSE9MREVSID0gJyY6cGxhY2Vob2xkZXInLFxuICBGT0NVUyA9ICcmOmZvY3VzJyxcbiAgRk9DVVNfTEFCRUxfRElWX0NISUxEID0gJyY6Zm9jdXMgKyBsYWJlbCA+IGRpdicsXG4gIERJU0FCTEVEID0gXCImOmRpc2FibGVkLCAmW2FyaWEtZGlzYWJsZWQ9J3RydWUnXVwiLFxuICBCRUZPUkUgPSAnJjo6YmVmb3JlJyxcbiAgQUZURVIgPSAnJjo6YWZ0ZXInLFxuICBCRUZPUkVfQU5EX0FGVEVSID0gJyY6OmJlZm9yZSwgJjo6YWZ0ZXInLFxuICBDSEVDS0VEX0JFRk9SRSA9ICcmOmNoZWNrZWQgKyBsYWJlbDo6YmVmb3JlJyxcbiAgQ0hFQ0tFRF9BRlRFUiA9ICcmOmNoZWNrZWQgKyBsYWJlbDo6YWZ0ZXInLFxuICBIT1ZFUl9GT0NVU19CRUZPUkUgPSAnJjpob3ZlciArIGxhYmVsOjpiZWZvcmUsICY6Zm9jdXMgKyBsYWJlbDo6YmVmb3JlJyxcbn1cblxuZXhwb3J0IGNvbnN0IGZvcm1CYXNlU3R5bGVzID0ge1xuICBmb250V2VpZ2h0OiAnYmFzZScsXG4gIGZvbnRTaXplOiAxNixcbiAgY29sb3I6ICd0ZXh0Jyxcbn0gYXMgY29uc3Q7XG5cbmV4cG9ydCBjb25zdCBmb3JtQmFzZUNvbXBvbmVudFN0eWxlcyA9IHtcbiAgd2lkdGg6IDEsXG4gIG91dGxpbmU6ICdub25lJyxcbiAgYmc6ICdiYWNrZ3JvdW5kJyxcbiAgbWluV2lkdGg6ICdhdXRvJyxcbiAgLi4uZm9ybUJhc2VTdHlsZXMsXG59IGFzIGNvbnN0O1xuXG5leHBvcnQgY29uc3QgZm9ybUZpZWxkRm9jdXNTdHlsZXMgPSB7XG4gIGJvcmRlckNvbG9yOiAncHJpbWFyeScsXG4gIGJveFNoYWRvdzogYGluc2V0IDAgMCAwIDFweCAke3RoZW1lLmNvbG9ycy5wcmltYXJ5fWAsXG59IGFzIGNvbnN0O1xuXG5leHBvcnQgY29uc3QgZm9ybUZpZWxkVGV4dERpc2FibGVkU3R5bGVzID0ge1xuICBjb2xvcjogJ3RleHQtZGlzYWJsZWQnLFxuICBjdXJzb3I6ICdub3QtYWxsb3dlZCcsXG59IGFzIGNvbnN0O1xuXG5leHBvcnQgY29uc3QgZm9ybUZpZWxkQmFzZURpc2FibGVkU3R5bGVzID0ge1xuICBib3JkZXJDb2xvcjogJ2N1cnJlbnRDb2xvcicsXG4gIG9wYWNpdHk6IDEsXG4gIC4uLmZvcm1GaWVsZFRleHREaXNhYmxlZFN0eWxlcyxcbn0gYXMgY29uc3Q7XG5cbmV4cG9ydCBjb25zdCBmb3JtRmllbGREaXNhYmxlZFN0eWxlcyA9IHtcbiAgLi4uZm9ybUZpZWxkQmFzZURpc2FibGVkU3R5bGVzLFxuICBiZzogJ2JhY2tncm91bmQtZGlzYWJsZWQnLFxuICBbSW5wdXRTZWxlY3RvcnMuSE9WRVJdOiB7XG4gICAgYm9yZGVyQ29sb3I6ICdjdXJyZW50Q29sb3InLFxuICB9LFxufSBhcyBjb25zdDtcblxuZXhwb3J0IGNvbnN0IGZvcm1GaWVsZFBhZGRpbmdTdHlsZXMgPSB7XG4gIHB5OiAxMixcbiAgcHg6IDgsXG59IGFzIGNvbnN0O1xuXG5leHBvcnQgY29uc3QgZm9ybUJhc2VGaWVsZFN0eWxlc09iamVjdCA9IHtcbiAgLi4uZm9ybUJhc2VDb21wb25lbnRTdHlsZXMsXG4gIHRyYW5zaXRpb246IHRyYW5zaXRpb25Db25jYXQoXG4gICAgWydiYWNrZ3JvdW5kLWNvbG9yJywgJ2JveC1zaGFkb3cnXSxcbiAgICAnc2xvdycsXG4gICAgJ2Vhc2UtaW4tb3V0J1xuICApLFxuICBib3JkZXI6IDEsXG4gIGJvcmRlclJhZGl1czogJ21kJyxcbiAgW0lucHV0U2VsZWN0b3JzLkhPVkVSXToge1xuICAgIGJvcmRlckNvbG9yOiAncHJpbWFyeScsXG4gIH0sXG4gIFtJbnB1dFNlbGVjdG9ycy5QTEFDRUhPTERFUl06IHtcbiAgICBmb250U3R5bGU6ICdpdGFsaWMnLFxuICB9LFxuICBbSW5wdXRTZWxlY3RvcnMuRElTQUJMRURdOiB7XG4gICAgLi4uZm9ybUZpZWxkRGlzYWJsZWRTdHlsZXMsXG4gIH0sXG59IGFzIGNvbnN0O1xuXG5leHBvcnQgY29uc3QgZm9ybUJhc2VGaWVsZFN0eWxlcyA9IGNzcyhmb3JtQmFzZUZpZWxkU3R5bGVzT2JqZWN0KTtcblxuY29uc3QgaW5wdXRXcmFwcGVyID0gY3NzKHtcbiAgbWFyZ2luOiAnMC4yNXJlbSAwJyxcbiAgd2lkdGg6ICcxMDAlJyxcbiAgZm9udFdlaWdodDogJ25vcm1hbCcsXG4gIGRpc3BsYXk6ICdmbGV4Jyxcbn0pO1xuXG5leHBvcnQgY29uc3QgSW5wdXRXcmFwcGVyID0gc3R5bGVkLmRpdihpbnB1dFdyYXBwZXIpO1xuXG5leHBvcnQgY29uc3QgZm9ybUZpZWxkU3R5bGVzID0gY3NzKHtcbiAgLi4uZm9ybUJhc2VGaWVsZFN0eWxlc09iamVjdCxcbiAgLi4uZm9ybUZpZWxkUGFkZGluZ1N0eWxlcyxcbiAgbGluZUhlaWdodDogJ2Jhc2UnLFxuICBbSW5wdXRTZWxlY3RvcnMuRk9DVVNdOiBmb3JtRmllbGRGb2N1c1N0eWxlcyxcbn0pO1xuXG5leHBvcnQgY29uc3QgY29uZGl0aW9uYWxTdHlsZXMgPSB2YXJpYW50KHtcbiAgdmFyaWFudHM6IHtcbiAgICBlcnJvcjoge1xuICAgICAgYm9yZGVyQ29sb3I6ICdmZWVkYmFjay1lcnJvcicsXG4gICAgICBbSW5wdXRTZWxlY3RvcnMuSE9WRVJdOiB7XG4gICAgICAgIGJvcmRlckNvbG9yOiAnZmVlZGJhY2stZXJyb3InLFxuICAgICAgfSxcbiAgICAgIFtJbnB1dFNlbGVjdG9ycy5GT0NVU106IHtcbiAgICAgICAgYm9yZGVyQ29sb3I6ICdmZWVkYmFjay1lcnJvcicsXG4gICAgICAgIGJveFNoYWRvdzogYGluc2V0IDAgMCAwIDFweCAke3RoZW1lLmNvbG9yc1snZmVlZGJhY2stZXJyb3InXX1gLFxuICAgICAgfSxcbiAgICB9LFxuICAgIGFjdGl2YXRlZDogeyBib3JkZXJDb2xvcjogJ2N1cnJlbnRDb2xvcicgfSxcbiAgfSxcbn0pO1xuXG5leHBvcnQgY29uc3QgY29uZGl0aW9uYWxTdHlsZVN0YXRlID0gKGVycm9yOiBib29sZWFuLCBhY3RpdmF0ZWQ6IGJvb2xlYW4pID0+IHtcbiAgcmV0dXJuIGVycm9yID8gJ2Vycm9yJyA6IGFjdGl2YXRlZCA/ICdhY3RpdmF0ZWQnIDogdW5kZWZpbmVkO1xufTtcblxuZXhwb3J0IGNvbnN0IGlucHV0U2l6ZVN0eWxlcyA9IHZhcmlhbnQoe1xuICBwcm9wOiAnaW5wdXRTaXplJyxcbiAgZGVmYXVsdFZhcmlhbnQ6ICdiYXNlJyxcbiAgYmFzZToge1xuICAgIHB4OiA4LFxuICB9LFxuICB2YXJpYW50czoge1xuICAgIGJhc2U6IHtcbiAgICAgIC4uLmZvcm1GaWVsZFBhZGRpbmdTdHlsZXMsXG4gICAgfSxcbiAgICBzbWFsbDoge1xuICAgICAgcHk6IDMgYXMgYW55LFxuICAgIH0sXG4gICAgc21hbGxGaWxlOiB7XG4gICAgICBweTogMiBhcyBhbnksXG4gICAgfSxcbiAgfSxcbn0pO1xuIl19 */");
 export const formFieldStyles = css({
   ...formBaseFieldStylesObject,
   ...formFieldPaddingStyles,

package/dist/GridForm/GridFormInputGroup/GridFormRadioGroupInput/index.js

@@ -31,12 +31,14 @@ export const GridFormRadioGroupInput = ({
     children: field.options.map(({
       label,
       value,
+      infotip,
       ...rest
     }) => /*#__PURE__*/_createElement(Radio, {
       ...register(field.name, field.validation),
       disabled: disabled,
       error: error,
       id: field.id,
+      infotip: infotip,
       key: value,
       label: label,
       value: value,

package/dist/GridForm/GridFormInputGroup/__fixtures__/renderers.d.ts

@@ -21,6 +21,10 @@ export declare const getComponent: (componentName: string) => {
 };
 type GridFormInputGroupTestComponentProps = GridFormInputGroupProps & {
     mode?: 'onSubmit' | 'onChange';
+    externalLabel?: {
+        id: string;
+        text: string;
+    };
 };
 export declare const GridFormInputGroupTestComponent: React.FC<GridFormInputGroupTestComponentProps>;
 export {};

package/dist/GridForm/types.d.ts

@@ -5,7 +5,7 @@ import { MinimalCheckboxProps } from '../ConnectedForm';
 import { CheckboxLabelUnion, TextAreaProps } from '../Form';
 import { CheckboxPaddingProps } from '../Form/types';
 import { ColumnProps } from '../Layout';
-import { InfoTipProps } from '../Tip/InfoTip';
+import { InfoTipSubComponentProps } from '../Tip/InfoTip/type-utils';
 import { Text, TextProps } from '../Typography/Text';
 export interface BaseFormInputProps {
     className?: string;
@@ -25,7 +25,12 @@ export type BaseFormField<Value> = {
      * HTML id to use instead of the name.
      */
     id?: string;
-    infotip?: InfoTipProps;
+    /**
+     * InfoTip to display next to the field label. The InfoTip button is
+     * automatically labelled by the field label. To override this behavior,
+     * provide `ariaLabel` or `ariaLabelledby`.
+     */
+    infotip?: InfoTipSubComponentProps;
     isSoloField?: boolean;
     name: string;
     onUpdate?: (value: Value) => void;

package/dist/Tip/InfoTip/InfoTipButton.js

@@ -8,14 +8,17 @@ export const InfoTipButton = /*#__PURE__*/forwardRef(({
   active,
   children,
   emphasis,
+  'aria-label': ariaLabel,
+  'aria-labelledby': ariaLabelledby,
   ...props
 }, ref) => {
   const Icon = emphasis === 'high' ? MiniInfoCircleIcon : MiniInfoOutlineIcon;
   return /*#__PURE__*/_jsxs(InfoTipButtonBase, {
+    ...props,
     active: active,
     "aria-expanded": active,
-    "aria-label": "Show information",
-    ...props,
+    "aria-label": ariaLabel,
+    "aria-labelledby": ariaLabelledby,
     ref: ref,
     children: [Icon && /*#__PURE__*/_jsx(Icon, {
       "aria-hidden": true,

package/dist/Tip/InfoTip/index.d.ts

@@ -1,13 +1,38 @@
 /// <reference types="react" />
 import { TipBaseAlignment, TipBaseProps } from '../shared/types';
-export type InfoTipProps = TipBaseProps & {
+/**
+ * Base props shared by all InfoTip variants.
+ * Contains all common props except the aria-* specific props.
+ */
+export type InfoTipBaseProps = TipBaseProps & {
     alignment?: TipBaseAlignment;
+    /**
+     * Accessible role description for the InfoTip button. Useful for translation.
+     * @default "More information button"
+     */
+    ariaRoleDescription?: string;
     emphasis?: 'low' | 'high';
     /**
-     * Called when the info tip is clicked - the onClick function is called after the DOM updates and the tip is mounted.
+     * Called when the InfoTip button is clicked - the onClick function is called after the DOM updates and the tip is mounted.
      */
     onClick?: (arg0: {
         isTipHidden: boolean;
     }) => void;
 };
+type InfoTipPropsWithAriaLabel = InfoTipBaseProps & {
+    /**
+     * Accessible label for the InfoTip button. ariaLabel or ariaLabelledby should be provided for accessibility.
+     */
+    ariaLabel?: string;
+    ariaLabelledby?: never;
+};
+type InfoTipPropsWithAriaLabelledby = InfoTipBaseProps & {
+    ariaLabel?: never;
+    /**
+     * ID of an element that labels the InfoTip button.
+     */
+    ariaLabelledby?: string;
+};
+export type InfoTipProps = InfoTipPropsWithAriaLabel | InfoTipPropsWithAriaLabelledby;
 export declare const InfoTip: React.FC<InfoTipProps>;
+export {};

package/dist/Tip/InfoTip/index.js

@@ -1,19 +1,22 @@
 import { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react';
 import { getFocusableElements as getFocusableElementsUtil } from '../../utils/focus';
-import { extractTextContent } from '../../utils/react';
 import { FloatingTip } from '../shared/FloatingTip';
 import { InlineTip } from '../shared/InlineTip';
 import { tipDefaultProps } from '../shared/types';
-import { isElementVisible } from '../shared/utils';
-import { ScreenreaderNavigableText } from './elements';
+import { isFloatingElementOpen } from '../shared/utils';
 import { InfoTipButton } from './InfoTipButton';
-import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
-const ARIA_HIDDEN_DELAY_MS = 1000;
 
-// Match native dialogs with open attribute, and role-based dialogs that aren't aria-hidden
+/**
+ * Base props shared by all InfoTip variants.
+ * Contains all common props except the aria-* specific props.
+ */
+import { jsx as _jsx } from "react/jsx-runtime";
 const MODAL_SELECTOR = 'dialog[open],[role="dialog"]:not([aria-hidden="true"]),[role="alertdialog"]:not([aria-hidden="true"])';
 export const InfoTip = ({
   alignment = 'top-right',
+  ariaLabel,
+  ariaLabelledby,
+  ariaRoleDescription = 'More information button',
   emphasis = 'low',
   info,
   onClick,
@@ -22,25 +25,14 @@ export const InfoTip = ({
 }) => {
   const isFloating = placement === 'floating';
   const [isTipHidden, setHideTip] = useState(true);
-  const [isAriaHidden, setIsAriaHidden] = useState(false);
-  const [shouldAnnounce, setShouldAnnounce] = useState(false);
   const [loaded, setLoaded] = useState(false);
   const wrapperRef = useRef(null);
   const buttonRef = useRef(null);
   const popoverContentNodeRef = useRef(null);
   const isInitialMount = useRef(true);
-  const ariaHiddenTimeoutRef = useRef(null);
-  const announceTimeoutRef = useRef(null);
   const getFocusableElements = useCallback(() => {
     return getFocusableElementsUtil(popoverContentNodeRef.current);
   }, []);
-  const clearAndSetTimeout = useCallback((timeoutRef, callback, delay) => {
-    clearTimeout(timeoutRef.current ?? undefined);
-    timeoutRef.current = setTimeout(() => {
-      callback();
-      timeoutRef.current = null;
-    }, delay);
-  }, []);
   const popoverContentRef = useCallback(node => {
     popoverContentNodeRef.current = node;
     if (node && !isTipHidden && isFloating) {
@@ -51,24 +43,10 @@ export const InfoTip = ({
   }, [onClick, isTipHidden, isFloating]);
   useEffect(() => {
     setLoaded(true);
-    const ariaHiddenTimeout = ariaHiddenTimeoutRef.current;
-    const announceTimeout = announceTimeoutRef.current;
-    return () => {
-      clearTimeout(ariaHiddenTimeout ?? undefined);
-      clearTimeout(announceTimeout ?? undefined);
-    };
   }, []);
   const setTipIsHidden = useCallback(nextTipState => {
     setHideTip(nextTipState);
-    if (!nextTipState && !isFloating) {
-      clearAndSetTimeout(ariaHiddenTimeoutRef, () => setIsAriaHidden(true), ARIA_HIDDEN_DELAY_MS);
-    } else if (nextTipState) {
-      if (isAriaHidden) setIsAriaHidden(false);
-      setShouldAnnounce(false);
-      clearTimeout(ariaHiddenTimeoutRef.current ?? undefined);
-      ariaHiddenTimeoutRef.current = null;
-    }
-  }, [isAriaHidden, isFloating, clearAndSetTimeout]);
+  }, []);
   const handleOutsideClick = useCallback(e => {
     const wrapper = wrapperRef.current;
     const isOutside = wrapper && (!(e.target instanceof HTMLElement) || !wrapper.contains(e.target));
@@ -79,10 +57,7 @@ export const InfoTip = ({
   const clickHandler = useCallback(() => {
     const currentTipState = !isTipHidden;
     setTipIsHidden(currentTipState);
-    if (!currentTipState) {
-      clearAndSetTimeout(announceTimeoutRef, () => setShouldAnnounce(true), 0);
-    }
-  }, [isTipHidden, setTipIsHidden, clearAndSetTimeout]);
+  }, [isTipHidden, setTipIsHidden]);
   useLayoutEffect(() => {
     if (isInitialMount.current) {
       isInitialMount.current = false;
@@ -108,7 +83,14 @@ export const InfoTip = ({
     const handleGlobalEscapeKey = e => {
       if (e.key !== 'Escape') return;
       const openModals = document.querySelectorAll(MODAL_SELECTOR);
-      const hasUnrelatedModal = Array.from(openModals).some(modal => isElementVisible(modal) && wrapperRef.current && !modal.contains(wrapperRef.current));
+      const hasUnrelatedModal = Array.from(openModals).some(modal => {
+        // Only consider floating elements that are actually open
+        if (!isFloatingElementOpen(modal)) {
+          return false;
+        }
+        // Check if it's unrelated to this InfoTip
+        return wrapperRef.current && !modal.contains(wrapperRef.current);
+      });
       if (hasUnrelatedModal) return;
       e.preventDefault();
       e.stopPropagation();
@@ -120,7 +102,18 @@ export const InfoTip = ({
       const handleTabKeyInPopover = event => {
         if (event.key !== 'Tab' || event.shiftKey) return;
         const focusableElements = getFocusableElements();
-        if (focusableElements.length === 0) return;
+        const {
+          activeElement
+        } = document;
+
+        // If no focusable elements and popover itself has focus, wrap to button
+        if (focusableElements.length === 0) {
+          if (activeElement === popoverContentNodeRef.current) {
+            event.preventDefault();
+            buttonRef.current?.focus();
+          }
+          return;
+        }
         const lastElement = focusableElements[focusableElements.length - 1];
 
         // Only wrap forward: if on last element, wrap to button
@@ -141,45 +134,35 @@ export const InfoTip = ({
       };
     }
     return () => document.removeEventListener('keydown', handleGlobalEscapeKey, true);
-  }, [isTipHidden, isFloating, setTipIsHidden, getFocusableElements]);
+  }, [isTipHidden, isFloating, getFocusableElements, setTipIsHidden]);
+  useEffect(() => {
+    if (isTipHidden) return;
+    const timeoutId = setTimeout(() => {
+      popoverContentNodeRef.current?.focus();
+    }, 0);
+    return () => clearTimeout(timeoutId);
+  }, [isTipHidden]);
   const Tip = loaded && isFloating ? FloatingTip : InlineTip;
   const tipProps = useMemo(() => ({
     alignment,
     info,
     isTipHidden,
+    contentRef: popoverContentRef,
     wrapperRef,
-    ...(isFloating && {
-      popoverContentRef
-    }),
     ...rest
-  }), [alignment, info, isTipHidden, wrapperRef, isFloating, popoverContentRef, rest]);
-  const extractedTextContent = useMemo(() => extractTextContent(info), [info]);
-  const screenreaderInfo = shouldAnnounce && !isTipHidden ? extractedTextContent : '\xa0';
-  const screenreaderText = useMemo(() => /*#__PURE__*/_jsx(ScreenreaderNavigableText, {
-    "aria-hidden": isAriaHidden,
-    "aria-live": "assertive",
-    screenreader: true,
-    children: screenreaderInfo
-  }), [isAriaHidden, screenreaderInfo]);
-  const button = useMemo(() => /*#__PURE__*/_jsx(InfoTipButton, {
-    active: !isTipHidden,
-    "aria-expanded": !isTipHidden,
-    emphasis: emphasis,
-    ref: buttonRef,
-    onClick: clickHandler
-  }), [isTipHidden, emphasis, clickHandler]);
-
-  /*
-   * For floating placement, screenreader text comes before button to maintain
-   * correct DOM order despite Portal rendering. See GMT-64 for planned fix.
-   */
+  }), [alignment, info, isTipHidden, popoverContentRef, wrapperRef, rest]);
   return /*#__PURE__*/_jsx(Tip, {
     ...tipProps,
     type: "info",
-    children: isFloating && alignment.includes('top') ? /*#__PURE__*/_jsxs(_Fragment, {
-      children: [screenreaderText, button]
-    }) : /*#__PURE__*/_jsxs(_Fragment, {
-      children: [button, screenreaderText]
+    children: /*#__PURE__*/_jsx(InfoTipButton, {
+      active: !isTipHidden,
+      "aria-expanded": !isTipHidden,
+      "aria-label": ariaLabel,
+      "aria-labelledby": ariaLabelledby,
+      "aria-roledescription": ariaRoleDescription,
+      emphasis: emphasis,
+      ref: buttonRef,
+      onClick: clickHandler
     })
   });
 };

package/dist/Tip/InfoTip/type-utils.d.ts

@@ -0,0 +1,35 @@
+import type { InfoTipBaseProps, InfoTipProps } from './index';
+type InfoTipAriaLabel = InfoTipBaseProps & {
+    ariaLabel?: string;
+    ariaLabelledby?: never;
+};
+type InfoTipAriaLabelledby = InfoTipBaseProps & {
+    ariaLabel?: never;
+    ariaLabelledby?: string;
+};
+type InfoTipPropsAriaWithFallback = InfoTipBaseProps & {
+    ariaLabel?: never;
+    ariaLabelledby?: never;
+};
+/**
+ * InfoTip props that allow both ariaLabel and ariaLabelledby to be optional.
+ * Used in components that automatically provide ariaLabelledby when neither is provided.
+ */
+export type InfoTipSubComponentProps = InfoTipAriaLabel | InfoTipAriaLabelledby | InfoTipPropsAriaWithFallback;
+export declare const createInfoTipProps: (props: InfoTipSubComponentProps, fallbackAriaLabelledby?: string) => {
+    infotipProps: InfoTipProps;
+    shouldLabelInfoTip: boolean;
+};
+/**
+ * Hook to handle infotip props and accessibility labeling.
+ * Extracts the common pattern used by Radio, Checkbox, and FormGroupLabel components.
+ *
+ * @param infotip - Optional infotip subcomponent props
+ * @returns Object containing infotipProps, labelId, and shouldLabelInfoTip flag
+ */
+export declare const useInfotipProps: (infotip?: InfoTipSubComponentProps) => {
+    infotipProps: InfoTipProps | undefined;
+    labelId: string;
+    shouldLabelInfoTip: boolean;
+};
+export {};

package/dist/Tip/InfoTip/type-utils.js

@@ -0,0 +1,72 @@
+import { useId } from 'react';
+
+/**
+ * InfoTip props that allow both ariaLabel and ariaLabelledby to be optional.
+ * Used in components that automatically provide ariaLabelledby when neither is provided.
+ */
+
+export const createInfoTipProps = (props, fallbackAriaLabelledby) => {
+  const {
+    ariaLabel,
+    ariaLabelledby,
+    ...rest
+  } = props;
+  const hasAriaLabel = ariaLabel !== undefined;
+  const hasAriaLabelledby = ariaLabelledby !== undefined;
+  if (hasAriaLabel) {
+    return {
+      infotipProps: {
+        ...rest,
+        ariaLabel
+      },
+      shouldLabelInfoTip: false
+    };
+  }
+  if (hasAriaLabelledby) {
+    return {
+      infotipProps: {
+        ...rest,
+        ariaLabelledby
+      },
+      shouldLabelInfoTip: false
+    };
+  }
+  if (fallbackAriaLabelledby) {
+    return {
+      infotipProps: {
+        ...rest,
+        ariaLabelledby: fallbackAriaLabelledby
+      },
+      shouldLabelInfoTip: true
+    };
+  }
+  return {
+    infotipProps: {
+      ...rest
+    },
+    shouldLabelInfoTip: false
+  };
+};
+
+/**
+ * Hook to handle infotip props and accessibility labeling.
+ * Extracts the common pattern used by Radio, Checkbox, and FormGroupLabel components.
+ *
+ * @param infotip - Optional infotip subcomponent props
+ * @returns Object containing infotipProps, labelId, and shouldLabelInfoTip flag
+ */
+export const useInfotipProps = infotip => {
+  const labelId = useId();
+  const {
+    infotipProps,
+    shouldLabelInfoTip
+  } = infotip ? createInfoTipProps(infotip, labelId) : {
+    infotipProps: undefined,
+    shouldLabelInfoTip: false
+  };
+  return {
+    infotipProps,
+    labelId,
+    shouldLabelInfoTip
+  };
+};

package/dist/Tip/__tests__/helpers.d.ts

@@ -1,9 +1,8 @@
 import { setupRtl } from '@codecademy/gamut-tests';
 import { RefObject } from 'react';
-import { InfoTip, InfoTipProps } from '../InfoTip';
+import { InfoTip } from '../InfoTip';
 import { TipPlacements } from '../shared/types';
 type InfoTipView = ReturnType<ReturnType<typeof setupRtl<typeof InfoTip>>>['view'];
-type Placement = NonNullable<InfoTipProps['placement']>;
 type ViewParam = {
     view: InfoTipView;
 };
@@ -14,7 +13,7 @@ type InfoParam = {
     info: string;
 };
 type PlacementParam = {
-    placement: Placement;
+    placement: TipPlacements;
 };
 export declare const createFocusOnClick: (ref: RefObject<HTMLDivElement>) => ({ isTipHidden }: {
     isTipHidden: boolean;
@@ -46,13 +45,10 @@ export declare const pressKey: (key: string) => Promise<void>;
 export declare const waitForLinkToHaveFocus: ({ view, linkText, }: ViewParam & LinkTextParam) => Promise<HTMLElement>;
 export declare const openTipAndWaitForLink: ({ view, linkText, }: ViewParam & LinkTextParam) => Promise<HTMLElement>;
 export declare const openTipTabToLinkAndWaitForFocus: (view: InfoTipView, linkText: string) => Promise<HTMLElement>;
-export declare const testShowTipOnClick: ({ view, info, placement, }: ViewParam & InfoParam & PlacementParam) => Promise<void>;
-export declare const testEscapeKeyReturnsFocus: ({ view, info, placement, }: ViewParam & InfoParam & PlacementParam) => Promise<void>;
-export declare const testFocusWrap: ({ view, containerRef, direction, }: ViewParam & {
-    containerRef: RefObject<HTMLDivElement>;
+export declare const testFocusWrap: ({ view, direction, }: ViewParam & {
     direction: 'forward' | 'backward';
 }) => Promise<void>;
-export declare const getTipContent: (view: InfoTipView, text: string, useQuery?: boolean) => HTMLElement;
+export declare const testTabFromPopoverWithNoInteractiveElements: (view: InfoTipView) => Promise<void>;
 export declare const testTabbingBetweenLinks: ({ view, firstLinkText, secondLinkText, placement, }: ViewParam & {
     firstLinkText: string;
     secondLinkText: string;
@@ -60,7 +56,6 @@ export declare const testTabbingBetweenLinks: ({ view, firstLinkText, secondLink
 }) => Promise<void>;
 export declare const setupLinkTestWithPlacement: (linkText: string, placement: TipPlacements, renderView: ReturnType<typeof setupRtl<typeof InfoTip>>) => {
     view: import("@testing-library/react").RenderResult;
-    containerRef: RefObject<HTMLDivElement>;
     info: import("react/jsx-runtime").JSX.Element;
     onClick: ({ isTipHidden }: {
         isTipHidden: boolean;
@@ -84,28 +79,12 @@ type ViewWithQueries = {
     getAllByText: (text: string) => HTMLElement[];
     getAllByLabelText: (text: string) => HTMLElement[];
 };
-export declare const getVisibleTip: ({ text, placement, }: {
-    text: string;
-    placement?: "inline" | "floating" | undefined;
-}) => HTMLElement | undefined;
-export declare const expectTipToBeVisible: ({ text, placement, }: {
-    text: string;
-    placement?: "inline" | "floating" | undefined;
-}) => void;
-export declare const expectTipToBeClosed: ({ text, placement, }: {
-    text: string;
-    placement?: "inline" | "floating" | undefined;
-}) => void;
 export declare const openInfoTipsWithKeyboard: ({ view, count, }: {
     view: ViewWithQueries;
     count: number;
 }) => Promise<void>;
 export declare const expectTipsVisible: (tips: {
     text: string;
-    placement?: 'inline' | 'floating';
-}[]) => void;
-export declare const expectTipsClosed: (tips: {
-    text: string;
-    placement?: 'inline' | 'floating';
 }[]) => void;
+export declare const expectTipsClosed: () => void;
 export {};

package/dist/Tip/shared/FloatingTip.js

@@ -18,7 +18,7 @@ export const FloatingTip = ({
   loading,
   narrow,
   overline,
-  popoverContentRef,
+  contentRef,
   truncateLines,
   type,
   username,
@@ -123,7 +123,7 @@ export const FloatingTip = ({
       width: inheritDims ? 'inherit' : undefined,
       onBlur: toolOnlyEventFunc,
       onFocus: toolOnlyEventFunc,
-      onKeyDown: escapeKeyPressHandler ? e => escapeKeyPressHandler(e) : undefined,
+      onKeyDown: escapeKeyPressHandler,
       onMouseDown: e => e.preventDefault(),
       onMouseEnter: toolOnlyEventFunc,
       children: children
@@ -134,7 +134,7 @@ export const FloatingTip = ({
       horizontalOffset: offset,
       isOpen: isPopoverOpen,
       outline: true,
-      popoverContainerRef: popoverContentRef,
+      popoverContainerRef: contentRef,
       skipFocusTrap: true,
       targetRef: ref,
       variant: "secondary",

package/dist/Tip/shared/InlineTip.js

@@ -17,6 +17,7 @@ export const InlineTip = ({
   loading,
   narrow,
   overline,
+  contentRef,
   truncateLines,
   type,
   username,
@@ -42,7 +43,7 @@ export const InlineTip = ({
     height: inheritDims ? 'inherit' : undefined,
     ref: wrapperRef,
     width: inheritDims ? 'inherit' : undefined,
-    onKeyDown: escapeKeyPressHandler ? e => escapeKeyPressHandler(e) : undefined,
+    onKeyDown: escapeKeyPressHandler,
     children: children
   });
   const tipBody = /*#__PURE__*/_jsx(InlineTipBodyWrapper, {
@@ -55,7 +56,9 @@ export const InlineTip = ({
       color: "currentColor",
       horizNarrow: narrow && isHorizontalCenter,
       id: id,
+      ref: contentRef,
       role: type === 'tool' ? 'tooltip' : undefined,
+      tabIndex: type === 'info' ? -1 : undefined,
       width: narrow && !isHorizontalCenter ? narrowWidth : 'max-content',
       zIndex: "auto",
       children: type === 'preview' ? /*#__PURE__*/_jsxs(_Fragment, {

package/dist/Tip/shared/types.d.ts

@@ -46,7 +46,7 @@ export type TipPlacementComponentProps = Omit<TipNewBaseProps, 'placement' | 'em
     escapeKeyPressHandler?: (event: React.KeyboardEvent<HTMLDivElement>) => void;
     id?: string;
     isTipHidden?: boolean;
-    popoverContentRef?: React.RefObject<HTMLDivElement> | ((node: HTMLDivElement | null) => void);
+    contentRef?: React.RefObject<HTMLDivElement> | ((node: HTMLDivElement | null) => void);
     type: 'info' | 'tool' | 'preview';
     wrapperRef?: React.RefObject<HTMLDivElement>;
     zIndex?: number;

package/dist/Tip/shared/utils.d.ts

@@ -6,3 +6,22 @@ export declare const escapeKeyPressHandler: (event: React.KeyboardEvent<HTMLDivE
  * Uses the modern checkVisibility API with a fallback for older browsers.
  */
 export declare const isElementVisible: (element: Element) => boolean;
+/**
+ * Check if a floating element (modal, dialog, popover, overlay, etc.) is actually open and blocking.
+ *
+ * A floating element is considered "open" and blocking if:
+ * 1. It's a <dialog> element with the open attribute (always blocking per HTML spec), OR
+ * 2. It has role="alertdialog" (always blocking per ARIA spec), OR
+ * 3. It has role="dialog" AND:
+ *    - It's not aria-hidden="true", AND
+ *    - It doesn't have aria-expanded="false" (for collapsible dialogs), AND
+ *    - It's actually visible (not just in DOM), AND
+ *    - It has aria-modal="true" (indicates blocking modal per ARIA spec)
+ *
+ * Non-blocking popovers and collapsible dialogs without aria-modal="true" are not considered
+ * blocking and should not prevent InfoTip from closing.
+ *
+ * @param element - The DOM element to check
+ * @returns `true` if the floating element is actually open and blocking, `false` otherwise
+ */
+export declare const isFloatingElementOpen: (element: Element) => boolean;