Skip to content

Commit 111b5a2

Browse files
authored
Support AIIntegration type in wrappers (DevExpress#29985)
1 parent a2647c7 commit 111b5a2

File tree

6 files changed

+18
-11
lines changed

6 files changed

+18
-11
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"axe-core": "4.10.3",
4545
"cheerio": "1.0.0-rc.10",
4646
"codelyzer": "6.0.2",
47-
"devextreme-internal-tools": "18.0.0-beta.2",
47+
"devextreme-internal-tools": "18.0.0-beta.3",
4848
"http-server": "14.1.1",
4949
"husky": "8.0.3",
5050
"jest": "29.7.0",

packages/devextreme-angular/src/ui/html-editor/index.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import {
2424
} from '@angular/core';
2525

2626

27+
import { AIIntegration } from 'devextreme/common/ai-integration';
2728
import { Converter, dxHtmlEditorImageUpload, dxHtmlEditorMediaResizing, dxHtmlEditorMention, ContentReadyEvent, DisposingEvent, FocusInEvent, FocusOutEvent, InitializedEvent, OptionChangedEvent, ValueChangedEvent, dxHtmlEditorTableContextMenu, dxHtmlEditorTableResizing, dxHtmlEditorToolbar, dxHtmlEditorVariables } from 'devextreme/ui/html_editor';
2829
import { EditorStyle, ValidationMessageMode, Position, ValidationStatus } from 'devextreme/common';
2930

@@ -133,10 +134,10 @@ export class DxHtmlEditorComponent extends DxComponent implements OnDestroy, Con
133134
134135
*/
135136
@Input()
136-
get aiIntegration(): Record<string, any> {
137+
get aiIntegration(): AIIntegration | undefined {
137138
return this._getOption('aiIntegration');
138139
}
139-
set aiIntegration(value: Record<string, any>) {
140+
set aiIntegration(value: AIIntegration | undefined) {
140141
this._setOption('aiIntegration', value);
141142
}
142143

@@ -631,7 +632,7 @@ export class DxHtmlEditorComponent extends DxComponent implements OnDestroy, Con
631632
* This member supports the internal infrastructure and is not intended to be used directly from your code.
632633
633634
*/
634-
@Output() aiIntegrationChange: EventEmitter<Record<string, any>>;
635+
@Output() aiIntegrationChange: EventEmitter<AIIntegration | undefined>;
635636

636637
/**
637638

packages/devextreme-vue/src/html-editor.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ import { prepareComponentConfig } from "./core/index";
44
import HtmlEditor, { Properties } from "devextreme/ui/html_editor";
55
import UploadInfo from "devextreme/file_management/upload_info";
66
import DataSource from "devextreme/data/data_source";
7+
import {
8+
AIIntegration,
9+
} from "devextreme/common/ai-integration";
710
import {
811
Converter,
912
dxHtmlEditorImageUpload,
@@ -120,7 +123,7 @@ const componentConfig = {
120123
props: {
121124
accessKey: String,
122125
activeStateEnabled: Boolean,
123-
aiIntegration: Object as PropType<Record<string, any>>,
126+
aiIntegration: Object as PropType<AIIntegration>,
124127
allowSoftLineBreak: Boolean,
125128
converter: Object as PropType<Converter | Record<string, any>>,
126129
customizeModules: Function as PropType<((config: any) => void)>,

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,6 @@ export interface dxHtmlEditorOptions extends EditorOptions<dxHtmlEditor> {
283283
* @docid
284284
* @default undefined
285285
* @public
286-
* @type object
287286
*/
288287
aiIntegration?: AIIntegration | undefined;
289288
/**

pnpm-lock.yaml

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tools/smd-cfg.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@
1111
"kind": "remove",
1212
"uid": "/card_view:Toolbar"
1313
},
14+
{
15+
"kind": "remove",
16+
"uid": "/ai-integration:AIIntegration"
17+
},
1418
{
1519
"kind": "remove",
1620
"uid": "/scheduler:Toolbar"

0 commit comments

Comments
 (0)