Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 0 additions & 18 deletions packages/devextreme-angular/src/ui/gantt/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,6 @@ import { DxoTasksModule } from 'devextreme-angular/ui/nested';
import { DxoToolbarModule } from 'devextreme-angular/ui/nested';
import { DxoValidationModule } from 'devextreme-angular/ui/nested';

import { DxoGanttAIModule } from 'devextreme-angular/ui/gantt/nested';
import { DxiGanttButtonModule } from 'devextreme-angular/ui/gantt/nested';
import { DxiGanttColumnModule } from 'devextreme-angular/ui/gantt/nested';
import { DxoGanttColumnHeaderFilterModule } from 'devextreme-angular/ui/gantt/nested';
import { DxoGanttColumnHeaderFilterSearchModule } from 'devextreme-angular/ui/gantt/nested';
Expand All @@ -72,15 +70,13 @@ import { DxiGanttContextMenuItemModule } from 'devextreme-angular/ui/gantt/neste
import { DxiGanttContextMenuItemItemModule } from 'devextreme-angular/ui/gantt/nested';
import { DxoGanttDependenciesModule } from 'devextreme-angular/ui/gantt/nested';
import { DxoGanttEditingModule } from 'devextreme-angular/ui/gantt/nested';
import { DxoGanttEditorOptionsModule } from 'devextreme-angular/ui/gantt/nested';
import { DxoGanttFilterRowModule } from 'devextreme-angular/ui/gantt/nested';
import { DxoGanttFormatModule } from 'devextreme-angular/ui/gantt/nested';
import { DxoGanttGanttHeaderFilterModule } from 'devextreme-angular/ui/gantt/nested';
import { DxoGanttGanttHeaderFilterSearchModule } from 'devextreme-angular/ui/gantt/nested';
import { DxoGanttHeaderFilterModule } from 'devextreme-angular/ui/gantt/nested';
import { DxiGanttItemModule } from 'devextreme-angular/ui/gantt/nested';
import { DxoGanttOperationDescriptionsModule } from 'devextreme-angular/ui/gantt/nested';
import { DxoGanttOptionsModule } from 'devextreme-angular/ui/gantt/nested';
import { DxoGanttResourceAssignmentsModule } from 'devextreme-angular/ui/gantt/nested';
import { DxoGanttResourcesModule } from 'devextreme-angular/ui/gantt/nested';
import { DxoGanttScaleTypeRangeModule } from 'devextreme-angular/ui/gantt/nested';
Expand All @@ -93,7 +89,6 @@ import { DxoGanttToolbarModule } from 'devextreme-angular/ui/gantt/nested';
import { DxiGanttToolbarItemModule } from 'devextreme-angular/ui/gantt/nested';
import { DxoGanttValidationModule } from 'devextreme-angular/ui/gantt/nested';
import {
PROPERTY_TOKEN_buttons,
PROPERTY_TOKEN_columns,
PROPERTY_TOKEN_items,
PROPERTY_TOKEN_stripLines,
Expand All @@ -119,11 +114,6 @@ import {
})
export class DxGanttComponent extends DxComponent implements OnDestroy, OnChanges, DoCheck {

@ContentChildren(PROPERTY_TOKEN_buttons)
set _buttonsContentChildren(value: QueryList<CollectionNestedOption>) {
this.setChildren('buttons', value);
}

@ContentChildren(PROPERTY_TOKEN_columns)
set _columnsContentChildren(value: QueryList<CollectionNestedOption>) {
this.setChildren('columns', value);
Expand Down Expand Up @@ -1361,8 +1351,6 @@ export class DxGanttComponent extends DxComponent implements OnDestroy, OnChange
DxoTasksModule,
DxoToolbarModule,
DxoValidationModule,
DxoGanttAIModule,
DxiGanttButtonModule,
DxiGanttColumnModule,
DxoGanttColumnHeaderFilterModule,
DxoGanttColumnHeaderFilterSearchModule,
Expand All @@ -1371,15 +1359,13 @@ export class DxGanttComponent extends DxComponent implements OnDestroy, OnChange
DxiGanttContextMenuItemItemModule,
DxoGanttDependenciesModule,
DxoGanttEditingModule,
DxoGanttEditorOptionsModule,
DxoGanttFilterRowModule,
DxoGanttFormatModule,
DxoGanttGanttHeaderFilterModule,
DxoGanttGanttHeaderFilterSearchModule,
DxoGanttHeaderFilterModule,
DxiGanttItemModule,
DxoGanttOperationDescriptionsModule,
DxoGanttOptionsModule,
DxoGanttResourceAssignmentsModule,
DxoGanttResourcesModule,
DxoGanttScaleTypeRangeModule,
Expand Down Expand Up @@ -1415,8 +1401,6 @@ export class DxGanttComponent extends DxComponent implements OnDestroy, OnChange
DxoTasksModule,
DxoToolbarModule,
DxoValidationModule,
DxoGanttAIModule,
DxiGanttButtonModule,
DxiGanttColumnModule,
DxoGanttColumnHeaderFilterModule,
DxoGanttColumnHeaderFilterSearchModule,
Expand All @@ -1425,15 +1409,13 @@ export class DxGanttComponent extends DxComponent implements OnDestroy, OnChange
DxiGanttContextMenuItemItemModule,
DxoGanttDependenciesModule,
DxoGanttEditingModule,
DxoGanttEditorOptionsModule,
DxoGanttFilterRowModule,
DxoGanttFormatModule,
DxoGanttGanttHeaderFilterModule,
DxoGanttGanttHeaderFilterSearchModule,
DxoGanttHeaderFilterModule,
DxiGanttItemModule,
DxoGanttOperationDescriptionsModule,
DxoGanttOptionsModule,
DxoGanttResourceAssignmentsModule,
DxoGanttResourcesModule,
DxoGanttScaleTypeRangeModule,
Expand Down
10 changes: 1 addition & 9 deletions packages/devextreme-angular/src/ui/gantt/nested/column-dxi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import {



import { ColumnAIOptions, FilterOperation, FilterType, ColumnHeaderFilter, SelectedFilterOperation } from 'devextreme/common/grids';
import { HorizontalAlignment, DataType, SortOrder } from 'devextreme/common';
import { FilterOperation, FilterType, ColumnHeaderFilter, SelectedFilterOperation } from 'devextreme/common/grids';
import { Format } from 'devextreme/common/core/localization';

import {
Expand All @@ -41,14 +41,6 @@ import { PROPERTY_TOKEN_columns } from 'devextreme-angular/core/tokens';
]
})
export class DxiGanttColumnComponent extends CollectionNestedOption {
@Input()
get ai(): ColumnAIOptions {
return this._getOption('ai');
}
set ai(value: ColumnAIOptions) {
this._setOption('ai', value);
}

@Input()
get alignment(): HorizontalAlignment | undefined {
return this._getOption('alignment');
Expand Down
197 changes: 2 additions & 195 deletions packages/devextreme-react/src/gantt.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,9 @@ import { Component as BaseComponent, IHtmlOptions, ComponentRef, NestedComponent
import NestedOption from "./core/nested-option";

import type { ContentReadyEvent, ContextMenuPreparingEvent, CustomCommandEvent, DependencyDeletedEvent, DependencyDeletingEvent, DependencyInsertedEvent, DependencyInsertingEvent, DisposingEvent, InitializedEvent, ResourceAssignedEvent, ResourceAssigningEvent, ResourceDeletedEvent, ResourceDeletingEvent, ResourceInsertedEvent, ResourceInsertingEvent, ResourceManagerDialogShowingEvent, ResourceUnassignedEvent, ResourceUnassigningEvent, ScaleCellPreparedEvent, TaskClickEvent, TaskDblClickEvent, TaskDeletedEvent, TaskDeletingEvent, TaskEditDialogShowingEvent, TaskInsertedEvent, TaskInsertingEvent, TaskMovingEvent, TaskUpdatedEvent, TaskUpdatingEvent, dxGanttContextMenuItem, GanttPredefinedContextMenuItem, dxGanttFilterRowOperationDescriptions, dxGanttHeaderFilterTexts, GanttPredefinedToolbarItem, GanttScaleType, dxGanttToolbarItem } from "devextreme/ui/gantt";
import type { ContentReadyEvent as TextBoxContentReadyEvent, DisposingEvent as TextBoxDisposingEvent, InitializedEvent as TextBoxInitializedEvent, dxTextBoxOptions, TextBoxType, ChangeEvent, CopyEvent, CutEvent, EnterKeyEvent, FocusInEvent, FocusOutEvent, InputEvent, KeyDownEvent, KeyUpEvent, OptionChangedEvent, PasteEvent, ValueChangedEvent } from "devextreme/ui/text_box";
import type { ContentReadyEvent as ButtonContentReadyEvent, DisposingEvent as ButtonDisposingEvent, InitializedEvent as ButtonInitializedEvent, dxButtonOptions, OptionChangedEvent as ButtonOptionChangedEvent, ClickEvent } from "devextreme/ui/button";
import type { AIIntegration } from "devextreme/common/ai-integration";
import type { AIColumnMode, ColumnAIOptions, FilterOperation, FilterType, ColumnHeaderFilter as GridsColumnHeaderFilter, SelectedFilterOperation, HeaderFilterGroupInterval, ColumnHeaderFilterSearchConfig, HeaderFilterSearchConfig } from "devextreme/common/grids";
import type { TextEditorButtonLocation, HorizontalAlignment, template, DataType, Format as CommonFormat, SortOrder, SearchMode, TextBoxPredefinedButton, TextEditorButton, LabelMode, MaskMode, EditorStyle, ValidationMessageMode, Position, ValidationStatus, ToolbarItemLocation, ToolbarItemComponent, ButtonStyle, ButtonType, SingleMultipleOrNone } from "devextreme/common";
import type { HorizontalAlignment, template, DataType, Format as CommonFormat, SortOrder, SearchMode, ToolbarItemLocation, ToolbarItemComponent, SingleMultipleOrNone } from "devextreme/common";
import type { dxTreeListColumn, dxTreeListRowObject } from "devextreme/ui/tree_list";
import type { FilterOperation, FilterType, ColumnHeaderFilter as GridsColumnHeaderFilter, SelectedFilterOperation, HeaderFilterGroupInterval, ColumnHeaderFilterSearchConfig, HeaderFilterSearchConfig } from "devextreme/common/grids";
import type { Format as LocalizationFormat } from "devextreme/common/core/localization";
import type { DataSourceOptions } from "devextreme/data/data_source";
import type { Store } from "devextreme/data/store";
Expand Down Expand Up @@ -147,62 +144,9 @@ const Gantt = memo(
) as (props: React.PropsWithChildren<IGanttOptions> & { ref?: Ref<GanttRef> }) => ReactElement | null;


// owners:
// Column
type IAIProps = React.PropsWithChildren<{
aiIntegration?: AIIntegration | undefined;
editorOptions?: dxTextBoxOptions<any>;
emptyText?: string;
mode?: AIColumnMode;
noDataText?: string;
popup?: Record<string, any>;
prompt?: string;
showHeaderMenu?: boolean;
}>
const _componentAI = (props: IAIProps) => {
return React.createElement(NestedOption<IAIProps>, {
...props,
elementDescriptor: {
OptionName: "ai",
ExpectedChildren: {
editorOptions: { optionName: "editorOptions", isCollectionItem: false }
},
},
});
};

const AI = Object.assign<typeof _componentAI, NestedComponentMeta>(_componentAI, {
componentType: "option",
});

// owners:
// EditorOptions
type IButtonProps = React.PropsWithChildren<{
location?: TextEditorButtonLocation;
name?: string | undefined;
options?: dxButtonOptions | undefined;
}>
const _componentButton = (props: IButtonProps) => {
return React.createElement(NestedOption<IButtonProps>, {
...props,
elementDescriptor: {
OptionName: "buttons",
IsCollectionItem: true,
ExpectedChildren: {
options: { optionName: "options", isCollectionItem: false }
},
},
});
};

const Button = Object.assign<typeof _componentButton, NestedComponentMeta>(_componentButton, {
componentType: "option",
});

// owners:
// Gantt
type IColumnProps = React.PropsWithChildren<{
ai?: ColumnAIOptions;
alignment?: HorizontalAlignment | undefined;
allowFiltering?: boolean;
allowHeaderFiltering?: boolean;
Expand Down Expand Up @@ -270,7 +214,6 @@ const _componentColumn = (props: IColumnProps) => {
defaultVisibleIndex: "visibleIndex"
},
ExpectedChildren: {
ai: { optionName: "ai", isCollectionItem: false },
columnHeaderFilter: { optionName: "headerFilter", isCollectionItem: false },
format: { optionName: "format", isCollectionItem: false },
headerFilter: { optionName: "headerFilter", isCollectionItem: false }
Expand Down Expand Up @@ -490,86 +433,6 @@ const Editing = Object.assign<typeof _componentEditing, NestedComponentMeta>(_co
componentType: "option",
});

// owners:
// AI
type IEditorOptionsProps = React.PropsWithChildren<{
accessKey?: string | undefined;
activeStateEnabled?: boolean;
buttons?: Array<string | TextBoxPredefinedButton | TextEditorButton>;
disabled?: boolean;
elementAttr?: Record<string, any>;
focusStateEnabled?: boolean;
height?: number | string | undefined;
hint?: string | undefined;
hoverStateEnabled?: boolean;
inputAttr?: any;
isDirty?: boolean;
isValid?: boolean;
label?: string;
labelMode?: LabelMode;
mask?: string;
maskChar?: string;
maskInvalidMessage?: string;
maskRules?: any;
maxLength?: number | string;
mode?: TextBoxType;
name?: string;
onChange?: ((e: ChangeEvent) => void);
onContentReady?: ((e: TextBoxContentReadyEvent) => void);
onCopy?: ((e: CopyEvent) => void);
onCut?: ((e: CutEvent) => void);
onDisposing?: ((e: TextBoxDisposingEvent) => void);
onEnterKey?: ((e: EnterKeyEvent) => void);
onFocusIn?: ((e: FocusInEvent) => void);
onFocusOut?: ((e: FocusOutEvent) => void);
onInitialized?: ((e: TextBoxInitializedEvent) => void);
onInput?: ((e: InputEvent) => void);
onKeyDown?: ((e: KeyDownEvent) => void);
onKeyUp?: ((e: KeyUpEvent) => void);
onOptionChanged?: ((e: OptionChangedEvent) => void);
onPaste?: ((e: PasteEvent) => void);
onValueChanged?: ((e: ValueChangedEvent) => void);
placeholder?: string;
readOnly?: boolean;
rtlEnabled?: boolean;
showClearButton?: boolean;
showMaskMode?: MaskMode;
spellcheck?: boolean;
stylingMode?: EditorStyle;
tabIndex?: number;
text?: string;
useMaskedValue?: boolean;
validationError?: any;
validationErrors?: Array<any>;
validationMessageMode?: ValidationMessageMode;
validationMessagePosition?: Position;
validationStatus?: ValidationStatus;
value?: string;
valueChangeEvent?: string;
visible?: boolean;
width?: number | string | undefined;
defaultValue?: string;
onValueChange?: (value: string) => void;
}>
const _componentEditorOptions = (props: IEditorOptionsProps) => {
return React.createElement(NestedOption<IEditorOptionsProps>, {
...props,
elementDescriptor: {
OptionName: "editorOptions",
DefaultsProps: {
defaultValue: "value"
},
ExpectedChildren: {
button: { optionName: "buttons", isCollectionItem: true }
},
},
});
};

const EditorOptions = Object.assign<typeof _componentEditorOptions, NestedComponentMeta>(_componentEditorOptions, {
componentType: "option",
});

// owners:
// Gantt
type IFilterRowProps = React.PropsWithChildren<{
Expand Down Expand Up @@ -789,54 +652,6 @@ const OperationDescriptions = Object.assign<typeof _componentOperationDescriptio
componentType: "option",
});

// owners:
// Button
type IOptionsProps = React.PropsWithChildren<{
accessKey?: string | undefined;
activeStateEnabled?: boolean;
disabled?: boolean;
elementAttr?: Record<string, any>;
focusStateEnabled?: boolean;
height?: number | string | undefined;
hint?: string | undefined;
hoverStateEnabled?: boolean;
icon?: string;
onClick?: ((e: ClickEvent) => void);
onContentReady?: ((e: ButtonContentReadyEvent) => void);
onDisposing?: ((e: ButtonDisposingEvent) => void);
onInitialized?: ((e: ButtonInitializedEvent) => void);
onOptionChanged?: ((e: ButtonOptionChangedEvent) => void);
rtlEnabled?: boolean;
stylingMode?: ButtonStyle;
tabIndex?: number;
template?: ((buttonData: { icon: string, text: string }, contentElement: any) => string | any) | template;
text?: string;
type?: ButtonType | string;
useSubmitBehavior?: boolean;
validationGroup?: string | undefined;
visible?: boolean;
width?: number | string | undefined;
render?: (...params: any) => React.ReactNode;
component?: React.ComponentType<any>;
}>
const _componentOptions = (props: IOptionsProps) => {
return React.createElement(NestedOption<IOptionsProps>, {
...props,
elementDescriptor: {
OptionName: "options",
TemplateProps: [{
tmplOption: "template",
render: "render",
component: "component"
}],
},
});
};

const Options = Object.assign<typeof _componentOptions, NestedComponentMeta>(_componentOptions, {
componentType: "option",
});

// owners:
// Gantt
type IResourceAssignmentsProps = React.PropsWithChildren<{
Expand Down Expand Up @@ -1101,10 +916,6 @@ export {
Gantt,
IGanttOptions,
GanttRef,
AI,
IAIProps,
Button,
IButtonProps,
Column,
IColumnProps,
ColumnHeaderFilter,
Expand All @@ -1121,8 +932,6 @@ export {
IDependenciesProps,
Editing,
IEditingProps,
EditorOptions,
IEditorOptionsProps,
FilterRow,
IFilterRowProps,
Format,
Expand All @@ -1137,8 +946,6 @@ export {
IItemProps,
OperationDescriptions,
IOperationDescriptionsProps,
Options,
IOptionsProps,
ResourceAssignments,
IResourceAssignmentsProps,
Resources,
Expand Down
Loading
Loading