Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
102 changes: 102 additions & 0 deletions examples/SampleApp/src/components/MessageInfoBottomSheet.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
import React, { useMemo } from 'react';
import BottomSheet, { BottomSheetFlatList } from '@gorhom/bottom-sheet';
import { BottomSheetView } from '@gorhom/bottom-sheet';
import {
Avatar,
useChatContext,
useMessageDeliveredData,
useMessageReadData,
useTheme,
} from 'stream-chat-react-native';
import { LocalMessage, UserResponse } from 'stream-chat';
import { StyleSheet, Text, View } from 'react-native';

const renderUserItem = ({ item }: { item: UserResponse }) => (
<View style={styles.userItem}>
<Avatar image={item.image} name={item.name ?? item.id} size={32} />
<Text style={styles.userName}>{item.name ?? item.id}</Text>
</View>
);

const renderEmptyText = ({ text }: { text: string }) => (
<Text style={styles.emptyText}>{text}</Text>
);

export const MessageInfoBottomSheet = ({
message,
ref,
}: {
message?: LocalMessage;
ref: React.RefObject<BottomSheet | null>;
}) => {
const {
theme: { colors },
} = useTheme();
const { client } = useChatContext();
const deliveredStatus = useMessageDeliveredData({ message });
const readStatus = useMessageReadData({ message });

const otherDeliveredToUsers = useMemo(() => {
return deliveredStatus.filter((user: UserResponse) => user.id !== client?.user?.id);
}, [deliveredStatus, client?.user?.id]);

const otherReadUsers = useMemo(() => {
return readStatus.filter((user: UserResponse) => user.id !== client?.user?.id);
}, [readStatus, client?.user?.id]);

return (
<BottomSheet enablePanDownToClose ref={ref} index={-1} snapPoints={['50%']}>
<BottomSheetView style={[styles.container, { backgroundColor: colors.white_smoke }]}>
<Text style={styles.title}>Read</Text>
<BottomSheetFlatList
data={otherReadUsers}
renderItem={renderUserItem}
keyExtractor={(item) => item.id}
style={styles.flatList}
ListEmptyComponent={renderEmptyText({ text: 'No one has read this message.' })}
/>
<Text style={styles.title}>Delivered</Text>
<BottomSheetFlatList
data={otherDeliveredToUsers}
renderItem={renderUserItem}
keyExtractor={(item) => item.id}
style={styles.flatList}
ListEmptyComponent={renderEmptyText({ text: 'The message was not delivered to anyone.' })}
/>
</BottomSheetView>
</BottomSheet>
);
};

const styles = StyleSheet.create({
container: {
flex: 1,
padding: 24,
justifyContent: 'center',
height: '100%',
},
title: {
fontSize: 16,
fontWeight: 'bold',
marginVertical: 8,
},
flatList: {
borderRadius: 16,
},
userItem: {
flexDirection: 'row',
alignItems: 'center',
padding: 8,
backgroundColor: 'white',
},
userName: {
fontSize: 16,
fontWeight: 'bold',
marginLeft: 16,
},
emptyText: {
fontSize: 16,
marginVertical: 16,
textAlign: 'center',
},
});
24 changes: 21 additions & 3 deletions examples/SampleApp/src/screens/ChannelScreen.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useCallback, useEffect, useState } from 'react';
import React, { useCallback, useEffect, useRef, useState } from 'react';
import type { LocalMessage, Channel as StreamChatChannel } from 'stream-chat';
import { RouteProp, useFocusEffect, useNavigation } from '@react-navigation/native';
import {
Expand Down Expand Up @@ -33,6 +33,8 @@ import { channelMessageActions } from '../utils/messageActions.tsx';
import { MessageLocation } from '../components/LocationSharing/MessageLocation.tsx';
import { useStreamChatContext } from '../context/StreamChatContext.tsx';
import { CustomAttachmentPickerSelectionBar } from '../components/AttachmentPickerSelectionBar.tsx';
import BottomSheet from '@gorhom/bottom-sheet';
import { MessageInfoBottomSheet } from '../components/MessageInfoBottomSheet.tsx';

export type ChannelScreenNavigationProp = NativeStackNavigationProp<
StackNavigatorParamList,
Expand Down Expand Up @@ -115,19 +117,20 @@ const ChannelHeader: React.FC<ChannelHeaderProps> = ({ channel }) => {

// Either provide channel or channelId.
export const ChannelScreen: React.FC<ChannelScreenProps> = ({
navigation,
route: {
params: { channel: channelFromProp, channelId, messageId },
},
}) => {
const { chatClient, messageListImplementation, messageListMode, messageListPruning } =
useAppContext();
const navigation = useNavigation();
const { bottom } = useSafeAreaInsets();
const {
theme: { colors },
} = useTheme();
const { t } = useTranslationContext();
const { setThread } = useStreamChatContext();
const [selectedMessage, setSelectedMessage] = useState<LocalMessage | undefined>(undefined);

const [channel, setChannel] = useState<StreamChatChannel | undefined>(channelFromProp);

Expand Down Expand Up @@ -170,6 +173,9 @@ export const ChannelScreen: React.FC<ChannelScreenProps> = ({

const onThreadSelect = useCallback(
(thread: LocalMessage | null) => {
if (!thread || !channel) {
return;
}
setSelectedThread(thread);
setThread(thread);
navigation.navigate('ThreadScreen', {
Expand All @@ -180,6 +186,16 @@ export const ChannelScreen: React.FC<ChannelScreenProps> = ({
[channel, navigation, setThread],
);

const messageInfoBottomSheetRef = useRef<BottomSheet>(null);

const handleMessageInfo = useCallback(
(message: LocalMessage) => {
setSelectedMessage(message);
messageInfoBottomSheetRef.current?.snapToIndex(1);
},
[messageInfoBottomSheetRef],
);

const messageActions = useCallback(
(params: MessageActionsParams) => {
if (!chatClient) {
Expand All @@ -190,9 +206,10 @@ export const ChannelScreen: React.FC<ChannelScreenProps> = ({
chatClient,
t,
colors,
handleMessageInfo,
});
},
[chatClient, colors, t],
[chatClient, colors, t, handleMessageInfo],
);

if (!channel || !chatClient) {
Expand Down Expand Up @@ -232,6 +249,7 @@ export const ChannelScreen: React.FC<ChannelScreenProps> = ({
)}
<AITypingIndicatorView channel={channel} />
<MessageInput />
<MessageInfoBottomSheet message={selectedMessage} ref={messageInfoBottomSheetRef} />
</Channel>
</View>
);
Expand Down
16 changes: 15 additions & 1 deletion examples/SampleApp/src/utils/messageActions.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
import React from 'react';
import { Alert } from 'react-native';
import { StreamChat } from 'stream-chat';
import { LocalMessage, StreamChat } from 'stream-chat';
import {
Colors,
Delete,
Eye,
messageActions,
MessageActionsParams,
Time,
Expand All @@ -15,11 +17,13 @@ export function channelMessageActions({
chatClient,
colors,
t,
handleMessageInfo,
}: {
params: MessageActionsParams;
chatClient: StreamChat;
t: TranslationContextValue['t'];
colors?: typeof Colors;
handleMessageInfo: (message: LocalMessage) => void;
}) {
const { dismissOverlay, deleteForMeMessage } = params;
const actions = messageActions(params);
Expand Down Expand Up @@ -111,5 +115,15 @@ export function channelMessageActions({
title: t('Delete for me'),
});

actions.push({
action: () => {
dismissOverlay();
handleMessageInfo(params.message);
},
actionType: 'messageInfo',
icon: <Eye height={24} width={24} pathFill={colors?.grey} />,
title: 'Message Info',
});

return actions;
}
6 changes: 3 additions & 3 deletions package/src/components/Message/Message.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -982,7 +982,7 @@ export const Message = (props: MessageProps) => {
const { openThread } = useThreadContext();
const { t } = useTranslationContext();
const readBy = useMessageReadData({ message });
const deliveredToCount = useMessageDeliveredData({ message });
const deliveredTo = useMessageDeliveredData({ message });
const { setQuotedMessage, setEditingState } = useMessageComposerAPIContext();

return (
Expand All @@ -991,13 +991,13 @@ export const Message = (props: MessageProps) => {
{...{
channel,
chatContext,
deliveredToCount,
deliveredToCount: deliveredTo.length,
dismissKeyboard,
enforceUniqueReaction,
members,
messagesContext,
openThread,
readBy,
readBy: readBy.length,
setEditingState,
setQuotedMessage,
t,
Expand Down
16 changes: 10 additions & 6 deletions package/src/components/Message/hooks/useMessageDeliveryData.ts
Original file line number Diff line number Diff line change
@@ -1,25 +1,29 @@
import { useCallback, useEffect, useState } from 'react';

import { Event, LocalMessage } from 'stream-chat';
import { Event, LocalMessage, UserResponse } from 'stream-chat';

import { useChannelContext } from '../../../contexts/channelContext/ChannelContext';
import { useChatContext } from '../../../contexts/chatContext/ChatContext';

export const useMessageDeliveredData = ({ message }: { message: LocalMessage }) => {
export const useMessageDeliveredData = ({ message }: { message?: LocalMessage }) => {
const { channel } = useChannelContext();
const { client } = useChatContext();
const calculate = useCallback(() => {
if (!message.created_at) {
return 0;
if (!message?.created_at) {
return [];
}
const messageRef = {
msgId: message.id,
timestampMs: new Date(message.created_at).getTime(),
};
return channel.messageReceiptsTracker.deliveredForMessage(messageRef).length;
return channel.messageReceiptsTracker.deliveredForMessage(messageRef);
}, [channel, message]);

const [deliveredToCount, setDeliveredToCount] = useState<number>(calculate());
const [deliveredToCount, setDeliveredToCount] = useState<UserResponse[]>([]);

useEffect(() => {
setDeliveredToCount(calculate());
}, [calculate]);

useEffect(() => {
const { unsubscribe } = channel.on('message.delivered', (event: Event) => {
Expand Down
16 changes: 10 additions & 6 deletions package/src/components/Message/hooks/useMessageReadData.ts
Original file line number Diff line number Diff line change
@@ -1,26 +1,30 @@
import { useCallback, useEffect, useState } from 'react';

import { Event, LocalMessage } from 'stream-chat';
import { Event, LocalMessage, UserResponse } from 'stream-chat';

import { useChannelContext } from '../../../contexts/channelContext/ChannelContext';
import { useChatContext } from '../../../contexts/chatContext/ChatContext';

export const useMessageReadData = ({ message }: { message: LocalMessage }) => {
export const useMessageReadData = ({ message }: { message?: LocalMessage }) => {
const { channel } = useChannelContext();
const { client } = useChatContext();
const calculate = useCallback(() => {
if (!message.created_at) {
return 0;
if (!message?.created_at) {
return [];
}
const messageRef = {
msgId: message.id,
timestampMs: new Date(message.created_at).getTime(),
};

return channel.messageReceiptsTracker.readersForMessage(messageRef).length;
return channel.messageReceiptsTracker.readersForMessage(messageRef);
}, [channel, message]);

const [readBy, setReadBy] = useState<number>(calculate());
const [readBy, setReadBy] = useState<UserResponse[]>([]);

useEffect(() => {
setReadBy(calculate());
}, [calculate]);

useEffect(() => {
const { unsubscribe } = channel.on('message.read', (event: Event) => {
Expand Down
3 changes: 3 additions & 0 deletions package/src/components/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ export * from './ChannelPreview/hooks/useChannelPreviewDisplayPresence';
export * from './ChannelPreview/hooks/useLatestMessagePreview';
export * from './ChannelPreview/hooks/useChannelPreviewData';
export * from './ChannelPreview/hooks/useIsChannelMuted';
export * from './ChannelPreview/hooks/useMessageDeliveryStatus';

export * from './Chat/Chat';
export * from './Chat/hooks/useCreateChatClient';
Expand Down Expand Up @@ -93,6 +94,8 @@ export * from './Message/hooks/useCreateMessageContext';
export * from './Message/hooks/useMessageActions';
export * from './Message/hooks/useMessageActionHandlers';
export * from './Message/hooks/useStreamingMessage';
export * from './Message/hooks/useMessageDeliveryData';
export * from './Message/hooks/useMessageReadData';
export * from './Message/Message';
export * from './Message/MessageSimple/MessageAvatar';
export * from './Message/MessageSimple/MessageBounce';
Expand Down
Loading