GetStream · gpunto · Apr 10, 2026 · Apr 10, 2026 · Apr 10, 2026 · Apr 10, 2026
diff --git a/stream-chat-android-compose/api/stream-chat-android-compose.api b/stream-chat-android-compose/api/stream-chat-android-compose.api
diff --git a/...ts/selectedmessage/SelectedMessageMenu.kt → ...mponents/messageactions/MessageActions.kt b/...ts/selectedmessage/SelectedMessageMenu.kt → ...mponents/messageactions/MessageActions.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.getstream.chat.android.compose.ui.components.selectedmessage
+package io.getstream.chat.android.compose.ui.components.messageactions
 
 import android.os.Build
 import android.view.WindowManager
@@ -64,9 +64,9 @@
 import io.getstream.chat.android.compose.ui.components.messageoptions.defaultMessageOptionsState
 import io.getstream.chat.android.compose.ui.messages.list.LocalSelectedMessageSnapshot
 import io.getstream.chat.android.compose.ui.theme.ChatTheme
+import io.getstream.chat.android.compose.ui.theme.MessageActionsHeaderParams
+import io.getstream.chat.android.compose.ui.theme.MessageActionsOptionsParams
 import io.getstream.chat.android.compose.ui.theme.MessageContainerParams
-import io.getstream.chat.android.compose.ui.theme.MessageMenuHeaderContentParams
-import io.getstream.chat.android.compose.ui.theme.MessageMenuOptionsParams
 import io.getstream.chat.android.compose.ui.theme.StreamTokens
 import io.getstream.chat.android.compose.util.extensions.toSet
 import io.getstream.chat.android.models.Channel
@@ -104,7 +104,7 @@
  */
 @Suppress("LongMethod")
 @Composable
-public fun SelectedMessageMenu(
+public fun MessageActions(
     message: Message,
     messageOptions: List<MessageOptionItemState>,
     ownCapabilities: Set<String>,
@@ -187,9 +187,9 @@
             horizontalAlignment = messageAlignment.contentAlignment,
         ) {
             val canLeaveReaction = ChannelCapabilities.SEND_REACTION in ownCapabilities
-            if (canLeaveReaction && ChatTheme.reactionOptionsTheme.areReactionOptionsVisible) {
-                ChatTheme.componentFactory.MessageMenuHeaderContent(
-                    params = MessageMenuHeaderContentParams(
+            if (canLeaveReaction && ChatTheme.config.messageActions.reactionsEnabled) {
+                ChatTheme.componentFactory.MessageActionsHeader(
+                    params = MessageActionsHeaderParams(
                         modifier = bubbleAlignmentPadding.then(animation.peripheralModifier(slideY = (-24).dp)),
                         message = message,
                         messageOptions = messageOptions,
@@ -221,8 +221,8 @@
                 )
             }
 
-            ChatTheme.componentFactory.MessageMenuOptions(
-                params = MessageMenuOptionsParams(
+            ChatTheme.componentFactory.MessageActionsOptions(
+                params = MessageActionsOptionsParams(
                     modifier = bubbleAlignmentPadding.then(animation.peripheralModifier(slideY = 24.dp)),
                     message = message,
                     options = messageOptions,
@@ -270,7 +270,7 @@
 private const val DimAmount = 0.7f
 
 /**
- * Holds the animation state for the [SelectedMessageMenu] pop-out effect.
+ * Holds the animation state for the [MessageActions] pop-out effect.
  *
  * Two parallel animations drive the menu entrance:
  * - **message**: slides the message from its list position to the dialog center
@@ -357,45 +357,45 @@
 
 @Preview(showBackground = true)
 @Composable
-private fun SelectedMessageMenuForIncomingMessagePreview() {
+private fun MessageActionsForIncomingMessagePreview() {
     ChatTheme {
-        SelectedMessageMenuForIncomingMessage()
+        MessageActionsForIncomingMessage()
     }
 }
 
 @Preview(showBackground = true)
 @Composable
-private fun SelectedMessageMenuForOutgoingMessagePreview() {
+private fun MessageActionsForOutgoingMessagePreview() {
     ChatTheme {
-        SelectedMessageMenuForOutgoingMessage()
+        MessageActionsForOutgoingMessage()
     }
 }
 
 @Composable
-internal fun SelectedMessageMenuForIncomingMessage() {
-    SelectedMessageMenuPreview(
+internal fun MessageActionsForIncomingMessage() {
+    MessageActionsPreview(
         selectedMessage = PreviewMessageData.message1,
     )
 }
 
 @Composable
-internal fun SelectedMessageMenuForOutgoingMessage() {
-    SelectedMessageMenuPreview(
+internal fun MessageActionsForOutgoingMessage() {
+    MessageActionsPreview(
         selectedMessage = PreviewMessageData.message1.copy(user = PreviewUserData.user1),
     )
 }
 
 @Preview(showBackground = true)
 @Composable
-private fun SelectedMessageMenuForFailedMessagePreview() {
+private fun MessageActionsForFailedMessagePreview() {
     ChatTheme {
-        SelectedMessageMenuForFailedMessage()
+        MessageActionsForFailedMessage()
     }
 }
 
 @Composable
-internal fun SelectedMessageMenuForFailedMessage() {
-    SelectedMessageMenuPreview(
+internal fun MessageActionsForFailedMessage() {
+    MessageActionsPreview(
         selectedMessage = PreviewMessageData.message1.copy(
             user = PreviewUserData.user1,
             syncStatus = SyncStatus.FAILED_PERMANENTLY,
@@ -404,15 +404,15 @@
 }
 
 @Composable
-private fun SelectedMessageMenuPreview(selectedMessage: Message) {
+private fun MessageActionsPreview(selectedMessage: Message) {
     val messageOptions = defaultMessageOptionsState(
         selectedMessage = selectedMessage,
         currentUser = PreviewUserData.user1,
         isInThread = false,
         channel = Channel(ownCapabilities = ChannelCapabilities.toSet()),
     )
 
-    SelectedMessageMenu(
+    MessageActions(
         message = selectedMessage,
         messageOptions = messageOptions,
         onMessageAction = {},

diff --git a/...ents/selectedmessage/MessageMenuHeader.kt → ...ts/messageactions/MessageActionsHeader.kt b/...ents/selectedmessage/MessageMenuHeader.kt → ...ts/messageactions/MessageActionsHeader.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.getstream.chat.android.compose.ui.components.selectedmessage
+package io.getstream.chat.android.compose.ui.components.messageactions
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
@@ -52,7 +52,7 @@ import io.getstream.chat.android.models.Reaction
  * @param modifier Modifier for styling.
  */
 @Composable
-public fun MessageMenuHeader(
+public fun MessageActionsHeader(
     ownReactions: List<Reaction>,
     onReactionOptionSelected: (ReactionOptionItemState) -> Unit,
     onShowMoreReactionsSelected: () -> Unit,
@@ -108,12 +108,12 @@ public fun MessageMenuHeader(
 
 @Preview(showBackground = true)
 @Composable
-private fun MessageMenuHeaderPreview() {
+private fun MessageActionsHeaderPreview() {
     ChatPreviewTheme {
         val reactionType = ChatTheme.reactionResolver.supportedReactions.firstOrNull()
 
         if (reactionType != null) {
-            MessageMenuHeader(
+            MessageActionsHeader(
                 ownReactions = listOf(Reaction(type = reactionType)),
                 onReactionOptionSelected = {},
                 onShowMoreReactionsSelected = {},

diff --git a/...nents/selectedmessage/ReactionCountRow.kt → ...onents/messageactions/ReactionCountRow.kt b/...nents/selectedmessage/ReactionCountRow.kt → ...onents/messageactions/ReactionCountRow.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.getstream.chat.android.compose.ui.components.selectedmessage
+package io.getstream.chat.android.compose.ui.components.messageactions
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border

diff --git a/...mponents/selectedmessage/ReactionsMenu.kt → ...omponents/messageactions/ReactionsMenu.kt b/...mponents/selectedmessage/ReactionsMenu.kt → ...omponents/messageactions/ReactionsMenu.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.getstream.chat.android.compose.ui.components.selectedmessage
+package io.getstream.chat.android.compose.ui.components.messageactions
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
@@ -83,7 +83,7 @@
  */
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
-public fun SelectedReactionsMenu(
+public fun ReactionsMenu(
     message: Message,
     currentUser: User?,
     ownCapabilities: Set<String>,
@@ -186,7 +186,7 @@

 @Suppress("LongParameterList")
 @Composable
 private fun ReactionsMenuList(
    reactionGroups: List<MessageReactionItemState>,
    items: List<UserReactionItemState>,
    selectedReactionType: String?,
@@ -371,15 +371,15 @@
 
 @Preview
 @Composable
-private fun OneSelectedReactionMenuPreview() {
+private fun OneReactionMenuPreview() {
     ChatTheme {
         ReactionsMenuContentOneReaction()
     }
 }
 
 @Preview
 @Composable
-private fun ManySelectedReactionsMenuPreview() {
+private fun ManyReactionsMenuPreview() {
     ChatTheme {
         ReactionsMenuContentManyReactions()
     }

diff --git a/...onents/selectedmessage/UserReactionRow.kt → ...ponents/messageactions/UserReactionRow.kt b/...onents/selectedmessage/UserReactionRow.kt → ...ponents/messageactions/UserReactionRow.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.getstream.chat.android.compose.ui.components.selectedmessage
+package io.getstream.chat.android.compose.ui.components.messageactions
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column

diff --git a/...ageoptions/MessageOptionItemVisibility.kt → ...ptions/MessageActionsOptionsVisibility.kt b/...ageoptions/MessageOptionItemVisibility.kt → ...ptions/MessageActionsOptionsVisibility.kt
@@ -16,10 +16,10 @@
 
 package io.getstream.chat.android.compose.ui.components.messageoptions
 
-import io.getstream.chat.android.compose.ui.components.selectedmessage.SelectedMessageMenu
+import io.getstream.chat.android.compose.ui.components.messageactions.MessageActions
 
 /**
- * Controls option visibility in the message options menu. All options are visible by default.
+ * Controls option visibility in the message actions overlay. All options are visible by default.
  *
  * @param isRetryMessageVisible Visibility of the retry failed message option.
  * @param isReplyVisible Visibility of the reply to message option (quote message).
@@ -33,11 +33,11 @@ import io.getstream.chat.android.compose.ui.components.selectedmessage.SelectedM
  * @param isMuteUserVisible Visibility of the mute user option.
  * @param isBlockUserVisible Visibility of the block user option.
  *
- * @see [SelectedMessageMenu]
+ * @see [MessageActions]
  * @see [MessageOptions]
  * @see [defaultMessageOptionsState]
  */
-public data class MessageOptionItemVisibility(
+public data class MessageActionsOptionsVisibility(
     val isRetryMessageVisible: Boolean = true,
     val isReplyVisible: Boolean = true,
     val isThreadReplyVisible: Boolean = true,

diff --git a/...ain/java/io/getstream/chat/android/compose/ui/components/messageoptions/MessageOptions.kt b/...ain/java/io/getstream/chat/android/compose/ui/components/messageoptions/MessageOptions.kt
@@ -24,7 +24,7 @@ import io.getstream.chat.android.compose.R
 import io.getstream.chat.android.compose.state.messageoptions.MessageOptionItemState
 import io.getstream.chat.android.compose.ui.components.common.ContextualMenu
 import io.getstream.chat.android.compose.ui.theme.ChatTheme
-import io.getstream.chat.android.compose.ui.theme.MessageMenuOptionsItemParams
+import io.getstream.chat.android.compose.ui.theme.MessageActionsOptionsItemParams
 import io.getstream.chat.android.compose.util.extensions.canBlockUser
 import io.getstream.chat.android.compose.util.extensions.canCopyMessage
 import io.getstream.chat.android.compose.util.extensions.canDeleteMessage
@@ -73,8 +73,8 @@ public fun MessageOptions(
 ) {
     ContextualMenu(modifier) {
         options.forEach { option ->
-            ChatTheme.componentFactory.MessageMenuOptionsItem(
-                params = MessageMenuOptionsItemParams(
+            ChatTheme.componentFactory.MessageActionsOptionsItem(
+                params = MessageActionsOptionsItemParams(
                     option = option,
                     onMessageOptionSelected = onMessageOptionSelected,
                 ),
@@ -105,7 +105,7 @@ public fun defaultMessageOptionsState(
     }
     val selectedMessageUserId = selectedMessage.user.id
     val ownCapabilities = channel.ownCapabilities
-    val visibility = ChatTheme.messageOptionsTheme.optionVisibility
+    val visibility = ChatTheme.config.messageActions.optionVisibility
 
     return listOfNotNull(
         if (visibility.canRetryMessage(currentUser, selectedMessage)) {

diff --git a/...roid-compose/src/main/java/io/getstream/chat/android/compose/ui/messages/ChannelScreen.kt b/...roid-compose/src/main/java/io/getstream/chat/android/compose/ui/messages/ChannelScreen.kt
@@ -67,7 +67,7 @@ import io.getstream.chat.android.compose.ui.messages.list.SelectedMessageSnapsho
 import io.getstream.chat.android.compose.ui.theme.AttachmentPickerMenuParams
 import io.getstream.chat.android.compose.ui.theme.ChannelHeaderParams
 import io.getstream.chat.android.compose.ui.theme.ChatTheme
-import io.getstream.chat.android.compose.ui.theme.MessageMenuParams
+import io.getstream.chat.android.compose.ui.theme.MessageActionsParams
 import io.getstream.chat.android.compose.ui.theme.MessageReactionPickerParams
 import io.getstream.chat.android.compose.ui.theme.ReactionsMenuParams
 import io.getstream.chat.android.compose.ui.util.StreamSnackbarHost
@@ -526,8 +526,8 @@ private fun BoxScope.ChannelScreenMenus(
     }
 
     if (selectedMessageState is SelectedMessageOptionsState && selectedMessage.id.isNotEmpty()) {
-        ChatTheme.componentFactory.MessageMenu(
-            params = MessageMenuParams(
+        ChatTheme.componentFactory.MessageActions(
+            params = MessageActionsParams(
                 messageOptions = messageOptions,
                 message = selectedMessage,
                 ownCapabilities = ownCapabilities,

diff --git a/...pose/src/main/java/io/getstream/chat/android/compose/ui/messages/list/MessageContainer.kt b/...pose/src/main/java/io/getstream/chat/android/compose/ui/messages/list/MessageContainer.kt
@@ -203,7 +203,7 @@ public fun MessageContainer(
 
     val messageAlignment = ChatTheme.messageAlignmentProvider.provideMessageAlignment(messageItem)
     val description = stringResource(id = R.string.stream_compose_cd_message_item)
-    val optionVisibility = ChatTheme.messageOptionsTheme.optionVisibility
+    val optionVisibility = ChatTheme.config.messageActions.optionVisibility
     val isSwipeable = remember(message, messageItem.ownCapabilities, optionVisibility) {
         optionVisibility.canReplyToMessage(message, messageItem.ownCapabilities)
     }

diff --git a/...-compose/src/main/java/io/getstream/chat/android/compose/ui/theme/ChatComponentFactory.kt b/...-compose/src/main/java/io/getstream/chat/android/compose/ui/theme/ChatComponentFactory.kt
@@ -118,8 +118,6 @@ import io.getstream.chat.android.compose.ui.components.messages.SegmentedMessage
 import io.getstream.chat.android.compose.ui.components.messages.SwipeToReplyIcon
 import io.getstream.chat.android.compose.ui.components.reactionpicker.ReactionsPicker
 import io.getstream.chat.android.compose.ui.components.reactions.ReactionToggleSize
-import io.getstream.chat.android.compose.ui.components.selectedmessage.MessageMenuHeader
-import io.getstream.chat.android.compose.ui.components.selectedmessage.SelectedMessageMenu
 import io.getstream.chat.android.compose.ui.messages.composer.internal.AudioRecordingButton
 import io.getstream.chat.android.compose.ui.messages.composer.internal.MessageComposerEditIndicator
 import io.getstream.chat.android.compose.ui.messages.composer.internal.attachments.MessageComposerAttachmentAudioRecordItem
@@ -1847,14 +1845,14 @@ public interface ChatComponentFactory {
     }
 
     /**
-     * Factory method for creating the full content of the SelectedMessageMenu.
+     * Factory method for creating the full content of the [MessageActions] overlay.
      * This is the menu that appears when a message is long-pressed.
      *
      * @param params Parameters for this component.
      */
     @Composable
-    public fun MessageMenu(params: MessageMenuParams) {
-        SelectedMessageMenu(
+    public fun MessageActions(params: MessageActionsParams) {
+        io.getstream.chat.android.compose.ui.components.messageactions.MessageActions(
             modifier = params.modifier,
             messageOptions = params.messageOptions,
             message = params.message,
@@ -1867,13 +1865,13 @@ public interface ChatComponentFactory {
     }
 
     /**
-     * Factory method for creating the header content of the SelectedMessageMenu.
+     * Factory method for creating the header content of the [MessageActions] overlay.
      *
      * @param params Parameters for this component.
      */
     @Composable
-    public fun MessageMenuHeaderContent(params: MessageMenuHeaderContentParams) {
-        MessageMenuHeader(
+    public fun MessageActionsHeader(params: MessageActionsHeaderParams) {
+        io.getstream.chat.android.compose.ui.components.messageactions.MessageActionsHeader(
             modifier = params.modifier,
             onReactionOptionSelected = {
                 params.onMessageAction(
@@ -1894,7 +1892,7 @@ public interface ChatComponentFactory {
      * @param params Parameters for this component.
      */
     @Composable
-    public fun MessageMenuOptions(params: MessageMenuOptionsParams) {
+    public fun MessageActionsOptions(params: MessageActionsOptionsParams) {
         MessageOptions(
             modifier = params.modifier,
             onMessageOptionSelected = params.onMessageOptionSelected,
@@ -1903,12 +1901,12 @@ public interface ChatComponentFactory {
     }
 
     /**
-     * Factory method for creating an individual option item in the SelectedMessageMenu.
+     * Factory method for creating an individual action item in the [MessageActions] overlay.
      *
      * @param params Parameters for this component.
      */
     @Composable
-    public fun MessageMenuOptionsItem(params: MessageMenuOptionsItemParams) {
+    public fun MessageActionsOptionsItem(params: MessageActionsOptionsItemParams) {
         ContextualMenuItem(
             label = stringResource(id = params.option.title),
             leadingIcon = params.option.iconPainter,
@@ -1956,7 +1954,7 @@ public interface ChatComponentFactory {
      */
     @Composable
     public fun ReactionsMenu(params: ReactionsMenuParams) {
-        io.getstream.chat.android.compose.ui.components.selectedmessage.SelectedReactionsMenu(
+        io.getstream.chat.android.compose.ui.components.messageactions.ReactionsMenu(
             modifier = params.modifier,
             currentUser = params.currentUser,
             message = params.message,
@@ -1974,7 +1972,7 @@ public interface ChatComponentFactory {
      */
     @Composable
     public fun ReactionsMenuContent(params: ReactionsMenuContentParams) {
-        io.getstream.chat.android.compose.ui.components.selectedmessage.ReactionsMenuContent(
+        io.getstream.chat.android.compose.ui.components.messageactions.ReactionsMenuContent(
             modifier = params.modifier,
             currentUser = params.currentUser,
             message = params.message,