Skip to content

Commit 40c799a

Browse files
fix: remove props spreading on React.Fragment (dragAndDropWindow) (#1835)
1 parent 04bff7d commit 40c799a

File tree

2 files changed

+16
-15
lines changed

2 files changed

+16
-15
lines changed

src/components/Channel/Channel.tsx

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -916,11 +916,6 @@ const ChannelInner = <
916916
typing,
917917
});
918918

919-
const OptionalMessageInputProvider = useMemo(
920-
() => (dragAndDropWindow ? DropzoneProvider : React.Fragment),
921-
[dragAndDropWindow],
922-
);
923-
924919
const className = clsx(chatClass, theme, channelClass);
925920

926921
if (state.error) {
@@ -955,9 +950,10 @@ const ChannelInner = <
955950
<EmojiProvider value={emojiContextValue}>
956951
<TypingProvider value={typingContextValue}>
957952
<div className={`${chatContainerClass}`}>
958-
<OptionalMessageInputProvider {...optionalMessageInputProps}>
959-
{children}
960-
</OptionalMessageInputProvider>
953+
{dragAndDropWindow && (
954+
<DropzoneProvider {...optionalMessageInputProps}>{children}</DropzoneProvider>
955+
)}
956+
{!dragAndDropWindow && <>{children}</>}
961957
</div>
962958
</TypingProvider>
963959
</EmojiProvider>

src/components/MessageInput/MessageInput.tsx

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React, { PropsWithChildren, useMemo } from 'react';
1+
import React, { PropsWithChildren } from 'react';
22
import type { Message } from 'stream-chat';
33

44
import { DefaultTriggerProvider } from './DefaultTriggerProvider';
@@ -126,17 +126,22 @@ const UnMemoizedMessageInput = <
126126
>('MessageInput');
127127

128128
const Input = PropInput || ContextInput || MessageInputFlat;
129-
const OptionalMessageInputProvider = useMemo(
130-
() => (dragAndDropWindow ? React.Fragment : MessageInputProvider),
131-
[dragAndDropWindow],
132-
);
129+
130+
if (dragAndDropWindow)
131+
return (
132+
<>
133+
<TriggerProvider>
134+
<Input />
135+
</TriggerProvider>
136+
</>
137+
);
133138

134139
return (
135-
<OptionalMessageInputProvider {...props}>
140+
<MessageInputProvider {...props}>
136141
<TriggerProvider>
137142
<Input />
138143
</TriggerProvider>
139-
</OptionalMessageInputProvider>
144+
</MessageInputProvider>
140145
);
141146
};
142147

0 commit comments

Comments
 (0)