Skip to content

Commit 4d9aec7

Browse files
marker-daomarker dao ®
andauthored
Chat: Improve MessageBase.type typings (#34058)
Co-authored-by: marker dao ® <youdontknow@marker-dao.eth>
1 parent a662a65 commit 4d9aec7

8 files changed

Lines changed: 25 additions & 12 deletions

File tree

packages/devextreme-angular/src/ui/chat/nested/item-dxi.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import {
1212

1313

1414

15-
import { User } from 'devextreme/ui/chat';
15+
import { User, MessageType } from 'devextreme/ui/chat';
1616

1717
import {
1818
DxIntegrationModule,
@@ -102,10 +102,10 @@ export class DxiChatItemComponent extends CollectionNestedOption {
102102
}
103103

104104
@Input()
105-
get type(): string | undefined {
105+
get type(): MessageType {
106106
return this._getOption('type');
107107
}
108-
set type(value: string | undefined) {
108+
set type(value: MessageType) {
109109
this._setOption('type', value);
110110
}
111111

packages/devextreme-angular/src/ui/nested/base/button-group-item-dxi.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,10 @@ export abstract class DxiButtonGroupItem extends CollectionNestedOption {
9898
this._setOption('stylingMode', value);
9999
}
100100

101-
get type(): ButtonType | string | undefined {
101+
get type(): ButtonType | string {
102102
return this._getOption('type');
103103
}
104-
set type(value: ButtonType | string | undefined) {
104+
set type(value: ButtonType | string) {
105105
this._setOption('type', value);
106106
}
107107

packages/devextreme-metadata/make-angular-metadata.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ Ng.makeMetadata({
1111
},
1212
mutations: [
1313
removeMembers(/\/card_view:/),
14+
removeMembers(/\/chat:MessageType/),
15+
removeMembers(/\/chat:MessageBase.type/),
1416
removeMembers(/\/scheduler:Toolbar/),
1517
removeMembers(/\/stepper:/),
1618
removeMembers(/\/tree_list:dxTreeListColumnButton.onClick/),

packages/devextreme-react/src/chat.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import dxChat, {
88
import { Component as BaseComponent, IHtmlOptions, ComponentRef, NestedComponentMeta } from "./core/component";
99
import NestedOption from "./core/nested-option";
1010

11-
import type { Message, DisposingEvent, InitializedEvent, MessageDeletedEvent, MessageDeletingEvent, MessageEditCanceledEvent, MessageEditingStartEvent, MessageEnteredEvent, MessageUpdatedEvent, MessageUpdatingEvent, TypingEndEvent, TypingStartEvent, User as ChatUser } from "devextreme/ui/chat";
11+
import type { Message, DisposingEvent, InitializedEvent, MessageDeletedEvent, MessageDeletingEvent, MessageEditCanceledEvent, MessageEditingStartEvent, MessageEnteredEvent, MessageUpdatedEvent, MessageUpdatingEvent, TypingEndEvent, TypingStartEvent, User as ChatUser, MessageType } from "devextreme/ui/chat";
1212
import type { Format } from "devextreme/common";
1313

1414

@@ -190,7 +190,7 @@ type IItemProps = React.PropsWithChildren<{
190190
src?: string;
191191
text?: string;
192192
timestamp?: Date | number | string;
193-
type?: string | undefined;
193+
type?: MessageType;
194194
}>
195195
const _componentItem = (props: IItemProps) => {
196196
return React.createElement(NestedOption<IItemProps>, {

packages/devextreme-vue/src/chat.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import {
2020
TypingEndEvent,
2121
TypingStartEvent,
2222
User,
23+
MessageType,
2324
} from "devextreme/ui/chat";
2425
import {
2526
DataSourceOptions,
@@ -297,7 +298,7 @@ const DxItemConfig = {
297298
src: String,
298299
text: String,
299300
timestamp: [Date, Number, String],
300-
type: String
301+
type: String as PropType<MessageType>
301302
}
302303
};
303304

packages/devextreme/js/ui/chat.d.ts

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,13 @@ export type Alert = {
196196
message?: string;
197197
};
198198

199+
/**
200+
* @docid
201+
* @namespace DevExpress.ui.dxChat
202+
* @public
203+
*/
204+
export type MessageType = 'text' | 'image';
205+
199206
/**
200207
* @docid
201208
* @namespace DevExpress.ui.dxChat
@@ -210,11 +217,9 @@ export type MessageBase = {
210217
id?: number | string;
211218
/**
212219
* @docid
213-
* @default undefined
214-
* @type string|undefined
215220
* @public
216221
*/
217-
type?: 'text' | 'image' | undefined;
222+
type?: MessageType;
218223
/**
219224
* @docid
220225
* @public

packages/devextreme/js/ui/chat_types.d.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ export {
1313
MessageUpdatedEvent,
1414
User,
1515
Alert,
16+
MessageType,
1617
TextMessage,
1718
ImageMessage,
1819
Message,

packages/devextreme/ts/dx.all.d.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33428,7 +33428,7 @@ declare module DevExpress.ui.dxChat {
3342833428
/**
3342933429
* [descr:MessageBase.type]
3343033430
*/
33431-
type?: 'text' | 'image' | undefined;
33431+
type?: MessageType;
3343233432
/**
3343333433
* [descr:MessageBase.timestamp]
3343433434
*/
@@ -33444,6 +33444,10 @@ declare module DevExpress.ui.dxChat {
3344433444

3344533445
[key: string]: any;
3344633446
};
33447+
/**
33448+
* [descr:MessageType]
33449+
*/
33450+
export type MessageType = 'text' | 'image';
3344733451
/**
3344833452
* [descr:TextMessage]
3344933453
*/

0 commit comments

Comments
 (0)