@react-native-oh/react-native-harmony 0.72.82 → 0.77.18-1

package/Libraries/Components/StatusBar/{StatusBar.harmony.js → StatusBar.js}

@@ -8,14 +8,13 @@
  * @flow
  */
 
-import type { ColorValue } from "react-native/Libraries/StyleSheet/StyleSheet";
+import type {ColorValue} from '../../StyleSheet/StyleSheet';
 
-import processColor from "react-native/Libraries/StyleSheet/processColor";
-import Platform from "react-native/Libraries/Utilities/Platform";
-//RNOH: patch - fix imports
-import NativeStatusBarManagerHarmony from "./NativeStatusBarManagerHarmony";
-import invariant from "invariant";
-import * as React from "react";
+import processColor from '../../StyleSheet/processColor';
+import Platform from '../../Utilities/Platform';
+import StatusBarDelegate from './delegates/StatusBarDelegate';
+import invariant from 'invariant';
+import * as React from 'react';
 
 /**
  * Status bar style
@@ -28,11 +27,11 @@ export type StatusBarStyle = $Keys<{
   /**
    * Dark background, white texts and icons
    */
-  "light-content": string,
+  'light-content': string,
   /**
    * Light background, dark texts and icons
    */
-  "dark-content": string,
+  'dark-content': string,
   ...
 }>;
 
@@ -84,7 +83,7 @@ type IOSProps = $ReadOnly<{|
    *
    * @platform ios
    */
-  showHideTransition?: ?("fade" | "slide" | "none"),
+  showHideTransition?: ?('fade' | 'slide' | 'none'),
 |}>;
 
 type Props = $ReadOnly<{|
@@ -102,7 +101,7 @@ type Props = $ReadOnly<{|
   /**
    * Sets the color of the status bar text.
    */
-  barStyle?: ?("default" | "light-content" | "dark-content"),
+  barStyle?: ?('default' | 'light-content' | 'dark-content'),
 |}>;
 
 /**
@@ -110,7 +109,7 @@ type Props = $ReadOnly<{|
  */
 function mergePropsStack(
   propsStack: Array<Object>,
-  defaultValues: Object
+  defaultValues: Object,
 ): Object {
   return propsStack.reduce(
     (prev, cur) => {
@@ -121,7 +120,7 @@ function mergePropsStack(
       }
       return prev;
     },
-    { ...defaultValues }
+    {...defaultValues},
   );
 }
 
@@ -131,7 +130,7 @@ function mergePropsStack(
  */
 function createStackEntry(props: any): any {
   const animated = props.animated ?? false;
-  const showHideTransition = props.showHideTransition ?? "fade";
+  const showHideTransition = props.showHideTransition ?? 'fade';
   return {
     backgroundColor:
       props.backgroundColor != null
@@ -160,32 +159,14 @@ function createStackEntry(props: any): any {
   };
 }
 
+const DELEGATE = new StatusBarDelegate({});
+
 /**
  * Component to control the app status bar.
  *
- * ### Usage with Navigator
- *
  * It is possible to have multiple `StatusBar` components mounted at the same
  * time. The props will be merged in the order the `StatusBar` components were
- * mounted. One use case is to specify status bar styles per route using `Navigator`.
- *
- * ```
- *  <View>
- *    <StatusBar
- *      backgroundColor="blue"
- *      barStyle="light-content"
- *    />
- *    <Navigator
- *      initialRoute={{statusBarHidden: true}}
- *      renderScene={(route, navigator) =>
- *        <View>
- *          <StatusBar hidden={route.statusBarHidden} />
- *          ...
- *        </View>
- *      }
- *    />
- *  </View>
- * ```
+ * mounted.
  *
  * ### Imperative API
  *
@@ -226,20 +207,19 @@ class StatusBar extends React.Component<Props> {
   static _propsStack: Array<any> = [];
 
   static _defaultProps: any = createStackEntry({
-    // RNOH: patch - use NativeStatusBarManager harmony
-    backgroundColor:
-      NativeStatusBarManagerHarmony.getConstants().DEFAULT_BACKGROUND_COLOR ??
-      "#00000000",
-    barStyle: "default",
+    backgroundColor: DELEGATE.getDefaultBackgroundColor(),
+    barStyle: 'default',
     translucent: false,
     hidden: false,
     networkActivityIndicatorVisible: false,
   });
 
   // Timer for updating the native module values at the end of the frame.
+  // $FlowFixMe[missing-local-annot]
   static _updateImmediate = null;
 
   // The current merged values from the props stack.
+  // $FlowFixMe[missing-local-annot]
   static _currentValues = null;
 
   // TODO(janic): Provide a real API to deal with status bar height. See the
@@ -247,11 +227,9 @@ class StatusBar extends React.Component<Props> {
   /**
    * The current height of the status bar on the device.
    *
-   * @platform android
+   * @platform androidk
    */
-  // RNOH: patch - use NativeStatusBarManagerHarmony
-  static currentHeight: ?number =
-    NativeStatusBarManagerHarmony.getConstants().HEIGHT;
+  static currentHeight: ?number = DELEGATE.getCurrentHeight();
 
   // Provide an imperative API as static functions of the component.
   // See the corresponding prop for more detail.
@@ -263,10 +241,14 @@ class StatusBar extends React.Component<Props> {
    *    changing the status bar hidden property.
    */
   static setHidden(hidden: boolean, animation?: StatusBarAnimation) {
-    animation = animation || "none";
-    //RNOH: patch - delete code specific to other platforms
+    animation = animation || 'none';
     StatusBar._defaultProps.hidden.value = hidden;
-    NativeStatusBarManagerHarmony.setHidden(hidden, animation);
+    DELEGATE.setHidden(hidden, animation);
+    // if (Platform.OS === 'ios') {
+    //   NativeStatusBarManagerIOS.setHidden(hidden, animation);
+    // } else if (Platform.OS === 'android') {
+    //   NativeStatusBarManagerAndroid.setHidden(hidden);
+    // }
   }
 
   /**
@@ -275,23 +257,32 @@ class StatusBar extends React.Component<Props> {
    * @param animated Animate the style change.
    */
   static setBarStyle(style: StatusBarStyle, animated?: boolean) {
-    //RNOH: patch - delete code specific to other platforms
+    animated = animated || false;
     StatusBar._defaultProps.barStyle.value = style;
-    NativeStatusBarManagerHarmony.setStyle(style, animated);
+    DELEGATE.setBarStyle(style, animated);
+    // if (Platform.OS === 'ios') {
+    //   NativeStatusBarManagerIOS.setStyle(style, animated);
+    // } else if (Platform.OS === 'android') {
+    //   NativeStatusBarManagerAndroid.setStyle(style);
+    // }
   }
 
   /**
-   * Control the visibility of the network activity indicator
+   * DEPRECATED - The status bar network activity indicator is not supported in iOS 13 and later. This will be removed in a future release.
    * @param visible Show the indicator.
+   *
+   * @deprecated
    */
   static setNetworkActivityIndicatorVisible(visible: boolean) {
-    //RNOH: patch - delete code specific to other platforms
-    if (Platform.OS !== "ios") {
+    if (Platform.OS !== 'ios') {
       console.warn(
-        "`setNetworkActivityIndicatorVisible` is only available on iOS"
+        '`setNetworkActivityIndicatorVisible` is only available on iOS',
       );
       return;
     }
+    StatusBar._defaultProps.networkActivityIndicatorVisible = visible;
+    DELEGATE.setNetworkActivityIndicatorVisible(visible);
+    // NativeStatusBarManagerIOS.setNetworkActivityIndicatorVisible(visible);
   }
 
   /**
@@ -300,22 +291,27 @@ class StatusBar extends React.Component<Props> {
    * @param animated Animate the style change.
    */
   static setBackgroundColor(color: string, animated?: boolean): void {
+    // RNC_patch
+    // if (Platform.OS !== 'android') {
+    //   console.warn('`setBackgroundColor` is only available on Android');
+    //   return;
+    // }
     animated = animated || false;
     StatusBar._defaultProps.backgroundColor.value = color;
-    //RNOH: patch - delete platform check
+
     const processedColor = processColor(color);
     if (processedColor == null) {
       console.warn(
-        `\`StatusBar.setBackgroundColor\`: Color ${color} parsed to null or undefined`
+        `\`StatusBar.setBackgroundColor\`: Color ${color} parsed to null or undefined`,
       );
       return;
     }
     invariant(
-      typeof processedColor === "number",
-      "Unexpected color given for StatusBar.setBackgroundColor"
+      typeof processedColor === 'number',
+      'Unexpected color given for StatusBar.setBackgroundColor',
     );
-    //RNOH: patch - use harmony NativeStatusBarManager
-    NativeStatusBarManagerHarmony.setColor(processedColor, animated);
+
+    DELEGATE.setColor(processedColor, animated);
   }
 
   /**
@@ -323,9 +319,13 @@ class StatusBar extends React.Component<Props> {
    * @param translucent Set as translucent.
    */
   static setTranslucent(translucent: boolean) {
-    //RNOH: patch - delete platform check and use NativeStatusBarManagerHarmony
+    // RNC_patch
+    // if (Platform.OS !== 'android') {
+    //   console.warn('`setTranslucent` is only available on Android');
+    //   return;
+    // }
     StatusBar._defaultProps.translucent = translucent;
-    NativeStatusBarManagerHarmony.setTranslucent(translucent);
+    DELEGATE.setTranslucent(translucent);
   }
 
   /**
@@ -370,6 +370,7 @@ class StatusBar extends React.Component<Props> {
     return newEntry;
   }
 
+  // $FlowFixMe[missing-local-annot]
   _stackEntry = null;
 
   componentDidMount() {
@@ -389,7 +390,7 @@ class StatusBar extends React.Component<Props> {
   componentDidUpdate() {
     this._stackEntry = StatusBar.replaceStackEntry(
       this._stackEntry,
-      this.props
+      this.props,
     );
   }
 
@@ -403,37 +404,69 @@ class StatusBar extends React.Component<Props> {
       const oldProps = StatusBar._currentValues;
       const mergedProps = mergePropsStack(
         StatusBar._propsStack,
-        StatusBar._defaultProps
+        StatusBar._defaultProps,
       );
-      //RNOH: patch - delete code specific to IOS and Android
-      if (!oldProps || oldProps.hidden.value !== mergedProps.hidden.value) {
-        NativeStatusBarManagerHarmony.setHidden(mergedProps.hidden.value);
-      }
-
+      DELEGATE.updatePropsStack(oldProps, mergedProps);
       // Update the props that have changed using the merged values from the props stack.
-      if (!oldProps || oldProps.barStyle.value !== mergedProps.barStyle.value) {
-        NativeStatusBarManagerHarmony.setStyle(mergedProps.barStyle.value);
-      }
-      if (!oldProps || oldProps.translucent !== mergedProps.translucent) {
-        NativeStatusBarManagerHarmony.setTranslucent(mergedProps.translucent);
-      }
-      if (
-        !oldProps ||
-        oldProps.backgroundColor.value !== mergedProps.backgroundColor.value
-      ) {
-        const processedColor = processColor(mergedProps.backgroundColor.value);
-        if (processedColor == null) {
-          console.warn(
-            `\`StatusBar._updatePropsStack\`: Color ${mergedProps.backgroundColor.value} parsed to null or undefined`
-          );
-        } else {
-          invariant(
-            typeof processedColor === "number",
-            "Unexpected color given in StatusBar._updatePropsStack"
-          );
-          NativeStatusBarManagerHarmony.setColor(processedColor, mergedProps.backgroundColor.animated);
-        }
-      }
+      // if (Platform.OS === 'ios') {
+      //   if (
+      //     !oldProps ||
+      //     oldProps.barStyle.value !== mergedProps.barStyle.value
+      //   ) {
+      //     NativeStatusBarManagerIOS.setStyle(
+      //       mergedProps.barStyle.value,
+      //       mergedProps.barStyle.animated || false,
+      //     );
+      //   }
+      //   if (!oldProps || oldProps.hidden.value !== mergedProps.hidden.value) {
+      //     NativeStatusBarManagerIOS.setHidden(
+      //       mergedProps.hidden.value,
+      //       mergedProps.hidden.animated
+      //         ? mergedProps.hidden.transition
+      //         : 'none',
+      //     );
+      //   }
+
+      //   if (
+      //     !oldProps ||
+      //     oldProps.networkActivityIndicatorVisible !==
+      //       mergedProps.networkActivityIndicatorVisible
+      //   ) {
+      //     NativeStatusBarManagerIOS.setNetworkActivityIndicatorVisible(
+      //       mergedProps.networkActivityIndicatorVisible,
+      //     );
+      //   }
+      // } else if (Platform.OS === 'android') {
+      //   //todo(T60684787): Add back optimization to only update bar style and
+      //   //background color if the new value is different from the old value.
+      //   NativeStatusBarManagerAndroid.setStyle(mergedProps.barStyle.value);
+      //   const processedColor = processColor(mergedProps.backgroundColor.value);
+      //   if (processedColor == null) {
+      //     console.warn(
+      //       `\`StatusBar._updatePropsStack\`: Color ${mergedProps.backgroundColor.value} parsed to null or undefined`,
+      //     );
+      //   } else {
+      //     invariant(
+      //       typeof processedColor === 'number',
+      //       'Unexpected color given in StatusBar._updatePropsStack',
+      //     );
+      //     NativeStatusBarManagerAndroid.setColor(
+      //       processedColor,
+      //       mergedProps.backgroundColor.animated,
+      //     );
+      //   }
+      //   if (!oldProps || oldProps.hidden.value !== mergedProps.hidden.value) {
+      //     NativeStatusBarManagerAndroid.setHidden(mergedProps.hidden.value);
+      //   }
+      //   // Activities are not translucent by default, so always set if true.
+      //   if (
+      //     !oldProps ||
+      //     oldProps.translucent !== mergedProps.translucent ||
+      //     mergedProps.translucent
+      //   ) {
+      //     NativeStatusBarManagerAndroid.setTranslucent(mergedProps.translucent);
+      //   }
+      // }
       // Update the current prop values.
       StatusBar._currentValues = mergedProps;
     });

package/Libraries/Components/StatusBar/delegates/BaseStatusBarDelegate.ts

@@ -0,0 +1,25 @@
+/**
+ * @format
+ */
+
+export type StatusBarAnimation = 'none' | 'fade' | 'slide';
+
+export type StatusBarStyle = 'default' | 'light-content' | 'dark-content';
+
+export abstract class BaseStatusBarDelegate {
+  abstract getDefaultBackgroundColor(): string;
+
+  abstract getCurrentHeight(): number;
+
+  abstract setHidden(hidden: boolean, animation?: StatusBarAnimation): void;
+
+  abstract setBarStyle(style: StatusBarStyle, animated?: boolean): void;
+
+  abstract setNetworkActivityIndicatorVisible(visible: boolean): void;
+
+  abstract setColor(processedColor: number, animated?: boolean): void;
+
+  abstract setTranslucent(translucent: boolean): void;
+
+  abstract updatePropsStack(oldProps: any, mergedProps: any): void;
+}

package/Libraries/Components/StatusBar/delegates/NativeStatusBarManagerHarmony.harmony.ts

@@ -0,0 +1,53 @@
+/**
+ * Copyright (c) 2024 Huawei Technologies Co., Ltd.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+import * as TurboModuleRegistry from '../../../TurboModule/TurboModuleRegistry';
+import type { TurboModule } from '../../../TurboModule/RCTExport';
+
+type NativeStatusBarManagerConstants = {
+  HEIGHT: number;
+  DEFAULT_BACKGROUND_COLOR?: string;
+};
+
+export interface Spec extends TurboModule {
+  getConstants: () => NativeStatusBarManagerConstants;
+  setColor: (color: number, animated: boolean) => void;
+  setTranslucent: (translucent: boolean) => void;
+  setStyle: (statusBarStyle: string) => void;
+  setHidden: (hidden: boolean) => void;
+}
+
+const NativeModule = TurboModuleRegistry.getEnforcing<Spec>('StatusBarManager');
+
+let constants: NativeStatusBarManagerConstants | null = null;
+
+const NativeStatusBarManager: Spec = {
+  getConstants(): NativeStatusBarManagerConstants {
+    if (constants == null) {
+      constants = NativeModule.getConstants();
+    }
+    return constants;
+  },
+
+  setColor(color: number, animated: boolean): void {
+    NativeModule.setColor(color, animated);
+  },
+
+  setTranslucent(translucent: boolean): void {
+    NativeModule.setTranslucent(translucent);
+  },
+
+  setStyle(statusBarStyle: string): void {
+    NativeModule.setStyle(statusBarStyle);
+  },
+
+  setHidden(hidden: boolean): void {
+    NativeModule.setHidden(hidden);
+  },
+};
+
+export default NativeStatusBarManager;

package/Libraries/Components/StatusBar/delegates/StatusBarDelegate.harmony.ts

@@ -0,0 +1,83 @@
+/**
+ * Copyright (c) 2024 Huawei Technologies Co., Ltd.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+import {
+  BaseStatusBarDelegate,
+  StatusBarAnimation,
+  StatusBarStyle,
+} from './BaseStatusBarDelegate';
+import NativeStatusBarManagerHarmony from './NativeStatusBarManagerHarmony.harmony';
+import invariant from 'invariant';
+import processColor from '../../../StyleSheet/processColor';
+
+export default class StatusBarDelegate extends BaseStatusBarDelegate {
+  override getCurrentHeight(): number {
+    return NativeStatusBarManagerHarmony.getConstants().HEIGHT;
+  }
+
+  override getDefaultBackgroundColor(): string {
+    return (
+      NativeStatusBarManagerHarmony.getConstants().DEFAULT_BACKGROUND_COLOR ??
+      'black'
+    );
+  }
+
+  override setBarStyle(style: StatusBarStyle, animated?: boolean): void {
+    NativeStatusBarManagerHarmony.setStyle(style);
+  }
+
+  override setColor(processedColor: number, animated?: boolean): void {
+    NativeStatusBarManagerHarmony.setColor(processedColor, animated ?? false);
+  }
+
+  override setHidden(hidden: boolean, animation?: StatusBarAnimation): void {
+    NativeStatusBarManagerHarmony.setHidden(hidden);
+  }
+
+  override setNetworkActivityIndicatorVisible(visible: boolean): void {
+    // NOOP
+    return;
+  }
+
+  override setTranslucent(translucent: boolean): void {
+    NativeStatusBarManagerHarmony.setTranslucent(translucent);
+  }
+
+  override updatePropsStack(oldProps: any, newProps: any): void {
+    if (!oldProps || oldProps.hidden.value !== newProps.hidden.value) {
+      NativeStatusBarManagerHarmony.setHidden(newProps.hidden.value);
+    }
+    if (!oldProps || oldProps.barStyle.value !== newProps.barStyle.value) {
+      NativeStatusBarManagerHarmony.setStyle(newProps.barStyle.value);
+    }
+    if (!oldProps || oldProps.translucent !== newProps.translucent) {
+      NativeStatusBarManagerHarmony.setTranslucent(newProps.translucent);
+    }
+    if (
+      !oldProps ||
+      oldProps.backgroundColor.value !== newProps.backgroundColor.value
+    ) {
+      const processedColor = (processColor as any)(
+        newProps.backgroundColor.value
+      );
+      if (processedColor == null) {
+        console.warn(
+          `\`StatusBarDelegate::updatePropsStack\`: Color ${newProps.backgroundColor.value} parsed to null or undefined`
+        );
+      } else {
+        invariant(
+          typeof processedColor === 'number',
+          'Unexpected color given in StatusBarDelegate::updatePropsStack'
+        );
+        NativeStatusBarManagerHarmony.setColor(
+          processedColor,
+          newProps.backgroundColor.animated
+        );
+      }
+    }
+  }
+}

package/Libraries/Components/StatusBar/delegates/StatusBarDelegate.ts

@@ -0,0 +1,44 @@
+/**
+ * @format
+ */
+
+import {
+  BaseStatusBarDelegate,
+  StatusBarAnimation,
+  StatusBarStyle,
+} from './BaseStatusBarDelegate';
+import {UnsupportedByPlatformError} from '../../../../delegates/DelegateError';
+
+export default class StatusBarDelegate extends BaseStatusBarDelegate {
+  getCurrentHeight(): number {
+    throw new UnsupportedByPlatformError();
+  }
+
+  getDefaultBackgroundColor(): string {
+    throw new UnsupportedByPlatformError();
+  }
+
+  setBarStyle(style: StatusBarStyle, animated?: boolean): void {
+    throw new UnsupportedByPlatformError();
+  }
+
+  setColor(processedColor: number, animated?: boolean): void {
+    throw new UnsupportedByPlatformError();
+  }
+
+  setHidden(hidden: boolean, animation?: StatusBarAnimation): void {
+    throw new UnsupportedByPlatformError();
+  }
+
+  setNetworkActivityIndicatorVisible(visible: boolean): void {
+    throw new UnsupportedByPlatformError();
+  }
+
+  setTranslucent(translucent: boolean): void {
+    throw new UnsupportedByPlatformError();
+  }
+
+  updatePropsStack(oldProps: any, mergedProps: any): void {
+    throw new UnsupportedByPlatformError();
+  }
+}

package/Libraries/Components/Switch/AndroidSwitchNativeComponent.js

@@ -0,0 +1,13 @@
+/**
+ * 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
+ */
+
+export * from '../../../src/private/specs/components/AndroidSwitchNativeComponent';
+import AndroidSwitchNativeComponent from '../../../src/private/specs/components/AndroidSwitchNativeComponent';
+export default AndroidSwitchNativeComponent;