Skip to content

Bugfix/v3/fix date separator with render props of channel #147

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

Merged
merged 2 commits into from
May 19, 2022
Merged

Bugfix/v3/fix date separator with render props of channel #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf7ed97
Fix typo: Separator
HoonBaek May 18, 2022
6dc510d
Use memorization for renderCustomSeparator and contain it with round …
HoonBaek May 18, 2022
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
6 changes: 3 additions & 3 deletions src/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -609,7 +609,7 @@ interface ChannelUIProps {
renderMessage?: (props: RenderMessageProps) => React.ComponentType;
renderMessageInput?: () => React.ReactNode;
renderTypingIndicator?: () => React.ReactNode;
renderCustomSeperator?: () => React.ReactNode;
renderCustomSeparator?: () => React.ReactNode;
}

type CoreMessageType = Sendbird.AdminMessage | Sendbird.UserMessage | Sendbird.FileMessage;
Expand Down Expand Up @@ -659,15 +659,15 @@ type MessageUIProps = {
handleScroll: () => void;
// for extending
renderMessage?: (props: RenderMessageProps) => React.ReactNode;
renderCustomSeperator?: () => React.ReactNode;
renderCustomSeparator?: () => React.ReactNode;
renderEditInput?: () => React.ReactNode;
renderMessageContent?: () => React.ReactNode;
};

type MessageListProps = {
renderMessage?: (props: RenderMessageProps) => React.ReactNode;
renderPlaceholderEmpty?: () => React.ReactNode;
renderCustomSeperator?: () => React.ReactNode;
renderCustomSeparator?: () => React.ReactNode;
};

type SuggestedMentionListProps = {
Expand Down
6 changes: 3 additions & 3 deletions src/smart-components/Channel/components/ChannelUI/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export interface ChannelUIProps {
renderMessage?: (props: RenderMessageProps) => React.ReactNode;
renderMessageInput?: () => React.ReactNode;
renderTypingIndicator?: () => React.ReactNode;
renderCustomSeperator?: () => React.ReactNode;
renderCustomSeparator?: () => React.ReactNode;
}

const ChannelUI: React.FC<ChannelUIProps> = ({
Expand All @@ -34,7 +34,7 @@ const ChannelUI: React.FC<ChannelUIProps> = ({
renderMessage,
renderMessageInput,
renderTypingIndicator,
renderCustomSeperator,
renderCustomSeparator,
}: ChannelUIProps) => {
const {
currentGroupChannel,
Expand Down Expand Up @@ -143,7 +143,7 @@ const ChannelUI: React.FC<ChannelUIProps> = ({
<MessageList
renderMessage={renderMessage}
renderPlaceholderEmpty={renderPlaceholderEmpty}
renderCustomSeperator={renderCustomSeperator}
renderCustomSeparator={renderCustomSeparator}
/>
)
}
Expand Down
16 changes: 11 additions & 5 deletions src/smart-components/Channel/components/Message/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ type MessageUIProps = {
handleScroll: () => void;
// for extending
renderMessage?: (props: RenderMessageProps) => React.ReactNode;
renderCustomSeperator?: () => React.ReactNode;
renderCustomSeparator?: () => React.ReactNode;
renderEditInput?: () => React.ReactNode;
renderMessageContent?: () => React.ReactNode;
};
Expand All @@ -44,7 +44,7 @@ const Message: React.FC<MessageUIProps> = (props: MessageUIProps) => {
chainTop,
chainBottom,
handleScroll,
renderCustomSeperator,
renderCustomSeparator,
renderEditInput,
renderMessage,
renderMessageContent,
Expand Down Expand Up @@ -160,6 +160,12 @@ const Message: React.FC<MessageUIProps> = (props: MessageUIProps) => {
chainBottom,
});
}, [message, renderMessage]);
const renderedCustomSeparator = useMemo(() => {
if (renderCustomSeparator) {
return renderCustomSeparator?.();
}
return null;
}, [message, renderCustomSeparator]);

if (renderedMessage) {
return (
Expand All @@ -174,15 +180,15 @@ const Message: React.FC<MessageUIProps> = (props: MessageUIProps) => {
{/* date-separator */}
{
// TODO: Add message instance as a function parameter
hasSeparator && renderCustomSeperator?.() || (
hasSeparator && (renderedCustomSeparator || (
<DateSeparator>
<Label type={LabelTypography.CAPTION_2} color={LabelColors.ONBACKGROUND_2}>
{format(message.createdAt, 'MMMM dd, yyyy', {
locale: dateLocale,
})}
</Label>
</DateSeparator>
)
))
}
{renderedMessage}
</div>
Expand Down Expand Up @@ -273,7 +279,7 @@ const Message: React.FC<MessageUIProps> = (props: MessageUIProps) => {
>
{/* date-separator */}
{
hasSeparator && (renderCustomSeperator?.() || (
hasSeparator && (renderedCustomSeparator || (
<DateSeparator>
<Label type={LabelTypography.CAPTION_2} color={LabelColors.ONBACKGROUND_2}>
{format(message.createdAt, 'MMMM dd, yyyy', {
Expand Down
6 changes: 3 additions & 3 deletions src/smart-components/Channel/components/MessageList/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import uuidv4 from '../../../../utils/uuid';
export type MessageListProps = {
renderMessage?: (props: RenderMessageProps) => React.ReactNode;
renderPlaceholderEmpty?: () => React.ReactNode;
renderCustomSeperator?: () => React.ReactNode;
renderCustomSeparator?: () => React.ReactNode;
};

const SCROLL_REF_CLASS_NAME = '.sendbird-msg--scroll-ref';
Expand All @@ -24,7 +24,7 @@ const MessageList: React.FC<MessageListProps> = (props: MessageListProps) => {
const {
renderMessage,
renderPlaceholderEmpty,
renderCustomSeperator,
renderCustomSeparator,
} = props;
const {
allMessages,
Expand Down Expand Up @@ -143,7 +143,7 @@ const MessageList: React.FC<MessageListProps> = (props: MessageListProps) => {
hasSeparator={hasSeparator}
chainTop={chainTop}
chainBottom={chainBottom}
renderCustomSeperator={renderCustomSeperator}
renderCustomSeparator={renderCustomSeparator}
key={m.messageId + uuidv4()}
/>
);
Expand Down
2 changes: 1 addition & 1 deletion src/smart-components/Channel/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ const Channel: React.FC<ChannelProps> = (props: ChannelProps) => {
renderMessage={props?.renderMessage}
renderMessageInput={props?.renderMessageInput}
renderTypingIndicator={props?.renderTypingIndicator}
renderCustomSeperator={props?.renderCustomSeperator}
renderCustomSeparator={props?.renderCustomSeparator}
/>
</ChannelProvider>
);
Expand Down