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

package/Libraries/Components/Touchable/TouchableNativeFeedback.js

@@ -312,11 +312,15 @@ class TouchableNativeFeedback extends React.Component<Props, State> {
 
 const getBackgroundProp =
   Platform.OS === 'android'
-    ? (background, useForeground) =>
+    ? /* $FlowFixMe[missing-local-annot] The type annotation(s) required by
+       * Flow's LTI update could not be added via codemod */
+      (background, useForeground: boolean) =>
         useForeground && TouchableNativeFeedback.canUseNativeForeground()
           ? {nativeForegroundAndroid: background}
           : {nativeBackgroundAndroid: background}
-    : (background, useForeground) => null;
+    : /* $FlowFixMe[missing-local-annot] The type annotation(s) required by
+       * Flow's LTI update could not be added via codemod */
+      (background, useForeground: boolean) => null;
 
 TouchableNativeFeedback.displayName = 'TouchableNativeFeedback';
 

package/Libraries/Components/View/ReactNativeStyleAttributes.js

@@ -85,14 +85,7 @@ const ReactNativeStyleAttributes: {[string]: AnyAttributeType, ...} = {
   /**
    * Transform
    */
-  decomposedMatrix: true, // @deprecated
-  rotation: true, // @deprecated
-  scaleX: true, // @deprecated
-  scaleY: true, // @deprecated
   transform: {process: processTransform},
-  transformMatrix: true, // @deprecated
-  translateX: true, // @deprecated
-  translateY: true, // @deprecated
 
   /**
    * View

package/Libraries/Components/View/ViewPropTypes.js

@@ -92,22 +92,17 @@ type MouseEventProps = $ReadOnly<{|
 // Experimental/Work in Progress Pointer Event Callbacks (not yet ready for use)
 type PointerEventProps = $ReadOnly<{|
   onPointerEnter?: ?(event: PointerEvent) => void,
+  onPointerEnterCapture?: ?(event: PointerEvent) => void,
   onPointerLeave?: ?(event: PointerEvent) => void,
+  onPointerLeaveCapture?: ?(event: PointerEvent) => void,
   onPointerMove?: ?(event: PointerEvent) => void,
+  onPointerMoveCapture?: ?(event: PointerEvent) => void,
   onPointerCancel?: ?(e: PointerEvent) => void,
   onPointerCancelCapture?: ?(e: PointerEvent) => void,
   onPointerDown?: ?(e: PointerEvent) => void,
   onPointerDownCapture?: ?(e: PointerEvent) => void,
   onPointerUp?: ?(e: PointerEvent) => void,
   onPointerUpCapture?: ?(e: PointerEvent) => void,
-
-  // FIXME: these events are temporary while we converge pointer event handling
-  onPointerEnter2?: ?(e: PointerEvent) => void,
-  onPointerEnter2Capture?: ?(e: PointerEvent) => void,
-  onPointerLeave2?: ?(e: PointerEvent) => void,
-  onPointerLeave2Capture?: ?(e: PointerEvent) => void,
-  onPointerMove2?: ?(e: PointerEvent) => void,
-  onPointerMove2Capture?: ?(e: PointerEvent) => void,
 |}>;
 
 type TouchEventProps = $ReadOnly<{|

package/Libraries/Components/View/ViewPropTypes.win32.js

@@ -93,22 +93,17 @@ type MouseEventProps = $ReadOnly<{|
 // Experimental/Work in Progress Pointer Event Callbacks (not yet ready for use)
 type PointerEventProps = $ReadOnly<{|
   onPointerEnter?: ?(event: PointerEvent) => void,
+  onPointerEnterCapture?: ?(event: PointerEvent) => void,
   onPointerLeave?: ?(event: PointerEvent) => void,
+  onPointerLeaveCapture?: ?(event: PointerEvent) => void,
   onPointerMove?: ?(event: PointerEvent) => void,
+  onPointerMoveCapture?: ?(event: PointerEvent) => void,
   onPointerCancel?: ?(e: PointerEvent) => void,
   onPointerCancelCapture?: ?(e: PointerEvent) => void,
   onPointerDown?: ?(e: PointerEvent) => void,
   onPointerDownCapture?: ?(e: PointerEvent) => void,
   onPointerUp?: ?(e: PointerEvent) => void,
   onPointerUpCapture?: ?(e: PointerEvent) => void,
-
-  // FIXME: these events are temporary while we converge pointer event handling
-  onPointerEnter2?: ?(e: PointerEvent) => void,
-  onPointerEnter2Capture?: ?(e: PointerEvent) => void,
-  onPointerLeave2?: ?(e: PointerEvent) => void,
-  onPointerLeave2Capture?: ?(e: PointerEvent) => void,
-  onPointerMove2?: ?(e: PointerEvent) => void,
-  onPointerMove2Capture?: ?(e: PointerEvent) => void,
 |}>;
 
 type TouchEventProps = $ReadOnly<{|

package/Libraries/Core/ExceptionsManager.js

@@ -144,6 +144,8 @@ function handleException(e: mixed, isFatal: boolean) {
   }
 }
 
+/* $FlowFixMe[missing-local-annot] The type annotation(s) required by Flow's
+ * LTI update could not be added via codemod */
 function reactConsoleErrorHandler(...args) {
   // bubble up to any original handlers
   console._errorOriginal(...args);

package/Libraries/Core/ReactNativeVersion.js

@@ -11,7 +11,7 @@
 
 exports.version = {
   major: 0,
-  minor: 69,
+  minor: 70,
   patch: 0,
-  prerelease: 'rc.6',
+  prerelease: 'rc.4',
 };

package/Libraries/Core/Timers/JSTimers.js

@@ -274,7 +274,7 @@ const JSTimers = {
     const timeout = options && options.timeout;
     const id = _allocateCallback(
       timeout != null
-        ? deadline => {
+        ? (deadline: any) => {
             const timeoutId = requestIdleCallbackTimeouts[id];
             if (timeoutId) {
               JSTimers.clearTimeout(timeoutId);
@@ -364,7 +364,7 @@ const JSTimers = {
         // error one at a time
         for (let ii = 1; ii < errorCount; ii++) {
           JSTimers.setTimeout(
-            (error => {
+            ((error: Error) => {
               throw error;
             }).bind(null, errors[ii]),
             0,

package/Libraries/Core/polyfillPromise.js

@@ -11,7 +11,6 @@
 'use strict';
 
 const {polyfillGlobal} = require('../Utilities/PolyfillFunctions');
-const warnOnce = require('../Utilities/warnOnce');
 
 /**
  * Set up Promise. The native Promise implementation throws the following error:
@@ -37,34 +36,3 @@ if (global?.HermesInternal?.hasPromise?.()) {
 } else {
   polyfillGlobal('Promise', () => require('../Promise'));
 }
-
-if (__DEV__) {
-  // $FlowFixMe
-  const done = Promise.prototype.done;
-  if (done != null) {
-    let depth = 0;
-    /* eslint-disable no-extend-native */
-    // $FlowFixMe
-    Promise.prototype.done = function () {
-      ++depth;
-      try {
-        // Avoid infinite recursion if done() happens to be triggered by warnOnce.
-        if (depth === 1) {
-          // Warn once per unique call stack. Not super efficient, but we're in
-          // __DEV__ and .done() calls are rare to begin with.
-          const key = new Error().stack;
-          warnOnce(
-            key,
-            'Promise.prototype.done(): This nonstandard polyfill ' +
-              'has been deprecated and will be removed in a future release. ' +
-              'Please instead use `.then()`.',
-          );
-        }
-      } finally {
-        --depth;
-      }
-      return done.apply(this, arguments);
-    };
-    /* eslint-enable no-extend-native */
-  }
-}

package/Libraries/Core/setUpBatchedBridge.js

@@ -27,12 +27,16 @@ if (global.RN$Bridgeless === true && global.RN$registerCallableModule) {
       | $TEMPORARY$string<'RCTNativeAppEventEmitter'>
       | $TEMPORARY$string<'SamplingProfiler'>
       | $TEMPORARY$string<'Systrace'>,
+    /* $FlowFixMe[missing-local-annot] The type annotation(s) required by
+     * Flow's LTI update could not be added via codemod */
     factory,
   ) => BatchedBridge.registerLazyCallableModule(moduleName, factory);
 }
 
 registerModule('Systrace', () => require('../Performance/Systrace'));
-registerModule('JSTimers', () => require('./Timers/JSTimers'));
+if (!(global.RN$Bridgeless === true)) {
+  registerModule('JSTimers', () => require('./Timers/JSTimers'));
+}
 registerModule('HeapCapture', () => require('../HeapCapture/HeapCapture'));
 registerModule('SamplingProfiler', () =>
   require('../Performance/SamplingProfiler'),

package/Libraries/Core/setUpPerformance.js

@@ -11,7 +11,7 @@
 'use strict';
 
 if (!global.performance) {
-  global.performance = {};
+  global.performance = ({}: {now?: () => number});
 }
 
 /**

package/Libraries/EventEmitter/NativeEventEmitter.js

@@ -95,19 +95,6 @@ export default class NativeEventEmitter<TEventToArgsMap: {...}>
     };
   }
 
-  /**
-   * @deprecated Use `remove` on the EventSubscription from `addListener`.
-   */
-  removeListener<TEvent: $Keys<TEventToArgsMap>>(
-    eventType: TEvent,
-    listener: (...args: $ElementType<TEventToArgsMap, TEvent>) => mixed,
-  ): void {
-    this._nativeModule?.removeListeners(1);
-    // NOTE: This will report a deprecation notice via `console.error`.
-    // $FlowFixMe[prop-missing] - `removeListener` exists but is deprecated.
-    RCTDeviceEventEmitter.removeListener(eventType, listener);
-  }
-
   emit<TEvent: $Keys<TEventToArgsMap>>(
     eventType: TEvent,
     ...args: $ElementType<TEventToArgsMap, TEvent>

package/Libraries/Image/AssetSourceResolver.js

@@ -35,7 +35,7 @@ const {
 /**
  * Returns a path like 'assets/AwesomeModule/icon@2x.png'
  */
-function getScaledAssetPath(asset): string {
+function getScaledAssetPath(asset: PackagerAsset): string {
   const scale = pickScale(asset.scales, PixelRatio.get());
   const scaleSuffix = scale === 1 ? '' : '@' + scale + 'x';
   const assetDir = getBasePath(asset);
@@ -45,7 +45,7 @@ function getScaledAssetPath(asset): string {
 /**
  * Returns a path like 'drawable-mdpi/icon.png'
  */
-function getAssetPathInDrawableFolder(asset): string {
+function getAssetPathInDrawableFolder(asset: PackagerAsset): string {
   const scale = pickScale(asset.scales, PixelRatio.get());
   const drawbleFolder = getAndroidResourceFolderName(asset, scale);
   const fileName = getAndroidResourceIdentifier(asset);

package/Libraries/Image/Image.android.js

@@ -123,7 +123,9 @@ export type ImageComponentStatics = $ReadOnly<{|
  *
  * See https://reactnative.dev/docs/image
  */
-let Image = (props: ImagePropsType, forwardedRef) => {
+/* $FlowFixMe[missing-local-annot] The type annotation(s) required by Flow's
+ * LTI update could not be added via codemod */
+const BaseImage = (props: ImagePropsType, forwardedRef) => {
   let source = resolveAssetSource(props.source);
   const defaultSource = resolveAssetSource(props.defaultSource);
   const loadingIndicatorSource = resolveAssetSource(
@@ -221,11 +223,11 @@ let Image = (props: ImagePropsType, forwardedRef) => {
   );
 };
 
-Image = React.forwardRef<
+let Image = React.forwardRef<
   ImagePropsType,
   | React.ElementRef<typeof TextInlineImageNativeComponent>
   | React.ElementRef<typeof ImageViewNativeComponent>,
->(Image);
+>(BaseImage);
 
 if (ImageInjection.unstable_createImageComponent != null) {
   Image = ImageInjection.unstable_createImageComponent(Image);

package/Libraries/Image/Image.ios.js

@@ -102,7 +102,9 @@ export type ImageComponentStatics = $ReadOnly<{|
  *
  * See https://reactnative.dev/docs/image
  */
-let Image = (props: ImagePropsType, forwardedRef) => {
+/* $FlowFixMe[missing-local-annot] The type annotation(s) required by Flow's
+ * LTI update could not be added via codemod */
+const BaseImage = (props: ImagePropsType, forwardedRef) => {
   const source = resolveAssetSource(props.source) || {
     uri: undefined,
     width: undefined,
@@ -158,11 +160,12 @@ let Image = (props: ImagePropsType, forwardedRef) => {
   );
 };
 
-Image = React.forwardRef<
+const ImageForwardRef = React.forwardRef<
   ImagePropsType,
   React.ElementRef<typeof ImageViewNativeComponent>,
->(Image);
+>(BaseImage);
 
+let Image = ImageForwardRef;
 if (ImageInjection.unstable_createImageComponent != null) {
   Image = ImageInjection.unstable_createImageComponent(Image);
 }

package/Libraries/Image/Image.win32.js

@@ -124,7 +124,9 @@ export type ImageComponentStatics = $ReadOnly<{|
  *
  * See https://reactnative.dev/docs/image
  */
-let Image = (props: ImagePropsType, forwardedRef) => {
+/* $FlowFixMe[missing-local-annot] The type annotation(s) required by Flow's
+ * LTI update could not be added via codemod */
+const BaseImage = (props: ImagePropsType, forwardedRef) => {
   const source = resolveAssetSource(props.source) || {
     uri: undefined,
     width: undefined,
@@ -193,11 +195,12 @@ let Image = (props: ImagePropsType, forwardedRef) => {
   );
 };
 
-Image = React.forwardRef<
+const ImageForwardRef = React.forwardRef<
   ImagePropsType,
   React.ElementRef<typeof ImageViewNativeComponent>,
->(Image);
+>(BaseImage);
 
+let Image = ImageForwardRef;
 if (ImageInjection.unstable_createImageComponent != null) {
   Image = ImageInjection.unstable_createImageComponent(Image);
 }

package/Libraries/Image/ImageSource.js

@@ -91,9 +91,7 @@ export type ImageSource =
   | ImageURISource
   | $ReadOnlyArray<ImageURISource>;
 
-export function getImageSourceProperties(
-  imageSource: ImageURISource,
-): $ReadOnly<{
+type ImageSourceProperties = {
   body?: ?string,
   bundle?: ?string,
   cache?: ?('default' | 'reload' | 'force-cache' | 'only-if-cached'),
@@ -104,8 +102,12 @@ export function getImageSourceProperties(
   uri?: ?string,
   width?: ?number,
   ...
-}> {
-  const object = {};
+};
+
+export function getImageSourceProperties(
+  imageSource: ImageURISource,
+): $ReadOnly<ImageSourceProperties> {
+  const object: ImageSourceProperties = {};
   if (imageSource.body != null) {
     object.body = imageSource.body;
   }

package/Libraries/Inspector/ElementBox.js

@@ -26,7 +26,7 @@ class ElementBox extends React.Component<$FlowFixMeProps> {
     let padding = resolveBoxStyle('padding', style);
 
     const frameStyle = {...this.props.frame};
-    const contentStyle = {
+    const contentStyle: {width: number, height: number} = {
       width: this.props.frame.width,
       height: this.props.frame.height,
     };
@@ -102,7 +102,7 @@ type Style = {
  * @return a modified copy
  */
 function resolveRelativeSizes(style: $ReadOnly<Style>): Style {
-  let resolvedStyle = Object.assign({}, style);
+  let resolvedStyle = {...style};
   resolveSizeInPlace(resolvedStyle, 'top', 'height');
   resolveSizeInPlace(resolvedStyle, 'right', 'width');
   resolveSizeInPlace(resolvedStyle, 'bottom', 'height');

package/Libraries/Inspector/NetworkOverlay.js

@@ -10,15 +10,17 @@
 
 'use strict';
 
-const FlatList = require('../Lists/FlatList');
-const React = require('react');
+import type {RenderItemProps} from '../Lists/VirtualizedList';
+
 const ScrollView = require('../Components/ScrollView/ScrollView');
-const StyleSheet = require('../StyleSheet/StyleSheet');
-const Text = require('../Text/Text');
 const TouchableHighlight = require('../Components/Touchable/TouchableHighlight');
 const View = require('../Components/View/View');
-const WebSocketInterceptor = require('../WebSocket/WebSocketInterceptor');
+const FlatList = require('../Lists/FlatList');
 const XHRInterceptor = require('../Network/XHRInterceptor');
+const StyleSheet = require('../StyleSheet/StyleSheet');
+const Text = require('../Text/Text');
+const WebSocketInterceptor = require('../WebSocket/WebSocketInterceptor');
+const React = require('react');
 
 const LISTVIEW_CELL_HEIGHT = 15;
 
@@ -100,7 +102,7 @@ class NetworkOverlay extends React.Component<Props, State> {
   };
 
   // Map of `socketId` -> `index in `this.state.requests`.
-  _socketIdMap = {};
+  _socketIdMap: {[string]: number} = {};
   // Map of `xhr._index` -> `index in `this.state.requests`.
   _xhrIdMap: {[key: number]: number, ...} = {};
 
@@ -326,7 +328,10 @@ class NetworkOverlay extends React.Component<Props, State> {
     WebSocketInterceptor.disableInterception();
   }
 
-  _renderItem = ({item, index}): React.Element<any> => {
+  _renderItem = ({
+    item,
+    index,
+  }: RenderItemProps<NetworkRequestInfo>): React.Element<any> => {
     const tableRowViewStyle = [
       styles.tableRow,
       index % 2 === 1 ? styles.tableRowOdd : styles.tableRowEven,
@@ -358,7 +363,7 @@ class NetworkOverlay extends React.Component<Props, State> {
     );
   };
 
-  _renderItemDetail(id) {
+  _renderItemDetail(id: number) {
     const requestItem = this.state.requests[id];
     const details = Object.keys(requestItem).map(key => {
       if (key === 'id') {

package/Libraries/Interaction/PanResponder.js

@@ -190,6 +190,21 @@ type ActiveCallback = (
 
 type PassiveCallback = (event: PressEvent, gestureState: GestureState) => mixed;
 
+type PanHandlers = {|
+  onMoveShouldSetResponder: (event: PressEvent) => boolean,
+  onMoveShouldSetResponderCapture: (event: PressEvent) => boolean,
+  onResponderEnd: (event: PressEvent) => void,
+  onResponderGrant: (event: PressEvent) => boolean,
+  onResponderMove: (event: PressEvent) => void,
+  onResponderReject: (event: PressEvent) => void,
+  onResponderRelease: (event: PressEvent) => void,
+  onResponderStart: (event: PressEvent) => void,
+  onResponderTerminate: (event: PressEvent) => void,
+  onResponderTerminationRequest: (event: PressEvent) => boolean,
+  onStartShouldSetResponder: (event: PressEvent) => boolean,
+  onStartShouldSetResponderCapture: (event: PressEvent) => boolean,
+|};
+
 type PanResponderConfig = $ReadOnly<{|
   onMoveShouldSetPanResponder?: ?ActiveCallback,
   onMoveShouldSetPanResponderCapture?: ?ActiveCallback,
@@ -385,20 +400,7 @@ const PanResponder = {
    */
   create(config: PanResponderConfig): $TEMPORARY$object<{|
     getInteractionHandle: () => ?number,
-    panHandlers: $TEMPORARY$object<{|
-      onMoveShouldSetResponder: (event: PressEvent) => boolean,
-      onMoveShouldSetResponderCapture: (event: PressEvent) => boolean,
-      onResponderEnd: (event: PressEvent) => void,
-      onResponderGrant: (event: PressEvent) => boolean,
-      onResponderMove: (event: PressEvent) => void,
-      onResponderReject: (event: PressEvent) => void,
-      onResponderRelease: (event: PressEvent) => void,
-      onResponderStart: (event: PressEvent) => void,
-      onResponderTerminate: (event: PressEvent) => void,
-      onResponderTerminationRequest: (event: PressEvent) => boolean,
-      onStartShouldSetResponder: (event: PressEvent) => boolean,
-      onStartShouldSetResponderCapture: (event: PressEvent) => boolean,
-    |}>,
+    panHandlers: PanHandlers,
   |}> {
     const interactionState = {
       handle: (null: ?number),

package/Libraries/Linking/Linking.js

@@ -46,17 +46,6 @@ class Linking extends NativeEventEmitter<LinkingEventDefinitions> {
     return this.addListener(eventType, listener);
   }
 
-  /**
-   * @deprecated Use `remove` on the EventSubscription from `addEventListener`.
-   */
-  removeEventListener<K: $Keys<LinkingEventDefinitions>>(
-    eventType: K,
-    listener: (...$ElementType<LinkingEventDefinitions, K>) => mixed,
-  ): void {
-    // NOTE: This will report a deprecation notice via `console.error`.
-    this.removeListener(eventType, listener);
-  }
-
   /**
    * Try to open the given `url` with any of the installed apps.
    *

package/Libraries/Lists/FlatList.js

@@ -459,7 +459,7 @@ class FlatList<ItemT> extends React.PureComponent<Props<ItemT>, void> {
   _listRef: ?React.ElementRef<typeof VirtualizedList>;
   _virtualizedListPairs: Array<ViewabilityConfigCallbackPair> = [];
 
-  _captureRef = ref => {
+  _captureRef = (ref: ?React.ElementRef<typeof VirtualizedList>) => {
     this._listRef = ref;
   };
 
@@ -596,7 +596,7 @@ class FlatList<ItemT> extends React.PureComponent<Props<ItemT>, void> {
       ? 'ListItemComponent'
       : 'renderItem';
 
-    const renderer = (props): React.Node => {
+    const renderer = (props: RenderItemProps<ItemT>): React.Node => {
       if (ListItemComponent) {
         // $FlowFixMe[not-a-component] Component isn't valid
         // $FlowFixMe[incompatible-type-arg] Component isn't valid
@@ -625,6 +625,7 @@ class FlatList<ItemT> extends React.PureComponent<Props<ItemT>, void> {
             <View style={StyleSheet.compose(styles.row, columnWrapperStyle)}>
               {item.map((it, kk) => {
                 const element = renderer({
+                  // $FlowFixMe[incompatible-call]
                   item: it,
                   index: index * cols + kk,
                   separators: info.separators,

package/Libraries/Lists/SectionList.js

@@ -255,6 +255,8 @@ export default class SectionList<
   }
 
   _wrapperListRef: ?React.ElementRef<typeof VirtualizedSectionList>;
+  /* $FlowFixMe[missing-local-annot] The type annotation(s) required by Flow's
+   * LTI update could not be added via codemod */
   _captureRef = ref => {
     this._wrapperListRef = ref;
   };

package/Libraries/Lists/ViewabilityHelper.js

@@ -259,9 +259,13 @@ class ViewabilityHelper {
   }
 
   _onUpdateSync(
-    viewableIndicesToCheck,
-    onViewableItemsChanged,
-    createViewToken,
+    viewableIndicesToCheck: Array<number>,
+    onViewableItemsChanged: ({
+      changed: Array<ViewToken>,
+      viewableItems: Array<ViewToken>,
+      ...
+    }) => void,
+    createViewToken: (index: number, isViewable: boolean) => ViewToken,
   ) {
     // Filter out indices that have gone out of view since this call was scheduled.
     viewableIndicesToCheck = viewableIndicesToCheck.filter(ii =>

package/Libraries/Lists/VirtualizeUtils.js

@@ -25,28 +25,38 @@ export function elementsThatOverlapOffsets(
     offset: number,
     ...
   },
+  zoomScale: number = 1,
 ): Array<number> {
-  const out = [];
-  let outLength = 0;
-  for (let ii = 0; ii < itemCount; ii++) {
-    const frame = getFrameMetrics(ii);
-    const trailingOffset = frame.offset + frame.length;
-    for (let kk = 0; kk < offsets.length; kk++) {
-      if (out[kk] == null && trailingOffset >= offsets[kk]) {
-        out[kk] = ii;
-        outLength++;
-        if (kk === offsets.length - 1) {
-          invariant(
-            outLength === offsets.length,
-            'bad offsets input, should be in increasing order: %s',
-            JSON.stringify(offsets),
-          );
-          return out;
-        }
+  const result = [];
+  for (let offsetIndex = 0; offsetIndex < offsets.length; offsetIndex++) {
+    const currentOffset = offsets[offsetIndex];
+    let left = 0;
+    let right = itemCount - 1;
+
+    while (left <= right) {
+      // eslint-disable-next-line no-bitwise
+      const mid = left + ((right - left) >>> 1);
+      const frame = getFrameMetrics(mid);
+      const scaledOffsetStart = frame.offset * zoomScale;
+      const scaledOffsetEnd = (frame.offset + frame.length) * zoomScale;
+
+      // We want the first frame that contains the offset, with inclusive bounds. Thus, for the
+      // first frame the scaledOffsetStart is inclusive, while for other frames it is exclusive.
+      if (
+        (mid === 0 && currentOffset < scaledOffsetStart) ||
+        (mid !== 0 && currentOffset <= scaledOffsetStart)
+      ) {
+        right = mid - 1;
+      } else if (currentOffset > scaledOffsetEnd) {
+        left = mid + 1;
+      } else {
+        result[offsetIndex] = mid;
+        break;
       }
     }
   }
-  return out;
+
+  return result;
 }
 
 /**
@@ -104,6 +114,7 @@ export function computeWindowedRenderLimits(
     offset: number,
     velocity: number,
     visibleLength: number,
+    zoomScale: number,
     ...
   },
 ): {
@@ -115,7 +126,7 @@ export function computeWindowedRenderLimits(
   if (itemCount === 0) {
     return prev;
   }
-  const {offset, velocity, visibleLength} = scrollMetrics;
+  const {offset, velocity, visibleLength, zoomScale = 1} = scrollMetrics;
 
   // Start with visible area, then compute maximum overscan region by expanding from there, biased
   // in the direction of scroll. Total overscan area is capped, which should cap memory consumption
@@ -136,7 +147,8 @@ export function computeWindowedRenderLimits(
   );
   const overscanEnd = Math.max(0, visibleEnd + leadFactor * overscanLength);
 
-  const lastItemOffset = getFrameMetricsApprox(itemCount - 1).offset;
+  const lastItemOffset =
+    getFrameMetricsApprox(itemCount - 1).offset * zoomScale;
   if (lastItemOffset < overscanBegin) {
     // Entire list is before our overscan window
     return {
@@ -150,6 +162,7 @@ export function computeWindowedRenderLimits(
     [overscanBegin, visibleBegin, visibleEnd, overscanEnd],
     itemCount,
     getFrameMetricsApprox,
+    zoomScale,
   );
   overscanFirst = overscanFirst == null ? 0 : overscanFirst;
   first = first == null ? Math.max(0, overscanFirst) : first;