Skip to content

Commit

Permalink
dxDiagramCustomCommand -> CustomCommand after @public
Browse files Browse the repository at this point in the history
  • Loading branch information
@mpreyskurantov
mpreyskurantov committed May 20, 2024
1 parent 3e1a946 commit ee30773
Show file tree
Hide file tree
Showing 16 changed files with 113 additions and 105 deletions.
32 changes: 16 additions & 16 deletions packages/devextreme-angular/src/ui/diagram/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import {
import { Orientation, PageOrientation } from 'devextreme/common';
import { Store } from 'devextreme/data';
import DataSource, { Options as DataSourceOptions } from 'devextreme/data/data_source';
import { AutoZoomMode, Command, ConnectorLineEnd, ConnectorLineType, ContentReadyEvent, CustomCommandEvent, DataLayoutType, DisposingEvent, dxDiagramCustomCommand, InitializedEvent, ItemClickEvent, ItemDblClickEvent, OptionChangedEvent, PanelVisibility, RequestEditOperationEvent, RequestLayoutUpdateEvent, SelectionChangedEvent, ShapeCategory, ShapeType, ToolboxDisplayMode, Units } from 'devextreme/ui/diagram';
import { AutoZoomMode, Command, ConnectorLineEnd, ConnectorLineType, ContentReadyEvent, CustomCommand, CustomCommandEvent, DataLayoutType, DisposingEvent, InitializedEvent, ItemClickEvent, ItemDblClickEvent, OptionChangedEvent, PanelVisibility, RequestEditOperationEvent, RequestLayoutUpdateEvent, SelectionChangedEvent, ShapeCategory, ShapeType, ToolboxDisplayMode, Units } from 'devextreme/ui/diagram';

import DxDiagram from 'devextreme/ui/diagram';

Expand Down Expand Up @@ -103,10 +103,10 @@ export class DxDiagramComponent extends DxComponent implements OnDestroy, OnChan
*/
@Input()
get contextMenu(): { commands?: Array<dxDiagramCustomCommand | Command>, enabled?: boolean } {
get contextMenu(): { commands?: Array<CustomCommand | Command>, enabled?: boolean } {
return this._getOption('contextMenu');
}
set contextMenu(value: { commands?: Array<dxDiagramCustomCommand | Command>, enabled?: boolean }) {
set contextMenu(value: { commands?: Array<CustomCommand | Command>, enabled?: boolean }) {
this._setOption('contextMenu', value);
}

Expand Down Expand Up @@ -298,10 +298,10 @@ export class DxDiagramComponent extends DxComponent implements OnDestroy, OnChan
*/
@Input()
get historyToolbar(): { commands?: Array<dxDiagramCustomCommand | Command>, visible?: boolean } {
get historyToolbar(): { commands?: Array<CustomCommand | Command>, visible?: boolean } {
return this._getOption('historyToolbar');
}
set historyToolbar(value: { commands?: Array<dxDiagramCustomCommand | Command>, visible?: boolean }) {
set historyToolbar(value: { commands?: Array<CustomCommand | Command>, visible?: boolean }) {
this._setOption('historyToolbar', value);
}

Expand All @@ -311,10 +311,10 @@ export class DxDiagramComponent extends DxComponent implements OnDestroy, OnChan
*/
@Input()
get mainToolbar(): { commands?: Array<dxDiagramCustomCommand | Command>, visible?: boolean } {
get mainToolbar(): { commands?: Array<CustomCommand | Command>, visible?: boolean } {
return this._getOption('mainToolbar');
}
set mainToolbar(value: { commands?: Array<dxDiagramCustomCommand | Command>, visible?: boolean }) {
set mainToolbar(value: { commands?: Array<CustomCommand | Command>, visible?: boolean }) {
this._setOption('mainToolbar', value);
}

Expand Down Expand Up @@ -376,10 +376,10 @@ export class DxDiagramComponent extends DxComponent implements OnDestroy, OnChan
*/
@Input()
get propertiesPanel(): { tabs?: Array<any | { commands?: Array<dxDiagramCustomCommand | Command>, groups?: Array<any | { commands?: Array<dxDiagramCustomCommand | Command>, title?: string }>, title?: string }>, visibility?: PanelVisibility } {
get propertiesPanel(): { tabs?: Array<any | { commands?: Array<CustomCommand | Command>, groups?: Array<any | { commands?: Array<CustomCommand | Command>, title?: string }>, title?: string }>, visibility?: PanelVisibility } {
return this._getOption('propertiesPanel');
}
set propertiesPanel(value: { tabs?: Array<any | { commands?: Array<dxDiagramCustomCommand | Command>, groups?: Array<any | { commands?: Array<dxDiagramCustomCommand | Command>, title?: string }>, title?: string }>, visibility?: PanelVisibility }) {
set propertiesPanel(value: { tabs?: Array<any | { commands?: Array<CustomCommand | Command>, groups?: Array<any | { commands?: Array<CustomCommand | Command>, title?: string }>, title?: string }>, visibility?: PanelVisibility }) {
this._setOption('propertiesPanel', value);
}

Expand Down Expand Up @@ -493,10 +493,10 @@ export class DxDiagramComponent extends DxComponent implements OnDestroy, OnChan
*/
@Input()
get viewToolbar(): { commands?: Array<dxDiagramCustomCommand | Command>, visible?: boolean } {
get viewToolbar(): { commands?: Array<CustomCommand | Command>, visible?: boolean } {
return this._getOption('viewToolbar');
}
set viewToolbar(value: { commands?: Array<dxDiagramCustomCommand | Command>, visible?: boolean }) {
set viewToolbar(value: { commands?: Array<CustomCommand | Command>, visible?: boolean }) {
this._setOption('viewToolbar', value);
}

Expand Down Expand Up @@ -644,7 +644,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() contextMenuChange: EventEmitter<{ commands?: Array<dxDiagramCustomCommand | Command>, enabled?: boolean }>;
@Output() contextMenuChange: EventEmitter<{ commands?: Array<CustomCommand | Command>, enabled?: boolean }>;

/**
Expand Down Expand Up @@ -749,14 +749,14 @@ 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() historyToolbarChange: EventEmitter<{ commands?: Array<dxDiagramCustomCommand | Command>, visible?: boolean }>;
@Output() historyToolbarChange: EventEmitter<{ commands?: Array<CustomCommand | Command>, visible?: boolean }>;

/**
* This member supports the internal infrastructure and is not intended to be used directly from your code.
*/
@Output() mainToolbarChange: EventEmitter<{ commands?: Array<dxDiagramCustomCommand | Command>, visible?: boolean }>;
@Output() mainToolbarChange: EventEmitter<{ commands?: Array<CustomCommand | Command>, visible?: boolean }>;

/**
Expand Down Expand Up @@ -791,7 +791,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() propertiesPanelChange: EventEmitter<{ tabs?: Array<any | { commands?: Array<dxDiagramCustomCommand | Command>, groups?: Array<any | { commands?: Array<dxDiagramCustomCommand | Command>, title?: string }>, title?: string }>, visibility?: PanelVisibility }>;
@Output() propertiesPanelChange: EventEmitter<{ tabs?: Array<any | { commands?: Array<CustomCommand | Command>, groups?: Array<any | { commands?: Array<CustomCommand | Command>, title?: string }>, title?: string }>, visibility?: PanelVisibility }>;

/**
Expand Down Expand Up @@ -854,7 +854,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() viewToolbarChange: EventEmitter<{ commands?: Array<dxDiagramCustomCommand | Command>, visible?: boolean }>;
@Output() viewToolbarChange: EventEmitter<{ commands?: Array<CustomCommand | Command>, visible?: boolean }>;

/**
Expand Down
6 changes: 3 additions & 3 deletions packages/devextreme-angular/src/ui/nested/base/button-group-item-dxi.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { Properties as dxBoxOptions } from 'devextreme/ui/box';
import { Properties as dxButtonOptions } from 'devextreme/ui/button';
import { dxContextMenuItem } from 'devextreme/ui/context_menu';
import { DataGridPredefinedToolbarItem } from 'devextreme/ui/data_grid';
import { Command, dxDiagramCustomCommand } from 'devextreme/ui/diagram';
import { Command, CustomCommand } from 'devextreme/ui/diagram';
import { ItemClickEvent } from 'devextreme/ui/drop_down_button';
import { dxFileManagerContextMenuItem, FileManagerPredefinedContextMenuItem, FileManagerPredefinedToolbarItem } from 'devextreme/ui/file_manager';
import { ButtonItem, EmptyItem, FormItemComponent, FormItemType, GroupItem, LabelLocation, SimpleItem, TabbedItem } from 'devextreme/ui/form';
Expand Down Expand Up @@ -160,10 +160,10 @@ export abstract class DxiButtonGroupItem extends CollectionNestedOption {
this._setOption('closeMenuOnClick', value);
}

get items(): Array<dxContextMenuItem | SimpleItem | GroupItem | TabbedItem | EmptyItem | ButtonItem | dxDiagramCustomCommand | Command | dxFileManagerContextMenuItem | HtmlEditorPredefinedContextMenuItem | any | dxMenuItem | dxTreeViewItem> {
get items(): Array<dxContextMenuItem | SimpleItem | GroupItem | TabbedItem | EmptyItem | ButtonItem | CustomCommand | Command | dxFileManagerContextMenuItem | HtmlEditorPredefinedContextMenuItem | any | dxMenuItem | dxTreeViewItem> {
return this._getOption('items');
}
set items(value: Array<dxContextMenuItem | SimpleItem | GroupItem | TabbedItem | EmptyItem | ButtonItem | dxDiagramCustomCommand | Command | dxFileManagerContextMenuItem | HtmlEditorPredefinedContextMenuItem | any | dxMenuItem | dxTreeViewItem>) {
set items(value: Array<dxContextMenuItem | SimpleItem | GroupItem | TabbedItem | EmptyItem | ButtonItem | CustomCommand | Command | dxFileManagerContextMenuItem | HtmlEditorPredefinedContextMenuItem | any | dxMenuItem | dxTreeViewItem>) {
this._setOption('items', value);
}

Expand Down
8 changes: 4 additions & 4 deletions ...nested/base/diagram-custom-command-dxi.ts → .../src/ui/nested/base/custom-command-dxi.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,23 @@ import {
} from '@angular/core';

import { ToolbarItemLocation } from 'devextreme/common';
import { Command, dxDiagramCustomCommand } from 'devextreme/ui/diagram';
import { Command, CustomCommand } from 'devextreme/ui/diagram';

@Component({
template: ''
})
export abstract class DxiDiagramCustomCommand extends CollectionNestedOption {
export abstract class DxiCustomCommand extends CollectionNestedOption {
get icon(): string {
return this._getOption('icon');
}
set icon(value: string) {
this._setOption('icon', value);
}

get items(): Array<dxDiagramCustomCommand | Command> {
get items(): Array<CustomCommand | Command> {
return this._getOption('items');
}
set items(value: Array<dxDiagramCustomCommand | Command>) {
set items(value: Array<CustomCommand | Command>) {
this._setOption('items', value);
}

Expand Down
6 changes: 3 additions & 3 deletions packages/devextreme-angular/src/ui/nested/base/file-manager-context-menu.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@ import {
} from '@angular/core';

import { dxContextMenuItem } from 'devextreme/ui/context_menu';
import { Command, dxDiagramCustomCommand } from 'devextreme/ui/diagram';
import { Command, CustomCommand } from 'devextreme/ui/diagram';
import { dxFileManagerContextMenuItem, FileManagerPredefinedContextMenuItem } from 'devextreme/ui/file_manager';
import { GanttPredefinedContextMenuItem } from 'devextreme/ui/gantt';

@Component({
template: ''
})
export abstract class DxoFileManagerContextMenu extends NestedOption {
get commands(): Array<dxDiagramCustomCommand | Command> {
get commands(): Array<CustomCommand | Command> {
return this._getOption('commands');
}
set commands(value: Array<dxDiagramCustomCommand | Command>) {
set commands(value: Array<CustomCommand | Command>) {
this._setOption('commands', value);
}

Expand Down
10 changes: 5 additions & 5 deletions packages/devextreme-angular/src/ui/nested/base/html-editor-image-upload-tab-item-dxi.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
Component,
} from '@angular/core';

import { Command, dxDiagramCustomCommand } from 'devextreme/ui/diagram';
import { Command, CustomCommand } from 'devextreme/ui/diagram';
import { ButtonItem, EmptyItem, GroupItem, SimpleItem, TabbedItem } from 'devextreme/ui/form';
import { HtmlEditorImageUploadTab } from 'devextreme/ui/html_editor';

Expand Down Expand Up @@ -83,17 +83,17 @@ export abstract class DxiHtmlEditorImageUploadTabItem extends CollectionNestedOp
this._setOption('title', value);
}

get commands(): Array<dxDiagramCustomCommand | Command> {
get commands(): Array<CustomCommand | Command> {
return this._getOption('commands');
}
set commands(value: Array<dxDiagramCustomCommand | Command>) {
set commands(value: Array<CustomCommand | Command>) {
this._setOption('commands', value);
}

get groups(): Array<any | { commands?: Array<dxDiagramCustomCommand | Command>, title?: string }> {
get groups(): Array<any | { commands?: Array<CustomCommand | Command>, title?: string }> {
return this._getOption('groups');
}
set groups(value: Array<any | { commands?: Array<dxDiagramCustomCommand | Command>, title?: string }>) {
set groups(value: Array<any | { commands?: Array<CustomCommand | Command>, title?: string }>) {
this._setOption('groups', value);
}

Expand Down
2 changes: 1 addition & 1 deletion packages/devextreme-angular/src/ui/nested/base/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ export * from './chart-series-dxi';
export * from './charts-color';
export * from './column-chooser-search-config';
export * from './column-chooser-selection-config';
export * from './custom-command-dxi';
export * from './data-change-dxi';
export * from './data-grid-column-dxi';
export * from './data-grid-toolbar';
export * from './diagram-custom-command-dxi';
export * from './file-manager-context-menu';
export * from './file-manager-toolbar-item-dxi';
export * from './file-uploader-options';
Expand Down
4 changes: 2 additions & 2 deletions packages/devextreme-angular/src/ui/nested/command-dxi.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import {
import {
NestedOptionHost,
} from 'devextreme-angular/core';
import { DxiDiagramCustomCommand } from './base/diagram-custom-command-dxi';
import { DxiCustomCommand } from './base/custom-command-dxi';
import { DxiItemComponent } from './item-dxi';


Expand All @@ -36,7 +36,7 @@ import { DxiItemComponent } from './item-dxi';
'text'
]
})
export class DxiCommandComponent extends DxiDiagramCustomCommand {
export class DxiCommandComponent extends DxiCustomCommand {

protected get _optionPath() {
return 'commands';
Expand Down
6 changes: 3 additions & 3 deletions packages/devextreme-angular/src/ui/nested/group-dxi.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import {



import { Command, dxDiagramCustomCommand, ShapeCategory, ShapeType, ToolboxDisplayMode } from 'devextreme/ui/diagram';
import { Command, CustomCommand, ShapeCategory, ShapeType, ToolboxDisplayMode } from 'devextreme/ui/diagram';

import {
NestedOptionHost,
Expand All @@ -32,10 +32,10 @@ import { DxiCommandComponent } from './command-dxi';
})
export class DxiGroupComponent extends CollectionNestedOption {
@Input()
get commands(): Array<dxDiagramCustomCommand | Command> {
get commands(): Array<CustomCommand | Command> {
return this._getOption('commands');
}
set commands(value: Array<dxDiagramCustomCommand | Command>) {
set commands(value: Array<CustomCommand | Command>) {
this._setOption('commands', value);
}

Expand Down
6 changes: 3 additions & 3 deletions packages/devextreme-angular/src/ui/nested/history-toolbar.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import {



import { Command, dxDiagramCustomCommand } from 'devextreme/ui/diagram';
import { Command, CustomCommand } from 'devextreme/ui/diagram';

import {
NestedOptionHost,
Expand All @@ -34,10 +34,10 @@ import { DxiCommandComponent } from './command-dxi';
})
export class DxoHistoryToolbarComponent extends NestedOption implements OnDestroy, OnInit {
@Input()
get commands(): Array<dxDiagramCustomCommand | Command> {
get commands(): Array<CustomCommand | Command> {
return this._getOption('commands');
}
set commands(value: Array<dxDiagramCustomCommand | Command>) {
set commands(value: Array<CustomCommand | Command>) {
this._setOption('commands', value);
}

Expand Down
6 changes: 3 additions & 3 deletions packages/devextreme-angular/src/ui/nested/main-toolbar.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import {



import { Command, dxDiagramCustomCommand } from 'devextreme/ui/diagram';
import { Command, CustomCommand } from 'devextreme/ui/diagram';

import {
NestedOptionHost,
Expand All @@ -34,10 +34,10 @@ import { DxiCommandComponent } from './command-dxi';
})
export class DxoMainToolbarComponent extends NestedOption implements OnDestroy, OnInit {
@Input()
get commands(): Array<dxDiagramCustomCommand | Command> {
get commands(): Array<CustomCommand | Command> {
return this._getOption('commands');
}
set commands(value: Array<dxDiagramCustomCommand | Command>) {
set commands(value: Array<CustomCommand | Command>) {
this._setOption('commands', value);
}

Expand Down
6 changes: 3 additions & 3 deletions packages/devextreme-angular/src/ui/nested/properties-panel.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import {



import { Command, dxDiagramCustomCommand, PanelVisibility } from 'devextreme/ui/diagram';
import { Command, CustomCommand, PanelVisibility } from 'devextreme/ui/diagram';

import {
NestedOptionHost,
Expand All @@ -34,10 +34,10 @@ import { DxiTabComponent } from './tab-dxi';
})
export class DxoPropertiesPanelComponent extends NestedOption implements OnDestroy, OnInit {
@Input()
get tabs(): Array<any | { commands?: Array<dxDiagramCustomCommand | Command>, groups?: Array<any | { commands?: Array<dxDiagramCustomCommand | Command>, title?: string }>, title?: string }> {
get tabs(): Array<any | { commands?: Array<CustomCommand | Command>, groups?: Array<any | { commands?: Array<CustomCommand | Command>, title?: string }>, title?: string }> {
return this._getOption('tabs');
}
set tabs(value: Array<any | { commands?: Array<dxDiagramCustomCommand | Command>, groups?: Array<any | { commands?: Array<dxDiagramCustomCommand | Command>, title?: string }>, title?: string }>) {
set tabs(value: Array<any | { commands?: Array<CustomCommand | Command>, groups?: Array<any | { commands?: Array<CustomCommand | Command>, title?: string }>, title?: string }>) {
this._setOption('tabs', value);
}

Expand Down
6 changes: 3 additions & 3 deletions packages/devextreme-angular/src/ui/nested/view-toolbar.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import {



import { Command, dxDiagramCustomCommand } from 'devextreme/ui/diagram';
import { Command, CustomCommand } from 'devextreme/ui/diagram';

import {
NestedOptionHost,
Expand All @@ -34,10 +34,10 @@ import { DxiCommandComponent } from './command-dxi';
})
export class DxoViewToolbarComponent extends NestedOption implements OnDestroy, OnInit {
@Input()
get commands(): Array<dxDiagramCustomCommand | Command> {
get commands(): Array<CustomCommand | Command> {
return this._getOption('commands');
}
set commands(value: Array<dxDiagramCustomCommand | Command>) {
set commands(value: Array<CustomCommand | Command>) {
this._setOption('commands', value);
}

Expand Down

0 comments on commit ee30773

Please sign in to comment.