Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

TS migration InvertedList #25137 #33288

Merged
merged 8 commits into from
Dec 28, 2023
+54 −112
Merged

TS migration InvertedList #25137 #33288

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d486077
migration to ts v1
ishpaul777 Dec 19, 2023
25d798f
Update src/components/InvertedFlatList/CellRendererComponent.tsx
ishpaul777 Dec 20, 2023
a4d609e
Update src/components/InvertedFlatList/index.tsx
ishpaul777 Dec 20, 2023
fc2f53b
Update src/components/InvertedFlatList/index.tsx
ishpaul777 Dec 20, 2023
858c287
Merge branch 'Expensify:main' into typeScript/InvertedFlatList
ishpaul777 Dec 20, 2023
fc9393f
added requested changes
ishpaul777 Dec 20, 2023
90b642b
added requested changes
ishpaul777 Dec 28, 2023
64ed3d2
remove default argument for contentContainerStyle
ishpaul777 Dec 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/components/InvertedFlatList/BaseInvertedFlatList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,15 @@ import {FlatListProps} from 'react-native';
import FlatList from '@components/FlatList';

const AUTOSCROLL_TO_TOP_THRESHOLD = 128;
const WINDOW_SIZE = 15;

function BaseInvertedFlatList<T>(props: FlatListProps<T>, ref: ForwardedRef<FlatList>) {
return (
<FlatList
// eslint-disable-next-line react/jsx-props-no-spreading
{...props}
ref={ref}
windowSize={15}
windowSize={WINDOW_SIZE}
maintainVisibleContentPosition={{
minIndexForVisible: 0,
autoscrollToTopThreshold: AUTOSCROLL_TO_TOP_THRESHOLD,
Expand Down
4 changes: 1 addition & 3 deletions src/components/InvertedFlatList/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@ import BaseInvertedFlatList from './BaseInvertedFlatList';

// This is adapted from https://codesandbox.io/s/react-native-dsyse
// It's a HACK alert since FlatList has inverted scrolling on web
function InvertedFlatList<T>({onScroll: onScrollProp = () => {}, ...props}: FlatListProps<T>, ref: ForwardedRef<FlatList>) {
const {contentContainerStyle} = props;

function InvertedFlatList<T>({onScroll: onScrollProp = () => {}, contentContainerStyle = {}, ...props}: FlatListProps<T>, ref: ForwardedRef<FlatList>) {
const lastScrollEvent = useRef<number | null>(null);
const scrollEndTimeout = useRef<NodeJS.Timeout | null>(null);
const updateInProgress = useRef<boolean>(false);
Expand Down