Merge branch 'master' into feat/channel-delivery-state

# Conflicts:
#	package.json
#	yarn.lock

Author: MartinCupela

CHANGELOG.md

@@ -1,3 +1,33 @@
+## [13.8.1](https://github.com/GetStream/stream-chat-react/compare/v13.8.0...v13.8.1) (2025-10-08)
+
+### Bug Fixes
+
+* add "team" property to the `DefaultChannelData` interface ([#2850](https://github.com/GetStream/stream-chat-react/issues/2850)) ([edac5f6](https://github.com/GetStream/stream-chat-react/commit/edac5f6681bfe7e54dc055ab48e2e96074525504))
+
+### Chores
+
+* **deps:** upgrade steam-chat to v9.21.0 ([fad4407](https://github.com/GetStream/stream-chat-react/commit/fad4407d0103aeb173e9c72ca9a7c120e5c35826))
+
+## [13.8.0](https://github.com/GetStream/stream-chat-react/compare/v13.7.0...v13.8.0) (2025-10-08)
+
+### Bug Fixes
+
+* add CustomMessageComposerData redeclaration ([#2833](https://github.com/GetStream/stream-chat-react/issues/2833)) ([641cdd3](https://github.com/GetStream/stream-chat-react/commit/641cdd346e5e4ed1ff8410f65a28c25f39aa5b58))
+* add notification translator for notification validation:attachment:upload:in-progress ([#2842](https://github.com/GetStream/stream-chat-react/issues/2842)) ([7c2a965](https://github.com/GetStream/stream-chat-react/commit/7c2a965ce6664bb8f17682b277c704bcdee24ff4))
+* **ChannelPreview:** call getLatestMessagePreview on every relevant WS event ([#2838](https://github.com/GetStream/stream-chat-react/issues/2838)) ([386ef55](https://github.com/GetStream/stream-chat-react/commit/386ef55b291520b6fcc9a6063d93d1a119941627))
+* check cast-poll-vote permission to show "Suggest an option" poll action ([#2835](https://github.com/GetStream/stream-chat-react/issues/2835)) ([a14367e](https://github.com/GetStream/stream-chat-react/commit/a14367e0134a92326aaaa188484a09ff4e6852d0))
+* **giphy:** allow using actions in quoted messages ([#2849](https://github.com/GetStream/stream-chat-react/issues/2849)) ([8052bd7](https://github.com/GetStream/stream-chat-react/commit/8052bd7fc639158eea5a2b7f9f2c4f479f5db238))
+* **TextareaComposer:** check sendable data before allowing message submission ([#2852](https://github.com/GetStream/stream-chat-react/issues/2852)) ([4300ed6](https://github.com/GetStream/stream-chat-react/commit/4300ed686482ea73c532da6b0e50931c7aa76a6d))
+* **useMessageComposer:** keep editing message composer with up-to-date edited message reference ([#2851](https://github.com/GetStream/stream-chat-react/issues/2851)) ([d4eb2d7](https://github.com/GetStream/stream-chat-react/commit/d4eb2d712e19e42e0828b2bad9ab15f756309580))
+
+### Features
+
+* allow to override EditMessageModal and thus its additionalMessageInputProps ([#2853](https://github.com/GetStream/stream-chat-react/issues/2853)) ([50e3c62](https://github.com/GetStream/stream-chat-react/commit/50e3c6253653079c393a4282c5ff20108e7eca79))
+
+### Chores
+
+* **deps:** upgrade stream-chat to v9.20.3 ([51ea875](https://github.com/GetStream/stream-chat-react/commit/51ea8758941208ccd6263b582e523bb97d697ec7))
+
 ## [13.7.0](https://github.com/GetStream/stream-chat-react/compare/v13.6.6...v13.7.0) (2025-09-18)
 
 ### Features

src/components/Channel/Channel.tsx

@@ -106,6 +106,7 @@ type ChannelPropsForwardedToComponentContext = Pick<
   | 'CustomMessageActionsList'
   | 'DateSeparator'
   | 'EditMessageInput'
+  | 'EditMessageModal'
   | 'EmojiPicker'
   | 'emojiSearchIndex'
   | 'EmptyStateIndicator'
@@ -1207,6 +1208,7 @@ const ChannelInner = (
       CustomMessageActionsList: props.CustomMessageActionsList,
       DateSeparator: props.DateSeparator,
       EditMessageInput: props.EditMessageInput,
+      EditMessageModal: props.EditMessageModal,
       EmojiPicker: props.EmojiPicker,
       emojiSearchIndex: props.emojiSearchIndex,
       EmptyStateIndicator: props.EmptyStateIndicator,
@@ -1276,6 +1278,7 @@ const ChannelInner = (
       props.CustomMessageActionsList,
       props.DateSeparator,
       props.EditMessageInput,
+      props.EditMessageModal,
       props.EmojiPicker,
       props.emojiSearchIndex,
       props.EmptyStateIndicator,

src/components/Message/MessageSimple.tsx

@@ -26,7 +26,7 @@ import {
 
 import { Avatar as DefaultAvatar } from '../Avatar';
 import { Attachment as DefaultAttachment } from '../Attachment';
-import { EditMessageModal } from '../MessageInput';
+import { EditMessageModal as DefaultEditMessageModal } from '../MessageInput';
 import { Poll } from '../Poll';
 import { ReactionsList as DefaultReactionList } from '../Reactions';
 import { MessageBounceModal } from '../MessageBounce/MessageBounceModal';
@@ -69,6 +69,7 @@ const MessageSimpleWithContext = (props: MessageSimpleWithContextProps) => {
   const {
     Attachment = DefaultAttachment,
     Avatar = DefaultAvatar,
+    EditMessageModal = DefaultEditMessageModal,
     MessageOptions = DefaultMessageOptions,
     // TODO: remove this "passthrough" in the next
     // major release and use the new default instead

src/components/MessageInput/EditMessageForm.tsx

@@ -68,9 +68,14 @@ export const EditMessageForm = () => {
   );
 };
 
+export type EditMessageModalProps = Pick<
+  MessageUIComponentProps,
+  'additionalMessageInputProps'
+>;
+
 export const EditMessageModal = ({
   additionalMessageInputProps,
-}: Pick<MessageUIComponentProps, 'additionalMessageInputProps'>) => {
+}: EditMessageModalProps) => {
   const { EditMessageInput = EditMessageForm, Modal = DefaultModal } =
     useComponentContext();
   const { clearEditingState } = useMessageContext();

src/components/TextareaComposer/TextareaComposer.tsx

@@ -194,7 +194,11 @@ export const TextareaComposer = ({
             return nextIndex;
           });
         }
-      } else if (shouldSubmit(event) && textareaRef.current) {
+      } else if (
+        shouldSubmit(event) &&
+        textareaRef.current &&
+        messageComposer.hasSendableData
+      ) {
         if (event.key === 'Enter') {
           // prevent adding newline when submitting a message with
           event.preventDefault();
@@ -205,6 +209,7 @@ export const TextareaComposer = ({
     [
       focusedItemIndex,
       handleSubmit,
+      messageComposer,
       onKeyDown,
       shouldSubmit,
       suggestions,

src/context/ComponentContext.tsx

@@ -10,6 +10,7 @@ import type {
   CooldownTimerProps,
   CustomMessageActionsListProps,
   DateSeparatorProps,
+  EditMessageModalProps,
   EmojiSearchIndex,
   EmptyStateIndicatorProps,
   EventComponentProps,
@@ -96,6 +97,8 @@ export type ComponentContextValue = {
   DateSeparator?: React.ComponentType<DateSeparatorProps>;
   /** Custom UI component to override default edit message input, defaults to and accepts same props as: [EditMessageForm](https://github.com/GetStream/stream-chat-react/blob/master/src/components/MessageInput/EditMessageForm.tsx) */
   EditMessageInput?: React.ComponentType<MessageInputProps>;
+  /** Custom UI component to override default EditMessageModal, defaults to and accepts same props as: [EditMessageModal](https://github.com/GetStream/stream-chat-react/blob/master/src/components/MessageInput/EditMessageForm.tsx) */
+  EditMessageModal?: React.ComponentType<EditMessageModalProps>;
   /** Custom UI component for rendering button with emoji picker in MessageInput */
   EmojiPicker?: React.ComponentType;
   /** Mechanism to be used with autocomplete and text replace features of the `MessageInput` component, see [emoji-mart `SearchIndex`](https://github.com/missive/emoji-mart#%EF%B8%8F%EF%B8%8F-headless-search) */

src/types/defaultDataInterfaces.ts

@@ -3,6 +3,7 @@ export interface DefaultChannelData {
   image?: string;
   name?: string;
   subtitle?: string;
+  team?: string;
 }
 
 export interface DefaultAttachmentData {}