@astryxdesign/core 0.7.5 → 0.7.6-canary.0bd3b37

package/src/TimeInput/TimeInput.spec.md

@@ -37,15 +37,15 @@ system_specs: [spec:AST-043, spec:AST-085, spec:AST-086, spec:AST-102]
 
 ## Contract at a glance
 
-| Area                    | Contract                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  |
-| ----------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| Public contract         | None changes. TimeInput takes an ISO time `value`, `onChange`, `changeAction`, `isLoading`, `min`, `max`, `hasSeconds`, `hourFormat`, `increment`, `hasClear`, `presentation` (and deprecated `nativePicker`), Field props, size, status, and the input-family part props.                                                                                                                                                                                                                                                                                                                                                                                                                                                |
-| Behavior                | `presentation` picks the surface: a typed field, the browser time picker, or bottom-sheet wheels, each committing ISO times inside the range through `onChange` and an optional `changeAction`.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           |
-| End-user impact         | Desktop users type times in many forms and step with arrows; touch users get the OS picker by default. Keyboard and screen-reader users can reach a disabled field and hear invalid entries and stepped times.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |
-| Builder impact          | None.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |
-| Compatibility/readiness | Records shipped behavior; no API, default, or DOM change. Caller handlers other than focus, blur, and click still run while disabled, the format hint is fixed English, the clear and Save buttons scale under reduced motion, the grouped sheet field is unnamed by its own label, stepping a draft shows stale text, a focused clear button drops focus when disabled, the sheet surface is pointer-only, the sheet and native surfaces drop focus on clear, the format hint outlasts a disable, the grouped tooltip status describes nothing, time text ignores the locale's digits, separator, and day periods, and typed parsing ignores the locale and commits prefixes; all are listed under Current-state impact. |
-| Review checks           | Reject a surface other than the one `presentation` names, a commit outside `min`/`max`, an Action skipped by clear, a disabled field that leaves the tab order or changes value, or `nativePicker` winning over `presentation`.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           |
-| Governing rules         | `spec:AST-043` FR1–FR4; `family:input-fields` FR3–FR6, FR8–FR11; `spec:AST-085` FR1, FR2, FR4, FR6; `spec:AST-086` FR3, FR4, FR8; `architecture:internationalization` INV1a, INV8; `design:reduced-motion` DR1; `architecture:interaction-modality` INV4.                                                                                                                                                                                                                                                                                                                                                                                                                                                                 |
+| Area                    | Contract                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
+| ----------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| Public contract         | The Hour format default is the provider locale's hour cycle, not a fixed `12h`; no prop, type, or export changes. TimeInput takes an ISO time `value`, `onChange`, `changeAction`, `isLoading`, `min`, `max`, `hasSeconds`, `hourFormat`, `increment`, `hasClear`, `presentation` (and deprecated `nativePicker`), Field props, size, status, and the input-family part props.                                                                                                                                                                                                                                                                                                                                                                                                |
+| Behavior                | `presentation` picks the surface: a typed field, the browser time picker, or bottom-sheet wheels, each committing ISO times inside the range through `onChange` and an optional `changeAction`.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               |
+| End-user impact         | Desktop users type times in many forms and step with arrows; touch users get the OS picker by default. Keyboard and screen-reader users can reach a disabled field and hear invalid entries and stepped times.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |
+| Builder impact          | A caller that relied on the `12h` default under a 24-hour locale passes `hourFormat="12h"` to keep twelve-hour text. A per-user 12/24-hour preference goes on the provider locale as a `-u-hc-` extension (`en-US-u-hc-h23`) rather than on each field.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       |
+| Compatibility/readiness | The `hourFormat` default is the provider locale's hour cycle, which is `12h` for `en`/`en-US` and with no provider; every other released default, API, and DOM shape holds. Caller handlers other than focus, blur, and click still run while disabled, the clear and Save buttons scale under reduced motion, the grouped sheet field is unnamed by its own label, stepping a draft shows stale text, a focused clear button drops focus when disabled, the sheet surface is pointer-only, the sheet and native surfaces drop focus on clear, the format hint outlasts a disable, the grouped tooltip status describes nothing, the sheet's hour, minute, and second wheels use ASCII digits, and typed parsing commits prefixes; all are listed under Current-state impact. |
+| Review checks           | Reject a surface other than the one `presentation` names, a commit outside `min`/`max`, an Action skipped by clear, a disabled field that leaves the tab order or changes value, or `nativePicker` winning over `presentation`.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               |
+| Governing rules         | `spec:AST-043` FR1–FR4; `family:input-fields` FR3–FR6, FR8–FR11; `spec:AST-085` FR1, FR2, FR4, FR6; `spec:AST-086` FR3, FR4, FR8; `architecture:internationalization` INV1a, INV8; `design:reduced-motion` DR1; `architecture:interaction-modality` INV4.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |
 
 This table is a review projection; the body below is authoritative.
 
@@ -58,11 +58,12 @@ under `family:input-fields`. Consumer usage lives in `TimeInput.doc.mjs`.
 
 ## Compatibility and migration
 
-- Released default preserved: `yes`; `presentation="adaptive-native"`,
-  `hourFormat="12h"`, `increment={1}`, no seconds, no clear, `size="md"`,
-  `statusVariant="attached"`
-- Compatibility class: records shipped behavior; no public prop, default,
-  export, or DOM change
+- Released default preserved: `no` for `hourFormat`, which follows the
+  provider locale's hour cycle (`12h` for `en` and `en-US`, the released
+  default with no provider); `yes` for `presentation="adaptive-native"`,
+  `increment={1}`, no seconds, no clear, `size="md"`, `statusVariant="attached"`
+- Compatibility class: default change for non-English-US locales; no public
+  prop, type, export, or DOM change
 - Controlled/uncontrolled behavior: controlled; `value` is an ISO time or
   `undefined`, and the field shows an optimistic value only while a
   `changeAction` is pending
@@ -95,32 +96,32 @@ 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                                                                                                                       |
-| ------------- | --------------------------------------------------------------------------------------------- | ------------------------------------ | -------------------------------------------------------------------------------------------------------------------------------------- | ----------------- | --------------------- | ---------- | -------------------------------------------------------------------------------------------------------------------------------------------- |
-| Presentation  | `text-input`, `popover`, `bottom-sheet`, `native`, `adaptive-bottom-sheet`, `adaptive-native` | Which surface selects the time.      | Always.                                                                                                                                | `adaptive-native` | `spec:AST-043`        | Stable     | TypeScript rejects other values.                                                                                                             |
-| Native picker | `touch`, `always`, `never` (deprecated)                                                       | Released surface selector.           | Ignored when `presentation` is set.                                                                                                    | unset             | `spec:AST-043`        | Deprecated | A development warning names the replacement.                                                                                                 |
-| Hour format   | `12h`, `24h`                                                                                  | Display and wheel hour format.       | Typed, native (resting text), and sheet surfaces.                                                                                      | `12h`             | `component:TimeInput` | Stable     | TypeScript rejects other values.                                                                                                             |
-| Seconds       | off, on                                                                                       | Whether values carry seconds.        | Typed and sheet surfaces; keeps adaptive and legacy native off. A forced native surface ignores it and commits hours and minutes only. | off               | `component:TimeInput` | Stable     | Not applicable.                                                                                                                              |
-| Increment     | whole minutes                                                                                 | Arrow-key step.                      | Typed surface; not 1 keeps adaptive and legacy native off.                                                                             | `1`               | `component:TimeInput` | Stable     | A fractional increment steps by nothing: an arrow key re-commits and announces `value`, or commits the current time when the field is empty. |
-| Range         | `min`, `max` ISO times                                                                        | Inclusive allowed times.             | Every surface.                                                                                                                         | unbounded         | `component:TimeInput` | Stable     | Out-of-range entries do not commit.                                                                                                          |
-| Busy          | idle, busy                                                                                    | The value is loading or being saved. | `isLoading`, or while a `changeAction` is pending.                                                                                     | idle              | `family:input-fields` | Stable     | Not applicable.                                                                                                                              |
+| Concept       | Closed values or states                                                                       | Meaning                              | Availability by variant/orientation/state                                                                                              | Default                                                                     | Owner                 | Stability  | Invalid-value behavior                                                                                                                       |
+| ------------- | --------------------------------------------------------------------------------------------- | ------------------------------------ | -------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------- | --------------------- | ---------- | -------------------------------------------------------------------------------------------------------------------------------------------- |
+| Presentation  | `text-input`, `popover`, `bottom-sheet`, `native`, `adaptive-bottom-sheet`, `adaptive-native` | Which surface selects the time.      | Always.                                                                                                                                | `adaptive-native`                                                           | `spec:AST-043`        | Stable     | TypeScript rejects other values.                                                                                                             |
+| Native picker | `touch`, `always`, `never` (deprecated)                                                       | Released surface selector.           | Ignored when `presentation` is set.                                                                                                    | unset                                                                       | `spec:AST-043`        | Deprecated | A development warning names the replacement.                                                                                                 |
+| Hour format   | `12h`, `24h`                                                                                  | Display and wheel hour format.       | Typed, native (resting text), and sheet surfaces.                                                                                      | The provider locale's hour cycle, including a `-u-hc-` extension on its tag | `component:TimeInput` | Stable     | TypeScript rejects other values.                                                                                                             |
+| Seconds       | off, on                                                                                       | Whether values carry seconds.        | Typed and sheet surfaces; keeps adaptive and legacy native off. A forced native surface ignores it and commits hours and minutes only. | off                                                                         | `component:TimeInput` | Stable     | Not applicable.                                                                                                                              |
+| Increment     | whole minutes                                                                                 | Arrow-key step.                      | Typed surface; not 1 keeps adaptive and legacy native off.                                                                             | `1`                                                                         | `component:TimeInput` | Stable     | A fractional increment steps by nothing: an arrow key re-commits and announces `value`, or commits the current time when the field is empty. |
+| Range         | `min`, `max` ISO times                                                                        | Inclusive allowed times.             | Every surface.                                                                                                                         | unbounded                                                                   | `component:TimeInput` | Stable     | Out-of-range entries do not commit.                                                                                                          |
+| Busy          | idle, busy                                                                                    | The value is loading or being saved. | `isLoading`, or while a `changeAction` is pending.                                                                                     | idle                                                                        | `family:input-fields` | Stable     | Not applicable.                                                                                                                              |
 
 ## Behavioral and layout contract
 
-| ID   | Invariant                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | Basis                                                                                    |
-| ---- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------- |
-| FR1  | Surface by `presentation` and pointer: `text-input` and `popover` → typed field; `bottom-sheet` → sheet; `native` → native picker on every pointer with no fallback; `adaptive-bottom-sheet` → typed on a fine pointer, sheet on a coarse one; `adaptive-native` → typed on a fine pointer, native on a coarse one, falling back to the typed field when `hasSeconds` or `increment` is not 1. Deprecated `nativePicker` maps `touch` → `adaptive-native`, `always` → native with the same fallbacks, `never` → `text-input`; `presentation` wins when both are set.                                                                                                                                                                                                                                                                                                                                                                                                                                 | `spec:AST-043` FR1–FR4; current tests                                                    |
-| FR2  | Every surface reports changes as `onChange(isoTime \| undefined)` and then, when supplied, `changeAction` in a transition; while the Action is pending the field shows the proposed value; while `isLoading` or while the shown value differs from `value`, it sets `aria-busy`, shows a decorative Spinner, and announces the busy start once; once the Action settles the field shows `value`.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | `family:input-fields` FR5, FR6; `spec:AST-086` FR8; current source                       |
-| FR3  | Typed field: a native text input with a leading clock icon. Typing keeps a draft and commits as soon as the draft parses to an in-range time different from `value`. On blur an empty draft commits `undefined` (when a value exists), a valid draft commits if changed, and an invalid draft reverts. An invalid draft sets `aria-invalid` and fills a persistent assertive region with the localized invalid-time message. Typed times MUST parse in the active locale, and a commit MUST reflect the whole typed time (`architecture:internationalization` INV8). Implementation gap: the parser takes no locale. It recognizes only an English `a`/`p` day period, a `:` separator, and ASCII digits, and it commits as soon as a prefix parses: typing "2.30pm" commits 02:00 from "2" and keeps it on blur; `fi-FI`'s "14.30" keeps 14:00; under `es-ES` "2:30 p. m." commits 02:30 with no warning; and `ja-JP` "午後2:30" and `ar-SA` digits are rejected.                                   | `spec:AST-086` FR3; current tests; `architecture:internationalization` INV8              |
-| FR4  | Typed field: ArrowUp and ArrowDown step by `increment` minutes from `value`, or from the current time when empty, commit only when the result is in range, and announce the new time politely (in FR5's display text for the field's hour format, including FR5's digit, separator, and day-period gap). Arrow keys that belong to an IME composition do nothing. The shown text MUST match the committed and announced time. Implementation gap: stepping while a typed draft is pending commits and announces the stepped time but keeps showing the draft, and blur then commits the draft when it parses.                                                                                                                                                                                                                                                                                                                                                                                        | Current tests                                                                            |
-| FR5  | Typed field: the value shows as 12-hour or 24-hour text, with seconds when `hasSeconds`. While focused, enabled, and empty, the placeholder becomes a format hint for the hour format ("e.g., 2:30 PM" or "e.g., 14:30"); otherwise it is `placeholder` or the localized default. The format hint MUST be catalog text (`architecture:internationalization` INV1a). Implementation gap: it is a fixed English string. Implementation gap: a field that becomes disabled while focused keeps showing the hint until blur. On every surface, time text MUST use the locale's digits, separator, and (for twelve-hour text) day-period words (`architecture:internationalization` INV1a, INV8). Implementation gap: every surface's field text and the stepped announcement use ASCII digits, a `:` separator, and a fixed English "AM"/"PM" whatever the locale, and the sheet's hour, minute, and second wheel options use ASCII digits; the sheet's AM/PM wheel uses the catalog's day-period words. | `architecture:internationalization`; current tests                                       |
-| FR6  | Native surface: an `<input type="time">` the platform picks with, plus a clock button labelled with the localized open-picker phrase. Native edits outside `min`/`max` do not commit; they set `aria-invalid` and fill the assertive invalid-time region. A pending Action keeps the picker enabled. Clearing does not refocus or reopen the picker.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | `spec:AST-043` FR2; current tests                                                        |
-| FR7  | Sheet surface: a read-only combobox (`aria-haspopup="dialog"`, `aria-expanded`) that opens a BottomSheet of hour, minute, optional second, and (12-hour) meridiem wheels when tapped. Wheel options outside the range are disabled; each wheel change clamps to the range and commits. `isLoading` makes the sheet field inert as well as busy. The wheels MUST be reachable by keyboard (`architecture:interaction-modality` INV4). Implementation gap: Enter, Space, ArrowDown, and Alt+ArrowDown do not open the sheet, and the clock button is out of the tab order, so keyboard users cannot set a time on this surface.                                                                                                                                                                                                                                                                                                                                                                        | `spec:AST-043` DEC-3; current source and tests; `architecture:interaction-modality` INV4 |
-| FR8  | With `hasClear`, a clear button shows while a value is shown and the field is editable. It commits `undefined` through FR2's pipeline, including `changeAction`. On the typed surface it then focuses the input (keyboard: at once; pointer: on the next frame without scrolling). Implementation gap: on the sheet surface, and on the native surface (which does not refocus so the picker does not reopen), it moves focus nowhere, so a keyboard clear leaves focus on the document body. The clear button, and the sheet's Save button, are `component:Button`s, so their press scale MUST NOT apply under reduced motion (`design:reduced-motion` DR1). Implementation gap: both still scale under reduced motion.                                                                                                                                                                                                                                                                             | `family:input-fields` FR6, FR11; current tests                                           |
-| FR9  | TimeInput is disabled when its own `isDisabled` or an enclosing InputGroup's `isDisabled` is true; an enabled group never re-enables a field that disables itself (`spec:AST-085` FR7). Disabled, on every surface: `aria-disabled="true"` on the focusable control, a kept tab stop, no value change by typing, arrows, the picker, or the wheels, a dropped draft, no caller `onClick`, Enter cancelled, the clear button hidden, the control dimmed, and a keyboard focus ring. With `disabledMessage`, a reason tooltip opens on hover and keyboard focus and describes the control. Implementation gap: caller DOM handlers other than focus and blur (`onKeyDown` and the like) still run; only `onClick` is blocked. Implementation gap: when a focused clear button disappears because the field becomes disabled, focus falls to the document body; no destination is named (`spec:AST-085` FR4).                                                                                           | `spec:AST-085` FR1, FR2, FR6; `family:input-fields` FR4; current tests                   |
-| FR10 | Inside InputGroup there is no Field. On the typed and native surfaces, a visually hidden label, description, and status message inside the control name and describe it, the local status icon is suppressed, and a status message is announced through the shared channel (assertive for errors, polite otherwise) when it appears. The sheet surface MUST be named and described the same way. Implementation gap: the grouped sheet field renders no hidden label, description, or status node, so it is named only by the group label, its description and status ids resolve to nothing, and its own status message is not announced (the group's status still describes it). Implementation gap: with `statusVariant="tooltip"`, the grouped typed and native fields render the hidden status message but leave it out of `aria-describedby`, so it is announced once and never describes the control.                                                                                         | `family:input-fields` FR3; `spec:AST-086`; current tests                                 |
-| FR11 | Base props reach the semantic control; a caller DOM handler runs after the component's own handler for the same event and cannot cancel built-in behavior. A caller `aria-labelledby` is appended to the field label. `container*` and `control*` reach the Field box and control box; root styling is not accepted.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | `family:input-fields` FR10; current tests                                                |
-| FR12 | Size and text size (typed and native surfaces; the sheet field sets no font of its own), status presentation, and click-to-focus (typed surface) match `component:TextInput` FR9, FR11, and FR12, including its implementation gaps (the fixed height against `spec:AST-102` FR4, an error status without text, and the color-only `detached` status without a message). The control box carries `astryx-time-input` with `data-size`, `data-status`, and `data-disabled`.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | `family:input-fields` FR8, FR9; current tests                                            |
+| ID   | Invariant                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | Basis                                                                                    |
+| ---- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------- |
+| FR1  | Surface by `presentation` and pointer: `text-input` and `popover` → typed field; `bottom-sheet` → sheet; `native` → native picker on every pointer with no fallback; `adaptive-bottom-sheet` → typed on a fine pointer, sheet on a coarse one; `adaptive-native` → typed on a fine pointer, native on a coarse one, falling back to the typed field when `hasSeconds` or `increment` is not 1. Deprecated `nativePicker` maps `touch` → `adaptive-native`, `always` → native with the same fallbacks, `never` → `text-input`; `presentation` wins when both are set.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | `spec:AST-043` FR1–FR4; current tests                                                    |
+| FR2  | Every surface reports changes as `onChange(isoTime \| undefined)` and then, when supplied, `changeAction` in a transition; while the Action is pending the field shows the proposed value; while `isLoading` or while the shown value differs from `value`, it sets `aria-busy`, shows a decorative Spinner, and announces the busy start once; once the Action settles the field shows `value`.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | `family:input-fields` FR5, FR6; `spec:AST-086` FR8; current source                       |
+| FR3  | Typed field: a native text input with a leading clock icon. Typing keeps a draft and commits as soon as the draft parses to an in-range time different from `value`. On blur an empty draft commits `undefined` (when a value exists), a valid draft commits if changed, and an invalid draft reverts. An invalid draft sets `aria-invalid` and fills a persistent assertive region with the localized invalid-time message. Typed times MUST parse in the active locale, and a commit MUST reflect the whole typed time (`architecture:internationalization` INV8). The parser reads the locale's digits, hour-minute and minute-second separators, and day-period words on either side of the time, plus English day periods, `:`, and ASCII digits in every locale, so every time FR5 displays reads back as itself. Implementation gap: it commits as soon as a prefix parses: typing "2.30pm" under `en` commits 02:00 from "2" and keeps it on blur.                                                                                                                                                                                                                                      | `spec:AST-086` FR3; current tests; `architecture:internationalization` INV8              |
+| FR4  | Typed field: ArrowUp and ArrowDown step by `increment` minutes from `value`, or from the current time when empty, commit only when the result is in range, and announce the new time politely (in FR5's display text for the field's hour format). Arrow keys that belong to an IME composition do nothing. The shown text MUST match the committed and announced time. Implementation gap: stepping while a typed draft is pending commits and announces the stepped time but keeps showing the draft, and blur then commits the draft when it parses.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | Current tests                                                                            |
+| FR5  | Typed field: the value shows as 12-hour or 24-hour text, with seconds when `hasSeconds`. The hour format is `hourFormat` when set, else the provider locale's hour cycle (`h11`/`h12` → 12-hour, `h23`/`h24` → 24-hour), so a `-u-hc-` extension on the provider tag carries an app's per-user preference. Every surface receives the same resolved hour format. While focused, enabled, and empty, the placeholder becomes the catalog format hint for that hour format; otherwise it is `placeholder` or the localized default. Implementation gap: a field that becomes disabled while focused keeps showing the hint until blur. On every surface, time text MUST use the locale's digits, separator, and (for twelve-hour text) day-period words (`architecture:internationalization` INV1a, INV8): the typed, native resting, and sheet field text and the stepped announcement come from the shared time formatter. A locale whose twelve-hour reading writes 02:00 and 14:00 alike (no day period) gets English twelve-hour text. Implementation gap: the sheet's hour, minute, and second wheel options use ASCII digits; the sheet's AM/PM wheel uses the catalog's day-period words. | `architecture:internationalization`; current tests                                       |
+| FR6  | Native surface: an `<input type="time">` the platform picks with, plus a clock button labelled with the localized open-picker phrase. Native edits outside `min`/`max` do not commit; they set `aria-invalid` and fill the assertive invalid-time region. A pending Action keeps the picker enabled. Clearing does not refocus or reopen the picker.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | `spec:AST-043` FR2; current tests                                                        |
+| FR7  | Sheet surface: a read-only combobox (`aria-haspopup="dialog"`, `aria-expanded`) that opens a BottomSheet of hour, minute, optional second, and (12-hour) meridiem wheels when tapped. Wheel options outside the range are disabled; each wheel change clamps to the range and commits. `isLoading` makes the sheet field inert as well as busy. The wheels MUST be reachable by keyboard (`architecture:interaction-modality` INV4). Implementation gap: Enter, Space, ArrowDown, and Alt+ArrowDown do not open the sheet, and the clock button is out of the tab order, so keyboard users cannot set a time on this surface.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   | `spec:AST-043` DEC-3; current source and tests; `architecture:interaction-modality` INV4 |
+| FR8  | With `hasClear`, a clear button shows while a value is shown and the field is editable. It commits `undefined` through FR2's pipeline, including `changeAction`. On the typed surface it then focuses the input (keyboard: at once; pointer: on the next frame without scrolling). Implementation gap: on the sheet surface, and on the native surface (which does not refocus so the picker does not reopen), it moves focus nowhere, so a keyboard clear leaves focus on the document body. The clear button, and the sheet's Save button, are `component:Button`s, so their press scale MUST NOT apply under reduced motion (`design:reduced-motion` DR1). Implementation gap: both still scale under reduced motion.                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | `family:input-fields` FR6, FR11; current tests                                           |
+| FR9  | TimeInput is disabled when its own `isDisabled` or an enclosing InputGroup's `isDisabled` is true; an enabled group never re-enables a field that disables itself (`spec:AST-085` FR7). Disabled, on every surface: `aria-disabled="true"` on the focusable control, a kept tab stop, no value change by typing, arrows, the picker, or the wheels, a dropped draft, no caller `onClick`, Enter cancelled, the clear button hidden, the control dimmed, and a keyboard focus ring. With `disabledMessage`, a reason tooltip opens on hover and keyboard focus and describes the control. Implementation gap: caller DOM handlers other than focus and blur (`onKeyDown` and the like) still run; only `onClick` is blocked. Implementation gap: when a focused clear button disappears because the field becomes disabled, focus falls to the document body; no destination is named (`spec:AST-085` FR4).                                                                                                                                                                                                                                                                                      | `spec:AST-085` FR1, FR2, FR6; `family:input-fields` FR4; current tests                   |
+| FR10 | Inside InputGroup there is no Field. On the typed and native surfaces, a visually hidden label, description, and status message inside the control name and describe it, the local status icon is suppressed, and a status message is announced through the shared channel (assertive for errors, polite otherwise) when it appears. The sheet surface MUST be named and described the same way. Implementation gap: the grouped sheet field renders no hidden label, description, or status node, so it is named only by the group label, its description and status ids resolve to nothing, and its own status message is not announced (the group's status still describes it). Implementation gap: with `statusVariant="tooltip"`, the grouped typed and native fields render the hidden status message but leave it out of `aria-describedby`, so it is announced once and never describes the control.                                                                                                                                                                                                                                                                                    | `family:input-fields` FR3; `spec:AST-086`; current tests                                 |
+| FR11 | Base props reach the semantic control; a caller DOM handler runs after the component's own handler for the same event and cannot cancel built-in behavior. A caller `aria-labelledby` is appended to the field label. `container*` and `control*` reach the Field box and control box; root styling is not accepted.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | `family:input-fields` FR10; current tests                                                |
+| FR12 | Size and text size (typed and native surfaces; the sheet field sets no font of its own), status presentation, and click-to-focus (typed surface) match `component:TextInput` FR9, FR11, and FR12, including its implementation gaps (the fixed height against `spec:AST-102` FR4, an error status without text, and the color-only `detached` status without a message). The control box carries `astryx-time-input` with `data-size`, `data-status`, and `data-disabled`.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | `family:input-fields` FR8, FR9; current tests                                            |
 
 ### Allowed variation
 
@@ -128,8 +129,7 @@ Consumer migration instructions belong in consumer docs and release notes.
   and steps.
 - **AV2 — Accepted typed forms.** The shared time parser decides which typed
   spellings parse. A parse MUST commit the time the person typed, never a
-  different one (FR3 gap: prefix commits and locale separators, digits, and day
-  periods).
+  different one (FR3 gap: prefix commits).
 
 ### Representative states
 
@@ -202,19 +202,19 @@ anatomy-theming map.
 
 ## Verification map
 
-| Contract       | Verification                                                                                                                                                  | Representative states                                      | Mutation or failure expectation                                                                                                                                                                                                                   | Audit section                   |
-| -------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------- |
-| FR1, ORD1      | `Presentation.test.tsx`; `NativeTimeInput.test.tsx` mode cases                                                                                                | Each value × pointer; deprecated mapping; both props       | A substituted surface, a lost fallback, or `nativePicker` winning fails. Evidence gap: no real-browser check of the surface per pointer, as `spec:AST-043` asks. No test covers `presentation="popover"`.                                         | `audit:TimeInput/behavior`      |
-| FR3–FR5, AR2   | `TimeInput.test.tsx` typing, blur, invalid, stepping, IME, and format cases                                                                                   | 12h, 24h, seconds; invalid and out of range                | A commit of an invalid time, a missing alert, or a step during IME fails. Evidence gap: no test asserts the format hint, stepping from the current time when empty, or a step that would leave the range. No test steps while a draft is pending. | `audit:TimeInput/behavior`      |
-| FR6            | `NativeTimeInput.test.tsx`                                                                                                                                    | Coarse default; range; pending Action; clear; clock button | An out-of-range native commit, or a reopened picker after clear, fails.                                                                                                                                                                           | `audit:TimeInput/behavior`      |
-| FR7, ORD3, AR4 | `Presentation.test.tsx` sheet cases                                                                                                                           | Forced and adaptive sheet; disabled                        | A sheet field that is not inert while disabled fails. Evidence gap: no test opens the sheet by keyboard or asserts the clock button's tab order. No test disables an out-of-range wheel option or clamps a wheel change.                          | `audit:TimeInput/behavior`      |
-| FR8            | `TimeInput.test.tsx` clear cases; `NativeTimeInput.test.tsx` clear case                                                                                       | With value; empty                                          | A clear on an empty field, or no `undefined`, fails. Evidence gap: no test asserts the focus move after clear on either surface, `changeAction` on clear, or a clear or Save press under reduced motion.                                          | `audit:TimeInput/behavior`      |
-| FR9, AR3       | `TimeInput.test.tsx` disabled suites; `NativeTimeInput.test.tsx` and `Presentation.test.tsx` disabled cases; `InputGroup.test.tsx` disabled-propagation cases | Each surface; with reason; draft in progress               | A lost tab stop, a value change, or a caller `onClick` fails. Evidence gap: no test asserts that caller `onKeyDown` and similar handlers still run while disabled (the FR9 gap).                                                                  | `audit:TimeInput/accessibility` |
-| FR10           | `TimeInput.test.tsx` InputGroup suite                                                                                                                         | Grouped with description and status                        | A duplicate label, a visible status icon, or a missed announcement fails. Evidence gap: no test groups the sheet surface.                                                                                                                         | `audit:TimeInput/accessibility` |
-| FR11           | `TimeInput.fr10.test.tsx`                                                                                                                                     | Each surface; handler composition                          | A base prop off the control, or a caller handler that cancels built-ins, fails.                                                                                                                                                                   | `audit:TimeInput/api`           |
-| FR12           | `TimeInput.test.tsx` status and theme-state cases                                                                                                             | Status; disabled                                           | A missing state attribute fails. Evidence gap: no test asserts `data-size` or `data-status`.                                                                                                                                                      | `audit:TimeInput/theming`       |
-| FR2, ORD2      | Evidence gap: no TimeInput test of the pending Action's optimistic value                                                                                      | —                                                          | —                                                                                                                                                                                                                                                 | `audit:TimeInput/behavior`      |
-| AR1, PR1       | Covered by the FR10 and FR11 rows for naming. Evidence gap: no test asserts the single coarse-pointer query that decides the surface                          | —                                                          | —                                                                                                                                                                                                                                                 | `audit:TimeInput/behavior`      |
+| Contract       | Verification                                                                                                                                                  | Representative states                                      | Mutation or failure expectation                                                                                                                                                                                                                           | Audit section                   |
+| -------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------- |
+| FR1, ORD1      | `Presentation.test.tsx`; `NativeTimeInput.test.tsx` mode cases                                                                                                | Each value × pointer; deprecated mapping; both props       | A substituted surface, a lost fallback, or `nativePicker` winning fails. Evidence gap: no real-browser check of the surface per pointer, as `spec:AST-043` asks. No test covers `presentation="popover"`.                                                 | `audit:TimeInput/behavior`      |
+| FR3–FR5, AR2   | `TimeInput.test.tsx` typing, blur, invalid, stepping, IME, and format cases, including "shows the catalog format hint for the resolved hour format" (24-hour) | 12h, 24h, seconds; invalid and out of range                | A commit of an invalid time, a missing alert, or a step during IME fails. Evidence gap: no test asserts the 12-hour format hint, stepping from the current time when empty, or a step that would leave the range. No test steps while a draft is pending. | `audit:TimeInput/behavior`      |
+| FR6            | `NativeTimeInput.test.tsx`                                                                                                                                    | Coarse default; range; pending Action; clear; clock button | An out-of-range native commit, or a reopened picker after clear, fails.                                                                                                                                                                                   | `audit:TimeInput/behavior`      |
+| FR7, ORD3, AR4 | `Presentation.test.tsx` sheet cases                                                                                                                           | Forced and adaptive sheet; disabled                        | A sheet field that is not inert while disabled fails. Evidence gap: no test opens the sheet by keyboard or asserts the clock button's tab order. No test disables an out-of-range wheel option or clamps a wheel change.                                  | `audit:TimeInput/behavior`      |
+| FR8            | `TimeInput.test.tsx` clear cases; `NativeTimeInput.test.tsx` clear case                                                                                       | With value; empty                                          | A clear on an empty field, or no `undefined`, fails. Evidence gap: no test asserts the focus move after clear on either surface, `changeAction` on clear, or a clear or Save press under reduced motion.                                                  | `audit:TimeInput/behavior`      |
+| FR9, AR3       | `TimeInput.test.tsx` disabled suites; `NativeTimeInput.test.tsx` and `Presentation.test.tsx` disabled cases; `InputGroup.test.tsx` disabled-propagation cases | Each surface; with reason; draft in progress               | A lost tab stop, a value change, or a caller `onClick` fails. Evidence gap: no test asserts that caller `onKeyDown` and similar handlers still run while disabled (the FR9 gap).                                                                          | `audit:TimeInput/accessibility` |
+| FR10           | `TimeInput.test.tsx` InputGroup suite                                                                                                                         | Grouped with description and status                        | A duplicate label, a visible status icon, or a missed announcement fails. Evidence gap: no test groups the sheet surface.                                                                                                                                 | `audit:TimeInput/accessibility` |
+| FR11           | `TimeInput.fr10.test.tsx`                                                                                                                                     | Each surface; handler composition                          | A base prop off the control, or a caller handler that cancels built-ins, fails.                                                                                                                                                                           | `audit:TimeInput/api`           |
+| FR12           | `TimeInput.test.tsx` status and theme-state cases                                                                                                             | Status; disabled                                           | A missing state attribute fails. Evidence gap: no test asserts `data-size` or `data-status`.                                                                                                                                                              | `audit:TimeInput/theming`       |
+| FR2, ORD2      | Evidence gap: no TimeInput test of the pending Action's optimistic value                                                                                      | —                                                          | —                                                                                                                                                                                                                                                         | `audit:TimeInput/behavior`      |
+| AR1, PR1       | Covered by the FR10 and FR11 rows for naming. Evidence gap: no test asserts the single coarse-pointer query that decides the surface                          | —                                                          | —                                                                                                                                                                                                                                                         | `audit:TimeInput/behavior`      |
 
 ## Current-state impact
 
@@ -237,17 +237,14 @@ anatomy-theming map.
 - **Caller handlers while disabled (FR9).** A disabled TimeInput still runs a
   caller's DOM handlers other than focus and blur, such as `onKeyDown`, and
   blocks only `onClick`, against `spec:AST-085` FR2.
-- **Format hint (FR5).** The focused-empty format hint is fixed English text,
-  against `architecture:internationalization` INV1a, and stays shown until blur
+- **Format hint (FR5).** The focused-empty format hint stays shown until blur
   when a focused field becomes disabled.
-- **Typed parsing (FR3, AV2).** The typed field ignores the locale's day
-  periods, separator, and digits, and commits a parsed prefix, so a typed time
-  can commit a different time or be rejected, against
+- **Typed parsing (FR3, AV2).** The typed field commits a parsed prefix, so a
+  typed time can commit a different time, against
   `architecture:internationalization` INV8.
-- **Time text (FR4, FR5).** Field text on every surface and the stepped-time
-  announcement use ASCII digits, a `:` separator, and a fixed English "AM"/"PM"
-  in every locale, and the sheet's hour, minute, and second wheels use ASCII
-  digits, against `architecture:internationalization` INV1a and INV8.
+- **Wheel digits (FR5).** The sheet's hour, minute, and second wheels use ASCII
+  digits in every locale, against `architecture:internationalization` INV1a
+  and INV8.
 - **Grouped tooltip status (FR10).** Inside InputGroup with
   `statusVariant="tooltip"`, the typed and native fields never reference the
   hidden status message from `aria-describedby`.

package/src/TimeInput/TimeInput.tsx

@@ -52,9 +52,6 @@ import {Spinner} from '../Spinner';
 import {VisuallyHidden} from '../VisuallyHidden';
 import {
   type ISOTimeString,
-  parseTimeInput,
-  formatDisplayTime12h,
-  formatDisplayTime24h,
   formatISOTime,
   adjustTime,
   isImeKeyEvent,
@@ -81,7 +78,12 @@ import {InputGroupInternalContext} from '../InputGroup/InputGroupInternalContext
 import {groupStyles, inputGroupItemProps} from '../InputGroup/groupStyles';
 import {useTooltip} from '../Tooltip';
 import {themeProps} from '../utils/themeProps';
-import {useTranslator} from '../i18n';
+import {useLocale, useTranslator} from '../i18n';
+import {
+  formatLocaleTime,
+  parseLocaleTime,
+  resolveHourFormat,
+} from '../utils/timeFormat';
 
 import {useMergedRefs} from '../hooks/useMergedRefs';
 import {NativeTimeSegment} from '../DateTimeInput/NativeTimeSegment';
@@ -294,9 +296,13 @@ export interface TimeInputProps extends Omit<
 
   /**
    * Hour format for display.
-   * - '12h': Display as 12-hour with AM/PM (e.g., "2:30 PM")
+   * - '12h': Display as 12-hour with the locale's day period (e.g., "2:30 PM")
    * - '24h': Display as 24-hour (e.g., "14:30")
-   * @default '12h'
+   *
+   * When unset, follows the `InternationalizationProvider` locale's hour
+   * cycle: `en-US` reads 12-hour, `en-GB` and `de-DE` read 24-hour. A
+   * per-user preference rides on the locale tag (`en-US-u-hc-h23`).
+   * @default the locale's hour cycle
    */
   hourFormat?: TimeInputHourFormat;
 
@@ -449,6 +455,7 @@ function TimeField({
     ...controlProps
   } = rest;
   const t = useTranslator();
+  const locale = useLocale();
   const isEffectivelyRequired = useResolvedRequired({isRequired, isOptional});
   const placeholder =
     placeholderFromProps ?? t('@astryx.timeInput.placeholder');
@@ -542,9 +549,11 @@ function TimeField({
   const [pendingInput, setPendingInput] = useState<string | null>(null);
   const [isFocused, setIsFocused] = useState(false);
 
-  // Format function based on hourFormat
-  const formatDisplayTime =
-    hourFormat === '12h' ? formatDisplayTime12h : formatDisplayTime24h;
+  const formatDisplayTime = useCallback(
+    (time: ISOTimeString, includeSeconds: boolean) =>
+      formatLocaleTime(time, locale, hourFormat, includeSeconds),
+    [locale, hourFormat],
+  );
 
   // Unified change handler that fires both onChange and changeAction
   const fireChange = useCallback(
@@ -576,21 +585,23 @@ function TimeField({
     if (pendingInput === null || !pendingInput.trim()) {
       return true;
     }
-    const parsed = parseTimeInput(pendingInput, hasSeconds);
+    const parsed = parseLocaleTime(pendingInput, locale, hasSeconds);
     if (!parsed) {
       return false;
     }
     // Also check min/max range
     return isTimeInRange(parsed, min, max);
-  }, [pendingInput, hasSeconds, min, max]);
+  }, [pendingInput, locale, hasSeconds, min, max]);
 
   // Placeholder that shows format hint when focused and empty
   const displayPlaceholder = useMemo(() => {
     if (isFocused && !displayValue) {
-      return hourFormat === '12h' ? 'e.g., 2:30 PM' : 'e.g., 14:30';
+      return hourFormat === '12h'
+        ? t('@astryx.dateTimeInput.timeHint12h')
+        : t('@astryx.dateTimeInput.timeHint24h');
     }
     return placeholder;
-  }, [isFocused, displayValue, hourFormat, placeholder]);
+  }, [isFocused, displayValue, hourFormat, placeholder, t]);
 
   // Handle input text change - update immediately if valid
   const handleInputChange = useCallback(
@@ -604,12 +615,12 @@ function TimeField({
       setPendingInput(newValue);
 
       // If the input is valid, update immediately (don't wait for blur)
-      const parsed = parseTimeInput(newValue, hasSeconds);
+      const parsed = parseLocaleTime(newValue, locale, hasSeconds);
       if (parsed && isTimeInRange(parsed, min, max) && parsed !== value) {
         fireChange(parsed);
       }
     },
-    [hasSeconds, min, max, value, fireChange, isDisabled],
+    [locale, hasSeconds, min, max, value, fireChange, isDisabled],
   );
 
   // Handle focus
@@ -646,7 +657,7 @@ function TimeField({
         return;
       }
 
-      const parsed = parseTimeInput(pendingInput, hasSeconds);
+      const parsed = parseLocaleTime(pendingInput, locale, hasSeconds);
       if (parsed && isTimeInRange(parsed, min, max)) {
         // Valid time - update if different
         if (parsed !== value) {
@@ -656,7 +667,7 @@ function TimeField({
       // Clear pending input - display will revert to formatted value
       setPendingInput(null);
     },
-    [pendingInput, isDisabled, value, fireChange, hasSeconds, min, max],
+    [pendingInput, isDisabled, value, fireChange, locale, hasSeconds, min, max],
   );
 
   // Handle keyboard navigation on input
@@ -950,11 +961,18 @@ export function TimeInput(props: TimeInputProps) {
     props.nativePicker,
     'time',
   );
+  const locale = useLocale();
   const {
     presentation: _presentation,
     nativePicker: _nativePicker,
-    ...rest
+    ...surfaceProps
   } = props;
+  // Every surface gets the resolved hour format, so the typed text, the
+  // native field's resting text, and the sheet wheels agree.
+  const rest = {
+    ...surfaceProps,
+    hourFormat: resolveHourFormat(locale, props.hourFormat),
+  };
   if (effective === 'native') {
     // Deprecated `always` keeps released fallbacks (FR2 legacy); only an
     // explicit `presentation="native"` is forced.

package/src/TimeInput/TouchTimeField.tsx

@@ -46,7 +46,8 @@ import {useBusyAnnouncement} from '../hooks/useBusyAnnouncement';
 import {useMergedRefs} from '../hooks/useMergedRefs';
 import {useResolvedRequired} from '../hooks/useResolvedRequired';
 import {Icon} from '../Icon';
-import {useTranslator} from '../i18n';
+import {useLocale, useTranslator} from '../i18n';
+import {formatLocaleTime} from '../utils/timeFormat';
 import {colorVars, sizeVars, spacingVars} from '../theme/tokens.stylex';
 import {useSize} from '../SizeContext/SizeContext';
 import {Spinner} from '../Spinner';
@@ -57,8 +58,6 @@ import {focusOutlineStyles} from '../utils/focusOutline.stylex';
 import {themeProps} from '../utils/themeProps';
 import {
   clampTime,
-  formatDisplayTime12h,
-  formatDisplayTime24h,
   formatISOTime,
   getInputARIA,
   isTimeInRange,
@@ -238,6 +237,7 @@ export function TouchTimeField({
     ...controlProps
   } = rest;
   const t = useTranslator();
+  const locale = useLocale();
   const isEffectivelyRequired = useResolvedRequired({isRequired, isOptional});
   const placeholder =
     placeholderFromProps ?? t('@astryx.timeInput.placeholder');
@@ -302,10 +302,8 @@ export function TouchTimeField({
     [changeAction, isEffectivelyDisabled, onChange, setOptimisticValue],
   );
 
-  const formatDisplayTime =
-    hourFormat === '12h' ? formatDisplayTime12h : formatDisplayTime24h;
   const displayValue = optimisticValue
-    ? formatDisplayTime(optimisticValue, hasSeconds)
+    ? formatLocaleTime(optimisticValue, locale, hourFormat, hasSeconds)
     : '';
 
   const fallbackTime = useMemo(() => {

package/src/Timestamp/Timestamp.spec.md

@@ -44,7 +44,7 @@ system_specs: [spec:AST-009, spec:AST-085]
 | Behavior                | Relative output carries the full absolute date as its default accessible name; relative output, or configured `tooltipEntries`, attach a keyboard-reachable hover card of copyable rows.                                           |
 | End-user impact         | Readers see compact or exact times in their locale; screen-reader users hear the full date and time zone; keyboard users can open and copy the exact time.                                                                         |
 | Builder impact          | None; the record describes shipped behavior.                                                                                                                                                                                       |
-| Compatibility/readiness | Released behavior recorded as current; no API, default, or output changes. Four implementation gaps are listed under Current-state impact.                                                                                         |
+| Compatibility/readiness | Released behavior recorded as current; no API, default, or output changes. Three implementation gaps are listed under Current-state impact.                                                                                        |
 | Review checks           | Reject a relative timestamp without the full absolute name when the caller names nothing, a hover card without a tab stop, a change that makes more server markup depend on the server's zone, or a crash on an unparseable value. |
 | Governing rules         | `architecture:internationalization/INV4,INV8,INV10`; `architecture:react-component-runtime/INV1,INV3,INV5`; `architecture:public-component-api/INV5,INV6,INV8`.                                                                    |
 
@@ -70,11 +70,6 @@ Consumer migration instructions belong in consumer docs and release notes.
 
 ## Current-state impact
 
-- **Caller name and tab stop replaced (FR5, FR9).** On relative output the
-  full-date name replaces a caller `aria-label`, and while a card is attached
-  the component's `tabIndex={0}` replaces a caller `tabIndex`, where
-  `architecture:public-component-api` INV5 lets a caller's explicit input reach
-  the element.
 - **Focus lost when the card attaches (FR6, AR3).** While the card module
   loads, a fallback `time` with the tab stop renders; when the card attaches it
   replaces that element, so keyboard focus placed on it falls to the page body
@@ -129,11 +124,11 @@ Consumer migration instructions belong in consumer docs and release notes.
 | FR2 | `auto` shows `relative` when the instant is within `autoThreshold` seconds of now (default seven days) and `date_time` otherwise. `relative` uses the locale's long relative phrase and `relative_short` its narrow phrase; a value a few seconds in the future reads as "now". Absolute formats use the shared instant formatter in the provider locale with Gregorian years; `system_*` formats are machine-readable, and `unix_seconds` is zone-independent. `isTimezoneShown` appends the zone abbreviation to `date_time` and `time` only.                                                                                                                                                                                                                                                                                                                | Current source and tests |
 | FR3 | Server markup does not depend on the server's time zone and hydrates without a mismatch. A format that needs the clock renders `date_time` in UTC with the zone shown until the client can read the clock; the client then shows the resolved format without committing the UTC placeholder. Implementation gap: absolute formats other than `unix_seconds` render in the host's time zone, so their server markup depends on the server's zone and hydrating it in another zone produces a text mismatch (Current-state impact).                                                                                                                                                                                                                                                                                                                              | Current source and tests |
 | FR4 | With `isLive` and relative output, the clock refreshes every second under a minute old, every 30 seconds under an hour, every minute under a day, and every five minutes beyond; the timer is cleared on unmount or when the inputs change. Locale changes update the output live.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | Current source and tests |
-| FR5 | Relative output is named by the full absolute date and the long time-zone name unless a caller names the element; absolute output adds no name. A caller's explicit `aria-label` reaches the element (`architecture:public-component-api` INV5). Implementation gap: the component's full-date name replaces a caller `aria-label` on relative output (Current-state impact).                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | Current source and tests |
+| FR5 | Relative output is named by the full absolute date and the long time-zone name unless a caller names the element; absolute output adds no name. A caller's explicit `aria-label` reaches the element (`architecture:public-component-api` INV5).                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | Current source and tests |
 | FR6 | When `hasTooltip` is true and the output is relative or `tooltipEntries` is non-empty, a lazily loaded HoverCard named "Timestamp details" attaches above the timestamp, opening on hover and on keyboard focus; the `time` element gains `tabIndex={0}`. Otherwise no card renders and no tab stop is added. Focus placed on the timestamp stays there when the card attaches (`spec:AST-085` FR4). Implementation gap: while the card module loads, a fallback `time` with the tab stop renders, and attaching the card replaces it, so focus placed on it falls to the page body and no card opens (Current-state impact).                                                                                                                                                                                                                                  | Current source and tests |
 | FR7 | The card is a description list in a grid: an optional label column (present when any row has a label), the value column, and a trailing action column (present when any row is copyable). Without entries it has one copyable row with the full absolute time in the viewer's zone. Each configured entry is one row in the given order, rendered in its own time zone and format, read-only unless `isCopyable`. An unknown time zone does not crash. A description list holds only name-value groups (WCAG 2.2 1.3.1). Implementation gaps: once any row is copyable, every row carries an action-cell `div` inside its row group (empty on read-only rows), so the open card fails the `definition-list` structure check, and a card with no labelled rows, the default card included, renders each row as a lone `dd` with no `dt` (Current-state impact). | Current source and tests |
 | FR8 | A copy button is a small ghost IconButton on the `timestamp-copy-button` target, named "Copy {value}" with a "Copy" tooltip; activating it writes the row's value to the clipboard, switches to a check icon and the "Copied" name and tooltip for 1.5 seconds, and announces "Copied" politely. A clipboard rejection does nothing.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | Current source and tests |
-| FR9 | `ref`, `data-testid`, and other supported DOM, ARIA, data, and event props reach the `time` element; `xstyle`, `className`, and `style` reach the Text wrapper. A caller `aria-labelledby` names the element in place of FR5's name. A caller's explicit `tabIndex` reaches the element (`architecture:public-component-api` INV5). Implementation gap: while a card is attached, the component's `tabIndex={0}` replaces a caller `tabIndex` (Current-state impact).                                                                                                                                                                                                                                                                                                                                                                                          | Current source and tests |
+| FR9 | `ref`, `data-testid`, and other supported DOM, ARIA, data, and event props reach the `time` element; `xstyle`, `className`, and `style` reach the Text wrapper. A caller `aria-labelledby` names the element in place of FR5's name. A caller's explicit `tabIndex` reaches the element (`architecture:public-component-api` INV5).                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | Current source and tests |
 
 ### Allowed variation
 
@@ -161,8 +156,7 @@ Consumer migration instructions belong in consumer docs and release notes.
 - **ORD2 — Card rows.** Non-empty `tooltipEntries` → the default full-date row.
 - **ORD3 — Time element attributes.** `datetime` and `data-testid` are set,
   then caller props; the relative name and the card's tab stop apply only
-  where the caller sets no `aria-label` or `tabIndex` (today they overwrite
-  the caller's, the FR5 and FR9 gaps).
+  where the caller sets no `aria-label` or `tabIndex`.
 
 ### Performance and resources
 
@@ -230,10 +224,10 @@ Consumer migration instructions belong in consumer docs and release notes.
 | FR1, FR2            | `Timestamp.test.tsx` format, auto, locale, and invalid-value tests; stable visual baseline `core-timestamp--default` | Every format; thresholds; locales; unparseable values; default | A wrong phrase, a crossed tier, a non-Gregorian year, a missing `time` element or `datetime`, a crash, or a missing development warning for an unparseable value fails; a changed default type or color comes back changed for review. Gap: no test asserts the `timestamp` target or its format reflection.                                                                                                                                              | `audit:Timestamp/behavior` |
 | FR3                 | `Timestamp.test.tsx` server-rendering suite                                                                          | Server zones; hydration                                        | Zone-dependent markup, a hydration mismatch, or a committed placeholder fails. Gap: no test covers an absolute format rendered on a server in another zone.                                                                                                                                                                                                                                                                                               | `audit:Timestamp/behavior` |
 | FR4, PR1            | `Timestamp.test.tsx` live-update and locale tests                                                                    | Live relative output; locale change                            | A missing refresh or a stale locale fails. Gap: the per-tier refresh intervals and the timer cleanup on unmount or input change have no automated check.                                                                                                                                                                                                                                                                                                  | `audit:Timestamp/behavior` |
-| FR5, AR2            | `Timestamp.test.tsx` naming tests                                                                                    | Relative, absolute, time-zone spelling                         | A missing or short-zone name, or a name on absolute output, fails. The pass-through test "keeps its own spelled-out label on a relative timestamp" pins the caller-`aria-label` replacement, which is the recorded gap, not the contract.                                                                                                                                                                                                                 | `audit:Timestamp/a11y`     |
+| FR5, AR2            | `Timestamp.test.tsx` naming tests                                                                                    | Relative, absolute, time-zone spelling                         | A missing or short-zone name, or a name on absolute output, fails. A caller `aria-label` replaced on relative output fails.                                                                                                                                                                                                                                                                                                                               | `audit:Timestamp/a11y`     |
 | FR6, AR3            | `Timestamp.test.tsx` keyboard-reachability suite                                                                     | Relative, absolute, disabled, entries removed                  | A missing tab stop, `aria-expanded` on the trigger, or a stray tab stop fails. The aria-expanded test also pins `aria-haspopup` on the Text wrapper, which is current behavior, not contract. Gap: no test covers focus on the timestamp while the card module loads, or `aria-controls`.                                                                                                                                                                 | `audit:Timestamp/a11y`     |
 | FR7, FR8, AR4       | `Timestamp.test.tsx` hover-card suites; `tooltipEntries.test.ts`; `useClipboard.test.tsx`                            | Default row, entries, copyable rows, unknown zone              | A wrong row count or order, an unpaired label, a copy button on a read-only row, a wrong copied value, a missing copied state, or a missing announcement fails. Gap: no check runs the `definition-list` structure rule on the open card (the recorded gap); the grid columns and the 1.5-second reset have no automated check; `useClipboard.test.tsx` covers the clipboard-rejection no-op. The lone-`dd` rows of a label-less card are also unchecked. | `audit:Timestamp/behavior` |
-| FR9                 | `Timestamp.test.tsx` ref, test-id, and pass-through tests                                                            | Ref, test id, caller props                                     | A ref, test id, or caller prop missing from the `time` element fails. Gap: no test asserts that `xstyle`, `className`, and `style` reach the Text wrapper, or covers a caller `aria-labelledby` or `tabIndex`.                                                                                                                                                                                                                                            | `audit:Timestamp/behavior` |
+| FR9                 | `Timestamp.test.tsx` ref, test-id, and pass-through tests                                                            | Ref, test id, caller props                                     | A ref, test id, or caller prop missing from the `time` element fails. A caller `tabIndex` replaced while a card is attached fails. Gap: no test asserts that `xstyle`, `className`, and `style` reach the Text wrapper, or covers a caller `aria-labelledby`.                                                                                                                                                                                             | `audit:Timestamp/behavior` |
 | Theming anatomy map | `scripts/check-knowledge.mjs`                                                                                        | Consumer anatomy, targets, HoverCard delegate                  | Missing, extra, or stale mappings fail repository validation.                                                                                                                                                                                                                                                                                                                                                                                             | `audit:Timestamp/theming`  |
 | AR1                 | `Timestamp.test.tsx` `datetime` tests                                                                                | `date_time`; `date`                                            | A missing or wrong ISO `datetime` on `date_time`, or a missing one on `date`, fails. Gap: no test asserts the exact `datetime` on relative or other absolute formats.                                                                                                                                                                                                                                                                                     | `audit:Timestamp/a11y`     |
 | AR2, AR4            | Accessibility-tree evidence (`spec:AST-009` FR3)                                                                     | Relative output; copy buttons                                  | Gap: no accessibility-tree check proves the computed name of relative output or the copy-button names; the unit tests query the DOM.                                                                                                                                                                                                                                                                                                                      | `audit:Timestamp/a11y`     |

package/src/Timestamp/Timestamp.tsx

@@ -443,7 +443,10 @@ export function Timestamp({
         // before rendering — but keep the guard local: an empty aria-label
         // must be omitted entirely (not rendered as aria-label="") so AT
         // falls back to reading the visible <time> content.
-        {...(isRelativeFormat(effectiveFormat) && ariaLabelText !== ''
+        // A caller's own name wins (`component:Timestamp` FR5).
+        {...(isRelativeFormat(effectiveFormat) &&
+        ariaLabelText !== '' &&
+        rest['aria-label'] == null
           ? {'aria-label': ariaLabelText}
           : {})}
         // The hover card is anchored here with focusTrigger="always", which
@@ -454,7 +457,8 @@ export function Timestamp({
         // gratuitous tab stops otherwise. The card carries its own
         // dashed-underline hover indication as the affordance, so the anchor
         // needs no separate focus outline.
-        {...(showTooltip ? {tabIndex: 0} : {})}>
+        // A caller's own tabIndex wins (`component:Timestamp` FR9).
+        {...(showTooltip && rest.tabIndex == null ? {tabIndex: 0} : {})}>
         {displayText}
       </time>
     </Text>

package/src/Timestamp/TimestampHoverCard.tsx

@@ -26,11 +26,11 @@
 import type {ReactNode} from 'react';
 import {useCallback} from 'react';
 import * as stylex from '@stylexjs/stylex';
-import {HoverCard} from '../HoverCard';
-import {IconButton} from '../IconButton';
-import {Icon} from '../Icon';
+import {HoverCard} from '../HoverCard/HoverCard';
+import {IconButton} from '../IconButton/IconButton';
+import {Icon} from '../Icon/Icon';
 import {useClipboard} from '../hooks/useClipboard';
-import {useTranslator} from '../i18n';
+import {useTranslator} from '../i18n/useTranslator';
 import {themeProps} from '../utils/themeProps';
 import {
   colorVars,