Skip to content

Commit 07571fd

Browse files
authored
Change to using Flatlist from gesture-handler - 52 (#984)
* update to using Flatlist from gesture-handler * fix typescript
1 parent f8876b6 commit 07571fd

File tree

6 files changed

+13
-11
lines changed

6 files changed

+13
-11
lines changed

packages/core/src/components/FlatList.tsx

100644100755
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import React from "react";
2-
import { FlatList as FlatListstComponent } from "react-native";
2+
import { FlatList as FlatListComponent } from "react-native-gesture-handler";
33
import type { FlatListProps } from "react-native";
44

5-
const FlatList = React.forwardRef<FlatListstComponent, FlatListProps<any>>(
5+
const FlatList = React.forwardRef<FlatListComponent, FlatListProps<any>>(
66
<T extends any>(
77
{ numColumns, ...rest }: FlatListProps<T>,
8-
ref: React.Ref<FlatListstComponent>
8+
ref: React.Ref<FlatListComponent>
99
) => {
1010
return (
11-
<FlatListstComponent
11+
<FlatListComponent
1212
key={numColumns} // Changing numColumns requires re-rendering, setting it as the key ensures list is re-rendered when it changes
1313
numColumns={numColumns}
1414
ref={ref}

packages/core/src/components/SectionList/SectionList.tsx

100644100755
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import React from "react";
22
import { FlashListProps, FlashList } from "@shopify/flash-list";
3-
import { FlatListProps, FlatList as FlatListComponent } from "react-native";
3+
import { FlatListProps } from "react-native";
4+
import { FlatList as FlatListComponent } from "react-native-gesture-handler";
45
import SectionHeader, { DefaultSectionHeader } from "./SectionHeader";
56
import { flattenReactFragments } from "../../utilities";
67
import FlatList from "../FlatList";

packages/core/src/components/SimpleStyleScrollables/SimpleStyleFlatList.tsx

100644100755
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from "react";
22
import FlatList from "../FlatList";
3-
import { FlatList as FlatListComponent } from "react-native";
3+
import { FlatList as FlatListComponent } from "react-native-gesture-handler";
44
import type { FlatListProps } from "react-native";
55
import useSplitContentContainerStyles from "./useSplitContentContainerStyles";
66

packages/core/src/components/SimpleStyleScrollables/SimpleStyleSectionList.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import type {
55
FlashListSectionListProps,
66
} from "../SectionList";
77
import useSplitContentContainerStyles from "./useSplitContentContainerStyles";
8-
import { FlatList } from "react-native";
8+
import { FlatList as FlatListComponent } from "react-native-gesture-handler";
99
import { FlashList } from "@shopify/flash-list";
1010

1111
/**
@@ -22,7 +22,7 @@ const SimpleStyleSectionList = React.forwardRef(
2222
FlatListSectionListProps<T> | FlashListSectionListProps<T>,
2323
"contentContainerStyle"
2424
>,
25-
ref: React.Ref<FlatList | FlashList<any>>
25+
ref: React.Ref<FlatListComponent | FlashList<any>>
2626
) => {
2727
const { style, contentContainerStyle } =
2828
useSplitContentContainerStyles(styleProp);

packages/core/src/components/SimpleStyleScrollables/SimpleStyleSwipeableList.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import type {
55
FlatListSwipeableListProps,
66
} from "../SwipeableItem";
77
import useSplitContentContainerStyles from "./useSplitContentContainerStyles";
8-
import { FlatList } from "react-native";
8+
import { FlatList as FlatListComponent } from "react-native-gesture-handler";
99
import { FlashList } from "@shopify/flash-list";
1010

1111
/**
@@ -22,7 +22,7 @@ const SimpleStyleSwipeableList = React.forwardRef(
2222
FlashListSwipeableListProps<T> | FlatListSwipeableListProps<T>,
2323
"contentContainerStyle"
2424
>,
25-
ref: React.Ref<FlatList | FlashList<any>>
25+
ref: React.Ref<FlatListComponent | FlashList<any>>
2626
) => {
2727
const { style, contentContainerStyle } =
2828
useSplitContentContainerStyles(styleProp);

packages/core/src/components/SwipeableItem/SwipeableList.tsx

100644100755
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import React from "react";
22
import { FlashListProps, FlashList } from "@shopify/flash-list";
3-
import { FlatListProps, FlatList as FlatListComponent } from "react-native";
3+
import { FlatListProps } from "react-native";
4+
import { FlatList as FlatListComponent } from "react-native-gesture-handler";
45
import FlatList from "../FlatList";
56

67
type ListComponentType = "FlatList" | "FlashList";

0 commit comments

Comments
 (0)