Skip to content

Commit 52e951d

Browse files
authored
Merge branch 'main' into blazor-ca-enable
2 parents bcb75c7 + 5de3661 commit 52e951d

3 files changed

Lines changed: 20 additions & 1 deletion

File tree

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "patch",
3+
"comment": "Enter doesn't send chat message when send is disabled.",
4+
"packageName": "@ni/spright-components",
5+
"email": "163188334+Alexia-Claudia-Micu@users.noreply.github.com",
6+
"dependentChangeType": "patch"
7+
}

packages/spright-components/src/chat/input/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ export class ChatInput extends mixinErrorPattern(FoundationElement) {
194194
}
195195

196196
private shouldDisableSendButton(): boolean {
197-
return this.textArea!.value.length === 0;
197+
return this.sendDisabled || this.textArea!.value.length === 0;
198198
}
199199

200200
private resetInput(): void {

packages/spright-components/src/chat/input/tests/chat-input.spec.ts

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -330,6 +330,18 @@ describe('ChatInput', () => {
330330
expect(spy).not.toHaveBeenCalled();
331331
});
332332

333+
it('via Enter with sendDisabled set triggers no send event', async () => {
334+
const spy = jasmine.createSpy();
335+
element.addEventListener('send', spy);
336+
element.value = 'new value';
337+
element.sendDisabled = true;
338+
processUpdates();
339+
await page.pressEnterKey();
340+
341+
expect(spy).not.toHaveBeenCalled();
342+
expect(element.value).toBe('new value');
343+
});
344+
333345
it('Shift-Enter triggers no send event', async () => {
334346
const spy = jasmine.createSpy();
335347
element.addEventListener('send', spy);

0 commit comments

Comments
 (0)