Skip to content

AI Assistant: restore focus in chat after message processing #33794

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

Closed
anna-shakhova wants to merge 1 commit into from
+11 −1
Closed

AI Assistant: restore focus in chat after message processing #33794

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
2 changes: 2 additions & 0 deletions packages/devextreme/js/__internal/grids/grid_core/ai_chat/ai_chat.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ import type { AIChatOptions, CommandResult } from './types';

const mockWidgetInstance = {
option: jest.fn(),
blur: jest.fn(),
focus: jest.fn(),
};

jest.mock('../m_utils', () => ({
Expand Down
10 changes: 9 additions & 1 deletion packages/devextreme/js/__internal/grids/grid_core/ai_chat/ai_chat.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import type { Message, Properties as ChatProperties } from '@js/ui/chat';
import Chat from '@js/ui/chat';
import type { Properties as PopupProperties, ToolbarItem } from '@js/ui/popup';
import { MessageStatus } from '@ts/grids/grid_core/ai_assistant/const';
import type ChatTextArea from '@ts/ui/chat/message_box/chat_text_area';
import {
CHAT_MESSAGELIST_EMPTY_IMAGE_CLASS,
CHAT_MESSAGELIST_EMPTY_MESSAGE_CLASS,
Expand Down Expand Up @@ -257,7 +258,14 @@ export class AIChat {
const $textArea = this.chatInstance?.$element().find(`.${CLASSES.textArea}`);

if ($textArea?.length) {
gridCoreUtils.getWidgetInstance($textArea)?.option('disabled', disabled);
const chatTextAreaInstance: ChatTextArea = gridCoreUtils.getWidgetInstance($textArea);
chatTextAreaInstance?.option('disabled', disabled);

if (disabled) {
chatTextAreaInstance?.blur();
} else {
chatTextAreaInstance?.focus();
}
}
}

Expand Down
Loading