react-native-gifted-chat 2.7.1 → 2.7.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/Day/index.js +1 -1
- package/lib/Day/index.js.map +1 -1
- package/lib/MessageContainer/components/DayAnimated/index.js +7 -7
- package/lib/MessageContainer/components/DayAnimated/index.js.map +1 -1
- package/lib/MessageContainer/components/Item/index.d.ts +3 -3
- package/lib/MessageContainer/components/Item/index.js +47 -27
- package/lib/MessageContainer/components/Item/index.js.map +1 -1
- package/lib/MessageContainer/index.js +29 -33
- package/lib/MessageContainer/index.js.map +1 -1
- package/package.json +1 -1
- package/src/Day/index.tsx +1 -1
- package/src/MessageContainer/components/DayAnimated/index.tsx +7 -7
- package/src/MessageContainer/components/Item/index.tsx +60 -31
- package/src/MessageContainer/index.tsx +33 -31
package/lib/Day/index.js
CHANGED
|
@@ -19,7 +19,7 @@ export function Day({ dateFormat = DATE_FORMAT, dateFormatCalendar, createdAt, c
|
|
|
19
19
|
const date = dayjs(createdAt).locale(getLocale()).startOf('day');
|
|
20
20
|
if (!now.isSame(date, 'year'))
|
|
21
21
|
return date.format('D MMMM YYYY');
|
|
22
|
-
if (now.diff(date, 'days')
|
|
22
|
+
if (now.diff(date, 'days') < 1)
|
|
23
23
|
return date.calendar(now, {
|
|
24
24
|
sameDay: '[Today]',
|
|
25
25
|
...dateFormatCalendar,
|
package/lib/Day/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Day/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAC9B,OAAO,EACL,IAAI,EACJ,IAAI,GACL,MAAM,cAAc,CAAA;AACrB,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,YAAY,MAAM,2BAA2B,CAAA;AACpD,OAAO,QAAQ,MAAM,uBAAuB,CAAA;AAE5C,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AAGzC,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AACrD,OAAO,YAAY,MAAM,WAAW,CAAA;AACpC,OAAO,MAAM,MAAM,UAAU,CAAA;AAE7B,cAAc,SAAS,CAAA;AAEvB,KAAK,CAAC,MAAM,CAAC,YAAY,CAAC,CAAA;AAC1B,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;AAEtB,MAAM,UAAU,GAAG,CAAE,EACnB,UAAU,GAAG,WAAW,EACxB,kBAAkB,EAClB,SAAS,EACT,cAAc,EACd,YAAY,EACZ,SAAS,GACA;IACT,MAAM,EAAE,SAAS,EAAE,GAAG,cAAc,EAAE,CAAA;IAEtC,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE;QACjC,IAAI,SAAS,IAAI,IAAI;YACnB,OAAO,IAAI,CAAA;QAEb,MAAM,GAAG,GAAG,KAAK,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;QAClC,MAAM,IAAI,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;QAEhE,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC;YAC3B,OAAO,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAA;QAEnC,IAAI,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Day/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAC9B,OAAO,EACL,IAAI,EACJ,IAAI,GACL,MAAM,cAAc,CAAA;AACrB,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,YAAY,MAAM,2BAA2B,CAAA;AACpD,OAAO,QAAQ,MAAM,uBAAuB,CAAA;AAE5C,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AAGzC,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AACrD,OAAO,YAAY,MAAM,WAAW,CAAA;AACpC,OAAO,MAAM,MAAM,UAAU,CAAA;AAE7B,cAAc,SAAS,CAAA;AAEvB,KAAK,CAAC,MAAM,CAAC,YAAY,CAAC,CAAA;AAC1B,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;AAEtB,MAAM,UAAU,GAAG,CAAE,EACnB,UAAU,GAAG,WAAW,EACxB,kBAAkB,EAClB,SAAS,EACT,cAAc,EACd,YAAY,EACZ,SAAS,GACA;IACT,MAAM,EAAE,SAAS,EAAE,GAAG,cAAc,EAAE,CAAA;IAEtC,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE;QACjC,IAAI,SAAS,IAAI,IAAI;YACnB,OAAO,IAAI,CAAA;QAEb,MAAM,GAAG,GAAG,KAAK,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;QAClC,MAAM,IAAI,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;QAEhE,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC;YAC3B,OAAO,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAA;QAEnC,IAAI,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,GAAG,CAAC;YAC5B,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE;gBACxB,OAAO,EAAE,SAAS;gBAClB,GAAG,kBAAkB;aACtB,CAAC,CAAA;QAEJ,OAAO,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;IAChC,CAAC,EAAE,CAAC,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,kBAAkB,CAAC,CAAC,CAAA;IAE1D,IAAI,CAAC,OAAO;QACV,OAAO,IAAI,CAAA;IAEb,OAAO,CACL,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,YAAY,CAAC,WAAW,EAAE,MAAM,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC,CACxE;MAAA,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAC1C;QAAA,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CACpC;UAAA,CAAC,OAAO,CACV;QAAA,EAAE,IAAI,CACR;MAAA,EAAE,IAAI,CACR;IAAA,EAAE,IAAI,CAAC,CACR,CAAA;AACH,CAAC"}
|
|
@@ -2,7 +2,7 @@ import React, { useCallback, useEffect, useMemo, useState } from 'react';
|
|
|
2
2
|
import Animated, { interpolate, useAnimatedStyle, useDerivedValue, useSharedValue, useAnimatedReaction, withTiming, runOnJS } from 'react-native-reanimated';
|
|
3
3
|
import { Day } from '../../../Day';
|
|
4
4
|
import { isSameDay } from '../../../utils';
|
|
5
|
-
import {
|
|
5
|
+
import { useAbsoluteScrolledPositionToBottomOfDay, useRelativeScrolledPositionToBottomOfDay } from '../Item';
|
|
6
6
|
import stylesCommon from '../../../styles';
|
|
7
7
|
import styles from './styles';
|
|
8
8
|
export * from './types';
|
|
@@ -16,8 +16,8 @@ const DayAnimated = ({ scrolledY, daysPositions, listHeight, renderDay, messages
|
|
|
16
16
|
const [createdAt, setCreatedAt] = useState();
|
|
17
17
|
const dayTopOffset = useMemo(() => 10, []);
|
|
18
18
|
const dayBottomMargin = useMemo(() => 10, []);
|
|
19
|
-
const
|
|
20
|
-
const
|
|
19
|
+
const absoluteScrolledPositionToBottomOfDay = useAbsoluteScrolledPositionToBottomOfDay(listHeight, scrolledY, containerHeight, dayBottomMargin, dayTopOffset);
|
|
20
|
+
const relativeScrolledPositionToBottomOfDay = useRelativeScrolledPositionToBottomOfDay(listHeight, scrolledY, daysPositions, containerHeight, dayBottomMargin, dayTopOffset);
|
|
21
21
|
const messagesDates = useMemo(() => {
|
|
22
22
|
const messagesDates = [];
|
|
23
23
|
for (let i = 1; i < messages.length; i++) {
|
|
@@ -32,14 +32,14 @@ const DayAnimated = ({ scrolledY, daysPositions, listHeight, renderDay, messages
|
|
|
32
32
|
for (let i = 0; i < daysPositionsArray.value.length; i++) {
|
|
33
33
|
const day = daysPositionsArray.value[i];
|
|
34
34
|
const dayPosition = day.y + day.height - containerHeight.value - dayBottomMargin;
|
|
35
|
-
if (
|
|
35
|
+
if (absoluteScrolledPositionToBottomOfDay.value < dayPosition)
|
|
36
36
|
return day.createdAt;
|
|
37
37
|
}
|
|
38
38
|
return messagesDates[messagesDates.length - 1];
|
|
39
|
-
}, [daysPositionsArray,
|
|
39
|
+
}, [daysPositionsArray, absoluteScrolledPositionToBottomOfDay, messagesDates, containerHeight, dayBottomMargin]);
|
|
40
40
|
const style = useAnimatedStyle(() => ({
|
|
41
|
-
top: interpolate(
|
|
42
|
-
}), [
|
|
41
|
+
top: interpolate(relativeScrolledPositionToBottomOfDay.value, [-dayTopOffset, -0.0001, 0, isLoadingEarlierAnim.value ? 0 : containerHeight.value + dayTopOffset], [dayTopOffset, dayTopOffset, -containerHeight.value, isLoadingEarlierAnim.value ? -containerHeight.value : dayTopOffset], 'clamp'),
|
|
42
|
+
}), [relativeScrolledPositionToBottomOfDay, containerHeight, dayTopOffset, isLoadingEarlierAnim]);
|
|
43
43
|
const contentStyle = useAnimatedStyle(() => ({
|
|
44
44
|
opacity: opacity.value,
|
|
45
45
|
}), [opacity]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/MessageContainer/components/DayAnimated/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAExE,OAAO,QAAQ,EAAE,EAAE,WAAW,EAAE,gBAAgB,EAAE,eAAe,EAAE,cAAc,EAAE,mBAAmB,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAA;AAC5J,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAA;AAClC,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAC1C,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/MessageContainer/components/DayAnimated/index.tsx"],"names":[],"mappings":"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"}
|
|
@@ -2,14 +2,14 @@ import React from 'react';
|
|
|
2
2
|
import { DaysPositions } from '../../types';
|
|
3
3
|
import { ItemProps } from './types';
|
|
4
4
|
export * from './types';
|
|
5
|
-
export declare const
|
|
5
|
+
export declare const useAbsoluteScrolledPositionToBottomOfDay: (listHeight: {
|
|
6
6
|
value: number;
|
|
7
7
|
}, scrolledY: {
|
|
8
8
|
value: number;
|
|
9
9
|
}, containerHeight: {
|
|
10
10
|
value: number;
|
|
11
11
|
}, dayBottomMargin: number, dayTopOffset: number) => import("react-native-reanimated").DerivedValue<number>;
|
|
12
|
-
export declare const
|
|
12
|
+
export declare const useRelativeScrolledPositionToBottomOfDay: (listHeight: {
|
|
13
13
|
value: number;
|
|
14
14
|
}, scrolledY: {
|
|
15
15
|
value: number;
|
|
@@ -17,6 +17,6 @@ export declare const useTopOffset: (listHeight: {
|
|
|
17
17
|
value: DaysPositions;
|
|
18
18
|
}, containerHeight: {
|
|
19
19
|
value: number;
|
|
20
|
-
}, dayBottomMargin: number, dayTopOffset: number) => import("react-native-reanimated").DerivedValue<number>;
|
|
20
|
+
}, dayBottomMargin: number, dayTopOffset: number, createdAt?: number) => import("react-native-reanimated").DerivedValue<number>;
|
|
21
21
|
declare const Item: (props: ItemProps) => React.JSX.Element;
|
|
22
22
|
export default Item;
|
|
@@ -5,24 +5,35 @@ import Animated, { interpolate, useAnimatedStyle, useDerivedValue, useSharedValu
|
|
|
5
5
|
import { Day } from '../../../Day';
|
|
6
6
|
import { isSameDay } from '../../../utils';
|
|
7
7
|
export * from './types';
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
8
|
+
// y-position of current scroll position relative to the bottom of the day container. (since we have inverted list it is bottom)
|
|
9
|
+
export const useAbsoluteScrolledPositionToBottomOfDay = (listHeight, scrolledY, containerHeight, dayBottomMargin, dayTopOffset) => {
|
|
10
|
+
const absoluteScrolledPositionToBottomOfDay = useDerivedValue(() => listHeight.value + scrolledY.value - containerHeight.value - dayBottomMargin - dayTopOffset, [listHeight, scrolledY, containerHeight, dayBottomMargin, dayTopOffset]);
|
|
11
|
+
return absoluteScrolledPositionToBottomOfDay;
|
|
11
12
|
};
|
|
12
|
-
export const
|
|
13
|
-
const
|
|
13
|
+
export const useRelativeScrolledPositionToBottomOfDay = (listHeight, scrolledY, daysPositions, containerHeight, dayBottomMargin, dayTopOffset, createdAt) => {
|
|
14
|
+
const dayMarginTop = useMemo(() => 5, []);
|
|
15
|
+
const absoluteScrolledPositionToBottomOfDay = useAbsoluteScrolledPositionToBottomOfDay(listHeight, scrolledY, containerHeight, dayBottomMargin, dayTopOffset);
|
|
16
|
+
// sorted array of days positions by y
|
|
14
17
|
const daysPositionsArray = useDerivedValue(() => Object.values(daysPositions.value).sort((a, b) => a.y - b.y));
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
18
|
+
// find current day position by scrolled position
|
|
19
|
+
const currentDayPosition = useDerivedValue(() => {
|
|
20
|
+
if (createdAt != null) {
|
|
21
|
+
const currentDayPosition = daysPositionsArray.value.find(day => day.createdAt === createdAt);
|
|
22
|
+
if (currentDayPosition)
|
|
23
|
+
return currentDayPosition;
|
|
24
|
+
}
|
|
25
|
+
return daysPositionsArray.value.find((day, index) => {
|
|
26
|
+
const dayPosition = day.y + day.height;
|
|
27
|
+
return (absoluteScrolledPositionToBottomOfDay.value < dayPosition) || index === daysPositionsArray.value.length - 1;
|
|
28
|
+
});
|
|
29
|
+
}, [daysPositionsArray, absoluteScrolledPositionToBottomOfDay, createdAt]);
|
|
30
|
+
const relativeScrolledPositionToBottomOfDay = useDerivedValue(() => {
|
|
31
|
+
const scrolledBottomY = listHeight.value + scrolledY.value - ((currentDayPosition.value?.y ?? 0) +
|
|
32
|
+
(currentDayPosition.value?.height ?? 0) +
|
|
33
|
+
dayMarginTop);
|
|
34
|
+
return scrolledBottomY;
|
|
35
|
+
}, [listHeight, scrolledY, currentDayPosition, dayMarginTop]);
|
|
36
|
+
return relativeScrolledPositionToBottomOfDay;
|
|
26
37
|
};
|
|
27
38
|
const DayWrapper = forwardRef((props, ref) => {
|
|
28
39
|
const { renderDay: renderDayProp, currentMessage, previousMessage, } = props;
|
|
@@ -41,23 +52,32 @@ const DayWrapper = forwardRef((props, ref) => {
|
|
|
41
52
|
});
|
|
42
53
|
const Item = (props) => {
|
|
43
54
|
const { onRefDayWrapper, renderMessage: renderMessageProp, scrolledY, daysPositions, listHeight, ...rest } = props;
|
|
44
|
-
const
|
|
55
|
+
const dayContainerHeight = useSharedValue(0);
|
|
45
56
|
const dayTopOffset = useMemo(() => 10, []);
|
|
46
57
|
const dayBottomMargin = useMemo(() => 10, []);
|
|
47
|
-
const
|
|
48
|
-
const
|
|
49
|
-
|
|
50
|
-
|
|
58
|
+
const createdAt = useMemo(() => new Date(props.currentMessage.createdAt).getTime(), [props.currentMessage.createdAt]);
|
|
59
|
+
const relativeScrolledPositionToBottomOfDay = useRelativeScrolledPositionToBottomOfDay(listHeight, scrolledY, daysPositions, dayContainerHeight, dayBottomMargin, dayTopOffset, createdAt);
|
|
60
|
+
const handleLayoutDayContainer = useCallback(({ nativeEvent }) => {
|
|
61
|
+
dayContainerHeight.value = nativeEvent.layout.height;
|
|
62
|
+
}, [dayContainerHeight]);
|
|
51
63
|
const style = useAnimatedStyle(() => ({
|
|
52
|
-
opacity: interpolate(
|
|
53
|
-
|
|
64
|
+
opacity: interpolate(relativeScrolledPositionToBottomOfDay.value, [
|
|
65
|
+
-dayTopOffset,
|
|
66
|
+
-0.0001,
|
|
67
|
+
0,
|
|
68
|
+
dayContainerHeight.value + dayTopOffset,
|
|
69
|
+
], [
|
|
70
|
+
0,
|
|
71
|
+
0,
|
|
72
|
+
1,
|
|
73
|
+
1,
|
|
74
|
+
], 'clamp'),
|
|
75
|
+
}), [relativeScrolledPositionToBottomOfDay, dayContainerHeight, dayTopOffset]);
|
|
54
76
|
const handleRef = useCallback((ref) => {
|
|
55
|
-
onRefDayWrapper(ref, props.currentMessage._id, props.currentMessage.createdAt
|
|
56
|
-
? props.currentMessage.createdAt.getTime()
|
|
57
|
-
: props.currentMessage.createdAt);
|
|
77
|
+
onRefDayWrapper(ref, props.currentMessage._id, new Date(props.currentMessage.createdAt).getTime());
|
|
58
78
|
}, [onRefDayWrapper, props.currentMessage]);
|
|
59
79
|
return (<View key={props.currentMessage._id.toString()}>
|
|
60
|
-
<Animated.View style={style} onLayout={
|
|
80
|
+
<Animated.View style={style} onLayout={handleLayoutDayContainer}>
|
|
61
81
|
<DayWrapper {...rest} ref={handleRef}/>
|
|
62
82
|
</Animated.View>
|
|
63
83
|
{renderMessageProp
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/MessageContainer/components/Item/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,UAAU,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,OAAO,CAAA;AAC/D,OAAO,EAAqB,IAAI,EAAE,MAAM,cAAc,CAAA;AAEtD,OAAO,OAAyB,MAAM,kBAAkB,CAAA;AACxD,OAAO,QAAQ,EAAE,EAAE,WAAW,EAAE,gBAAgB,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAA;AAElH,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAA;AAClC,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAG1C,cAAc,SAAS,CAAA;AAEvB,MAAM,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/MessageContainer/components/Item/index.tsx"],"names":[],"mappings":"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"}
|
|
@@ -18,7 +18,6 @@ function MessageContainer(props) {
|
|
|
18
18
|
const scrollToBottomStyleAnim = useAnimatedStyle(() => ({
|
|
19
19
|
opacity: scrollToBottomOpacity.value,
|
|
20
20
|
}), [scrollToBottomOpacity]);
|
|
21
|
-
const [hasScrolled, setHasScrolled] = useState(false);
|
|
22
21
|
const daysPositions = useSharedValue({});
|
|
23
22
|
const listHeight = useSharedValue(0);
|
|
24
23
|
const scrolledY = useSharedValue(0);
|
|
@@ -54,48 +53,46 @@ function MessageContainer(props) {
|
|
|
54
53
|
handleOnScrollProp?.(event);
|
|
55
54
|
const { contentOffset: { y: contentOffsetY }, contentSize: { height: contentSizeHeight }, layoutMeasurement: { height: layoutMeasurementHeight }, } = event;
|
|
56
55
|
const duration = 250;
|
|
57
|
-
|
|
58
|
-
if (contentOffsetY > scrollToBottomOffset) {
|
|
59
|
-
setIsScrollToBottomVisible(true);
|
|
60
|
-
scrollToBottomOpacity.value = withTiming(1, { duration });
|
|
61
|
-
}
|
|
62
|
-
else {
|
|
63
|
-
scrollToBottomOpacity.value = withTiming(0, { duration }, isFinished => {
|
|
64
|
-
if (isFinished)
|
|
65
|
-
runOnJS(setIsScrollToBottomVisible)(false);
|
|
66
|
-
});
|
|
67
|
-
}
|
|
68
|
-
}
|
|
69
|
-
else if (contentOffsetY < scrollToBottomOffset &&
|
|
70
|
-
contentSizeHeight - layoutMeasurementHeight > scrollToBottomOffset) {
|
|
56
|
+
const makeScrollToBottomVisible = () => {
|
|
71
57
|
setIsScrollToBottomVisible(true);
|
|
72
58
|
scrollToBottomOpacity.value = withTiming(1, { duration });
|
|
73
|
-
}
|
|
74
|
-
|
|
59
|
+
};
|
|
60
|
+
const makeScrollToBottomHidden = () => {
|
|
75
61
|
scrollToBottomOpacity.value = withTiming(0, { duration }, isFinished => {
|
|
76
62
|
if (isFinished)
|
|
77
63
|
runOnJS(setIsScrollToBottomVisible)(false);
|
|
78
64
|
});
|
|
79
|
-
}
|
|
80
|
-
|
|
65
|
+
};
|
|
66
|
+
if (inverted)
|
|
67
|
+
if (contentOffsetY > scrollToBottomOffset)
|
|
68
|
+
makeScrollToBottomVisible();
|
|
69
|
+
else
|
|
70
|
+
makeScrollToBottomHidden();
|
|
71
|
+
else if (contentOffsetY < scrollToBottomOffset &&
|
|
72
|
+
contentSizeHeight - layoutMeasurementHeight > scrollToBottomOffset)
|
|
73
|
+
makeScrollToBottomVisible();
|
|
74
|
+
else
|
|
75
|
+
makeScrollToBottomHidden();
|
|
81
76
|
}, [handleOnScrollProp, inverted, scrollToBottomOffset, scrollToBottomOpacity]);
|
|
82
77
|
const handleLayoutDayWrapper = useCallback((ref, id, createdAt) => {
|
|
83
78
|
setTimeout(() => {
|
|
84
79
|
const itemLayout = forwardRef?.current?.recyclerlistview_unsafe?.getLayout(messages.findIndex(m => m._id === id));
|
|
85
|
-
if (ref && itemLayout)
|
|
86
|
-
daysPositions.value
|
|
87
|
-
|
|
88
|
-
|
|
80
|
+
if (ref && itemLayout)
|
|
81
|
+
daysPositions.modify(value => {
|
|
82
|
+
'worklet';
|
|
83
|
+
// @ts-expect-error: https://docs.swmansion.com/react-native-reanimated/docs/core/useSharedValue#remarks
|
|
84
|
+
value[id] = {
|
|
89
85
|
...itemLayout,
|
|
90
86
|
createdAt,
|
|
91
|
-
}
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
else if (daysPositions.value[id] != null)
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
87
|
+
};
|
|
88
|
+
return value;
|
|
89
|
+
});
|
|
90
|
+
else if (daysPositions.value[id] != null)
|
|
91
|
+
daysPositions.modify(value => {
|
|
92
|
+
'worklet';
|
|
93
|
+
delete value[id];
|
|
94
|
+
return value;
|
|
95
|
+
});
|
|
99
96
|
}, 100);
|
|
100
97
|
}, [messages, daysPositions, forwardRef]);
|
|
101
98
|
const renderItem = useCallback(({ item, index }) => {
|
|
@@ -171,13 +168,12 @@ function MessageContainer(props) {
|
|
|
171
168
|
}, [inverted, messages, doScrollToBottom, listHeight, listViewProps]);
|
|
172
169
|
const onEndReached = useCallback(() => {
|
|
173
170
|
if (infiniteScroll &&
|
|
174
|
-
hasScrolled &&
|
|
175
171
|
loadEarlier &&
|
|
176
172
|
onLoadEarlier &&
|
|
177
173
|
!isLoadingEarlier &&
|
|
178
174
|
Platform.OS !== 'web')
|
|
179
175
|
onLoadEarlier();
|
|
180
|
-
}, [
|
|
176
|
+
}, [infiniteScroll, loadEarlier, onLoadEarlier, isLoadingEarlier]);
|
|
181
177
|
const keyExtractor = useCallback((item) => item._id.toString(), []);
|
|
182
178
|
const scrollHandler = useAnimatedScrollHandler({
|
|
183
179
|
onScroll: event => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/MessageContainer/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,WAAW,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAC7D,OAAO,EACL,IAAI,EACJ,gBAAgB,EAChB,IAAI,EACJ,QAAQ,GAET,MAAM,cAAc,CAAA;AACrB,OAAO,EAAE,SAAS,EAAsB,MAAM,qBAAqB,CAAA;AACnE,OAAO,QAAQ,EAAE,EAAE,OAAO,EAAE,wBAAwB,EAAE,gBAAgB,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AAEnI,OAAO,WAAW,MAAM,0BAA0B,CAAA;AAClD,OAAO,IAAI,MAAM,mBAAmB,CAAA;AAEpC,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAE5C,OAAO,eAAe,MAAM,oBAAoB,CAAA;AAIhD,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AACpC,OAAO,YAAY,MAAM,WAAW,CAAA;AACpC,OAAO,MAAM,MAAM,UAAU,CAAA;AAE7B,cAAc,SAAS,CAAA;AAEvB,MAAM,iBAAiB,GAAG,QAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAA;AAErE,SAAS,gBAAgB,CAAwC,KAAsC;IACrG,MAAM,EACJ,QAAQ,GAAG,EAAE,EACb,IAAI,EACJ,QAAQ,GAAG,KAAK,EAChB,eAAe,EAAE,mBAAmB,EACpC,aAAa,EACb,QAAQ,GAAG,IAAI,EACf,WAAW,GAAG,KAAK,EACnB,aAAa,EACb,yBAAyB,EACzB,SAAS,GAAG,IAAI,EAChB,uBAAuB,GAAG,KAAK,EAC/B,oBAAoB,GAAG,GAAG,EAC1B,QAAQ,GAAG,KAAK,EAChB,mBAAmB,EACnB,cAAc,GAAG,KAAK,EACtB,gBAAgB,GAAG,KAAK,EACxB,qBAAqB,EAAE,yBAAyB,EAChD,YAAY,EAAE,gBAAgB,EAC9B,iBAAiB,EAAE,qBAAqB,EACxC,UAAU,EACV,cAAc,EAAE,kBAAkB,EAClC,uBAAuB,EAAE,2BAA2B,GACrD,GAAG,KAAK,CAAA;IAET,MAAM,qBAAqB,GAAG,cAAc,CAAC,CAAC,CAAC,CAAA;IAC/C,MAAM,CAAC,uBAAuB,EAAE,0BAA0B,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAA;IAC7E,MAAM,uBAAuB,GAAG,gBAAgB,CAAC,GAAG,EAAE,CAAC,CAAC;QACtD,OAAO,EAAE,qBAAqB,CAAC,KAAK;KACrC,CAAC,EAAE,CAAC,qBAAqB,CAAC,CAAC,CAAA;IAE5B,MAAM,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/MessageContainer/index.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/Day/index.tsx
CHANGED
|
@@ -3,7 +3,7 @@ import { LayoutChangeEvent } from 'react-native'
|
|
|
3
3
|
import Animated, { interpolate, useAnimatedStyle, useDerivedValue, useSharedValue, useAnimatedReaction, withTiming, runOnJS } from 'react-native-reanimated'
|
|
4
4
|
import { Day } from '../../../Day'
|
|
5
5
|
import { isSameDay } from '../../../utils'
|
|
6
|
-
import {
|
|
6
|
+
import { useAbsoluteScrolledPositionToBottomOfDay, useRelativeScrolledPositionToBottomOfDay } from '../Item'
|
|
7
7
|
import { DayAnimatedProps } from './types'
|
|
8
8
|
|
|
9
9
|
import stylesCommon from '../../../styles'
|
|
@@ -25,8 +25,8 @@ const DayAnimated = ({ scrolledY, daysPositions, listHeight, renderDay, messages
|
|
|
25
25
|
|
|
26
26
|
const dayTopOffset = useMemo(() => 10, [])
|
|
27
27
|
const dayBottomMargin = useMemo(() => 10, [])
|
|
28
|
-
const
|
|
29
|
-
const
|
|
28
|
+
const absoluteScrolledPositionToBottomOfDay = useAbsoluteScrolledPositionToBottomOfDay(listHeight, scrolledY, containerHeight, dayBottomMargin, dayTopOffset)
|
|
29
|
+
const relativeScrolledPositionToBottomOfDay = useRelativeScrolledPositionToBottomOfDay(listHeight, scrolledY, daysPositions, containerHeight, dayBottomMargin, dayTopOffset)
|
|
30
30
|
|
|
31
31
|
const messagesDates = useMemo(() => {
|
|
32
32
|
const messagesDates: number[] = []
|
|
@@ -47,21 +47,21 @@ const DayAnimated = ({ scrolledY, daysPositions, listHeight, renderDay, messages
|
|
|
47
47
|
const day = daysPositionsArray.value[i]
|
|
48
48
|
const dayPosition = day.y + day.height - containerHeight.value - dayBottomMargin
|
|
49
49
|
|
|
50
|
-
if (
|
|
50
|
+
if (absoluteScrolledPositionToBottomOfDay.value < dayPosition)
|
|
51
51
|
return day.createdAt
|
|
52
52
|
}
|
|
53
53
|
|
|
54
54
|
return messagesDates[messagesDates.length - 1]
|
|
55
|
-
}, [daysPositionsArray,
|
|
55
|
+
}, [daysPositionsArray, absoluteScrolledPositionToBottomOfDay, messagesDates, containerHeight, dayBottomMargin])
|
|
56
56
|
|
|
57
57
|
const style = useAnimatedStyle(() => ({
|
|
58
58
|
top: interpolate(
|
|
59
|
-
|
|
59
|
+
relativeScrolledPositionToBottomOfDay.value,
|
|
60
60
|
[-dayTopOffset, -0.0001, 0, isLoadingEarlierAnim.value ? 0 : containerHeight.value + dayTopOffset],
|
|
61
61
|
[dayTopOffset, dayTopOffset, -containerHeight.value, isLoadingEarlierAnim.value ? -containerHeight.value : dayTopOffset],
|
|
62
62
|
'clamp'
|
|
63
63
|
),
|
|
64
|
-
}), [
|
|
64
|
+
}), [relativeScrolledPositionToBottomOfDay, containerHeight, dayTopOffset, isLoadingEarlierAnim])
|
|
65
65
|
|
|
66
66
|
const contentStyle = useAnimatedStyle(() => ({
|
|
67
67
|
opacity: opacity.value,
|
|
@@ -10,43 +10,56 @@ import { ItemProps } from './types'
|
|
|
10
10
|
|
|
11
11
|
export * from './types'
|
|
12
12
|
|
|
13
|
-
|
|
14
|
-
|
|
13
|
+
// y-position of current scroll position relative to the bottom of the day container. (since we have inverted list it is bottom)
|
|
14
|
+
export const useAbsoluteScrolledPositionToBottomOfDay = (listHeight: { value: number }, scrolledY: { value: number }, containerHeight: { value: number }, dayBottomMargin: number, dayTopOffset: number) => {
|
|
15
|
+
const absoluteScrolledPositionToBottomOfDay = useDerivedValue(() =>
|
|
15
16
|
listHeight.value + scrolledY.value - containerHeight.value - dayBottomMargin - dayTopOffset
|
|
16
17
|
, [listHeight, scrolledY, containerHeight, dayBottomMargin, dayTopOffset])
|
|
17
18
|
|
|
18
|
-
return
|
|
19
|
+
return absoluteScrolledPositionToBottomOfDay
|
|
19
20
|
}
|
|
20
21
|
|
|
21
|
-
export const
|
|
22
|
+
export const useRelativeScrolledPositionToBottomOfDay = (
|
|
22
23
|
listHeight: { value: number },
|
|
23
24
|
scrolledY: { value: number },
|
|
24
25
|
daysPositions: { value: DaysPositions },
|
|
25
26
|
containerHeight: { value: number },
|
|
26
27
|
dayBottomMargin: number,
|
|
27
|
-
dayTopOffset: number
|
|
28
|
+
dayTopOffset: number,
|
|
29
|
+
createdAt?: number
|
|
28
30
|
) => {
|
|
29
|
-
const
|
|
31
|
+
const dayMarginTop = useMemo(() => 5, [])
|
|
30
32
|
|
|
33
|
+
const absoluteScrolledPositionToBottomOfDay = useAbsoluteScrolledPositionToBottomOfDay(listHeight, scrolledY, containerHeight, dayBottomMargin, dayTopOffset)
|
|
34
|
+
|
|
35
|
+
// sorted array of days positions by y
|
|
31
36
|
const daysPositionsArray = useDerivedValue(() => Object.values(daysPositions.value).sort((a, b) => a.y - b.y))
|
|
32
37
|
|
|
33
|
-
|
|
34
|
-
|
|
38
|
+
// find current day position by scrolled position
|
|
39
|
+
const currentDayPosition = useDerivedValue(() => {
|
|
40
|
+
if (createdAt != null) {
|
|
41
|
+
const currentDayPosition = daysPositionsArray.value.find(day => day.createdAt === createdAt)
|
|
42
|
+
if (currentDayPosition)
|
|
43
|
+
return currentDayPosition
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
return daysPositionsArray.value.find((day, index) => {
|
|
35
47
|
const dayPosition = day.y + day.height
|
|
36
|
-
return (
|
|
48
|
+
return (absoluteScrolledPositionToBottomOfDay.value < dayPosition) || index === daysPositionsArray.value.length - 1
|
|
37
49
|
})
|
|
38
|
-
, [daysPositionsArray,
|
|
39
|
-
|
|
40
|
-
const topOffset = useDerivedValue(() => {
|
|
41
|
-
const scrolledBottomY = listHeight.value + scrolledY.value - (currentDayPosition.value?.height ?? 0) - 5 // 5 is marginTop in Day component.
|
|
42
|
-
const dateBottomY = currentDayPosition.value?.y ?? 0
|
|
50
|
+
}, [daysPositionsArray, absoluteScrolledPositionToBottomOfDay, createdAt])
|
|
43
51
|
|
|
44
|
-
|
|
52
|
+
const relativeScrolledPositionToBottomOfDay = useDerivedValue(() => {
|
|
53
|
+
const scrolledBottomY = listHeight.value + scrolledY.value - (
|
|
54
|
+
(currentDayPosition.value?.y ?? 0) +
|
|
55
|
+
(currentDayPosition.value?.height ?? 0) +
|
|
56
|
+
dayMarginTop
|
|
57
|
+
)
|
|
45
58
|
|
|
46
|
-
return
|
|
47
|
-
}, [listHeight, scrolledY, currentDayPosition])
|
|
59
|
+
return scrolledBottomY
|
|
60
|
+
}, [listHeight, scrolledY, currentDayPosition, dayMarginTop])
|
|
48
61
|
|
|
49
|
-
return
|
|
62
|
+
return relativeScrolledPositionToBottomOfDay
|
|
50
63
|
}
|
|
51
64
|
|
|
52
65
|
const DayWrapper = forwardRef<View, MessageProps<IMessage>>((props, ref) => {
|
|
@@ -88,37 +101,53 @@ const Item = (props: ItemProps) => {
|
|
|
88
101
|
...rest
|
|
89
102
|
} = props
|
|
90
103
|
|
|
91
|
-
const
|
|
104
|
+
const dayContainerHeight = useSharedValue(0)
|
|
92
105
|
const dayTopOffset = useMemo(() => 10, [])
|
|
93
106
|
const dayBottomMargin = useMemo(() => 10, [])
|
|
94
|
-
const topOffset = useTopOffset(listHeight, scrolledY, daysPositions, containerHeight, dayBottomMargin, dayTopOffset)
|
|
95
107
|
|
|
96
|
-
const
|
|
97
|
-
|
|
98
|
-
|
|
108
|
+
const createdAt = useMemo(() =>
|
|
109
|
+
new Date(props.currentMessage.createdAt).getTime()
|
|
110
|
+
, [props.currentMessage.createdAt])
|
|
111
|
+
|
|
112
|
+
const relativeScrolledPositionToBottomOfDay = useRelativeScrolledPositionToBottomOfDay(listHeight, scrolledY, daysPositions, dayContainerHeight, dayBottomMargin, dayTopOffset, createdAt)
|
|
113
|
+
|
|
114
|
+
const handleLayoutDayContainer = useCallback(({ nativeEvent }: LayoutChangeEvent) => {
|
|
115
|
+
dayContainerHeight.value = nativeEvent.layout.height
|
|
116
|
+
}, [dayContainerHeight])
|
|
99
117
|
|
|
100
118
|
const style = useAnimatedStyle(() => ({
|
|
101
119
|
opacity: interpolate(
|
|
102
|
-
|
|
103
|
-
[
|
|
104
|
-
|
|
120
|
+
relativeScrolledPositionToBottomOfDay.value,
|
|
121
|
+
[
|
|
122
|
+
-dayTopOffset,
|
|
123
|
+
-0.0001,
|
|
124
|
+
0,
|
|
125
|
+
dayContainerHeight.value + dayTopOffset,
|
|
126
|
+
],
|
|
127
|
+
[
|
|
128
|
+
0,
|
|
129
|
+
0,
|
|
130
|
+
1,
|
|
131
|
+
1,
|
|
132
|
+
],
|
|
105
133
|
'clamp'
|
|
106
134
|
),
|
|
107
|
-
}), [
|
|
135
|
+
}), [relativeScrolledPositionToBottomOfDay, dayContainerHeight, dayTopOffset])
|
|
108
136
|
|
|
109
137
|
const handleRef = useCallback((ref: unknown) => {
|
|
110
138
|
onRefDayWrapper(
|
|
111
139
|
ref,
|
|
112
140
|
props.currentMessage._id,
|
|
113
|
-
props.currentMessage.createdAt
|
|
114
|
-
? props.currentMessage.createdAt.getTime()
|
|
115
|
-
: props.currentMessage.createdAt
|
|
141
|
+
new Date(props.currentMessage.createdAt).getTime()
|
|
116
142
|
)
|
|
117
143
|
}, [onRefDayWrapper, props.currentMessage])
|
|
118
144
|
|
|
119
145
|
return (
|
|
120
146
|
<View key={props.currentMessage._id.toString()}>
|
|
121
|
-
<Animated.View
|
|
147
|
+
<Animated.View
|
|
148
|
+
style={style}
|
|
149
|
+
onLayout={handleLayoutDayContainer}
|
|
150
|
+
>
|
|
122
151
|
<DayWrapper
|
|
123
152
|
{...rest as MessageProps<IMessage>}
|
|
124
153
|
ref={handleRef}
|
|
@@ -58,8 +58,6 @@ function MessageContainer<TMessage extends IMessage = IMessage> (props: MessageC
|
|
|
58
58
|
opacity: scrollToBottomOpacity.value,
|
|
59
59
|
}), [scrollToBottomOpacity])
|
|
60
60
|
|
|
61
|
-
const [hasScrolled, setHasScrolled] = useState(false)
|
|
62
|
-
|
|
63
61
|
const daysPositions = useSharedValue<DaysPositions>({})
|
|
64
62
|
const listHeight = useSharedValue(0)
|
|
65
63
|
const scrolledY = useSharedValue(0)
|
|
@@ -112,49 +110,54 @@ function MessageContainer<TMessage extends IMessage = IMessage> (props: MessageC
|
|
|
112
110
|
|
|
113
111
|
const duration = 250
|
|
114
112
|
|
|
115
|
-
|
|
116
|
-
if (contentOffsetY > scrollToBottomOffset!) {
|
|
117
|
-
setIsScrollToBottomVisible(true)
|
|
118
|
-
scrollToBottomOpacity.value = withTiming(1, { duration })
|
|
119
|
-
} else {
|
|
120
|
-
scrollToBottomOpacity.value = withTiming(0, { duration }, isFinished => {
|
|
121
|
-
if (isFinished)
|
|
122
|
-
runOnJS(setIsScrollToBottomVisible)(false)
|
|
123
|
-
})
|
|
124
|
-
}
|
|
125
|
-
} else if (
|
|
126
|
-
contentOffsetY < scrollToBottomOffset! &&
|
|
127
|
-
contentSizeHeight - layoutMeasurementHeight > scrollToBottomOffset!
|
|
128
|
-
) {
|
|
113
|
+
const makeScrollToBottomVisible = () => {
|
|
129
114
|
setIsScrollToBottomVisible(true)
|
|
130
115
|
scrollToBottomOpacity.value = withTiming(1, { duration })
|
|
131
|
-
}
|
|
116
|
+
}
|
|
117
|
+
|
|
118
|
+
const makeScrollToBottomHidden = () => {
|
|
132
119
|
scrollToBottomOpacity.value = withTiming(0, { duration }, isFinished => {
|
|
133
120
|
if (isFinished)
|
|
134
121
|
runOnJS(setIsScrollToBottomVisible)(false)
|
|
135
122
|
})
|
|
136
123
|
}
|
|
137
124
|
|
|
138
|
-
|
|
125
|
+
if (inverted)
|
|
126
|
+
if (contentOffsetY > scrollToBottomOffset!)
|
|
127
|
+
makeScrollToBottomVisible()
|
|
128
|
+
else
|
|
129
|
+
makeScrollToBottomHidden()
|
|
130
|
+
else if (
|
|
131
|
+
contentOffsetY < scrollToBottomOffset! &&
|
|
132
|
+
contentSizeHeight - layoutMeasurementHeight > scrollToBottomOffset!
|
|
133
|
+
)
|
|
134
|
+
makeScrollToBottomVisible()
|
|
135
|
+
else
|
|
136
|
+
makeScrollToBottomHidden()
|
|
139
137
|
}, [handleOnScrollProp, inverted, scrollToBottomOffset, scrollToBottomOpacity])
|
|
140
138
|
|
|
141
139
|
const handleLayoutDayWrapper = useCallback((ref: unknown, id: string | number, createdAt: number) => {
|
|
142
140
|
setTimeout(() => { // do not delete "setTimeout". It's necessary for get correct layout.
|
|
143
141
|
const itemLayout = forwardRef?.current?.recyclerlistview_unsafe?.getLayout(messages.findIndex(m => m._id === id))
|
|
144
142
|
|
|
145
|
-
if (ref && itemLayout)
|
|
146
|
-
daysPositions.value
|
|
147
|
-
|
|
148
|
-
|
|
143
|
+
if (ref && itemLayout)
|
|
144
|
+
daysPositions.modify(value => {
|
|
145
|
+
'worklet'
|
|
146
|
+
|
|
147
|
+
// @ts-expect-error: https://docs.swmansion.com/react-native-reanimated/docs/core/useSharedValue#remarks
|
|
148
|
+
value[id] = {
|
|
149
149
|
...itemLayout,
|
|
150
150
|
createdAt,
|
|
151
|
-
}
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
151
|
+
}
|
|
152
|
+
return value
|
|
153
|
+
})
|
|
154
|
+
else if (daysPositions.value[id] != null)
|
|
155
|
+
daysPositions.modify(value => {
|
|
156
|
+
'worklet'
|
|
157
|
+
|
|
158
|
+
delete value[id]
|
|
159
|
+
return value
|
|
160
|
+
})
|
|
158
161
|
}, 100)
|
|
159
162
|
}, [messages, daysPositions, forwardRef])
|
|
160
163
|
|
|
@@ -275,14 +278,13 @@ function MessageContainer<TMessage extends IMessage = IMessage> (props: MessageC
|
|
|
275
278
|
const onEndReached = useCallback(() => {
|
|
276
279
|
if (
|
|
277
280
|
infiniteScroll &&
|
|
278
|
-
hasScrolled &&
|
|
279
281
|
loadEarlier &&
|
|
280
282
|
onLoadEarlier &&
|
|
281
283
|
!isLoadingEarlier &&
|
|
282
284
|
Platform.OS !== 'web'
|
|
283
285
|
)
|
|
284
286
|
onLoadEarlier()
|
|
285
|
-
}, [
|
|
287
|
+
}, [infiniteScroll, loadEarlier, onLoadEarlier, isLoadingEarlier])
|
|
286
288
|
|
|
287
289
|
const keyExtractor = useCallback((item: unknown) => (item as TMessage)._id.toString(), [])
|
|
288
290
|
|