@astryxdesign/core 0.7.3-canary.b74cf21 → 0.7.3-canary.ca48bb7

package/src/BottomSheet/BottomSheet.test.tsx

@@ -498,6 +498,35 @@ describe('BottomSheet', () => {
     expect(dialog).toHaveStyle({'--_sheet-scrim-opacity': '1'});
   });
 
+  it('stays open when a file picker inside it is dismissed, and still closes on its own close request', () => {
+    // A file input fires a bubbling `cancel` at itself when its picker is
+    // dismissed. It reaches the <dialog> like a close request but is not one.
+    const onOpenChange = vi.fn();
+    render(
+      <BottomSheet
+        isOpen
+        purpose="form"
+        onOpenChange={onOpenChange}
+        label="Upload">
+        <input type="file" aria-label="Picture" />
+      </BottomSheet>,
+    );
+
+    const fromPicker = new Event('cancel', {bubbles: true, cancelable: true});
+    fireEvent(screen.getByLabelText('Picture'), fromPicker);
+
+    expect(onOpenChange).not.toHaveBeenCalled();
+    expect(fromPicker.defaultPrevented).toBe(false);
+
+    fireEvent(
+      screen.getByRole('dialog'),
+      new Event('cancel', {cancelable: true}),
+    );
+
+    expect(onOpenChange).toHaveBeenCalledTimes(1);
+    expect(onOpenChange).toHaveBeenCalledWith(false);
+  });
+
   it('keeps a standalone modal sheet presented through its exit animation', () => {
     render(<ExitHarness />);
     const dialog = screen.getByRole('dialog', {name: 'Filters'});

package/src/BottomSheet/BottomSheet.tsx

@@ -361,12 +361,16 @@ function StandaloneBottomSheet({
   });
 
   // The native `cancel` event is a close request the stack never saw a press
-  // for (Android back, the platform close watcher). Always preventDefault so
-  // the browser cannot close the controlled <dialog>, then answer with the
-  // stack's rules: only the top-most layer dismisses, and nothing dismisses
-  // during an IME composition.
+  // for (Android back, the platform close watcher). One that bubbles up from
+  // inside is not: a file input fires it when its picker is dismissed, so it is
+  // left alone. Otherwise always preventDefault so the browser cannot close the
+  // controlled <dialog>, then answer with the stack's rules: only the top-most
+  // layer dismisses, and nothing dismisses during an IME composition.
   const handleCancel = useCallback(
     (event: React.SyntheticEvent<HTMLDialogElement>) => {
+      if (event.target !== event.currentTarget) {
+        return;
+      }
       event.preventDefault();
       if (shouldDismissOnCloseRequest()) {
         dismissOnEscape();

package/src/BottomSheet/BottomSheetSwitcher.spec.md

@@ -3,17 +3,16 @@ schema_version: 3
 template_version: 4
 kind: component
 id: component:BottomSheetSwitcher
-authority: draft
+authority: current
 archive_reason: null
 superseded_by: null
-approved_by: null
-approved_at: null
+approved_by: imdreamrunner
+approved_at: 2026-10-21
 owners: [cixzhang]
 review_triggers: [public-api, behavior, layout, theming, accessibility]
 verified_by:
   [
     packages/core/src/BottomSheet/BottomSheetSwitcher.test.tsx,
-    packages/core/src/BottomSheet/__tests__/BottomSheetNativeModal.a11y.browser.spec.ts,
     apps/storybook/stories/BottomSheetSwitcher.stories.tsx,
     scripts/check-knowledge.mjs,
   ]
@@ -35,13 +34,10 @@ system_specs: [spec:AST-002, spec:AST-027]
 ## Intent
 
 BottomSheetSwitcher coordinates a mutually exclusive sequence of BottomSheet
-children. This draft records verified shipped and remediated behavior, and the
-hosting requirements its decision log decides — each child presented in its own
-native dialog — without adding a prop, changing a default, or settling the
-open modality, identifier, or theming decisions below. A row whose review state
-is "Owner decision" is the decided requirement, not shipped behavior; the
-representative states that name a sheet's own dialog, the retained dialog, or
-the flow wrapper describe DEC-1's decided structure in the same way.
+children, each presented in its own native dialog (DEC-1), without adding a
+prop or changing a default. Where the shipped switcher does not yet meet a
+requirement, the row carries a present-tense implementation gap note. The
+modality, identifier, and theming questions below stay open.
 
 ## Compatibility and migration
 
@@ -61,6 +57,8 @@ Consumer migration instructions belong in consumer docs and release notes.
 
 - The presentation lifecycle of every directly nested BottomSheet child's native
   dialog: which is presented, retained during a handoff, or closed.
+  Implementation gap: the switcher renders one dialog of its own and hosts
+  every child as a panel inside it; no child owns a dialog yet.
 - Which child sheet is active, retained during a handoff, or hidden.
 - Which sheet dialog hosts the flow (its ref, `id`, and dismissal
   registration) and which paints the flow's one scrim, plus
@@ -81,30 +79,27 @@ Consumer migration instructions belong in consumer docs and release notes.
 
 ## Public concepts
 
-| Concept             | Closed values or states                              | Meaning                                                                                                                                                                                                                     | Availability by variant/orientation/state                                      | Default                                | Owner                                                                     | Stability | Invalid-value behavior                                                                     |
-| ------------------- | ---------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------ | -------------------------------------- | ------------------------------------------------------------------------- | --------- | ------------------------------------------------------------------------------------------ |
-| Active sheet        | `null` or one nested BottomSheet `sheetId`           | Selects the only interactive child, or closes the flow                                                                                                                                                                      | All presentations                                                              | `null` is closed; the prop is required | `component:BottomSheetSwitcher`                                           | released  | A non-matching or duplicate id is not given a safe public fallback by the current contract |
-| Shared presentation | `true` / `false` through `hasScrim`                  | Selects the current modal scrim-backed host or non-modal no-scrim host                                                                                                                                                      | Entire flow                                                                    | `true`                                 | `component:BottomSheetSwitcher`                                           | released  | Boolean only                                                                               |
-| Child identity      | Non-empty `sheetId` on each direct BottomSheet child | Associates controlled selection, labeling, purpose, and transition state with a child                                                                                                                                       | Direct nested BottomSheet children                                             | none                                   | `component:BottomSheet`                                                   | released  | Empty ids warn and stay hidden; duplicate-id behavior is not specified                     |
-| Dismissal request   | `onActiveSheetChange(null)`                          | Reports an allowed implicit close without taking control from the caller                                                                                                                                                    | Escape/platform close, scrim click, or swipe according to active child purpose | none                                   | `component:BottomSheetSwitcher`; `family:overlay-dismissal` owns ordering | released  | The caller may retain its controlled value                                                 |
-| Dialog surface      | inherited dialog props plus `ref` and `onCancel`     | Dialog props and handlers, `onCancel` included, reach every sheet dialog; `ref`, `id`, and `data-testid` resolve to the host dialog, which is never null for an object ref while a sheet is mounted (owner decision, DEC-2) | Entire flow                                                                    | none                                   | `component:BottomSheetSwitcher`                                           | released  | Component-owned semantics and handlers retain precedence                                   |
+| Concept             | Closed values or states                              | Meaning                                                                                                                                                                                                                                                                                                                     | Availability by variant/orientation/state                                      | Default                                | Owner                                                                     | Stability | Invalid-value behavior                                                                     |
+| ------------------- | ---------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------ | -------------------------------------- | ------------------------------------------------------------------------- | --------- | ------------------------------------------------------------------------------------------ |
+| Active sheet        | `null` or one nested BottomSheet `sheetId`           | Selects the only interactive child, or closes the flow                                                                                                                                                                                                                                                                      | All presentations                                                              | `null` is closed; the prop is required | `component:BottomSheetSwitcher`                                           | released  | A non-matching or duplicate id is not given a safe public fallback by the current contract |
+| Shared presentation | `true` / `false` through `hasScrim`                  | Selects the current modal scrim-backed host or non-modal no-scrim host                                                                                                                                                                                                                                                      | Entire flow                                                                    | `true`                                 | `component:BottomSheetSwitcher`                                           | released  | Boolean only                                                                               |
+| Child identity      | Non-empty `sheetId` on each direct BottomSheet child | Associates controlled selection, labeling, purpose, and transition state with a child                                                                                                                                                                                                                                       | Direct nested BottomSheet children                                             | none                                   | `component:BottomSheet`                                                   | released  | Empty ids warn and stay hidden; duplicate-id behavior is not specified                     |
+| Dismissal request   | `onActiveSheetChange(null)`                          | Reports an allowed implicit close without taking control from the caller                                                                                                                                                                                                                                                    | Escape/platform close, scrim click, or swipe according to active child purpose | none                                   | `component:BottomSheetSwitcher`; `family:overlay-dismissal` owns ordering | released  | The caller may retain its controlled value                                                 |
+| Dialog surface      | inherited dialog props plus `ref` and `onCancel`     | Dialog props and handlers, `onCancel` included, reach every sheet dialog; `ref`, `id`, and `data-testid` resolve to the host dialog, which is never null for an object ref while a sheet is mounted (DEC-2). Implementation gap: every dialog prop, `ref`, `id`, and `data-testid` reaches the switcher's one shared dialog | Entire flow                                                                    | none                                   | `component:BottomSheetSwitcher`                                           | released  | Component-owned semantics and handlers retain precedence                                   |
 
 ## Behavioral and layout contract
 
-Draft requirements identify their basis so observed code is not mistaken for an
-intentional decision. This draft cannot clear the gaps it records.
-
-| ID  | Candidate invariant                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | Basis                                                    | Draft review state                                                                                                                                                                       |
-| --- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| FR1 | Zero or one child sheet is interactive for each controlled `activeSheet` value; all other children are hidden or retained inert and `aria-hidden` during a transition.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | Current source, docs, and tests                          | Verified shipped behavior                                                                                                                                                                |
-| FR2 | Each child sheet owns one native dialog. Opening a sheet presents its dialog once; a handoff presents the entering sheet's dialog above the retained one and closes the retained dialog only after its panel has faded. Returning to a sheet whose dialog is still open beneath a newer one re-presents it so the interactive sheet is the topmost layer.                                                                                                                                                                                                                                                                                                                                                                                               | DEC-1                                                    | Owner decision                                                                                                                                                                           |
-| FR3 | During a handoff, the entering sheet is above the retained sheet. A taller retained sheet aligns down to a shorter entering sheet, and the retained sheet fades only after required transform motion completes.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | Current source and transition tests                      | Verified shipped behavior; exact visual treatment remains human-reviewed                                                                                                                 |
-| FR4 | Closing retains the outgoing sheet through its exit, then closes the dialog. A modal flow restores focus to the element captured when that modal flow opened.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | Current source and focus tests                           | Verified shipped behavior                                                                                                                                                                |
-| FR5 | `hasScrim=true` uses `showModal()`, a native backdrop, and native focus containment, and locks page scroll: the page does not scroll while a modal flow is presented; the lock is held continuously across a handoff, never released and re-acquired between steps; it still holds beneath a `Dialog` opened from a step; it is released after the flow's exit (owner decision, DEC-1). `hasScrim=false` uses `show()` without a backdrop or scroll lock and leaves the page interactive (verified current behavior). In a non-modal flow the sheet dialogs order themselves with local values inside the switcher's isolated flow wrapper (owner decision, DEC-1); the page-level value that wrapper carries remains a `spec:AST-027` conformance gap. | DEC-1; `spec:AST-027` FR2, FR4, FR8                      | Modal host and the wrapper's local ordering: owner decision. Non-modal `show()` host: verified current behavior. The wrapper's page-level value remains a `spec:AST-027` conformance gap |
-| FR6 | The active child purpose governs implicit dismissal: `info` allows Escape, scrim click, and swipe; `form` allows Escape; `required` blocks all three and exposes `alertdialog`.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | Current BottomSheet docs and switcher tests              | Verified shipped behavior                                                                                                                                                                |
-| FR7 | While visible, the switcher participates in `family:overlay-dismissal`; one Escape or platform close request reaches only the topmost present layer, and descendants receive a deeper logical layer scope.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | `family:overlay-dismissal` and the audit regression test | Settled remediation in this audit                                                                                                                                                        |
-| FR8 | One backdrop paints the flow's scrim at a time: the retained sheet's dialog keeps it through a handoff and the entering dialog takes it over without a fade when the retained dialog closes. A stale gesture from an outgoing sheet cannot change the flow's scrim, and unmounting a retained sheet cannot keep its dialog open or the flow's modal layer held.                                                                                                                                                                                                                                                                                                                                                                                         | DEC-1; current tests                                     | Owner decision                                                                                                                                                                           |
-| FR9 | The switcher forwards neutral dialog attributes, styling inputs, and composed handlers, `onCancel` included, to every sheet dialog, so a handler fires for whichever sheet dialog raises the event; renders `id` and `data-testid` on the host dialog only, so each appears once in the document; attaches its ref to the host dialog; and preserves its owned ARIA and dismissal behavior. An object ref's `current` is never `null` while a sheet is mounted. A callback ref follows React's semantics on a handoff: a cleanup it returned runs when it detaches from the old host; a callback ref without a cleanup is called with `null` on detach, then with the new host.                                                                         | DEC-1, DEC-2; `architecture:public-component-api` INV8   | Owner decision                                                                                                                                                                           |
+| ID  | Invariant                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   | Basis                                                    |
+| --- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------- |
+| FR1 | Zero or one child sheet is interactive for each controlled `activeSheet` value; all other children are hidden or retained inert and `aria-hidden` during a transition.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | Current source, docs, and tests                          |
+| FR2 | Each child sheet owns one native dialog. Opening a sheet presents its dialog once; a handoff presents the entering sheet's dialog above the retained one and closes the retained dialog only after its panel has faded. Returning to a sheet whose dialog is still open beneath a newer one re-presents it so the interactive sheet is the topmost layer. Implementation gap: the switcher presents one shared dialog once per flow and hosts every child as a panel inside it; a handoff swaps panels in that dialog, and no dialog is re-presented.                                                                                                                                                                                                                                                                                                                                       | DEC-1                                                    |
+| FR3 | During a handoff, the entering sheet is above the retained sheet. A taller retained sheet aligns down to a shorter entering sheet, and the retained sheet fades only after required transform motion completes.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | Current source and transition tests                      |
+| FR4 | Closing retains the outgoing sheet through its exit, then closes the dialog. A modal flow restores focus to the element captured when that modal flow opened.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | Current source and focus tests                           |
+| FR5 | `hasScrim=true` uses `showModal()`, a native backdrop, and native focus containment, and locks page scroll: the page does not scroll while a modal flow is presented; the lock is held continuously across a handoff, never released and re-acquired between steps; it still holds beneath a `Dialog` opened from a step; it is released after the flow's exit (DEC-1). `hasScrim=false` uses `show()` without a backdrop or scroll lock and leaves the page interactive. In a non-modal flow the sheet dialogs order themselves with local values inside the switcher's isolated flow wrapper (DEC-1); the page-level value that wrapper carries remains a `spec:AST-027` conformance gap. Implementation gap: a script focus trap runs on top of the modal dialog's native containment; a non-modal flow is one shared dialog carrying the page-level value itself, with no flow wrapper. | DEC-1; `spec:AST-027` FR2, FR4, FR8                      |
+| FR6 | The active child purpose governs implicit dismissal: `info` allows Escape, scrim click, and swipe; `form` allows Escape; `required` blocks all three and exposes `alertdialog`.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | Current BottomSheet docs and switcher tests              |
+| FR7 | While visible, the switcher participates in `family:overlay-dismissal`; one Escape or platform close request reaches only the topmost present layer, and descendants receive a deeper logical layer scope.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | `family:overlay-dismissal` and the audit regression test |
+| FR8 | One backdrop paints the flow's scrim at a time: the retained sheet's dialog keeps it through a handoff and the entering dialog takes it over without a fade when the retained dialog closes. A stale gesture from an outgoing sheet cannot change the flow's scrim, and unmounting a retained sheet cannot keep its dialog open or the flow's modal layer held. Implementation gap: the one backdrop is the shared dialog's, so no takeover between dialogs happens.                                                                                                                                                                                                                                                                                                                                                                                                                        | DEC-1; current tests                                     |
+| FR9 | The switcher forwards neutral dialog attributes, styling inputs, and composed handlers, `onCancel` included, to every sheet dialog, so a handler fires for whichever sheet dialog raises the event; renders `id` and `data-testid` on the host dialog only, so each appears once in the document; attaches its ref to the host dialog; and preserves its owned ARIA and dismissal behavior. An object ref's `current` is never `null` while a sheet is mounted. A callback ref follows React's semantics on a handoff: a cleanup it returned runs when it detaches from the old host; a callback ref without a cleanup is called with `null` on detach, then with the new host. Implementation gap: every forwarded input, `ref`, `id`, and `data-testid` reaches the one shared dialog, which never changes on a handoff.                                                                  | DEC-1, DEC-2; `architecture:public-component-api` INV8   |
 
 ### Allowed variation
 
@@ -116,8 +111,9 @@ intentional decision. This draft cannot clear the gaps it records.
 
 ### Representative states
 
-The states below describe DEC-1's decided structure where they name a sheet's
-own dialog, the retained dialog, or the flow wrapper.
+Where a state names a sheet's own dialog, the retained dialog, or the flow
+wrapper, the shipped switcher meets it with its one shared dialog instead; FR2
+and FR5 record that implementation gap.
 
 | State      | Required invariant                                                                                                                                                               | Allowed variation                                                                        |
 | ---------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------- |
@@ -125,7 +121,7 @@ own dialog, the retained dialog, or the flow wrapper.
 | First open | Matching child is visible and interactive in its own dialog.                                                                                                                     | Child-owned height and content.                                                          |
 | Handoff    | Entering child is interactive in its own dialog; retained child's dialog stays open, inert, and hidden from accessibility APIs until it fades, and keeps painting the one scrim. | Alignment offset depends on measured panel geometry.                                     |
 | Closing    | Outgoing child is retained inert while exit motion completes; modal focus and scroll ownership remain until close.                                                               | Theme-controlled duration.                                                               |
-| Modal      | Native modal host, backdrop, native focus containment, and the page scroll lock are active.                                                                                      | Active child's `purpose` controls implicit dismissal.                                    |
+| Modal      | Native modal host, backdrop, native focus containment, and the page scroll lock are active. Implementation gap: a script focus trap runs on top of the native containment.       | Active child's `purpose` controls implicit dismissal.                                    |
 | Non-modal  | Native non-modal host has no backdrop or scroll lock and background content remains interactive.                                                                                 | The current clipping/stacking limitation is a conformance gap, not an allowed exception. |
 
 ### Transformation and precedence order
@@ -144,7 +140,8 @@ own dialog, the retained dialog, or the flow wrapper.
   Native modality holds across a modal flow's child handoffs because a sheet
   dialog is modal throughout, and the one page scroll lock is held for the
   whole flow rather than per step. A non-modal flow paints no backdrop and
-  holds no lock.
+  holds no lock. Implementation gap: one shared dialog is presented
+  throughout, so a handoff has one dialog open, not two.
 - **PR2 — Stable child registration.** Parent rerenders and changing consumer ref
   identities do not unregister a mounted child or cancel an active handoff.
 
@@ -160,11 +157,11 @@ own dialog, the retained dialog, or the flow wrapper.
 
 ## Design relationships
 
-| Anatomy or state | Design requirement                                                                                                                    | Representation authority                                         | Hierarchy role | Component contract |
-| ---------------- | ------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------- | -------------- | ------------------ |
-| Shared dialog    | Transparent host for the flow's interaction and accessibility boundary; DEC-1 decides one such host per child sheet                   | Current source and public docs; DEC-1 for the per-sheet clause   | Structural     | FR2, FR5, AR1      |
-| Sheet panels     | Delegate visible panel, content, handle, and gesture presentation to BottomSheet                                                      | `component:BottomSheet` draft as observational context           | Prominent      | FR1, FR3           |
-| Scrim            | Optional native backdrop that dims and blocks the page in modal presentation; DEC-1 decides that one sheet dialog paints it at a time | Current source and public docs; DEC-1 for the one-painter clause | Supporting     | FR5, FR8           |
+| Anatomy or state | Design requirement                                                                                                                                           | Representation authority                                         | Hierarchy role | Component contract |
+| ---------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------ | ---------------------------------------------------------------- | -------------- | ------------------ |
+| Shared dialog    | Transparent host for the flow's interaction and accessibility boundary, one per child sheet (DEC-1). Implementation gap: one such host serves the whole flow | Current source and public docs; DEC-1 for the per-sheet clause   | Structural     | FR2, FR5, AR1      |
+| Sheet panels     | Delegate visible panel, content, handle, and gesture presentation to BottomSheet                                                                             | `component:BottomSheet` as observational context                 | Prominent      | FR1, FR3           |
+| Scrim            | Optional native backdrop that dims and blocks the page in modal presentation; one sheet dialog paints it at a time (DEC-1)                                   | Current source and public docs; DEC-1 for the one-painter clause | Supporting     | FR5, FR8           |
 
 ### Theming anatomy
 
@@ -198,16 +195,16 @@ own dialog, the retained dialog, or the flow wrapper.
 - `architecture:public-component-api` and `spec:AST-002` own the released prop,
   DOM, ref, and compatibility surface.
 - `spec:AST-027` identifies the non-modal `show()` plus page-level `z-index` path
-  as a migration gap; this draft does not treat it as an exception.
+  as a migration gap, not an exception.
 
 ## Verification map
 
-| Contract         | Verification                                                                  | Representative states                                                                                                  | Mutation or failure expectation                                                                                                                                              | Audit section                             |
-| ---------------- | ----------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------- |
-| FR1–FR4, FR8     | `BottomSheetSwitcher.test.tsx`                                                | closed, first open, handoffs in either completion order, rapid replacement, unmount, close                             | A child becomes interactive at the wrong time, a retained child disappears early, a second backdrop paints, or a sheet dialog's lifecycle breaks.                            | `audit:BottomSheetSwitcher/behavior`      |
-| FR5–FR7, AR1–AR3 | `BottomSheetSwitcher.test.tsx`; `BottomSheetNativeModal.a11y.browser.spec.ts` | modal/non-modal, info/form/required, nested layer, IME, focus return, scroll lock in engines, non-modal local ordering | Modality, dismissal order, naming, inertness, scroll lock, or focus behavior diverges, or a sheet dialog takes a page-level z-index.                                         | `audit:BottomSheetSwitcher/accessibility` |
-| FR9              | `BottomSheetSwitcher.test.tsx`; export checks                                 | ref across open/handoff/close/unmount, callback-ref cleanup, `id` once, DOM/ARIA/data/events, class, style, xstyle     | A supported input is dropped or duplicated, an object ref is null while a sheet is mounted or skips a cleanup, or an input overrides component-owned semantics accidentally. | `audit:BottomSheetSwitcher/api`           |
-| Theming anatomy  | `scripts/check-knowledge.mjs`; theming tests                                  | dialog, delegated sheet panel, scrim                                                                                   | A non-painting host gains a target, a delegated panel loses its owner, or the scrim gap disappears without review.                                                           | `audit:BottomSheetSwitcher/theming`       |
+| Contract         | Verification                                                                                                            | Representative states                                                                                                  | Mutation or failure expectation                                                                                                                                              | Audit section                             |
+| ---------------- | ----------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------- |
+| FR1–FR4, FR8     | `BottomSheetSwitcher.test.tsx`                                                                                          | closed, first open, handoffs in either completion order, rapid replacement, unmount, close                             | A child becomes interactive at the wrong time, a retained child disappears early, a second backdrop paints, or a sheet dialog's lifecycle breaks.                            | `audit:BottomSheetSwitcher/behavior`      |
+| FR5–FR7, AR1–AR3 | `BottomSheetSwitcher.test.tsx`; `BottomSheetNativeModal.a11y.browser.spec.ts` (implementation gap: not yet in the tree) | modal/non-modal, info/form/required, nested layer, IME, focus return, scroll lock in engines, non-modal local ordering | Modality, dismissal order, naming, inertness, scroll lock, or focus behavior diverges, or a sheet dialog takes a page-level z-index.                                         | `audit:BottomSheetSwitcher/accessibility` |
+| FR9              | `BottomSheetSwitcher.test.tsx`; export checks                                                                           | ref across open/handoff/close/unmount, callback-ref cleanup, `id` once, DOM/ARIA/data/events, class, style, xstyle     | A supported input is dropped or duplicated, an object ref is null while a sheet is mounted or skips a cleanup, or an input overrides component-owned semantics accidentally. | `audit:BottomSheetSwitcher/api`           |
+| Theming anatomy  | `scripts/check-knowledge.mjs`; theming tests                                                                            | dialog, delegated sheet panel, scrim                                                                                   | A non-painting host gains a target, a delegated panel loses its owner, or the scrim gap disappears without review.                                                           | `audit:BottomSheetSwitcher/theming`       |
 
 ## Decision log
 

package/src/BottomSheet/BottomSheetSwitcher.test.tsx

@@ -708,6 +708,32 @@ describe('BottomSheetSwitcher', () => {
     expect(onActiveSheetChange).toHaveBeenNthCalledWith(2, null);
   });
 
+  it('keeps the flow open when a file picker inside a step is dismissed, and still closes on its own close request', () => {
+    // A file input fires a bubbling `cancel` at itself when its picker is
+    // dismissed. A step renders no dialog, so it reaches the switcher's.
+    const onActiveSheetChange = vi.fn();
+    render(
+      <BottomSheetSwitcher
+        activeSheet="upload"
+        onActiveSheetChange={onActiveSheetChange}>
+        <BottomSheet sheetId="upload" label="Upload" purpose="form">
+          <input type="file" aria-label="Picture" />
+        </BottomSheet>
+      </BottomSheetSwitcher>,
+    );
+
+    const fromPicker = new Event('cancel', {bubbles: true, cancelable: true});
+    fireEvent(screen.getByLabelText('Picture'), fromPicker);
+
+    expect(onActiveSheetChange).not.toHaveBeenCalled();
+    expect(fromPicker.defaultPrevented).toBe(false);
+
+    fireEvent(getSharedDialog(), new Event('cancel', {cancelable: true}));
+
+    expect(onActiveSheetChange).toHaveBeenCalledTimes(1);
+    expect(onActiveSheetChange).toHaveBeenCalledWith(null);
+  });
+
   it('honors purpose=required for a switcher-managed sheet', () => {
     const onActiveSheetChange = vi.fn();
     render(

package/src/BottomSheet/BottomSheetSwitcher.tsx

@@ -591,8 +591,14 @@ export function BottomSheetSwitcher({
       ? undefined
       : sheetLabels.get(visibleTransition.retainedSheet));
 
+  // A `cancel` that bubbles up from a step is not a close request for the
+  // flow: a file input fires one when its picker is dismissed, and a step
+  // renders no dialog of its own, so it lands here. It is left alone.
   const handleCancel = useCallback(
     (event: SyntheticEvent<HTMLDialogElement>) => {
+      if (event.target !== event.currentTarget) {
+        return;
+      }
       event.preventDefault();
       if (shouldDismissOnCloseRequest()) {
         dismissOnEscape();

package/src/Calendar/Calendar.test.tsx

@@ -382,25 +382,35 @@ describe('Calendar', () => {
   // ─── Date Constraints ────────────────────────────────────────
 
   it('respects min date constraint', () => {
-    render(<Calendar focusDate="2026-01-01" min="2026-01-10" />);
+    const onChange = vi.fn();
+    render(
+      <Calendar focusDate="2026-01-01" min="2026-01-10" onChange={onChange} />,
+    );
 
     // Day 5 should be disabled (before min)
     const day5 = getDayButton(5);
-    expect(day5).toBeDisabled();
+    expect(day5).toHaveAttribute('aria-disabled', 'true');
+    // spec:AST-085 FR1: focusable through aria-disabled, not natively disabled;
+    // a click still selects nothing.
+    expect(day5).not.toHaveAttribute('disabled');
+    day5.focus();
+    expect(day5).toHaveFocus();
+    day5.click();
+    expect(onChange).not.toHaveBeenCalled();
 
     // Day 15 should be enabled (after min)
     const day15 = getDayButton(15);
-    expect(day15).not.toBeDisabled();
+    expect(day15).not.toHaveAttribute('aria-disabled', 'true');
   });
 
   it('respects max date constraint', () => {
     render(<Calendar focusDate="2026-01-01" max="2026-01-20" />);
 
     const day25 = getDayButton(25);
-    expect(day25).toBeDisabled();
+    expect(day25).toHaveAttribute('aria-disabled', 'true');
 
     const day15 = getDayButton(15);
-    expect(day15).not.toBeDisabled();
+    expect(day15).not.toHaveAttribute('aria-disabled', 'true');
   });
 
   // ─── Initial Visible Month ───────────────────────────────────
@@ -424,14 +434,20 @@ describe('Calendar', () => {
       render(<Calendar min="2027-03-04" max="2027-06-30" />);
 
       expect(screen.getByText('March 2027')).toBeInTheDocument();
-      expect(getDayButton(4, 'March', 2027)).not.toBeDisabled();
+      expect(getDayButton(4, 'March', 2027)).not.toHaveAttribute(
+        'aria-disabled',
+        'true',
+      );
     });
 
     it('opens on max when the window is entirely in the past', () => {
       render(<Calendar min="2019-01-01" max="2019-04-30" />);
 
       expect(screen.getByText('April 2019')).toBeInTheDocument();
-      expect(getDayButton(30, 'April', 2019)).not.toBeDisabled();
+      expect(getDayButton(30, 'April', 2019)).not.toHaveAttribute(
+        'aria-disabled',
+        'true',
+      );
     });
 
     it('keeps max in the last pane in the two-month layout', () => {
@@ -466,7 +482,7 @@ describe('Calendar', () => {
 
     // January 4, 2026 is a Sunday - should be disabled
     const sunday = getDayButton(4);
-    expect(sunday).toBeDisabled();
+    expect(sunday).toHaveAttribute('aria-disabled', 'true');
   });
 
   it('caps the end date to maxRangeSpan once a start is picked', async () => {
@@ -475,15 +491,43 @@ describe('Calendar', () => {
     render(<Calendar mode="range" focusDate="2026-01-01" maxRangeSpan={7} />);
 
     // Before a start is picked every day is selectable.
-    expect(getDayButton(20)).not.toBeDisabled();
+    expect(getDayButton(20)).not.toHaveAttribute('aria-disabled', 'true');
 
     // Pick Jan 10 as the start. A 7-day window spans Jan 4–16 (start ± 6).
     await user.click(getDayButton(10));
 
-    expect(getDayButton(16)).not.toBeDisabled(); // 6 days after — the edge
-    expect(getDayButton(17)).toBeDisabled(); // 7 days after — beyond the cap
-    expect(getDayButton(4)).not.toBeDisabled(); // 6 days before — symmetric
-    expect(getDayButton(3)).toBeDisabled(); // 7 days before — beyond the cap
+    expect(getDayButton(16)).not.toHaveAttribute('aria-disabled', 'true'); // 6 days after — the edge
+    expect(getDayButton(17)).toHaveAttribute('aria-disabled', 'true'); // 7 days after — beyond the cap
+    expect(getDayButton(4)).not.toHaveAttribute('aria-disabled', 'true'); // 6 days before — symmetric
+    expect(getDayButton(3)).toHaveAttribute('aria-disabled', 'true'); // 7 days before — beyond the cap
+  });
+
+  it('keeps one Tab stop when the span cap disables the day that held it', async () => {
+    const user = userEvent.setup();
+
+    render(<Calendar mode="range" focusDate="2026-01-01" maxRangeSpan={7} />);
+
+    // Arrow from Jan 1 to Jan 25 so Jan 25 holds the grid's Tab stop.
+    getDayButton(1).focus();
+    await user.keyboard('{ArrowDown}{ArrowDown}{ArrowDown}');
+    for (let i = 0; i < 3; i += 1) {
+      await user.keyboard('{ArrowRight}');
+    }
+    expect(getDayButton(25)).toHaveFocus();
+
+    // Picking Jan 10 as the start disables Jan 25 (beyond the 7-day cap).
+    await user.click(getDayButton(10));
+    expect(getDayButton(25)).toHaveAttribute('aria-disabled', 'true');
+
+    // spec:AST-085 FR1: a disabled day stays focusable but never keeps the
+    // grid's Tab stop, so the grid still has exactly one, on an enabled day.
+    const grid = screen.getByRole('grid');
+    const stops = Array.from(
+      grid.querySelectorAll<HTMLElement>('button[data-date][tabindex="0"]'),
+    );
+    expect(stops).toHaveLength(1);
+    expect(stops[0]).not.toHaveAttribute('aria-disabled', 'true');
+    expect(getDayButton(25)).toHaveAttribute('tabindex', '-1');
   });
 
   it('enforces minRangeSpan once a start is picked', async () => {
@@ -496,11 +540,11 @@ describe('Calendar', () => {
 
     // The picked start itself stays enabled — it is the active selection
     // anchor, not an unreachable end.
-    expect(getDayButton(10)).not.toBeDisabled();
-    expect(getDayButton(11)).toBeDisabled(); // 1 day apart — too short
-    expect(getDayButton(12)).not.toBeDisabled(); // 3-day span — allowed
-    expect(getDayButton(8)).not.toBeDisabled(); // 3-day span the other way
-    expect(getDayButton(9)).toBeDisabled(); // 2-day span — too short
+    expect(getDayButton(10)).not.toHaveAttribute('aria-disabled', 'true');
+    expect(getDayButton(11)).toHaveAttribute('aria-disabled', 'true'); // 1 day apart — too short
+    expect(getDayButton(12)).not.toHaveAttribute('aria-disabled', 'true'); // 3-day span — allowed
+    expect(getDayButton(8)).not.toHaveAttribute('aria-disabled', 'true'); // 3-day span the other way
+    expect(getDayButton(9)).toHaveAttribute('aria-disabled', 'true'); // 2-day span — too short
   });
 
   it('commits a same-day range with the default minimum', async () => {
@@ -565,8 +609,8 @@ describe('Calendar', () => {
 
     // …and the start is cleared: the days that minRangeSpan disabled around
     // the old anchor are selectable again, so a new start can be placed there.
-    expect(getDayButton(11)).not.toBeDisabled();
-    expect(getDayButton(9)).not.toBeDisabled();
+    expect(getDayButton(11)).not.toHaveAttribute('aria-disabled', 'true');
+    expect(getDayButton(9)).not.toHaveAttribute('aria-disabled', 'true');
   });
 
   it('announces the cleared range in the provider locale', async () => {
@@ -603,7 +647,7 @@ describe('Calendar', () => {
 
     // A picked single date must not disable far-away days.
     await user.click(getDayButton(10));
-    expect(getDayButton(25)).not.toBeDisabled();
+    expect(getDayButton(25)).not.toHaveAttribute('aria-disabled', 'true');
   });
 
   it('keeps a controlled value that is wider than maxRangeSpan (selection-only)', () => {
@@ -621,7 +665,7 @@ describe('Calendar', () => {
 
     // No selection is in progress (both endpoints are set), so no anchor →
     // every day is pickable and both endpoints render selected.
-    expect(getDayButton(20)).not.toBeDisabled();
+    expect(getDayButton(20)).not.toHaveAttribute('aria-disabled', 'true');
     expect(getDayButton(5).closest('[role="gridcell"]')).toHaveAttribute(
       'aria-selected',
       'true',
@@ -1713,7 +1757,7 @@ describe('Calendar', () => {
     render(<Calendar focusDate="2026-01-01" min="2026-01-05" />);
 
     const day1 = getDayButton(1);
-    expect(day1).toBeDisabled();
+    expect(day1).toHaveAttribute('aria-disabled', 'true');
 
     const day8 = getDayButton(8);
     day8.focus();
@@ -1741,7 +1785,7 @@ describe('Calendar', () => {
     render(<Calendar focusDate="2026-01-01" dateConstraints={[disableJan8]} />);
 
     const day8 = getDayButton(8);
-    expect(day8).toBeDisabled();
+    expect(day8).toHaveAttribute('aria-disabled', 'true');
 
     const day15 = getDayButton(15);
     day15.focus();

package/src/Calendar/Calendar.tsx

@@ -1372,7 +1372,8 @@ function DayCell({
         // Mark today's cell programmatically (APG date-picker pattern), not just
         // visually, so screen-reader users can identify the current date.
         aria-current={state.isToday ? 'date' : undefined}
-        disabled={isDisabled}
+        // A disabled day stays focusable through aria-disabled (spec:AST-085
+        // FR1); arrows still skip it and its click and hover are guarded.
         // Initial roving tab-stop seed; useGridFocus owns it after mount.
         tabIndex={isTabbableDay ? 0 : -1}
         onClick={() => !state.effectivelyDisabled && onDayClick(date)}

package/src/CheckboxInput/CheckboxInput.test.tsx

@@ -278,7 +278,7 @@ describe('CheckboxInput', () => {
     );
     const checkbox = screen.getByRole('checkbox');
     expect(checkbox).toBeChecked();
-    expect(checkbox).toBeDisabled();
+    expect(checkbox).toHaveAttribute('aria-disabled', 'true');
     expect(checkbox).toHaveAttribute('type', 'checkbox');
   });
 
@@ -588,16 +588,55 @@ describe('CheckboxInput', () => {
       expect(checkbox).not.toBeChecked();
     });
 
-    it('remains natively disabled when disabled without a reason', () => {
+    it('stays focusable via aria-disabled when disabled without a reason', async () => {
+      const user = userEvent.setup();
+      const onChange = vi.fn();
+      const onClick = vi.fn();
+      render(
+        <form>
+          <CheckboxInput
+            label="Accept terms"
+            value={false}
+            onChange={onChange}
+            onClick={onClick}
+            htmlName="terms"
+            isRequired
+            isDisabled
+          />
+        </form>,
+      );
+      const checkbox = screen.getByRole('checkbox');
+      expect(checkbox).not.toHaveAttribute('disabled');
+      expect(checkbox).toHaveAttribute('aria-disabled', 'true');
+      await user.tab();
+      expect(checkbox).toHaveFocus();
+      await user.keyboard(' ');
+      await user.click(checkbox);
+      expect(onChange).not.toHaveBeenCalled();
+      expect(onClick).not.toHaveBeenCalled();
+      expect(checkbox).not.toBeChecked();
+      const form = checkbox.closest('form')!;
+      expect(form.checkValidity()).toBe(true);
+      expect([...new FormData(form).keys()]).toEqual([]);
+    });
+
+    it('keeps a disabled indeterminate checkbox mixed after Space or a click', async () => {
+      const user = userEvent.setup();
       render(
         <CheckboxInput
-          label="Accept terms"
-          value={false}
+          label="Select all"
+          value="indeterminate"
           onChange={() => {}}
           isDisabled
         />,
       );
-      expect(screen.getByRole('checkbox')).toBeDisabled();
+      const checkbox = screen.getByRole<HTMLInputElement>('checkbox');
+      expect(checkbox.indeterminate).toBe(true);
+      await user.tab();
+      await user.keyboard(' ');
+      fireEvent.click(checkbox);
+      expect(checkbox.indeterminate).toBe(true);
+      expect(checkbox).not.toBeChecked();
     });
   });
   describe('form participation', () => {