improve(CTA && MB): Improve types

Author: marker dao ®

packages/devextreme/js/__internal/ui/chat/message_box/chat_text_area.ts

@@ -4,13 +4,13 @@ import type { DefaultOptionsRule } from '@js/core/options/utils';
 import type { dxElementWrapper } from '@js/core/renderer';
 import $ from '@js/core/renderer';
 import { getOuterHeight } from '@js/core/utils/size';
+import type { NativeEventInfo } from '@js/events';
 import type {
   ClickEvent,
   InitializedEvent,
 } from '@js/ui/button';
 import type Button from '@js/ui/button';
 import type { Properties as FileUploaderProperties } from '@js/ui/file_uploader';
-import type { EnterKeyEvent } from '@js/ui/text_area';
 import { current, isMaterial } from '@js/ui/themes';
 import type { Item as ToolbarItem } from '@js/ui/toolbar';
 import Toolbar from '@js/ui/toolbar';
@@ -24,10 +24,14 @@ const TEXT_AREA_WITH_TOOLBAR = 'dx-textarea-with-toolbar';
 
 const isMobile = (): boolean => devices.current().deviceType !== 'desktop';
 
+type EnterKeyEvent = NativeEventInfo<ChatTextArea, KeyboardEvent>;
+
+export type SendEvent = ClickEvent | EnterKeyEvent;
+
 export type Properties = TextAreaProperties & {
   fileUploaderOptions?: FileUploaderProperties;
 
-  onSend?: (e: ClickEvent | EnterKeyEvent) => void;
+  onSend?: (e: SendEvent) => void;
 };
 
 class ChatTextArea extends TextArea<Properties> {
@@ -37,8 +41,7 @@ class ChatTextArea extends TextArea<Properties> {
 
   _sendButton?: Button;
 
-  /** KeyboardEvent should be replaced with EnterKeyEvent */
-  _sendAction?: (e: Partial<ClickEvent | KeyboardEvent>) => void;
+  _sendAction?: (e: SendEvent) => void;
 
   _getDefaultOptions(): Properties {
     return {
@@ -72,7 +75,11 @@ class ChatTextArea extends TextArea<Properties> {
       enter: (e): void => {
         if (!e?.shiftKey && this._isValuableTextEntered() && !isMobile()) {
           e.preventDefault();
-          this._processSendPress(e);
+          this._processSendButtonActivation({
+            component: this,
+            element: this.element(),
+            event: e,
+          });
         }
       },
     };
@@ -172,7 +179,7 @@ class ChatTextArea extends TextArea<Properties> {
           'aria-label': messageLocalization.format('dxChat-sendButtonAriaLabel'),
         },
         onClick: (e: ClickEvent): void => {
-          this._processSendPress(e);
+          this._processSendButtonActivation(e);
         },
         onInitialized: (e: InitializedEvent): void => {
           this._sendButton = e.component;
@@ -204,7 +211,7 @@ class ChatTextArea extends TextArea<Properties> {
     this._toggleButtonDisableState(shouldButtonBeDisabled);
   }
 
-  _processSendPress(e: ClickEvent | KeyboardEvent): void {
+  _processSendButtonActivation(e: SendEvent): void {
     this._sendAction?.(e);
     this.reset();
     this._toggleButtonDisableState(true);

packages/devextreme/js/__internal/ui/chat/message_box/message_box.ts

@@ -1,17 +1,18 @@
 import type { NativeEventInfo } from '@js/common/core/events';
 import $, { type dxElementWrapper } from '@js/core/renderer';
 import type { InteractionEvent } from '@js/events';
-import type { ClickEvent } from '@js/ui/button';
 import type { Properties as FileUploaderProperties } from '@js/ui/file_uploader';
+import type { InputEvent } from '@js/ui/text_area';
 import type { DOMComponentProperties } from '@ts/core/widget/dom_component';
 import DOMComponent from '@ts/core/widget/dom_component';
 import type { OptionChanged } from '@ts/core/widget/types';
-import type { Properties as ChatTextAreaProperties } from '@ts/ui/chat/message_box/chat_text_area';
+import type {
+  Properties as ChatTextAreaProperties,
+  SendEvent,
+} from '@ts/ui/chat/message_box/chat_text_area';
 import ChatTextArea from '@ts/ui/chat/message_box/chat_text_area';
 import EditingPreview from '@ts/ui/chat/message_box/editing_preview';
 
-import type { EnterKeyEvent, InputEvent } from '../../../../ui/text_area';
-
 export const CHAT_MESSAGEBOX_CLASS = 'dx-chat-messagebox';
 export const CHAT_MESSAGEBOX_TEXTAREA_CONTAINER_CLASS = 'dx-chat-messagebox-textarea-container';
 export const CHAT_MESSAGEBOX_TEXTAREA_CLASS = 'dx-chat-messagebox-textarea';
@@ -167,7 +168,7 @@ class MessageBox extends DOMComponent<MessageBox, Properties> {
         this._triggerTypingStartAction(e);
         this._updateTypingEndTimeout();
       },
-      onSend: (e: ClickEvent | EnterKeyEvent): void => {
+      onSend: (e: SendEvent): void => {
         this._sendHandler(e);
       },
     };
@@ -219,7 +220,7 @@ class MessageBox extends DOMComponent<MessageBox, Properties> {
     this._typingEndTimeoutId = undefined;
   }
 
-  _sendHandler(e: ClickEvent | EnterKeyEvent): void {
+  _sendHandler(e: SendEvent): void {
     this._clearTypingEndTimeout();
     this._typingEndAction?.();