@octanejs/aria 0.0.46 → 0.0.47

package/README.md

@@ -15,16 +15,17 @@ pnpm add @octanejs/aria
 - `@octanejs/aria` — the `react-aria` behavior-hook surface.
 - `@octanejs/aria/stately` — the `react-stately` state-hook surface.
 - `@octanejs/aria/components` — the complete public export surface of
-  `react-aria-components@1.19.0`.
+  `react-aria-components@1.20.0`.
 
 Ported from the pinned `adobe/react-spectrum` checkout at commit
-`1c84a49a1faf50b571c84e00bcf9c60b22ddd03e`, which publishes
-`react-aria@3.50.0`, `react-stately@3.48.0`, and
-`react-aria-components@1.19.0`. The components entry point has an exact checked
-crosswalk: all 280 runtime exports and all 313 type exports match the pinned
+`5ecb3333001313e83898cd07644227897e3bae1f`, which publishes
+`react-aria@3.51.0`, `react-stately@3.49.0`, and
+`react-aria-components@1.20.0`. The components entry point has an exact checked
+crosswalk: all 286 runtime exports and all 327 type exports match the pinned
 package, with no missing or extra names. Existing families retain differential
 tests against React; calendar/date, color, drag and drop, file, data, toast, and
-layout additions have focused public-behavior coverage.
+layout additions have focused public-behavior coverage. The 1.20 release adds
+TokenField and PreviewTrigger, keyboard shortcut bindings, and context-menu triggers.
 
 Status, supported surface, and known divergences: `status.json` (rendered into
 `docs/bindings-status.md`). Source provenance and refresh instructions:

package/UPSTREAM.md

@@ -1,108 +1,97 @@
 # React Aria upstream ledger
 
 `@octanejs/aria` targets the coordinated React Spectrum release at commit
-`1c84a49a1faf50b571c84e00bcf9c60b22ddd03e`:
+`5ecb3333001313e83898cd07644227897e3bae1f`:
 
-| Package | Version | Verified tag | npm SHA-256 | npm integrity |
-| --- | --- | --- | --- | --- |
-| `react-aria` | `3.50.0` | `react-aria@3.50.0` | `bcab487177dba271a36f247531043c3c940579cacc201e31bbdbba29ef2d2a7c` | `sha512-S0Os6QZk33fzUAKu1QLT9afoUaCBt1ZNdoiq0n2YMVgKIdNIQS8zxiZ8O9hYE6QyDkHKjD6q39LQZ+qaSAIgjw==` |
-| `react-aria-components` | `1.19.0` | `react-aria-components@1.19.0` | `d63da4e2ab794d3a86a16ba17b719f22a256d9c0c5fd22c057d228e0f05932a1` | `sha512-2smSS5nqJ8cGYMQezuUXveZm7eMyHCqTN6mDpylQBYLYbdF5dxCCuW1DHn1VKLe1DybSfPvX/cZtJlDmvFfn8A==` |
-| `react-stately` | `3.48.0` | `react-stately@3.48.0` | `55f38303d09112619b9adc754032ba3caadc7e5a0b7fbc74bfc5636369674dd4` | `sha512-ImicSAG+lTotAe5izcs1fz49Zk48w7pDusqYg04WaPhCoej8BJ24soMu3iLXIrsi273s4P1gZrYGrqReMfgEEA==` |
+| Package | Version | npm SHA-256 | npm integrity |
+| --- | --- | --- | --- |
+| `react-aria` | `3.51.0` | `8d404cc6c43909f85dcd207435614db08f38c69553b8085bed2910c61b7e89fa` | `sha512-AyWLw0XR38cFPwBu/ErgGaVrc5dupLEKmRlMXTGvFKOtbaGRQ2+yQJkjVhpdHhoRhU4+G+tJDFeHDTS8tK3bfQ==` |
+| `react-aria-components` | `1.20.0` | `b63f044f9cb25cb48789b8c2ce06b27c83a81c94c6413a29766eabb3c15458dd` | `sha512-BMbpIgoV9aELeBrB0Y120NgoigHb5OdcJwc+4e7uSnbTbamea6lo+gqcc4LAxzMaK3Jf+7LI1oCDE6yANsmxIQ==` |
+| `react-stately` | `3.49.0` | `90e49592b8c2aa351c9e25c2ad82f477aa50682dd7ef9afe8c7c11a01f856793` | `sha512-13iNq2KzBrRAzxRc+n53hgROfIistiYY/sPtIhCw1qUB7/kmo+X1xEU2uiS5zcCIrc55AUPwoHqOIIpKWSwB9A==` |
 
-All three signed registry artifacts record the same `gitHead`, and all three tags resolve to
-that commit. The ordered composite SHA-256 of the three npm tarballs is
-`dcad3293f0f7438705f72cdd7df03351476aeaba7d0d2743c7ad6d8130aff56f`.
-The supported range is these exact coordinated versions; upgrades require a new crosswalk.
+Registry metadata and tarball manifests record the same `gitHead` for all three
+packages. Downloaded bytes match their npm SHA-512 integrity values. The ordered
+SHA-256 of the three concatenated tarballs is
+`775b11dacccd090af9b3a59f47b17dcf03efd7cf09be32b5b8e94dc707167b86`.
+The supported range is these exact coordinated versions.
 
 ## Source and test boundary
 
-- Canonical repository: `https://github.com/adobe/react-spectrum.git`
-- Source roots: `packages/react-aria/src`, `packages/react-aria-components/src`, and
-  `packages/react-stately/src`
+- Repository: `https://github.com/adobe/react-spectrum.git`
+- Source roots: `packages/react-aria/src`, `packages/react-aria-components/src`, and `packages/react-stately/src`
 - Public entry points: each package's `exports/index.ts`
 - Test roots: each package's `test` directory
-- License: Apache-2.0; the pinned root `LICENSE` SHA-256 is
-  `7dfe6526888bac51759c99f9a51262ba2711a8c12a067f2181609dd9a4066b84`
+- License: Apache-2.0; root `LICENSE` SHA-256 `7dfe6526888bac51759c99f9a51262ba2711a8c12a067f2181609dd9a4066b84`
 - React oracle: `react@19.2.7` and `react-dom@19.2.7`
 
-The monorepo source and suites are not vendored in this retrofit because the three package
-trees contain more than two thousand source/support files. The immutable external checkout
-can be reproduced with:
+The exact source can be reproduced with:
 
 ```sh
-git clone --depth 1 --branch react-aria@3.50.0 --filter=blob:none --sparse \
-  https://github.com/adobe/react-spectrum.git react-spectrum-aria-3.50.0
-git -C react-spectrum-aria-3.50.0 sparse-checkout set --skip-checks \
-  packages/react-aria packages/react-aria-components packages/react-stately LICENSE
+git clone --filter=blob:none --sparse https://github.com/adobe/react-spectrum.git react-spectrum-aria
+git -C react-spectrum-aria checkout 5ecb3333001313e83898cd07644227897e3bae1f
+git -C react-spectrum-aria sparse-checkout set packages/react-aria packages/react-aria-components packages/react-stately
 ```
 
-`audit/upstream-crosswalk.json` records all 1,294 public entry-point exports and all 185
-test-root artifacts from that checkout. It currently classifies 998 exports as
-`surface-present-unverified`, with per-symbol entry-point evidence, and 296 as explicit gaps.
-Surface presence is not a behavioral parity claim. The upstream suites contain 177 runtime
-test files, one type test, and seven support artifacts. They are present but have not been
-adapted case-by-case, so this binding remains `recorded-unverified`.
+`audit/upstream-crosswalk.json` classifies all 1,340 public entry-point exports and
+198 test-root artifacts: 1,044 exports are `surface-present-unverified`, and 296
+remain explicit gaps in the curated root/stately surfaces. These gaps predate
+this update. The checkout contains 189 runtime test files, one type test, and eight
+support artifacts. Surface presence is not a behavior-parity claim.
 
 ## React Aria Components public surface
 
-The `@octanejs/aria/components` entry point separately claims complete named-export parity
-with the pinned `react-aria-components@1.19.0` package. The completed inventory is 280 runtime
-exports and 313 type exports, including calendar/date/time, color, drag-and-drop,
-DropZone/FileTrigger, toast, data hooks, Virtualizer, and layout classes.
-
-`scripts/check-react-aria-components-exports.mjs` parses the installed pinned declaration
-barrel and `src/components/index.ts`, keeps runtime and type-only exports in separate lanes,
-and rejects missing or extra names in either direction:
+`@octanejs/aria/components` matches all 286 runtime and 327 type export names from
+`react-aria-components@1.20.0`, including the new TokenField and PreviewTrigger
+families. `scripts/check-react-aria-components-exports.mjs` checks runtime and type
+names separately and rejects missing or extra names in either direction:
 
 ```sh
 pnpm --filter @octanejs/aria exports:check
 ```
 
-This components-entry claim does not convert the broader `react-aria` and `react-stately`
-crosswalk into a full-export or full-upstream-suite claim.
+The root behavior hooks and `/stately` remain curated surfaces. This export check
+does not claim complete type assignability or execution of every upstream suite.
 
-## Refreshing the advanced source staging tree
+## Refreshing source
 
-The sparse `.react-spectrum` checkout must point at the exact coordinated commit above.
-`scripts/port-advanced-source.mjs` creates a reviewable staging tree, rewrites package
-boundaries to the local Octane adapters, copies locale dictionaries, and records provenance.
-It must not target `packages/aria`, because reviewed Octane adaptations must not be
-overwritten mechanically.
+`scripts/port-advanced-source.mjs` creates a staging tree from the pinned source,
+rewrites package boundaries, and copies locale dictionaries. It rejects
+`packages/aria` as an output location so mechanical conversion cannot overwrite
+reviewed native-event, ref, and hook-slot adaptations.
 
 ```sh
 node packages/aria/scripts/port-advanced-source.mjs \
+  --source-checkout /tmp/react-spectrum-aria \
   --output-root /tmp/octane-aria-upstream
 ```
 
-Review the staged diff against `packages/aria`, preserve native-event, ref-as-prop,
-hook-slot, and compiler adaptations, then run the export audit, `tsrx-tsc`, and the Aria
-test projects. Updating the pin requires reviewing the upstream source and export diffs
-together. Newly adapted Adobe source retains its Apache-2.0 header; the required license
-text is shipped as `LICENSE-APACHE-2.0`.
+Review the release diff, preserve Octane adaptations, and run the export audit,
+`tsrx-tsc`, Aria test projects, and Shadcn integration tests. New Adobe source retains
+its Apache-2.0 header; `LICENSE-APACHE-2.0` ships the license text. Artifact hashes and
+release adaptation notes live in `audit/release-1.20.0.json`.
 
 ## Executable evidence
 
-The only React-parity-owned executable lane today is the bounded differential project. It
-compiles the same `.tsrx` fixtures once for Octane and once for the pinned React packages,
-covering interaction hooks, form-field event wiring, collections, Select, ComboBox, React Aria
-Components render props, keyed collection updates, and Tree/Table state.
+The differential project compiles shared fixtures for Octane and the pinned React
+packages. It covers interaction hooks, forms, collections, Select, ComboBox, render
+props, keyed updates, Tree/Table, and the new shortcut and TokenField markup cases.
+
+The complete 96-case upstream TokenFieldValue file and its source are vendored under
+`upstream/react-stately`. The `aria-token-value-pristine` and
+`aria-token-value-adapted` projects run the original source and the Octane adaptation,
+respectively. The adaptation preserves every case and assertion while replacing the
+source import and test registration and removing the React-version gate. Per-case
+inventories and file hashes are recorded in `audit/react-parity.json`.
 
-That lane is representative evidence only. Declaring the upstream runtime and type suites
-`present` records that the coordinated checkout contains those suites; it is not a claim that
-this binding has completed pristine full-suite, one-for-one adapted, or type-lane execution.
-The export/test crosswalk and Octane-only divergence/framework contracts remain ordinary-shard
-coverage until those required lanes and inventories exist.
+This is bounded evidence for one upstream file. Other upstream runtime and type
+suites have not been adapted case-by-case, so the binding remains
+`recorded-unverified`. Octane-only tests separately cover native event wiring, SSR,
+hydration, and component integration.
 
 ## Intentional divergences
 
-- Native text editing uses Octane `onInput` wiring while public value callbacks retain their
-  upstream `onChange(value)` names.
-- React `forwardRef` wrappers become Octane ref-as-prop components.
-- The i18n server serializer keeps generated identifiers valid after 26 hoisted strings,
-  correcting invalid JavaScript emitted by the pinned upstream algorithm.
-- Server locale direction is derived from the injected locale, including RTL locales, rather
-  than being hard-coded to `ltr`.
-
-`native-input-event-wiring` is linked to the differential case in `audit/react-parity.json`.
-The other divergences above remain documented package contracts with ordinary-shard tests; they
-are not counted as completed React-parity suite evidence until adapted upstream lanes exist.
+- Native text editing uses `onInput`; value-level `onChange(value)` callbacks retain their names.
+- Refs are ordinary props, including adapters for upstream `forwardRef` wrappers.
+- React Server Components are outside the Octane binding.
+- The i18n server serializer produces valid identifiers after 26 hoisted strings.
+- Server locale direction follows the injected locale, including RTL locales.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@octanejs/aria",
-  "version": "0.0.46",
+  "version": "0.0.47",
   "license": "MIT AND Apache-2.0",
   "type": "module",
   "sideEffects": [
@@ -46,26 +46,26 @@
     "./components": "./src/components/index.ts"
   },
   "dependencies": {
-    "@internationalized/date": "^3.12.2",
+    "@internationalized/date": "^3.12.3",
     "@internationalized/number": "^3.6.7",
-    "@internationalized/string": "^3.2.9",
-    "@react-types/shared": "^3.36.0",
+    "@internationalized/string": "^3.2.10",
+    "@react-types/shared": "^3.36.1",
     "clsx": "^2.1.1"
   },
   "peerDependencies": {
     "octane": "^0.1.51 || ^0.2.0"
   },
   "devDependencies": {
-    "@tsrx/react": "^0.2.63",
+    "@tsrx/react": "^0.2.69",
     "esbuild": "^0.28.1",
-    "react": "^19.2.7",
-    "react-aria": "3.50.0",
-    "react-aria-components": "1.19.0",
-    "react-dom": "^19.2.7",
-    "react-stately": "3.48.0",
+    "react": "19.2.7",
+    "react-aria": "3.51.0",
+    "react-aria-components": "1.20.0",
+    "react-dom": "19.2.7",
+    "react-stately": "3.49.0",
     "typescript": "^5.9.3",
     "vitest": "^4.1.10",
-    "octane": "0.2.0"
+    "octane": "0.2.7"
   },
   "scripts": {
     "exports:check": "node scripts/check-react-aria-components-exports.mjs",

package/src/calendar/useCalendarGrid.tsx

@@ -1,5 +1,5 @@
 /** @jsxImportSource octane */
-// Ported from adobe/react-spectrum@1c84a49a1faf50b571c84e00bcf9c60b22ddd03e (packages/react-aria/src/calendar/useCalendarGrid.ts).
+// Ported from adobe/react-spectrum@5ecb3333001313e83898cd07644227897e3bae1f (packages/react-aria/src/calendar/useCalendarGrid.ts).
 /*
  * Copyright 2020 Adobe. All rights reserved.
  * This file is licensed to you under the Apache License, Version 2.0 (the "License");
@@ -19,12 +19,13 @@ import {
 } from '../upstream-exports/react-stately/useCalendarState';
 import { DOMAttributes } from '@react-types/shared';
 import { hookData, useVisibleRangeDescription } from './utils';
-import { KeyboardEvent, useMemo } from '../compat/react';
 import { mergeProps } from '../utils/mergeProps';
 import { RangeCalendarState } from '../upstream-exports/react-stately/useRangeCalendarState';
 import { useDateFormatter } from '../i18n/useDateFormatter';
+import { useKeyboard } from '../interactions/useKeyboard';
 import { useLabels } from '../utils/useLabels';
 import { useLocale } from '../i18n/I18nProvider';
+import { useMemo } from '../compat/react';
 
 export interface AriaCalendarGridProps {
 	/**
@@ -83,70 +84,67 @@ export function useCalendarGrid(
 
 	let { direction } = useLocale();
 
-	let onKeyDown = (e: KeyboardEvent) => {
-		switch (e.key) {
-			case 'Enter':
-			case ' ':
-				e.preventDefault();
-				state.selectFocusedDate();
-				break;
-			case 'PageUp':
-				e.preventDefault();
-				e.stopPropagation();
-				state.focusPreviousSection(e.shiftKey);
-				break;
-			case 'PageDown':
-				e.preventDefault();
-				e.stopPropagation();
-				state.focusNextSection(e.shiftKey);
-				break;
-			case 'End':
-				e.preventDefault();
-				e.stopPropagation();
+	let { keyboardProps } = useKeyboard({
+		shortcuts: {
+			End: () => {
 				state.focusSectionEnd();
-				break;
-			case 'Home':
-				e.preventDefault();
-				e.stopPropagation();
+			},
+			Home: () => {
 				state.focusSectionStart();
-				break;
-			case 'ArrowLeft':
-				e.preventDefault();
-				e.stopPropagation();
+			},
+			Escape: () => {
+				// Cancel the selection.
+				if ('setAnchorDate' in state) {
+					state.setAnchorDate(null);
+				}
+				return false; // TODO: is this really correct? or should it return true when we cancel and only propagate if there's nothing to do
+			},
+		},
+	});
+
+	let { keyboardProps: repeatKeyboardProps } = useKeyboard({
+		shortcuts: {
+			Enter: () => {
+				state.selectFocusedDate();
+			},
+			' ': () => {
+				state.selectFocusedDate();
+			},
+			PageUp: () => {
+				state.focusPreviousSection();
+			},
+			'Shift+PageUp': () => {
+				state.focusPreviousSection(true);
+			},
+			PageDown: () => {
+				state.focusNextSection();
+			},
+			'Shift+PageDown': () => {
+				state.focusNextSection(true);
+			},
+			ArrowLeft: () => {
 				if (direction === 'rtl') {
 					state.focusNextDay();
 				} else {
 					state.focusPreviousDay();
 				}
-				break;
-			case 'ArrowUp':
-				e.preventDefault();
-				e.stopPropagation();
+			},
+			ArrowUp: () => {
 				state.focusPreviousRow();
-				break;
-			case 'ArrowRight':
-				e.preventDefault();
-				e.stopPropagation();
+			},
+			ArrowRight: () => {
 				if (direction === 'rtl') {
 					state.focusPreviousDay();
 				} else {
 					state.focusNextDay();
 				}
-				break;
-			case 'ArrowDown':
-				e.preventDefault();
-				e.stopPropagation();
+			},
+			ArrowDown: () => {
 				state.focusNextRow();
-				break;
-			case 'Escape':
-				// Cancel the selection.
-				if ('setAnchorDate' in state) {
-					e.preventDefault();
-					state.setAnchorDate(null);
-				}
-				break;
-		}
-	};
+			},
+		},
+		allowRepeats: true,
+	});
 
 	let visibleRangeDescription = useVisibleRangeDescription(
 		startDate,
@@ -181,16 +179,20 @@ export function useCalendarGrid(
 	let weeksInMonth = state.getWeeksInMonth(startDate);
 
 	return {
-		gridProps: mergeProps(labelProps, {
-			role: 'grid',
-			'aria-readonly': state.isReadOnly || undefined,
-			'aria-disabled': state.isDisabled || undefined,
-			'aria-multiselectable':
-				'highlightedRange' in state || state.selectionMode === 'multiple' || undefined,
-			onKeyDown,
-			onFocus: () => state.setFocused(true),
-			onBlur: () => state.setFocused(false),
-		}) as unknown as DOMAttributes,
+		gridProps: mergeProps(
+			labelProps,
+			{
+				role: 'grid',
+				'aria-readonly': state.isReadOnly || undefined,
+				'aria-disabled': state.isDisabled || undefined,
+				'aria-multiselectable':
+					'highlightedRange' in state || state.selectionMode === 'multiple' || undefined,
+				onFocus: () => state.setFocused(true),
+				onBlur: () => state.setFocused(false),
+			},
+			keyboardProps,
+			repeatKeyboardProps,
+		),
 		headerProps: {
 			// Column headers are hidden to screen readers to make navigating with a touch screen reader easier.
 			// The day names are already included in the label of each cell, so there's no need to announce them twice.

package/src/collections/Document.ts

@@ -437,6 +437,9 @@ export class Document<T, C extends BaseCollection<T> = BaseCollection<T>> {
 
 	subscribe(fn: () => void): () => boolean {
 		this.subscriptions.add(fn);
+		if (this.queuedRender) {
+			fn();
+		}
 		return (): boolean => this.subscriptions.delete(fn);
 	}