Skip to content

fix: Export Messages tab closing due to "flex-tab close when click outside of it" preference #36812

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
kodiakhq merged 6 commits into from
Sep 1, 2025
Merged

fix: Export Messages tab closing due to "flex-tab close when click outside of it" preference #36812

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b682c09
fix
tiagoevanp Aug 27, 2025
df75f27
Create fluffy-dryers-obey.md
tiagoevanp Aug 27, 2025
05c6571
fix typecheck
tiagoevanp Aug 27, 2025
345d4c9
Merge branch 'fix/export-message-hide-flex-tab' of github.com:RocketC…
tiagoevanp Aug 27, 2025
8216361
fix: review
dougfabris Sep 1, 2025
e89622e
Merge branch 'develop' into fix/export-message-hide-flex-tab
kodiakhq[bot] Sep 1, 2025
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
5 changes: 5 additions & 0 deletions .changeset/fluffy-dryers-obey.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

Prevent `Export Messages` tab from closing when selecting messages by clicking outside of it and preference "Hide Contextual Bar by clicking outside of it" is set true.
14 changes: 10 additions & 4 deletions apps/meteor/client/views/room/MessageList/contexts/SelectedMessagesContext.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import type { FormEvent } from 'react';
import { createContext, useCallback, useContext, useEffect, useSyncExternalStore } from 'react';

import { selectedMessageStore } from '../../providers/SelectedMessagesProvider';
Expand Down Expand Up @@ -48,11 +49,16 @@ export const useIsSelecting = (): boolean => {
return useSyncExternalStore(subscribe, getSnapshot);
};

export const useToggleSelect = (mid: string): (() => void) => {
export const useToggleSelect = (mid: string): ((event?: FormEvent<HTMLElement>) => void) => {
const { selectedMessageStore } = useContext(SelectedMessageContext);
return useCallback(() => {
selectedMessageStore.toggle(mid);
}, [mid, selectedMessageStore]);

return useCallback(
(event) => {
event?.stopPropagation();
selectedMessageStore.toggle(mid);
},
[mid, selectedMessageStore],
);
};

export const useToggleSelectAll = (): (() => void) => {
Expand Down
4 changes: 1 addition & 3 deletions apps/meteor/tests/e2e/export-messages.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,9 +145,7 @@ test.describe('export-messages', () => {
await expect(exportMessagesTab.sendButton).toBeEnabled();
});

// TODO: Fix this test - the test is failing because when selecting the message, the import messages tab becomes not visible
// and the message is not selected.
test.fail('should be able to select a single message to export with hide contextual bar preference enabled', async ({ page, api }) => {
test('should be able to select a single message to export with hide contextual bar preference enabled', async ({ page, api }) => {
await api.post('/users.setPreferences', {
userId: 'rocketchat.internal.admin.test',
data: { hideFlexTab: true },
Expand Down
Loading