From d89395bcd434992ba8c28bb0c6b10c8659d25d84 Mon Sep 17 00:00:00 2001 From: Folkert van der Beek Date: Mon, 6 Dec 2021 00:06:46 +0100 Subject: [PATCH] Replace .finally() method with .then(onFinally, onFinally) --- src/BidirectionalFlatList.tsx | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/BidirectionalFlatList.tsx b/src/BidirectionalFlatList.tsx index f205869..2910909 100644 --- a/src/BidirectionalFlatList.tsx +++ b/src/BidirectionalFlatList.tsx @@ -115,6 +115,11 @@ export const BidirectionalFlatList = (React.forwardRef( } setOnStartReachedInProgress(true); + + const onFinally = () => { + onStartReachedInPromise.current = onStartReached().then(p); + }; + const p = () => { return new Promise((resolve) => { onStartReachedInPromise.current = null; @@ -124,9 +129,7 @@ export const BidirectionalFlatList = (React.forwardRef( }; if (onEndReachedInPromise.current) { - onEndReachedInPromise.current.finally(() => { - onStartReachedInPromise.current = onStartReached().then(p); - }); + onEndReachedInPromise.current.then(onFinally, onFinally); } else { onStartReachedInPromise.current = onStartReached().then(p); } @@ -143,6 +146,11 @@ export const BidirectionalFlatList = (React.forwardRef( } setOnEndReachedInProgress(true); + + const onFinally = () => { + onEndReachedInPromise.current = onEndReached().then(p); + }; + const p = () => { return new Promise((resolve) => { onStartReachedInPromise.current = null; @@ -152,9 +160,7 @@ export const BidirectionalFlatList = (React.forwardRef( }; if (onStartReachedInPromise.current) { - onStartReachedInPromise.current.finally(() => { - onEndReachedInPromise.current = onEndReached().then(p); - }); + onStartReachedInPromise.current.then(onFinally, onFinally); } else { onEndReachedInPromise.current = onEndReached().then(p); }