@react-native-ohos/flash-list 1.8.3-rc.5 → 2.1.1-rc.1

package/src/benchmark/JSFPSMonitor.ts

@@ -1,26 +1,4 @@
-/**
- * MIT License
- *
- * Copyright (C) 2024 Huawei Device Co., Ltd.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
+import { ErrorMessages } from "../errors/ErrorMessages";
 
 import { roundToDecimalPlaces } from "./roundToDecimalPlaces";
 
@@ -68,9 +46,7 @@ export class JSFPSMonitor {
 
   public startTracking() {
     if (this.startTime !== 0) {
-      throw new Error(
-        "This FPS Monitor has already been run, please create a new instance"
-      );
+      throw new Error(ErrorMessages.fpsMonitorAlreadyRunning);
     }
     this.startTime = Date.now();
     this.timeWindow.startTime = Date.now();

package/src/benchmark/roundToDecimalPlaces.ts

@@ -1,27 +1,3 @@
-/**
- * MIT License
- *
- * Copyright (C) 2024 Huawei Device Co., Ltd.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
 export function roundToDecimalPlaces(value: number, decimalPlaces: number) {
   const multiplier = 10 ** decimalPlaces;
   return Math.round(value * multiplier) / multiplier;

package/src/benchmark/useBenchmark.ts

@@ -1,38 +1,10 @@
-/**
- * MIT License
- *
- * Copyright (C) 2024 Huawei Device Co., Ltd.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-import React, { useEffect } from "react";
+import React, { useEffect, useState, useCallback, useRef } from "react";
 
-import FlashList from "../FlashList";
+import { FlashListRef } from "../FlashListRef";
+import { ErrorMessages } from "../errors/ErrorMessages";
 
 import { autoScroll, Cancellable } from "./AutoScrollHelper";
 import { JSFPSMonitor, JSFPSResult } from "./JSFPSMonitor";
-import { roundToDecimalPlaces } from "./roundToDecimalPlaces";
-import {
-  BlankAreaTrackerResult,
-  useBlankAreaTracker,
-} from "./useBlankAreaTracker";
 
 export interface BenchmarkParams {
   startDelayInMs?: number;
@@ -52,13 +24,18 @@ export interface BenchmarkParams {
    * Blank area is negative when list is able to draw faster than the scroll speed.
    */
   sumNegativeBlankAreaValues?: boolean;
+
+  /**
+   * When set to true, the benchmark will not start automatically.
+   * Use the returned startBenchmark function to trigger it manually.
+   */
+  startManually?: boolean;
 }
 
 export interface BenchmarkResult {
   js?: JSFPSResult;
   interrupted: boolean;
   suggestions: string[];
-  blankArea?: BlankAreaTrackerResult;
   formattedString?: string;
 }
 
@@ -69,24 +46,31 @@ export interface BenchmarkResult {
  */
 
 export function useBenchmark(
-  flashListRef: React.RefObject<FlashList<any>>,
+  flashListRef: React.RefObject<FlashListRef<any>>,
   callback: (benchmarkResult: BenchmarkResult) => void,
   params: BenchmarkParams = {}
 ) {
-  const [blankAreaResult, blankAreaTracker] = useBlankAreaTracker(
-    flashListRef,
-    undefined,
-    { sumNegativeValues: params.sumNegativeBlankAreaValues, startDelayInMs: 0 }
-  );
-  useEffect(() => {
+  const [isBenchmarkRunning, setIsBenchmarkRunning] = useState(false);
+  const cancellableRef = useRef<Cancellable | null>(null);
+
+  const startBenchmark = useCallback(() => {
+    if (isBenchmarkRunning) {
+      return;
+    }
+
     const cancellable = new Cancellable();
+    cancellableRef.current = cancellable;
     const suggestions: string[] = [];
+
     if (flashListRef.current) {
       if (!(Number(flashListRef.current.props.data?.length) > 0)) {
-        throw new Error("Data is empty, cannot run benchmark");
+        throw new Error(ErrorMessages.dataEmptyCannotRunBenchmark);
       }
     }
-    const cancelTimeout = setTimeout(async () => {
+
+    setIsBenchmarkRunning(true);
+
+    const runBenchmark = async () => {
       const jsFPSMonitor = new JSFPSMonitor();
       jsFPSMonitor.startTracking();
       for (let i = 0; i < (params.repeatCount || 1); i++) {
@@ -105,7 +89,6 @@ export function useBenchmark(
       computeSuggestions(flashListRef, suggestions);
       const result: BenchmarkResult = generateResult(
         jsProfilerResponse,
-        blankAreaResult,
         suggestions,
         cancellable
       );
@@ -113,25 +96,43 @@ export function useBenchmark(
         result.formattedString = getFormattedString(result);
       }
       callback(result);
+      setIsBenchmarkRunning(false);
+    };
+
+    runBenchmark();
+  }, [
+    callback,
+    flashListRef,
+    isBenchmarkRunning,
+    params.repeatCount,
+    params.speedMultiplier,
+  ]);
+
+  useEffect(() => {
+    if (params.startManually) {
+      return;
+    }
+
+    const cancelTimeout = setTimeout(() => {
+      startBenchmark();
     }, params.startDelayInMs || 3000);
+
     return () => {
       clearTimeout(cancelTimeout);
-      cancellable.cancel();
+      if (cancellableRef.current) {
+        cancellableRef.current.cancel();
+      }
     };
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
-  return [blankAreaTracker];
+
+  return { startBenchmark, isBenchmarkRunning } as const;
 }
 
 export function getFormattedString(res: BenchmarkResult) {
   return (
     `Results:\n\n` +
     `JS FPS: Avg: ${res.js?.averageFPS} | Min: ${res.js?.minFPS} | Max: ${res.js?.maxFPS}\n\n` +
-    `${
-      res.blankArea
-        ? `Blank Area: Max: ${res.blankArea?.maxBlankArea} Cumulative: ${res.blankArea?.cumulativeBlankArea}\n\n`
-        : ``
-    }` +
     `${
       res.suggestions.length > 0
         ? `Suggestions:\n\n${res.suggestions
@@ -144,22 +145,11 @@ export function getFormattedString(res: BenchmarkResult) {
 
 function generateResult(
   jsProfilerResponse: JSFPSResult,
-  blankAreaResult: BlankAreaTrackerResult,
   suggestions: string[],
   cancellable: Cancellable
 ) {
   return {
     js: jsProfilerResponse,
-    blankArea:
-      blankAreaResult.maxBlankArea >= 0
-        ? {
-            maxBlankArea: roundToDecimalPlaces(blankAreaResult.maxBlankArea, 0),
-            cumulativeBlankArea: roundToDecimalPlaces(
-              blankAreaResult.cumulativeBlankArea,
-              0
-            ),
-          }
-        : undefined,
     suggestions,
     interrupted: cancellable.isCancelled(),
   };
@@ -169,21 +159,21 @@ function generateResult(
  * Scrolls to the end of the list and then back to the top
  */
 async function runScrollBenchmark(
-  flashListRef: React.RefObject<FlashList<any> | null | undefined>,
+  flashListRef: React.RefObject<FlashListRef<any> | null | undefined>,
   cancellable: Cancellable,
   scrollSpeedMultiplier: number
 ): Promise<void> {
   if (flashListRef.current) {
     const horizontal = flashListRef.current.props.horizontal;
-    const rlv = flashListRef.current.recyclerlistview_unsafe;
-    if (rlv) {
-      const rlvSize = rlv.getRenderedSize();
-      const rlvContentSize = rlv.getContentDimension();
+    const rv = flashListRef.current;
+    if (rv) {
+      const rvSize = rv.getWindowSize();
+      const rvContentSize = rv.getChildContainerDimensions();
 
       const fromX = 0;
       const fromY = 0;
-      const toX = rlvContentSize.width - rlvSize.width;
-      const toY = rlvContentSize.height - rlvSize.height;
+      const toX = rvContentSize.width - rvSize.width;
+      const toY = rvContentSize.height - rvSize.height;
 
       const scrollNow = (x: number, y: number) => {
         flashListRef.current?.scrollToOffset({
@@ -213,8 +203,9 @@ async function runScrollBenchmark(
     }
   }
 }
+
 function computeSuggestions(
-  flashListRef: React.RefObject<FlashList<any> | null | undefined>,
+  flashListRef: React.RefObject<FlashListRef<any> | null | undefined>,
   suggestions: string[]
 ) {
   if (flashListRef.current) {
@@ -223,42 +214,5 @@ function computeSuggestions(
         `Data count is low. Try to increase it to a large number (e.g 200) using the 'useDataMultiplier' hook.`
       );
     }
-    const distanceFromWindow = roundToDecimalPlaces(
-      flashListRef.current.firstItemOffset,
-      0
-    );
-    if (
-      (flashListRef.current.props.estimatedFirstItemOffset || 0) !==
-      distanceFromWindow
-    ) {
-      suggestions.push(
-        `estimatedFirstItemOffset can be set to ${distanceFromWindow}`
-      );
-    }
-    const rlv = flashListRef.current.recyclerlistview_unsafe;
-    const horizontal = flashListRef.current.props.horizontal;
-    if (rlv) {
-      const sizeArray = rlv.props.dataProvider
-        .getAllData()
-        .map((_, index) =>
-          horizontal
-            ? rlv.getLayout?.(index)?.width || 0
-            : rlv.getLayout?.(index)?.height || 0
-        );
-      const averageSize = Math.round(
-        sizeArray.reduce((prev, current) => prev + current, 0) /
-          sizeArray.length
-      );
-      if (
-        Math.abs(
-          averageSize -
-            (flashListRef.current.props.estimatedItemSize ??
-              flashListRef.current.state.layoutProvider
-                .defaultEstimatedItemSize)
-        ) > 5
-      ) {
-        suggestions.push(`estimatedItemSize can be set to ${averageSize}`);
-      }
-    }
   }
 }

package/src/benchmark/useDataMultiplier.ts

@@ -1,27 +1,3 @@
-/**
- * MIT License
- *
- * Copyright (C) 2024 Huawei Device Co., Ltd.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
 /**
  * Increases the data size by duplicating it, it's kept in hook format so that in future we can add auto pagination support.
  * If you're using this with FlatList then make sure you remove `keyExtractor` because this method might duplicate ids that might be in the data.

package/src/benchmark/useFlatListBenchmark.ts

@@ -1,30 +1,8 @@
-/**
- * MIT License
- *
- * Copyright (C) 2024 Huawei Device Co., Ltd.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-import { useEffect } from "react";
+import { useCallback, useEffect, useRef, useState } from "react";
 import { FlatList } from "react-native";
 
+import { ErrorMessages } from "../errors/ErrorMessages";
+
 import { autoScroll, Cancellable } from "./AutoScrollHelper";
 import { JSFPSMonitor } from "./JSFPSMonitor";
 import {
@@ -47,14 +25,24 @@ export function useFlatListBenchmark(
   callback: (benchmarkResult: BenchmarkResult) => void,
   params: FlatListBenchmarkParams
 ) {
-  useEffect(() => {
+  const [isBenchmarkRunning, setIsBenchmarkRunning] = useState(false);
+  const cancellableRef = useRef<Cancellable | null>(null);
+
+  const startBenchmark = useCallback(() => {
+    if (isBenchmarkRunning) {
+      return;
+    }
     const cancellable = new Cancellable();
-    if (flatListRef.current) {
+    cancellableRef.current = cancellable;
+    if (flatListRef.current && flatListRef.current.props) {
       if (!(Number(flatListRef.current.props.data?.length) > 0)) {
-        throw new Error("Data is empty, cannot run benchmark");
+        throw new Error(ErrorMessages.dataEmptyCannotRunBenchmark);
       }
     }
-    const cancelTimeout = setTimeout(async () => {
+
+    setIsBenchmarkRunning(true);
+
+    const runBenchmark = async () => {
       const jsFPSMonitor = new JSFPSMonitor();
       jsFPSMonitor.startTracking();
       for (let i = 0; i < (params.repeatCount || 1); i++) {
@@ -75,14 +63,37 @@ export function useFlatListBenchmark(
         result.formattedString = getFormattedString(result);
       }
       callback(result);
+      setIsBenchmarkRunning(false);
+    };
+
+    runBenchmark();
+  }, [
+    callback,
+    flatListRef,
+    isBenchmarkRunning,
+    params.repeatCount,
+    params.speedMultiplier,
+    params.targetOffset,
+  ]);
+
+  useEffect(() => {
+    if (params.startManually) {
+      return;
+    }
+
+    const cancelTimeout = setTimeout(() => {
+      startBenchmark();
     }, params.startDelayInMs || 3000);
+
     return () => {
       clearTimeout(cancelTimeout);
-      cancellable.cancel();
+      if (cancellableRef.current) {
+        cancellableRef.current.cancel();
+      }
     };
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
-  return [];
+  return { startBenchmark, isBenchmarkRunning };
 }
 
 /**
@@ -95,7 +106,7 @@ async function runScrollBenchmark(
   scrollSpeedMultiplier: number
 ): Promise<void> {
   if (flatListRef.current) {
-    const horizontal = flatListRef.current.props.horizontal;
+    const horizontal = Boolean(flatListRef.current.props?.horizontal);
 
     const fromX = 0;
     const fromY = 0;

package/src/errors/ErrorMessages.ts

@@ -0,0 +1,26 @@
+export const ErrorMessages = {
+  multipleViewabilityThresholdTypesNotSupported:
+    "You can set exactly one of itemVisiblePercentThreshold or viewAreaCoveragePercentThreshold. Specifying both is not supported.",
+  flashListV2OnlySupportsNewArchitecture:
+    "FlashList v2 is only supported on new architecture",
+  layoutManagerNotInitializedLayoutInfo:
+    "LayoutManager is not initialized, layout info is unavailable",
+  layoutManagerNotInitializedChildContainer:
+    "LayoutManager is not initialized, child container layout is unavailable",
+  layoutManagerNotInitializedWindowSize:
+    "LayoutManager is not initialized, window size is unavailable",
+  horizontalPropCannotBeToggled:
+    "Horizontal prop cannot be toggled, you can use a key on FlashList to recreate it.",
+  layoutManagerNotInitializedVisibleIndices:
+    "LayoutManager is not initialized, visible indices are not unavailable",
+  masonryAndHorizontalIncompatible:
+    "Masonry and horizontal props are incompatible",
+  numColumnsAndHorizontalIncompatible:
+    "numColumns and horizontal props are incompatible",
+  indexOutOfBounds: "index out of bounds, not enough layouts",
+  fpsMonitorAlreadyRunning:
+    "This FPS Monitor has already been run, please create a new instance",
+  dataEmptyCannotRunBenchmark: "Data is empty, cannot run benchmark",
+  stickyHeadersNotSupportedForHorizontal:
+    "Sticky headers are not supported when list is horizontal",
+};

package/src/errors/WarningMessages.ts

@@ -0,0 +1,9 @@
+export const WarningMessages = {
+  keyExtractorNotDefinedForAnimation:
+    "keyExtractor is not defined. This might cause the animations to not work as expected.",
+  keyExtractorNotDefinedForMVCP:
+    "keyExtractor is not defined, maintainVisibleContentPosition may not work as expected.",
+  exceededMaxRendersWithoutCommit:
+    "Exceeded max renders without commit. This might mean that you have duplicate keys in your keyExtractor output or your list is nested in a ScrollView causing a lot of items to render at once. " +
+    "If it's none of those and is causing a real issue or error, consider reporing this on FlashList Github",
+};

package/src/index.ts

@@ -1,42 +1,17 @@
-/**
- * MIT License
- *
- * Copyright (C) 2024 Huawei Device Co., Ltd.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
+// Keep this unmodified for TS type checking
+import { isNewArch } from "./isNewArch";
+import { ErrorMessages } from "./errors/ErrorMessages";
 
-export { default as FlashList } from "./FlashList";
+export { FlashList } from "./FlashList";
+export { FlashListRef } from "./FlashListRef";
 export {
   FlashListProps,
-  ContentStyle,
   ListRenderItem,
   ListRenderItemInfo,
   RenderTarget,
   RenderTargetOptions,
 } from "./FlashListProps";
 export { default as AnimatedFlashList } from "./AnimatedFlashList";
-export {
-  useOnNativeBlankAreaEvents,
-  BlankAreaEventHandler,
-  BlankAreaEvent,
-} from "./native/auto-layout/AutoLayoutView";
 export {
   useBenchmark,
   BenchmarkParams,
@@ -47,21 +22,18 @@ export {
   useFlatListBenchmark,
   FlatListBenchmarkParams,
 } from "./benchmark/useFlatListBenchmark";
-export {
-  useBlankAreaTracker,
-  BlankAreaTrackerResult,
-  BlankAreaTrackerConfig,
-} from "./benchmark/useBlankAreaTracker";
-export {
-  MasonryFlashList,
-  MasonryFlashListProps,
-  MasonryFlashListScrollEvent,
-  MasonryFlashListRef,
-  MasonryListItem,
-  MasonryListRenderItem,
-  MasonryListRenderItemInfo,
-} from "./MasonryFlashList";
+export { useLayoutState } from "./recyclerview/hooks/useLayoutState";
+export { useRecyclingState } from "./recyclerview/hooks/useRecyclingState";
+export { useMappingHelper } from "./recyclerview/hooks/useMappingHelper";
 export { JSFPSMonitor, JSFPSResult } from "./benchmark/JSFPSMonitor";
 export { autoScroll, Cancellable } from "./benchmark/AutoScrollHelper";
-export { default as ViewToken } from "./viewability/ViewToken";
-export { default as CellContainer } from "./native/cell-container/CellContainer";
+export { default as ViewToken } from "./recyclerview/viewability/ViewToken";
+export { useFlashListContext } from "./recyclerview/RecyclerViewContextProvider";
+export {
+  LayoutCommitObserver,
+  LayoutCommitObserverProps,
+} from "./recyclerview/LayoutCommitObserver";
+
+if (!isNewArch()) {
+  throw new Error(ErrorMessages.flashListV2OnlySupportsNewArchitecture);
+}

package/src/isNewArch.ts

@@ -0,0 +1,25 @@
+import { Platform } from "react-native";
+
+let _isNewArch: boolean | undefined;
+
+export function isNewArch(): boolean {
+  if (_isNewArch !== undefined) {
+    return _isNewArch;
+  } else {
+    try {
+      // Check for Fabric UI Manager
+      const hasFabricUIManager = Boolean(
+        (global as any)?.nativeFabricUIManager
+      );
+
+      // Check for TurboModule system
+      const hasTurboModule = Boolean((global as any)?.__turboModuleProxy);
+
+      _isNewArch =
+        hasFabricUIManager || hasTurboModule || Platform.OS === "web";
+    } catch {
+      _isNewArch = true;
+    }
+  }
+  return _isNewArch;
+}

package/src/native/config/PlatformHelper.android.ts

@@ -1,53 +1,7 @@
-/**
- * MIT License
- *
- * Copyright (C) 2024 Huawei Device Co., Ltd.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-import { BaseItemAnimator } from "recyclerlistview";
-
 const PlatformConfig = {
   defaultDrawDistance: 250,
-  // Using rotate instead of scaleY on Android to avoid performance issues. Issue: https://github.com/Shopify/flash-list/issues/751
-  invertedTransformStyle: { transform: [{ rotate: "180deg" }] },
-  invertedTransformStyleHorizontal: { transform: [{ rotate: "180deg" }] },
-};
-const getCellContainerPlatformStyles = (
-  inverted: boolean,
-  parentProps: { x: number; y: number; isHorizontal?: boolean }
-): { transform: string; WebkitTransform: string } | undefined => {
-  return undefined;
-};
-
-const getItemAnimator = (): BaseItemAnimator | undefined => {
-  return undefined;
-};
-
-const getFooterContainer = (): React.ComponentClass | undefined => {
-  return undefined;
+  supportsOffsetCorrection: true,
+  trackAverageRenderTimeForOffsetProjection: true,
 };
 
-export {
-  PlatformConfig,
-  getCellContainerPlatformStyles,
-  getItemAnimator,
-  getFooterContainer,
-};
+export { PlatformConfig };