@office-iss/react-native-win32 0.67.0-preview.2 → 0.67.1

package/Libraries/Types/CoreEventTypes.win32.js

@@ -0,0 +1,191 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict
+ * @format
+ */
+
+import * as React from 'react';
+import type {HostComponent} from '../Renderer/shims/ReactNativeTypes';
+
+export type SyntheticEvent<T> = $ReadOnly<{|
+  bubbles: ?boolean,
+  cancelable: ?boolean,
+  currentTarget: number | React.ElementRef<HostComponent<mixed>>,
+  defaultPrevented: ?boolean,
+  dispatchConfig: $ReadOnly<{|
+    registrationName: string,
+  |}>,
+  eventPhase: ?number,
+  preventDefault: () => void,
+  isDefaultPrevented: () => boolean,
+  stopPropagation: () => void,
+  isPropagationStopped: () => boolean,
+  isTrusted: ?boolean,
+  nativeEvent: T,
+  persist: () => void,
+  target: ?number | React.ElementRef<HostComponent<mixed>>,
+  timeStamp: number,
+  type: ?string,
+|}>;
+
+export type ResponderSyntheticEvent<T> = $ReadOnly<{|
+  ...SyntheticEvent<T>,
+  touchHistory: $ReadOnly<{|
+    indexOfSingleActiveTouch: number,
+    mostRecentTimeStamp: number,
+    numberActiveTouches: number,
+    touchBank: $ReadOnlyArray<
+      $ReadOnly<{|
+        touchActive: boolean,
+        startPageX: number,
+        startPageY: number,
+        startTimeStamp: number,
+        currentPageX: number,
+        currentPageY: number,
+        currentTimeStamp: number,
+        previousPageX: number,
+        previousPageY: number,
+        previousTimeStamp: number,
+      |}>,
+    >,
+  |}>,
+|}>;
+
+export type Layout = $ReadOnly<{|
+  x: number,
+  y: number,
+  width: number,
+  height: number,
+|}>;
+
+export type TextLayout = $ReadOnly<{|
+  ...Layout,
+  ascender: number,
+  capHeight: number,
+  descender: number,
+  text: string,
+  xHeight: number,
+|}>;
+
+export type LayoutEvent = SyntheticEvent<
+  $ReadOnly<{|
+    layout: Layout,
+  |}>,
+>;
+
+export type TextLayoutEvent = SyntheticEvent<
+  $ReadOnly<{|
+    lines: Array<TextLayout>,
+  |}>,
+>;
+
+export type PressEvent = ResponderSyntheticEvent<
+  $ReadOnly<{|
+    altKey: ?boolean, // TODO(macOS)
+    button: ?number, // TODO(macOS)
+    changedTouches: $ReadOnlyArray<$PropertyType<PressEvent, 'nativeEvent'>>,
+    ctrlKey: ?boolean, // TODO(macOS)
+    force?: number,
+    identifier: number,
+    locationX: number,
+    locationY: number,
+    metaKey: ?boolean, // TODO(macOS)
+    pageX: number,
+    pageY: number,
+    shiftKey: ?boolean, // TODO(macOS)
+    target: ?number,
+    timestamp: number,
+    touches: $ReadOnlyArray<$PropertyType<PressEvent, 'nativeEvent'>>,
+  |}>,
+>;
+
+export type ScrollEvent = SyntheticEvent<
+  $ReadOnly<{|
+    contentInset: $ReadOnly<{|
+      bottom: number,
+      left: number,
+      right: number,
+      top: number,
+    |}>,
+    contentOffset: $ReadOnly<{|
+      y: number,
+      x: number,
+    |}>,
+    contentSize: $ReadOnly<{|
+      height: number,
+      width: number,
+    |}>,
+    layoutMeasurement: $ReadOnly<{|
+      height: number,
+      width: number,
+    |}>,
+    targetContentOffset?: $ReadOnly<{|
+      y: number,
+      x: number,
+    |}>,
+    velocity?: $ReadOnly<{|
+      y: number,
+      x: number,
+    |}>,
+    zoomScale?: number,
+    responderIgnoreScroll?: boolean,
+    key?: string, // TODO(macOS)
+  |}>,
+>;
+
+export type BlurEvent = SyntheticEvent<
+  $ReadOnly<{|
+    target: number,
+  |}>,
+>;
+
+export type FocusEvent = SyntheticEvent<
+  $ReadOnly<{|
+    target: number,
+  |}>,
+>;
+
+// [Windows Mouse events on Windows don't match up with the version in core
+// introduced for react-native-web. Replace typings with our values to catch
+// anything dependent on react-native-web specific values
+export type MouseEvent = SyntheticEvent<
+  $ReadOnly<{|
+    target: number,
+    identifier: number,
+    pageX: number,
+    pageY: number,
+    locationX: number,
+    locationY: number,
+    timestamp: number,
+    pointerType: string,
+    force: number,
+    isLeftButton: boolean,
+    isRightButton: boolean,
+    isMiddleButton: boolean,
+    isBarrelButtonPressed: boolean,
+    isHorizontalScrollWheel: boolean,
+    isEraser: boolean,
+    shiftKey: boolean,
+    ctrlKey: boolean,
+    altKey: boolean,
+  |}>,
+>;
+// Windows]
+
+// [Windows
+export type KeyEvent = SyntheticEvent<
+  $ReadOnly<{|
+    altKey: boolean,
+    ctrlKey: boolean,
+    metaKey: boolean,
+    shiftKey: boolean,
+    key: string,
+    code: string,
+    eventPhase: number,
+  |}>,
+>;
+// Windows]

package/jest/preprocessor.js

@@ -13,42 +13,10 @@
 'use strict';
 
 const babelRegisterOnly = require('metro-babel-register');
-const nullthrows = require('nullthrows');
 const createCacheKeyFunction = require('@jest/create-cache-key-function')
   .default;
-const t = require('@babel/types');
-const {statements} = require('@babel/template').default;
 
-const importDefault = '__importDefault__';
-const importAll = '__importAll__';
-
-// prelude
-const importPrelude = statements(`
-  function ${importDefault}(moduleId) {
-    const exports = require(moduleId);
-
-    if (exports && exports.__esModule) {
-      return exports.default;
-    }
-
-    return exports;
-  };
-
-  function ${importAll}(moduleId) {
-    const exports = require(moduleId);
-
-    if (exports && exports.__esModule) {
-      return exports;
-    }
-
-    return Object.assign({}, exports, {default: exports});
-  };
-`);
-
-const {
-  transformSync: babelTransformSync,
-  transformFromAstSync: babelTransformFromAstSync,
-} = require('@babel/core');
+const {transformSync: babelTransformSync} = require('@babel/core');
 const generate = require('@babel/generator').default;
 
 const nodeFiles = new RegExp(
@@ -73,13 +41,13 @@ module.exports = {
       }).code;
     }
 
-    let {ast} = transformer.transform({
+    const {ast} = transformer.transform({
       filename: file,
       options: {
         ast: true, // needed for open source (?) https://github.com/facebook/react-native/commit/f8d6b97140cffe8d18b2558f94570c8d1b410d5c#r28647044
         dev: true,
         enableBabelRuntime: false,
-        experimentalImportSupport: true,
+        experimentalImportSupport: false,
         globalPrefix: '',
         hot: false,
         inlineRequires: true,
@@ -111,6 +79,10 @@ module.exports = {
         [require('@babel/plugin-transform-regenerator')],
         [require('@babel/plugin-transform-sticky-regex')],
         [require('@babel/plugin-transform-unicode-regex')],
+        [
+          require('@babel/plugin-transform-modules-commonjs'),
+          {strict: false, allowTopLevelThis: true},
+        ],
         [require('@babel/plugin-transform-classes')],
         [require('@babel/plugin-transform-arrow-functions')],
         [require('@babel/plugin-transform-spread')],
@@ -127,46 +99,6 @@ module.exports = {
       ],
     });
 
-    // We're not using @babel/plugin-transform-modules-commonjs so
-    // we need to add 'use strict' manually
-    const directives = ast.program.directives;
-
-    if (
-      ast.program.sourceType === 'module' &&
-      (directives == null ||
-        directives.findIndex(d => d.value.value === 'use strict') === -1)
-    ) {
-      ast.program.directives = [
-        ...(directives || []),
-        t.directive(t.directiveLiteral('use strict')),
-      ];
-    }
-
-    // Postprocess the transformed module to handle ESM and inline requires.
-    // We need to do this in a separate pass to avoid issues tracking references.
-    const babelTransformResult = babelTransformFromAstSync(ast, src, {
-      ast: true,
-      retainLines: true,
-      plugins: [
-        [
-          require('metro-transform-plugins').importExportPlugin,
-          {importDefault, importAll},
-        ],
-        [
-          require('babel-preset-fbjs/plugins/inline-requires.js'),
-          {inlineableCalls: [importDefault, importAll]},
-        ],
-      ],
-      sourceType: 'module',
-    });
-
-    ast = nullthrows(babelTransformResult.ast);
-
-    // Inject import helpers *after* running the inline-requires transform,
-    // because otherwise it will assume they are user code and bail out of
-    // inlining calls to them.
-    ast.program.body.unshift(...importPrelude());
-
     return generate(
       ast,
       // $FlowFixMe[prop-missing] Error found when improving flow typing for libs

package/overrides.json

@@ -7,7 +7,7 @@
     "**/__snapshots__/**",
     "src/rntypes/**"
   ],
-  "baseVersion": "0.67.0-rc.1",
+  "baseVersion": "0.67.1",
   "overrides": [
     {
       "type": "derived",
@@ -74,6 +74,13 @@
       "baseHash": "0b409391c852a1001cee74a84414a13c4fe88f8b",
       "issue": 4378
     },
+    {
+      "type": "patch",
+      "file": "src/Libraries/Components/Pressable/Pressable.win32.js",
+      "baseFile": "Libraries/Components/Pressable/Pressable.js",
+      "baseHash": "614553aa8396b42e932f8c717ebc8b493d772d93",
+      "issue": 6240
+    },
     {
       "type": "copy",
       "file": "src/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.js",
@@ -185,6 +192,13 @@
       "baseFile": "Libraries/Components/View/View.js",
       "baseHash": "689895e8755aed42e913460d1fa964907a74f06c"
     },
+    {
+      "type": "patch",
+      "file": "src/Libraries/Components/View/ViewPropTypes.win32.js",
+      "baseFile": "Libraries/Components/View/ViewPropTypes.js",
+      "baseHash": "2b12228aa1ab0e12844996a99ff5d38fbff689a1",
+      "issue": 6240
+    },
     {
       "type": "platform",
       "file": "src/Libraries/Components/View/ViewWin32.Props.ts"
@@ -364,6 +378,20 @@
       "type": "platform",
       "file": "src/Libraries/PersonaCoin/PersonaCoinTypes.ts"
     },
+    {
+      "type": "patch",
+      "file": "src/Libraries/Pressability/HoverState.win32.js",
+      "baseFile": "Libraries/Pressability/HoverState.js",
+      "baseHash": "2807a1cddb7c5135f63e5dd4d0706ac660f25d76",
+      "issue": 6240
+    },
+    {
+      "type": "patch",
+      "file": "src/Libraries/Pressability/Pressability.win32.js",
+      "baseFile": "Libraries/Pressability/Pressability.js",
+      "baseHash": "05c53428a4b7b142fabb6833ecf54ba88c0aa05d",
+      "issue": 6240
+    },
     {
       "type": "platform",
       "file": "src/Libraries/QuirkSettings/CachingNativeQuirkSettings.js"
@@ -417,6 +445,13 @@
       "baseHash": "1a196691fb0e9b656c348b7d42427c1c6163c9bb",
       "issue": 7074
     },
+    {
+      "type": "patch",
+      "file": "src/Libraries/Types/CoreEventTypes.win32.js",
+      "baseFile": "Libraries/Types/CoreEventTypes.js",
+      "baseHash": "22c50d13820ca4db6c6cf5e6563f8437d55c24af",
+      "issue": 6240
+    },
     {
       "type": "copy",
       "file": "src/Libraries/Utilities/BackHandler.win32.js",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@office-iss/react-native-win32",
-  "version": "0.67.0-preview.2",
+  "version": "0.67.1",
   "description": "Implementation of react native on top of Office's Win32 platform.",
   "license": "MIT",
   "main": "./index.win32.js",
@@ -25,7 +25,7 @@
     "@react-native-community/cli": "^6.0.0",
     "@react-native-community/cli-platform-android": "^6.0.0",
     "@react-native-community/cli-platform-ios": "^6.0.0",
-    "@react-native-windows/virtualized-list": "0.67.0-preview.1",
+    "@react-native-windows/virtualized-list": "0.67.1",
     "@react-native/assets": "1.0.0",
     "@react-native/normalize-color": "2.0.0",
     "@react-native/polyfills": "2.0.0",
@@ -70,21 +70,21 @@
     "just-scripts": "^1.3.3",
     "prettier": "1.19.1",
     "react": "17.0.2",
-    "react-native": "0.67.0-rc.1",
+    "react-native": "0.67.1",
     "react-native-platform-override": "^1.5.1",
     "react-shallow-renderer": "16.14.1",
     "typescript": "^4.4.4"
   },
   "peerDependencies": {
     "react": "17.0.2",
-    "react-native": "0.67.0-rc.1"
+    "react-native": "^0.67.0"
   },
   "beachball": {
-    "defaultNpmTag": "preview",
+    "defaultNpmTag": "v0.67-stable",
     "disallowedChangeTypes": [
       "major",
       "minor",
-      "patch"
+      "prerelease"
     ]
   },
   "promoteRelease": true,