Skip to content

fix: allow channel, user and emoji autocomplete after slash command #7668

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

Open
Rohit3523 wants to merge 1 commit into
base: develop
Choose a base branch
from
+45 −16
Open

fix: allow channel, user and emoji autocomplete after slash command #7668

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 29 additions & 0 deletions app/containers/MessageComposer/MessageComposer.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -572,6 +572,35 @@ describe('MessageComposer', () => {
expect(onSendMessage).toHaveBeenCalledWith('#general', false);
});

test('typing # after a slash command opens channel autocomplete', async () => {
const onSendMessage = jest.fn();
(searchRemote as unknown as jest.Mock).mockImplementationOnce(() => [{ rid: 'r1', name: 'general', t: 'c' }]);
render(<Render context={{ onSendMessage }} />);

await fireEvent(screen.getByTestId('message-composer-input'), 'focus');
await fireEvent.changeText(screen.getByTestId('message-composer-input'), '/hello #');
await fireEvent(screen.getByTestId('message-composer-input'), 'selectionChange', {
nativeEvent: { selection: { start: 8, end: 8 } }
});
await advanceComposerTimers();

await waitFor(() => expect(screen.getByTestId('autocomplete-item-general')).toBeOnTheScreen());
});

test('typing @ after a slash command opens user autocomplete', async () => {
const onSendMessage = jest.fn();
render(<Render context={{ onSendMessage }} />);

await fireEvent(screen.getByTestId('message-composer-input'), 'focus');
await fireEvent.changeText(screen.getByTestId('message-composer-input'), '/hello @');
await fireEvent(screen.getByTestId('message-composer-input'), 'selectionChange', {
nativeEvent: { selection: { start: 8, end: 8 } }
});
await advanceComposerTimers();

await waitFor(() => expect(screen.getByTestId('autocomplete-item-John')).toBeOnTheScreen());
});

test('select : emoji inserts emoji and sends, autocomplete hides', async () => {
const onSendMessage = jest.fn();
render(<Render context={{ onSendMessage }} />);
Expand Down
32 changes: 16 additions & 16 deletions app/containers/MessageComposer/components/ComposerInput.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,22 @@ export const ComposerInput = memo(
stopAutocomplete();
return;
}
if (lastWord.match(/^#/)) {
setAutocompleteParams({ text: autocompleteText, type: '#' });
return;
}
if (lastWord.match(/^@/)) {
setAutocompleteParams({ text: autocompleteText, type: '@' });
return;
}
if (lastWord.match(/^:/)) {
setAutocompleteParams({ text: autocompleteText, type: ':' });
return;
}
if (lastWord.match(/^!/) && room?.t === 'l') {
setAutocompleteParams({ text: autocompleteText, type: '!' });
return;
}
if (!sharing && text.match(/^\//)) {
const commandParameter = text.match(/^\/([a-z0-9._-]+) (.+)/im);
if (commandParameter) {
Expand All @@ -344,22 +360,6 @@ export const ComposerInput = memo(
setAutocompleteParams({ text: autocompleteText, type: '/' });
return;
}
if (lastWord.match(/^#/)) {
setAutocompleteParams({ text: autocompleteText, type: '#' });
return;
}
if (lastWord.match(/^@/)) {
setAutocompleteParams({ text: autocompleteText, type: '@' });
return;
}
if (lastWord.match(/^:/)) {
setAutocompleteParams({ text: autocompleteText, type: ':' });
return;
}
if (lastWord.match(/^!/) && room?.t === 'l') {
setAutocompleteParams({ text: autocompleteText, type: '!' });
return;
}

stopAutocomplete();
}, textInputDebounceTime);
Expand Down
Loading