fix: Delay onPressUp to native onClick event (#8368)

Author: devongovett

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

@@ -385,7 +385,9 @@ export function usePress(props: PressHookProps): PressResult {
             shouldStopPropagation = stopPressStart && stopPressUp && stopPressEnd;
           } else if (state.isPressed && state.pointerType !== 'keyboard') {
             let pointerType = state.pointerType || (e.nativeEvent as PointerEvent).pointerType as PointerType || 'virtual';
-            shouldStopPropagation = triggerPressEnd(createEvent(e.currentTarget, e), pointerType, true);
+            let stopPressUp = triggerPressUp(createEvent(e.currentTarget, e), pointerType);
+            let stopPressEnd =  triggerPressEnd(createEvent(e.currentTarget, e), pointerType, true);
+            shouldStopPropagation = stopPressUp && stopPressEnd;
             state.isOverTarget = false;
             triggerClick(e);
             cancel(e);
@@ -507,8 +509,8 @@ export function usePress(props: PressHookProps): PressResult {
           return;
         }
 
-        // Only handle left clicks
-        if (e.button === 0) {
+        // Only handle left clicks. If isPressed is true, delay until onClick.
+        if (e.button === 0 && !state.isPressed) {
           triggerPressUp(e, state.pointerType || e.pointerType);
         }
       };
@@ -651,7 +653,7 @@ export function usePress(props: PressHookProps): PressResult {
           return;
         }
 
-        if (!state.ignoreEmulatedMouseEvents && e.button === 0) {
+        if (!state.ignoreEmulatedMouseEvents && e.button === 0 && !state.isPressed) {
           triggerPressUp(e, state.pointerType || 'mouse');
         }
       };

packages/@react-aria/interactions/test/usePress.test.js

@@ -387,17 +387,6 @@ describe('usePress', function () {
           type: 'presschange',
           pressed: true
         },
-        {
-          type: 'pressup',
-          target: el.parentElement,
-          pointerType: 'mouse',
-          ctrlKey: false,
-          metaKey: false,
-          shiftKey: false,
-          altKey: false,
-          x: 0,
-          y: 0
-        },
         {
           type: 'pressend',
           target: el.parentElement,

packages/@react-spectrum/calendar/test/RangeCalendar.test.js

@@ -923,6 +923,7 @@ describe('RangeCalendar', () => {
 
       // mouse up should
       fireEvent.mouseUp(getByText('10'), {detail: 1});
+      fireEvent.click(getByText('10'), {detail: 1});
       selectedDates = getAllByLabelText('selected', {exact: false});
       expect(selectedDates[0].textContent).toBe('10');
       expect(selectedDates[selectedDates.length - 1].textContent).toBe('10');
@@ -967,6 +968,7 @@ describe('RangeCalendar', () => {
 
       // mouse up should
       fireEvent.mouseUp(getByText('20'), {detail: 1});
+      fireEvent.click(getByText('20'), {detail: 1});
       selectedDates = getAllByLabelText('selected', {exact: false});
       expect(selectedDates[0].textContent).toBe('20');
       expect(selectedDates[selectedDates.length - 1].textContent).toBe('20');