@react-native-oh/react-native-harmony 0.72.22 → 0.72.23-2

package/Libraries/Components/RefreshControl/RefreshControl.harmony.js

@@ -164,7 +164,9 @@ class RefreshControl extends React.Component<RefreshControlProps> {
   render(): React.Node {
     // RNOH: patch - replaced occurrences Platform.OS with OS
     if (OS === "ios") {
-      const { enabled, colors, progressBackgroundColor, size, ...props } =
+      // RNOH: patch - change descructuring to pass progressBackgroundColor to PullToRefreshViewNativeComponent
+      // BEFORE: const { enabled, colors, progressBackgroundColor, size, ...props } =
+      const { enabled, colors, size, ...props } =
         this.props;
       return (
         <PullToRefreshViewNativeComponent

package/Libraries/Components/ScrollView/ScrollView.harmony.js

@@ -681,6 +681,9 @@ export type Props = $ReadOnly<{|
 
 type State = {|
   layoutHeight: ?number,
+  // RNOH patch - resolving flashScrollIndicators command on the JS side
+  // as it is currently not feasible on the native side
+  showScrollIndicator: boolean,
 |};
 
 const IS_ANIMATING_TOUCH_START_THRESHOLD_MS = 16;
@@ -766,6 +769,9 @@ class ScrollView extends React.Component<Props, State> {
 
   state: State = {
     layoutHeight: null,
+    // RNOH patch - resolving flashScrollIndicators command on the JS side
+    // as it is currently not feasible on the native side
+    showScrollIndicator: false,
   };
 
   componentDidMount() {
@@ -947,10 +953,20 @@ class ScrollView extends React.Component<Props, State> {
    * @platform ios
    */
   flashScrollIndicators: () => void = () => {
-    if (this._scrollView.nativeInstance == null) {
-      return;
-    }
-    Commands.flashScrollIndicators(this._scrollView.nativeInstance);
+    // RNOH patch - resolving flashScrollIndicators command on the JS side
+    // as it is currently not feasible on the native side
+
+    // if (this._scrollView.nativeInstance == null) {
+    //   return;
+    // }
+    // Commands.flashScrollIndicators(this._scrollView.nativeInstance);
+
+    this.state.showScrollIndicator = true;
+    setTimeout(() => {
+      this.state.showScrollIndicator = false;
+      this.forceUpdate();
+    }, 500);
+    this.forceUpdate();
   };
 
   /**
@@ -1814,6 +1830,11 @@ class ScrollView extends React.Component<Props, State> {
         this.props.pagingEnabled === true &&
         this.props.snapToInterval == null &&
         this.props.snapToOffsets == null,
+      // RNOH patch - resolving flashScrollIndicators command on the JS side
+      // as it is currently not feasible on the native side 
+      showsVerticalScrollIndicator: (this.props.showsVerticalScrollIndicator ?? true) || this.state.showScrollIndicator,
+      showsHorizontalScrollIndicator: (this.props.showsHorizontalScrollIndicator ?? true) || this.state.showScrollIndicator,
+      persistentScrollbar: this.props.persistentScrollbar || this.state.showScrollIndicator,
     };
 
     const { decelerationRate } = this.props;

package/Libraries/Components/TextInput/TextInput.harmony.js

@@ -1609,6 +1609,16 @@ const ExportedForwardRef: React.AbstractComponent<
     delete style.verticalAlign;
   }
 
+  // RNOH patch: invalid `keyboardType` prop values crash the app
+  {
+    // supported keyboard types from `textinput/conversions.h`
+  const SUPPORTED_KEYBOARD_TYPES = ["default", "email-address", "numeric", "phone-pad", "number-pad", "url", "decimal-pad", "ascii-capable", "numbers-and-punctuation", "name-phone-pad", "twitter", "web-search", "ascii-capable-number-pad", "visible-password"];
+  if (keyboardType && !SUPPORTED_KEYBOARD_TYPES.includes(keyboardType)) {
+    keyboardType = "default";
+  }
+  }
+  // END RNOH patch
+
   return (
     <InternalTextInput
       allowFontScaling={allowFontScaling}

package/Libraries/Share/Share.harmony.js

@@ -0,0 +1,174 @@
+/**
+ * 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 NativeActionSheetManager from 'react-native/Libraries/ActionSheetIOS/NativeActionSheetManager';
+import NativeShareModule from 'react-native/Libraries/Share/NativeShareModule';
+
+const processColor = require('react-native/Libraries/StyleSheet/processColor').default;
+const PlatformOS = 'android'; // rnoh: patch
+const invariant = require('invariant');
+
+type Content =
+  | {
+      title?: string,
+      message: string,
+      ...
+    }
+  | {
+      title?: string,
+      url: string,
+      ...
+    };
+type Options = {
+  dialogTitle?: string,
+  excludedActivityTypes?: Array<string>,
+  tintColor?: string,
+  subject?: string,
+  anchor?: number,
+  ...
+};
+
+class Share {
+  /**
+   * Open a dialog to share text content.
+   *
+   * In iOS, Returns a Promise which will be invoked an object containing `action`, `activityType`.
+   * If the user dismissed the dialog, the Promise will still be resolved with action being `Share.dismissedAction`
+   * and all the other keys being undefined.
+   *
+   * In Android, Returns a Promise which always be resolved with action being `Share.sharedAction`.
+   *
+   * ### Content
+   *
+   *  - `message` - a message to share
+   *
+   * #### iOS
+   *
+   *  - `url` - a URL to share
+   *
+   * At least one of URL and message is required.
+   *
+   * #### Android
+   *
+   * - `title` - title of the message
+   *
+   * ### Options
+   *
+   * #### iOS
+   *
+   *  - `subject` - a subject to share via email
+   *  - `excludedActivityTypes`
+   *  - `tintColor`
+   *
+   * #### Android
+   *
+   *  - `dialogTitle`
+   *
+   */
+  static share(
+    content: Content,
+    options: Options = {},
+  ): Promise<{action: string, activityType: ?string}> {
+    invariant(
+      typeof content === 'object' && content !== null,
+      'Content to share must be a valid object',
+    );
+    invariant(
+      typeof content.url === 'string' || typeof content.message === 'string' || typeof content.title === 'string', // rnoh: patch
+      'At least one of URL, title and message is required', // rnoh: patch
+    );
+    invariant(
+      typeof options === 'object' && options !== null,
+      'Options must be a valid object',
+    );
+
+    if (PlatformOS === 'android') {
+      invariant(
+        NativeShareModule,
+        'ShareModule should be registered on Android.',
+      );
+      invariant(
+        content.title == null || typeof content.title === 'string',
+        'Invalid title: title should be a string.',
+      );
+
+      const newContent = {
+        title: content.title,
+        message:
+          typeof content.message === 'string' ? content.message : undefined,
+        url: typeof content.url === 'string' ? content.url : undefined, // rnoh: patch
+      };
+
+      return NativeShareModule.share(newContent, options.dialogTitle)
+        .then(
+          result => ({
+            activityType: null,
+            ...result,
+          }),
+        );
+    } else if (PlatformOS=== 'ios') {  // rnoh: patch
+      return new Promise((resolve, reject) => {
+        const tintColor = processColor(options.tintColor);
+
+        invariant(
+          tintColor == null || typeof tintColor === 'number',
+          'Unexpected color given for options.tintColor',
+        );
+
+        invariant(
+          NativeActionSheetManager,
+          'NativeActionSheetManager is not registered on iOS, but it should be.',
+        );
+
+        NativeActionSheetManager.showShareActionSheetWithOptions(
+          {
+            message:
+              typeof content.message === 'string' ? content.message : undefined,
+            url: typeof content.url === 'string' ? content.url : undefined,
+            subject: options.subject,
+            tintColor: typeof tintColor === 'number' ? tintColor : undefined,
+            anchor:
+              typeof options.anchor === 'number' ? options.anchor : undefined,
+            excludedActivityTypes: options.excludedActivityTypes,
+          },
+          error => reject(error),
+          (success, activityType) => {
+            if (success) {
+              resolve({
+                action: 'sharedAction',
+                activityType: activityType,
+              });
+            } else {
+              resolve({
+                action: 'dismissedAction',
+                activityType: null,
+              });
+            }
+          },
+        );
+      });
+    } else {
+      return Promise.reject(new Error('Unsupported platform'));
+    }
+  }
+
+  /**
+   * The content was successfully shared.
+   */
+  static sharedAction: 'sharedAction' = 'sharedAction';
+
+  /**
+   * The dialog has been dismissed.
+   * @platform ios
+   */
+  static dismissedAction: 'dismissedAction' = 'dismissedAction';
+}
+
+module.exports = Share;

package/index.js

@@ -66,6 +66,9 @@ module.exports = {
   get Linking() {
     return require('react-native/Libraries/Linking/Linking');
   },
+  get LogBox() {
+    return require('react-native/Libraries/LogBox/LogBox').default;
+  },
   get Modal() {
     return require('react-native/Libraries/Modal/Modal');
   },
@@ -111,7 +114,7 @@ module.exports = {
     return require('./Libraries/Components/SafeAreaView/SafeAreaView').default;
   },
   get Share() {
-    return require('react-native/Libraries/Share/Share');
+    return require('./Libraries/Share/Share');
   },
   get ScrollView() {
     return require('./Libraries/Components/ScrollView/ScrollView');
@@ -125,6 +128,9 @@ module.exports = {
   get Switch() {
     return require('react-native/Libraries/Components/Switch/Switch').default;
   },
+  get Systrace() {
+    return require('react-native/Libraries/Performance/Systrace');
+  },
   get Text() {
     return require('react-native/Libraries/Text/Text');
   },
@@ -155,6 +161,10 @@ module.exports = {
   get UIManager() {
     return require('./Libraries/ReactNative/UIManager');
   },
+  get unstable_batchedUpdates() {
+    return require('react-native/Libraries/ReactNative/RendererProxy')
+      .unstable_batchedUpdates;
+  },
   get useAnimatedValue() {
     return require('react-native/Libraries/Animated/useAnimatedValue').default;
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native-oh/react-native-harmony",
-  "version": "0.72.22",
+  "version": "0.72.23-2",
   "description": "",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
@@ -46,7 +46,7 @@
     "./*.har"
   ],
   "dependencies": {
-    "@react-native-oh/react-native-harmony-cli": "^0.0.24",
+    "@react-native-oh/react-native-harmony-cli": "^0.0.23",
     "colors": "^1.4.0",
     "fs-extra": "^11.1.1",
     "metro": "^0.76.3",

package/types/index.d.ts

@@ -48,9 +48,9 @@ export * from 'react-native/Libraries/Linking/Linking';
 export * from 'react-native/Libraries/Lists/FlatList';
 export * from 'react-native/Libraries/Lists/SectionList';
 export * from '@react-native/virtualized-lists';
-// export * from 'react-native/Libraries/LogBox/LogBox';
+export * from 'react-native/Libraries/LogBox/LogBox';
 export * from 'react-native/Libraries/Modal/Modal';
-// export * as Systrace from 'react-native/Libraries/Performance/Systrace';
+export * as Systrace from 'react-native/Libraries/Performance/Systrace';
 // export * from 'react-native/Libraries/PermissionsAndroid/PermissionsAndroid';
 // export * from 'react-native/Libraries/PushNotificationIOS/PushNotificationIOS';
 export * from 'react-native/Libraries/ReactNative/AppRegistry';