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
16 changes: 16 additions & 0 deletions package/src/components/Channel/Channel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,10 @@ import { MessageStatus as MessageStatusDefault } from '../Message/MessageSimple/
import { MessageSwipeContent as MessageSwipeContentDefault } from '../Message/MessageSimple/MessageSwipeContent';
import { MessageTimestamp as MessageTimestampDefault } from '../Message/MessageSimple/MessageTimestamp';
import { ReactionListBottom as ReactionListBottomDefault } from '../Message/MessageSimple/ReactionList/ReactionListBottom';
import { ReactionListClustered as ReactionListClusteredDefault } from '../Message/MessageSimple/ReactionList/ReactionListClustered';
import { ReactionListCountItem as ReactionListCountItemDefault } from '../Message/MessageSimple/ReactionList/ReactionListItem';
import { ReactionListItem as ReactionListItemDefault } from '../Message/MessageSimple/ReactionList/ReactionListItem';
import { ReactionListItemWrapper as ReactionListItemWrapperDefault } from '../Message/MessageSimple/ReactionList/ReactionListItemWrapper';
import { ReactionListTop as ReactionListTopDefault } from '../Message/MessageSimple/ReactionList/ReactionListTop';
import { StreamingMessageView as DefaultStreamingMessageView } from '../Message/MessageSimple/StreamingMessageView';
import { AttachmentUploadPreviewList as AttachmentUploadPreviewDefault } from '../MessageInput/components/AttachmentPreview/AttachmentUploadPreviewList';
Expand Down Expand Up @@ -393,6 +397,10 @@ export type ChannelPropsWithContext = Pick<ChannelContextValue, 'channel'> &
| 'reactionListPosition'
| 'reactionListType'
| 'ReactionListTop'
| 'ReactionListClustered'
| 'ReactionListItem'
| 'ReactionListItemWrapper'
| 'ReactionListCountItem'
| 'Reply'
| 'shouldShowUnreadUnderlay'
| 'ScrollToBottomButton'
Expand Down Expand Up @@ -722,6 +730,10 @@ const ChannelWithContext = (props: PropsWithChildren<ChannelPropsWithContext>) =
reactionListPosition = 'top',
reactionListType = 'clustered',
ReactionListTop = ReactionListTopDefault,
ReactionListClustered = ReactionListClusteredDefault,
ReactionListItem = ReactionListItemDefault,
ReactionListItemWrapper = ReactionListItemWrapperDefault,
ReactionListCountItem = ReactionListCountItemDefault,
Reply = ReplyDefault,
ScrollToBottomButton = ScrollToBottomButtonDefault,
selectReaction,
Expand Down Expand Up @@ -1978,6 +1990,10 @@ const ChannelWithContext = (props: PropsWithChildren<ChannelPropsWithContext>) =
reactionListPosition,
reactionListType,
ReactionListTop,
ReactionListClustered,
ReactionListItem,
ReactionListItemWrapper,
ReactionListCountItem,
removeMessage,
Reply,
retrySendMessage,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,10 @@ export const useCreateMessagesContext = ({
reactionListPosition,
reactionListType,
ReactionListTop,
ReactionListClustered,
ReactionListItem,
ReactionListItemWrapper,
ReactionListCountItem,
removeMessage,
Reply,
retrySendMessage,
Expand Down Expand Up @@ -207,6 +211,10 @@ export const useCreateMessagesContext = ({
reactionListPosition,
reactionListType,
ReactionListTop,
ReactionListClustered,
ReactionListItem,
ReactionListItemWrapper,
ReactionListCountItem,
removeMessage,
Reply,
retrySendMessage,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import React, { useMemo } from 'react';
import React, { useCallback, useMemo } from 'react';
import { FlatList, StyleSheet, View } from 'react-native';

import { ReactionListClustered } from './ReactionListClustered';
import { ReactionListItem, ReactionListItemProps } from './ReactionListItem';
import { ReactionListItemProps } from './ReactionListItem';

import {
MessageContextValue,
Expand All @@ -16,22 +15,6 @@ import { useTheme } from '../../../../contexts/themeContext/ThemeContext';

import { primitives } from '../../../../theme';

const renderItem = ({ index, item }: { index: number; item: ReactionListItemProps }) => (
<ReactionListItem
handleReaction={item.handleReaction}
key={index}
onLongPress={item.onLongPress}
onPress={item.onPress}
onPressIn={item.onPressIn}
preventPress={item.preventPress}
reaction={item.reaction}
showReactionsOverlay={item.showReactionsOverlay}
supportedReactions={item.supportedReactions}
selected={item.reaction.own}
showCount={item.showCount}
/>
);

export type ReactionListBottomProps = Partial<
Pick<
MessageContextValue,
Expand All @@ -46,7 +29,9 @@ export type ReactionListBottomProps = Partial<
| 'showReactionsOverlay'
>
> &
Partial<Pick<MessagesContextValue, 'supportedReactions'>> & {
Partial<
Pick<MessagesContextValue, 'supportedReactions' | 'ReactionListClustered' | 'ReactionListItem'>
> & {
type?: 'clustered' | 'segmented';
showCount?: boolean;
};
Expand All @@ -70,6 +55,8 @@ export const ReactionListBottom = (props: ReactionListBottomProps) => {
supportedReactions: propSupportedReactions,
type,
showCount = true,
ReactionListClustered: propReactionListClustered,
ReactionListItem: propReactionListItem,
} = props;

const {
Expand All @@ -84,7 +71,11 @@ export const ReactionListBottom = (props: ReactionListBottomProps) => {
showReactionsOverlay: contextShowReactionsOverlay,
} = useMessageContext();

const { supportedReactions: contextSupportedReactions } = useMessagesContext();
const {
supportedReactions: contextSupportedReactions,
ReactionListClustered: contextReactionListClustered,
ReactionListItem: contextReactionListItem,
} = useMessagesContext();

const alignment = propAlignment || contextAlignment;
const handleReaction = propHandlerReaction || contextHandleReaction;
Expand All @@ -96,6 +87,27 @@ export const ReactionListBottom = (props: ReactionListBottomProps) => {
const reactions = propReactions || contextReactions;
const showReactionsOverlay = propShowReactionsOverlay || contextShowReactionsOverlay;
const supportedReactions = propSupportedReactions || contextSupportedReactions;
const ReactionListClustered = propReactionListClustered || contextReactionListClustered;
const ReactionListItem = propReactionListItem || contextReactionListItem;

const renderItem = useCallback(
({ index, item }: { index: number; item: ReactionListItemProps }) => (
<ReactionListItem
handleReaction={item.handleReaction}
key={index}
onLongPress={item.onLongPress}
onPress={item.onPress}
onPressIn={item.onPressIn}
preventPress={item.preventPress}
reaction={item.reaction}
showReactionsOverlay={item.showReactionsOverlay}
supportedReactions={item.supportedReactions}
selected={item.reaction.own}
showCount={item.showCount}
/>
),
[ReactionListItem],
);

const styles = useStyles({ messageAlignment: alignment });
const supportedReactionTypes = supportedReactions?.map(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { Pressable, PressableProps, StyleProp, StyleSheet, View, ViewStyle } fro
import { useTheme } from '../../../../contexts/themeContext/ThemeContext';
import { primitives } from '../../../../theme';

type ReactionListItemWrapperProps = PressableProps & {
export type ReactionListItemWrapperProps = PressableProps & {
selected?: boolean;
style?: StyleProp<ViewStyle>;
};
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
import React, { useMemo } from 'react';
import { ScrollView, StyleSheet, View } from 'react-native';

import { ReactionListClustered } from './ReactionListClustered';

import { ReactionListCountItem, ReactionListItem } from './ReactionListItem';

import { useTheme } from '../../../../contexts';
import {
MessageContextValue,
Expand All @@ -29,12 +25,19 @@ export type ReactionListTopProps = Partial<
| 'reactions'
| 'showReactionsOverlay'
| 'handleReaction'
>
> &
Pick<MessagesContextValue, 'supportedReactions' | 'reactionListType'> & {
type?: 'clustered' | 'segmented';
showCount?: boolean;
};
> &
Pick<
MessagesContextValue,
| 'supportedReactions'
| 'reactionListType'
| 'ReactionListClustered'
| 'ReactionListItem'
| 'ReactionListCountItem'
>
> & {
type?: 'clustered' | 'segmented';
showCount?: boolean;
};

/**
* ReactionListTop - A high level component which implements all the logic required for a message reaction list
Expand All @@ -53,6 +56,9 @@ export const ReactionListTop = (props: ReactionListTopProps) => {
handleReaction: propHandleReaction,
type,
showCount = true,
ReactionListClustered: propReactionListClustered,
ReactionListItem: propReactionListItem,
ReactionListCountItem: propReactionListCountItem,
} = props;

const {
Expand All @@ -67,7 +73,12 @@ export const ReactionListTop = (props: ReactionListTopProps) => {
handleReaction: contextHandleReaction,
} = useMessageContext();

const { supportedReactions: contextSupportedReactions } = useMessagesContext();
const {
supportedReactions: contextSupportedReactions,
ReactionListClustered: contextReactionListClustered,
ReactionListItem: contextReactionListItem,
ReactionListCountItem: contextReactionListCountItem,
} = useMessagesContext();

const alignment = propAlignment || contextAlignment;
const hasReactions = propHasReactions || contextHasReactions;
Expand All @@ -79,6 +90,10 @@ export const ReactionListTop = (props: ReactionListTopProps) => {
const showReactionsOverlay = propShowReactionsOverlay || contextShowReactionsOverlay;
const supportedReactions = propSupportedReactions || contextSupportedReactions;
const handleReaction = propHandleReaction || contextHandleReaction;
const ReactionListClustered = propReactionListClustered || contextReactionListClustered;
const ReactionListItem = propReactionListItem || contextReactionListItem;
const ReactionListCountItem = propReactionListCountItem || contextReactionListCountItem;

const styles = useStyles({ alignment });

const supportedReactionTypes = supportedReactions?.map(
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 @@ -106,6 +106,9 @@ export * from './Message/MessageSimple/MessageTextContainer';
export * from './Message/MessageSimple/MessageTimestamp';
export * from './Message/MessageSimple/ReactionList/ReactionListBottom';
export * from './Message/MessageSimple/ReactionList/ReactionListTop';
export * from './Message/MessageSimple/ReactionList/ReactionListClustered';
export * from './Message/MessageSimple/ReactionList/ReactionListItem';
export * from './Message/MessageSimple/ReactionList/ReactionListItemWrapper';
export * from './Message/MessageSimple/utils/renderText';
export * from './Message/utils/messageActions';
export * from '../utils/removeReservedFields';
Expand Down
25 changes: 25 additions & 0 deletions package/src/contexts/messagesContext/MessagesContext.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,12 @@ import type { MessageStatusProps } from '../../components/Message/MessageSimple/
import type { MessageTextProps } from '../../components/Message/MessageSimple/MessageTextContainer';
import { MessageTimestampProps } from '../../components/Message/MessageSimple/MessageTimestamp';
import { ReactionListBottomProps } from '../../components/Message/MessageSimple/ReactionList/ReactionListBottom';
import { ReactionListClusteredProps } from '../../components/Message/MessageSimple/ReactionList/ReactionListClustered';
import {
ReactionListItemProps,
ReactionListCountItemProps,
} from '../../components/Message/MessageSimple/ReactionList/ReactionListItem';
import { ReactionListItemWrapperProps } from '../../components/Message/MessageSimple/ReactionList/ReactionListItemWrapper';
import type { ReactionListTopProps } from '../../components/Message/MessageSimple/ReactionList/ReactionListTop';
import type { MarkdownRules } from '../../components/Message/MessageSimple/utils/renderText';
import type { MessageActionsParams } from '../../components/Message/utils/messageActions';
Expand Down Expand Up @@ -608,6 +614,25 @@ export type MessagesContextValue = Pick<MessageContextValue, 'isMessageAIGenerat
*/
ReactionListTop?: React.ComponentType<ReactionListTopProps>;

/**
* UI component for ReactionListBottom
* Defaults to: [ReactionList](https://github.com/GetStream/stream-chat-react-native/blob/main/package/src/components/Reaction/ReactionList.tsx)
*/
ReactionListClustered: React.ComponentType<ReactionListClusteredProps>;
/**
* UI component for ReactionListSegmented
* Defaults to: [ReactionList](https://github.com/GetStream/stream-chat-react-native/blob/main/package/src/components/Reaction/ReactionList.tsx)
*/
ReactionListItem: React.ComponentType<ReactionListItemProps>;

/**
* UI component for ReactionListItemWrapper
* Defaults to: [ReactionListItemWrapper](https://github.com/GetStream/stream-chat-react-native/blob/main/package/src/components/Reaction/ReactionListItemWrapper.tsx)
*/
ReactionListItemWrapper: React.ComponentType<ReactionListItemWrapperProps>;

ReactionListCountItem: React.ComponentType<ReactionListCountItemProps>;

/**
* Full override of the reaction function on Message and Message Overlay
*
Expand Down
Loading