@codecademy/gamut 67.6.4-alpha.1d4469.0 → 67.6.4-alpha.1d6b98.0

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

@@ -0,0 +1,12 @@
+/// <reference types="react" />
+export declare const ScreenreaderNavigableText: import("@emotion/styled").StyledComponent<(((Omit<{
+    theme?: import("@emotion/react").Theme | undefined;
+    as?: import("react").ElementType<any, keyof import("react").JSX.IntrinsicElements> | undefined;
+} & import("../..").TextTruncateProps & Pick<import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLSpanElement>, HTMLSpanElement>, "slot" | "style" | "title" | "dir" | "children" | "className" | "aria-hidden" | "onAnimationStart" | "onDragStart" | "onDragEnd" | "onDrag" | "defaultChecked" | "defaultValue" | "suppressContentEditableWarning" | "suppressHydrationWarning" | "accessKey" | "autoFocus" | "contentEditable" | "contextMenu" | "draggable" | "hidden" | "id" | "lang" | "nonce" | "spellCheck" | "tabIndex" | "translate" | "radioGroup" | "role" | "about" | "content" | "datatype" | "inlist" | "prefix" | "property" | "rel" | "resource" | "rev" | "typeof" | "vocab" | "autoCapitalize" | "autoCorrect" | "autoSave" | "itemProp" | "itemScope" | "itemType" | "itemID" | "itemRef" | "results" | "security" | "unselectable" | "inputMode" | "is" | "aria-activedescendant" | "aria-atomic" | "aria-autocomplete" | "aria-braillelabel" | "aria-brailleroledescription" | "aria-busy" | "aria-checked" | "aria-colcount" | "aria-colindex" | "aria-colindextext" | "aria-colspan" | "aria-controls" | "aria-current" | "aria-describedby" | "aria-description" | "aria-details" | "aria-disabled" | "aria-dropeffect" | "aria-errormessage" | "aria-expanded" | "aria-flowto" | "aria-grabbed" | "aria-haspopup" | "aria-invalid" | "aria-keyshortcuts" | "aria-label" | "aria-labelledby" | "aria-level" | "aria-live" | "aria-modal" | "aria-multiline" | "aria-multiselectable" | "aria-orientation" | "aria-owns" | "aria-placeholder" | "aria-posinset" | "aria-pressed" | "aria-readonly" | "aria-relevant" | "aria-required" | "aria-roledescription" | "aria-rowcount" | "aria-rowindex" | "aria-rowindextext" | "aria-rowspan" | "aria-selected" | "aria-setsize" | "aria-sort" | "aria-valuemax" | "aria-valuemin" | "aria-valuenow" | "aria-valuetext" | "dangerouslySetInnerHTML" | "onCopy" | "onCopyCapture" | "onCut" | "onCutCapture" | "onPaste" | "onPasteCapture" | "onCompositionEnd" | "onCompositionEndCapture" | "onCompositionStart" | "onCompositionStartCapture" | "onCompositionUpdate" | "onCompositionUpdateCapture" | "onFocus" | "onFocusCapture" | "onBlur" | "onBlurCapture" | "onChange" | "onChangeCapture" | "onBeforeInput" | "onBeforeInputCapture" | "onInput" | "onInputCapture" | "onReset" | "onResetCapture" | "onSubmit" | "onSubmitCapture" | "onInvalid" | "onInvalidCapture" | "onLoad" | "onLoadCapture" | "onError" | "onErrorCapture" | "onKeyDown" | "onKeyDownCapture" | "onKeyPress" | "onKeyPressCapture" | "onKeyUp" | "onKeyUpCapture" | "onAbort" | "onAbortCapture" | "onCanPlay" | "onCanPlayCapture" | "onCanPlayThrough" | "onCanPlayThroughCapture" | "onDurationChange" | "onDurationChangeCapture" | "onEmptied" | "onEmptiedCapture" | "onEncrypted" | "onEncryptedCapture" | "onEnded" | "onEndedCapture" | "onLoadedData" | "onLoadedDataCapture" | "onLoadedMetadata" | "onLoadedMetadataCapture" | "onLoadStart" | "onLoadStartCapture" | "onPause" | "onPauseCapture" | "onPlay" | "onPlayCapture" | "onPlaying" | "onPlayingCapture" | "onProgress" | "onProgressCapture" | "onRateChange" | "onRateChangeCapture" | "onResize" | "onResizeCapture" | "onSeeked" | "onSeekedCapture" | "onSeeking" | "onSeekingCapture" | "onStalled" | "onStalledCapture" | "onSuspend" | "onSuspendCapture" | "onTimeUpdate" | "onTimeUpdateCapture" | "onVolumeChange" | "onVolumeChangeCapture" | "onWaiting" | "onWaitingCapture" | "onAuxClick" | "onAuxClickCapture" | "onClick" | "onClickCapture" | "onContextMenu" | "onContextMenuCapture" | "onDoubleClick" | "onDoubleClickCapture" | "onDragCapture" | "onDragEndCapture" | "onDragEnter" | "onDragEnterCapture" | "onDragExit" | "onDragExitCapture" | "onDragLeave" | "onDragLeaveCapture" | "onDragOver" | "onDragOverCapture" | "onDragStartCapture" | "onDrop" | "onDropCapture" | "onMouseDown" | "onMouseDownCapture" | "onMouseEnter" | "onMouseLeave" | "onMouseMove" | "onMouseMoveCapture" | "onMouseOut" | "onMouseOutCapture" | "onMouseOver" | "onMouseOverCapture" | "onMouseUp" | "onMouseUpCapture" | "onSelect" | "onSelectCapture" | "onTouchCancel" | "onTouchCancelCapture" | "onTouchEnd" | "onTouchEndCapture" | "onTouchMove" | "onTouchMoveCapture" | "onTouchStart" | "onTouchStartCapture" | "onPointerDown" | "onPointerDownCapture" | "onPointerMove" | "onPointerMoveCapture" | "onPointerUp" | "onPointerUpCapture" | "onPointerCancel" | "onPointerCancelCapture" | "onPointerEnter" | "onPointerLeave" | "onPointerOver" | "onPointerOverCapture" | "onPointerOut" | "onPointerOutCapture" | "onGotPointerCapture" | "onGotPointerCaptureCapture" | "onLostPointerCapture" | "onLostPointerCaptureCapture" | "onScroll" | "onScrollCapture" | "onWheel" | "onWheelCapture" | "onAnimationStartCapture" | "onAnimationEnd" | "onAnimationEndCapture" | "onAnimationIteration" | "onAnimationIterationCapture" | "onTransitionEnd" | "onTransitionEndCapture" | keyof import("react").ClassAttributes<HTMLSpanElement>>, "ref"> | Omit<{
+    theme?: import("@emotion/react").Theme | undefined;
+    as?: import("react").ElementType<any, keyof import("react").JSX.IntrinsicElements> | undefined;
+} & import("../..").TextNoTruncateProps & Pick<import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLSpanElement>, HTMLSpanElement>, "slot" | "style" | "title" | "dir" | "children" | "className" | "aria-hidden" | "onAnimationStart" | "onDragStart" | "onDragEnd" | "onDrag" | "defaultChecked" | "defaultValue" | "suppressContentEditableWarning" | "suppressHydrationWarning" | "accessKey" | "autoFocus" | "contentEditable" | "contextMenu" | "draggable" | "hidden" | "id" | "lang" | "nonce" | "spellCheck" | "tabIndex" | "translate" | "radioGroup" | "role" | "about" | "content" | "datatype" | "inlist" | "prefix" | "property" | "rel" | "resource" | "rev" | "typeof" | "vocab" | "autoCapitalize" | "autoCorrect" | "autoSave" | "itemProp" | "itemScope" | "itemType" | "itemID" | "itemRef" | "results" | "security" | "unselectable" | "inputMode" | "is" | "aria-activedescendant" | "aria-atomic" | "aria-autocomplete" | "aria-braillelabel" | "aria-brailleroledescription" | "aria-busy" | "aria-checked" | "aria-colcount" | "aria-colindex" | "aria-colindextext" | "aria-colspan" | "aria-controls" | "aria-current" | "aria-describedby" | "aria-description" | "aria-details" | "aria-disabled" | "aria-dropeffect" | "aria-errormessage" | "aria-expanded" | "aria-flowto" | "aria-grabbed" | "aria-haspopup" | "aria-invalid" | "aria-keyshortcuts" | "aria-label" | "aria-labelledby" | "aria-level" | "aria-live" | "aria-modal" | "aria-multiline" | "aria-multiselectable" | "aria-orientation" | "aria-owns" | "aria-placeholder" | "aria-posinset" | "aria-pressed" | "aria-readonly" | "aria-relevant" | "aria-required" | "aria-roledescription" | "aria-rowcount" | "aria-rowindex" | "aria-rowindextext" | "aria-rowspan" | "aria-selected" | "aria-setsize" | "aria-sort" | "aria-valuemax" | "aria-valuemin" | "aria-valuenow" | "aria-valuetext" | "dangerouslySetInnerHTML" | "onCopy" | "onCopyCapture" | "onCut" | "onCutCapture" | "onPaste" | "onPasteCapture" | "onCompositionEnd" | "onCompositionEndCapture" | "onCompositionStart" | "onCompositionStartCapture" | "onCompositionUpdate" | "onCompositionUpdateCapture" | "onFocus" | "onFocusCapture" | "onBlur" | "onBlurCapture" | "onChange" | "onChangeCapture" | "onBeforeInput" | "onBeforeInputCapture" | "onInput" | "onInputCapture" | "onReset" | "onResetCapture" | "onSubmit" | "onSubmitCapture" | "onInvalid" | "onInvalidCapture" | "onLoad" | "onLoadCapture" | "onError" | "onErrorCapture" | "onKeyDown" | "onKeyDownCapture" | "onKeyPress" | "onKeyPressCapture" | "onKeyUp" | "onKeyUpCapture" | "onAbort" | "onAbortCapture" | "onCanPlay" | "onCanPlayCapture" | "onCanPlayThrough" | "onCanPlayThroughCapture" | "onDurationChange" | "onDurationChangeCapture" | "onEmptied" | "onEmptiedCapture" | "onEncrypted" | "onEncryptedCapture" | "onEnded" | "onEndedCapture" | "onLoadedData" | "onLoadedDataCapture" | "onLoadedMetadata" | "onLoadedMetadataCapture" | "onLoadStart" | "onLoadStartCapture" | "onPause" | "onPauseCapture" | "onPlay" | "onPlayCapture" | "onPlaying" | "onPlayingCapture" | "onProgress" | "onProgressCapture" | "onRateChange" | "onRateChangeCapture" | "onResize" | "onResizeCapture" | "onSeeked" | "onSeekedCapture" | "onSeeking" | "onSeekingCapture" | "onStalled" | "onStalledCapture" | "onSuspend" | "onSuspendCapture" | "onTimeUpdate" | "onTimeUpdateCapture" | "onVolumeChange" | "onVolumeChangeCapture" | "onWaiting" | "onWaitingCapture" | "onAuxClick" | "onAuxClickCapture" | "onClick" | "onClickCapture" | "onContextMenu" | "onContextMenuCapture" | "onDoubleClick" | "onDoubleClickCapture" | "onDragCapture" | "onDragEndCapture" | "onDragEnter" | "onDragEnterCapture" | "onDragExit" | "onDragExitCapture" | "onDragLeave" | "onDragLeaveCapture" | "onDragOver" | "onDragOverCapture" | "onDragStartCapture" | "onDrop" | "onDropCapture" | "onMouseDown" | "onMouseDownCapture" | "onMouseEnter" | "onMouseLeave" | "onMouseMove" | "onMouseMoveCapture" | "onMouseOut" | "onMouseOutCapture" | "onMouseOver" | "onMouseOverCapture" | "onMouseUp" | "onMouseUpCapture" | "onSelect" | "onSelectCapture" | "onTouchCancel" | "onTouchCancelCapture" | "onTouchEnd" | "onTouchEndCapture" | "onTouchMove" | "onTouchMoveCapture" | "onTouchStart" | "onTouchStartCapture" | "onPointerDown" | "onPointerDownCapture" | "onPointerMove" | "onPointerMoveCapture" | "onPointerUp" | "onPointerUpCapture" | "onPointerCancel" | "onPointerCancelCapture" | "onPointerEnter" | "onPointerLeave" | "onPointerOver" | "onPointerOverCapture" | "onPointerOut" | "onPointerOutCapture" | "onGotPointerCapture" | "onGotPointerCaptureCapture" | "onLostPointerCapture" | "onLostPointerCaptureCapture" | "onScroll" | "onScrollCapture" | "onWheel" | "onWheelCapture" | "onAnimationStartCapture" | "onAnimationEnd" | "onAnimationEndCapture" | "onAnimationIteration" | "onAnimationIterationCapture" | "onTransitionEnd" | "onTransitionEndCapture" | keyof import("react").ClassAttributes<HTMLSpanElement>>, "ref">) & import("react").RefAttributes<HTMLSpanElement>) & {
+    theme?: import("@emotion/react").Theme | undefined;
+}) & {
+    theme?: import("@emotion/react").Theme | undefined;
+}, {}, {}>;

package/dist/Tip/InfoTip/elements.js

@@ -0,0 +1,9 @@
+import _styled from "@emotion/styled/base";
+import { css } from '@codecademy/gamut-styles';
+import { Text } from '../../Typography';
+export const ScreenreaderNavigableText = /*#__PURE__*/_styled(Text, {
+  target: "e1rvjfdo0",
+  label: "ScreenreaderNavigableText"
+})(css({
+  position: 'absolute'
+}), process.env.NODE_ENV === "production" ? "" : "/*# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9UaXAvSW5mb1RpcC9lbGVtZW50cy50c3giXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBS3lDIiwiZmlsZSI6Ii4uLy4uLy4uL3NyYy9UaXAvSW5mb1RpcC9lbGVtZW50cy50c3giLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBjc3MgfSBmcm9tICdAY29kZWNhZGVteS9nYW11dC1zdHlsZXMnO1xuaW1wb3J0IHN0eWxlZCBmcm9tICdAZW1vdGlvbi9zdHlsZWQnO1xuXG5pbXBvcnQgeyBUZXh0IH0gZnJvbSAnLi4vLi4vVHlwb2dyYXBoeSc7XG5cbmV4cG9ydCBjb25zdCBTY3JlZW5yZWFkZXJOYXZpZ2FibGVUZXh0ID0gc3R5bGVkKFRleHQpKFxuICBjc3MoeyBwb3NpdGlvbjogJ2Fic29sdXRlJyB9KVxuKTtcbiJdfQ== */");

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

@@ -1,37 +1,7 @@
 /// <reference types="react" />
 import { TipBaseAlignment, TipBaseProps } from '../shared/types';
-type InfoTipPropsWithAriaLabel = TipBaseProps & {
+export type InfoTipProps = TipBaseProps & {
     alignment?: TipBaseAlignment;
-    /**
-     * Accessible label for the InfoTip button. ariaLabel or ariaLabelledby should be provided for accessibility.
-     */
-    ariaLabel?: string;
-    ariaLabelledby?: never;
-    /**
-     * 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.
-     */
-    onClick?: (arg0: {
-        isTipHidden: boolean;
-    }) => void;
-};
-type InfoTipPropsWithAriaLabelledby = TipBaseProps & {
-    alignment?: TipBaseAlignment;
-    ariaLabel?: never;
-    /**
-     * ID of an element that labels the InfoTip button.
-     */
-    ariaLabelledby?: string;
-    /**
-     * 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.
@@ -40,6 +10,4 @@ type InfoTipPropsWithAriaLabelledby = TipBaseProps & {
         isTipHidden: boolean;
     }) => void;
 };
-export type InfoTipProps = InfoTipPropsWithAriaLabel | InfoTipPropsWithAriaLabelledby;
 export declare const InfoTip: React.FC<InfoTipProps>;
-export {};

package/dist/Tip/InfoTip/index.js

@@ -1,17 +1,19 @@
 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 { isFloatingElementOpen } from '../shared/utils';
+import { isElementVisible } from '../shared/utils';
+import { ScreenreaderNavigableText } from './elements';
 import { InfoTipButton } from './InfoTipButton';
-import { jsx as _jsx } from "react/jsx-runtime";
+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
 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,
@@ -20,14 +22,25 @@ 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) {
@@ -38,10 +51,24 @@ 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));
@@ -52,7 +79,10 @@ export const InfoTip = ({
   const clickHandler = useCallback(() => {
     const currentTipState = !isTipHidden;
     setTipIsHidden(currentTipState);
-  }, [isTipHidden, setTipIsHidden]);
+    if (!currentTipState) {
+      clearAndSetTimeout(announceTimeoutRef, () => setShouldAnnounce(true), 0);
+    }
+  }, [isTipHidden, setTipIsHidden, clearAndSetTimeout]);
   useLayoutEffect(() => {
     if (isInitialMount.current) {
       isInitialMount.current = false;
@@ -78,14 +108,7 @@ export const InfoTip = ({
     const handleGlobalEscapeKey = e => {
       if (e.key !== 'Escape') return;
       const openModals = document.querySelectorAll(MODAL_SELECTOR);
-      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);
-      });
+      const hasUnrelatedModal = Array.from(openModals).some(modal => isElementVisible(modal) && wrapperRef.current && !modal.contains(wrapperRef.current));
       if (hasUnrelatedModal) return;
       e.preventDefault();
       e.stopPropagation();
@@ -97,18 +120,7 @@ export const InfoTip = ({
       const handleTabKeyInPopover = event => {
         if (event.key !== 'Tab' || event.shiftKey) return;
         const focusableElements = getFocusableElements();
-        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;
-        }
+        if (focusableElements.length === 0) return;
         const lastElement = focusableElements[focusableElements.length - 1];
 
         // Only wrap forward: if on last element, wrap to button
@@ -129,35 +141,45 @@ export const InfoTip = ({
       };
     }
     return () => document.removeEventListener('keydown', handleGlobalEscapeKey, true);
-  }, [isTipHidden, isFloating, getFocusableElements, setTipIsHidden]);
-  useEffect(() => {
-    if (isTipHidden) return;
-    const timeoutId = setTimeout(() => {
-      popoverContentNodeRef.current?.focus();
-    }, 0);
-    return () => clearTimeout(timeoutId);
-  }, [isTipHidden]);
+  }, [isTipHidden, isFloating, setTipIsHidden, getFocusableElements]);
   const Tip = loaded && isFloating ? FloatingTip : InlineTip;
   const tipProps = useMemo(() => ({
     alignment,
     info,
     isTipHidden,
-    contentRef: popoverContentRef,
     wrapperRef,
+    ...(isFloating && {
+      popoverContentRef
+    }),
     ...rest
-  }), [alignment, info, isTipHidden, popoverContentRef, wrapperRef, 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.
+   */
   return /*#__PURE__*/_jsx(Tip, {
     ...tipProps,
     type: "info",
-    children: /*#__PURE__*/_jsx(InfoTipButton, {
-      active: !isTipHidden,
-      "aria-expanded": !isTipHidden,
-      "aria-label": ariaLabel,
-      "aria-labelledby": ariaLabelledby,
-      "aria-roledescription": ariaRoleDescription,
-      emphasis: emphasis,
-      ref: buttonRef,
-      onClick: clickHandler
+    children: isFloating && alignment.includes('top') ? /*#__PURE__*/_jsxs(_Fragment, {
+      children: [screenreaderText, button]
+    }) : /*#__PURE__*/_jsxs(_Fragment, {
+      children: [button, screenreaderText]
     })
   });
 };

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

@@ -2,9 +2,10 @@
 /// <reference types="testing-library__jest-dom" />
 import { setupRtl } from '@codecademy/gamut-tests';
 import { RefObject } from 'react';
-import { InfoTip } from '../InfoTip';
+import { InfoTip, InfoTipProps } 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;
 };
@@ -15,7 +16,7 @@ type InfoParam = {
     info: string;
 };
 type PlacementParam = {
-    placement: TipPlacements;
+    placement: Placement;
 };
 export declare const createFocusOnClick: (ref: RefObject<HTMLDivElement>) => ({ isTipHidden }: {
     isTipHidden: boolean;
@@ -47,10 +48,13 @@ 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 testFocusWrap: ({ view, direction, }: ViewParam & {
+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>;
     direction: 'forward' | 'backward';
 }) => Promise<void>;
-export declare const testTabFromPopoverWithNoInteractiveElements: (view: InfoTipView) => Promise<void>;
+export declare const getTipContent: (view: InfoTipView, text: string, useQuery?: boolean) => HTMLElement;
 export declare const testTabbingBetweenLinks: ({ view, firstLinkText, secondLinkText, placement, }: ViewParam & {
     firstLinkText: string;
     secondLinkText: string;
@@ -58,6 +62,7 @@ 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;
@@ -81,12 +86,28 @@ 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,
-  contentRef,
+  popoverContentRef,
   truncateLines,
   type,
   username,
@@ -123,7 +123,7 @@ export const FloatingTip = ({
       width: inheritDims ? 'inherit' : undefined,
       onBlur: toolOnlyEventFunc,
       onFocus: toolOnlyEventFunc,
-      onKeyDown: escapeKeyPressHandler,
+      onKeyDown: escapeKeyPressHandler ? e => escapeKeyPressHandler(e) : undefined,
       onMouseDown: e => e.preventDefault(),
       onMouseEnter: toolOnlyEventFunc,
       children: children
@@ -134,7 +134,7 @@ export const FloatingTip = ({
       horizontalOffset: offset,
       isOpen: isPopoverOpen,
       outline: true,
-      popoverContainerRef: contentRef,
+      popoverContainerRef: popoverContentRef,
       skipFocusTrap: true,
       targetRef: ref,
       variant: "secondary",

package/dist/Tip/shared/InlineTip.js

@@ -17,7 +17,6 @@ export const InlineTip = ({
   loading,
   narrow,
   overline,
-  contentRef,
   truncateLines,
   type,
   username,
@@ -43,7 +42,7 @@ export const InlineTip = ({
     height: inheritDims ? 'inherit' : undefined,
     ref: wrapperRef,
     width: inheritDims ? 'inherit' : undefined,
-    onKeyDown: escapeKeyPressHandler,
+    onKeyDown: escapeKeyPressHandler ? e => escapeKeyPressHandler(e) : undefined,
     children: children
   });
   const tipBody = /*#__PURE__*/_jsx(InlineTipBodyWrapper, {
@@ -56,9 +55,7 @@ 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;
-    contentRef?: React.RefObject<HTMLDivElement> | ((node: HTMLDivElement | null) => void);
+    popoverContentRef?: 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,22 +6,3 @@ 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;

package/dist/Tip/shared/utils.js

@@ -15,108 +15,4 @@ export const escapeKeyPressHandler = event => {
 export const isElementVisible = element => {
   if (!(element instanceof HTMLElement)) return false;
   return element.checkVisibility?.() ?? true;
-};
-
-/**
- * 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 const isFloatingElementOpen = element => {
-  if (!isElementVisible(element)) return false;
-
-  /**
-   * Native <dialog> elements are always blocking when open.
-   * Per HTML spec, dialog elements with the open attribute are modal.
-   */
-  if (element instanceof HTMLDialogElement) {
-    return element.open === true;
-  }
-
-  /**
-   * Elements with role="dialog" or role="alertdialog".
-   * Per ARIA spec, role="alertdialog" is always modal (blocking).
-   * role="dialog" requires aria-modal="true" to be blocking.
-   */
-  const role = element.getAttribute('role');
-  if (role !== 'dialog' && role !== 'alertdialog') {
-    return false;
-  }
-
-  /**
-   * Cache attribute values to avoid multiple DOM reads.
-   * Check aria-hidden first as it's a common exclusion case.
-   */
-  const ariaHidden = element.getAttribute('aria-hidden');
-  if (ariaHidden === 'true') {
-    return false;
-  }
-
-  /**
-   * Check for collapsible dialogs (like help menus).
-   * If aria-expanded exists and is false, the dialog is closed.
-   * These dialogs stay in DOM but are collapsed when closed.
-   */
-  const ariaExpanded = element.getAttribute('aria-expanded');
-  if (ariaExpanded === 'false') {
-    return false;
-  }
-
-  /**
-   * Per ARIA spec, role="alertdialog" is always modal (blocking).
-   * At this point, we've already verified:
-   * - The element is visible (not hidden via CSS)
-   * - It's not aria-hidden="true"
-   * - It's not aria-expanded="false"
-   * So if it's an alertdialog, it's open and blocking.
-   * Handle alertdialog here to avoid expensive DOM queries for dialog elements.
-   */
-  if (role === 'alertdialog') {
-    return true;
-  }
-
-  /**
-   * For role="dialog", check if any child button with aria-expanded indicates the dialog is closed.
-   * Some dialogs use a toggle button pattern where the button's aria-expanded
-   * reflects the dialog's state.
-   * Only perform this expensive querySelector operation after all other checks pass.
-   */
-  const toggleButton = element.querySelector('button[aria-expanded], [role="button"][aria-expanded]');
-  if (toggleButton && toggleButton.getAttribute('aria-expanded') === 'false') {
-    return false;
-  }
-
-  /**
-   * For role="dialog", check aria-modal attribute.
-   * aria-modal="true" indicates a blocking modal (Modal, Dialog).
-   * aria-modal="false" or absence indicates non-blocking.
-   */
-  const ariaModal = element.getAttribute('aria-modal');
-  if (ariaModal === 'true') {
-    return true;
-  }
-  if (ariaModal === 'false') {
-    // Explicitly non-modal, should not block
-    return false;
-  }
-
-  /**
-   * Elements with role="dialog" but without aria-modal="true" are non-blocking.
-   * These include collapsible dialogs (help menus) and popovers (Popover, InfoTip, Tooltip)
-   * that use role="dialog". They should not prevent InfoTip from closing.
-   */
-  return false;
 };