@office-iss/react-native-win32 0.69.0 → 0.70.0-preview.1

package/Libraries/Lists/VirtualizedList.js

@@ -8,40 +8,41 @@
  * @format
  */
 
-const Batchinator = require('../Interaction/Batchinator');
-const FillRateHelper = require('./FillRateHelper');
-const ReactNative = require('../Renderer/shims/ReactNative');
-const RefreshControl = require('../Components/RefreshControl/RefreshControl');
-const ScrollView = require('../Components/ScrollView/ScrollView');
-const StyleSheet = require('../StyleSheet/StyleSheet');
-const View = require('../Components/View/View');
-const ViewabilityHelper = require('./ViewabilityHelper');
-
-const flattenStyle = require('../StyleSheet/flattenStyle');
-const infoLog = require('../Utilities/infoLog');
-const invariant = require('invariant');
-
-import {
-  keyExtractor as defaultKeyExtractor,
-  computeWindowedRenderLimits,
-} from './VirtualizeUtils';
-
-import * as React from 'react';
 import type {ScrollResponderType} from '../Components/ScrollView/ScrollView';
 import type {ViewStyleProp} from '../StyleSheet/StyleSheet';
+import type {LayoutEvent, ScrollEvent} from '../Types/CoreEventTypes';
 import type {
   ViewabilityConfig,
-  ViewToken,
   ViewabilityConfigCallbackPair,
+  ViewToken,
 } from './ViewabilityHelper';
-import type {LayoutEvent} from '../Types/CoreEventTypes';
+
 import {
+  type ChildListState,
+  type ListDebugInfo,
   VirtualizedListCellContextProvider,
   VirtualizedListContext,
   VirtualizedListContextProvider,
-  type ChildListState,
-  type ListDebugInfo,
 } from './VirtualizedListContext.js';
+import {
+  computeWindowedRenderLimits,
+  keyExtractor as defaultKeyExtractor,
+} from './VirtualizeUtils';
+import * as React from 'react';
+
+const RefreshControl = require('../Components/RefreshControl/RefreshControl');
+const ScrollView = require('../Components/ScrollView/ScrollView');
+const View = require('../Components/View/View');
+const Batchinator = require('../Interaction/Batchinator');
+const ReactNative = require('../Renderer/shims/ReactNative');
+const flattenStyle = require('../StyleSheet/flattenStyle');
+const StyleSheet = require('../StyleSheet/StyleSheet');
+const infoLog = require('../Utilities/infoLog');
+const FillRateHelper = require('./FillRateHelper');
+const ViewabilityHelper = require('./ViewabilityHelper');
+const invariant = require('invariant');
+
+const ON_END_REACHED_EPSILON = 0.001;
 
 type Item = any;
 
@@ -219,7 +220,8 @@ type OptionalProps = {|
    * How far from the end (in units of visible length of the list) the bottom edge of the
    * list must be from the end of the content to trigger the `onEndReached` callback.
    * Thus a value of 0.5 will trigger `onEndReached` when the end of the content is
-   * within half the visible length of the list.
+   * within half the visible length of the list. A value of 0 will not trigger until scrolling
+   * to the very end of the list.
    */
   onEndReachedThreshold?: ?number,
   /**
@@ -1192,14 +1194,22 @@ class VirtualizedList extends React.PureComponent<Props, State> {
   _averageCellLength = 0;
   // Maps a cell key to the set of keys for all outermost child lists within that cell
   _cellKeysToChildListKeys: Map<string, Set<string>> = new Map();
-  _cellRefs = {};
+  _cellRefs: {[string]: null | CellRenderer} = {};
   _fillRateHelper: FillRateHelper;
-  _frames = {};
+  _frames: {
+    [string]: {
+      inLayout?: boolean,
+      index: number,
+      length: number,
+      offset: number,
+    },
+  } = {};
   _footerLength = 0;
-  _hasDoneInitialScroll = false;
+  // Used for preventing scrollToIndex from being called multiple times for initialScrollIndex
+  _hasTriggeredInitialScrollToIndex = false;
   _hasInteracted = false;
   _hasMore = false;
-  _hasWarned = {};
+  _hasWarned: {[string]: boolean} = {};
   _headerLength = 0;
   _hiPriInProgress: boolean = false; // flag to prevent infinite hiPri cell limit update
   _highestMeasuredFrameIndex = 0;
@@ -1222,6 +1232,7 @@ class VirtualizedList extends React.PureComponent<Props, State> {
     timestamp: 0,
     velocity: 0,
     visibleLength: 0,
+    zoomScale: 1,
   };
   _scrollRef: ?React.ElementRef<any> = null;
   _sentEndForContentLength = 0;
@@ -1230,6 +1241,8 @@ class VirtualizedList extends React.PureComponent<Props, State> {
   _updateCellsToRenderBatcher: Batchinator;
   _viewabilityTuples: Array<ViewabilityHelperCallbackTuple> = [];
 
+  /* $FlowFixMe[missing-local-annot] The type annotation(s) required by Flow's
+   * LTI update could not be added via codemod */
   _captureScrollRef = ref => {
     this._scrollRef = ref;
   };
@@ -1242,6 +1255,8 @@ class VirtualizedList extends React.PureComponent<Props, State> {
     );
   }
 
+  /* $FlowFixMe[missing-local-annot] The type annotation(s) required by Flow's
+   * LTI update could not be added via codemod */
   _defaultRenderScrollComponent = props => {
     const onRefresh = props.onRefresh;
     if (this._isNestedWithSameOrientation()) {
@@ -1261,6 +1276,7 @@ class VirtualizedList extends React.PureComponent<Props, State> {
           refreshControl={
             props.refreshControl == null ? (
               <RefreshControl
+                // $FlowFixMe[incompatible-type]
                 refreshing={props.refreshing}
                 onRefresh={onRefresh}
                 progressViewOffset={props.progressViewOffset}
@@ -1507,13 +1523,22 @@ class VirtualizedList extends React.PureComponent<Props, State> {
     const {data, getItemCount, onEndReached, onEndReachedThreshold} =
       this.props;
     const {contentLength, visibleLength, offset} = this._scrollMetrics;
-    const distanceFromEnd = contentLength - visibleLength - offset;
+    let distanceFromEnd = contentLength - visibleLength - offset;
+
+    // Especially when oERT is zero it's necessary to 'floor' very small distanceFromEnd values to be 0
+    // since debouncing causes us to not fire this event for every single "pixel" we scroll and can thus
+    // be at the "end" of the list with a distanceFromEnd approximating 0 but not quite there.
+    if (distanceFromEnd < ON_END_REACHED_EPSILON) {
+      distanceFromEnd = 0;
+    }
+
+    // TODO: T121172172 Look into why we're "defaulting" to a threshold of 2 when oERT is not present
     const threshold =
       onEndReachedThreshold != null ? onEndReachedThreshold * visibleLength : 2;
     if (
       onEndReached &&
       this.state.last === getItemCount(data) - 1 &&
-      distanceFromEnd < threshold &&
+      distanceFromEnd <= threshold &&
       this._scrollMetrics.contentLength !== this._sentEndForContentLength
     ) {
       // Only call onEndReached once for a given content length
@@ -1532,7 +1557,7 @@ class VirtualizedList extends React.PureComponent<Props, State> {
       height > 0 &&
       this.props.initialScrollIndex != null &&
       this.props.initialScrollIndex > 0 &&
-      !this._hasDoneInitialScroll
+      !this._hasTriggeredInitialScrollToIndex
     ) {
       if (this.props.contentOffset == null) {
         this.scrollToIndex({
@@ -1540,7 +1565,7 @@ class VirtualizedList extends React.PureComponent<Props, State> {
           index: this.props.initialScrollIndex,
         });
       }
-      this._hasDoneInitialScroll = true;
+      this._hasTriggeredInitialScrollToIndex = true;
     }
     if (this.props.onContentSizeChange) {
       this.props.onContentSizeChange(width, height);
@@ -1618,6 +1643,9 @@ class VirtualizedList extends React.PureComponent<Props, State> {
       );
       this._hasWarned.perf = true;
     }
+
+    // For invalid negative values (w/ RTL), set this to 1.
+    const zoomScale = e.nativeEvent.zoomScale < 0 ? 1 : e.nativeEvent.zoomScale;
     this._scrollMetrics = {
       contentLength,
       dt,
@@ -1626,6 +1654,7 @@ class VirtualizedList extends React.PureComponent<Props, State> {
       timestamp,
       velocity,
       visibleLength,
+      zoomScale,
     };
     this._updateViewableItems(this.props.data);
     if (!this.props) {
@@ -1688,7 +1717,7 @@ class VirtualizedList extends React.PureComponent<Props, State> {
     }
   }
 
-  _onScrollBeginDrag = (e): void => {
+  _onScrollBeginDrag = (e: ScrollEvent): void => {
     this._nestedChildLists.forEach(childList => {
       childList.ref && childList.ref._onScrollBeginDrag(e);
     });
@@ -1699,7 +1728,7 @@ class VirtualizedList extends React.PureComponent<Props, State> {
     this.props.onScrollBeginDrag && this.props.onScrollBeginDrag(e);
   };
 
-  _onScrollEndDrag = (e): void => {
+  _onScrollEndDrag = (e: ScrollEvent): void => {
     this._nestedChildLists.forEach(childList => {
       childList.ref && childList.ref._onScrollEndDrag(e);
     });
@@ -1711,14 +1740,14 @@ class VirtualizedList extends React.PureComponent<Props, State> {
     this.props.onScrollEndDrag && this.props.onScrollEndDrag(e);
   };
 
-  _onMomentumScrollBegin = (e): void => {
+  _onMomentumScrollBegin = (e: ScrollEvent): void => {
     this._nestedChildLists.forEach(childList => {
       childList.ref && childList.ref._onMomentumScrollBegin(e);
     });
     this.props.onMomentumScrollBegin && this.props.onMomentumScrollBegin(e);
   };
 
-  _onMomentumScrollEnd = (e): void => {
+  _onMomentumScrollEnd = (e: ScrollEvent): void => {
     this._nestedChildLists.forEach(childList => {
       childList.ref && childList.ref._onMomentumScrollEnd(e);
     });
@@ -1747,6 +1776,7 @@ class VirtualizedList extends React.PureComponent<Props, State> {
         | $TEMPORARY$object<{first: number, last: number}>
       );
       const {contentLength, offset, visibleLength} = this._scrollMetrics;
+      const distanceFromEnd = contentLength - visibleLength - offset;
       if (!isVirtualizationDisabled) {
         // If we run this with bogus data, we'll force-render window {first: 0, last: 0},
         // and wipe out the initialNumToRender rendered elements.
@@ -1757,7 +1787,17 @@ class VirtualizedList extends React.PureComponent<Props, State> {
           // we'll wipe out the initialNumToRender rendered elements starting at initialScrollIndex.
           // So let's wait until we've scrolled the view to the right place. And until then,
           // we will trust the initialScrollIndex suggestion.
-          if (!this.props.initialScrollIndex || this._hasDoneInitialScroll) {
+
+          // Thus, we want to recalculate the windowed render limits if any of the following hold:
+          // - initialScrollIndex is undefined or is 0
+          // - initialScrollIndex > 0 AND scrolling is complete
+          // - initialScrollIndex > 0 AND the end of the list is visible (this handles the case
+          //   where the list is shorter than the visible area)
+          if (
+            !this.props.initialScrollIndex ||
+            this._scrollMetrics.offset ||
+            Math.abs(distanceFromEnd) < Number.EPSILON
+          ) {
             newState = computeWindowedRenderLimits(
               this.props.data,
               this.props.getItemCount,
@@ -1770,7 +1810,6 @@ class VirtualizedList extends React.PureComponent<Props, State> {
           }
         }
       } else {
-        const distanceFromEnd = contentLength - visibleLength - offset;
         const renderAhead =
           distanceFromEnd < onEndReachedThreshold * visibleLength
             ? maxToRenderPerBatchOrDefault(this.props.maxToRenderPerBatch)
@@ -1864,15 +1903,15 @@ class VirtualizedList extends React.PureComponent<Props, State> {
       'Tried to get frame for out of range index ' + index,
     );
     const item = getItem(data, index);
-    let frame = item && this._frames[this._keyExtractor(item, index)];
+    const frame = item && this._frames[this._keyExtractor(item, index)];
     if (!frame || frame.index !== index) {
       if (getItemLayout) {
-        frame = getItemLayout(data, index);
+        /* $FlowFixMe[prop-missing] (>=0.63.0 site=react_native_fb) This comment
+         * suppresses an error found when Flow v0.63 was deployed. To see the error
+         * delete this comment and run Flow. */
+        return getItemLayout(data, index);
       }
     }
-    /* $FlowFixMe[prop-missing] (>=0.63.0 site=react_native_fb) This comment
-     * suppresses an error found when Flow v0.63 was deployed. To see the error
-     * delete this comment and run Flow. */
     return frame;
   };
 
@@ -1998,7 +2037,12 @@ class CellRenderer extends React.Component<
       );
   };
 
-  _renderElement(renderItem, ListItemComponent, item, index) {
+  _renderElement(
+    renderItem: any,
+    ListItemComponent: any,
+    item: any,
+    index: any,
+  ) {
     if (renderItem && ListItemComponent) {
       console.warn(
         'VirtualizedList: Both ListItemComponent and renderItem props are present. ListItemComponent will take' +
@@ -2062,9 +2106,11 @@ class CellRenderer extends React.Component<
         : this._onLayout;
     // NOTE: that when this is a sticky header, `onLayout` will get automatically extracted and
     // called explicitly by `ScrollViewStickyHeader`.
-    const itemSeparator = ItemSeparatorComponent && (
-      <ItemSeparatorComponent {...this.state.separatorProps} />
-    );
+    const itemSeparator = React.isValidElement(ItemSeparatorComponent)
+      ? ItemSeparatorComponent
+      : ItemSeparatorComponent && (
+          <ItemSeparatorComponent {...this.state.separatorProps} />
+        );
     const cellStyle = inversionStyle
       ? horizontal
         ? [styles.rowReverse, inversionStyle]

package/Libraries/Lists/VirtualizedListContext.js

@@ -47,6 +47,7 @@ type Context = $ReadOnly<{
     timestamp: number,
     velocity: number,
     visibleLength: number,
+    zoomScale: number,
   },
   horizontal: ?boolean,
   getOutermostParentListRef: () => VirtualizedList,

package/Libraries/Lists/VirtualizedSectionList.js

@@ -8,11 +8,12 @@
  * @format
  */
 
-import invariant from 'invariant';
 import type {ViewToken} from './ViewabilityHelper';
+
 import {keyExtractor as defaultKeyExtractor} from './VirtualizeUtils';
-import {View, VirtualizedList} from 'react-native';
+import invariant from 'invariant';
 import * as React from 'react';
+import {View, VirtualizedList} from 'react-native';
 
 type Item = any;
 
@@ -147,6 +148,7 @@ class VirtualizedSectionList<
       viewOffset,
       index,
     };
+    // $FlowFixMe[incompatible-use]
     this._listRef.scrollToIndex(toIndexParams);
   }
 
@@ -390,21 +392,24 @@ class VirtualizedSectionList<
       }
     };
 
-  _updatePropsFor = (cellKey, value) => {
+  _updatePropsFor = (cellKey: string, value: any) => {
     const updateProps = this._updatePropsMap[cellKey];
     if (updateProps != null) {
       updateProps(value);
     }
   };
 
-  _updateHighlightFor = (cellKey, value) => {
+  _updateHighlightFor = (cellKey: string, value: boolean) => {
     const updateHighlight = this._updateHighlightMap[cellKey];
     if (updateHighlight != null) {
       updateHighlight(value);
     }
   };
 
-  _setUpdateHighlightFor = (cellKey, updateHighlightFn) => {
+  _setUpdateHighlightFor = (
+    cellKey: string,
+    updateHighlightFn: ?(boolean) => void,
+  ) => {
     if (updateHighlightFn != null) {
       this._updateHighlightMap[cellKey] = updateHighlightFn;
     } else {
@@ -412,7 +417,7 @@ class VirtualizedSectionList<
     }
   };
 
-  _setUpdatePropsFor = (cellKey, updatePropsFn) => {
+  _setUpdatePropsFor = (cellKey: string, updatePropsFn: ?(boolean) => void) => {
     if (updatePropsFn != null) {
       this._updatePropsMap[cellKey] = updatePropsFn;
     } else {
@@ -444,10 +449,10 @@ class VirtualizedSectionList<
     return null;
   }
 
-  _updateHighlightMap = {};
-  _updatePropsMap = {};
+  _updateHighlightMap: {[string]: (boolean) => void} = {};
+  _updatePropsMap: {[string]: void | (boolean => void)} = {};
   _listRef: ?React.ElementRef<typeof VirtualizedList>;
-  _captureRef = ref => {
+  _captureRef = (ref: null | React$ElementRef<Class<VirtualizedList>>) => {
     this._listRef = ref;
   };
 }

package/Libraries/Lists/__tests__/VirtualizeUtils-test.js

@@ -48,9 +48,9 @@ describe('elementsThatOverlapOffsets', function () {
         offset: 100 * index,
       };
     }
-    expect(elementsThatOverlapOffsets(offsets, 100, getFrameMetrics)).toEqual([
-      0, 2, 3, 4,
-    ]);
+    expect(
+      elementsThatOverlapOffsets(offsets, 100, getFrameMetrics, 1),
+    ).toEqual([0, 2, 3, 4]);
   });
   it('handles variable length', function () {
     const offsets = [150, 250, 900];
@@ -62,29 +62,30 @@ describe('elementsThatOverlapOffsets', function () {
       {offset: 950, length: 150},
     ];
     expect(
-      elementsThatOverlapOffsets(offsets, frames.length, ii => frames[ii]),
+      elementsThatOverlapOffsets(offsets, frames.length, ii => frames[ii], 1),
     ).toEqual([1, 1, 3]);
   });
-  it('handles out of bounds', function () {
-    const offsets = [150, 900];
-    const frames = [
-      {offset: 0, length: 50},
-      {offset: 50, length: 150},
-      {offset: 250, length: 100},
-    ];
+  it('handles frame boundaries', function () {
+    const offsets = [0, 100, 200, 300];
+    function getFrameMetrics(index: number) {
+      return {
+        length: 100,
+        offset: 100 * index,
+      };
+    }
     expect(
-      elementsThatOverlapOffsets(offsets, frames.length, ii => frames[ii]),
-    ).toEqual([1]);
+      elementsThatOverlapOffsets(offsets, 100, getFrameMetrics, 1),
+    ).toEqual([0, 0, 1, 2]);
   });
-  it('errors on non-increasing offsets', function () {
-    const offsets = [150, 50];
+  it('handles out of bounds', function () {
+    const offsets = [-100, 150, 900];
     const frames = [
       {offset: 0, length: 50},
       {offset: 50, length: 150},
       {offset: 250, length: 100},
     ];
-    expect(() => {
-      elementsThatOverlapOffsets(offsets, frames.length, ii => frames[ii]);
-    }).toThrowErrorMatchingSnapshot();
+    expect(
+      elementsThatOverlapOffsets(offsets, frames.length, ii => frames[ii], 1),
+    ).toEqual([undefined, 1]);
   });
 });

package/Libraries/Lists/__tests__/VirtualizedList-test.js

@@ -384,7 +384,7 @@ describe('VirtualizedList', () => {
 
     const instance = component.getInstance();
 
-    instance._onLayout({nativeEvent: {layout}});
+    instance._onLayout({nativeEvent: {layout, zoomScale: 1}});
 
     const initialContentHeight = props.initialNumToRender * ITEM_HEIGHT;
 
@@ -885,6 +885,7 @@ it('adjusts render area with non-zero initialScrollIndex', () => {
       viewport: {width: 10, height: 50},
       content: {width: 10, height: 200},
     });
+    simulateScroll(component, {x: 0, y: 10}); // simulate scroll offset for initialScrollIndex
 
     performAllBatches();
   });
@@ -914,8 +915,8 @@ it('renders new items when data is updated with non-zero initialScrollIndex', ()
 
   ReactTestRenderer.act(() => {
     simulateLayout(component, {
-      viewport: {width: 10, height: 50},
-      content: {width: 10, height: 200},
+      viewport: {width: 10, height: 20},
+      content: {width: 10, height: 20},
     });
     performAllBatches();
   });
@@ -1490,7 +1491,7 @@ it('calls _onCellLayout properly', () => {
   );
   const cell = virtualList._cellRefs.i4;
   const event = {
-    nativeEvent: {layout: {x: 0, y: 0, width: 50, height: 50}},
+    nativeEvent: {layout: {x: 0, y: 0, width: 50, height: 50}, zoomScale: 1},
   };
   cell._onLayout(event);
   expect(mock).toHaveBeenCalledWith(event, 'i4', 3);
@@ -1544,7 +1545,9 @@ function simulateLayout(component, args) {
 
 function simulateViewportLayout(component, dimensions) {
   lastViewportLayout = dimensions;
-  component.getInstance()._onLayout({nativeEvent: {layout: dimensions}});
+  component
+    .getInstance()
+    ._onLayout({nativeEvent: {layout: dimensions}, zoomScale: 1});
 }
 
 function simulateContentLayout(component, dimensions) {
@@ -1558,7 +1561,7 @@ function simulateCellLayout(component, items, itemIndex, dimensions) {
   const instance = component.getInstance();
   const cellKey = instance._keyExtractor(items[itemIndex], itemIndex);
   instance._onCellLayout(
-    {nativeEvent: {layout: dimensions}},
+    {nativeEvent: {layout: dimensions, zoomScale: 1}},
     cellKey,
     itemIndex,
   );
@@ -1570,6 +1573,7 @@ function simulateScroll(component, position) {
       contentOffset: position,
       contentSize: lastContentLayout,
       layoutMeasurement: lastViewportLayout,
+      zoomScale: 1,
     },
   });
 }

package/Libraries/LogBox/Data/LogBoxData.js

@@ -133,7 +133,7 @@ function handleUpdate(): void {
   }
 }
 
-function appendNewLog(newLog) {
+function appendNewLog(newLog: LogBoxLog) {
   // Don't want store these logs because they trigger a
   // state update when we add them to the store.
   if (isMessageIgnored(newLog.message.content)) {

package/Libraries/LogBox/Data/parseLogBoxLog.js

@@ -316,7 +316,7 @@ export function parseLogBoxLog(args: $ReadOnlyArray<mixed>): {|
 |} {
   const message = args[0];
   let argsWithoutComponentStack = [];
-  let componentStack = [];
+  let componentStack: ComponentStack = [];
 
   // Extract component stack from warnings like "Some warning%s".
   if (

package/Libraries/LogBox/LogBox.js

@@ -39,7 +39,7 @@ if (__DEV__) {
   let originalConsoleError;
   let originalConsoleWarn;
   let consoleErrorImpl;
-  let consoleWarnImpl;
+  let consoleWarnImpl: (...args: Array<mixed>) => void;
 
   let isLogBoxInstalled: boolean = false;
 
@@ -166,6 +166,8 @@ if (__DEV__) {
     }
   };
 
+  /* $FlowFixMe[missing-local-annot] The type annotation(s) required by Flow's
+   * LTI update could not be added via codemod */
   const registerError = (...args): void => {
     // Let errors within LogBox itself fall through.
     if (LogBoxData.isLogBoxErrorMessage(args[0])) {

package/Libraries/LogBox/UI/AnsiHighlight.js

@@ -63,6 +63,8 @@ export default function Ansi({
     }
   });
 
+  /* $FlowFixMe[missing-local-annot] The type annotation(s) required by Flow's
+   * LTI update could not be added via codemod */
   const getText = (content, key) => {
     if (key === 1) {
       // Remove the vertical bar after line numbers

package/Libraries/LogBox/UI/LogBoxInspectorCodeFrame.js

@@ -32,15 +32,18 @@ function LogBoxInspectorCodeFrame(props: Props): React.Node {
   }
 
   function getFileName() {
+    // $FlowFixMe[incompatible-use]
     const matches = /[^/]*$/.exec(codeFrame.fileName);
     if (matches && matches.length > 0) {
       return matches[0];
     }
 
+    // $FlowFixMe[incompatible-use]
     return codeFrame.fileName;
   }
 
   function getLocation() {
+    // $FlowFixMe[incompatible-use]
     const location = codeFrame.location;
     if (location != null) {
       return ` (${location.row}:${

package/Libraries/LogBox/UI/LogBoxInspectorSourceMapStatus.js

@@ -45,9 +45,6 @@ function LogBoxInspectorSourceMapStatus(props: Props): React.Node {
           animation,
           rotate: animated.interpolate({
             inputRange: [0, 1],
-            /* $FlowFixMe[speculation-ambiguous] (>=0.38.0) - Flow error
-             * detected during the deployment of v0.38.0. To see the error,
-             * remove this comment and run flow */
             outputRange: ['0deg', '360deg'],
           }),
         });

package/Libraries/LogBox/UI/LogBoxInspectorStackFrames.js

@@ -8,6 +8,10 @@
  * @format
  */
 
+import type {StackFrame} from '../../Core/NativeExceptionsManager';
+import type {Stack} from '../Data/LogBoxSymbolication';
+import type LogBoxLog from '../Data/LogBoxLog';
+
 import * as React from 'react';
 import StyleSheet from '../../StyleSheet/StyleSheet';
 import Text from '../../Text/Text';
@@ -18,8 +22,6 @@ import LogBoxInspectorStackFrame from './LogBoxInspectorStackFrame';
 import LogBoxInspectorSection from './LogBoxInspectorSection';
 import * as LogBoxStyle from './LogBoxStyle';
 import openFileInEditor from '../../Core/Devtools/openFileInEditor';
-import type {Stack} from '../Data/LogBoxSymbolication';
-import type LogBoxLog from '../Data/LogBoxLog';
 
 type Props = $ReadOnly<{|
   log: LogBoxLog,
@@ -111,7 +113,10 @@ function LogBoxInspectorStackFrames(props: Props): React.Node {
   );
 }
 
-function StackFrameList(props) {
+function StackFrameList(props: {
+  list: Stack | Array<StackFrame>,
+  status: string | 'COMPLETE' | 'FAILED' | 'NONE' | 'PENDING',
+}) {
   return (
     <>
       {props.list.map((frame, index) => {

package/Libraries/NativeComponent/BaseViewConfig.android.js

@@ -64,24 +64,24 @@ const bubblingEventTypes = {
       bubbled: 'onPointerDown',
     },
   },
-  topPointerEnter2: {
+  topPointerEnter: {
     phasedRegistrationNames: {
-      captured: 'onPointerEnter2Capture',
-      bubbled: 'onPointerEnter2',
+      captured: 'onPointerEnterCapture',
+      bubbled: 'onPointerEnter',
       skipBubbling: true,
     },
   },
-  topPointerLeave2: {
+  topPointerLeave: {
     phasedRegistrationNames: {
-      captured: 'onPointerLeave2Capture',
-      bubbled: 'onPointerLeave2',
+      captured: 'onPointerLeaveCapture',
+      bubbled: 'onPointerLeave',
       skipBubbling: true,
     },
   },
-  topPointerMove2: {
+  topPointerMove: {
     phasedRegistrationNames: {
-      captured: 'onPointerMove2Capture',
-      bubbled: 'onPointerMove2',
+      captured: 'onPointerMoveCapture',
+      bubbled: 'onPointerMove',
     },
   },
   topPointerUp: {
@@ -96,15 +96,6 @@ const directEventTypes = {
   topAccessibilityAction: {
     registrationName: 'onAccessibilityAction',
   },
-  topPointerEnter: {
-    registrationName: 'onPointerEnter',
-  },
-  topPointerLeave: {
-    registrationName: 'onPointerLeave',
-  },
-  topPointerMove: {
-    registrationName: 'onPointerMove',
-  },
   onGestureHandlerEvent: DynamicallyInjectedByGestureHandler({
     registrationName: 'onGestureHandlerEvent',
   }),