chore: update upstream code

package.json

@@ -125,7 +125,7 @@
     "@tailwindcss/postcss": "^4.0.0",
     "@testing-library/dom": "^10.1.0",
     "@testing-library/jest-dom": "^5.16.5",
-    "@testing-library/react": "^15.0.7",
+    "@testing-library/react": "^16.0.0",
     "@testing-library/user-event": "patch:@testing-library/user-event@npm%3A14.6.1#~/.yarn/patches/@testing-library-user-event-npm-14.6.1-5da7e1d4e2.patch",
     "@types/react": "npm:[email protected]",
     "@types/react-dom": "npm:[email protected]",

packages/@internationalized/date/docs/CalendarDate.mdx

@@ -72,7 +72,7 @@ date.toString(); // '2022-02-03'
 
 By default, `CalendarDate` uses the Gregorian calendar system, but many other calendar systems that are used around the world are supported, such as Hebrew, Indian, Islamic, Buddhist, Ethiopic, and more. A <TypeLink links={docs.links} type={docs.exports.Calendar} /> instance can be passed to the `CalendarDate` constructor to represent dates in that calendar system.
 
-This example creates a date in the Buddhist calendar system, which is equivalent to April 4th, 2020 in the Gregorian calendar.
+This example creates a date in the Buddhist calendar system, which is equivalent to April 30th, 2020 in the Gregorian calendar.
 
 ```tsx
 import {BuddhistCalendar} from '@internationalized/date';
@@ -86,7 +86,7 @@ See the [Calendar](Calendar.html#implementations) docs for details about the sup
 
 Many calendar systems have only one era, or a modern era and a pre-modern era (e.g. AD and BC in the Gregorian calendar). However, other calendar systems may have many eras. For example, the Japanese calendar has eras for the reign of each Emperor. `CalendarDate` represents eras using string identifiers, which can be passed as an additional parameter to the constructor before the year. When eras are present, years are numbered starting from 1 within the era.
 
-This example creates a date in the Japanese calendar system, which is equivalent to April 4th, 2020 in the Gregorian calendar.
+This example creates a date in the Japanese calendar system, which is equivalent to April 30th, 2019 in the Gregorian calendar.
 
 ```tsx
 import {JapaneseCalendar} from '@internationalized/date';

packages/@react-aria/collections/src/Document.ts

@@ -460,9 +460,13 @@ export class Document<T, C extends BaseCollection<T> = BaseCollection<T>> extend
   }
 
   updateCollection(): void {
-    // First, update the indices of dirty element children.
+    // First, remove disconnected nodes and update the indices of dirty element children.
     for (let element of this.dirtyNodes) {
-      element.updateChildIndices();
+      if (element instanceof ElementNode && (!element.isConnected || element.isHidden)) {
+        this.removeNode(element);
+      } else {
+        element.updateChildIndices();
+      }
     }
 
     // Next, update dirty collection nodes.
@@ -471,8 +475,6 @@ export class Document<T, C extends BaseCollection<T> = BaseCollection<T>> extend
         if (element.isConnected && !element.isHidden) {
           element.updateNode();
           this.addNode(element);
-        } else {
-          this.removeNode(element);
         }
 
         element.isMutated = false;

packages/@react-aria/grid/src/useGrid.ts

@@ -53,7 +53,16 @@ export interface GridProps extends DOMProps, AriaLabelingProps {
   /** Handler that is called when a user performs an action on the row. */
   onRowAction?: (key: Key) => void,
   /** Handler that is called when a user performs an action on the cell. */
-  onCellAction?: (key: Key) => void
+  onCellAction?: (key: Key) => void,
+  /**
+   * Whether pressing the escape key should clear selection in the grid or not.
+   *
+   * Most experiences should not modify this option as it eliminates a keyboard user's ability to
+   * easily clear selection. Only use if the escape key is being handled externally or should not
+   * trigger selection clearing contextually.
+   * @default 'clearSelection'
+   */
+  escapeKeyBehavior?: 'clearSelection' | 'none'
 }
 
 export interface GridAria {
@@ -77,7 +86,8 @@ export function useGrid<T>(props: GridProps, state: GridState<T, GridCollection<
     scrollRef,
     getRowText,
     onRowAction,
-    onCellAction
+    onCellAction,
+    escapeKeyBehavior = 'clearSelection'
   } = props;
   let {selectionManager: manager} = state;
 
@@ -106,7 +116,8 @@ export function useGrid<T>(props: GridProps, state: GridState<T, GridCollection<
     keyboardDelegate: delegate,
     isVirtualized,
     scrollRef,
-    disallowTypeAhead
+    disallowTypeAhead,
+    escapeKeyBehavior
   });
 
   let id = useId(props.id);

packages/@react-aria/gridlist/src/useGridList.ts

@@ -48,7 +48,16 @@ export interface AriaGridListProps<T> extends GridListProps<T>, DOMProps, AriaLa
    * via the left/right arrow keys or the tab key.
    * @default 'arrow'
    */
-  keyboardNavigationBehavior?: 'arrow' | 'tab'
+  keyboardNavigationBehavior?: 'arrow' | 'tab',
+  /**
+   * Whether pressing the escape key should clear selection in the grid list or not.
+   *
+   * Most experiences should not modify this option as it eliminates a keyboard user's ability to
+   * easily clear selection. Only use if the escape key is being handled externally or should not
+   * trigger selection clearing contextually.
+   * @default 'clearSelection'
+   */
+  escapeKeyBehavior?: 'clearSelection' | 'none'
 }
 
 export interface AriaGridListOptions<T> extends Omit<AriaGridListProps<T>, 'children'> {
@@ -105,7 +114,8 @@ export function useGridList<T>(props: AriaGridListOptions<T>, state: ListState<T
     onAction,
     disallowTypeAhead,
     linkBehavior = 'action',
-    keyboardNavigationBehavior = 'arrow'
+    keyboardNavigationBehavior = 'arrow',
+    escapeKeyBehavior = 'clearSelection'
   } = props;
 
   if (!props['aria-label'] && !props['aria-labelledby']) {
@@ -124,7 +134,8 @@ export function useGridList<T>(props: AriaGridListOptions<T>, state: ListState<T
     shouldFocusWrap: props.shouldFocusWrap,
     linkBehavior,
     disallowTypeAhead,
-    autoFocus: props.autoFocus
+    autoFocus: props.autoFocus,
+    escapeKeyBehavior
   });
 
   let id = useId(props.id);

packages/@react-aria/interactions/src/useMove.ts

@@ -93,7 +93,7 @@ export function useMove(props: MoveEvents): MoveResult {
       state.current.didMove = false;
     };
 
-    if (typeof PointerEvent === 'undefined') {
+    if (typeof PointerEvent === 'undefined' && process.env.NODE_ENV === 'test') {
       let onMouseMove = (e: MouseEvent) => {
         if (e.button === 0) {
           move(e, 'mouse', e.pageX - (state.current.lastPosition?.pageX ?? 0), e.pageY - (state.current.lastPosition?.pageY ?? 0));
@@ -151,7 +151,7 @@ export function useMove(props: MoveEvents): MoveResult {
         addGlobalListener(window, 'touchend', onTouchEnd, false);
         addGlobalListener(window, 'touchcancel', onTouchEnd, false);
       };
-    } else if (process.env.NODE_ENV === 'test') {
+    } else {
       let onPointerMove = (e: PointerEvent) => {
         if (e.pointerId === state.current.id) {
           let pointerType = (e.pointerType || 'mouse') as PointerType;

packages/@react-aria/interactions/src/usePress.ts

@@ -176,8 +176,7 @@ export function usePress(props: PressHookProps): PressResult {
     preventFocusOnPress,
     shouldCancelOnPointerExit,
     allowTextSelectionOnPress,
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    ref: _, // Removing `ref` from `domProps` because TypeScript is dumb
+    ref: domRef,
     ...domProps
   } = usePressResponderContext(props);
 
@@ -814,13 +813,26 @@ export function usePress(props: PressHookProps): PressResult {
     triggerSyntheticClick
   ]);
 
-  // Remove user-select: none in case component unmounts immediately after pressStart
+  // Avoid onClick delay for double tap to zoom by default.
+  useEffect(() => {
+    let element = domRef?.current;
+    if (element && (element instanceof getOwnerWindow(element).Element)) {
+      // Only apply touch-action if not already set by another CSS rule.
+      let style = getOwnerWindow(element).getComputedStyle(element);
+      if (style.touchAction === 'auto') {
+        // touchAction: 'manipulation' is supposed to be equivalent, but in 
+        // Safari it causes onPointerCancel not to fire on scroll.
+        // https://bugs.webkit.org/show_bug.cgi?id=240917
+        (element as HTMLElement).style.touchAction = 'pan-x pan-y pinch-zoom';
+      }
+    }
+  }, [domRef]);
 
+  // Remove user-select: none in case component unmounts immediately after pressStart
   useEffect(() => {
     let state = ref.current;
     return () => {
       if (!allowTextSelectionOnPress) {
-
         restoreTextSelection(state.target ?? undefined);
       }
       for (let dispose of state.disposables) {

packages/@react-aria/interactions/stories/usePress.stories.tsx

@@ -19,7 +19,7 @@ import {
   Modal,
   ModalOverlay
 } from 'react-aria-components';
-import React from 'react';
+import React, {useState} from 'react';
 import styles from './usePress-stories.css';
 import {usePress} from '@react-aria-nutrient/interactions';
 
@@ -234,3 +234,70 @@ export function SoftwareKeyboardIssue() {
     </div>
   );
 }
+
+export function AndroidUnmountIssue() {
+  let [showButton, setShowButton] = useState(true);
+
+  return (
+    <div style={{display: 'flex', flexDirection: 'column', alignItems: 'center'}}>
+      <p>This story tests an Android issue where tapping a button that unmounts causes the element behind it to receive onClick.</p>
+      <div style={{position: 'relative', width: 100, height: 100}}>
+        <button
+          type="button"
+          onClick={() => {
+            alert('button underneath was pressed');
+          }}
+          style={{position: 'absolute', top: 0}}>
+          Test 2
+        </button>
+        {showButton && (
+          <Button
+            className="foo"
+            style={{position: 'absolute', top: 0}}
+            onPress={() => {
+              console.log('ra Button pressed');
+              setShowButton(false);
+            }}>
+            Test
+          </Button>
+        )}
+      </div>
+    </div>
+  );
+}
+
+export function IOSScrollIssue() {
+  return (
+    <div style={{display: 'flex', flexDirection: 'column', alignItems: 'center'}}>
+      <p>This story tests an iOS Safari issue that causes onPointerCancel not to be fired with touch-action: manipulation. Scrolling the list should not trigger onPress.</p>
+      <div
+        style={{
+          marginTop: 10,
+          width: 500,
+          height: 100,
+          overflowY: 'hidden',
+          overflowX: 'auto',
+          border: '1px solid black',
+          display: 'flex',
+          gap: 8
+        }}>
+        {Array.from({length: 10}).map((_, i) => (
+          <Card key={i} />
+        ))}
+      </div>
+    </div>
+  );
+}
+
+function Card() {
+  return (
+    <Button
+      className="foo"
+      style={{height: 80, width: 150, flexShrink: 0}}
+      onPress={() => {
+        alert('pressed');
+      }}>
+      Test
+    </Button>
+  );
+}