[DF] feat(#547): fix typescript pr requests

CHANGELOG.md

@@ -7,8 +7,6 @@ and adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
-- Add support for `experimentalMaintainTopContentPosition`
-
 - Update types to match `react-native@0.72` view types.
   - https://github.com/Shopify/flash-list/pull/890
 - Add support for `experimentalMaintainTopContentPosition`

android/src/main/kotlin/com/shopify/reactnative/flash_list/AutoLayoutView.kt

@@ -78,7 +78,6 @@ class AutoLayoutView(context: Context) : ReactViewGroup(context) {
             alShadow.clearGapsAndOverlaps(
                     positionSortedViews,
                     getParentScrollView() as ScrollView,
-                    experimentalScrollPositionManagement
             )
         }
     }

src/BiDirectionalScrollView.tsx

@@ -16,7 +16,7 @@ import {
   View,
 } from "react-native";
 
-import { BidirectionalFlatlist } from "./BidirectionalFlatlist";
+import { BidirectionalList } from "./BidirectionalList";
 import type { ShiftFunction } from "./types";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment

src/BidirectionalFlatlist.ts → src/BidirectionalList.ts

@@ -14,18 +14,18 @@ const LINKING_ERROR =
   )}- You rebuilt the app after installing the package\n` +
   `- You are not using Expo managed workflow\n`;
 
-interface BidirectionalFlatlistProps {
+interface BidirectionalListProps {
   style: ViewStyle;
   children: ReactNode;
 }
 
 const ComponentName = "DoubleSidedScrollView";
 
-const BidirectionalFlatlist =
-  requireNativeComponent<BidirectionalFlatlistProps>(ComponentName);
+const BidirectionalList =
+  requireNativeComponent<BidirectionalListProps>(ComponentName);
 
-if (BidirectionalFlatlist === null) {
+if (BidirectionalList === null) {
   throw new Error(LINKING_ERROR);
 }
 
-export { BidirectionalFlatlist };
+export { BidirectionalList };

src/FlashList.tsx

@@ -6,7 +6,6 @@ import {
   NativeSyntheticEvent,
   StyleSheet,
   NativeScrollEvent,
-  Platform,
 } from "react-native";
 import {
   BaseItemAnimator,
@@ -32,6 +31,7 @@ import {
   RenderTargetOptions,
 } from "./FlashListProps";
 import {
+  getBidirectionalScrollView,
   getCellContainerPlatformStyles,
   getFooterContainer,
   getItemAnimator,
@@ -43,7 +43,6 @@ import {
   hasUnsupportedKeysInContentContainerStyle,
   updateContentStyle,
 } from "./utils/ContentContainerUtils";
-import { BidirectionalScrollView } from "./BiDirectionalScrollView";
 
 interface StickyProps extends StickyContainerProps {
   children: any;
@@ -399,12 +398,10 @@ class FlashList<T> extends React.PureComponent<
           windowCorrectionConfig={this.getUpdatedWindowCorrectionConfig()}
           itemAnimator={this.itemAnimator}
           suppressBoundedSizeException
-          externalScrollView={
-            this.props.experimentalScrollPositionManagement &&
-            Platform.OS === "android"
-              ? (BidirectionalScrollView as unknown as RecyclerListViewProps["externalScrollView"])
-              : (renderScrollComponent as RecyclerListViewProps["externalScrollView"])
-          }
+          externalScrollView={getBidirectionalScrollView(
+            Boolean(this.props.maintainVisibleContentPosition),
+            renderScrollComponent
+          )}
         />
       </StickyHeaderContainer>
     );

src/native/config/PlatformHelper.ts

@@ -1,5 +1,9 @@
-import { BaseItemAnimator } from "recyclerlistview";
+import { Platform, ScrollViewProps } from "react-native";
+import { BaseItemAnimator, RecyclerListViewProps } from "recyclerlistview";
 import { DefaultJSItemAnimator } from "recyclerlistview/dist/reactnative/platform/reactnative/itemanimators/defaultjsanimator/DefaultJSItemAnimator";
+import React from "react";
+
+import { BidirectionalScrollView } from "../../BiDirectionalScrollView";
 
 const PlatformConfig = {
   defaultDrawDistance: 250,
@@ -21,9 +25,22 @@ const getFooterContainer = (): React.ComponentClass | undefined => {
   return undefined;
 };
 
+const getBidirectionalScrollView = (
+  experimentalScrollPositionManagement: boolean,
+  renderScrollComponent:
+    | React.FC<ScrollViewProps>
+    | React.ComponentType<ScrollViewProps>
+    | undefined
+) => {
+  return experimentalScrollPositionManagement && Platform.OS === "android"
+    ? (BidirectionalScrollView as unknown as RecyclerListViewProps["externalScrollView"])
+    : (renderScrollComponent as unknown as RecyclerListViewProps["externalScrollView"]);
+};
+
 export {
   PlatformConfig,
   getCellContainerPlatformStyles,
   getItemAnimator,
   getFooterContainer,
+  getBidirectionalScrollView,
 };