Merge branch 'main' into upgrade-sb-8-2

Author: snowystinger

packages/@react-aria/datepicker/src/useDatePickerGroup.ts

@@ -110,7 +110,7 @@ export function useDatePickerGroup(state: DatePickerState | DateRangePickerState
       }
     },
     onPress(e) {
-      if (e.pointerType !== 'mouse') {
+      if (e.pointerType === 'touch' || e.pointerType === 'pen') {
         focusLast();
       }
     }

packages/react-aria-components/test/DateField.test.js

@@ -339,6 +339,23 @@ describe('DateField', () => {
     expect(document.activeElement).toBe(segments[0]);
   });
 
+  it('should do nothing when pressing enter', async () => {
+    let {getAllByRole} = render(
+      <DateField defaultValue={new CalendarDate(2024, 12, 31)}>
+        <Label>Birth date</Label>
+        <DateInput>
+          {segment => <DateSegment segment={segment} />}
+        </DateInput>
+      </DateField>
+    );
+  
+    let segments = getAllByRole('spinbutton');
+    await user.click(segments[2]);
+    expect(segments[2]).toHaveFocus();
+    await user.keyboard('{Enter}');
+    expect(segments[2]).toHaveFocus();
+  });
+
   it('does not crash on unknown segment types', async () => {
     let {getByRole} = render(
       <I18nProvider locale="zh-CN-u-ca-chinese">