@astryxdesign/core 0.5.0-canary.f4d494c → 0.5.0

package/src/Avatar/index.ts

@@ -5,7 +5,7 @@
 /**
  * @file index.ts
  * @input Imports Avatar component and types from Avatar.tsx, AvatarStatusDot from AvatarStatusDot.tsx
- * @output Exports Avatar, AvatarProps, AvatarSize, AvatarShape, resolveSize, AvatarStatusDot, AvatarStatusDotProps, AvatarStatusDotVariant
+ * @output Exports Avatar, AvatarProps, AvatarSize, AvatarStatusDot, AvatarStatusDotProps, AvatarStatusDotVariant
  * @position Component entry point; re-exported by /packages/core/src/index.ts
  *
  * SYNC: When modified, update this header and /packages/core/src/Avatar/Avatar.doc.mjs
@@ -38,7 +38,7 @@ export interface AvatarStatusDotVariantMap {
 }
 
 export {Avatar, resolveSize} from './Avatar';
-export type {AvatarProps, AvatarSize, AvatarShape} from './Avatar';
+export type {AvatarProps, AvatarSize} from './Avatar';
 export {AvatarStatusDot} from './AvatarStatusDot';
 export type {
   AvatarStatusDotProps,

package/src/AvatarGroup/AvatarGroup.doc.mjs

@@ -25,8 +25,8 @@ export const docs = {
   },
   theming: {
     targets: [
-      {className: 'astryx-avatar-group', visualProps: ['size', 'shape']},
-      {className: 'astryx-avatar-group-overflow', visualProps: ['size', 'shape']},
+      {className: 'astryx-avatar-group', visualProps: ['size']},
+      {className: 'astryx-avatar-group-overflow', visualProps: ['size']},
     ],
   },
   description: 'Stacked avatar display with overlapping layout and optional overflow indicator. Children are Avatar elements.',
@@ -52,12 +52,6 @@ export const docs = {
         "Size applied to all avatars via context. This wins over each child Avatar's own size prop, including when it is left at the default, so set the size here rather than on the children.",
       default: "'md'",
     },
-    {
-      name: 'shape',
-      type: "'circle' | 'rounded' | 'square'",
-      description: "Shape applied to all avatars via context, overriding each avatar's own shape prop. Also applied to AvatarGroupOverflow's \"+N\" indicator.",
-      default: "'circle'",
-    },
     {
       name: 'ref',
       type: 'React.Ref<HTMLDivElement>',

package/src/AvatarGroup/AvatarGroup.test.tsx

@@ -118,30 +118,6 @@ describe('AvatarGroupOverflow', () => {
     expect(overflow).toHaveAttribute('data-size', 'lg');
   });
 
-  it('applies the group shape to the overflow chip, matching its avatars', () => {
-    render(
-      <AvatarGroup shape="square">
-        <Avatar name="Alice" />
-        <AvatarGroupOverflow count={5} />
-      </AvatarGroup>,
-    );
-
-    const overflow = screen.getByLabelText('5 more');
-    expect(overflow).toHaveAttribute('data-shape', 'square');
-  });
-
-  it('defaults the overflow chip to circle shape with no explicit AvatarGroup shape', () => {
-    render(
-      <AvatarGroup>
-        <Avatar name="Alice" />
-        <AvatarGroupOverflow count={5} />
-      </AvatarGroup>,
-    );
-
-    const overflow = screen.getByLabelText('5 more');
-    expect(overflow).toHaveAttribute('data-shape', 'circle');
-  });
-
   it('renders as button when onClick is provided', () => {
     render(
       <AvatarGroup>

package/src/AvatarGroup/AvatarGroup.tsx

@@ -26,7 +26,7 @@
 
 import {useId, useMemo, useState, type ReactNode} from 'react';
 import type {BaseProps} from '../BaseProps';
-import {resolveSize, type AvatarShape, type AvatarSize} from '../Avatar';
+import {resolveSize, type AvatarSize} from '../Avatar';
 import * as stylex from '@stylexjs/stylex';
 import {mergeProps} from '../utils';
 import {composeEventHandlers} from '../utils/composeEventHandlers';
@@ -55,13 +55,6 @@ export interface AvatarGroupProps extends BaseProps<HTMLDivElement> {
    * @default 'md'
    */
   size?: AvatarSize;
-  /**
-   * Shape applied to all avatars via context, overriding each avatar's own
-   * `shape` prop so a group stays visually uniform. Also applied to the
-   * `AvatarGroupOverflow` "+N" indicator, so it matches the group.
-   * @default 'circle'
-   */
-  shape?: AvatarShape;
   /**
    * Test ID for integration testing.
    */
@@ -96,7 +89,6 @@ const styles = stylex.create({
 export function AvatarGroup({
   children,
   size = 'md',
-  shape = 'circle',
   'data-testid': testId,
   'aria-label': ariaLabelFromProps,
   'aria-describedby': ariaDescribedByFromProps,
@@ -114,8 +106,8 @@ export function AvatarGroup({
   const overlap = Math.round(numericSize * OVERLAP_RATIO);
 
   const contextValue = useMemo(
-    () => ({size, shape, overlap, numericSize}),
-    [size, shape, overlap, numericSize],
+    () => ({size, overlap, numericSize}),
+    [size, overlap, numericSize],
   );
 
   // The keyboard hint and roving tab stop only make sense once the group has
@@ -160,7 +152,7 @@ export function AvatarGroup({
         onKeyDown={composeEventHandlers(onKeyDown, handleKeyDown)}
         onFocus={composeEventHandlers(onFocus, handleFocus)}
         {...mergeProps(
-          themeProps('avatar-group', {size, shape}),
+          themeProps('avatar-group', {size}),
           stylex.props(styles.root, xstyle),
           className,
           style,

package/src/AvatarGroup/AvatarGroupContext.ts

@@ -9,18 +9,16 @@
  */
 
 import {createContext, use} from 'react';
-import type {AvatarShape, AvatarSize} from '../Avatar';
+import type {AvatarSize} from '../Avatar';
 
 export interface AvatarGroupContextValue {
   size: AvatarSize;
-  shape: AvatarShape;
   overlap: number;
   numericSize: number;
 }
 
-export const AvatarGroupContext = createContext<AvatarGroupContextValue | null>(
-  null,
-);
+export const AvatarGroupContext =
+  createContext<AvatarGroupContextValue | null>(null);
 AvatarGroupContext.displayName = 'AvatarGroupContext';
 
 export function useAvatarGroup(): AvatarGroupContextValue | null {

package/src/AvatarGroup/AvatarGroupOverflow.tsx

@@ -20,9 +20,9 @@ import {
   typographyVars,
   typeScaleVars,
   fontWeightVars,
+  radiusVars,
   spacingVars,
 } from '../theme/tokens.stylex';
-import {shapeStyles} from '../Avatar/Avatar';
 import {mergeProps} from '../utils';
 import {resolveSize} from '../Avatar';
 import {useAvatarGroup} from './AvatarGroupContext';
@@ -65,10 +65,7 @@ const styles = stylex.create({
     display: 'inline-flex',
     alignItems: 'center',
     justifyContent: 'center',
-    // Reads the shape variant's `--_avatar-radius` (set via `shapeStyles`,
-    // shared with Avatar) so the overflow indicator matches the group's
-    // shape instead of always staying a circle.
-    borderRadius: 'var(--_avatar-radius)',
+    borderRadius: radiusVars['--radius-full'],
     // Use opaque background to prevent avatar bleed-through
     backgroundColor: colorVars['--color-background-surface'],
     color: colorVars['--color-text-secondary'],
@@ -169,7 +166,6 @@ export function AvatarGroupOverflow({
   const t = useTranslator();
   const group = useAvatarGroup();
   const size = group?.size ?? 'md';
-  const shape = group?.shape ?? 'circle';
   const numericSize = group?.numericSize ?? resolveSize('md');
   const overlap = group?.overlap ?? 0;
 
@@ -190,7 +186,7 @@ export function AvatarGroupOverflow({
         aria-label={label}
         data-avatar-item=""
         {...mergeProps(
-          themeProps('avatar-group-overflow', {size, shape}),
+          themeProps('avatar-group-overflow', {size}),
           focusOutlineProps.focusVisible(
             styles.base,
             styles.button,
@@ -198,7 +194,6 @@ export function AvatarGroupOverflow({
             dynamicStyles.size(numericSize),
             dynamicStyles.fontSize(numericSize),
             dynamicStyles.overlap(-overlap),
-            shapeStyles[shape],
             xstyle,
           ),
           className,
@@ -215,14 +210,13 @@ export function AvatarGroupOverflow({
       {...rest}
       aria-label={label}
       {...mergeProps(
-        themeProps('avatar-group-overflow', {size, shape}),
+        themeProps('avatar-group-overflow', {size}),
         stylex.props(
           styles.base,
           styles.overlap,
           dynamicStyles.size(numericSize),
           dynamicStyles.fontSize(numericSize),
           dynamicStyles.overlap(-overlap),
-          shapeStyles[shape],
           xstyle,
         ),
         className,

package/src/DateInput/DateInput.doc.mjs

@@ -156,13 +156,6 @@ export const docs = {
         "How the committed date value is displayed. Named values are reused from Timestamp's format vocabulary: 'date' shows 'Mar 21, 2026', 'date_long' shows 'March 21, 2026', 'date_weekday' shows 'Wed, Mar 21, 2026', 'system_date' shows '2026-03-21'. A function receives the ISO value and returns a custom string. Applies only to the committed value, never to text being typed.",
       default: "'date_long'",
     },
-    {
-      name: 'nativePicker',
-      type: "'touch' | 'always' | 'never'",
-      description:
-        "Which surface draws the date picker. 'touch' (the default) hands a touch device to the browser/OS \u2014 the field becomes an input type=date and the platform draws the picker (the iOS wheel, the Android calendar dialog); 'always' does that wherever the browser supports input type=date; 'never' keeps Astryx's own pickers everywhere (the bottom-sheet picker on a finger, the calendar popover on a mouse). Use 'never' for a field that needs weekStartsOn, numberOfMonths or dateConstraints, none of which a native picker can express. format and placeholder still apply in native mode; min and max are forwarded, but a native picker may not show them (on iOS an out-of-range date can be selected and is refused on commit rather than greyed out).",
-      default: "'touch'",
-    },
     {
       name: 'width',
       type: 'SizeValue',
@@ -444,13 +437,6 @@ export const docsZh = {
         "已选日期的显示格式。命名值复用 Timestamp 的格式词汇：'date' 显示 'Mar 21, 2026'，'date_long' 显示 'March 21, 2026'，'date_weekday' 显示 'Wed, Mar 21, 2026'，'system_date' 显示 '2026-03-21'。函数接收 ISO 值并返回自定义字符串。仅作用于已提交的值，不影响正在输入的文本。",
       default: "'date_long'",
     },
-    {
-      name: 'nativePicker',
-      type: "'touch' | 'always' | 'never'",
-      description:
-        "由哪个界面绘制日期选择器。'touch'（默认）在触摸设备上交给浏览器/操作系统：字段变为 input type=date，由平台绘制选择器（iOS 滚轮、Android 日历对话框）；'always' 在所有支持 input type=date 的浏览器上都这样做；'never' 始终使用 Astryx 自带的选择器（触摸设备用底部弹出选择器，鼠标设备用日历弹出层）。需要 weekStartsOn、numberOfMonths 或 dateConstraints 的字段应使用 'never'，原生选择器无法表达这些。原生模式下 format 和 placeholder 仍然生效；min 和 max 会传递给原生控件，但原生选择器可能不会显示这些限制（在 iOS 上仍可选中超出范围的日期，会在提交时被拒绝，而不是变灰）。",
-      default: "'touch'",
-    },
     {
       name: 'xstyle',
       type: 'StyleXStyles',
@@ -551,8 +537,6 @@ export const docsDense = {
     weekStartsOn: 'first day of week in calendar (0=Sunday, or name e.g. "mon")',
     format:
       "committed-value display: 'date_long' (default, March 21, 2026), 'date' (Mar 21, 2026), 'date_weekday' (Wed, Mar 21, 2026), 'system_date' (2026-03-21), or (iso)=>string; reuses Timestamp vocabulary. Committed value only, not while typing.",
-    nativePicker:
-      "which surface draws the picker: 'touch' (default) = browser/OS on a coarse pointer, 'always', 'never' = Astryx's own everywhere. use 'never' for weekStartsOn/numberOfMonths/dateConstraints. format+placeholder still apply; min/max forwarded but not necessarily shown by the OS picker \u2014 refused on commit instead.",
     xstyle: 'StyleX styles for layout; must be stylex.create() value',
   },
 };

package/src/DateInput/DateInput.tsx

@@ -62,7 +62,6 @@ import {useInputStatusIcon} from '../hooks/useInputStatusIcon';
 import {useMediaQuery} from '../hooks/useMediaQuery';
 import {useResolvedRequired} from '../hooks/useResolvedRequired';
 import {usePopover} from '../Popover';
-import {NativeDateField} from './NativeDateField';
 import {TouchDateField} from './TouchDateField';
 import {useTooltip} from '../Tooltip';
 import {getInputARIA, isImeKeyEvent, parseDateInput} from '../utils';
@@ -151,17 +150,6 @@ export type DateInputSize = keyof typeof sizeStyles;
  * types stay in compile-time lockstep: renaming or removing one of these
  * members from `TimestampFormat` breaks this type at build time.
  */
-/**
- * When DateInput hands date picking to the browser/OS instead of its own
- * surfaces.
- *
- * - `'touch'`: native on touch devices (coarse pointer), Astryx's calendar
- *   popover on mouse-driven ones
- * - `'always'`: native wherever the browser supports `<input type="date">`
- * - `'never'`: Astryx's own pickers everywhere
- */
-export type DateInputNativePicker = 'touch' | 'always' | 'never';
-
 export type DateInputFormat = Extract<
   TimestampFormat,
   'date' | 'date_long' | 'date_weekday' | 'system_date'
@@ -373,40 +361,6 @@ export interface DateInputProps extends Omit<
    * ```
    */
   format?: DateInputFormat | ((value: ISODateString) => string);
-
-  /**
-   * When date picking is handed to the browser/OS instead of Astryx's own
-   * surfaces: the field becomes an `<input type="date">` and the platform
-   * draws the picker — the iOS wheel, the Android calendar dialog — with the
-   * OS's own hit areas, momentum scrolling, locale and accessibility
-   * settings.
-   *
-   * - `'touch'` (default): native on touch devices (coarse pointer), the text
-   *   field and calendar popover on mouse-driven ones
-   * - `'always'`: native wherever the browser supports `<input type="date">`
-   * - `'never'`: Astryx's own pickers everywhere — the touch picker on a
-   *   finger, the calendar popover on a mouse
-   *
-   * `format` and `placeholder` still apply in native mode: DateInput paints
-   * the closed field's text itself, over the control. `numberOfMonths` and
-   * `weekStartsOn` do not — they describe a calendar grid the native picker
-   * does not have — so a field that needs either should pass `'never'`.
-   *
-   * `min` and `max` are forwarded, but note that a native picker may not
-   * *show* them: on iOS they are constraint-validation flags rather than
-   * clamps, so an out-of-range date can be selected and is refused on commit
-   * (announced to assistive technology) rather than being greyed out in the
-   * picker. `dateConstraints` is enforced the same way, on commit, and is
-   * reason enough to prefer `'never'` on a field that uses it.
-   *
-   * @default 'touch'
-   * @example
-   * ```
-   * // Astryx's own touch picker instead of the platform's
-   * <DateInput label="Event date" value={date} onChange={setDate} nativePicker="never" />
-   * ```
-   */
-  nativePicker?: DateInputNativePicker;
 }
 
 /**
@@ -933,13 +887,7 @@ PointerDateField.displayName = 'PointerDateField';
  */
 export function DateInput(props: DateInputProps) {
   const isTouch = useMediaQuery(TOUCH_POINTER_QUERY);
-  const nativePicker = props.nativePicker ?? 'touch';
 
-  // The platform's picker, where the consumer asked for it — see the
-  // `nativePicker` prop for what that trades away.
-  if (nativePicker === 'always' || (nativePicker === 'touch' && isTouch)) {
-    return <NativeDateField {...props} />;
-  }
   return isTouch ? (
     <TouchDateField {...props} />
   ) : (

package/src/DateInput/DateInputTouch.test.tsx

@@ -219,11 +219,6 @@ function Controlled({
   return (
     <DateInput
       label="Event date"
-      // This suite is about Astryx's own touch surface, which is now opt-out:
-      // `nativePicker` defaults to 'touch', so a coarse pointer gets the
-      // platform's picker unless a field says otherwise. Tests that assert on
-      // the surface selection itself pass their own value over this.
-      nativePicker="never"
       {...DEFAULT_RANGE}
       {...props}
       value={value}
@@ -281,16 +276,6 @@ function weekdayRow(): HTMLElement {
 // ---------------------------------------------------------------------------
 
 describe('DateInput — surface selection', () => {
-  it('hands a touch device to the platform picker by default', () => {
-    // `nativePicker` defaults to 'touch': the OS draws the picker unless a
-    // field opts out. Everything else in this file passes 'never', so this is
-    // the one place the default itself is asserted.
-    stubMedia({pointer: 'coarse', width: 393});
-    render(<DateInput label="Event date" onChange={() => {}} />);
-    const input = document.querySelector('input');
-    expect(input).toHaveAttribute('type', 'date');
-  });
-
   it('switches on the pointer alone, so a tablet gets the picker too', () => {
     // `pointer` is the PRIMARY device, which is what makes it the whole test:
     // a touchscreen laptop reports `fine` (its trackpad) and keeps the
@@ -335,7 +320,7 @@ describe('DateInput — surface selection', () => {
     setViewport('desktop');
     const onChange = vi.fn();
     render(
-      <DateInput nativePicker="never" label="Event date" onChange={onChange} min={undefined} />,
+      <DateInput label="Event date" onChange={onChange} min={undefined} />,
     );
     fireEvent.change(field(), {target: {value: '2026-03-25'}});
     expect(onChange).toHaveBeenCalledWith('2026-03-25');
@@ -375,12 +360,12 @@ describe('DateInput — surface selection', () => {
 describe('DateInput — field parity', () => {
   it('shows a placeholder until a date is chosen, then the formatted value', () => {
     const {rerender} = render(
-      <DateInput nativePicker="never" label="Ship date" onChange={() => {}} />,
+      <DateInput label="Ship date" onChange={() => {}} />,
     );
     expect(field()).toHaveValue('');
     expect(field()).toHaveAttribute('placeholder', 'Select a date');
     rerender(
-      <DateInput nativePicker="never" label="Ship date" value="2026-03-21" onChange={() => {}} />,
+      <DateInput label="Ship date" value="2026-03-21" onChange={() => {}} />,
     );
     expect(field()).toHaveValue('March 21, 2026');
   });
@@ -388,7 +373,6 @@ describe('DateInput — field parity', () => {
   it('honors a named format', () => {
     render(
       <DateInput
-        nativePicker="never"
         label="Ship date"
         value="2026-03-21"
         format="system_date"
@@ -401,7 +385,6 @@ describe('DateInput — field parity', () => {
   it('honors a function format', () => {
     render(
       <DateInput
-        nativePicker="never"
         label="Ship date"
         value="2026-03-21"
         format={iso => `ISO:${iso}`}
@@ -414,7 +397,6 @@ describe('DateInput — field parity', () => {
   it('honors a custom placeholder', () => {
     render(
       <DateInput
-        nativePicker="never"
         label="Ship date"
         placeholder="Pick a day"
         onChange={() => {}}
@@ -427,7 +409,6 @@ describe('DateInput — field parity', () => {
     const onChange = vi.fn();
     render(
       <DateInput
-        nativePicker="never"
         label="Ship date"
         value="2026-03-21"
         hasClear
@@ -451,7 +432,6 @@ describe('DateInput — field parity', () => {
     try {
       render(
         <DateInput
-          nativePicker="never"
           label="Ship date"
           value="2026-03-21"
           hasClear
@@ -477,7 +457,7 @@ describe('DateInput — field parity', () => {
 
   it('does not open the picker until the field is tapped', () => {
     withLayout(() => {
-      render(<DateInput nativePicker="never" label="Ship date" onChange={() => {}} />);
+      render(<DateInput label="Ship date" onChange={() => {}} />);
       expect(field()).toHaveAttribute('aria-expanded', 'false');
       expect(screen.queryByRole('grid')).not.toBeInTheDocument();
       fireEvent.click(field());
@@ -495,7 +475,7 @@ describe('DateInput — field parity', () => {
   });
 
   it('is not openable while disabled', () => {
-    render(<DateInput nativePicker="never" label="Ship date" isDisabled onChange={() => {}} />);
+    render(<DateInput label="Ship date" isDisabled onChange={() => {}} />);
     expect(field()).toBeDisabled();
     fireEvent.click(field());
     expect(screen.queryByRole('grid')).not.toBeInTheDocument();
@@ -504,7 +484,6 @@ describe('DateInput — field parity', () => {
   it('stays focusable and explains itself when disabled with a reason', () => {
     render(
       <DateInput
-        nativePicker="never"
         label="Ship date"
         isDisabled
         disabledMessage="You need the Editor role"
@@ -521,7 +500,6 @@ describe('DateInput — field parity', () => {
   it('renders label, description and status through Field', () => {
     render(
       <DateInput
-        nativePicker="never"
         label="Ship date"
         description="When it leaves the warehouse"
         status={{type: 'error', message: 'Pick a date'}}
@@ -538,12 +516,12 @@ describe('DateInput — field parity', () => {
   });
 
   it('marks required for assistive technology', () => {
-    render(<DateInput nativePicker="never" label="Ship date" isRequired onChange={() => {}} />);
+    render(<DateInput label="Ship date" isRequired onChange={() => {}} />);
     expect(field()).toHaveAttribute('aria-required', 'true');
   });
 
   it('associates the label natively, so the field is named without ARIA', () => {
-    render(<DateInput nativePicker="never" label="Ship date" onChange={() => {}} />);
+    render(<DateInput label="Ship date" onChange={() => {}} />);
     expect(screen.getByLabelText('Ship date')).toBe(field());
   });
 
@@ -558,7 +536,6 @@ describe('DateInput — field parity', () => {
     withLayout(() => {
       render(
         <DateInput
-          nativePicker="never"
           label="Ship date"
           value="2026-03-10"
           min="2026-03-01"
@@ -581,7 +558,7 @@ describe('DateInput — field parity', () => {
   it('drops the Field wrapper inside an InputGroup', () => {
     render(
       <InputGroup label="Range">
-        <DateInput nativePicker="never" label="Start" onChange={() => {}} />
+        <DateInput label="Start" onChange={() => {}} />
       </InputGroup>,
     );
     // Named by the group label plus its own, the way core's inputs are.
@@ -666,7 +643,7 @@ describe('DateInput — calendar surface', () => {
   it('Save closes even with no date chosen, committing nothing', () => {
     const onChange = vi.fn();
     withLayout(() => {
-      render(<DateInput nativePicker="never" label="Ship date" onChange={onChange} />);
+      render(<DateInput label="Ship date" onChange={onChange} />);
       fireEvent.click(field());
       fireEvent.click(screen.getByRole('button', {name: 'Save'}));
     });

package/src/DateInput/index.ts

@@ -14,7 +14,6 @@ export type {
   DateInputProps,
   DateInputSize,
   DateInputFormat,
-  DateInputNativePicker,
   DateInputStatus,
   DateInputStatusType,
 } from './DateInput';

package/src/HoverCard/HoverCard.test.tsx

@@ -365,42 +365,7 @@ describe('HoverCard', () => {
     );
   });
 
-  it('advertises a dialog popup on the trigger when labelled', () => {
-    render(
-      <HoverCard content={<span>Card content</span>} label="Profile actions">
-        <button type="button">Trigger</button>
-      </HoverCard>,
-    );
-    const trigger = screen.getByRole('button', {name: 'Trigger'});
-    expect(trigger).toHaveAttribute('aria-haspopup', 'dialog');
-    // While closed, the layer is not in the DOM, so aria-controls must not
-    // point at a missing id (see DateInput). It is set once the card opens.
-    expect(trigger).not.toHaveAttribute('aria-controls');
-    expect(trigger).toHaveAttribute('aria-expanded', 'false');
-    expect(trigger).not.toHaveAttribute('aria-describedby');
-  });
-
-  it('merges existing popup attributes on the trigger when labelled', () => {
-    render(
-      <HoverCard content={<span>Card content</span>} label="Profile actions">
-        <button
-          type="button"
-          aria-haspopup="menu"
-          aria-controls="menu-id"
-          aria-expanded="true">
-          Trigger
-        </button>
-      </HoverCard>,
-    );
-    const trigger = screen.getByRole('button', {name: 'Trigger'});
-    // The hover card's dialog popup is advertised, but the trigger's own
-    // popup semantics are preserved rather than overwritten.
-    expect(trigger).toHaveAttribute('aria-haspopup', 'dialog');
-    expect(trigger.getAttribute('aria-controls')).toContain('menu-id');
-    expect(trigger).toHaveAttribute('aria-expanded', 'false');
-  });
-
-  it('keeps aria-describedby on the trigger when no label is provided', () => {
+  it('injects aria-describedby on trigger', () => {
     render(
       <HoverCard content={<span>Card content</span>}>
         <button type="button">Trigger</button>
@@ -408,10 +373,9 @@ describe('HoverCard', () => {
     );
     const trigger = screen.getByRole('button', {name: 'Trigger'});
     expect(trigger).toHaveAttribute('aria-describedby');
-    expect(trigger).not.toHaveAttribute('aria-haspopup');
   });
 
-  it('preserves existing aria-describedby when no label is provided', () => {
+  it('merges existing aria-describedby', () => {
     render(
       <HoverCard content={<span>Card content</span>}>
         <button type="button" aria-describedby="existing-id">
@@ -424,34 +388,6 @@ describe('HoverCard', () => {
     expect(describedBy).toContain('existing-id');
   });
 
-  it('updates aria-expanded when the labelled hover card opens and closes', async () => {
-    render(
-      <HoverCard
-        content={<span>Card content</span>}
-        label="Profile actions"
-        delay={0}>
-        <button type="button">Trigger</button>
-      </HoverCard>,
-    );
-    const trigger = screen.getByRole('button', {name: 'Trigger'});
-    expect(trigger).toHaveAttribute('aria-expanded', 'false');
-    expect(trigger).not.toHaveAttribute('aria-controls');
-
-    fireEvent.mouseEnter(trigger);
-    await waitFor(() => {
-      expect(trigger).toHaveAttribute('aria-expanded', 'true');
-      // The layer is in the DOM now, so aria-controls points at it.
-      expect(trigger).toHaveAttribute('aria-controls');
-    });
-
-    fireEvent.mouseLeave(trigger);
-    await waitFor(() => {
-      expect(trigger).toHaveAttribute('aria-expanded', 'false');
-      // The layer is gone from the DOM, so aria-controls is cleared.
-      expect(trigger).not.toHaveAttribute('aria-controls');
-    });
-  });
-
   it('calls onOpenChange(true) when shown', async () => {
     const onOpenChange = vi.fn();
     render(
@@ -493,32 +429,16 @@ describe('HoverCard', () => {
 
   it('supports text-only children with inline wrapper', () => {
     render(
-      <HoverCard content={<span>Card content</span>} label="Profile actions">
+      <HoverCard content={<span>Card content</span>}>
         Just text, no element
       </HoverCard>,
     );
     // Text should be rendered
     expect(screen.getByText('Just text, no element')).toBeInTheDocument();
-    // When labelled, the wrapper advertises a dialog popup.
-    const wrapper = screen.getByText('Just text, no element');
-    expect(wrapper.tagName).toBe('SPAN');
-    expect(wrapper).toHaveAttribute('aria-haspopup', 'dialog');
-    expect(wrapper).toHaveAttribute('aria-expanded', 'false');
-    // While closed, the layer is not in the DOM, so aria-controls is unset.
-    expect(wrapper).not.toHaveAttribute('aria-controls');
-    expect(wrapper).not.toHaveAttribute('aria-describedby');
-  });
-
-  it('keeps aria-describedby on text-only children when no label is provided', () => {
-    render(
-      <HoverCard content={<span>Card content</span>}>
-        Just text, no element
-      </HoverCard>,
-    );
+    // Should have aria-describedby on the wrapper span
     const wrapper = screen.getByText('Just text, no element');
     expect(wrapper.tagName).toBe('SPAN');
     expect(wrapper).toHaveAttribute('aria-describedby');
-    expect(wrapper).not.toHaveAttribute('aria-haspopup');
   });
 
   describe('isDefaultOpen', () => {