@office-iss/react-native-win32 0.78.3 → 0.79.0-preview.1

package/Libraries/Components/TextInput/TextInputState.js

@@ -12,32 +12,16 @@
 // TextInputs. All calls relating to the keyboard should be funneled
 // through here.
 
-import type {
-  HostInstance,
-  MeasureInWindowOnSuccessCallback,
-  MeasureLayoutOnSuccessCallback,
-  MeasureOnSuccessCallback,
-} from '../../Renderer/shims/ReactNativeTypes';
+import type {HostInstance} from '../../../src/private/types/HostInstance';
 
 import {Commands as AndroidTextInputCommands} from '../../Components/TextInput/AndroidTextInputNativeComponent';
 import {Commands as iOSTextInputCommands} from '../../Components/TextInput/RCTSingelineTextInputNativeComponent';
 
 const {findNodeHandle} = require('../../ReactNative/RendererProxy');
-const Platform = require('../../Utilities/Platform');
+const Platform = require('../../Utilities/Platform').default;
 
 let currentlyFocusedInputRef: ?HostInstance = null;
-const inputs = new Set<{
-  blur(): void,
-  focus(): void,
-  measure(callback: MeasureOnSuccessCallback): void,
-  measureInWindow(callback: MeasureInWindowOnSuccessCallback): void,
-  measureLayout(
-    relativeToNativeNode: number | HostInstance,
-    onSuccess: MeasureLayoutOnSuccessCallback,
-    onFail?: () => void,
-  ): void,
-  setNativeProps(nativeProps: {...}): void,
-}>();
+const inputs = new Set<HostInstance>();
 
 function currentlyFocusedInput(): ?HostInstance {
   return currentlyFocusedInputRef;
@@ -196,7 +180,7 @@ function isTextInput(textField: HostInstance): boolean {
   return inputs.has(textField);
 }
 
-module.exports = {
+const TextInputState = {
   currentlyFocusedInput,
   focusInput,
   blurInput,
@@ -210,3 +194,5 @@ module.exports = {
   unregisterInput,
   isTextInput,
 };
+
+export default TextInputState;

package/Libraries/Components/TextInput/TextInputState.win32.js

@@ -12,33 +12,17 @@
 // TextInputs. All calls relating to the keyboard should be funneled
 // through here.
 
-import type {
-  HostInstance,
-  MeasureInWindowOnSuccessCallback,
-  MeasureLayoutOnSuccessCallback,
-  MeasureOnSuccessCallback,
-} from '../../Renderer/shims/ReactNativeTypes';
+import type {HostInstance} from '../../../src/private/types/HostInstance';
 
 import {Commands as AndroidTextInputCommands} from '../../Components/TextInput/AndroidTextInputNativeComponent';
 import {Commands as iOSTextInputCommands} from '../../Components/TextInput/RCTSingelineTextInputNativeComponent';
 import {Commands as Win32TextInputCommands} from '../../Components/TextInput/Win32TextInputNativeComponent';
 
 const {findNodeHandle} = require('../../ReactNative/RendererProxy');
-const Platform = require('../../Utilities/Platform');
+const Platform = require('../../Utilities/Platform').default;
 
 let currentlyFocusedInputRef: ?HostInstance = null;
-const inputs = new Set<{
-  blur(): void,
-  focus(): void,
-  measure(callback: MeasureOnSuccessCallback): void,
-  measureInWindow(callback: MeasureInWindowOnSuccessCallback): void,
-  measureLayout(
-    relativeToNativeNode: number | HostInstance,
-    onSuccess: MeasureLayoutOnSuccessCallback,
-    onFail?: () => void,
-  ): void,
-  setNativeProps(nativeProps: {...}): void,
-}>();
+const inputs = new Set<HostInstance>();
 
 function currentlyFocusedInput(): ?HostInstance {
   return currentlyFocusedInputRef;
@@ -235,7 +219,7 @@ function isTextInput(textField: HostInstance): boolean {
   return inputs.has(textField);
 }
 
-module.exports = {
+const TextInputState = {
   currentlyFocusedInput,
   focusInput,
   blurInput,
@@ -251,3 +235,5 @@ module.exports = {
   unregisterInput,
   isTextInput,
 };
+
+export default TextInputState;

package/Libraries/Components/TextInput/Win32TextInputNativeComponent.js

@@ -3,7 +3,7 @@
  * @format
  */
 
-import type {HostComponent} from '../../Renderer/shims/ReactNativeTypes';
+import type {HostComponent} from '../../../src/private/types/HostComponent';
 
 import requireNativeComponent from '../../ReactNative/requireNativeComponent';
 import codegenNativeCommands from '../../Utilities/codegenNativeCommands';

package/Libraries/Components/ToastAndroid/NativeToastAndroid.js

@@ -8,6 +8,6 @@
  * @format
  */
 
-export * from '../../../src/private/specs/modules/NativeToastAndroid';
-import NativeToastAndroid from '../../../src/private/specs/modules/NativeToastAndroid';
+export * from '../../../src/private/specs_DEPRECATED/modules/NativeToastAndroid';
+import NativeToastAndroid from '../../../src/private/specs_DEPRECATED/modules/NativeToastAndroid';
 export default NativeToastAndroid;

package/Libraries/Components/ToastAndroid/ToastAndroid.android.js

@@ -71,4 +71,4 @@ const ToastAndroid = {
   },
 };
 
-module.exports = ToastAndroid;
+export default ToastAndroid;

package/Libraries/Components/ToastAndroid/ToastAndroid.d.ts

@@ -16,17 +16,51 @@
  *
  * There is also a function `showWithGravity` to specify the layout gravity. May be
  * ToastAndroid.TOP, ToastAndroid.BOTTOM, ToastAndroid.CENTER
+ *
+ * **Note**: Starting from Android API level 30 (Android R) or higher, for apps targeting
+ * that API level, setting toast gravity is a no-op for text toasts.
+ * This means that in many cases `TOP`, `BOTTOM`, `CENTER`, or offsets may not have
+ * any visible effect on actual toast positioning.
+ *
+ * Reference: https://developer.android.com/reference/android/widget/Toast#setGravity(int,%20int,%20int)
  */
 export interface ToastAndroidStatic {
   /**
-   * String message: A string with the text to toast
-   * int duration: The duration of the toast.
-   * May be ToastAndroid.SHORT or ToastAndroid.LONG
+   * Display a toast message for a specified duration.
+   *
+   * @param message A string with the text to toast.
+   * @param duration The duration of the toast–either ToastAndroid.SHORT or ToastAndroid.LONG
    */
   show(message: string, duration: number): void;
-  /** `gravity` may be ToastAndroid.TOP, ToastAndroid.BOTTOM, ToastAndroid.CENTER */
+
+  /**
+   * Display a toast message for a specified duration with a given gravity.
+   *
+   * @param message A string with the text to display in the toast.
+   * @param duration The duration of the toast.
+   *                 May be `ToastAndroid.SHORT` or `ToastAndroid.LONG`.
+   * @param gravity Positioning on the screen, e.g.,
+   *                `ToastAndroid.TOP`, `ToastAndroid.BOTTOM`, or `ToastAndroid.CENTER`.
+   *
+   * **Note**: On Android R (API 30) or later (when targeting API 30+), this setting may
+   * not have any effect on text toast placement due to `setGravity` becoming a no-op.
+   */
   showWithGravity(message: string, duration: number, gravity: number): void;
 
+  /**
+   * Display a toast message for a specified duration with a given gravity and custom offsets.
+   *
+   * @param message A string with the text to display in the toast.
+   * @param duration The duration of the toast.
+   *                 May be `ToastAndroid.SHORT` or `ToastAndroid.LONG`.
+   * @param gravity Positioning on the screen, e.g.,
+   *                `ToastAndroid.TOP`, `ToastAndroid.BOTTOM`, or `ToastAndroid.CENTER`.
+   * @param xOffset Horizontal offset from the given gravity.
+   * @param yOffset Vertical offset from the given gravity.
+   *
+   * **Note**: On Android R (API 30) or later (when targeting API 30+), setting gravity
+   * and offsets may not visibly affect the placement of text toasts.
+   */
   showWithGravityAndOffset(
     message: string,
     duration: number,
@@ -34,12 +68,40 @@ export interface ToastAndroidStatic {
     xOffset: number,
     yOffset: number,
   ): void;
-  // Toast duration constants
+
+  /**
+   * Indicates a short duration on the screen.
+   *
+   * Value: 2000 milliseconds (2 seconds).
+   */
   SHORT: number;
+
+  /**
+   * Indicates a long duration on the screen.
+   *
+   * Value: 3500 milliseconds (3.5 seconds).
+   */
   LONG: number;
-  // Toast gravity constants
+
+  /**
+   * Indicates that the toast message should appear at the top of the screen.
+   *
+   * **Note**: On Android R or later, this may not have any visible effect.
+   */
   TOP: number;
+
+  /**
+   * Indicates that the toast message should appear at the bottom of the screen.
+   *
+   * **Note**: On Android R or later, this may not have any visible effect.
+   */
   BOTTOM: number;
+
+  /**
+   * Indicates that the toast message should appear at the center of the screen.
+   *
+   * **Note**: On Android R or later, this may not have any visible effect.
+   */
   CENTER: number;
 }
 

package/Libraries/Components/ToastAndroid/ToastAndroid.js

@@ -42,4 +42,4 @@ const ToastAndroid = {
   },
 };
 
-module.exports = ToastAndroid;
+export default ToastAndroid;

package/Libraries/Components/ToastAndroid/ToastAndroid.win32.js

@@ -42,4 +42,4 @@ const ToastAndroid = {
   },
 };
 
-module.exports = ToastAndroid;
+export default ToastAndroid;

package/Libraries/Components/Touchable/BoundingDimensions.js

@@ -50,4 +50,4 @@ BoundingDimensions.getPooledFromElement = function (
 
 PooledClass.addPoolingTo(BoundingDimensions as $FlowFixMe, twoArgumentPooler);
 
-module.exports = BoundingDimensions;
+export default BoundingDimensions;

package/Libraries/Components/Touchable/PooledClass.js

@@ -130,4 +130,4 @@ const PooledClass = {
   fourArgumentPooler: (fourArgumentPooler: Pooler),
 };
 
-module.exports = PooledClass;
+export default PooledClass;

package/Libraries/Components/Touchable/Position.js

@@ -37,4 +37,4 @@ Position.prototype.destructor = function () {
 
 PooledClass.addPoolingTo(Position as $FlowFixMe, twoArgumentPooler);
 
-module.exports = Position;
+export default Position;

package/Libraries/Components/Touchable/Touchable.js

@@ -10,7 +10,7 @@
 
 import type {EdgeInsetsProp} from '../../StyleSheet/EdgeInsetsPropType';
 import type {ColorValue} from '../../StyleSheet/StyleSheet';
-import type {PressEvent} from '../../Types/CoreEventTypes';
+import type {GestureResponderEvent} from '../../Types/CoreEventTypes';
 
 import {PressabilityDebugView} from '../../Pressability/PressabilityDebug';
 import UIManager from '../../ReactNative/UIManager';
@@ -21,7 +21,7 @@ import Position from './Position';
 import * as React from 'react';
 
 const extractSingleTouch = (nativeEvent: {
-  +changedTouches: $ReadOnlyArray<PressEvent['nativeEvent']>,
+  +changedTouches: $ReadOnlyArray<GestureResponderEvent['nativeEvent']>,
   +force?: number,
   +identifier: number,
   +locationX: number,
@@ -30,7 +30,7 @@ const extractSingleTouch = (nativeEvent: {
   +pageY: number,
   +target: ?number,
   +timestamp: number,
-  +touches: $ReadOnlyArray<PressEvent['nativeEvent']>,
+  +touches: $ReadOnlyArray<GestureResponderEvent['nativeEvent']>,
 }) => {
   const touches = nativeEvent.touches;
   const changedTouches = nativeEvent.changedTouches;
@@ -370,7 +370,7 @@ const LONG_PRESS_ALLOWED_MOVEMENT = 10;
  *
  * @lends Touchable.prototype
  */
-const TouchableMixin = {
+const TouchableMixinImpl = {
   componentDidMount: function () {
     if (!Platform.isTV) {
       return;
@@ -398,7 +398,7 @@ const TouchableMixin = {
   touchableGetInitialState: function (): {
     touchable: {
       touchState: ?State,
-      responderID: ?PressEvent['currentTarget'],
+      responderID: ?GestureResponderEvent['currentTarget'],
     },
   } {
     return {
@@ -434,12 +434,12 @@ const TouchableMixin = {
 
   /**
    * Place as callback for a DOM element's `onResponderGrant` event.
-   * @param {SyntheticEvent} e Synthetic event from event system.
+   * @param {NativeSyntheticEvent} e Synthetic event from event system.
    *
    */
   /* $FlowFixMe[missing-this-annot] The 'this' type annotation(s) required by
    * Flow's LTI update could not be added via codemod */
-  touchableHandleResponderGrant: function (e: PressEvent) {
+  touchableHandleResponderGrant: function (e: GestureResponderEvent) {
     const dispatchID = e.currentTarget;
     // Since e is used in a callback invoked on another event loop
     // (as in setTimeout etc), we need to call e.persist() on the
@@ -482,7 +482,7 @@ const TouchableMixin = {
    */
   /* $FlowFixMe[missing-this-annot] The 'this' type annotation(s) required by
    * Flow's LTI update could not be added via codemod */
-  touchableHandleResponderRelease: function (e: PressEvent) {
+  touchableHandleResponderRelease: function (e: GestureResponderEvent) {
     this.pressInLocation = null;
     this._receiveSignal(Signals.RESPONDER_RELEASE, e);
   },
@@ -492,7 +492,7 @@ const TouchableMixin = {
    */
   /* $FlowFixMe[missing-this-annot] The 'this' type annotation(s) required by
    * Flow's LTI update could not be added via codemod */
-  touchableHandleResponderTerminate: function (e: PressEvent) {
+  touchableHandleResponderTerminate: function (e: GestureResponderEvent) {
     this.pressInLocation = null;
     this._receiveSignal(Signals.RESPONDER_TERMINATED, e);
   },
@@ -502,7 +502,7 @@ const TouchableMixin = {
    */
   /* $FlowFixMe[missing-this-annot] The 'this' type annotation(s) required by
    * Flow's LTI update could not be added via codemod */
-  touchableHandleResponderMove: function (e: PressEvent) {
+  touchableHandleResponderMove: function (e: GestureResponderEvent) {
     // Measurement may not have returned yet.
     if (!this.state.touchable.positionOnActivate) {
       return;
@@ -732,14 +732,14 @@ const TouchableMixin = {
 
   /* $FlowFixMe[missing-this-annot] The 'this' type annotation(s) required by
    * Flow's LTI update could not be added via codemod */
-  _handleDelay: function (e: PressEvent) {
+  _handleDelay: function (e: GestureResponderEvent) {
     this.touchableDelayTimeout = null;
     this._receiveSignal(Signals.DELAY, e);
   },
 
   /* $FlowFixMe[missing-this-annot] The 'this' type annotation(s) required by
    * Flow's LTI update could not be added via codemod */
-  _handleLongDelay: function (e: PressEvent) {
+  _handleLongDelay: function (e: GestureResponderEvent) {
     this.longPressDelayTimeout = null;
     const curState = this.state.touchable.touchState;
     if (
@@ -760,7 +760,7 @@ const TouchableMixin = {
    */
   /* $FlowFixMe[missing-this-annot] The 'this' type annotation(s) required by
    * Flow's LTI update could not be added via codemod */
-  _receiveSignal: function (signal: Signal, e: PressEvent) {
+  _receiveSignal: function (signal: Signal, e: GestureResponderEvent) {
     const responderID = this.state.touchable.responderID;
     const curState = this.state.touchable.touchState;
     const nextState = Transitions[curState] && Transitions[curState][signal];
@@ -815,7 +815,7 @@ const TouchableMixin = {
 
   /* $FlowFixMe[missing-this-annot] The 'this' type annotation(s) required by
    * Flow's LTI update could not be added via codemod */
-  _savePressInLocation: function (e: PressEvent) {
+  _savePressInLocation: function (e: GestureResponderEvent) {
     const touch = extractSingleTouch(e.nativeEvent);
     const pageX = touch && touch.pageX;
     const pageY = touch && touch.pageY;
@@ -852,7 +852,7 @@ const TouchableMixin = {
     curState: State,
     nextState: State,
     signal: Signal,
-    e: PressEvent,
+    e: GestureResponderEvent,
   ) {
     const curIsHighlight = this._isHighlight(curState);
     const newIsHighlight = this._isHighlight(nextState);
@@ -911,14 +911,14 @@ const TouchableMixin = {
 
   /* $FlowFixMe[missing-this-annot] The 'this' type annotation(s) required by
    * Flow's LTI update could not be added via codemod */
-  _startHighlight: function (e: PressEvent) {
+  _startHighlight: function (e: GestureResponderEvent) {
     this._savePressInLocation(e);
     this.touchableHandleActivePressIn && this.touchableHandleActivePressIn(e);
   },
 
   /* $FlowFixMe[missing-this-annot] The 'this' type annotation(s) required by
    * Flow's LTI update could not be added via codemod */
-  _endHighlight: function (e: PressEvent) {
+  _endHighlight: function (e: GestureResponderEvent) {
     if (this.touchableHandleActivePressOut) {
       if (
         this.touchableGetPressOutDelayMS &&
@@ -946,12 +946,12 @@ const {
   touchableHandleFocus,
   touchableHandleBlur,
   ...TouchableMixinWithoutDefaultFocusAndBlur
-} = TouchableMixin;
-TouchableMixin.withoutDefaultFocusAndBlur =
+} = TouchableMixinImpl;
+TouchableMixinImpl.withoutDefaultFocusAndBlur =
   TouchableMixinWithoutDefaultFocusAndBlur;
 
-const Touchable = {
-  Mixin: TouchableMixin,
+const TouchableImpl = {
+  Mixin: TouchableMixinImpl,
   /**
    * Renders a debugging overlay to visualize touch target with hitSlop (might not work on Android).
    */
@@ -960,7 +960,7 @@ const Touchable = {
     hitSlop,
   }: {
     color: ColorValue,
-    hitSlop: EdgeInsetsProp,
+    hitSlop?: EdgeInsetsProp,
     ...
   }): null | React.Node => {
     if (__DEV__) {
@@ -970,4 +970,4 @@ const Touchable = {
   },
 };
 
-export default Touchable;
+export default TouchableImpl;

package/Libraries/Components/Touchable/Touchable.win32.js

@@ -10,7 +10,7 @@
 
 import type {EdgeInsetsProp} from '../../StyleSheet/EdgeInsetsPropType';
 import type {ColorValue} from '../../StyleSheet/StyleSheet';
-import type {PressEvent} from '../../Types/CoreEventTypes';
+import type {GestureResponderEvent} from '../../Types/CoreEventTypes';
 
 import {PressabilityDebugView} from '../../Pressability/PressabilityDebug';
 import UIManager from '../../ReactNative/UIManager';
@@ -21,9 +21,9 @@ import Position from './Position';
 import * as React from 'react';
 
 const extractSingleTouch = (nativeEvent: {
+  +changedTouches: $ReadOnlyArray<GestureResponderEvent['nativeEvent']>,
   +altKey: ?boolean,
   +button: ?number,
-  +changedTouches: $ReadOnlyArray<PressEvent['nativeEvent']>,
   +ctrlKey: ?boolean,
   +force?: number,
   +identifier: number,
@@ -35,7 +35,7 @@ const extractSingleTouch = (nativeEvent: {
   +shiftKey: ?boolean,
   +target: ?number,
   +timestamp: number,
-  +touches: $ReadOnlyArray<PressEvent['nativeEvent']>,
+  +touches: $ReadOnlyArray<GestureResponderEvent['nativeEvent']>,
 }) => {
   const touches = nativeEvent.touches;
   const changedTouches = nativeEvent.changedTouches;
@@ -375,7 +375,7 @@ const LONG_PRESS_ALLOWED_MOVEMENT = 10;
  *
  * @lends Touchable.prototype
  */
-const TouchableMixin = {
+const TouchableMixinImpl = {
   componentDidMount: function () {
     if (!Platform.isTV) {
       return;
@@ -403,7 +403,7 @@ const TouchableMixin = {
   touchableGetInitialState: function (): {
     touchable: {
       touchState: ?State,
-      responderID: ?PressEvent['currentTarget'],
+      responderID: ?GestureResponderEvent['currentTarget'],
     },
   } {
     return {
@@ -439,12 +439,12 @@ const TouchableMixin = {
 
   /**
    * Place as callback for a DOM element's `onResponderGrant` event.
-   * @param {SyntheticEvent} e Synthetic event from event system.
+   * @param {NativeSyntheticEvent} e Synthetic event from event system.
    *
    */
   /* $FlowFixMe[missing-this-annot] The 'this' type annotation(s) required by
    * Flow's LTI update could not be added via codemod */
-  touchableHandleResponderGrant: function (e: PressEvent) {
+  touchableHandleResponderGrant: function (e: GestureResponderEvent) {
     const dispatchID = e.currentTarget;
     // Since e is used in a callback invoked on another event loop
     // (as in setTimeout etc), we need to call e.persist() on the
@@ -487,7 +487,7 @@ const TouchableMixin = {
    */
   /* $FlowFixMe[missing-this-annot] The 'this' type annotation(s) required by
    * Flow's LTI update could not be added via codemod */
-  touchableHandleResponderRelease: function (e: PressEvent) {
+  touchableHandleResponderRelease: function (e: GestureResponderEvent) {
     this.pressInLocation = null;
     this._receiveSignal(Signals.RESPONDER_RELEASE, e);
   },
@@ -497,7 +497,7 @@ const TouchableMixin = {
    */
   /* $FlowFixMe[missing-this-annot] The 'this' type annotation(s) required by
    * Flow's LTI update could not be added via codemod */
-  touchableHandleResponderTerminate: function (e: PressEvent) {
+  touchableHandleResponderTerminate: function (e: GestureResponderEvent) {
     this.pressInLocation = null;
     this._receiveSignal(Signals.RESPONDER_TERMINATED, e);
   },
@@ -507,7 +507,7 @@ const TouchableMixin = {
    */
   /* $FlowFixMe[missing-this-annot] The 'this' type annotation(s) required by
    * Flow's LTI update could not be added via codemod */
-  touchableHandleResponderMove: function (e: PressEvent) {
+  touchableHandleResponderMove: function (e: GestureResponderEvent) {
     // Measurement may not have returned yet.
     if (!this.state.touchable.positionOnActivate) {
       return;
@@ -737,14 +737,14 @@ const TouchableMixin = {
 
   /* $FlowFixMe[missing-this-annot] The 'this' type annotation(s) required by
    * Flow's LTI update could not be added via codemod */
-  _handleDelay: function (e: PressEvent) {
+  _handleDelay: function (e: GestureResponderEvent) {
     this.touchableDelayTimeout = null;
     this._receiveSignal(Signals.DELAY, e);
   },
 
   /* $FlowFixMe[missing-this-annot] The 'this' type annotation(s) required by
    * Flow's LTI update could not be added via codemod */
-  _handleLongDelay: function (e: PressEvent) {
+  _handleLongDelay: function (e: GestureResponderEvent) {
     this.longPressDelayTimeout = null;
     const curState = this.state.touchable.touchState;
     if (
@@ -765,7 +765,7 @@ const TouchableMixin = {
    */
   /* $FlowFixMe[missing-this-annot] The 'this' type annotation(s) required by
    * Flow's LTI update could not be added via codemod */
-  _receiveSignal: function (signal: Signal, e: PressEvent) {
+  _receiveSignal: function (signal: Signal, e: GestureResponderEvent) {
     const responderID = this.state.touchable.responderID;
     const curState = this.state.touchable.touchState;
     const nextState = Transitions[curState] && Transitions[curState][signal];
@@ -820,7 +820,7 @@ const TouchableMixin = {
 
   /* $FlowFixMe[missing-this-annot] The 'this' type annotation(s) required by
    * Flow's LTI update could not be added via codemod */
-  _savePressInLocation: function (e: PressEvent) {
+  _savePressInLocation: function (e: GestureResponderEvent) {
     const touch = extractSingleTouch(e.nativeEvent);
     const pageX = touch && touch.pageX;
     const pageY = touch && touch.pageY;
@@ -857,7 +857,7 @@ const TouchableMixin = {
     curState: State,
     nextState: State,
     signal: Signal,
-    e: PressEvent,
+    e: GestureResponderEvent,
   ) {
     const curIsHighlight = this._isHighlight(curState);
     const newIsHighlight = this._isHighlight(nextState);
@@ -916,14 +916,14 @@ const TouchableMixin = {
 
   /* $FlowFixMe[missing-this-annot] The 'this' type annotation(s) required by
    * Flow's LTI update could not be added via codemod */
-  _startHighlight: function (e: PressEvent) {
+  _startHighlight: function (e: GestureResponderEvent) {
     this._savePressInLocation(e);
     this.touchableHandleActivePressIn && this.touchableHandleActivePressIn(e);
   },
 
   /* $FlowFixMe[missing-this-annot] The 'this' type annotation(s) required by
    * Flow's LTI update could not be added via codemod */
-  _endHighlight: function (e: PressEvent) {
+  _endHighlight: function (e: GestureResponderEvent) {
     if (this.touchableHandleActivePressOut) {
       if (
         this.touchableGetPressOutDelayMS &&
@@ -951,12 +951,12 @@ const {
   touchableHandleFocus,
   touchableHandleBlur,
   ...TouchableMixinWithoutDefaultFocusAndBlur
-} = TouchableMixin;
-TouchableMixin.withoutDefaultFocusAndBlur =
+} = TouchableMixinImpl;
+TouchableMixinImpl.withoutDefaultFocusAndBlur =
   TouchableMixinWithoutDefaultFocusAndBlur;
 
-const Touchable = {
-  Mixin: TouchableMixin,
+const TouchableImpl = {
+  Mixin: TouchableMixinImpl,
   /**
    * Renders a debugging overlay to visualize touch target with hitSlop (might not work on Android).
    */
@@ -965,7 +965,7 @@ const Touchable = {
     hitSlop,
   }: {
     color: ColorValue,
-    hitSlop: EdgeInsetsProp,
+    hitSlop?: EdgeInsetsProp,
     ...
   }): null | React.Node => {
     if (__DEV__) {
@@ -975,4 +975,4 @@ const Touchable = {
   },
 };
 
-export default Touchable;
+export default TouchableImpl;

package/Libraries/Components/Touchable/TouchableBounce.js

@@ -19,7 +19,7 @@ import {PressabilityDebugView} from '../../Pressability/PressabilityDebug';
 import Platform from '../../Utilities/Platform';
 import * as React from 'react';
 
-type Props = $ReadOnly<{|
+type Props = $ReadOnly<{
   ...React.ElementConfig<TouchableWithoutFeedback>,
 
   onPressAnimationComplete?: ?() => void,
@@ -29,12 +29,12 @@ type Props = $ReadOnly<{|
   style?: ?ViewStyleProp,
 
   hostRef: React.RefSetter<React.ElementRef<typeof Animated.View>>,
-|}>;
+}>;
 
-type State = $ReadOnly<{|
+type State = $ReadOnly<{
   pressability: Pressability,
   scale: Animated.Value,
-|}>;
+}>;
 
 class TouchableBounce extends React.Component<Props, State> {
   state: State = {
@@ -214,9 +214,9 @@ class TouchableBounce extends React.Component<Props, State> {
   }
 }
 
-module.exports = (React.forwardRef((props, hostRef) => (
+export default (React.forwardRef((props, hostRef: React.RefSetter<mixed>) => (
   <TouchableBounce {...props} hostRef={hostRef} />
 )): component(
   ref: React.RefSetter<mixed>,
-  ...props: $ReadOnly<$Diff<Props, {|hostRef: mixed|}>>
+  ...props: $ReadOnly<$Diff<Props, {hostRef: mixed}>>
 ));