@office-iss/react-native-win32 0.72.1 → 0.72.3

package/CHANGELOG.json

@@ -2,7 +2,49 @@
   "name": "@office-iss/react-native-win32",
   "entries": [
     {
-      "date": "Wed, 19 Jul 2023 18:43:20 GMT",
+      "date": "Mon, 28 Aug 2023 15:14:00 GMT",
+      "tag": "@office-iss/react-native-win32_v0.72.3",
+      "version": "0.72.3",
+      "comments": {
+        "patch": [
+          {
+            "author": "krsiler@microsoft.com",
+            "package": "@office-iss/react-native-win32",
+            "commit": "e1ba8c787d9d100f4919e96ab5e39d8a21aa1600",
+            "comment": "fix a11yState and add support for aria-required and -multiselectable"
+          },
+          {
+            "author": "30809111+acoates-ms@users.noreply.github.com",
+            "package": "@office-iss/react-native-win32",
+            "commit": "89c50c302edadaa79f458f3e7252971f70d7dbb1",
+            "comment": "Remove flow usage from saveAssetPlugin codeflow"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Mon, 14 Aug 2023 15:18:19 GMT",
+      "tag": "@office-iss/react-native-win32_v0.72.2",
+      "version": "0.72.2",
+      "comments": {
+        "patch": [
+          {
+            "author": "email not defined",
+            "package": "@office-iss/react-native-win32",
+            "commit": "3e3d2da8e1bc2899525dc48e80d86df4e32c104d",
+            "comment": "add isDefaultButton check to win32"
+          },
+          {
+            "author": "30809111+acoates-ms@users.noreply.github.com",
+            "package": "@office-iss/react-native-win32",
+            "commit": "30ecf04918029a8699096532c8b13d4ae7a4b4f3",
+            "comment": "Add saveAssetPlugin to fix long path assets"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Wed, 19 Jul 2023 18:43:52 GMT",
       "tag": "@office-iss/react-native-win32_v0.72.1",
       "version": "0.72.1",
       "comments": {

package/CHANGELOG.md

@@ -1,17 +1,35 @@
 # Change Log - @office-iss/react-native-win32
 
-This log was last generated on Wed, 19 Jul 2023 18:43:20 GMT and should not be manually modified.
+This log was last generated on Mon, 28 Aug 2023 15:14:00 GMT and should not be manually modified.
 
 <!-- Start content -->
 
-## 0.72.1
+## 0.72.3
 
-Wed, 19 Jul 2023 18:43:20 GMT
+Mon, 28 Aug 2023 15:14:00 GMT
 
 ### Patches
 
-- Integrate RN 0.72.3 (jthysell@microsoft.com)
+- fix a11yState and add support for aria-required and -multiselectable (krsiler@microsoft.com)
+- Remove flow usage from saveAssetPlugin codeflow (30809111+acoates-ms@users.noreply.github.com)
 
+## 0.72.2
+
+Mon, 14 Aug 2023 15:18:19 GMT
+
+### Patches
+
+- add isDefaultButton check to win32 (email not defined)
+- Add saveAssetPlugin to fix long path assets (30809111+acoates-ms@users.noreply.github.com)
+
+## 0.72.1
+
+Wed, 19 Jul 2023 18:43:52 GMT
+
+### Patches
+
+- Integrate RN 0.72.3 (jthysell@microsoft.com)
+
 ## 0.72.0
 
 Fri, 23 Jun 2023 22:30:08 GMT

package/Libraries/Components/Button.win32.js

@@ -163,6 +163,8 @@ type ButtonProps = $ReadOnly<{|
   'aria-disabled'?: ?boolean,
   'aria-expanded'?: ?boolean,
   'aria-selected'?: ?boolean,
+  'aria-multiselectable'?: ?boolean, // Win32
+  'aria-required'?: ?boolean, // Win32
 
   /**
    * [Android] Controlling if a view fires accessibility events and if it is reported to accessibility services.
@@ -293,6 +295,8 @@ class Button extends React.Component<ButtonProps> {
       'aria-disabled': ariaDisabled,
       'aria-expanded': ariaExpanded,
       'aria-label': ariaLabel,
+      'aria-multiselectable': ariaMultiselectable, // Win32
+      'aria-required': ariaRequired, // Win32
       'aria-selected': ariaSelected,
       importantForAccessibility,
       color,
@@ -327,6 +331,9 @@ class Button extends React.Component<ButtonProps> {
       checked: ariaChecked ?? accessibilityState?.checked,
       disabled: ariaDisabled ?? accessibilityState?.disabled,
       expanded: ariaExpanded ?? accessibilityState?.expanded,
+      multiselectable:
+        ariaMultiselectable ?? accessibilityState?.multiselectable, // Win32
+      required: ariaRequired ?? accessibilityState?.required, // Win32
       selected: ariaSelected ?? accessibilityState?.selected,
     };
 

package/Libraries/Components/Pressable/Pressable.win32.js

@@ -74,6 +74,8 @@ type Props = $ReadOnly<{|
   'aria-disabled'?: ?boolean,
   'aria-expanded'?: ?boolean,
   'aria-selected'?: ?boolean,
+  'aria-multiselectable'?: ?boolean, // Win32
+  'aria-required'?: ?boolean, // Win32
   /**
    * A value indicating whether the accessibility elements contained within
    * this accessibility element are hidden.
@@ -257,6 +259,8 @@ function Pressable(props: Props, forwardedRef): React.Node {
     'aria-disabled': ariaDisabled,
     'aria-expanded': ariaExpanded,
     'aria-label': ariaLabel,
+    'aria-multiselectable': ariaMultiselectable, // Win32
+    'aria-required': ariaRequired, // Win32
     'aria-selected': ariaSelected,
     cancelable,
     children,
@@ -297,6 +301,8 @@ function Pressable(props: Props, forwardedRef): React.Node {
     checked: ariaChecked ?? accessibilityState?.checked,
     disabled: ariaDisabled ?? accessibilityState?.disabled,
     expanded: ariaExpanded ?? accessibilityState?.expanded,
+    multiselectable: ariaMultiselectable ?? accessibilityState?.multiselectable, // Win32
+    required: ariaRequired ?? accessibilityState?.required, // Win32
     selected: ariaSelected ?? accessibilityState?.selected,
   };
 

package/Libraries/Components/View/View.win32.js

@@ -50,6 +50,8 @@ const View: React.AbstractComponent<
       'aria-label': ariaLabel,
       'aria-labelledby': ariaLabelledBy,
       'aria-live': ariaLive,
+      'aria-multiselectable': ariaMultiselectable, // Win32
+      'aria-required': ariaRequired, // Win32
       'aria-selected': ariaSelected,
       'aria-valuemax': ariaValueMax,
       'aria-valuemin': ariaValueMin,
@@ -76,6 +78,8 @@ const View: React.AbstractComponent<
       ariaChecked != null ||
       ariaDisabled != null ||
       ariaExpanded != null ||
+      ariaMultiselectable != null ||
+      ariaRequired != null ||
       ariaSelected != null
     ) {
       _accessibilityState = {
@@ -83,6 +87,9 @@ const View: React.AbstractComponent<
         checked: ariaChecked ?? accessibilityState?.checked,
         disabled: ariaDisabled ?? accessibilityState?.disabled,
         expanded: ariaExpanded ?? accessibilityState?.expanded,
+        multiselectable:
+          ariaMultiselectable ?? accessibilityState?.multiselectable, // Win32
+        required: ariaRequired ?? accessibilityState?.required, // Win32
         selected: ariaSelected ?? accessibilityState?.selected,
       };
     }

package/Libraries/Components/View/ViewAccessibility.d.ts

@@ -57,6 +57,8 @@ export interface AccessibilityProps
   'aria-checked'?: boolean | 'mixed' | undefined;
   'aria-disabled'?: boolean | undefined;
   'aria-expanded'?: boolean | undefined;
+  'aria-multiselectable'?: boolean | undefined; // Win32
+  'aria-required'?: boolean | undefined; // Win32
   'aria-selected'?: boolean | undefined;
 
   /**

package/Libraries/Components/View/ViewAccessibility.win32.js

@@ -152,6 +152,8 @@ export type AccessibilityState = {
   checked?: ?boolean | 'mixed',
   busy?: boolean,
   expanded?: boolean,
+  multiselectable?: boolean, // Win32
+  required?: boolean, // Win32
   ...
 };
 

package/Libraries/Components/View/ViewPropTypes.win32.js

@@ -467,7 +467,8 @@ type WindowsViewProps = $ReadOnly<{|
 
   accessibilityPosInSet?: ?number,
   accessibilitySetSize?: ?number,
-
+  'aria-multiselectable'?: ?boolean,
+  'aria-required'?: ?boolean,
   /**
    * Specifies if the control should show System focus visuals
    */

package/Libraries/Image/Image.win32.js

@@ -173,6 +173,8 @@ const BaseImage = (props: ImagePropsType, forwardedRef) => {
     'aria-checked': ariaChecked,
     'aria-disabled': ariaDisabled,
     'aria-expanded': ariaExpanded,
+    'aria-multiselectable': ariaMultiselectable, // Win32
+    'aria-required': ariaRequired, // Win32
     'aria-selected': ariaSelected,
     height,
     src,
@@ -185,6 +187,9 @@ const BaseImage = (props: ImagePropsType, forwardedRef) => {
     checked: ariaChecked ?? props.accessibilityState?.checked,
     disabled: ariaDisabled ?? props.accessibilityState?.disabled,
     expanded: ariaExpanded ?? props.accessibilityState?.expanded,
+    multiselectable:
+      ariaMultiselectable ?? props.accessibilityState?.multiselectable, // Win32
+    required: ariaRequired ?? props.accessibilityState?.required, // Win32
     selected: ariaSelected ?? props.accessibilityState?.selected,
   };
   const accessibilityLabel = props['aria-label'] ?? props.accessibilityLabel;

package/Libraries/Image/assetPaths.js

@@ -0,0 +1,36 @@
+/**
+ * Copyright (c) Microsoft Corporation.
+ * Licensed under the MIT License.
+ *
+ * Dont use flow here, since this file is used by saveAssetPlugin.js which will run without flow transform
+ * @format
+ */
+
+'use strict';
+
+// Some windows machines may not have long paths enabled
+// https://learn.microsoft.com/en-us/windows/win32/fileio/maximum-file-path-limitation
+// Assets in nested node_modules (common when using pnpm) - end up creating very long paths
+// Using this function we shorten longer paths to prevent paths from hitting the path limit
+function ensureShortPath(str) {
+  if (str.length < 40) return str;
+
+  const assetsPrefix = 'assets/';
+
+  if (!str.startsWith(assetsPrefix)) {
+    console.warn(`Unexpected asset uri - ${str} may not load correctly.`);
+  }
+
+  const postStr = str.slice(assetsPrefix.length);
+  var hash = 0,
+    i,
+    chr;
+  for (i = 0; i < postStr.length; i++) {
+    chr = postStr.charCodeAt(i);
+    hash = (hash << 5) - hash + chr;
+    hash |= 0; // Convert to 32bit integer
+  }
+  return assetsPrefix + hash.toString();
+}
+
+module.exports = ensureShortPath;

package/Libraries/Image/resolveAssetSource.win32.js

@@ -10,6 +10,7 @@
 
 const resolveAssetSource = require('./resolveAssetSource.js'); // Get base impl
 const Platform = require('../Utilities/Platform');
+const ensureShortPath = require('./assetPaths.js');
 
 type IPackagerAsset = {
   __packager_asset: boolean,
@@ -56,7 +57,7 @@ class AssetResolverLateScaleResolution {
    */
   _scaledAssetURLInBundle() {
     const path = this._resolver.bundleUrl || 'file://';
-    return this._fromSource(path + this._getAssetPath());
+    return this._fromSource(path + this._getAssetPath(true));
   }
 
   /**
@@ -66,7 +67,7 @@ class AssetResolverLateScaleResolution {
   _assetServerURL() {
     return this._fromSource(
       this._resolver.serverUrl +
-        this._getAssetPath() +
+        this._getAssetPath(false) +
         '?platform=' +
         Platform.OS +
         '&hash=' +
@@ -77,8 +78,8 @@ class AssetResolverLateScaleResolution {
   /**
    * Returns a path like 'assets/AwesomeModule/icon.png'
    */
-  _getAssetPath(): string {
-    const assetDir = this._getBasePath();
+  _getAssetPath(local: boolean): string {
+    const assetDir = this._getBasePath(local);
     return (
       assetDir +
       '/' +
@@ -88,7 +89,19 @@ class AssetResolverLateScaleResolution {
     );
   }
 
-  _getBasePath() {
+  _getBasePath(local: boolean) {
+    if (local) {
+      const safePath = this._resolver.asset.httpServerLocation
+        .substr(1)
+        .replace(/\.\.\//g, '_');
+      // If this asset was created with the newer saveAssetPlugin, then we should shorten the path
+      // This conditional is added to allow back compat of older bundles which might have been created without the saveAssetPlugin
+      if (this._resolver.asset.__useShortPath) {
+        return ensureShortPath(safePath);
+      }
+      return safePath;
+    }
+
     let basePath = this._resolver.asset.httpServerLocation;
     if (basePath[0] === '/') {
       basePath = basePath.substr(1);

package/Libraries/Pressability/Pressability.win32.js

@@ -429,6 +429,7 @@ export default class Pressability {
   |}>;
   _touchActivateTime: ?number;
   _touchState: TouchState = 'NOT_RESPONDER';
+  _isKeyDown: boolean = false;
 
   constructor(config: PressabilityConfig) {
     this.configure(config);
@@ -474,6 +475,7 @@ export default class Pressability {
         if (onBlur != null) {
           onBlur(event);
         }
+        this._isKeyDown = false;
       },
       onFocus: (event: FocusEvent): void => {
         const {onFocus} = this._config;
@@ -602,7 +604,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
@@ -610,6 +613,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;
@@ -622,6 +627,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);
         }
@@ -786,6 +792,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).
@@ -814,7 +826,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);
       }
     }
@@ -835,7 +850,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' &&
@@ -854,17 +873,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/metro.config.js

@@ -14,3 +14,5 @@ if (
 
 const {makeMetroConfig} = require('@rnw-scripts/metro-dev-config');
 module.exports = makeMetroConfig();
+// Enable this when RN CLI gets support for saveAssetPlugins: https://github.com/react-native-community/cli/pull/2002
+// module.exports.transformer.assetPlugins = [require.resolve('./metroShortPathAssetDataPlugin.js')];

package/metroShortPathAssetDataPlugin.js

@@ -0,0 +1,15 @@
+// @ts-check
+/**
+ * @typedef {import("metro").AssetData} AssetData;
+ **/
+
+/**
+ * @param {AssetData & {__useShortPath: boolean}} asset
+ * @returns {Promise<AssetData>}
+ */
+async function metroShortPathAssetDataPlugin(asset) {
+  asset.__useShortPath = true;
+  return Promise.resolve(asset);
+  }
+
+module.exports = metroShortPathAssetDataPlugin;

package/overrides.json

@@ -233,6 +233,10 @@
       "baseFile": "packages/react-native/Libraries/DevToolsSettings/DevToolsSettingsManager.android.js",
       "baseHash": "1c9eb481e8ed077fa650e3ea34837e2a31310366"
     },
+    {
+      "type": "platform",
+      "file": "src/Libraries/Image/assetPaths.js"
+    },
     {
       "type": "derived",
       "file": "src/Libraries/Image/Image.win32.js",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@office-iss/react-native-win32",
-  "version": "0.72.1",
+  "version": "0.72.3",
   "description": "Implementation of react native on top of Office's Win32 platform.",
   "repository": {
     "type": "git",

package/react-native.config.js

@@ -7,6 +7,8 @@ module.exports = {
         projectConfig: (projectRoot, projectParams) => null,
         dependencyConfig: (projectRoot, dependencyParams) => null,
         npmPackageName: '@office-iss/react-native-win32',
+        // Enable once CLI config supports it - https://github.com/react-native-community/cli/pull/2002
+        // saveAssetsPlugin: '@office-iss/react-native-win32/saveAssetPlugin'
       },
     },
   };

package/saveAssetPlugin.js

@@ -0,0 +1,45 @@
+// @ts-check
+const path = require('path');
+const ensureShortPath = require('./Libraries/Image/assetPaths');
+
+/**
+ * @typedef {import("metro").AssetData} AssetData;
+ **/
+
+/**
+ * @param {AssetData} asset
+ * @param {number} scale 
+ * @returns {string}
+ */
+function getAssetDestPath(asset, scale) {
+  const suffix = scale === 1 ? '' : `@${scale}x`;
+  const fileName = `${asset.name + suffix}.${asset.type}`;
+  return path.join(
+    // Assets can have relative paths outside of the project root.
+    // Replace `../` with `_` to make sure they don't end up outside of
+    // the expected assets directory.
+    ensureShortPath(asset.httpServerLocation.substr(1).replace(/\.\.\//g, '_')),
+    fileName,
+  );
+}
+
+/**
+ * @param {ReadonlyArray<AssetData>} assets 
+ * @param {string} _platform 
+ * @param {string | undefined} _assetsDest 
+ * @param {string | undefined} _assetCatalogDest 
+ * @param {(asset: AssetData, allowedScales: number[] | undefined, getAssetDestPath: (asset: AssetData, scale: number) => string) => void} addAssetToCopy 
+ */
+function saveAssetsWin32(
+  assets,
+  _platform,
+  _assetsDest,
+  _assetCatalogDest,
+  addAssetToCopy,
+) {
+  assets.forEach((asset) =>
+    addAssetToCopy(asset, undefined, getAssetDestPath),
+  );
+}
+
+module.exports = saveAssetsWin32;

package/src/Libraries/Components/View/ViewAccessibility.d.ts

@@ -57,6 +57,8 @@ export interface AccessibilityProps
   'aria-checked'?: boolean | 'mixed' | undefined;
   'aria-disabled'?: boolean | undefined;
   'aria-expanded'?: boolean | undefined;
+  'aria-multiselectable'?: boolean | undefined; // Win32
+  'aria-required'?: boolean | undefined; // Win32
   'aria-selected'?: boolean | undefined;
 
   /**