@astryxdesign/core 0.6.2 → 0.6.3-canary.039a67e

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astryxdesign/core",
-  "version": "0.6.2",
+  "version": "0.6.3-canary.039a67e",
   "displayName": "Astryx Core",
   "description": "The component library. Accessible, themeable React components with built-in spacing, dark mode, and StyleX styling.",
   "author": "Meta Open Source",
@@ -539,6 +539,11 @@
       "types": "./dist/TimeInput/index.d.ts",
       "default": "./dist/TimeInput/index.js"
     },
+    "./Timer": {
+      "source": "./src/Timer/index.ts",
+      "types": "./dist/Timer/index.d.ts",
+      "default": "./dist/Timer/index.js"
+    },
     "./Timestamp": {
       "source": "./src/Timestamp/index.ts",
       "types": "./dist/Timestamp/index.d.ts",
@@ -619,6 +624,16 @@
       "types": "./dist/utils/index.d.ts",
       "default": "./dist/utils/index.js"
     },
+    "./Markdown/plugins": {
+      "source": "./src/Markdown/plugins/index.ts",
+      "types": "./dist/Markdown/plugins/index.d.ts",
+      "default": "./dist/Markdown/plugins/index.js"
+    },
+    "./Markdown/parser": {
+      "source": "./src/Markdown/parser/index.ts",
+      "types": "./dist/Markdown/parser/index.d.ts",
+      "default": "./dist/Markdown/parser/index.js"
+    },
     "./Calendar/utils": {
       "source": "./src/Calendar/utils.ts",
       "types": "./dist/Calendar/utils.d.ts",
@@ -653,6 +668,11 @@
       "source": "./src/Typeahead/utils.ts",
       "types": "./dist/Typeahead/utils.d.ts",
       "default": "./dist/Typeahead/utils.js"
+    },
+    "./Markdown/remark": {
+      "source": "./src/Markdown/remark.ts",
+      "types": "./dist/Markdown/remark.d.ts",
+      "default": "./dist/Markdown/remark.js"
     }
   },
   "files": [
@@ -672,6 +692,8 @@
     "react-dom": ">=19.0.0"
   },
   "devDependencies": {
+    "@astryxdesign/a11y-spec": "0.6.3-canary.039a67e",
+    "@astryxdesign/cli": "0.6.3-canary.039a67e",
     "@babel/cli": "^7.29.7",
     "@babel/core": "^7.29.7",
     "@babel/preset-react": "^7.29.7",
@@ -681,9 +703,7 @@
     "@testing-library/dom": "^10.0.0",
     "@testing-library/jest-dom": "^6.6.0",
     "@testing-library/react": "^16.3.2",
-    "@types/babel__core": "^7.20.5",
-    "@astryxdesign/a11y-spec": "0.0.0",
-    "@astryxdesign/cli": "0.6.2"
+    "@types/babel__core": "^7.20.5"
   },
   "dependencies": {
     "intl-messageformat": "^11.2.9"

package/src/Avatar/Avatar.doc.mjs

@@ -23,7 +23,7 @@ export const docs = {
     ],
     anatomy: [
       {name: 'Photo', required: false, description: 'The profile image, loaded from the src URL. Shown when available.'},
-      {name: 'Initials', required: false, description: 'One or two letters extracted from the name. Shown when no photo is available.'},
+      {name: 'Initials', required: false, description: 'The first letter, digit or emoji of the first and last words of the name; punctuation is skipped. Shown when no photo is available. A name with no letters, digits or emoji shows the default icon instead.'},
       {name: 'Default icon', required: false, description: 'A generic person silhouette. Shown when there is no photo or name.'},
       {name: 'Status dot', required: false, description: 'A small indicator in the bottom-right corner showing availability (online, away, busy). Each variant pairs colour with a distinct shape so status does not rely on colour alone.'},
     ],

package/src/Avatar/Avatar.test.tsx

@@ -103,6 +103,36 @@ describe('Avatar', () => {
     expect(screen.getByTestId('avatar')).toHaveTextContent('👨‍👩‍👧‍👦A');
   });
 
+  describe('initials come from letters, digits and emoji, not punctuation', () => {
+    it.each([
+      ['Northwind Workbench (automation)', 'NA'],
+      ['Ada "The Countess" Lovelace', 'AL'],
+      ['“Ada” Lovelace', 'AL'],
+      ['Ada - Lovelace', 'AL'],
+      ['Ada Lovelace —', 'AL'],
+      ['Mary-Jane Watson', 'MW'],
+      ['(Ada)', 'A'],
+      ['Alice', 'A'],
+      ['R2 D2', 'RD'],
+      ['3M', '3'],
+      ['émile zola', 'ÉZ'],
+      ['😀 Ada', '😀A'],
+      ['Ada (😀)', 'A😀'],
+    ])('%s renders %s', (name, expected) => {
+      render(<Avatar name={name} data-testid="avatar" />);
+      expect(screen.getByTestId('avatar').textContent).toBe(expected);
+    });
+
+    it('falls through to the default icon when no word yields an initial', () => {
+      render(<Avatar name="- ()" data-testid="a" />);
+      const el = screen.getByTestId('a');
+      expect(el.querySelector('svg')).not.toBeNull();
+      expect(el).toHaveTextContent('');
+      // The name still names the avatar.
+      expect(screen.getByRole('img', {name: '- ()'})).toBeInTheDocument();
+    });
+  });
+
   it('retries a new src after a previous src failed to load', () => {
     const {rerender} = render(
       <Avatar name="Ada" src="https://example.com/broken.jpg" />,

package/src/Avatar/Avatar.tsx

@@ -384,25 +384,46 @@ export interface AvatarProps extends BaseProps<HTMLDivElement> {
 }
 
 /**
- * Generates initials from a name string.
- * Takes the first letter of the first two words.
+ * A character that can stand for a word in initials: a letter, a digit, or an
+ * emoji. Punctuation and other symbols, such as `(`, `"` or `-`, cannot.
+ */
+const INITIAL_CHARACTER =
+  /[\p{L}\p{N}\p{Extended_Pictographic}\p{Regional_Indicator}]/u;
+
+/**
+ * The first character of a word that can stand for it in initials, skipping
+ * leading punctuation, or '' when the word has none (a lone `-` or `()`).
+ */
+function initialCharacter(word: string): string {
+  const index = word.search(INITIAL_CHARACTER);
+  return index === -1 ? '' : firstCharacter(word.slice(index));
+}
+
+/**
+ * Generates initials from a name string: the first letter, digit or emoji of
+ * the first and last words. Words with none of those, such as a lone `-`, are
+ * skipped, and leading punctuation within a word is ignored. Returns '' when
+ * no word yields an initial.
  * @example
  * ```
- * getInitials('John Doe')
- * getInitials('Alice')
+ * getInitials('John Doe') // 'JD'
+ * getInitials('Alice') // 'A'
+ * getInitials('Northwind Workbench (automation)') // 'NA'
  * ```
  */
 function getInitials(name: string): string {
-  const words = name.trim().split(/\s+/);
-  if (words.length === 0) {
+  const initials = name
+    .trim()
+    .split(/\s+/)
+    .map(initialCharacter)
+    .filter(initial => initial !== '');
+  if (initials.length === 0) {
     return '';
   }
-  if (words.length === 1) {
-    return firstCharacter(words[0]).toUpperCase();
+  if (initials.length === 1) {
+    return initials[0].toUpperCase();
   }
-  return (
-    firstCharacter(words[0]) + firstCharacter(words[words.length - 1])
-  ).toUpperCase();
+  return (initials[0] + initials[initials.length - 1]).toUpperCase();
 }
 
 /**
@@ -554,8 +575,11 @@ export function Avatar({
   // truthy), leaving an empty plate behind a blank accessible name.
   const meaningfulName = meaningful(name);
   const meaningfulAlt = meaningful(alt);
-  const showInitials = !showImage && !showFallbackImage && meaningfulName;
-  const showIcon = !showImage && !showFallbackImage && !meaningfulName;
+  // A name made only of punctuation ("—", "()") still names the avatar, but
+  // yields no initials; it falls back to the default icon, not an empty plate.
+  const initials = meaningfulName ? getInitials(meaningfulName) : '';
+  const showInitials = !showImage && !showFallbackImage && initials !== '';
+  const showIcon = !showImage && !showFallbackImage && initials === '';
 
   // A meaningful accessible name comes from `alt`/`name`, composed with the
   // status element's `label` when one is present ("Jane Doe, Online") — the
@@ -753,7 +777,7 @@ export function Avatar({
                 dynamicStyles.fontSize(numericSize),
               ),
             )}>
-            {getInitials(meaningfulName)}
+            {initials}
           </div>
         )}
         {showIcon && (

package/src/BottomSheet/BottomSheet.doc.mjs

@@ -1,5 +1,12 @@
 // Copyright (c) Meta Platforms, Inc. and affiliates.
 
+/**
+ * @file BottomSheet.doc.mjs
+ * @input BottomSheet props, sheet anatomy, and focus-time keyboard scrolling behavior
+ * @output Consumer documentation and examples for BottomSheet
+ * @position CLI and rendered component documentation
+ */
+
 /** @type {import('@astryxdesign/cli/authoring').ComponentAnatomyElement[]} */
 const anatomy = [
   {
@@ -130,7 +137,7 @@ export const docs = {
       name: 'children',
       type: 'ReactNode',
       description:
-        "Sheet content, rendered below the grab handle in a scrollable area. If it includes a text-entry control that can bring up the mobile keyboard, use height='tall' and keep the sheet fully expanded while editing.",
+        "Sheet content in a scrollable area. The named body is keyboard reachable while overflowing. Forward Tab entry may move directly to the first native link or button; input controls, composite widgets, and nested scroll areas retain the body stop. Shift+Tab from a delegated first child skips the body. Fitting content adds no body stop. The internal observed content box preserves block flow and percentage heights. If it includes a text-entry control that can bring up the mobile keyboard, use height='tall' and keep the sheet fully expanded while editing.",
       required: true,
     },
     {

package/src/BottomSheet/BottomSheet.spec.md

@@ -14,6 +14,9 @@ verified_by:
   [
     packages/core/src/BottomSheet/BottomSheet.test.tsx,
     packages/core/src/BottomSheet/BottomSheetPanel.test.tsx,
+    packages/core/src/BottomSheet/BottomSheetKeyboard.test.tsx,
+    packages/core/src/BottomSheet/__tests__/BottomSheetKeyboard.a11y.browser.spec.ts,
+    apps/storybook/stories/BottomSheet.stories.tsx,
     scripts/check-knowledge.mjs,
   ]
 modules: []
@@ -22,7 +25,7 @@ design_specs: []
 architecture:
   [architecture:component-theming-surface, architecture:layer-runtime]
 contributing: []
-system_specs: []
+system_specs: [spec:AST-025]
 ---
 
 # BottomSheet component contract
@@ -30,14 +33,15 @@ system_specs: []
 ## Intent
 
 BottomSheet presents caller-provided content in a panel that rises from the
-bottom edge. This draft records current consumer anatomy and theming reachability
-without changing runtime behavior, styling, targets, or public API.
+bottom edge. This draft records current consumer anatomy, keyboard-reachable
+scrolling, and theming reachability without changing public API.
 
 ## Compatibility and migration
 
 - Released default preserved: `yes`
-- Compatibility class: additive documentation only; runtime, DOM, styling,
-  targets, and public API remain unchanged
+- Compatibility class: additive internal content box and shared scroll behavior;
+  public props, defaults, targets, and caller child ordering inside the content box
+  remain unchanged
 - Controlled/uncontrolled behavior: unchanged
 - Migration decision: none
 
@@ -48,7 +52,8 @@ Consumer migration instructions belong in consumer docs and release notes.
 **Owns**
 
 - The visual Sheet panel and its current `bottom-sheet` target.
-- The scrolling Content area and decorative Handle inside the panel.
+- The scrolling Content area, its shared viewport/content-box integration, and
+  automatic keyboard-path selection.
 - Standalone sheet presentation, including its optional native-dialog Scrim.
 
 **Does not own / non-goals**
@@ -67,10 +72,11 @@ in `BottomSheet.doc.mjs`.
 
 ## Behavioral and layout contract
 
-| ID  | Candidate invariant                                                                                                                                                | Basis                           | Draft review state                                 |
-| --- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------------------------------- | -------------------------------------------------- |
-| FR1 | The current presented sheet contains one Sheet panel, one scrolling Content area, and one decorative Handle; a Scrim is present only in scrim-backed presentation. | Current source, docs, and tests | Verified current behavior; no new behavior decided |
-| FR2 | The Sheet panel carries `bottom-sheet`; Content area, Handle, and Scrim carry no BottomSheet public target.                                                        | Current source, docs, and tests | Verified current behavior; no target change        |
+| ID  | Candidate invariant                                                                                                                                                                                                                         | Basis                              | Draft review state                                 |
+| --- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------- | -------------------------------------------------- |
+| FR1 | The current presented sheet contains one Sheet panel, one scrolling Content area, and one decorative Handle; a Scrim is present only in scrim-backed presentation.                                                                          | Current source, docs, and tests    | Verified current behavior; no new behavior decided |
+| FR2 | The Sheet panel carries `bottom-sheet`; Content area, Handle, and Scrim carry no BottomSheet public target.                                                                                                                                 | Current source, docs, and tests    | Verified current behavior; no target change        |
+| FR3 | Content renders in one real observed content box. Effective overflow, containment, and keyboard access come from `useScrollableArea`; the named overflowing body delegates forward Tab entry to a safe first sequential native link/button. | `spec:AST-025`; issue #5207; tests | Focus-time prototype for owner review              |
 
 ### Allowed variation
 
@@ -96,8 +102,14 @@ in `BottomSheet.doc.mjs`.
 
 ## Accessibility contract
 
-This draft does not change or extend BottomSheet's existing dialog naming,
-focus, Handle, keyboard, or dismissal behavior.
+- **AR1 — Keyboard scroll path.** The named body is a tab stop while effectively
+  overflowing. On forward Tab entry, the shared hook may delegate to the first
+  sequential native link/button outside navigation-key-owning surfaces. It keeps
+  the body stop for excluded content and skips the body on reverse traversal
+  from the delegated first child.
+- **AR2 — Focus continuity.** Content, overflow, or eligibility changes MUST NOT
+  move focus. Pointer/programmatic body focus never delegates. A focused body
+  losing overflow remains programmatically focusable.
 
 ## Design relationships
 
@@ -143,18 +155,20 @@ a decision that they must remain unthemeable.
   mapping, and factual `none` dispositions.
 - `architecture:layer-runtime` owns the current native-dialog host distinction
   and records that sheets retain local scrim and swipe behavior.
+- `spec:AST-025` owns effective scroll measurement, overflow and containment,
+  automatic keyboard-owner selection, and focus continuity.
 - `family:overlay-dismissal` owns shared Escape and platform-close ordering and
   records BottomSheet's current local-only adoption gap. This anatomy backfill
   does not migrate that runtime behavior.
 
 ## Verification map
 
-| Contract            | Verification                                                              | Representative states                          | Mutation or failure expectation                                                                 | Audit section               |
-| ------------------- | ------------------------------------------------------------------------- | ---------------------------------------------- | ----------------------------------------------------------------------------------------------- | --------------------------- |
-| FR1                 | `BottomSheet.test.tsx` render, content, Handle, and scrim behavior suites | Modal, non-modal, and switcher presentations   | Removing a documented part fails existing content, structure, or dismissal assertions.          | `audit:BottomSheet/anatomy` |
-| FR2                 | Panel target assertion, source inspection, and theming target inventories | Sheet panel, Content area, Handle, and Scrim   | Removing the panel target or documenting an unshipped child target fails evidence or inventory. | `audit:BottomSheet/theming` |
-| Layout evidence     | `BottomSheetPanel.test.tsx`                                               | Floating Handle and scrolling Content area     | Reordering or merging the stable parts fails existing panel structure and style assertions.     | `audit:BottomSheet/anatomy` |
-| Theming anatomy map | `scripts/check-knowledge.mjs`                                             | Canonical anatomy and current target inventory | Missing, extra, prefixed, stale, or multiply assigned mappings fail repository validation.      | `audit:BottomSheet/theming` |
+| Contract            | Verification                                                                                       | Representative states                                                    | Mutation or failure expectation                                                                         | Audit section                     |
+| ------------------- | -------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------- | --------------------------------- |
+| FR1                 | `BottomSheet.test.tsx` render, content, Handle, and scrim behavior suites                          | Modal, non-modal, and switcher presentations                             | Removing a documented part fails existing content, structure, or dismissal assertions.                  | `audit:BottomSheet/anatomy`       |
+| FR2                 | Panel target assertion, source inspection, and theming target inventories                          | Sheet panel, Content area, Handle, and Scrim                             | Removing the panel target or documenting an unshipped child target fails evidence or inventory.         | `audit:BottomSheet/theming`       |
+| FR3, AR1–AR2        | `BottomSheetKeyboard.test.tsx`; `BottomSheetKeyboard.a11y.browser.spec.ts`; open Storybook stories | fitting/overflow, plain text, usable/unusable/dynamic descendants, focus | Missing/duplicate keyboard access, stale ownership, focus movement, or broken content-box layout fails. | `audit:BottomSheet/accessibility` |     | Layout evidence | `BottomSheetPanel.test.tsx` | Floating Handle and scrolling Content area | Reordering or merging the stable parts fails existing panel structure and style assertions. | `audit:BottomSheet/anatomy` |
+| Theming anatomy map | `scripts/check-knowledge.mjs`                                                                      | Canonical anatomy and current target inventory                           | Missing, extra, prefixed, stale, or multiply assigned mappings fail repository validation.              | `audit:BottomSheet/theming`       |
 
 Existing tests directly assert the Sheet panel target, Content area placement,
 Handle structure, and scrim behavior. Source and public target metadata confirm
@@ -162,8 +176,20 @@ that the other three parts have no public target.
 
 ## Decision log
 
-None. This draft records current facts and introduces no component-local design,
-API, theming, or layer-system decision.
+### DEC-1 — BottomSheet adopts automatic shared keyboard ownership
+
+**Reference:** `component:BottomSheet/DEC-1`
+**Decider:** cixzhang, 2026-09-13
+
+BottomSheet supplies its existing label to
+`keyboardAccess.owner="contentOrViewport"`. The shared hook keeps the overflowing
+body named and tabbable, delegating forward keyboard entry to a safe first native
+link/button. Pointer/programmatic focus and excluded content keep the body path. BottomSheet retains `stickyContainment="always"` because the
+body deliberately remains the sheet-local Sticky boundary.
+
+A real flow-root content box supplies the hook's observation seam while preserving
+representative margin, float, percentage-height, flex/grid-child, and hug-height
+behavior.
 
 ## Open questions
 

package/src/BottomSheet/BottomSheet.test.tsx

@@ -3,7 +3,7 @@
 /**
  * @file BottomSheet.test.tsx
  * @input Uses vitest, @testing-library/react, BottomSheet component
- * @output Unit tests for BottomSheet component behavior
+ * @output Unit tests for BottomSheet behavior and observed content anatomy
  * @position Core testing; validates BottomSheet.tsx implementation
  *
  * SYNC: When BottomSheet.tsx changes, update tests to match new behavior
@@ -290,7 +290,7 @@ describe('BottomSheet', () => {
     expect(onClick).toHaveBeenCalledTimes(1);
   });
 
-  it('keeps consumer content as the last scroll-body child', () => {
+  it('keeps consumer content first and last inside the observed content box', () => {
     render(
       <BottomSheet isOpen onOpenChange={() => {}} label="Filters">
         <div data-testid="consumer-content">Sheet content</div>
@@ -300,7 +300,10 @@ describe('BottomSheet', () => {
     const consumer = screen.getByTestId('consumer-content');
 
     expect(body.children).toHaveLength(1);
-    expect(body.lastElementChild).toBe(consumer);
+    const content = body.lastElementChild;
+    expect(content).toHaveAttribute('data-scroll-content');
+    expect(content?.lastElementChild).toBe(consumer);
+    expect(consumer.matches(':first-child')).toBe(true);
     expect(consumer.matches(':last-child')).toBe(true);
   });
 

package/src/BottomSheet/BottomSheet.tsx

@@ -4,7 +4,7 @@
 
 /**
  * @file BottomSheet.tsx
- * @input Uses React, StyleX, core hooks/utils, BottomSheetPanel, BottomSheetSwitcherContext
+ * @input Uses React, StyleX, core hooks/utils, named BottomSheetPanel, BottomSheetSwitcherContext
  * @output Exports BottomSheet component and BottomSheetProps
  * @position Public BottomSheet router plus private standalone/switcher hosts
  *
@@ -379,6 +379,7 @@ function StandaloneBottomSheet({
           ref={ref}
           state={panelState}
           height={height}
+          label={label}
           snapPoints={snapPoints}
           isSwipeDismissAllowed={purpose === 'info'}
           isPageScrollLocked={shouldPresent && hasScrim}
@@ -537,6 +538,7 @@ function SwitcherBottomSheetItem({
         ref={ref}
         state={panelState}
         height={height}
+        label={label}
         snapPoints={snapPoints}
         isSwipeDismissAllowed={purpose === 'info'}
         isPageScrollLocked={hasScrim}

package/src/BottomSheet/BottomSheetKeyboard.test.tsx

@@ -0,0 +1,195 @@
+// Copyright (c) Meta Platforms, Inc. and affiliates.
+
+/**
+ * @file BottomSheetKeyboard.test.tsx
+ * @input BottomSheetPanel, real shared scroll behavior, and explicit DOM geometry
+ * @output Regression coverage for viewport access, entry-time eligibility, and focus continuity
+ * @position BottomSheet integration tests; browser stories verify native key scrolling
+ */
+
+import {act, fireEvent, render, screen, waitFor} from '@testing-library/react';
+import {useState, type ReactNode} from 'react';
+import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
+import {BottomSheetPanel} from './BottomSheetPanel';
+
+function Fixture({children}: {children: ReactNode}) {
+  return (
+    <BottomSheetPanel
+      label="Reading details"
+      state={{kind: 'open', entering: false}}
+      height="capped"
+      onDismiss={() => {}}
+      onScrimOpacity={() => {}}>
+      {children}
+    </BottomSheetPanel>
+  );
+}
+
+function body() {
+  return screen.getByRole('group', {name: 'Reading details'});
+}
+
+async function measure(scrollHeight: number, scrollWidth = 300) {
+  const viewport = body();
+  // jsdom does not resolve the shared hook's dynamic StyleX CSS variable.
+  viewport.style.overflowY = 'auto';
+  viewport.style.overflowX = 'auto';
+  for (const [key, value] of Object.entries({
+    clientHeight: 100,
+    clientWidth: 300,
+    scrollHeight,
+    scrollWidth,
+  })) {
+    Object.defineProperty(viewport, key, {configurable: true, value});
+  }
+  fireEvent(window, new Event('resize'));
+  await waitFor(() => {
+    expect(viewport.dataset.scrollableBlock === 'true').toBe(
+      scrollHeight > 101,
+    );
+  });
+}
+
+beforeEach(() => {
+  // jsdom has no layout. Visibility-specific cases still use real computed
+  // style/hidden/inert checks; native layout is covered in Storybook.
+  vi.spyOn(HTMLElement.prototype, 'getClientRects').mockReturnValue([
+    new DOMRect(0, 0, 20, 20),
+  ] as unknown as DOMRectList);
+});
+
+afterEach(() => {
+  vi.restoreAllMocks();
+});
+
+describe('BottomSheet keyboard scrolling', () => {
+  it('adds a named body tab stop only while text-only content overflows', async () => {
+    render(<Fixture>Reading details body</Fixture>);
+    await measure(100);
+    expect(body()).not.toHaveAttribute('tabindex');
+    await measure(300);
+    expect(body()).toHaveAttribute('tabindex', '0');
+    expect(body()).toHaveStyle({overscrollBehaviorY: 'contain'});
+  });
+
+  it('preserves current body focus when overflow disappears', async () => {
+    render(<Fixture>Reading details body</Fixture>);
+    await measure(300);
+    act(() => body().focus());
+    await measure(100);
+    expect(body()).toHaveFocus();
+    expect(body()).toHaveAttribute('tabindex', '-1');
+    expect(body()).toHaveStyle({overscrollBehaviorY: 'auto'});
+  });
+
+  it('retains keyboard access to content that overflows only horizontally', async () => {
+    render(<Fixture>Wide reading content</Fixture>);
+    await measure(100, 600);
+    await waitFor(() =>
+      expect(body()).toHaveAttribute('data-scrollable-inline', 'true'),
+    );
+    expect(body()).toHaveAttribute('tabindex', '0');
+  });
+
+  it('keeps the named viewport available alongside focusable content', async () => {
+    render(
+      <Fixture>
+        <button type="button">Continue reading</button>
+      </Fixture>,
+    );
+    await measure(300);
+    expect(body()).toHaveAttribute('tabindex', '0');
+    act(() => screen.getByRole('button').focus());
+    expect(screen.getByRole('button')).toHaveFocus();
+  });
+
+  it.each([
+    <button type="button" key="disabled" disabled>
+      Unavailable
+    </button>,
+    <button type="button" key="hidden" hidden>
+      Hidden
+    </button>,
+    <button type="button" key="negative" tabIndex={-2}>
+      Programmatic only
+    </button>,
+    <button type="button" key="visibility" style={{visibility: 'hidden'}}>
+      Hidden by CSS
+    </button>,
+    <div key="inert" inert>
+      <button type="button">Inert</button>
+    </div>,
+    <fieldset key="fieldset" disabled>
+      <button type="button">Disabled by fieldset</button>
+    </fieldset>,
+  ])(
+    'ignores a descendant that cannot supply sequential keyboard access (%#)',
+    async child => {
+      render(<Fixture>{child}</Fixture>);
+      await measure(300);
+      expect(body()).toHaveAttribute('tabindex', '0');
+    },
+  );
+
+  it('does not move focus when a nested child changes', async () => {
+    let setHasControl: (value: boolean) => void = () => {};
+    function AsyncContent() {
+      const [hasControl, update] = useState(false);
+      setHasControl = update;
+      return hasControl ? (
+        <button type="button">Loaded action</button>
+      ) : (
+        <p>Loading text</p>
+      );
+    }
+    render(
+      <Fixture>
+        <AsyncContent />
+      </Fixture>,
+    );
+    await measure(300);
+    act(() => body().focus());
+    act(() => setHasControl(true));
+    expect(body()).toHaveAttribute('tabindex', '0');
+    expect(body()).toHaveFocus();
+    act(() => setHasControl(false));
+    await waitFor(() => expect(body()).toHaveAttribute('tabindex', '0'));
+  });
+
+  it('retains the viewport when an existing descendant becomes disabled', async () => {
+    render(
+      <Fixture>
+        <button type="button">Continue reading</button>
+      </Fixture>,
+    );
+    await measure(300);
+    screen.getByRole('button').setAttribute('disabled', '');
+    await waitFor(() => expect(body()).toHaveAttribute('tabindex', '0'));
+  });
+
+  it.each(['content', 'ancestor'])(
+    'retains the viewport when %s data attributes change child visibility',
+    async target => {
+      const {container} = render(
+        <Fixture>
+          <style>
+            {'[data-actions="hidden"] button { visibility: hidden; }'}
+          </style>
+          <div data-testid="conditional-content">
+            <button type="button">Conditional action</button>
+          </div>
+        </Fixture>,
+      );
+      await measure(300);
+      expect(body()).toHaveAttribute('tabindex', '0');
+      const owner =
+        target === 'content'
+          ? screen.getByTestId('conditional-content')
+          : container;
+      owner.setAttribute('data-actions', 'hidden');
+      await waitFor(() => expect(body()).toHaveAttribute('tabindex', '0'));
+      owner.removeAttribute('data-actions');
+      expect(body()).toHaveAttribute('tabindex', '0');
+    },
+  );
+});