Merge branch '24_2' into 24_2_dataSource_d_ts

DevExpress · Aug 30, 2024 · a40db18 · a40db18
2 parents 20b80a7 + 8404bc4
commit a40db18
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 11 deletions.
diff --git a/packages/devextreme-angular/src/ui/chat/index.ts b/packages/devextreme-angular/src/ui/chat/index.ts
@@ -78,7 +78,7 @@ export class DxChatComponent extends DxComponent implements OnDestroy, OnChanges
 
 
     /**
-     * [descr:WidgetOptions.activeStateEnabled]
+     * [descr:dxChatOptions.activeStateEnabled]
     
      */
     @Input()
@@ -130,7 +130,7 @@ export class DxChatComponent extends DxComponent implements OnDestroy, OnChanges
 
 
     /**
-     * [descr:WidgetOptions.focusStateEnabled]
+     * [descr:dxChatOptions.focusStateEnabled]
     
      */
     @Input()
@@ -169,7 +169,7 @@ export class DxChatComponent extends DxComponent implements OnDestroy, OnChanges
 
 
     /**
-     * [descr:WidgetOptions.hoverStateEnabled]
+     * [descr:dxChatOptions.hoverStateEnabled]
     
      */
     @Input()

diff --git a/packages/devextreme/js/__internal/ui/chat/chat.ts b/packages/devextreme/js/__internal/ui/chat/chat.ts
@@ -29,6 +29,9 @@ class Chat extends Widget<Properties> {
   _getDefaultOptions(): Properties {
     return {
       ...super._getDefaultOptions(),
+      activeStateEnabled: true,
+      focusStateEnabled: true,
+      hoverStateEnabled: true,
       title: '',
       items: [],
       dataSource: null,

diff --git a/packages/devextreme/js/ui/chat.d.ts b/packages/devextreme/js/ui/chat.d.ts
@@ -111,11 +111,22 @@ export type Message = {
 export interface dxChatOptions extends WidgetOptions<dxChat> {
     /**
      * @docid
-     * @type string | Array<Message> | Store | DataSource | DataSourceOptions | null
-     * @default null
+     * @default true
      * @public
      */
-    dataSource?: DataSourceLike<Message> | null;
+    activeStateEnabled?: boolean;
+    /**
+     * @docid
+     * @default true
+     * @public
+     */
+    focusStateEnabled?: boolean;
+    /**
+     * @docid
+     * @default true
+     * @public
+     */
+    hoverStateEnabled?: boolean;
     /**
      * @docid
      * @default { id: new Guid().toString() }
@@ -135,6 +146,13 @@ export interface dxChatOptions extends WidgetOptions<dxChat> {
      * @public
      */
     items?: Array<Message>;
+    /**
+     * @docid
+     * @type string | Array<Message> | Store | DataSource | DataSourceOptions | null
+     * @default null
+     * @public
+     */
+    dataSource?: DataSourceLike<Message> | null;
     /**
      * @docid
      * @default null

diff --git a/packages/devextreme/testing/tests/DevExpress.ui/defaultOptions.tests.js b/packages/devextreme/testing/tests/DevExpress.ui/defaultOptions.tests.js
@@ -1342,9 +1342,12 @@ testComponentDefaults(ColorBox,
 testComponentDefaults(Chat,
     {},
     {
+        activeStateEnabled: true,
+        focusStateEnabled: true,
+        hoverStateEnabled: true,
         title: '',
-        onMessageSend: null,
-        dataSource: null,
+        onMessageSend: undefined,
+        dataSource: undefined,
     }
 );
 

diff --git a/packages/devextreme/ts/dx.all.d.ts b/packages/devextreme/ts/dx.all.d.ts
@@ -4837,7 +4837,7 @@ declare module DevExpress.core {
   /**
    * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution.
    */
-  type ComponentFactory<TComponent> = {
+  export type ComponentFactory<TComponent> = {
     new (
       element: UserDefinedElement,
       options?: Record<string, unknown>
@@ -9464,9 +9464,17 @@ declare module DevExpress.ui {
    */
   export interface dxChatOptions extends WidgetOptions<dxChat> {
     /**
-     * [descr:dxChatOptions.dataSource]
+     * [descr:dxChatOptions.activeStateEnabled]
      */
-    dataSource?: DevExpress.data.DataSource.DataSourceLike<DevExpress.ui.dxChat.Message> | null;
+    activeStateEnabled?: boolean;
+    /**
+     * [descr:dxChatOptions.focusStateEnabled]
+     */
+    focusStateEnabled?: boolean;
+    /**
+     * [descr:dxChatOptions.hoverStateEnabled]
+     */
+    hoverStateEnabled?: boolean;
     /**
      * [descr:dxChatOptions.user]
      */
@@ -9479,6 +9487,10 @@ declare module DevExpress.ui {
      * [descr:dxChatOptions.items]
      */
     items?: Array<DevExpress.ui.dxChat.Message>;
+    /**
+     * [descr:dxChatOptions.dataSource]
+     */
+    dataSource?: DevExpress.data.DataSource.DataSourceLike<DevExpress.ui.dxChat.Message> | null;
     /**
      * [descr:dxChatOptions.onMessageSend]
      */