Skip to content

Commit 150efb9

Browse files
feat: Move expandable message composer out of feature preview (RocketChat#37524)
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
1 parent d064a79 commit 150efb9

6 files changed

Lines changed: 21 additions & 46 deletions

File tree

.changeset/few-mirrors-smoke.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
"@rocket.chat/meteor": minor
3+
"@rocket.chat/i18n": minor
4+
"@rocket.chat/ui-client": minor
5+
---
6+
7+
Moves the expandable message composer out of feature preview

apps/meteor/client/views/room/composer/messageBox/MessageBox.tsx

Lines changed: 13 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
/* eslint-disable complexity */
22
import { isRoomFederated, isRoomNativeFederated, type IMessage, type ISubscription } from '@rocket.chat/core-typings';
33
import { useContentBoxSize, useEffectEvent } from '@rocket.chat/fuselage-hooks';
4-
import { FeaturePreview, FeaturePreviewOff, FeaturePreviewOn, useSafeRefCallback } from '@rocket.chat/ui-client';
4+
import { useSafeRefCallback } from '@rocket.chat/ui-client';
55
import {
66
MessageComposerAction,
77
MessageComposerToolbarActions,
88
MessageComposer,
9-
MessageComposerInput,
109
MessageComposerToolbar,
1110
MessageComposerActionsDivider,
1211
MessageComposerToolbarSubmit,
@@ -424,35 +423,18 @@ const MessageBox = ({
424423
{isRecordingVideo && <VideoMessageRecorder reference={messageComposerRef} rid={room._id} tmid={tmid} />}
425424
<MessageComposer ref={messageComposerRef} variant={isEditing ? 'editing' : undefined}>
426425
{isRecordingAudio && <AudioMessageRecorder rid={room._id} isMicrophoneDenied={isMicrophoneDenied} />}
427-
<FeaturePreview feature='expandableMessageComposer'>
428-
<FeaturePreviewOn>
429-
<MessageComposerInputExpandable
430-
dimensions={sizes}
431-
ref={mergedRefs}
432-
aria-label={composerPlaceholder}
433-
name='msg'
434-
disabled={isRecording || !canSend}
435-
onChange={setTyping}
436-
style={textAreaStyle}
437-
placeholder={composerPlaceholder}
438-
onPaste={handlePaste}
439-
aria-activedescendant={popup.focused ? `popup-item-${popup.focused._id}` : undefined}
440-
/>
441-
</FeaturePreviewOn>
442-
<FeaturePreviewOff>
443-
<MessageComposerInput
444-
ref={mergedRefs}
445-
aria-label={composerPlaceholder}
446-
name='msg'
447-
disabled={isRecording || !canSend}
448-
onChange={setTyping}
449-
style={textAreaStyle}
450-
placeholder={composerPlaceholder}
451-
onPaste={handlePaste}
452-
aria-activedescendant={popup.focused ? `popup-item-${popup.focused._id}` : undefined}
453-
/>
454-
</FeaturePreviewOff>
455-
</FeaturePreview>
426+
<MessageComposerInputExpandable
427+
dimensions={sizes}
428+
ref={mergedRefs}
429+
aria-label={composerPlaceholder}
430+
name='msg'
431+
disabled={isRecording || !canSend}
432+
onChange={setTyping}
433+
style={textAreaStyle}
434+
placeholder={composerPlaceholder}
435+
onPaste={handlePaste}
436+
aria-activedescendant={popup.focused ? `popup-item-${popup.focused._id}` : undefined}
437+
/>
456438
<MessageComposerToolbar>
457439
<MessageComposerToolbarActions aria-label={t('Message_composer_toolbox_primary_actions')}>
458440
<MessageComposerAction
-19.4 KB
Binary file not shown.

packages/i18n/src/locales/en.i18n.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2029,8 +2029,6 @@
20292029
"Execute_Synchronization_Now": "Execute Synchronization Now",
20302030
"Exit_Full_Screen": "Exit Full Screen",
20312031
"Expand": "Expand",
2032-
"Expandable_message_composer": "Expandable Composer",
2033-
"Expandable_message_composer_description": "Expand the text input area to easily write and review longer messages without having to scroll up and down.",
20342032
"Expand_group": "Expand {{group}}",
20352033
"Expand_all": "Expand all",
20362034
"Expand_view": "Expand view",

packages/i18n/src/locales/nb.i18n.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2021,8 +2021,6 @@
20212021
"Execute_Synchronization_Now": "Utfør synkronisering nå",
20222022
"Exit_Full_Screen": "Avslutt fullskjerm",
20232023
"Expand": "Utvid",
2024-
"Expandable_message_composer": "Utvidbar komponist",
2025-
"Expandable_message_composer_description": "Utvid tekstinntastingsområdet slik at du enkelt kan skrive og gå gjennom lengre meldinger uten å måtte bla opp og ned.",
20262024
"Expand_group": "Utvid {{group}}",
20272025
"Expand_all": "Utvid alle",
20282026
"Expand_view": "Utvid visningen",

packages/ui-client/src/hooks/useFeaturePreviewList.ts

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ export type FeaturesAvailable =
55
| 'enable-timestamp-message-parser'
66
| 'contextualbarResizable'
77
| 'newNavigation'
8-
| 'secondarySidebar'
9-
| 'expandableMessageComposer';
8+
| 'secondarySidebar';
109

1110
export type FeaturePreviewProps = {
1211
name: FeaturesAvailable;
@@ -74,15 +73,6 @@ export const defaultFeaturesPreview: FeaturePreviewProps[] = [
7473
value: true,
7574
},
7675
},
77-
{
78-
name: 'expandableMessageComposer',
79-
i18n: 'Expandable_message_composer',
80-
description: 'Expandable_message_composer_description',
81-
imageUrl: 'images/featurePreview/expandable-composer.png',
82-
group: 'Message',
83-
value: false,
84-
enabled: true,
85-
},
8676
];
8777

8878
export const enabledDefaultFeatures = defaultFeaturesPreview.filter((feature) => feature.enabled);

0 commit comments

Comments
 (0)