chore: minimize the virtualized-lists fork

.changeset/great-zebras-tease.md

@@ -0,0 +1,6 @@
+---
+"@react-native-macos/virtualized-lists": minor
+"react-native-macos": minor
+---
+
+Remove the generic VirtualizedList and SectionList selection API, and keep macOS keyboard selection owned by FlatList. Option+Down selects the final data row, Enter activates the selected row, and native vertical inversion preserves child views.

packages/react-native/Libraries/Components/ScrollView/ScrollView.js

@@ -1747,7 +1747,8 @@ class ScrollView extends React.Component<ScrollViewProps, ScrollViewState> {
     // this is the case.
     const preserveChildren =
       this.props.maintainVisibleContentPosition != null ||
-      (Platform.OS === 'android' && this.props.snapToAlignment != null);
+      (Platform.OS === 'android' && this.props.snapToAlignment != null) ||
+      (Platform.OS === 'macos' && this.props.inverted === true); // [macOS]
 
     const contentContainer = (
       <NativeScrollContentView

packages/react-native/Libraries/Components/ScrollView/__tests__/ScrollView-test.js

@@ -12,6 +12,7 @@
 
 const {create, unmount, update} = require('../../../../jest/renderer');
 const Text = require('../../../Text/Text').default;
+const Platform = require('../../../Utilities/Platform').default;
 const ReactNativeTestTools = require('../../../Utilities/ReactNativeTestTools');
 const View = require('../../View/View').default;
 const ScrollView = require('../ScrollView').default;
@@ -39,6 +40,46 @@ describe('ScrollView', () => {
     );
   });
 
+  it('preserves children for native inversion on macOS', async () => {
+    const platformOSDescriptor = Object.getOwnPropertyDescriptor(
+      Platform,
+      'OS',
+    );
+    if (platformOSDescriptor == null) {
+      throw new Error('Platform.OS descriptor was not found');
+    }
+    // $FlowFixMe[incompatible-type] Exercise the macOS-only render branch.
+    Object.defineProperty(Platform, 'OS', {
+      ...platformOSDescriptor,
+      // $FlowFixMe[incompatible-type] Platform is a platform-specific union.
+      value: 'macos',
+    });
+    try {
+      const invertedComponent = await create(
+        <ScrollView inverted={true}>
+          <View />
+        </ScrollView>,
+      );
+      const regularComponent = await create(
+        <ScrollView inverted={false}>
+          <View />
+        </ScrollView>,
+      );
+
+      expect(
+        invertedComponent.root.findByType('RCTScrollContentView').props
+          .collapsableChildren,
+      ).toBe(false);
+      expect(
+        regularComponent.root.findByType('RCTScrollContentView').props
+          .collapsableChildren,
+      ).toBe(true);
+    } finally {
+      // $FlowFixMe[incompatible-type] Restore the test platform.
+      Object.defineProperty(Platform, 'OS', platformOSDescriptor);
+    }
+  });
+
   it('mocks native methods and instance methods', async () => {
     jest.mock('../ScrollView');
 

packages/react-native/Libraries/Lists/FlatList.d.ts

@@ -9,7 +9,7 @@
 
 import type * as React from 'react';
 import type {
-  ListRenderItem,
+  ListRenderItemInfo,
   ViewToken,
   VirtualizedListProps,
   ViewabilityConfig,
@@ -19,7 +19,20 @@ import type {StyleProp} from '../StyleSheet/StyleSheet';
 import type {ViewStyle} from '../StyleSheet/StyleSheetTypes';
 import type {View} from '../Components/View/View';
 
-export interface FlatListProps<ItemT> extends VirtualizedListProps<ItemT> {
+export interface FlatListRenderItemInfo<ItemT>
+  extends ListRenderItemInfo<ItemT> {
+  isSelected: boolean;
+}
+
+export type FlatListRenderItem<ItemT> = (
+  info: FlatListRenderItemInfo<ItemT>,
+) => React.ReactNode;
+
+export interface FlatListProps<ItemT>
+  extends Omit<
+    VirtualizedListProps<ItemT>,
+    'ListItemComponent' | 'renderItem'
+  > {
   /**
    * Optional custom style for multi-item rows generated when numColumns > 1
    */
@@ -87,6 +100,44 @@ export interface FlatListProps<ItemT> extends VirtualizedListProps<ItemT> {
    */
   initialScrollIndex?: number | null | undefined;
 
+  /**
+   * Allows rows to be selected with the keyboard.
+   *
+   * @platform macos
+   */
+  enableSelectionOnKeyPress?: boolean | null | undefined;
+
+  /**
+   * The initially selected row.
+   *
+   * @platform macos
+   */
+  initialSelectedIndex?: number | null | undefined;
+
+  /**
+   * Called when the selected row changes.
+   *
+   * @platform macos
+   */
+  onSelectionChanged?:
+    | ((info: {
+        previousSelection: number;
+        newSelection: number;
+        item: ItemT | ReadonlyArray<ItemT> | null | undefined;
+      }) => void)
+    | null
+    | undefined;
+
+  /**
+   * Called when Enter is pressed on the selected row.
+   *
+   * @platform macos
+   */
+  onSelectionEntered?:
+    | ((item: ItemT | ReadonlyArray<ItemT> | null | undefined) => void)
+    | null
+    | undefined;
+
   /**
    * Used to extract a unique key for a given item at the specified index. Key is used for caching
    * and as the react key to track item re-ordering. The default extractor checks `item.key`, then
@@ -140,7 +191,13 @@ export interface FlatListProps<ItemT> extends VirtualizedListProps<ItemT> {
    * ```
    * Provides additional metadata like `index` if you need it.
    */
-  renderItem: ListRenderItem<ItemT> | null | undefined;
+  renderItem: FlatListRenderItem<ItemT> | null | undefined;
+
+  ListItemComponent?:
+    | React.ComponentType<FlatListRenderItemInfo<ItemT>>
+    | React.ReactElement
+    | null
+    | undefined;
 
   /**
    * See `ViewabilityHelper` for flow type and further documentation.
@@ -223,6 +280,13 @@ export abstract class FlatListComponent<
    */
   flashScrollIndicators: () => void;
 
+  /**
+   * Moves selection to the specified row.
+   *
+   * @platform macos
+   */
+  selectRowAtIndex: (index: number) => void;
+
   /**
    * Provides a handle to the underlying scroll responder.
    */