Skip to content

WIP: Check CI #29699

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: 25_1
Choose a base branch
from
Open

WIP: Check CI #29699

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dcfbb16
vue | diagram.d.ts: declarations
mpreyskurantov Apr 24, 2025
dba1af6
vue | diagram.d.ts: regenerate-all
mpreyskurantov Apr 24, 2025
9859110
vue | diagram.d.ts: demo
mpreyskurantov Apr 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions apps/demos/Demos/Diagram/OperationRestrictions/Vue/App.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,7 @@ import {
DxContextToolbox,
DxToolbox,
DxPropertiesPanel,
DxGroup,
type DxDiagramTypes,
DxGroup
} from 'devextreme-vue/diagram';
import notify from 'devextreme/ui/notify';
import ArrayStore from 'devextreme/data/array_store';
Expand All @@ -77,7 +76,7 @@ const orgItemsDataSource = new ArrayStore({
data: service.getOrgItems(),
});
const diagram = ref();
const shapes = ['team', 'employee'] as unknown as DxDiagramTypes.ShapeType[];
const shapes = ['team', 'employee'];

const itemStyleExpr = ({ Type }) => ({
fill: {
Expand Down
12 changes: 6 additions & 6 deletions packages/devextreme-angular/src/ui/diagram/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,10 +145,10 @@ export class DxDiagramComponent extends DxComponent implements OnDestroy, OnChan

*/
@Input()
get contextToolbox(): { category?: ShapeCategory | string, displayMode?: ToolboxDisplayMode, enabled?: boolean, shapeIconsPerRow?: number, shapes?: Array<ShapeType>, width?: number } {
get contextToolbox(): { category?: ShapeCategory | string, displayMode?: ToolboxDisplayMode, enabled?: boolean, shapeIconsPerRow?: number, shapes?: Array<ShapeType | string>, width?: number } {
return this._getOption('contextToolbox');
}
set contextToolbox(value: { category?: ShapeCategory | string, displayMode?: ToolboxDisplayMode, enabled?: boolean, shapeIconsPerRow?: number, shapes?: Array<ShapeType>, width?: number }) {
set contextToolbox(value: { category?: ShapeCategory | string, displayMode?: ToolboxDisplayMode, enabled?: boolean, shapeIconsPerRow?: number, shapes?: Array<ShapeType | string>, width?: number }) {
this._setOption('contextToolbox', value);
}

Expand Down Expand Up @@ -483,10 +483,10 @@ export class DxDiagramComponent extends DxComponent implements OnDestroy, OnChan

*/
@Input()
get toolbox(): { groups?: { category?: ShapeCategory | string, displayMode?: ToolboxDisplayMode, expanded?: boolean, shapes?: Array<ShapeType>, title?: string }[], shapeIconsPerRow?: number, showSearch?: boolean, visibility?: PanelVisibility, width?: number | undefined } {
get toolbox(): { groups?: { category?: ShapeCategory | string, displayMode?: ToolboxDisplayMode, expanded?: boolean, shapes?: Array<ShapeType | string>, 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<ShapeType>, title?: string }[], shapeIconsPerRow?: number, showSearch?: boolean, visibility?: PanelVisibility, width?: number | undefined }) {
set toolbox(value: { groups?: { category?: ShapeCategory | string, displayMode?: ToolboxDisplayMode, expanded?: boolean, shapes?: Array<ShapeType | string>, title?: string }[], shapeIconsPerRow?: number, showSearch?: boolean, visibility?: PanelVisibility, width?: number | undefined }) {
this._setOption('toolbox', value);
}

Expand Down Expand Up @@ -680,7 +680,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<ShapeType>, width?: number }>;
@Output() contextToolboxChange: EventEmitter<{ category?: ShapeCategory | string, displayMode?: ToolboxDisplayMode, enabled?: boolean, shapeIconsPerRow?: number, shapes?: Array<ShapeType | string>, width?: number }>;

/**

Expand Down Expand Up @@ -862,7 +862,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<ShapeType>, title?: string }[], shapeIconsPerRow?: number, showSearch?: boolean, visibility?: PanelVisibility, width?: number | undefined }>;
@Output() toolboxChange: EventEmitter<{ groups?: { category?: ShapeCategory | string, displayMode?: ToolboxDisplayMode, expanded?: boolean, shapes?: Array<ShapeType | string>, title?: string }[], shapeIconsPerRow?: number, showSearch?: boolean, visibility?: PanelVisibility, width?: number | undefined }>;

/**

Expand Down
4 changes: 2 additions & 2 deletions packages/devextreme-angular/src/ui/diagram/nested/context-toolbox.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,10 @@ export class DxoDiagramContextToolboxComponent extends NestedOption implements O
}

@Input()
get shapes(): Array<ShapeType> {
get shapes(): Array<ShapeType | string> {
return this._getOption('shapes');
}
set shapes(value: Array<ShapeType>) {
set shapes(value: Array<ShapeType | string>) {
this._setOption('shapes', value);
}

Expand Down
4 changes: 2 additions & 2 deletions packages/devextreme-angular/src/ui/diagram/nested/group-dxi.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,10 @@ export class DxiDiagramGroupComponent extends CollectionNestedOption {
}

@Input()
get shapes(): Array<ShapeType> {
get shapes(): Array<ShapeType | string> {
return this._getOption('shapes');
}
set shapes(value: Array<ShapeType>) {
set shapes(value: Array<ShapeType | string>) {
this._setOption('shapes', value);
}

Expand Down
4 changes: 2 additions & 2 deletions packages/devextreme-angular/src/ui/diagram/nested/toolbox-group-dxi.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,10 @@ export class DxiDiagramToolboxGroupComponent extends CollectionNestedOption {
}

@Input()
get shapes(): Array<ShapeType> {
get shapes(): Array<ShapeType | string> {
return this._getOption('shapes');
}
set shapes(value: Array<ShapeType>) {
set shapes(value: Array<ShapeType | string>) {
this._setOption('shapes', value);
}

Expand Down
4 changes: 2 additions & 2 deletions packages/devextreme-angular/src/ui/diagram/nested/toolbox.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ import { DxiDiagramToolboxGroupComponent } from './toolbox-group-dxi';
})
export class DxoDiagramToolboxComponent extends NestedOption implements OnDestroy, OnInit {
@Input()
get groups(): { category?: ShapeCategory | string, displayMode?: ToolboxDisplayMode, expanded?: boolean, shapes?: Array<ShapeType>, title?: string }[] {
get groups(): { category?: ShapeCategory | string, displayMode?: ToolboxDisplayMode, expanded?: boolean, shapes?: Array<ShapeType | string>, title?: string }[] {
return this._getOption('groups');
}
set groups(value: { category?: ShapeCategory | string, displayMode?: ToolboxDisplayMode, expanded?: boolean, shapes?: Array<ShapeType>, title?: string }[]) {
set groups(value: { category?: ShapeCategory | string, displayMode?: ToolboxDisplayMode, expanded?: boolean, shapes?: Array<ShapeType | string>, title?: string }[]) {
this._setOption('groups', value);
}

Expand Down
8 changes: 4 additions & 4 deletions packages/devextreme-react/src/diagram.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ type IContextToolboxProps = React.PropsWithChildren<{
displayMode?: ToolboxDisplayMode;
enabled?: boolean;
shapeIconsPerRow?: number;
shapes?: Array<ShapeType>;
shapes?: Array<ShapeType | string>;
width?: number;
}>
const _componentContextToolbox = (props: IContextToolboxProps) => {
Expand Down Expand Up @@ -468,7 +468,7 @@ type IGroupProps = React.PropsWithChildren<{
category?: ShapeCategory | string;
displayMode?: ToolboxDisplayMode;
expanded?: boolean;
shapes?: Array<ShapeType>;
shapes?: Array<ShapeType | string>;
}>
const _componentGroup = (props: IGroupProps) => {
return React.createElement(NestedOption<IGroupProps>, {
Expand Down Expand Up @@ -745,7 +745,7 @@ type IToolboxProps = React.PropsWithChildren<{
category?: ShapeCategory | string;
displayMode?: ToolboxDisplayMode;
expanded?: boolean;
shapes?: Array<ShapeType>;
shapes?: Array<ShapeType | string>;
title?: string;
}[];
shapeIconsPerRow?: number;
Expand Down Expand Up @@ -776,7 +776,7 @@ type IToolboxGroupProps = React.PropsWithChildren<{
category?: ShapeCategory | string;
displayMode?: ToolboxDisplayMode;
expanded?: boolean;
shapes?: Array<ShapeType>;
shapes?: Array<ShapeType | string>;
title?: string;
}>
const _componentToolboxGroup = (props: IToolboxGroupProps) => {
Expand Down
6 changes: 3 additions & 3 deletions packages/devextreme-vue/src/diagram.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ const DxContextToolboxConfig = {
displayMode: String as PropType<ToolboxDisplayMode>,
enabled: Boolean,
shapeIconsPerRow: Number,
shapes: Array as PropType<Array<ShapeType>>,
shapes: Array as PropType<Array<ShapeType | string>>,
width: Number
}
};
Expand Down Expand Up @@ -628,7 +628,7 @@ const DxGroupConfig = {
commands: Array as PropType<Array<Command | CustomCommand>>,
displayMode: String as PropType<ToolboxDisplayMode>,
expanded: Boolean,
shapes: Array as PropType<Array<ShapeType>>,
shapes: Array as PropType<Array<ShapeType | string>>,
title: String
}
};
Expand Down Expand Up @@ -937,7 +937,7 @@ const DxToolboxGroupConfig = {
category: String as PropType<ShapeCategory | string>,
displayMode: String as PropType<ToolboxDisplayMode>,
expanded: Boolean,
shapes: Array as PropType<Array<ShapeType>>,
shapes: Array as PropType<Array<ShapeType | string>>,
title: String
}
};
Expand Down
4 changes: 2 additions & 2 deletions packages/devextreme/js/ui/diagram.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ export interface dxDiagramOptions extends WidgetOptions<dxDiagram> {
/**
* @docid
*/
shapes?: Array<ShapeType> | Array<string>;
shapes?: Array<ShapeType | string>;
/**
* @docid
* @default 152
Expand Down Expand Up @@ -1068,7 +1068,7 @@ export interface dxDiagramOptions extends WidgetOptions<dxDiagram> {
/**
* @docid
*/
shapes?: Array<ShapeType> | Array<string>;
shapes?: Array<ShapeType | string>;
/**
* @docid
*/
Expand Down
4 changes: 2 additions & 2 deletions packages/devextreme/ts/dx.all.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13995,7 +13995,7 @@ declare module DevExpress.ui {
/**
* [descr:dxDiagramOptions.contextToolbox.shapes]
*/
shapes?: Array<DevExpress.ui.dxDiagram.ShapeType> | Array<string>;
shapes?: Array<DevExpress.ui.dxDiagram.ShapeType | string>;
/**
* [descr:dxDiagramOptions.contextToolbox.width]
*/
Expand Down Expand Up @@ -14678,7 +14678,7 @@ declare module DevExpress.ui {
/**
* [descr:dxDiagramOptions.toolbox.groups.shapes]
*/
shapes?: Array<DevExpress.ui.dxDiagram.ShapeType> | Array<string>;
shapes?: Array<DevExpress.ui.dxDiagram.ShapeType | string>;
/**
* [descr:dxDiagramOptions.toolbox.groups.title]
*/
Expand Down
Loading