@react-native-macos/virtualized-lists 0.78.6 → 0.79.0

package/Lists/FillRateHelper.js

@@ -244,4 +244,4 @@ class FillRateHelper {
   }
 }
 
-module.exports = FillRateHelper;
+export default FillRateHelper;

package/Lists/ListMetricsAggregator.js

@@ -8,8 +8,8 @@
  * @format
  */
 
-import type {Props as VirtualizedListProps} from './VirtualizedListProps';
-import type {Layout} from 'react-native/Libraries/Types/CoreEventTypes';
+import type {VirtualizedListProps} from './VirtualizedListProps';
+import type {LayoutRectangle} from 'react-native/Libraries/Types/CoreEventTypes';
 
 import {keyExtractor as defaultKeyExtractor} from './VirtualizeUtils';
 import invariant from 'invariant';
@@ -82,7 +82,7 @@ export default class ListMetricsAggregator {
     cellIndex: number,
     cellKey: string,
     orientation: ListOrientation,
-    layout: Layout,
+    layout: LayoutRectangle,
   }): boolean {
     this._invalidateIfOrientationChanged(orientation);
 
@@ -264,7 +264,10 @@ export default class ListMetricsAggregator {
    * Finds the flow-relative offset (e.g. starting from the left in LTR, but
    * right in RTL) from a layout box.
    */
-  flowRelativeOffset(layout: Layout, referenceContentLength?: ?number): number {
+  flowRelativeOffset(
+    layout: LayoutRectangle,
+    referenceContentLength?: ?number,
+  ): number {
     const {horizontal, rtl} = this._orientation;
 
     if (horizontal && rtl) {

package/Lists/StateSafePureComponent.js

@@ -31,8 +31,8 @@ export default class StateSafePureComponent<
     this._installSetStateHooks();
   }
 
-  setState(
-    partialState: ?(Partial<State> | ((State, Props) => ?Partial<State>)),
+  setState<K: $Keys<State>>(
+    partialState: ?(Pick<State, K> | ((State, Props) => ?Pick<State, K>)),
     callback?: () => mixed,
   ): void {
     if (typeof partialState === 'function') {

package/Lists/ViewabilityHelper.js

@@ -35,7 +35,10 @@ export type ViewabilityConfigCallbackPair = {
   ...
 };
 
-export type ViewabilityConfig = $ReadOnly<{|
+export type ViewabilityConfigCallbackPairs =
+  Array<ViewabilityConfigCallbackPair>;
+
+export type ViewabilityConfig = $ReadOnly<{
   /**
    * Minimum amount of time (in milliseconds) that an item must be physically viewable before the
    * viewability callback will be fired. A high number means that scrolling through content without
@@ -62,7 +65,7 @@ export type ViewabilityConfig = $ReadOnly<{|
    * render.
    */
   waitForInteraction?: boolean,
-|}>;
+}>;
 
 /**
  * A Utility class for calculating viewable items based on current metrics like scroll position and
@@ -346,4 +349,4 @@ function _isEntirelyVisible(
   return top >= 0 && bottom <= viewportHeight && bottom > top;
 }
 
-module.exports = ViewabilityHelper;
+export default ViewabilityHelper;

package/Lists/VirtualizedList.js

@@ -12,20 +12,19 @@ import type {CellMetricProps, ListOrientation} from './ListMetricsAggregator';
 import type {ViewToken} from './ViewabilityHelper';
 import type {
   Item,
-  Props,
-  RenderItemProps,
-  RenderItemType,
+  ListRenderItem,
+  ListRenderItemInfo,
   Separators,
+  VirtualizedListProps,
 } from './VirtualizedListProps';
 import type {ScrollResponderType} from 'react-native/Libraries/Components/ScrollView/ScrollView';
 import type {ViewStyleProp} from 'react-native/Libraries/StyleSheet/StyleSheet';
 import type {
-  LayoutEvent,
+  LayoutChangeEvent,
   ScrollEvent,
 } from 'react-native/Libraries/Types/CoreEventTypes';
 import type {KeyEvent} from 'react-native/Libraries/Types/CoreEventTypes'; // [macOS]
 
-import Batchinator from '../Interaction/Batchinator';
 import clamp from '../Utilities/clamp';
 import infoLog from '../Utilities/infoLog';
 import {CellRenderMask} from './CellRenderMask';
@@ -65,7 +64,7 @@ import {
   findNodeHandle,
 } from 'react-native';
 
-export type {RenderItemProps, RenderItemType, Separators};
+export type {ListRenderItemInfo, ListRenderItem, Separators};
 
 const ON_EDGE_REACHED_EPSILON = 0.001;
 
@@ -125,7 +124,10 @@ function getScrollingThreshold(threshold: number, visibleLength: number) {
  * - As an effort to remove defaultProps, use helper functions when referencing certain props
  *
  */
-class VirtualizedList extends StateSafePureComponent<Props, State> {
+class VirtualizedList extends StateSafePureComponent<
+  VirtualizedListProps,
+  State,
+> {
   static contextType: typeof VirtualizedListContext = VirtualizedListContext;
 
   // scrollToEnd may be janky without getItemLayout prop
@@ -262,6 +264,7 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
       return;
     }
 
+    // $FlowFixMe[incompatible-call]
     scrollRef.scrollTo({
       animated,
       ...this._scrollToParamsFromOffset(offset),
@@ -341,10 +344,10 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
     }
   }
 
-  getScrollRef():
-    | ?React.ElementRef<typeof ScrollView>
-    | ?React.ElementRef<typeof View> {
+  getScrollRef(): ?React.ElementRef<typeof ScrollView> {
+    // $FlowFixMe[prop-missing]
     if (this._scrollRef && this._scrollRef.getScrollRef) {
+      // $FlowFixMe[not-a-function]
       return this._scrollRef.getScrollRef();
     } else {
       return this._scrollRef;
@@ -395,15 +398,11 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
 
   state: State;
 
-  constructor(props: Props) {
+  constructor(props: VirtualizedListProps) {
     super(props);
     this._checkProps(props);
 
     this._fillRateHelper = new FillRateHelper(this._listMetrics);
-    this._updateCellsToRenderBatcher = new Batchinator(
-      this._updateCellsToRender,
-      this.props.updateCellsBatchingPeriod ?? 50,
-    );
 
     if (this.props.viewabilityConfigCallbackPairs) {
       this._viewabilityTuples = this.props.viewabilityConfigCallbackPairs.map(
@@ -446,7 +445,7 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
     };
   }
 
-  _checkProps(props: Props) {
+  _checkProps(props: VirtualizedListProps) {
     const {onScroll, windowSize, getItemCount, data, initialScrollIndex} =
       props;
 
@@ -495,7 +494,7 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
   }
 
   static _findItemIndexWithKey(
-    props: Props,
+    props: VirtualizedListProps,
     key: string,
     hint: ?number,
   ): ?number {
@@ -517,9 +516,9 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
 
   static _getItemKey(
     props: {
-      data: Props['data'],
-      getItem: Props['getItem'],
-      keyExtractor: Props['keyExtractor'],
+      data: VirtualizedListProps['data'],
+      getItem: VirtualizedListProps['getItem'],
+      keyExtractor: VirtualizedListProps['keyExtractor'],
       ...
     },
     index: number,
@@ -529,7 +528,7 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
   }
 
   static _createRenderMask(
-    props: Props,
+    props: VirtualizedListProps,
     cellsAroundViewport: {first: number, last: number},
     additionalRegions?: ?$ReadOnlyArray<{first: number, last: number}>,
   ): CellRenderMask {
@@ -572,7 +571,10 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
     return renderMask;
   }
 
-  static _initialRenderRegion(props: Props): {first: number, last: number} {
+  static _initialRenderRegion(props: VirtualizedListProps): {
+    first: number,
+    last: number,
+  } {
     const itemCount = props.getItemCount(props.data);
 
     const firstCellIndex = Math.max(
@@ -593,7 +595,7 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
   }
 
   static _ensureClosestStickyHeader(
-    props: Props,
+    props: VirtualizedListProps,
     stickyIndicesSet: Set<number>,
     renderMask: CellRenderMask,
     cellIdx: number,
@@ -609,7 +611,7 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
   }
 
   _adjustCellsAroundViewport(
-    props: Props,
+    props: VirtualizedListProps,
     cellsAroundViewport: {first: number, last: number},
     pendingScrollUpdateCount: number,
   ): {first: number, last: number} {
@@ -713,14 +715,17 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
     if (this._isNestedWithSameOrientation()) {
       this.context.unregisterAsNestedChild({ref: this});
     }
-    this._updateCellsToRenderBatcher.dispose();
+    clearTimeout(this._updateCellsToRenderTimeoutID);
     this._viewabilityTuples.forEach(tuple => {
       tuple.viewabilityHelper.dispose();
     });
     this._fillRateHelper.deactivateAndFlush();
   }
 
-  static getDerivedStateFromProps(newProps: Props, prevState: State): State {
+  static getDerivedStateFromProps(
+    newProps: VirtualizedListProps,
+    prevState: State,
+  ): State {
     // first and last could be stale (e.g. if a new, shorter items props is passed in), so we make
     // sure we're rendering a reasonable range here.
     const itemCount = newProps.getItemCount(newProps.data);
@@ -864,7 +869,7 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
 
   static _constrainToItemCount(
     cells: {first: number, last: number},
-    props: Props,
+    props: VirtualizedListProps,
   ): {first: number, last: number} {
     const itemCount = props.getItemCount(props.data);
     const lastPossibleCellIndex = itemCount - 1;
@@ -993,7 +998,7 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
           collapsable={Platform.OS !== 'macos'} // [macOS]
           key="$empty">
           {React.cloneElement(element, {
-            onLayout: (event: LayoutEvent) => {
+            onLayout: (event: LayoutChangeEvent) => {
               this._onLayoutEmpty(event);
               // $FlowFixMe[prop-missing] React.Element internal inspection
               if (element.props.onLayout) {
@@ -1157,7 +1162,7 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
           (
             this.props.renderScrollComponent ||
             this._defaultRenderScrollComponent
-          )(scrollProps),
+          )(scrollProps) as ExactReactElement_DEPRECATED<any>,
           {
             ref: this._captureScrollRef,
           },
@@ -1202,7 +1207,7 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
     }
   }
 
-  componentDidUpdate(prevProps: Props) {
+  componentDidUpdate(prevProps: VirtualizedListProps) {
     const {data, extraData, getItemLayout} = this.props;
     if (data !== prevProps.data || extraData !== prevProps.extraData) {
       // clear the viewableIndices cache to also trigger
@@ -1269,15 +1274,13 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
     visibleLength: 0,
     zoomScale: 1,
   };
-  _scrollRef: ?React.ElementRef<any> = null;
+  _scrollRef: ?React.ElementRef<typeof ScrollView> = null;
   _sentStartForContentLength = 0;
   _sentEndForContentLength = 0;
-  _updateCellsToRenderBatcher: Batchinator;
+  _updateCellsToRenderTimeoutID: ?TimeoutID = null;
   _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 => {
+  _captureScrollRef = (ref: ?React.ElementRef<typeof ScrollView>) => {
     this._scrollRef = ref;
   };
 
@@ -1368,7 +1371,7 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
   };
 
   _onCellLayout = (
-    e: LayoutEvent,
+    e: LayoutChangeEvent,
     cellKey: string,
     cellIndex: number,
   ): void => {
@@ -1455,7 +1458,7 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
     }
   }
 
-  _onLayout = (e: LayoutEvent) => {
+  _onLayout = (e: LayoutChangeEvent) => {
     if (this._isNestedWithSameOrientation()) {
       // Need to adjust our scroll metrics to be relative to our containing
       // VirtualizedList before we can make claims about list item viewability
@@ -1470,7 +1473,7 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
     this._maybeCallOnEdgeReached();
   };
 
-  _onLayoutEmpty = (e: LayoutEvent) => {
+  _onLayoutEmpty = (e: LayoutChangeEvent) => {
     this.props.onLayout && this.props.onLayout(e);
   };
 
@@ -1478,12 +1481,12 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
     return this._getCellKey() + '-footer';
   }
 
-  _onLayoutFooter = (e: LayoutEvent) => {
+  _onLayoutFooter = (e: LayoutChangeEvent) => {
     this._triggerRemeasureForChildListsInCell(this._getFooterCellKey());
     this._footerLength = this._selectLength(e.nativeEvent.layout);
   };
 
-  _onLayoutHeader = (e: LayoutEvent) => {
+  _onLayoutHeader = (e: LayoutChangeEvent) => {
     this._headerLength = this._selectLength(e.nativeEvent.layout);
   };
 
@@ -1491,7 +1494,7 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
   _selectRowAtIndex = (rowIndex: number) => {
     const prevIndex = this.state.selectedRowIndex;
     const newIndex = rowIndex;
-    this.setState({selectedRowIndex: newIndex});
+    this.setState<'selectedRowIndex'>({selectedRowIndex: newIndex});
 
     this.ensureItemAtIndexIsVisible(newIndex);
     if (prevIndex !== newIndex) {
@@ -1871,7 +1874,7 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
       zoomScale,
     };
     if (this.state.pendingScrollUpdateCount > 0) {
-      this.setState(state => ({
+      this.setState<'pendingScrollUpdateCount'>(state => ({
         pendingScrollUpdateCount: state.pendingScrollUpdateCount - 1,
       }));
     }
@@ -1918,11 +1921,19 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
       this._hiPriInProgress = true;
       // Don't worry about interactions when scrolling quickly; focus on filling content as fast
       // as possible.
-      this._updateCellsToRenderBatcher.dispose();
+      if (this._updateCellsToRenderTimeoutID != null) {
+        clearTimeout(this._updateCellsToRenderTimeoutID);
+        this._updateCellsToRenderTimeoutID = null;
+      }
       this._updateCellsToRender();
       return;
     } else {
-      this._updateCellsToRenderBatcher.schedule();
+      if (this._updateCellsToRenderTimeoutID == null) {
+        this._updateCellsToRenderTimeoutID = setTimeout(() => {
+          this._updateCellsToRenderTimeoutID = null;
+          this._updateCellsToRender();
+        }, this.props.updateCellsBatchingPeriod ?? 50);
+      }
     }
   }
 
@@ -2023,7 +2034,7 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
   _updateCellsToRender = () => {
     this._updateViewableItems(this.props, this.state.cellsAroundViewport);
 
-    this.setState((state, props) => {
+    this.setState<'cellsAroundViewport' | 'renderMask'>((state, props) => {
       const cellsAroundViewport = this._adjustCellsAroundViewport(
         props,
         state.cellsAroundViewport,
@@ -2189,4 +2200,4 @@ const styles = StyleSheet.create({
   },
 });
 
-module.exports = VirtualizedList;
+export default VirtualizedList;

package/Lists/VirtualizedListCellRenderer.js

@@ -8,11 +8,11 @@
  * @format
  */
 
-import type {CellRendererProps, RenderItemType} from './VirtualizedListProps';
+import type {CellRendererProps, ListRenderItem} from './VirtualizedListProps';
 import type {ViewStyleProp} from 'react-native/Libraries/StyleSheet/StyleSheet';
 import type {
   FocusEvent,
-  LayoutEvent,
+  LayoutChangeEvent,
 } from 'react-native/Libraries/Types/CoreEventTypes';
 
 import {VirtualizedListCellContextProvider} from './VirtualizedListContext.js';
@@ -32,7 +32,11 @@ export type Props<ItemT> = {
   inversionStyle: ViewStyleProp,
   isSelected: ?boolean, // [macOS]
   item: ItemT,
-  onCellLayout?: (event: LayoutEvent, cellKey: string, index: number) => void,
+  onCellLayout?: (
+    event: LayoutChangeEvent,
+    cellKey: string,
+    index: number,
+  ) => void,
   onCellFocusCapture?: (cellKey: string) => void,
   onUnmount: (cellKey: string) => void,
   onUpdateSeparators: (
@@ -40,14 +44,14 @@ export type Props<ItemT> = {
     props: Partial<SeparatorProps<ItemT>>,
   ) => void,
   prevCellKey: ?string,
-  renderItem?: ?RenderItemType<ItemT>,
+  renderItem?: ?ListRenderItem<ItemT>,
   ...
 };
 
-type SeparatorProps<ItemT> = $ReadOnly<{|
+type SeparatorProps<ItemT> = $ReadOnly<{
   highlighted: boolean,
   leadingItem: ?ItemT,
-|}>;
+}>;
 
 type State<ItemT> = {
   separatorProps: SeparatorProps<ItemT>,
@@ -65,10 +69,10 @@ export default class CellRenderer<ItemT> extends React.PureComponent<
     },
   };
 
-  static getDerivedStateFromProps(
-    props: Props<ItemT>,
-    prevState: State<ItemT>,
-  ): ?State<ItemT> {
+  static getDerivedStateFromProps<StaticItemT>(
+    props: Props<StaticItemT>,
+    prevState: State<StaticItemT>,
+  ): ?State<StaticItemT> {
     if (props.item !== prevState.separatorProps.leadingItem) {
       return {
         separatorProps: {
@@ -118,7 +122,7 @@ export default class CellRenderer<ItemT> extends React.PureComponent<
     this.props.onUnmount(this.props.cellKey);
   }
 
-  _onLayout = (nativeEvent: LayoutEvent): void => {
+  _onLayout = (nativeEvent: LayoutChangeEvent): void => {
     this.props.onCellLayout?.(
       nativeEvent,
       this.props.cellKey,
@@ -131,7 +135,7 @@ export default class CellRenderer<ItemT> extends React.PureComponent<
   };
 
   _renderElement(
-    renderItem: ?RenderItemType<ItemT>,
+    renderItem: ?ListRenderItem<ItemT>,
     ListItemComponent: any,
     item: ItemT,
     index: number,

package/Lists/VirtualizedListProps.js

@@ -16,7 +16,7 @@ import type {
 import type {ViewStyleProp} from 'react-native/Libraries/StyleSheet/StyleSheet';
 import type {
   FocusEvent,
-  LayoutEvent,
+  LayoutChangeEvent,
 } from 'react-native/Libraries/Types/CoreEventTypes';
 
 import * as React from 'react';
@@ -31,7 +31,7 @@ export type Separators = {
   ...
 };
 
-export type RenderItemProps<ItemT> = {
+export type ListRenderItemInfo<ItemT> = {
   item: ItemT,
   index: number,
   isSelected: ?boolean, // [macOS]
@@ -45,12 +45,12 @@ export type CellRendererProps<ItemT> = $ReadOnly<{
   index: number,
   item: ItemT,
   onFocusCapture?: (event: FocusEvent) => void,
-  onLayout?: (event: LayoutEvent) => void,
+  onLayout?: (event: LayoutChangeEvent) => void,
   style: ViewStyleProp,
 }>;
 
-export type RenderItemType<ItemT> = (
-  info: RenderItemProps<ItemT>,
+export type ListRenderItem<ItemT> = (
+  info: ListRenderItemInfo<ItemT>,
 ) => React.Node;
 
 // [macOS
@@ -59,7 +59,7 @@ export type SelectedRowIndexPathType = {
   rowIndex: number,
 }; // macOS]
 
-type RequiredProps = {|
+type RequiredProps = {
   /**
    * The default accessor functions assume this is an Array<{key: string} | {id: string}> but you can override
    * getItem, getItemCount, and keyExtractor to handle any type of index-based data.
@@ -73,9 +73,9 @@ type RequiredProps = {|
    * Determines how many items are in the data blob.
    */
   getItemCount: (data: any) => number,
-|};
-type OptionalProps = {|
-  renderItem?: ?RenderItemType<Item>,
+};
+type OptionalProps = {
+  renderItem?: ?ListRenderItem<Item>,
   /**
    * `debug` will turn on extra logging and visual overlays to aid with debugging both usage and
    * implementation, but with a significant perf hit.
@@ -162,26 +162,17 @@ type OptionalProps = {|
    * `highlight` and `unhighlight` (which set the `highlighted: boolean` prop) are insufficient for
    * your use-case.
    */
-  ListItemComponent?: ?(
-    | React.ComponentType<any>
-    | ExactReactElement_DEPRECATED<any>
-  ),
+  ListItemComponent?: ?(React.ComponentType<any> | React.MixedElement),
   /**
    * Rendered when the list is empty. Can be a React Component Class, a render function, or
    * a rendered element.
    */
-  ListEmptyComponent?: ?(
-    | React.ComponentType<any>
-    | ExactReactElement_DEPRECATED<any>
-  ),
+  ListEmptyComponent?: ?(React.ComponentType<any> | React.MixedElement),
   /**
    * Rendered at the bottom of all the items. Can be a React Component Class, a render function, or
    * a rendered element.
    */
-  ListFooterComponent?: ?(
-    | React.ComponentType<any>
-    | ExactReactElement_DEPRECATED<any>
-  ),
+  ListFooterComponent?: ?(React.ComponentType<any> | React.MixedElement),
   /**
    * Styling for internal View for ListFooterComponent
    */
@@ -190,10 +181,7 @@ type OptionalProps = {|
    * Rendered at the top of all the items. Can be a React Component Class, a render function, or
    * a rendered element.
    */
-  ListHeaderComponent?: ?(
-    | React.ComponentType<any>
-    | ExactReactElement_DEPRECATED<any>
-  ),
+  ListHeaderComponent?: ?(React.ComponentType<any> | React.MixedElement),
   /**
    * Styling for internal View for ListHeaderComponent
    */
@@ -263,7 +251,7 @@ type OptionalProps = {|
    * <RefreshControl> component built internally. The onRefresh and refreshing
    * props are also ignored. Only works for vertical VirtualizedList.
    */
-  refreshControl?: ?ExactReactElement_DEPRECATED<any>,
+  refreshControl?: ?React.MixedElement,
   /**
    * Set this true while waiting for new data from a refresh.
    */
@@ -277,7 +265,7 @@ type OptionalProps = {|
   /**
    * Render a custom scroll component, e.g. with a differently styled `RefreshControl`.
    */
-  renderScrollComponent?: (props: Object) => ExactReactElement_DEPRECATED<any>,
+  renderScrollComponent?: (props: Object) => React.MixedElement,
   /**
    * Amount of time between low-pri item render batches, e.g. for rendering items quite a ways off
    * screen. Similar fill rate/responsiveness tradeoff as `maxToRenderPerBatch`.
@@ -300,13 +288,9 @@ type OptionalProps = {|
    * chance that fast scrolling may reveal momentary blank areas of unrendered content.
    */
   windowSize?: ?number,
-  /**
-   * The legacy implementation is no longer supported.
-   */
-  legacyImplementation?: empty,
-|};
+};
 // [macOS
-type MacOSProps = {|
+type MacOSProps = {
   /**
    * Allows you to 'select' a row using arrow keys. The selected row will have the prop `isSelected`
    * passed in as true to it's renderItem / ListItemComponent. You can also imperatively select a row
@@ -347,15 +331,15 @@ type MacOSProps = {|
 
   sectionIndex?: number,
   rowIndex?: number,
-|};
+};
 // macOS]
 
-export type Props = {|
+export type VirtualizedListProps = {
   ...React.ElementConfig<ScrollView>,
   ...RequiredProps,
   ...OptionalProps,
   ...MacOSProps, // [macOS]
-|};
+};
 
 /**
  * Default Props Helper Functions

package/Lists/VirtualizedSectionList.js

@@ -44,11 +44,11 @@ export type SectionBase<SectionItemT> = {
   ...
 };
 
-type RequiredProps<SectionT: SectionBase<any>> = {|
+type RequiredProps<SectionT: SectionBase<any>> = {
   sections: $ReadOnlyArray<SectionT>,
-|};
+};
 
-type OptionalProps<SectionT: SectionBase<any>> = {|
+type OptionalProps<SectionT: SectionBase<any>> = {
   /**
    * Default renderer for every item in every section.
    */
@@ -87,11 +87,11 @@ type OptionalProps<SectionT: SectionBase<any>> = {|
    */
   stickySectionHeadersEnabled?: boolean,
   onEndReached?: ?({distanceFromEnd: number, ...}) => void,
-|};
+};
 
 type VirtualizedListProps = React.ElementConfig<typeof VirtualizedList>;
 
-export type Props<SectionT> = {|
+export type VirtualizedSectionListProps<SectionT: SectionBase<any>> = {
   ...RequiredProps<SectionT>,
   ...OptionalProps<SectionT>,
   ...$Diff<
@@ -102,14 +102,14 @@ export type Props<SectionT> = {|
       ...
     },
   >,
-|};
-export type ScrollToLocationParamsType = {|
+};
+export type ScrollToLocationParamsType = {
   animated?: ?boolean,
   itemIndex: number,
   sectionIndex: number,
   viewOffset?: number,
   viewPosition?: number,
-|};
+};
 
 type State = {childProps: VirtualizedListProps, ...};
 
@@ -120,7 +120,7 @@ type State = {childProps: VirtualizedListProps, ...};
  */
 class VirtualizedSectionList<
   SectionT: SectionBase<any>,
-> extends React.PureComponent<Props<SectionT>, State> {
+> extends React.PureComponent<VirtualizedSectionListProps<SectionT>, State> {
   scrollToLocation(params: ScrollToLocationParamsType) {
     let index = params.itemIndex;
     for (let i = 0; i < params.sectionIndex; i++) {
@@ -203,7 +203,7 @@ class VirtualizedSectionList<
   }
 
   _getItem(
-    props: Props<SectionT>,
+    props: VirtualizedSectionListProps<SectionT>,
     sections: ?$ReadOnlyArray<Item>,
     index: number,
   ): ?Item {
@@ -453,15 +453,15 @@ class VirtualizedSectionList<
   };
 }
 
-type ItemWithSeparatorCommonProps = $ReadOnly<{|
+type ItemWithSeparatorCommonProps = $ReadOnly<{
   leadingItem: ?Item,
   leadingSection: ?Object,
   section: Object,
   trailingItem: ?Item,
   trailingSection: ?Object,
-|}>;
+}>;
 
-type ItemWithSeparatorProps = $ReadOnly<{|
+type ItemWithSeparatorProps = $ReadOnly<{
   ...ItemWithSeparatorCommonProps,
   LeadingSeparatorComponent: ?React.ComponentType<any>,
   SeparatorComponent: ?React.ComponentType<any>,
@@ -481,7 +481,7 @@ type ItemWithSeparatorProps = $ReadOnly<{|
   updatePropsFor: (prevCellKey: string, value: Object) => void,
   renderItem: Function,
   inverted: boolean,
-|}>;
+}>;
 
 function ItemWithSeparator(props: ItemWithSeparatorProps): React.Node {
   const {
@@ -598,12 +598,12 @@ function ItemWithSeparator(props: ItemWithSeparatorProps): React.Node {
   );
 }
 
-module.exports = VirtualizedSectionList as component(
+export default VirtualizedSectionList as component(
   ref: React.RefSetter<
     interface {
       getListRef(): ?VirtualizedList,
       scrollToLocation(params: ScrollToLocationParamsType): void,
     },
   >,
-  ...Props<SectionBase<any>>
+  ...VirtualizedSectionListProps<SectionBase<any>>
 );

package/Utilities/clamp.js

@@ -20,4 +20,4 @@ function clamp(min: number, value: number, max: number): number {
   return value;
 }
 
-module.exports = clamp;
+export default clamp;

package/Utilities/infoLog.js

@@ -17,4 +17,4 @@ function infoLog(...args: Array<mixed>): void {
   return console.log(...args);
 }
 
-module.exports = infoLog;
+export default infoLog;

package/index.js

@@ -22,37 +22,38 @@ export type {
   ViewToken,
   ViewabilityConfig,
   ViewabilityConfigCallbackPair,
+  ViewabilityConfigCallbackPairs,
 } from './Lists/ViewabilityHelper';
 export type {
   CellRendererProps,
-  RenderItemProps,
-  RenderItemType,
+  ListRenderItemInfo,
+  ListRenderItem,
   Separators,
 } from './Lists/VirtualizedListProps';
 export type {
-  Props as VirtualizedSectionListProps,
+  VirtualizedSectionListProps,
   ScrollToLocationParamsType,
   SectionBase,
 } from './Lists/VirtualizedSectionList';
 export type {FillRateInfo} from './Lists/FillRateHelper';
 
-module.exports = {
+export default {
   keyExtractor,
 
   get VirtualizedList(): VirtualizedList {
-    return require('./Lists/VirtualizedList');
+    return require('./Lists/VirtualizedList').default;
   },
   get VirtualizedSectionList(): VirtualizedSectionList {
-    return require('./Lists/VirtualizedSectionList');
+    return require('./Lists/VirtualizedSectionList').default;
   },
   get VirtualizedListContextResetter(): VirtualizedListContextResetter {
     const VirtualizedListContext = require('./Lists/VirtualizedListContext');
     return VirtualizedListContext.VirtualizedListContextResetter;
   },
   get ViewabilityHelper(): ViewabilityHelper {
-    return require('./Lists/ViewabilityHelper');
+    return require('./Lists/ViewabilityHelper').default;
   },
   get FillRateHelper(): FillRateHelper {
-    return require('./Lists/FillRateHelper');
+    return require('./Lists/FillRateHelper').default;
   },
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native-macos/virtualized-lists",
-  "version": "0.78.6",
+  "version": "0.79.0",
   "description": "Virtualized lists for React Native macOS.",
   "license": "MIT",
   "repository": {

package/Interaction/Batchinator.js

@@ -1,85 +0,0 @@
-/**
- * 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.
- *
- * @flow strict-local
- * @format
- */
-
-import {InteractionManager} from 'react-native';
-import * as ReactNativeFeatureFlags from 'react-native/src/private/featureflags/ReactNativeFeatureFlags';
-
-/**
- * A simple class for batching up invocations of a low-pri callback. A timeout is set to run the
- * callback once after a delay, no matter how many times it's scheduled. Once the delay is reached,
- * InteractionManager.runAfterInteractions is used to invoke the callback after any hi-pri
- * interactions are done running.
- *
- * Make sure to cleanup with dispose().  Example:
- *
- *   class Widget extends React.Component {
- *     _batchedSave: new Batchinator(() => this._saveState, 1000);
- *     _saveSate() {
- *       // save this.state to disk
- *     }
- *     componentDidUpdate() {
- *       this._batchedSave.schedule();
- *     }
- *     componentWillUnmount() {
- *       this._batchedSave.dispose();
- *     }
- *     ...
- *   }
- */
-class Batchinator {
-  _callback: () => void;
-  _delay: number;
-  _taskHandle: ?{cancel: () => void, ...};
-
-  constructor(callback: () => void, delay: number) {
-    this._delay = delay;
-    this._callback = callback;
-  }
-
-  /*
-   * Cleanup any pending tasks.
-   *
-   * By default, if there is a pending task the callback is run immediately. Set the option abort to
-   * true to not call the callback if it was pending.
-   */
-  dispose(): void {
-    if (this._taskHandle) {
-      this._taskHandle.cancel();
-      this._taskHandle = null;
-    }
-  }
-
-  schedule(): void {
-    if (this._taskHandle) {
-      return;
-    }
-    const invokeCallback = () => {
-      // Note that we clear the handle before invoking the callback so that if the callback calls
-      // schedule again, it will actually schedule another task.
-      this._taskHandle = null;
-      this._callback();
-    };
-
-    const timeoutHandle = setTimeout(
-      // NOTE: When shipping this, delete `Batchinator` instead of only these
-      // lines of code. Without `InteractionManager`, it's just a `setTimeout`.
-      ReactNativeFeatureFlags.disableInteractionManagerInBatchinator()
-        ? invokeCallback
-        : () => {
-            this._taskHandle =
-              InteractionManager.runAfterInteractions(invokeCallback);
-          },
-      this._delay,
-    );
-    this._taskHandle = {cancel: () => clearTimeout(timeoutHandle)};
-  }
-}
-
-module.exports = Batchinator;