@office-iss/react-native-win32 0.71.12 → 0.71.13

package/CHANGELOG.json

@@ -2,7 +2,22 @@
   "name": "@office-iss/react-native-win32",
   "entries": [
     {
-      "date": "Thu, 06 Jul 2023 20:21:09 GMT",
+      "date": "Fri, 04 Aug 2023 23:48:53 GMT",
+      "tag": "@office-iss/react-native-win32_v0.71.13",
+      "version": "0.71.13",
+      "comments": {
+        "patch": [
+          {
+            "author": "email not defined",
+            "package": "@office-iss/react-native-win32",
+            "commit": "958bd7b3a1d65a3cd4076bed410c0cb1b5675740",
+            "comment": "add isDefaultButton check to win32"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Thu, 06 Jul 2023 20:21:35 GMT",
       "tag": "@office-iss/react-native-win32_v0.71.12",
       "version": "0.71.12",
       "comments": {

package/CHANGELOG.md

@@ -1,17 +1,25 @@
 # Change Log - @office-iss/react-native-win32
 
-This log was last generated on Thu, 06 Jul 2023 20:21:09 GMT and should not be manually modified.
+This log was last generated on Fri, 04 Aug 2023 23:48:53 GMT and should not be manually modified.
 
 <!-- Start content -->
 
-## 0.71.12
+## 0.71.13
 
-Thu, 06 Jul 2023 20:21:09 GMT
+Fri, 04 Aug 2023 23:48:53 GMT
 
 ### Patches
 
-- Update core 0.71.6 -> 0.71.12 (30809111+acoates-ms@users.noreply.github.com)
+- add isDefaultButton check to win32 (email not defined)
 
+## 0.71.12
+
+Thu, 06 Jul 2023 20:21:35 GMT
+
+### Patches
+
+- Update core 0.71.6 -> 0.71.12 (30809111+acoates-ms@users.noreply.github.com)
+
 ## 0.71.11
 
 Fri, 23 Jun 2023 18:19:55 GMT

package/Libraries/Pressability/Pressability.win32.js

@@ -427,6 +427,7 @@ export default class Pressability {
   |}>;
   _touchActivateTime: ?number;
   _touchState: TouchState = 'NOT_RESPONDER';
+  _isKeyDown: boolean = false;
 
   constructor(config: PressabilityConfig) {
     this.configure(config);
@@ -468,6 +469,7 @@ export default class Pressability {
         if (onBlur != null) {
           onBlur(event);
         }
+        this._isKeyDown = false;
       },
       onFocus: (event: FocusEvent): void => {
         const {onFocus} = this._config;
@@ -596,7 +598,8 @@ export default class Pressability {
           (event.nativeEvent.code === 'Space' ||
             event.nativeEvent.code === 'Enter' ||
             event.nativeEvent.code === 'GamepadA') &&
-          event.defaultPrevented !== true
+          event.defaultPrevented !== true &&
+          this._isKeyDown
         ) {
           const {onPressOut, onPress} = this._config;
           // $FlowFixMe: PressEvents don't mesh with keyboarding APIs. Keep legacy behavior of passing KeyEvents instead
@@ -604,6 +607,8 @@ export default class Pressability {
           // $FlowFixMe: PressEvents don't mesh with keyboarding APIs. Keep legacy behavior of passing KeyEvents instead
           onPress && onPress(event);
         }
+        // Native windows app clears the key pressed state when another key press interrupts the current
+        this._isKeyDown = false;
       },
       onKeyDown: (event: KeyEvent): void => {
         const {onKeyDown} = this._config;
@@ -616,6 +621,7 @@ export default class Pressability {
           event.defaultPrevented !== true
         ) {
           const {onPressIn} = this._config;
+          this._isKeyDown = true;
           // $FlowFixMe: PressEvents don't mesh with keyboarding APIs. Keep legacy behavior of passing KeyEvents instead
           onPressIn && onPressIn(event);
         }
@@ -780,6 +786,12 @@ export default class Pressability {
     }
   }
 
+  // [Win32]
+  // $FlowFixMe - button typing
+  _isDefaultPressButton(button): boolean {
+    return !button; // Treat 0 or undefined as default press
+  }
+
   /**
    * Performs a transition between touchable states and identify any activations
    * or deactivations (and callback invocations).
@@ -808,7 +820,10 @@ export default class Pressability {
 
     if (isPressInSignal(prevState) && signal === 'LONG_PRESS_DETECTED') {
       const {onLongPress} = this._config;
-      if (onLongPress != null) {
+      if (
+        onLongPress != null &&
+        this._isDefaultPressButton(getTouchFromPressEvent(event).button)
+      ) {
         onLongPress(event);
       }
     }
@@ -829,7 +844,11 @@ export default class Pressability {
         this._deactivate(event);
       }
       const {onLongPress, onPress, android_disableSound} = this._config;
-      if (onPress != null) {
+
+      if (
+        onPress != null &&
+        this._isDefaultPressButton(getTouchFromPressEvent(event).button)
+      ) {
         const isPressCanceledByLongPress =
           onLongPress != null &&
           prevState === 'RESPONDER_ACTIVE_LONG_PRESS_IN' &&
@@ -848,17 +867,20 @@ export default class Pressability {
 
   _activate(event: PressEvent): void {
     const {onPressIn} = this._config;
-    const {pageX, pageY} = getTouchFromPressEvent(event);
+    const {pageX, pageY, button} = getTouchFromPressEvent(event);
     this._touchActivatePosition = {pageX, pageY};
     this._touchActivateTime = Date.now();
-    if (onPressIn != null) {
+    if (onPressIn != null && this._isDefaultPressButton(button)) {
       onPressIn(event);
     }
   }
 
   _deactivate(event: PressEvent): void {
     const {onPressOut} = this._config;
-    if (onPressOut != null) {
+    if (
+      onPressOut != null &&
+      this._isDefaultPressButton(getTouchFromPressEvent(event).button)
+    ) {
       const minPressDuration = normalizeDelay(
         this._config.minPressDuration,
         0,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@office-iss/react-native-win32",
-  "version": "0.71.12",
+  "version": "0.71.13",
   "description": "Implementation of react native on top of Office's Win32 platform.",
   "license": "MIT",
   "main": "./index.win32.js",