diff --git a/apps/demos/Demos/Diagram/OperationRestrictions/React/App.tsx b/apps/demos/Demos/Diagram/OperationRestrictions/React/App.tsx index 7b5d208b943b..0146cb09c4eb 100644 --- a/apps/demos/Demos/Diagram/OperationRestrictions/React/App.tsx +++ b/apps/demos/Demos/Diagram/OperationRestrictions/React/App.tsx @@ -154,10 +154,10 @@ export default function App() { > - + - + diff --git a/apps/demos/Demos/Diagram/OperationRestrictions/Vue/App.vue b/apps/demos/Demos/Diagram/OperationRestrictions/Vue/App.vue index ebbc053009f1..558c734e2500 100644 --- a/apps/demos/Demos/Diagram/OperationRestrictions/Vue/App.vue +++ b/apps/demos/Demos/Diagram/OperationRestrictions/Vue/App.vue @@ -74,7 +74,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 }: Record) => ({ fill: { diff --git a/packages/devextreme-angular/src/ui/diagram/index.ts b/packages/devextreme-angular/src/ui/diagram/index.ts index fe80ce0e90b7..43e3f8fbfa15 100644 --- a/packages/devextreme-angular/src/ui/diagram/index.ts +++ b/packages/devextreme-angular/src/ui/diagram/index.ts @@ -183,10 +183,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); } @@ -521,10 +521,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); } @@ -718,7 +718,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 }>; /** @@ -900,7 +900,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 75972e06e027..4ae4c6469ae5 100644 --- a/packages/devextreme-angular/src/ui/diagram/nested/group-dxi.ts +++ b/packages/devextreme-angular/src/ui/diagram/nested/group-dxi.ts @@ -88,10 +88,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 d2565eeeba53..53409c32a989 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 @@ -62,10 +62,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 e60d96924825..7b9509ee29f4 100644 --- a/packages/devextreme-angular/src/ui/diagram/nested/toolbox.ts +++ b/packages/devextreme-angular/src/ui/diagram/nested/toolbox.ts @@ -44,10 +44,10 @@ export class DxoDiagramToolboxComponent extends NestedOption implements OnDestro } @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/js/ui/diagram.d.ts b/packages/devextreme/js/ui/diagram.d.ts index 4dbb299f7957..ab0bf64e69b8 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 */ diff --git a/packages/devextreme/ts/dx.all.d.ts b/packages/devextreme/ts/dx.all.d.ts index 3eeb5dac2c5b..dc94cc8480a9 100644 --- a/packages/devextreme/ts/dx.all.d.ts +++ b/packages/devextreme/ts/dx.all.d.ts @@ -15262,7 +15262,7 @@ declare module DevExpress.ui { /** * [descr:dxDiagramOptions.contextToolbox.shapes] */ - shapes?: Array | Array; + shapes?: Array; /** * [descr:dxDiagramOptions.contextToolbox.width] */ @@ -15945,7 +15945,7 @@ declare module DevExpress.ui { /** * [descr:dxDiagramOptions.toolbox.groups.shapes] */ - shapes?: Array | Array; + shapes?: Array; /** * [descr:dxDiagramOptions.toolbox.groups.title] */