@react-native-oh/react-native-harmony 0.72.23 → 0.72.27

package/Libraries/Components/View/View.harmony.js

@@ -1,149 +1,149 @@
-/*
-* RNOH patches:
-* - imports
-* - disable view flattening (collapsable prop) for box-only and none pointer events
-*/
-
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @format
- * @flow strict-local
- */
-
-import type {ViewProps} from 'react-native/Libraries/Components/View/ViewPropTypes';
-
-import flattenStyle from 'react-native/Libraries/StyleSheet/flattenStyle';
-import TextAncestor from 'react-native/Libraries/Text/TextAncestor';
-import {getAccessibilityRoleFromRole} from 'react-native/Libraries/Utilities/AcessibilityMapping';
-import ViewNativeComponent from 'react-native/Libraries/Components/View/ViewNativeComponent';
-import * as React from 'react';
-
-export type Props = ViewProps;
-
-/**
- * The most fundamental component for building a UI, View is a container that
- * supports layout with flexbox, style, some touch handling, and accessibility
- * controls.
- *
- * @see https://reactnative.dev/docs/view
- */
-const View: React.AbstractComponent<
-  ViewProps,
-  React.ElementRef<typeof ViewNativeComponent>,
-> = React.forwardRef(
-  (
-    {
-      accessibilityElementsHidden,
-      accessibilityLabel,
-      accessibilityLabelledBy,
-      accessibilityLiveRegion,
-      accessibilityRole,
-      accessibilityState,
-      accessibilityValue,
-      'aria-busy': ariaBusy,
-      'aria-checked': ariaChecked,
-      'aria-disabled': ariaDisabled,
-      'aria-expanded': ariaExpanded,
-      'aria-hidden': ariaHidden,
-      'aria-label': ariaLabel,
-      'aria-labelledby': ariaLabelledBy,
-      'aria-live': ariaLive,
-      'aria-selected': ariaSelected,
-      'aria-valuemax': ariaValueMax,
-      'aria-valuemin': ariaValueMin,
-      'aria-valuenow': ariaValueNow,
-      'aria-valuetext': ariaValueText,
-      focusable,
-      id,
-      importantForAccessibility,
-      nativeID,
-      pointerEvents,
-      role,
-      tabIndex,
-      collapsable,
-      ...otherProps
-    }: ViewProps,
-    forwardedRef,
-  ) => {
-    const _accessibilityLabelledBy =
-      ariaLabelledBy?.split(/\s*,\s*/g) ?? accessibilityLabelledBy;
-
-    let _accessibilityState;
-    if (
-      accessibilityState != null ||
-      ariaBusy != null ||
-      ariaChecked != null ||
-      ariaDisabled != null ||
-      ariaExpanded != null ||
-      ariaSelected != null
-    ) {
-      _accessibilityState = {
-        busy: ariaBusy ?? accessibilityState?.busy,
-        checked: ariaChecked ?? accessibilityState?.checked,
-        disabled: ariaDisabled ?? accessibilityState?.disabled,
-        expanded: ariaExpanded ?? accessibilityState?.expanded,
-        selected: ariaSelected ?? accessibilityState?.selected,
-      };
-    }
-    let _accessibilityValue;
-    if (
-      accessibilityValue != null ||
-      ariaValueMax != null ||
-      ariaValueMin != null ||
-      ariaValueNow != null ||
-      ariaValueText != null
-    ) {
-      _accessibilityValue = {
-        max: ariaValueMax ?? accessibilityValue?.max,
-        min: ariaValueMin ?? accessibilityValue?.min,
-        now: ariaValueNow ?? accessibilityValue?.now,
-        text: ariaValueText ?? accessibilityValue?.text,
-      };
-    }
-
-    // $FlowFixMe[underconstrained-implicit-instantiation]
-    let style = flattenStyle(otherProps.style);
-
-    const newPointerEvents = style?.pointerEvents || pointerEvents;
-
-    return (
-      <TextAncestor.Provider value={false}>
-        <ViewNativeComponent
-          {...otherProps}
-          accessibilityLiveRegion={
-            ariaLive === 'off' ? 'none' : ariaLive ?? accessibilityLiveRegion
-          }
-          accessibilityLabel={ariaLabel ?? accessibilityLabel}
-          focusable={tabIndex !== undefined ? !tabIndex : focusable}
-          accessibilityState={_accessibilityState}
-          accessibilityRole={
-            role ? getAccessibilityRoleFromRole(role) : accessibilityRole
-          }
-          accessibilityElementsHidden={
-            ariaHidden ?? accessibilityElementsHidden
-          }
-          accessibilityLabelledBy={_accessibilityLabelledBy}
-          accessibilityValue={_accessibilityValue}
-          collapsable={["box-only", "none"].includes(newPointerEvents) ? false : collapsable} // RNOH: patch
-          importantForAccessibility={
-            ariaHidden === true
-              ? 'no-hide-descendants'
-              : importantForAccessibility
-          }
-          nativeID={id ?? nativeID}
-          style={style}
-          pointerEvents={newPointerEvents}
-          ref={forwardedRef}
-        />
-      </TextAncestor.Provider>
-    );
-  },
-);
-
-View.displayName = 'View';
-
-module.exports = View;
+/*
+* RNOH patches:
+* - imports
+* - disable view flattening (collapsable prop) for box-only and none pointer events
+*/
+
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @format
+ * @flow strict-local
+ */
+
+import type {ViewProps} from 'react-native/Libraries/Components/View/ViewPropTypes';
+
+import flattenStyle from 'react-native/Libraries/StyleSheet/flattenStyle';
+import TextAncestor from 'react-native/Libraries/Text/TextAncestor';
+import {getAccessibilityRoleFromRole} from 'react-native/Libraries/Utilities/AcessibilityMapping';
+import ViewNativeComponent from 'react-native/Libraries/Components/View/ViewNativeComponent';
+import * as React from 'react';
+
+export type Props = ViewProps;
+
+/**
+ * The most fundamental component for building a UI, View is a container that
+ * supports layout with flexbox, style, some touch handling, and accessibility
+ * controls.
+ *
+ * @see https://reactnative.dev/docs/view
+ */
+const View: React.AbstractComponent<
+  ViewProps,
+  React.ElementRef<typeof ViewNativeComponent>,
+> = React.forwardRef(
+  (
+    {
+      accessibilityElementsHidden,
+      accessibilityLabel,
+      accessibilityLabelledBy,
+      accessibilityLiveRegion,
+      accessibilityRole,
+      accessibilityState,
+      accessibilityValue,
+      'aria-busy': ariaBusy,
+      'aria-checked': ariaChecked,
+      'aria-disabled': ariaDisabled,
+      'aria-expanded': ariaExpanded,
+      'aria-hidden': ariaHidden,
+      'aria-label': ariaLabel,
+      'aria-labelledby': ariaLabelledBy,
+      'aria-live': ariaLive,
+      'aria-selected': ariaSelected,
+      'aria-valuemax': ariaValueMax,
+      'aria-valuemin': ariaValueMin,
+      'aria-valuenow': ariaValueNow,
+      'aria-valuetext': ariaValueText,
+      focusable,
+      id,
+      importantForAccessibility,
+      nativeID,
+      pointerEvents,
+      role,
+      tabIndex,
+      collapsable,
+      ...otherProps
+    }: ViewProps,
+    forwardedRef,
+  ) => {
+    const _accessibilityLabelledBy =
+      ariaLabelledBy?.split(/\s*,\s*/g) ?? accessibilityLabelledBy;
+
+    let _accessibilityState;
+    if (
+      accessibilityState != null ||
+      ariaBusy != null ||
+      ariaChecked != null ||
+      ariaDisabled != null ||
+      ariaExpanded != null ||
+      ariaSelected != null
+    ) {
+      _accessibilityState = {
+        busy: ariaBusy ?? accessibilityState?.busy,
+        checked: ariaChecked ?? accessibilityState?.checked,
+        disabled: ariaDisabled ?? accessibilityState?.disabled,
+        expanded: ariaExpanded ?? accessibilityState?.expanded,
+        selected: ariaSelected ?? accessibilityState?.selected,
+      };
+    }
+    let _accessibilityValue;
+    if (
+      accessibilityValue != null ||
+      ariaValueMax != null ||
+      ariaValueMin != null ||
+      ariaValueNow != null ||
+      ariaValueText != null
+    ) {
+      _accessibilityValue = {
+        max: ariaValueMax ?? accessibilityValue?.max,
+        min: ariaValueMin ?? accessibilityValue?.min,
+        now: ariaValueNow ?? accessibilityValue?.now,
+        text: ariaValueText ?? accessibilityValue?.text,
+      };
+    }
+
+    // $FlowFixMe[underconstrained-implicit-instantiation]
+    let style = flattenStyle(otherProps.style);
+
+    const newPointerEvents = style?.pointerEvents || pointerEvents;
+
+    return (
+      <TextAncestor.Provider value={false}>
+        <ViewNativeComponent
+          {...otherProps}
+          accessibilityLiveRegion={
+            ariaLive === 'off' ? 'none' : ariaLive ?? accessibilityLiveRegion
+          }
+          accessibilityLabel={ariaLabel ?? accessibilityLabel}
+          focusable={tabIndex !== undefined ? !tabIndex : focusable}
+          accessibilityState={_accessibilityState}
+          accessibilityRole={
+            role ? getAccessibilityRoleFromRole(role) : accessibilityRole
+          }
+          accessibilityElementsHidden={
+            ariaHidden ?? accessibilityElementsHidden
+          }
+          accessibilityLabelledBy={_accessibilityLabelledBy}
+          accessibilityValue={_accessibilityValue}
+          collapsable={["box-only", "none"].includes(newPointerEvents) ? false : collapsable} // RNOH: patch
+          importantForAccessibility={
+            ariaHidden === true
+              ? 'no-hide-descendants'
+              : importantForAccessibility
+          }
+          nativeID={id ?? nativeID}
+          style={style}
+          pointerEvents={newPointerEvents}
+          ref={forwardedRef}
+        />
+      </TextAncestor.Provider>
+    );
+  },
+);
+
+View.displayName = 'View';
+
+module.exports = View;

package/Libraries/Core/setUpReactDevTools.harmony.js

@@ -1,93 +1,93 @@
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @flow
- * @format
- */
-
-'use strict';
-
-if (__DEV__) {
-  let isWebSocketOpen = false;
-  let ws = null;
-
-  const reactDevTools = require('react-devtools-core');
-  const connectToDevTools = () => {
-    if (ws !== null && isWebSocketOpen) {
-      // If the DevTools backend is already connected, don't recreate the WebSocket.
-      // This would break the connection.
-      // If there isn't an active connection, a backend may be waiting to connect,
-      // in which case it's okay to make a new one.
-      return;
-    }
-
-    // not when debugging in chrome
-    // TODO(t12832058) This check is broken
-    if (!window.document) {
-      const AppState = require('react-native/Libraries/AppState/AppState');
-      const getDevServer = require('react-native/Libraries/Core/Devtools/getDevServer');
-
-      // Don't steal the DevTools from currently active app.
-      // Note: if you add any AppState subscriptions to this file,
-      // you will also need to guard against `AppState.isAvailable`,
-      // or the code will throw for bundles that don't have it.
-      const isAppActive = () => AppState.currentState !== 'background';
-
-      // RNOH patch: wait until appstate is active before connecting
-      if (!isAppActive()) {
-        const subscription = AppState.addEventListener('change', () => {
-          if (isAppActive()) {
-            connectToDevTools();
-            subscription.remove();
-          }
-        });
-        return;
-      }
-
-      // Get hostname from development server (packager)
-      const devServer = getDevServer();
-      const host = devServer.bundleLoadedFromServer
-        ? devServer.url
-            .replace(/https?:\/\//, '')
-            .replace(/\/$/, '')
-            .split(':')[0]
-        : 'localhost';
-
-      // Read the optional global variable for backward compatibility.
-      // It was added in https://github.com/facebook/react-native/commit/bf2b435322e89d0aeee8792b1c6e04656c2719a0.
-      const port =
-        window.__REACT_DEVTOOLS_PORT__ != null
-          ? window.__REACT_DEVTOOLS_PORT__
-          : 8097;
-
-      const WebSocket = require('react-native/Libraries/WebSocket/WebSocket');
-      ws = new WebSocket('ws://' + host + ':' + port);
-      ws.addEventListener('close', event => {
-        isWebSocketOpen = false;
-      });
-      ws.addEventListener('open', event => {
-        isWebSocketOpen = true;
-      });
-
-      const ReactNativeStyleAttributes = require('react-native/Libraries/Components/View/ReactNativeStyleAttributes');
-      const devToolsSettingsManager = require('react-native/Libraries/DevToolsSettings/DevToolsSettingsManager');
-
-      reactDevTools.connectToDevTools({
-        isAppActive,
-        resolveRNStyle: require('react-native/Libraries/StyleSheet/flattenStyle'),
-        nativeStyleEditorValidAttributes: Object.keys(
-          ReactNativeStyleAttributes,
-        ),
-        websocket: ws,
-        devToolsSettingsManager,
-      });
-    }
-  };
-
-  const RCTNativeAppEventEmitter = require('react-native/Libraries/EventEmitter/RCTNativeAppEventEmitter');
-  RCTNativeAppEventEmitter.addListener('RCTDevMenuShown', connectToDevTools);
-  connectToDevTools(); // Try connecting once on load
-}
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
+ * @format
+ */
+
+'use strict';
+
+if (__DEV__) {
+  let isWebSocketOpen = false;
+  let ws = null;
+
+  const reactDevTools = require('react-devtools-core');
+  const connectToDevTools = () => {
+    if (ws !== null && isWebSocketOpen) {
+      // If the DevTools backend is already connected, don't recreate the WebSocket.
+      // This would break the connection.
+      // If there isn't an active connection, a backend may be waiting to connect,
+      // in which case it's okay to make a new one.
+      return;
+    }
+
+    // not when debugging in chrome
+    // TODO(t12832058) This check is broken
+    if (!window.document) {
+      const AppState = require('react-native/Libraries/AppState/AppState');
+      const getDevServer = require('react-native/Libraries/Core/Devtools/getDevServer');
+
+      // Don't steal the DevTools from currently active app.
+      // Note: if you add any AppState subscriptions to this file,
+      // you will also need to guard against `AppState.isAvailable`,
+      // or the code will throw for bundles that don't have it.
+      const isAppActive = () => AppState.currentState !== 'background';
+
+      // RNOH patch: wait until appstate is active before connecting
+      if (!isAppActive()) {
+        const subscription = AppState.addEventListener('change', () => {
+          if (isAppActive()) {
+            connectToDevTools();
+            subscription.remove();
+          }
+        });
+        return;
+      }
+
+      // Get hostname from development server (packager)
+      const devServer = getDevServer();
+      const host = devServer.bundleLoadedFromServer
+        ? devServer.url
+            .replace(/https?:\/\//, '')
+            .replace(/\/$/, '')
+            .split(':')[0]
+        : 'localhost';
+
+      // Read the optional global variable for backward compatibility.
+      // It was added in https://github.com/facebook/react-native/commit/bf2b435322e89d0aeee8792b1c6e04656c2719a0.
+      const port =
+        window.__REACT_DEVTOOLS_PORT__ != null
+          ? window.__REACT_DEVTOOLS_PORT__
+          : 8097;
+
+      const WebSocket = require('react-native/Libraries/WebSocket/WebSocket');
+      ws = new WebSocket('ws://' + host + ':' + port);
+      ws.addEventListener('close', event => {
+        isWebSocketOpen = false;
+      });
+      ws.addEventListener('open', event => {
+        isWebSocketOpen = true;
+      });
+
+      const ReactNativeStyleAttributes = require('react-native/Libraries/Components/View/ReactNativeStyleAttributes');
+      const devToolsSettingsManager = require('react-native/Libraries/DevToolsSettings/DevToolsSettingsManager');
+
+      reactDevTools.connectToDevTools({
+        isAppActive,
+        resolveRNStyle: require('react-native/Libraries/StyleSheet/flattenStyle'),
+        nativeStyleEditorValidAttributes: Object.keys(
+          ReactNativeStyleAttributes,
+        ),
+        websocket: ws,
+        devToolsSettingsManager,
+      });
+    }
+  };
+
+  const RCTNativeAppEventEmitter = require('react-native/Libraries/EventEmitter/RCTNativeAppEventEmitter');
+  RCTNativeAppEventEmitter.addListener('RCTDevMenuShown', connectToDevTools);
+  connectToDevTools(); // Try connecting once on load
+}

package/Libraries/Image/AssetSourceResolver.harmony.ts

@@ -1,78 +1,78 @@
-import {
-  getAssetDestRelativePath,
-  Asset,
-} from '@react-native-oh/react-native-harmony-cli/src/assetResolver';
-import {
-  getBasePath,
-} from '@react-native/assets-registry/path-support';
-import { Platform } from 'react-native';
-
-type ResolvedAssetSource = {
-  readonly __packager_asset: boolean;
-  readonly width?: number;
-  readonly height?: number;
-  readonly uri: string;
-  readonly scale: number;
-};
-
-function getAssetPath(asset: Asset): string {
-  const assetDir = getBasePath(asset);
-  return assetDir + '/' + asset.name + '.' + asset.type;
-}
-
-class AssetSourceResolver {
-  constructor(
-    private serverUrl: string | undefined,
-    private jsbundleUrl: string | undefined,
-    private asset: Asset
-  ) {}
-
-  isLoadedFromServer(): boolean {
-    return !!this.serverUrl;
-  }
-
-  public defaultAsset(): ResolvedAssetSource {
-    if (this.isLoadedFromServer()) {
-      return this.assetServerURL();
-    }
-
-    return {
-      __packager_asset: this.asset.__packager_asset,
-      uri: `asset://${getAssetDestRelativePath(this.asset)}`,
-      scale: 1,
-      width: this.asset.width,
-      height: this.asset.height,
-    };
-  }
-
-  /**
-   * Returns an absolute URL which can be used to fetch the asset
-   * from the devserver
-   */
-  assetServerURL(): ResolvedAssetSource {
-    if (!this.serverUrl) {
-      throw new Error('need server to load from');
-    }
-
-    return this.fromSource(
-      this.serverUrl +
-      getAssetPath(this.asset) +
-        '?platform=' +
-        Platform.OS +
-        '&hash=' +
-        this.asset.hash,
-    );
-  }
-
-  fromSource(source: string): ResolvedAssetSource {
-    return {
-      __packager_asset: true,
-      width: this.asset.width,
-      height: this.asset.height,
-      uri: source,
-      scale: 1,
-    };
-  }
-}
-
-module.exports = AssetSourceResolver;
+import {
+  getAssetDestRelativePath,
+  Asset,
+} from '@react-native-oh/react-native-harmony-cli/src/assetResolver';
+import {
+  getBasePath,
+} from '@react-native/assets-registry/path-support';
+import { Platform } from 'react-native';
+
+type ResolvedAssetSource = {
+  readonly __packager_asset: boolean;
+  readonly width?: number;
+  readonly height?: number;
+  readonly uri: string;
+  readonly scale: number;
+};
+
+function getAssetPath(asset: Asset): string {
+  const assetDir = getBasePath(asset);
+  return assetDir + '/' + asset.name + '.' + asset.type;
+}
+
+class AssetSourceResolver {
+  constructor(
+    private serverUrl: string | undefined,
+    private jsbundleUrl: string | undefined,
+    private asset: Asset
+  ) {}
+
+  isLoadedFromServer(): boolean {
+    return !!this.serverUrl;
+  }
+
+  public defaultAsset(): ResolvedAssetSource {
+    if (this.isLoadedFromServer()) {
+      return this.assetServerURL();
+    }
+
+    return {
+      __packager_asset: this.asset.__packager_asset,
+      uri: `asset://${getAssetDestRelativePath(this.asset)}`,
+      scale: 1,
+      width: this.asset.width,
+      height: this.asset.height,
+    };
+  }
+
+  /**
+   * Returns an absolute URL which can be used to fetch the asset
+   * from the devserver
+   */
+  assetServerURL(): ResolvedAssetSource {
+    if (!this.serverUrl) {
+      throw new Error('need server to load from');
+    }
+
+    return this.fromSource(
+      this.serverUrl +
+      getAssetPath(this.asset) +
+        '?platform=' +
+        Platform.OS +
+        '&hash=' +
+        this.asset.hash,
+    );
+  }
+
+  fromSource(source: string): ResolvedAssetSource {
+    return {
+      __packager_asset: true,
+      width: this.asset.width,
+      height: this.asset.height,
+      uri: source,
+      scale: 1,
+    };
+  }
+}
+
+module.exports = AssetSourceResolver;