From 64ad4a28e974c5a03360e13fd57ca0711a777c55 Mon Sep 17 00:00:00 2001 From: Mikhail Preyskurantov <5574159+mpreyskurantov@users.noreply.github.com> Date: Thu, 24 Apr 2025 21:18:26 +0300 Subject: [PATCH 1/3] vue | diagram.d.ts: declarations --- packages/devextreme/js/ui/diagram.d.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/devextreme/js/ui/diagram.d.ts b/packages/devextreme/js/ui/diagram.d.ts index 91b4dfb2a94d..b5a17f3b7f4b 100644 --- a/packages/devextreme/js/ui/diagram.d.ts +++ b/packages/devextreme/js/ui/diagram.d.ts @@ -287,7 +287,7 @@ export interface dxDiagramOptions extends WidgetOptions { /** * @docid */ - shapes?: Array | Array; + shapes?: Array; /** * @docid * @default 152 @@ -1068,7 +1068,7 @@ export interface dxDiagramOptions extends WidgetOptions { /** * @docid */ - shapes?: Array | Array; + shapes?: Array; /** * @docid */ From fa8c8ba1a6d752cf181eff05e4ec9cb1ea9d0e6f Mon Sep 17 00:00:00 2001 From: Mikhail Preyskurantov <5574159+mpreyskurantov@users.noreply.github.com> Date: Thu, 24 Apr 2025 21:19:02 +0300 Subject: [PATCH 2/3] vue | diagram.d.ts: regenerate-all --- packages/devextreme-angular/src/ui/diagram/index.ts | 12 ++++++------ .../src/ui/diagram/nested/context-toolbox.ts | 4 ++-- .../src/ui/diagram/nested/group-dxi.ts | 4 ++-- .../src/ui/diagram/nested/toolbox-group-dxi.ts | 4 ++-- .../src/ui/diagram/nested/toolbox.ts | 4 ++-- packages/devextreme-react/src/diagram.ts | 8 ++++---- packages/devextreme-vue/src/diagram.ts | 6 +++--- packages/devextreme/ts/dx.all.d.ts | 4 ++-- 8 files changed, 23 insertions(+), 23 deletions(-) diff --git a/packages/devextreme-angular/src/ui/diagram/index.ts b/packages/devextreme-angular/src/ui/diagram/index.ts index c6d3113bc984..4ac1d2f80b42 100644 --- a/packages/devextreme-angular/src/ui/diagram/index.ts +++ b/packages/devextreme-angular/src/ui/diagram/index.ts @@ -147,10 +147,10 @@ export class DxDiagramComponent extends DxComponent implements OnDestroy, OnChan */ @Input() - get contextToolbox(): { category?: ShapeCategory | string, displayMode?: ToolboxDisplayMode, enabled?: boolean, shapeIconsPerRow?: number, shapes?: Array, width?: number } { + get contextToolbox(): { category?: ShapeCategory | string, displayMode?: ToolboxDisplayMode, enabled?: boolean, shapeIconsPerRow?: number, shapes?: Array, width?: number } { return this._getOption('contextToolbox'); } - set contextToolbox(value: { category?: ShapeCategory | string, displayMode?: ToolboxDisplayMode, enabled?: boolean, shapeIconsPerRow?: number, shapes?: Array, width?: number }) { + set contextToolbox(value: { category?: ShapeCategory | string, displayMode?: ToolboxDisplayMode, enabled?: boolean, shapeIconsPerRow?: number, shapes?: Array, width?: number }) { this._setOption('contextToolbox', value); } @@ -485,10 +485,10 @@ export class DxDiagramComponent extends DxComponent implements OnDestroy, OnChan */ @Input() - get toolbox(): { groups?: { category?: ShapeCategory | string, displayMode?: ToolboxDisplayMode, expanded?: boolean, shapes?: Array, title?: string }[], shapeIconsPerRow?: number, showSearch?: boolean, visibility?: PanelVisibility, width?: number | undefined } { + get toolbox(): { groups?: { category?: ShapeCategory | string, displayMode?: ToolboxDisplayMode, expanded?: boolean, shapes?: Array, title?: string }[], shapeIconsPerRow?: number, showSearch?: boolean, visibility?: PanelVisibility, width?: number | undefined } { return this._getOption('toolbox'); } - set toolbox(value: { groups?: { category?: ShapeCategory | string, displayMode?: ToolboxDisplayMode, expanded?: boolean, shapes?: Array, title?: string }[], shapeIconsPerRow?: number, showSearch?: boolean, visibility?: PanelVisibility, width?: number | undefined }) { + set toolbox(value: { groups?: { category?: ShapeCategory | string, displayMode?: ToolboxDisplayMode, expanded?: boolean, shapes?: Array, title?: string }[], shapeIconsPerRow?: number, showSearch?: boolean, visibility?: PanelVisibility, width?: number | undefined }) { this._setOption('toolbox', value); } @@ -682,7 +682,7 @@ export class DxDiagramComponent extends DxComponent implements OnDestroy, OnChan * This member supports the internal infrastructure and is not intended to be used directly from your code. */ - @Output() contextToolboxChange: EventEmitter<{ category?: ShapeCategory | string, displayMode?: ToolboxDisplayMode, enabled?: boolean, shapeIconsPerRow?: number, shapes?: Array, width?: number }>; + @Output() contextToolboxChange: EventEmitter<{ category?: ShapeCategory | string, displayMode?: ToolboxDisplayMode, enabled?: boolean, shapeIconsPerRow?: number, shapes?: Array, width?: number }>; /** @@ -864,7 +864,7 @@ export class DxDiagramComponent extends DxComponent implements OnDestroy, OnChan * This member supports the internal infrastructure and is not intended to be used directly from your code. */ - @Output() toolboxChange: EventEmitter<{ groups?: { category?: ShapeCategory | string, displayMode?: ToolboxDisplayMode, expanded?: boolean, shapes?: Array, title?: string }[], shapeIconsPerRow?: number, showSearch?: boolean, visibility?: PanelVisibility, width?: number | undefined }>; + @Output() toolboxChange: EventEmitter<{ groups?: { category?: ShapeCategory | string, displayMode?: ToolboxDisplayMode, expanded?: boolean, shapes?: Array, title?: string }[], shapeIconsPerRow?: number, showSearch?: boolean, visibility?: PanelVisibility, width?: number | undefined }>; /** diff --git a/packages/devextreme-angular/src/ui/diagram/nested/context-toolbox.ts b/packages/devextreme-angular/src/ui/diagram/nested/context-toolbox.ts index bd665eef273a..622fe22dc6f2 100644 --- a/packages/devextreme-angular/src/ui/diagram/nested/context-toolbox.ts +++ b/packages/devextreme-angular/src/ui/diagram/nested/context-toolbox.ts @@ -65,10 +65,10 @@ export class DxoDiagramContextToolboxComponent extends NestedOption implements O } @Input() - get shapes(): Array { + get shapes(): Array { return this._getOption('shapes'); } - set shapes(value: Array) { + set shapes(value: Array) { this._setOption('shapes', value); } diff --git a/packages/devextreme-angular/src/ui/diagram/nested/group-dxi.ts b/packages/devextreme-angular/src/ui/diagram/nested/group-dxi.ts index eaf549b1a6c1..d0a2dafb8c40 100644 --- a/packages/devextreme-angular/src/ui/diagram/nested/group-dxi.ts +++ b/packages/devextreme-angular/src/ui/diagram/nested/group-dxi.ts @@ -75,10 +75,10 @@ export class DxiDiagramGroupComponent extends CollectionNestedOption { } @Input() - get shapes(): Array { + get shapes(): Array { return this._getOption('shapes'); } - set shapes(value: Array) { + set shapes(value: Array) { this._setOption('shapes', value); } diff --git a/packages/devextreme-angular/src/ui/diagram/nested/toolbox-group-dxi.ts b/packages/devextreme-angular/src/ui/diagram/nested/toolbox-group-dxi.ts index bf06d62e5cda..8e06eeafac17 100644 --- a/packages/devextreme-angular/src/ui/diagram/nested/toolbox-group-dxi.ts +++ b/packages/devextreme-angular/src/ui/diagram/nested/toolbox-group-dxi.ts @@ -55,10 +55,10 @@ export class DxiDiagramToolboxGroupComponent extends CollectionNestedOption { } @Input() - get shapes(): Array { + get shapes(): Array { return this._getOption('shapes'); } - set shapes(value: Array) { + set shapes(value: Array) { this._setOption('shapes', value); } diff --git a/packages/devextreme-angular/src/ui/diagram/nested/toolbox.ts b/packages/devextreme-angular/src/ui/diagram/nested/toolbox.ts index a77ffc01d57f..c4f6ce68f493 100644 --- a/packages/devextreme-angular/src/ui/diagram/nested/toolbox.ts +++ b/packages/devextreme-angular/src/ui/diagram/nested/toolbox.ts @@ -39,10 +39,10 @@ import { DxiDiagramToolboxGroupComponent } from './toolbox-group-dxi'; }) export class DxoDiagramToolboxComponent extends NestedOption implements OnDestroy, OnInit, AfterContentInit { @Input() - get groups(): { category?: ShapeCategory | string, displayMode?: ToolboxDisplayMode, expanded?: boolean, shapes?: Array, title?: string }[] { + get groups(): { category?: ShapeCategory | string, displayMode?: ToolboxDisplayMode, expanded?: boolean, shapes?: Array, title?: string }[] { return this._getOption('groups'); } - set groups(value: { category?: ShapeCategory | string, displayMode?: ToolboxDisplayMode, expanded?: boolean, shapes?: Array, title?: string }[]) { + set groups(value: { category?: ShapeCategory | string, displayMode?: ToolboxDisplayMode, expanded?: boolean, shapes?: Array, title?: string }[]) { this._setOption('groups', value); } diff --git a/packages/devextreme-react/src/diagram.ts b/packages/devextreme-react/src/diagram.ts index 8c31a779cfa9..94c717cb9610 100644 --- a/packages/devextreme-react/src/diagram.ts +++ b/packages/devextreme-react/src/diagram.ts @@ -241,7 +241,7 @@ type IContextToolboxProps = React.PropsWithChildren<{ displayMode?: ToolboxDisplayMode; enabled?: boolean; shapeIconsPerRow?: number; - shapes?: Array; + shapes?: Array; width?: number; }> const _componentContextToolbox = (props: IContextToolboxProps) => { @@ -468,7 +468,7 @@ type IGroupProps = React.PropsWithChildren<{ category?: ShapeCategory | string; displayMode?: ToolboxDisplayMode; expanded?: boolean; - shapes?: Array; + shapes?: Array; }> const _componentGroup = (props: IGroupProps) => { return React.createElement(NestedOption, { @@ -745,7 +745,7 @@ type IToolboxProps = React.PropsWithChildren<{ category?: ShapeCategory | string; displayMode?: ToolboxDisplayMode; expanded?: boolean; - shapes?: Array; + shapes?: Array; title?: string; }[]; shapeIconsPerRow?: number; @@ -776,7 +776,7 @@ type IToolboxGroupProps = React.PropsWithChildren<{ category?: ShapeCategory | string; displayMode?: ToolboxDisplayMode; expanded?: boolean; - shapes?: Array; + shapes?: Array; title?: string; }> const _componentToolboxGroup = (props: IToolboxGroupProps) => { diff --git a/packages/devextreme-vue/src/diagram.ts b/packages/devextreme-vue/src/diagram.ts index fc0540a59962..551fe1416c39 100644 --- a/packages/devextreme-vue/src/diagram.ts +++ b/packages/devextreme-vue/src/diagram.ts @@ -357,7 +357,7 @@ const DxContextToolboxConfig = { displayMode: String as PropType, enabled: Boolean, shapeIconsPerRow: Number, - shapes: Array as PropType>, + shapes: Array as PropType>, width: Number } }; @@ -628,7 +628,7 @@ const DxGroupConfig = { commands: Array as PropType>, displayMode: String as PropType, expanded: Boolean, - shapes: Array as PropType>, + shapes: Array as PropType>, title: String } }; @@ -937,7 +937,7 @@ const DxToolboxGroupConfig = { category: String as PropType, displayMode: String as PropType, expanded: Boolean, - shapes: Array as PropType>, + shapes: Array as PropType>, title: String } }; diff --git a/packages/devextreme/ts/dx.all.d.ts b/packages/devextreme/ts/dx.all.d.ts index 37808f0f796a..5cf382a905fc 100644 --- a/packages/devextreme/ts/dx.all.d.ts +++ b/packages/devextreme/ts/dx.all.d.ts @@ -14996,7 +14996,7 @@ declare module DevExpress.ui { /** * [descr:dxDiagramOptions.contextToolbox.shapes] */ - shapes?: Array | Array; + shapes?: Array; /** * [descr:dxDiagramOptions.contextToolbox.width] */ @@ -15679,7 +15679,7 @@ declare module DevExpress.ui { /** * [descr:dxDiagramOptions.toolbox.groups.shapes] */ - shapes?: Array | Array; + shapes?: Array; /** * [descr:dxDiagramOptions.toolbox.groups.title] */ From 24836f25eeb6a363ad1f2fb9ac6e3b72775b833b Mon Sep 17 00:00:00 2001 From: Mikhail Preyskurantov <5574159+mpreyskurantov@users.noreply.github.com> Date: Thu, 24 Apr 2025 21:19:39 +0300 Subject: [PATCH 3/3] vue | diagram.d.ts: demo --- apps/demos/Demos/Diagram/OperationRestrictions/Vue/App.vue | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/apps/demos/Demos/Diagram/OperationRestrictions/Vue/App.vue b/apps/demos/Demos/Diagram/OperationRestrictions/Vue/App.vue index fe202e580dd8..f7a413941c54 100644 --- a/apps/demos/Demos/Diagram/OperationRestrictions/Vue/App.vue +++ b/apps/demos/Demos/Diagram/OperationRestrictions/Vue/App.vue @@ -63,8 +63,7 @@ import { DxContextToolbox, DxToolbox, DxPropertiesPanel, - DxGroup, - type DxDiagramTypes, + DxGroup } from 'devextreme-vue/diagram'; import notify from 'devextreme/ui/notify'; import { ArrayStore } from 'devextreme-vue/common/data'; @@ -74,7 +73,7 @@ const orgItemsDataSource = new ArrayStore({ key: 'ID', data: service.getOrgItems(), }); -const shapes = ['team', 'employee'] as unknown as DxDiagramTypes.ShapeType[]; +const shapes = ['team', 'employee']; const itemStyleExpr = ({ Type }) => ({ fill: {