diff --git a/packages/devextreme-angular/src/common/core/animation/index.ts b/packages/devextreme-angular/src/common/core/animation/index.ts new file mode 100644 index 000000000000..9014c94673c5 --- /dev/null +++ b/packages/devextreme-angular/src/common/core/animation/index.ts @@ -0,0 +1,12 @@ +export { + AnimationConfig, + animationPresets, + AnimationState, + cancelAnimationFrame, + CollisionResolution, + CollisionResolutionCombination, + fx, + PositionConfig, + requestAnimationFrame, + TransitionExecutor, +} from 'devextreme/common/core/animation'; diff --git a/packages/devextreme-angular/src/common/core/animation/ng-package.json b/packages/devextreme-angular/src/common/core/animation/ng-package.json new file mode 100644 index 000000000000..3360c83b3395 --- /dev/null +++ b/packages/devextreme-angular/src/common/core/animation/ng-package.json @@ -0,0 +1,5 @@ +{ + "lib": { + "entryFile": "index.ts" + } +} \ No newline at end of file diff --git a/packages/devextreme-angular/src/common/core/environment/index.ts b/packages/devextreme-angular/src/common/core/environment/index.ts new file mode 100644 index 000000000000..3937d076e3d3 --- /dev/null +++ b/packages/devextreme-angular/src/common/core/environment/index.ts @@ -0,0 +1,9 @@ +export { + Device, + devices, + DevicesObject, + dxSchedulerTimeZone, + getTimeZones, + hideTopOverlay, + initMobileViewport, +} from 'devextreme/common/core/environment'; diff --git a/packages/devextreme-angular/src/common/core/environment/ng-package.json b/packages/devextreme-angular/src/common/core/environment/ng-package.json new file mode 100644 index 000000000000..3360c83b3395 --- /dev/null +++ b/packages/devextreme-angular/src/common/core/environment/ng-package.json @@ -0,0 +1,5 @@ +{ + "lib": { + "entryFile": "index.ts" + } +} \ No newline at end of file diff --git a/packages/devextreme-angular/src/common/core/events/index.ts b/packages/devextreme-angular/src/common/core/events/index.ts new file mode 100644 index 000000000000..595ca8ea55ce --- /dev/null +++ b/packages/devextreme-angular/src/common/core/events/index.ts @@ -0,0 +1,16 @@ +export { + AsyncCancelable, + Cancelable, + ChangedOptionInfo, + DxEvent, + EventInfo, + EventObject, + InitializedEventInfo, + ItemInfo, + NativeEventInfo, + off, + on, + one, + trigger, + triggerHandler, +} from 'devextreme/common/core/events'; diff --git a/packages/devextreme-angular/src/common/core/events/index/index.ts b/packages/devextreme-angular/src/common/core/events/index/index.ts new file mode 100644 index 000000000000..81002ab25db2 --- /dev/null +++ b/packages/devextreme-angular/src/common/core/events/index/index.ts @@ -0,0 +1,4 @@ +export { + event, + eventsHandler, +} from 'devextreme/common/core/events/index'; diff --git a/packages/devextreme-angular/src/common/core/events/index/ng-package.json b/packages/devextreme-angular/src/common/core/events/index/ng-package.json new file mode 100644 index 000000000000..3360c83b3395 --- /dev/null +++ b/packages/devextreme-angular/src/common/core/events/index/ng-package.json @@ -0,0 +1,5 @@ +{ + "lib": { + "entryFile": "index.ts" + } +} \ No newline at end of file diff --git a/packages/devextreme-angular/src/common/core/events/ng-package.json b/packages/devextreme-angular/src/common/core/events/ng-package.json new file mode 100644 index 000000000000..3360c83b3395 --- /dev/null +++ b/packages/devextreme-angular/src/common/core/events/ng-package.json @@ -0,0 +1,5 @@ +{ + "lib": { + "entryFile": "index.ts" + } +} \ No newline at end of file diff --git a/packages/devextreme-angular/src/common/core/localization/index.ts b/packages/devextreme-angular/src/common/core/localization/index.ts new file mode 100644 index 000000000000..e2fe4bb70025 --- /dev/null +++ b/packages/devextreme-angular/src/common/core/localization/index.ts @@ -0,0 +1,10 @@ +export { + Format, + formatDate, + formatMessage, + formatNumber, + loadMessages, + locale, + parseDate, + parseNumber, +} from 'devextreme/common/core/localization'; diff --git a/packages/devextreme-angular/src/common/core/localization/ng-package.json b/packages/devextreme-angular/src/common/core/localization/ng-package.json new file mode 100644 index 000000000000..3360c83b3395 --- /dev/null +++ b/packages/devextreme-angular/src/common/core/localization/ng-package.json @@ -0,0 +1,5 @@ +{ + "lib": { + "entryFile": "index.ts" + } +} \ No newline at end of file diff --git a/packages/devextreme-angular/src/common/data/index.ts b/packages/devextreme-angular/src/common/data/index.ts new file mode 100644 index 000000000000..f3cfe138bc73 --- /dev/null +++ b/packages/devextreme-angular/src/common/data/index.ts @@ -0,0 +1,47 @@ +export { + applyChanges, + ArrayStore, + ArrayStoreOptions, + base64_encode, + compileGetter, + compileSetter, + CustomStore, + CustomStoreOptions, + DataHelperMixin, + DataSource, + DataSourceLike, + DataSourceOptions, + EdmLiteral, + EndpointSelector, + errorHandler, + FilterDescriptor, + GroupDescriptor, + GroupingInterval, + GroupItem, + isGroupItemsArray, + isItemsArray, + isLoadResultObject, + keyConverters, + LangParams, + LoadOptions, + LoadResult, + LoadResultObject, + LocalStore, + LocalStoreOptions, + ODataContext, + ODataContextOptions, + ODataStore, + ODataStoreOptions, + query, + Query, + ResolvedData, + SearchOperation, + SelectDescriptor, + setErrorHandler, + SortDescriptor, + Store, + StoreBase, + StoreOptions, + StoreOptionsBase, + SummaryDescriptor, +} from 'devextreme/common/data'; diff --git a/packages/devextreme-angular/src/common/data/ng-package.json b/packages/devextreme-angular/src/common/data/ng-package.json new file mode 100644 index 000000000000..3360c83b3395 --- /dev/null +++ b/packages/devextreme-angular/src/common/data/ng-package.json @@ -0,0 +1,5 @@ +{ + "lib": { + "entryFile": "index.ts" + } +} \ No newline at end of file diff --git a/packages/devextreme-angular/src/common/export/excel/index.ts b/packages/devextreme-angular/src/common/export/excel/index.ts new file mode 100644 index 000000000000..6b235fb7d6b3 --- /dev/null +++ b/packages/devextreme-angular/src/common/export/excel/index.ts @@ -0,0 +1,11 @@ +export { + CellAddress, + CellRange, + DataGridCell, + ExcelExportBaseProps, + ExcelExportDataGridProps, + ExcelExportPivotGridProps, + exportDataGrid, + exportPivotGrid, + PivotGridCell, +} from 'devextreme/common/export/excel'; diff --git a/packages/devextreme-angular/src/common/export/excel/ng-package.json b/packages/devextreme-angular/src/common/export/excel/ng-package.json new file mode 100644 index 000000000000..3360c83b3395 --- /dev/null +++ b/packages/devextreme-angular/src/common/export/excel/ng-package.json @@ -0,0 +1,5 @@ +{ + "lib": { + "entryFile": "index.ts" + } +} \ No newline at end of file diff --git a/packages/devextreme-angular/src/common/export/index.ts b/packages/devextreme-angular/src/common/export/index.ts new file mode 100644 index 000000000000..38b5d035c33c --- /dev/null +++ b/packages/devextreme-angular/src/common/export/index.ts @@ -0,0 +1,3 @@ +export { + ExportLoadPanel, +} from 'devextreme/common/export'; diff --git a/packages/devextreme-angular/src/common/export/ng-package.json b/packages/devextreme-angular/src/common/export/ng-package.json new file mode 100644 index 000000000000..3360c83b3395 --- /dev/null +++ b/packages/devextreme-angular/src/common/export/ng-package.json @@ -0,0 +1,5 @@ +{ + "lib": { + "entryFile": "index.ts" + } +} \ No newline at end of file diff --git a/packages/devextreme-angular/src/common/export/pdf/index.ts b/packages/devextreme-angular/src/common/export/pdf/index.ts new file mode 100644 index 000000000000..95c06666158b --- /dev/null +++ b/packages/devextreme-angular/src/common/export/pdf/index.ts @@ -0,0 +1,9 @@ +export { + Cell, + DataGridCell, + exportDataGrid, + exportGantt, + PdfExportDataGridProps, + PdfExportGanttFont, + PdfExportGanttProps, +} from 'devextreme/common/export/pdf'; diff --git a/packages/devextreme-angular/src/common/export/pdf/ng-package.json b/packages/devextreme-angular/src/common/export/pdf/ng-package.json new file mode 100644 index 000000000000..3360c83b3395 --- /dev/null +++ b/packages/devextreme-angular/src/common/export/pdf/ng-package.json @@ -0,0 +1,5 @@ +{ + "lib": { + "entryFile": "index.ts" + } +} \ No newline at end of file diff --git a/packages/devextreme-angular/src/common/file_management/index.ts b/packages/devextreme-angular/src/common/file_management/index.ts new file mode 100644 index 000000000000..73f25410f594 --- /dev/null +++ b/packages/devextreme-angular/src/common/file_management/index.ts @@ -0,0 +1,13 @@ +export { + CustomFileSystemProvider, + CustomFileSystemProviderOptions, + FileSystemError, + FileSystemItem, + FileSystemProviderBase, + FileSystemProviderBaseOptions, + ObjectFileSystemProvider, + ObjectFileSystemProviderOptions, + RemoteFileSystemProvider, + RemoteFileSystemProviderOptions, + UploadInfo, +} from 'devextreme/common/file_management'; diff --git a/packages/devextreme-angular/src/common/file_management/ng-package.json b/packages/devextreme-angular/src/common/file_management/ng-package.json new file mode 100644 index 000000000000..3360c83b3395 --- /dev/null +++ b/packages/devextreme-angular/src/common/file_management/ng-package.json @@ -0,0 +1,5 @@ +{ + "lib": { + "entryFile": "index.ts" + } +} \ No newline at end of file diff --git a/packages/devextreme-angular/src/common/index.ts b/packages/devextreme-angular/src/common/index.ts index ccdb9057c493..52d0bcfd3b7f 100644 --- a/packages/devextreme-angular/src/common/index.ts +++ b/packages/devextreme-angular/src/common/index.ts @@ -5,21 +5,26 @@ export { ButtonType, CompareRule, ComparisonOperator, + config, CustomRule, DataStructure, DataType, + DefaultOptionsRule, Direction, DisplayMode, DragDirection, Draggable, DragHighlight, + DxPromise, EditorStyle, EmailRule, ExportFormat, FieldChooserLayout, FirstDayOfWeek, + FloatingActionButtonDirection, Format, GlobalConfig, + Guid, HorizontalAlignment, HorizontalEdge, LabelMode, @@ -41,6 +46,7 @@ export { ScrollMode, SearchMode, SelectAllMode, + setTemplateEngine, SimplifiedSearchMode, SingleMultipleAllOrNone, SingleMultipleOrNone, @@ -54,6 +60,7 @@ export { SubmenuShowMode, TabsIconPosition, TabsStyle, + Template, TextBoxPredefinedButton, TextEditorButton, TextEditorButtonLocation, diff --git a/packages/devextreme-angular/src/ui/autocomplete/nested/animation.ts b/packages/devextreme-angular/src/ui/autocomplete/nested/animation.ts index 05a49a13f7dd..0953f1a1a004 100644 --- a/packages/devextreme-angular/src/ui/autocomplete/nested/animation.ts +++ b/packages/devextreme-angular/src/ui/autocomplete/nested/animation.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig } from 'devextreme/animation/fx'; +import { AnimationConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/autocomplete/nested/collision.ts b/packages/devextreme-angular/src/ui/autocomplete/nested/collision.ts index f5126f4c9957..2e129d0ac7c1 100644 --- a/packages/devextreme-angular/src/ui/autocomplete/nested/collision.ts +++ b/packages/devextreme-angular/src/ui/autocomplete/nested/collision.ts @@ -14,7 +14,7 @@ import { -import { CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/autocomplete/nested/drop-down-options.ts b/packages/devextreme-angular/src/ui/autocomplete/nested/drop-down-options.ts index e57b6dab7501..fbb9ce8ceb9a 100644 --- a/packages/devextreme-angular/src/ui/autocomplete/nested/drop-down-options.ts +++ b/packages/devextreme-angular/src/ui/autocomplete/nested/drop-down-options.ts @@ -19,9 +19,8 @@ import { -import { AnimationConfig } from 'devextreme/animation/fx'; -import { PositionConfig } from 'devextreme/animation/position'; import { PositionAlignment, ToolbarItemComponent, ToolbarItemLocation } from 'devextreme/common'; +import { AnimationConfig, PositionConfig } from 'devextreme/common/core/animation'; import { UserDefinedElement } from 'devextreme/core/element'; import { ToolbarLocation } from 'devextreme/ui/popup'; import { LocateInMenuMode, ShowTextMode } from 'devextreme/ui/toolbar'; diff --git a/packages/devextreme-angular/src/ui/autocomplete/nested/from.ts b/packages/devextreme-angular/src/ui/autocomplete/nested/from.ts index 54ce1c662675..6d8dc118d5cf 100644 --- a/packages/devextreme-angular/src/ui/autocomplete/nested/from.ts +++ b/packages/devextreme-angular/src/ui/autocomplete/nested/from.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/autocomplete/nested/hide.ts b/packages/devextreme-angular/src/ui/autocomplete/nested/hide.ts index 2ee144866127..95e4cb1feef3 100644 --- a/packages/devextreme-angular/src/ui/autocomplete/nested/hide.ts +++ b/packages/devextreme-angular/src/ui/autocomplete/nested/hide.ts @@ -14,8 +14,8 @@ import { -import { AnimationState, AnimationType } from 'devextreme/animation/fx'; import { Direction } from 'devextreme/common'; +import { AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/autocomplete/nested/position.ts b/packages/devextreme-angular/src/ui/autocomplete/nested/position.ts index 689cdf08af90..7bfae47a3668 100644 --- a/packages/devextreme-angular/src/ui/autocomplete/nested/position.ts +++ b/packages/devextreme-angular/src/ui/autocomplete/nested/position.ts @@ -14,8 +14,8 @@ import { -import { CollisionResolution, CollisionResolutionCombination } from 'devextreme/animation/position'; import { HorizontalAlignment, PositionAlignment, VerticalAlignment } from 'devextreme/common'; +import { CollisionResolution, CollisionResolutionCombination } from 'devextreme/common/core/animation'; import { UserDefinedElement } from 'devextreme/core/element'; import { diff --git a/packages/devextreme-angular/src/ui/autocomplete/nested/show.ts b/packages/devextreme-angular/src/ui/autocomplete/nested/show.ts index a900a31d35a1..68de77db7997 100644 --- a/packages/devextreme-angular/src/ui/autocomplete/nested/show.ts +++ b/packages/devextreme-angular/src/ui/autocomplete/nested/show.ts @@ -14,8 +14,8 @@ import { -import { AnimationState, AnimationType } from 'devextreme/animation/fx'; import { Direction } from 'devextreme/common'; +import { AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/autocomplete/nested/to.ts b/packages/devextreme-angular/src/ui/autocomplete/nested/to.ts index 64b733e9b604..a15af212abc5 100644 --- a/packages/devextreme-angular/src/ui/autocomplete/nested/to.ts +++ b/packages/devextreme-angular/src/ui/autocomplete/nested/to.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/bar-gauge/index.ts b/packages/devextreme-angular/src/ui/bar-gauge/index.ts index 34b500a50048..3c91ab00bf22 100644 --- a/packages/devextreme-angular/src/ui/bar-gauge/index.ts +++ b/packages/devextreme-angular/src/ui/bar-gauge/index.ts @@ -22,8 +22,8 @@ import { import { ExportFormat, HorizontalAlignment, Orientation, Position, VerticalEdge } from 'devextreme/common'; import { AnimationEaseMode, DashStyle, Font, Palette, PaletteExtensionMode, ShiftLabelOverlap, TextOverflow, Theme, WordWrap } from 'devextreme/common/charts'; +import { Format } from 'devextreme/common/core/localization'; import { UserDefinedElement } from 'devextreme/core/element'; -import { Format } from 'devextreme/localization'; import { DisposingEvent, DrawnEvent, ExportedEvent, ExportingEvent, FileSavingEvent, IncidentOccurredEvent, InitializedEvent, OptionChangedEvent, TooltipHiddenEvent, TooltipShownEvent } from 'devextreme/viz/bar_gauge'; import DxBarGauge from 'devextreme/viz/bar_gauge'; diff --git a/packages/devextreme-angular/src/ui/bar-gauge/nested/label.ts b/packages/devextreme-angular/src/ui/bar-gauge/nested/label.ts index 1f16912dc2e1..81cd776c3b3b 100644 --- a/packages/devextreme-angular/src/ui/bar-gauge/nested/label.ts +++ b/packages/devextreme-angular/src/ui/bar-gauge/nested/label.ts @@ -15,7 +15,7 @@ import { import { Font } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/bar-gauge/nested/legend.ts b/packages/devextreme-angular/src/ui/bar-gauge/nested/legend.ts index 8bdaa56ca3b0..6888f5e6d112 100644 --- a/packages/devextreme-angular/src/ui/bar-gauge/nested/legend.ts +++ b/packages/devextreme-angular/src/ui/bar-gauge/nested/legend.ts @@ -16,7 +16,7 @@ import { import { HorizontalAlignment, Orientation, Position, VerticalEdge } from 'devextreme/common'; import { DashStyle, Font } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/bar-gauge/nested/tooltip.ts b/packages/devextreme-angular/src/ui/bar-gauge/nested/tooltip.ts index 52bd2598a2b3..bd21809bd216 100644 --- a/packages/devextreme-angular/src/ui/bar-gauge/nested/tooltip.ts +++ b/packages/devextreme-angular/src/ui/bar-gauge/nested/tooltip.ts @@ -15,8 +15,8 @@ import { import { DashStyle, Font } from 'devextreme/common/charts'; +import { Format } from 'devextreme/common/core/localization'; import { UserDefinedElement } from 'devextreme/core/element'; -import { Format } from 'devextreme/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/bullet/index.ts b/packages/devextreme-angular/src/ui/bullet/index.ts index ca8b76d0a0b9..e01ab085e16b 100644 --- a/packages/devextreme-angular/src/ui/bullet/index.ts +++ b/packages/devextreme-angular/src/ui/bullet/index.ts @@ -18,8 +18,8 @@ import { import { DashStyle, Font, Theme } from 'devextreme/common/charts'; +import { Format } from 'devextreme/common/core/localization'; import { UserDefinedElement } from 'devextreme/core/element'; -import { Format } from 'devextreme/localization'; import { DisposingEvent, DrawnEvent, ExportedEvent, ExportingEvent, FileSavingEvent, IncidentOccurredEvent, InitializedEvent, OptionChangedEvent, TooltipHiddenEvent, TooltipShownEvent } from 'devextreme/viz/bullet'; import DxBullet from 'devextreme/viz/bullet'; diff --git a/packages/devextreme-angular/src/ui/bullet/nested/tooltip.ts b/packages/devextreme-angular/src/ui/bullet/nested/tooltip.ts index 91fb88a63a8a..8bcb13aedaa0 100644 --- a/packages/devextreme-angular/src/ui/bullet/nested/tooltip.ts +++ b/packages/devextreme-angular/src/ui/bullet/nested/tooltip.ts @@ -15,8 +15,8 @@ import { import { DashStyle, Font } from 'devextreme/common/charts'; +import { Format } from 'devextreme/common/core/localization'; import { UserDefinedElement } from 'devextreme/core/element'; -import { Format } from 'devextreme/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/chart/index.ts b/packages/devextreme-angular/src/ui/chart/index.ts index 0a8791d1bd49..1d880feea22b 100644 --- a/packages/devextreme-angular/src/ui/chart/index.ts +++ b/packages/devextreme-angular/src/ui/chart/index.ts @@ -24,10 +24,10 @@ import { import { ExportFormat, HorizontalAlignment, Orientation, Position, SingleOrMultiple, VerticalAlignment, VerticalEdge } from 'devextreme/common'; import { AnimationEaseMode, ArgumentAxisHoverMode, AxisScaleType, ChartsAxisLabelOverlap, ChartsColor, ChartsDataType, ChartsLabelOverlap, DashStyle, DiscreteAxisDivisionMode, Font, LegendHoverMode, Palette, PaletteExtensionMode, RelativePosition, ScaleBreak, ScaleBreakLineStyle, TextOverflow, Theme, TimeInterval, VisualRange, VisualRangeUpdateMode, WordWrap } from 'devextreme/common/charts'; +import { Format } from 'devextreme/common/core/localization'; import { UserDefinedElement } from 'devextreme/core/element'; import { Store } from 'devextreme/data'; import DataSource, { Options as DataSourceOptions } from 'devextreme/data/data_source'; -import { Format } from 'devextreme/localization'; import { AggregatedPointsPosition, ArgumentAxisClickEvent, ChartLabelDisplayMode, ChartTooltipLocation, ChartZoomAndPanMode, DisposingEvent, DoneEvent, DrawnEvent, dxChartAnnotationConfig, dxChartCommonAnnotationConfig, EventKeyModifier, ExportedEvent, ExportingEvent, FileSavingEvent, IncidentOccurredEvent, InitializedEvent, LegendClickEvent, OptionChangedEvent, PointClickEvent, PointHoverChangedEvent, PointSelectionChangedEvent, SeriesClickEvent, SeriesHoverChangedEvent, SeriesSelectionChangedEvent, TooltipHiddenEvent, TooltipShownEvent, ZoomEndEvent, ZoomStartEvent } from 'devextreme/viz/chart'; import { ChartSeries } from 'devextreme/viz/common'; diff --git a/packages/devextreme-angular/src/ui/chart/nested/area.ts b/packages/devextreme-angular/src/ui/chart/nested/area.ts index 24a2123e6009..667a809d9b01 100644 --- a/packages/devextreme-angular/src/ui/chart/nested/area.ts +++ b/packages/devextreme-angular/src/ui/chart/nested/area.ts @@ -16,7 +16,7 @@ import { import { HorizontalAlignment } from 'devextreme/common'; import { ChartsColor, DashStyle, Font, HatchDirection, PointInteractionMode, PointSymbol, RelativePosition, SeriesHoverMode, SeriesSelectionMode, SeriesType, ValueErrorBarDisplayMode, ValueErrorBarType } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { ChartSeriesAggregationMethod, FinancialChartReductionLevel } from 'devextreme/viz/chart'; import { diff --git a/packages/devextreme-angular/src/ui/chart/nested/argument-axis.ts b/packages/devextreme-angular/src/ui/chart/nested/argument-axis.ts index fa21d7c2ccd5..60f66dcc34c4 100644 --- a/packages/devextreme-angular/src/ui/chart/nested/argument-axis.ts +++ b/packages/devextreme-angular/src/ui/chart/nested/argument-axis.ts @@ -21,7 +21,7 @@ import { import { HorizontalAlignment, Position, VerticalAlignment } from 'devextreme/common'; import { ArgumentAxisHoverMode, AxisScaleType, ChartsAxisLabelOverlap, ChartsDataType, DashStyle, DiscreteAxisDivisionMode, Font, RelativePosition, ScaleBreak, ScaleBreakLineStyle, TextOverflow, TimeInterval, VisualRange, VisualRangeUpdateMode, WordWrap } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { AggregatedPointsPosition, ChartLabelDisplayMode } from 'devextreme/viz/chart'; import { diff --git a/packages/devextreme-angular/src/ui/chart/nested/bar.ts b/packages/devextreme-angular/src/ui/chart/nested/bar.ts index 92c178dbcdf2..cd95aa13b0dc 100644 --- a/packages/devextreme-angular/src/ui/chart/nested/bar.ts +++ b/packages/devextreme-angular/src/ui/chart/nested/bar.ts @@ -16,7 +16,7 @@ import { import { HorizontalAlignment } from 'devextreme/common'; import { ChartsColor, DashStyle, Font, HatchDirection, PointInteractionMode, PointSymbol, RelativePosition, SeriesHoverMode, SeriesSelectionMode, SeriesType, ValueErrorBarDisplayMode, ValueErrorBarType } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { ChartSeriesAggregationMethod, FinancialChartReductionLevel } from 'devextreme/viz/chart'; import { diff --git a/packages/devextreme-angular/src/ui/chart/nested/bubble.ts b/packages/devextreme-angular/src/ui/chart/nested/bubble.ts index f70b278a9bbf..915205d0e6d2 100644 --- a/packages/devextreme-angular/src/ui/chart/nested/bubble.ts +++ b/packages/devextreme-angular/src/ui/chart/nested/bubble.ts @@ -16,7 +16,7 @@ import { import { HorizontalAlignment } from 'devextreme/common'; import { ChartsColor, DashStyle, Font, HatchDirection, PointInteractionMode, PointSymbol, RelativePosition, SeriesHoverMode, SeriesSelectionMode, SeriesType, ValueErrorBarDisplayMode, ValueErrorBarType } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { ChartSeriesAggregationMethod, FinancialChartReductionLevel } from 'devextreme/viz/chart'; import { diff --git a/packages/devextreme-angular/src/ui/chart/nested/candlestick.ts b/packages/devextreme-angular/src/ui/chart/nested/candlestick.ts index 183c542df7e3..ab10f6f94b55 100644 --- a/packages/devextreme-angular/src/ui/chart/nested/candlestick.ts +++ b/packages/devextreme-angular/src/ui/chart/nested/candlestick.ts @@ -16,7 +16,7 @@ import { import { HorizontalAlignment } from 'devextreme/common'; import { ChartsColor, DashStyle, Font, HatchDirection, PointInteractionMode, PointSymbol, RelativePosition, SeriesHoverMode, SeriesSelectionMode, SeriesType, ValueErrorBarDisplayMode, ValueErrorBarType } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { ChartSeriesAggregationMethod, FinancialChartReductionLevel } from 'devextreme/viz/chart'; import { diff --git a/packages/devextreme-angular/src/ui/chart/nested/common-series-settings.ts b/packages/devextreme-angular/src/ui/chart/nested/common-series-settings.ts index 555687d2d5f4..5cc1ca95f737 100644 --- a/packages/devextreme-angular/src/ui/chart/nested/common-series-settings.ts +++ b/packages/devextreme-angular/src/ui/chart/nested/common-series-settings.ts @@ -16,7 +16,7 @@ import { import { HorizontalAlignment } from 'devextreme/common'; import { ChartsColor, DashStyle, Font, HatchDirection, PointInteractionMode, PointSymbol, RelativePosition, SeriesHoverMode, SeriesSelectionMode, SeriesType, ValueErrorBarDisplayMode, ValueErrorBarType } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { ChartSeriesAggregationMethod, FinancialChartReductionLevel } from 'devextreme/viz/chart'; import { diff --git a/packages/devextreme-angular/src/ui/chart/nested/crosshair.ts b/packages/devextreme-angular/src/ui/chart/nested/crosshair.ts index 4ee04755aba4..b5fa736966dd 100644 --- a/packages/devextreme-angular/src/ui/chart/nested/crosshair.ts +++ b/packages/devextreme-angular/src/ui/chart/nested/crosshair.ts @@ -15,7 +15,7 @@ import { import { DashStyle, Font } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/chart/nested/fullstackedarea.ts b/packages/devextreme-angular/src/ui/chart/nested/fullstackedarea.ts index a8c7e4947b74..ea26e962c68b 100644 --- a/packages/devextreme-angular/src/ui/chart/nested/fullstackedarea.ts +++ b/packages/devextreme-angular/src/ui/chart/nested/fullstackedarea.ts @@ -16,7 +16,7 @@ import { import { HorizontalAlignment } from 'devextreme/common'; import { ChartsColor, DashStyle, Font, HatchDirection, PointInteractionMode, PointSymbol, RelativePosition, SeriesHoverMode, SeriesSelectionMode, SeriesType, ValueErrorBarDisplayMode, ValueErrorBarType } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { ChartSeriesAggregationMethod, FinancialChartReductionLevel } from 'devextreme/viz/chart'; import { diff --git a/packages/devextreme-angular/src/ui/chart/nested/fullstackedbar.ts b/packages/devextreme-angular/src/ui/chart/nested/fullstackedbar.ts index 2de1b0d67db0..34b5dd044977 100644 --- a/packages/devextreme-angular/src/ui/chart/nested/fullstackedbar.ts +++ b/packages/devextreme-angular/src/ui/chart/nested/fullstackedbar.ts @@ -16,7 +16,7 @@ import { import { HorizontalAlignment } from 'devextreme/common'; import { ChartsColor, DashStyle, Font, HatchDirection, PointInteractionMode, PointSymbol, RelativePosition, SeriesHoverMode, SeriesSelectionMode, SeriesType, ValueErrorBarDisplayMode, ValueErrorBarType } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { ChartSeriesAggregationMethod, FinancialChartReductionLevel } from 'devextreme/viz/chart'; import { diff --git a/packages/devextreme-angular/src/ui/chart/nested/fullstackedline.ts b/packages/devextreme-angular/src/ui/chart/nested/fullstackedline.ts index 0893fd9a8468..34ed9c4624f4 100644 --- a/packages/devextreme-angular/src/ui/chart/nested/fullstackedline.ts +++ b/packages/devextreme-angular/src/ui/chart/nested/fullstackedline.ts @@ -16,7 +16,7 @@ import { import { HorizontalAlignment } from 'devextreme/common'; import { ChartsColor, DashStyle, Font, HatchDirection, PointInteractionMode, PointSymbol, RelativePosition, SeriesHoverMode, SeriesSelectionMode, SeriesType, ValueErrorBarDisplayMode, ValueErrorBarType } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { ChartSeriesAggregationMethod, FinancialChartReductionLevel } from 'devextreme/viz/chart'; import { diff --git a/packages/devextreme-angular/src/ui/chart/nested/fullstackedspline.ts b/packages/devextreme-angular/src/ui/chart/nested/fullstackedspline.ts index c1f85547aa54..5dcfd078c1c7 100644 --- a/packages/devextreme-angular/src/ui/chart/nested/fullstackedspline.ts +++ b/packages/devextreme-angular/src/ui/chart/nested/fullstackedspline.ts @@ -16,7 +16,7 @@ import { import { HorizontalAlignment } from 'devextreme/common'; import { ChartsColor, DashStyle, Font, HatchDirection, PointInteractionMode, PointSymbol, RelativePosition, SeriesHoverMode, SeriesSelectionMode, SeriesType, ValueErrorBarDisplayMode, ValueErrorBarType } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { ChartSeriesAggregationMethod, FinancialChartReductionLevel } from 'devextreme/viz/chart'; import { diff --git a/packages/devextreme-angular/src/ui/chart/nested/fullstackedsplinearea.ts b/packages/devextreme-angular/src/ui/chart/nested/fullstackedsplinearea.ts index 9c6cf737ec93..1e113fedf67f 100644 --- a/packages/devextreme-angular/src/ui/chart/nested/fullstackedsplinearea.ts +++ b/packages/devextreme-angular/src/ui/chart/nested/fullstackedsplinearea.ts @@ -16,7 +16,7 @@ import { import { HorizontalAlignment } from 'devextreme/common'; import { ChartsColor, DashStyle, Font, HatchDirection, PointInteractionMode, PointSymbol, RelativePosition, SeriesHoverMode, SeriesSelectionMode, SeriesType, ValueErrorBarDisplayMode, ValueErrorBarType } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { ChartSeriesAggregationMethod, FinancialChartReductionLevel } from 'devextreme/viz/chart'; import { diff --git a/packages/devextreme-angular/src/ui/chart/nested/horizontal-line.ts b/packages/devextreme-angular/src/ui/chart/nested/horizontal-line.ts index 64131dec389c..cc73a8a3946a 100644 --- a/packages/devextreme-angular/src/ui/chart/nested/horizontal-line.ts +++ b/packages/devextreme-angular/src/ui/chart/nested/horizontal-line.ts @@ -15,7 +15,7 @@ import { import { DashStyle, Font } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/chart/nested/label.ts b/packages/devextreme-angular/src/ui/chart/nested/label.ts index b3783e58a33a..a619de6bb2f3 100644 --- a/packages/devextreme-angular/src/ui/chart/nested/label.ts +++ b/packages/devextreme-angular/src/ui/chart/nested/label.ts @@ -20,7 +20,7 @@ import { DOCUMENT } from '@angular/common'; import { HorizontalAlignment, Position, VerticalAlignment } from 'devextreme/common'; import { ChartsAxisLabelOverlap, DashStyle, Font, RelativePosition, TextOverflow, WordWrap } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { ChartLabelDisplayMode } from 'devextreme/viz/chart'; import { diff --git a/packages/devextreme-angular/src/ui/chart/nested/line.ts b/packages/devextreme-angular/src/ui/chart/nested/line.ts index 79d4261f1eb5..760c8e4b8113 100644 --- a/packages/devextreme-angular/src/ui/chart/nested/line.ts +++ b/packages/devextreme-angular/src/ui/chart/nested/line.ts @@ -16,7 +16,7 @@ import { import { HorizontalAlignment } from 'devextreme/common'; import { ChartsColor, DashStyle, Font, HatchDirection, PointInteractionMode, PointSymbol, RelativePosition, SeriesHoverMode, SeriesSelectionMode, SeriesType, ValueErrorBarDisplayMode, ValueErrorBarType } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { ChartSeriesAggregationMethod, FinancialChartReductionLevel } from 'devextreme/viz/chart'; import { diff --git a/packages/devextreme-angular/src/ui/chart/nested/rangearea.ts b/packages/devextreme-angular/src/ui/chart/nested/rangearea.ts index f8d8a1fec28f..0aa9074a072b 100644 --- a/packages/devextreme-angular/src/ui/chart/nested/rangearea.ts +++ b/packages/devextreme-angular/src/ui/chart/nested/rangearea.ts @@ -16,7 +16,7 @@ import { import { HorizontalAlignment } from 'devextreme/common'; import { ChartsColor, DashStyle, Font, HatchDirection, PointInteractionMode, PointSymbol, RelativePosition, SeriesHoverMode, SeriesSelectionMode, SeriesType, ValueErrorBarDisplayMode, ValueErrorBarType } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { ChartSeriesAggregationMethod, FinancialChartReductionLevel } from 'devextreme/viz/chart'; import { diff --git a/packages/devextreme-angular/src/ui/chart/nested/rangebar.ts b/packages/devextreme-angular/src/ui/chart/nested/rangebar.ts index 968dbdbe73b0..0b9cf4d546d0 100644 --- a/packages/devextreme-angular/src/ui/chart/nested/rangebar.ts +++ b/packages/devextreme-angular/src/ui/chart/nested/rangebar.ts @@ -16,7 +16,7 @@ import { import { HorizontalAlignment } from 'devextreme/common'; import { ChartsColor, DashStyle, Font, HatchDirection, PointInteractionMode, PointSymbol, RelativePosition, SeriesHoverMode, SeriesSelectionMode, SeriesType, ValueErrorBarDisplayMode, ValueErrorBarType } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { ChartSeriesAggregationMethod, FinancialChartReductionLevel } from 'devextreme/viz/chart'; import { diff --git a/packages/devextreme-angular/src/ui/chart/nested/scatter.ts b/packages/devextreme-angular/src/ui/chart/nested/scatter.ts index 9188450fe1a2..24c1b6d06136 100644 --- a/packages/devextreme-angular/src/ui/chart/nested/scatter.ts +++ b/packages/devextreme-angular/src/ui/chart/nested/scatter.ts @@ -16,7 +16,7 @@ import { import { HorizontalAlignment } from 'devextreme/common'; import { ChartsColor, DashStyle, Font, HatchDirection, PointInteractionMode, PointSymbol, RelativePosition, SeriesHoverMode, SeriesSelectionMode, SeriesType, ValueErrorBarDisplayMode, ValueErrorBarType } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { ChartSeriesAggregationMethod, FinancialChartReductionLevel } from 'devextreme/viz/chart'; import { diff --git a/packages/devextreme-angular/src/ui/chart/nested/series-dxi.ts b/packages/devextreme-angular/src/ui/chart/nested/series-dxi.ts index 571696821007..58f6af872aaf 100644 --- a/packages/devextreme-angular/src/ui/chart/nested/series-dxi.ts +++ b/packages/devextreme-angular/src/ui/chart/nested/series-dxi.ts @@ -14,7 +14,7 @@ import { import { HorizontalAlignment } from 'devextreme/common'; import { ChartsColor, DashStyle, Font, HatchDirection, PointInteractionMode, PointSymbol, RelativePosition, SeriesHoverMode, SeriesSelectionMode, SeriesType, ValueErrorBarDisplayMode, ValueErrorBarType } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { ChartSeriesAggregationMethod, FinancialChartReductionLevel } from 'devextreme/viz/chart'; import { diff --git a/packages/devextreme-angular/src/ui/chart/nested/spline.ts b/packages/devextreme-angular/src/ui/chart/nested/spline.ts index ff05c2b4b92a..c21c0096212c 100644 --- a/packages/devextreme-angular/src/ui/chart/nested/spline.ts +++ b/packages/devextreme-angular/src/ui/chart/nested/spline.ts @@ -16,7 +16,7 @@ import { import { HorizontalAlignment } from 'devextreme/common'; import { ChartsColor, DashStyle, Font, HatchDirection, PointInteractionMode, PointSymbol, RelativePosition, SeriesHoverMode, SeriesSelectionMode, SeriesType, ValueErrorBarDisplayMode, ValueErrorBarType } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { ChartSeriesAggregationMethod, FinancialChartReductionLevel } from 'devextreme/viz/chart'; import { diff --git a/packages/devextreme-angular/src/ui/chart/nested/splinearea.ts b/packages/devextreme-angular/src/ui/chart/nested/splinearea.ts index 4cb064961046..17a830f38923 100644 --- a/packages/devextreme-angular/src/ui/chart/nested/splinearea.ts +++ b/packages/devextreme-angular/src/ui/chart/nested/splinearea.ts @@ -16,7 +16,7 @@ import { import { HorizontalAlignment } from 'devextreme/common'; import { ChartsColor, DashStyle, Font, HatchDirection, PointInteractionMode, PointSymbol, RelativePosition, SeriesHoverMode, SeriesSelectionMode, SeriesType, ValueErrorBarDisplayMode, ValueErrorBarType } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { ChartSeriesAggregationMethod, FinancialChartReductionLevel } from 'devextreme/viz/chart'; import { diff --git a/packages/devextreme-angular/src/ui/chart/nested/stackedarea.ts b/packages/devextreme-angular/src/ui/chart/nested/stackedarea.ts index a6c29a18bd31..297dfbb9dd2a 100644 --- a/packages/devextreme-angular/src/ui/chart/nested/stackedarea.ts +++ b/packages/devextreme-angular/src/ui/chart/nested/stackedarea.ts @@ -16,7 +16,7 @@ import { import { HorizontalAlignment } from 'devextreme/common'; import { ChartsColor, DashStyle, Font, HatchDirection, PointInteractionMode, PointSymbol, RelativePosition, SeriesHoverMode, SeriesSelectionMode, SeriesType, ValueErrorBarDisplayMode, ValueErrorBarType } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { ChartSeriesAggregationMethod, FinancialChartReductionLevel } from 'devextreme/viz/chart'; import { diff --git a/packages/devextreme-angular/src/ui/chart/nested/stackedbar.ts b/packages/devextreme-angular/src/ui/chart/nested/stackedbar.ts index edfd201adb37..2f82a49f706a 100644 --- a/packages/devextreme-angular/src/ui/chart/nested/stackedbar.ts +++ b/packages/devextreme-angular/src/ui/chart/nested/stackedbar.ts @@ -16,7 +16,7 @@ import { import { HorizontalAlignment } from 'devextreme/common'; import { ChartsColor, DashStyle, Font, HatchDirection, PointInteractionMode, PointSymbol, RelativePosition, SeriesHoverMode, SeriesSelectionMode, SeriesType, ValueErrorBarDisplayMode, ValueErrorBarType } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { ChartSeriesAggregationMethod, FinancialChartReductionLevel } from 'devextreme/viz/chart'; import { diff --git a/packages/devextreme-angular/src/ui/chart/nested/stackedline.ts b/packages/devextreme-angular/src/ui/chart/nested/stackedline.ts index f0dd7c49504d..6718719c0cba 100644 --- a/packages/devextreme-angular/src/ui/chart/nested/stackedline.ts +++ b/packages/devextreme-angular/src/ui/chart/nested/stackedline.ts @@ -16,7 +16,7 @@ import { import { HorizontalAlignment } from 'devextreme/common'; import { ChartsColor, DashStyle, Font, HatchDirection, PointInteractionMode, PointSymbol, RelativePosition, SeriesHoverMode, SeriesSelectionMode, SeriesType, ValueErrorBarDisplayMode, ValueErrorBarType } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { ChartSeriesAggregationMethod, FinancialChartReductionLevel } from 'devextreme/viz/chart'; import { diff --git a/packages/devextreme-angular/src/ui/chart/nested/stackedspline.ts b/packages/devextreme-angular/src/ui/chart/nested/stackedspline.ts index d60ee179ddc2..99f24dd20bcb 100644 --- a/packages/devextreme-angular/src/ui/chart/nested/stackedspline.ts +++ b/packages/devextreme-angular/src/ui/chart/nested/stackedspline.ts @@ -16,7 +16,7 @@ import { import { HorizontalAlignment } from 'devextreme/common'; import { ChartsColor, DashStyle, Font, HatchDirection, PointInteractionMode, PointSymbol, RelativePosition, SeriesHoverMode, SeriesSelectionMode, SeriesType, ValueErrorBarDisplayMode, ValueErrorBarType } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { ChartSeriesAggregationMethod, FinancialChartReductionLevel } from 'devextreme/viz/chart'; import { diff --git a/packages/devextreme-angular/src/ui/chart/nested/stackedsplinearea.ts b/packages/devextreme-angular/src/ui/chart/nested/stackedsplinearea.ts index c532fdf87b0e..8cf98e05cdba 100644 --- a/packages/devextreme-angular/src/ui/chart/nested/stackedsplinearea.ts +++ b/packages/devextreme-angular/src/ui/chart/nested/stackedsplinearea.ts @@ -16,7 +16,7 @@ import { import { HorizontalAlignment } from 'devextreme/common'; import { ChartsColor, DashStyle, Font, HatchDirection, PointInteractionMode, PointSymbol, RelativePosition, SeriesHoverMode, SeriesSelectionMode, SeriesType, ValueErrorBarDisplayMode, ValueErrorBarType } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { ChartSeriesAggregationMethod, FinancialChartReductionLevel } from 'devextreme/viz/chart'; import { diff --git a/packages/devextreme-angular/src/ui/chart/nested/steparea.ts b/packages/devextreme-angular/src/ui/chart/nested/steparea.ts index 07b3f2a4fca9..df715eae3675 100644 --- a/packages/devextreme-angular/src/ui/chart/nested/steparea.ts +++ b/packages/devextreme-angular/src/ui/chart/nested/steparea.ts @@ -16,7 +16,7 @@ import { import { HorizontalAlignment } from 'devextreme/common'; import { ChartsColor, DashStyle, Font, HatchDirection, PointInteractionMode, PointSymbol, RelativePosition, SeriesHoverMode, SeriesSelectionMode, SeriesType, ValueErrorBarDisplayMode, ValueErrorBarType } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { ChartSeriesAggregationMethod, FinancialChartReductionLevel } from 'devextreme/viz/chart'; import { diff --git a/packages/devextreme-angular/src/ui/chart/nested/stepline.ts b/packages/devextreme-angular/src/ui/chart/nested/stepline.ts index f3ebe9372ace..4cc5409ef7d3 100644 --- a/packages/devextreme-angular/src/ui/chart/nested/stepline.ts +++ b/packages/devextreme-angular/src/ui/chart/nested/stepline.ts @@ -16,7 +16,7 @@ import { import { HorizontalAlignment } from 'devextreme/common'; import { ChartsColor, DashStyle, Font, HatchDirection, PointInteractionMode, PointSymbol, RelativePosition, SeriesHoverMode, SeriesSelectionMode, SeriesType, ValueErrorBarDisplayMode, ValueErrorBarType } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { ChartSeriesAggregationMethod, FinancialChartReductionLevel } from 'devextreme/viz/chart'; import { diff --git a/packages/devextreme-angular/src/ui/chart/nested/stock.ts b/packages/devextreme-angular/src/ui/chart/nested/stock.ts index b48fec518f20..600f490f9944 100644 --- a/packages/devextreme-angular/src/ui/chart/nested/stock.ts +++ b/packages/devextreme-angular/src/ui/chart/nested/stock.ts @@ -16,7 +16,7 @@ import { import { HorizontalAlignment } from 'devextreme/common'; import { ChartsColor, DashStyle, Font, HatchDirection, PointInteractionMode, PointSymbol, RelativePosition, SeriesHoverMode, SeriesSelectionMode, SeriesType, ValueErrorBarDisplayMode, ValueErrorBarType } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { ChartSeriesAggregationMethod, FinancialChartReductionLevel } from 'devextreme/viz/chart'; import { diff --git a/packages/devextreme-angular/src/ui/chart/nested/tooltip.ts b/packages/devextreme-angular/src/ui/chart/nested/tooltip.ts index be9adcab2dc6..d073f5936d65 100644 --- a/packages/devextreme-angular/src/ui/chart/nested/tooltip.ts +++ b/packages/devextreme-angular/src/ui/chart/nested/tooltip.ts @@ -15,8 +15,8 @@ import { import { DashStyle, Font } from 'devextreme/common/charts'; +import { Format } from 'devextreme/common/core/localization'; import { UserDefinedElement } from 'devextreme/core/element'; -import { Format } from 'devextreme/localization'; import { ChartTooltipLocation } from 'devextreme/viz/chart'; import { diff --git a/packages/devextreme-angular/src/ui/chart/nested/value-axis-dxi.ts b/packages/devextreme-angular/src/ui/chart/nested/value-axis-dxi.ts index 822a33e1a815..817747d66f82 100644 --- a/packages/devextreme-angular/src/ui/chart/nested/value-axis-dxi.ts +++ b/packages/devextreme-angular/src/ui/chart/nested/value-axis-dxi.ts @@ -19,7 +19,7 @@ import { import { HorizontalAlignment, Position, VerticalAlignment } from 'devextreme/common'; import { AxisScaleType, ChartsAxisLabelOverlap, ChartsDataType, DashStyle, DiscreteAxisDivisionMode, Font, RelativePosition, ScaleBreak, ScaleBreakLineStyle, TextOverflow, TimeInterval, VisualRange, VisualRangeUpdateMode, WordWrap } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { AggregatedPointsPosition, ChartLabelDisplayMode } from 'devextreme/viz/chart'; import { diff --git a/packages/devextreme-angular/src/ui/chart/nested/vertical-line.ts b/packages/devextreme-angular/src/ui/chart/nested/vertical-line.ts index 7b7ac04afb7d..2d1ed998269b 100644 --- a/packages/devextreme-angular/src/ui/chart/nested/vertical-line.ts +++ b/packages/devextreme-angular/src/ui/chart/nested/vertical-line.ts @@ -15,7 +15,7 @@ import { import { DashStyle, Font } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/circular-gauge/index.ts b/packages/devextreme-angular/src/ui/circular-gauge/index.ts index a148037199c3..dea914593f1b 100644 --- a/packages/devextreme-angular/src/ui/circular-gauge/index.ts +++ b/packages/devextreme-angular/src/ui/circular-gauge/index.ts @@ -22,8 +22,8 @@ import { import { ExportFormat, HorizontalAlignment, VerticalEdge } from 'devextreme/common'; import { AnimationEaseMode, ChartsColor, DashStyle, Font, LabelOverlap, Palette, PaletteExtensionMode, TextOverflow, Theme, WordWrap } from 'devextreme/common/charts'; +import { Format } from 'devextreme/common/core/localization'; import { UserDefinedElement } from 'devextreme/core/element'; -import { Format } from 'devextreme/localization'; import { CircularGaugeElementOrientation, CircularGaugeLabelOverlap, DisposingEvent, DrawnEvent, ExportedEvent, ExportingEvent, FileSavingEvent, IncidentOccurredEvent, InitializedEvent, OptionChangedEvent, TooltipHiddenEvent, TooltipShownEvent } from 'devextreme/viz/circular_gauge'; import { GaugeIndicator } from 'devextreme/viz/gauges/base_gauge'; diff --git a/packages/devextreme-angular/src/ui/circular-gauge/nested/label.ts b/packages/devextreme-angular/src/ui/circular-gauge/nested/label.ts index 62fab7435102..2b58d8840622 100644 --- a/packages/devextreme-angular/src/ui/circular-gauge/nested/label.ts +++ b/packages/devextreme-angular/src/ui/circular-gauge/nested/label.ts @@ -15,7 +15,7 @@ import { import { Font, LabelOverlap } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { CircularGaugeLabelOverlap } from 'devextreme/viz/circular_gauge'; import { diff --git a/packages/devextreme-angular/src/ui/circular-gauge/nested/scale.ts b/packages/devextreme-angular/src/ui/circular-gauge/nested/scale.ts index 3f4747a40ffd..3c2549feee40 100644 --- a/packages/devextreme-angular/src/ui/circular-gauge/nested/scale.ts +++ b/packages/devextreme-angular/src/ui/circular-gauge/nested/scale.ts @@ -15,7 +15,7 @@ import { import { Font, LabelOverlap } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { CircularGaugeElementOrientation, CircularGaugeLabelOverlap } from 'devextreme/viz/circular_gauge'; import { diff --git a/packages/devextreme-angular/src/ui/circular-gauge/nested/subvalue-indicator.ts b/packages/devextreme-angular/src/ui/circular-gauge/nested/subvalue-indicator.ts index 6105bb807dc4..749640d6690f 100644 --- a/packages/devextreme-angular/src/ui/circular-gauge/nested/subvalue-indicator.ts +++ b/packages/devextreme-angular/src/ui/circular-gauge/nested/subvalue-indicator.ts @@ -16,7 +16,7 @@ import { import { HorizontalEdge, VerticalEdge } from 'devextreme/common'; import { ChartsColor, Font, Palette } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/circular-gauge/nested/text.ts b/packages/devextreme-angular/src/ui/circular-gauge/nested/text.ts index d24a38d40929..455730f24b7d 100644 --- a/packages/devextreme-angular/src/ui/circular-gauge/nested/text.ts +++ b/packages/devextreme-angular/src/ui/circular-gauge/nested/text.ts @@ -15,7 +15,7 @@ import { import { Font } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/circular-gauge/nested/tooltip.ts b/packages/devextreme-angular/src/ui/circular-gauge/nested/tooltip.ts index d56cf5b76391..bd418ae3320a 100644 --- a/packages/devextreme-angular/src/ui/circular-gauge/nested/tooltip.ts +++ b/packages/devextreme-angular/src/ui/circular-gauge/nested/tooltip.ts @@ -15,8 +15,8 @@ import { import { DashStyle, Font } from 'devextreme/common/charts'; +import { Format } from 'devextreme/common/core/localization'; import { UserDefinedElement } from 'devextreme/core/element'; -import { Format } from 'devextreme/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/circular-gauge/nested/value-indicator.ts b/packages/devextreme-angular/src/ui/circular-gauge/nested/value-indicator.ts index 81ad4bda6511..e2e2075720a4 100644 --- a/packages/devextreme-angular/src/ui/circular-gauge/nested/value-indicator.ts +++ b/packages/devextreme-angular/src/ui/circular-gauge/nested/value-indicator.ts @@ -16,7 +16,7 @@ import { import { HorizontalEdge, VerticalEdge } from 'devextreme/common'; import { ChartsColor, Font, Palette } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/color-box/nested/animation.ts b/packages/devextreme-angular/src/ui/color-box/nested/animation.ts index 17e6fdaf455f..efa548f41597 100644 --- a/packages/devextreme-angular/src/ui/color-box/nested/animation.ts +++ b/packages/devextreme-angular/src/ui/color-box/nested/animation.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig } from 'devextreme/animation/fx'; +import { AnimationConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/color-box/nested/collision.ts b/packages/devextreme-angular/src/ui/color-box/nested/collision.ts index 6b91b5e9a69f..b2a7380744fc 100644 --- a/packages/devextreme-angular/src/ui/color-box/nested/collision.ts +++ b/packages/devextreme-angular/src/ui/color-box/nested/collision.ts @@ -14,7 +14,7 @@ import { -import { CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/color-box/nested/drop-down-options.ts b/packages/devextreme-angular/src/ui/color-box/nested/drop-down-options.ts index 2279919233d6..5f976804d287 100644 --- a/packages/devextreme-angular/src/ui/color-box/nested/drop-down-options.ts +++ b/packages/devextreme-angular/src/ui/color-box/nested/drop-down-options.ts @@ -19,9 +19,8 @@ import { -import { AnimationConfig } from 'devextreme/animation/fx'; -import { PositionConfig } from 'devextreme/animation/position'; import { PositionAlignment, ToolbarItemComponent, ToolbarItemLocation } from 'devextreme/common'; +import { AnimationConfig, PositionConfig } from 'devextreme/common/core/animation'; import { UserDefinedElement } from 'devextreme/core/element'; import { ToolbarLocation } from 'devextreme/ui/popup'; import { LocateInMenuMode, ShowTextMode } from 'devextreme/ui/toolbar'; diff --git a/packages/devextreme-angular/src/ui/color-box/nested/from.ts b/packages/devextreme-angular/src/ui/color-box/nested/from.ts index 153eca2035c8..6327ea7bd6fa 100644 --- a/packages/devextreme-angular/src/ui/color-box/nested/from.ts +++ b/packages/devextreme-angular/src/ui/color-box/nested/from.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/color-box/nested/hide.ts b/packages/devextreme-angular/src/ui/color-box/nested/hide.ts index 07aef846a774..6c930717ad72 100644 --- a/packages/devextreme-angular/src/ui/color-box/nested/hide.ts +++ b/packages/devextreme-angular/src/ui/color-box/nested/hide.ts @@ -14,8 +14,8 @@ import { -import { AnimationState, AnimationType } from 'devextreme/animation/fx'; import { Direction } from 'devextreme/common'; +import { AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/color-box/nested/position.ts b/packages/devextreme-angular/src/ui/color-box/nested/position.ts index 22cb204d33c9..85f472f3e4d8 100644 --- a/packages/devextreme-angular/src/ui/color-box/nested/position.ts +++ b/packages/devextreme-angular/src/ui/color-box/nested/position.ts @@ -14,8 +14,8 @@ import { -import { CollisionResolution, CollisionResolutionCombination } from 'devextreme/animation/position'; import { HorizontalAlignment, PositionAlignment, VerticalAlignment } from 'devextreme/common'; +import { CollisionResolution, CollisionResolutionCombination } from 'devextreme/common/core/animation'; import { UserDefinedElement } from 'devextreme/core/element'; import { diff --git a/packages/devextreme-angular/src/ui/color-box/nested/show.ts b/packages/devextreme-angular/src/ui/color-box/nested/show.ts index 449c50ff1b3d..1f11cc69e695 100644 --- a/packages/devextreme-angular/src/ui/color-box/nested/show.ts +++ b/packages/devextreme-angular/src/ui/color-box/nested/show.ts @@ -14,8 +14,8 @@ import { -import { AnimationState, AnimationType } from 'devextreme/animation/fx'; import { Direction } from 'devextreme/common'; +import { AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/color-box/nested/to.ts b/packages/devextreme-angular/src/ui/color-box/nested/to.ts index a7b9b3051f3f..9d4b13663230 100644 --- a/packages/devextreme-angular/src/ui/color-box/nested/to.ts +++ b/packages/devextreme-angular/src/ui/color-box/nested/to.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/context-menu/index.ts b/packages/devextreme-angular/src/ui/context-menu/index.ts index 565383d6b45c..4ba4c714e6a5 100644 --- a/packages/devextreme-angular/src/ui/context-menu/index.ts +++ b/packages/devextreme-angular/src/ui/context-menu/index.ts @@ -23,9 +23,8 @@ import { export { ExplicitTypes } from 'devextreme/ui/context_menu'; -import { AnimationConfig } from 'devextreme/animation/fx'; -import { PositionConfig } from 'devextreme/animation/position'; import { SingleOrNone, SubmenuShowMode } from 'devextreme/common'; +import { AnimationConfig, PositionConfig } from 'devextreme/common/core/animation'; import { UserDefinedElement } from 'devextreme/core/element'; import { Store } from 'devextreme/data'; import DataSource, { Options as DataSourceOptions } from 'devextreme/data/data_source'; diff --git a/packages/devextreme-angular/src/ui/context-menu/nested/animation.ts b/packages/devextreme-angular/src/ui/context-menu/nested/animation.ts index 3a4b35d6ae27..7594966972fa 100644 --- a/packages/devextreme-angular/src/ui/context-menu/nested/animation.ts +++ b/packages/devextreme-angular/src/ui/context-menu/nested/animation.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig } from 'devextreme/animation/fx'; +import { AnimationConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/context-menu/nested/collision.ts b/packages/devextreme-angular/src/ui/context-menu/nested/collision.ts index 5a545dec5ade..f79e7ebb3cb9 100644 --- a/packages/devextreme-angular/src/ui/context-menu/nested/collision.ts +++ b/packages/devextreme-angular/src/ui/context-menu/nested/collision.ts @@ -14,7 +14,7 @@ import { -import { CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/context-menu/nested/from.ts b/packages/devextreme-angular/src/ui/context-menu/nested/from.ts index a843a8b291c0..f59884706bc3 100644 --- a/packages/devextreme-angular/src/ui/context-menu/nested/from.ts +++ b/packages/devextreme-angular/src/ui/context-menu/nested/from.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/context-menu/nested/hide.ts b/packages/devextreme-angular/src/ui/context-menu/nested/hide.ts index 6d39630c9f1c..f9f80b0ace09 100644 --- a/packages/devextreme-angular/src/ui/context-menu/nested/hide.ts +++ b/packages/devextreme-angular/src/ui/context-menu/nested/hide.ts @@ -14,8 +14,8 @@ import { -import { AnimationState, AnimationType } from 'devextreme/animation/fx'; import { Direction } from 'devextreme/common'; +import { AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/context-menu/nested/position.ts b/packages/devextreme-angular/src/ui/context-menu/nested/position.ts index 460c52b51486..96e30cf5d448 100644 --- a/packages/devextreme-angular/src/ui/context-menu/nested/position.ts +++ b/packages/devextreme-angular/src/ui/context-menu/nested/position.ts @@ -14,8 +14,8 @@ import { -import { CollisionResolution, CollisionResolutionCombination } from 'devextreme/animation/position'; import { HorizontalAlignment, PositionAlignment, VerticalAlignment } from 'devextreme/common'; +import { CollisionResolution, CollisionResolutionCombination } from 'devextreme/common/core/animation'; import { UserDefinedElement } from 'devextreme/core/element'; import { diff --git a/packages/devextreme-angular/src/ui/context-menu/nested/show.ts b/packages/devextreme-angular/src/ui/context-menu/nested/show.ts index e85170b98bce..0f3d61cb6cfe 100644 --- a/packages/devextreme-angular/src/ui/context-menu/nested/show.ts +++ b/packages/devextreme-angular/src/ui/context-menu/nested/show.ts @@ -14,8 +14,8 @@ import { -import { AnimationState, AnimationType } from 'devextreme/animation/fx'; import { Direction } from 'devextreme/common'; +import { AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/context-menu/nested/to.ts b/packages/devextreme-angular/src/ui/context-menu/nested/to.ts index 2a62ccce7f31..6ff30d7125ea 100644 --- a/packages/devextreme-angular/src/ui/context-menu/nested/to.ts +++ b/packages/devextreme-angular/src/ui/context-menu/nested/to.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/data-grid/index.ts b/packages/devextreme-angular/src/ui/data-grid/index.ts index 4de189c0edd4..778846bb20d2 100644 --- a/packages/devextreme-angular/src/ui/data-grid/index.ts +++ b/packages/devextreme-angular/src/ui/data-grid/index.ts @@ -23,13 +23,13 @@ import { export { ExplicitTypes } from 'devextreme/ui/data_grid'; -import { PositionConfig } from 'devextreme/animation/position'; import { DragDirection, DragHighlight, HorizontalAlignment, Mode, ScrollbarMode, SelectAllMode, SingleMultipleOrNone, SortOrder } from 'devextreme/common'; +import { PositionConfig } from 'devextreme/common/core/animation'; +import { Format } from 'devextreme/common/core/localization'; import { ApplyFilterMode, ColumnChooserMode, ColumnChooserSearchConfig, ColumnChooserSelectionConfig, ColumnResizeMode, DataChange, DataRenderMode, EnterKeyAction, EnterKeyDirection, GridsEditMode, GridsEditRefreshMode, GroupExpandMode, HeaderFilterSearchConfig, NewRowPosition, Pager, SelectionColumnDisplayMode, StartEditAction, StateStoreType, SummaryType } from 'devextreme/common/grids'; import { UserDefinedElement } from 'devextreme/core/element'; import { Store } from 'devextreme/data'; import DataSource, { Options as DataSourceOptions } from 'devextreme/data/data_source'; -import { Format } from 'devextreme/localization'; import { AdaptiveDetailRowPreparingEvent, CellClickEvent, CellDblClickEvent, CellHoverChangedEvent, CellPreparedEvent, ContentReadyEvent, ContextMenuPreparingEvent, DataErrorOccurredEvent, DataGridExportFormat, DataGridScrollMode, DisposingEvent, dxDataGridColumn, dxDataGridToolbar, EditCanceledEvent, EditCancelingEvent, EditingStartEvent, EditorPreparedEvent, EditorPreparingEvent, ExportingEvent, FocusedCellChangedEvent, FocusedCellChangingEvent, FocusedRowChangedEvent, FocusedRowChangingEvent, InitializedEvent, InitNewRowEvent, KeyDownEvent, OptionChangedEvent, RowClickEvent, RowCollapsedEvent, RowCollapsingEvent, RowDblClickEvent, RowExpandedEvent, RowExpandingEvent, RowInsertedEvent, RowInsertingEvent, RowPreparedEvent, RowRemovedEvent, RowRemovingEvent, RowUpdatedEvent, RowUpdatingEvent, RowValidatingEvent, SavedEvent, SavingEvent, SelectionChangedEvent, SelectionSensitivity, ToolbarPreparingEvent } from 'devextreme/ui/data_grid'; import { Properties as dxFilterBuilderOptions } from 'devextreme/ui/filter_builder'; import { Properties as dxFormOptions } from 'devextreme/ui/form'; diff --git a/packages/devextreme-angular/src/ui/data-grid/nested/animation.ts b/packages/devextreme-angular/src/ui/data-grid/nested/animation.ts index 0e47d8ab5bf9..160a4e032aa1 100644 --- a/packages/devextreme-angular/src/ui/data-grid/nested/animation.ts +++ b/packages/devextreme-angular/src/ui/data-grid/nested/animation.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig } from 'devextreme/animation/fx'; +import { AnimationConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/data-grid/nested/collision.ts b/packages/devextreme-angular/src/ui/data-grid/nested/collision.ts index b9d4a89d65ff..1aee9afb4442 100644 --- a/packages/devextreme-angular/src/ui/data-grid/nested/collision.ts +++ b/packages/devextreme-angular/src/ui/data-grid/nested/collision.ts @@ -14,7 +14,7 @@ import { -import { CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/data-grid/nested/column-chooser.ts b/packages/devextreme-angular/src/ui/data-grid/nested/column-chooser.ts index 46df0a45e7b4..0e4f5cc2ca90 100644 --- a/packages/devextreme-angular/src/ui/data-grid/nested/column-chooser.ts +++ b/packages/devextreme-angular/src/ui/data-grid/nested/column-chooser.ts @@ -14,8 +14,8 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; import { SortOrder } from 'devextreme/common'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { ColumnChooserMode, ColumnChooserSearchConfig, ColumnChooserSelectionConfig } from 'devextreme/common/grids'; import { UserDefinedElement } from 'devextreme/core/element'; diff --git a/packages/devextreme-angular/src/ui/data-grid/nested/column-dxi.ts b/packages/devextreme-angular/src/ui/data-grid/nested/column-dxi.ts index eea6d3d6fadc..f3b1ee9c79a9 100644 --- a/packages/devextreme-angular/src/ui/data-grid/nested/column-dxi.ts +++ b/packages/devextreme-angular/src/ui/data-grid/nested/column-dxi.ts @@ -18,10 +18,10 @@ import { import { AsyncRule, CompareRule, CustomRule, DataType, EmailRule, HorizontalAlignment, NumericRule, PatternRule, RangeRule, RequiredRule, SearchMode, SortOrder, StringLengthRule } from 'devextreme/common'; +import { Format } from 'devextreme/common/core/localization'; import { ColumnHeaderFilterSearchConfig, FilterOperation, FilterType, FixedPosition, HeaderFilterGroupInterval, SelectedFilterOperation } from 'devextreme/common/grids'; import { Store } from 'devextreme/data'; import { Options as DataSourceOptions } from 'devextreme/data/data_source'; -import { Format } from 'devextreme/localization'; import { DataGridCommandColumnType, DataGridPredefinedColumnButton, dxDataGridColumn, dxDataGridColumnButton } from 'devextreme/ui/data_grid'; import { SimpleItem } from 'devextreme/ui/form'; diff --git a/packages/devextreme-angular/src/ui/data-grid/nested/field-dxi.ts b/packages/devextreme-angular/src/ui/data-grid/nested/field-dxi.ts index 01c6fa13a426..407a483f8ab9 100644 --- a/packages/devextreme-angular/src/ui/data-grid/nested/field-dxi.ts +++ b/packages/devextreme-angular/src/ui/data-grid/nested/field-dxi.ts @@ -13,9 +13,9 @@ import { import { DataType } from 'devextreme/common'; +import { Format } from 'devextreme/common/core/localization'; import { Store } from 'devextreme/data'; import { Options as DataSourceOptions } from 'devextreme/data/data_source'; -import { Format } from 'devextreme/localization'; import { FilterBuilderOperation } from 'devextreme/ui/filter_builder'; import { diff --git a/packages/devextreme-angular/src/ui/data-grid/nested/filter-builder-popup.ts b/packages/devextreme-angular/src/ui/data-grid/nested/filter-builder-popup.ts index ccd7eb5f442d..9c8a4200e3af 100644 --- a/packages/devextreme-angular/src/ui/data-grid/nested/filter-builder-popup.ts +++ b/packages/devextreme-angular/src/ui/data-grid/nested/filter-builder-popup.ts @@ -19,9 +19,8 @@ import { -import { AnimationConfig } from 'devextreme/animation/fx'; -import { PositionConfig } from 'devextreme/animation/position'; import { PositionAlignment, ToolbarItemComponent, ToolbarItemLocation } from 'devextreme/common'; +import { AnimationConfig, PositionConfig } from 'devextreme/common/core/animation'; import { UserDefinedElement } from 'devextreme/core/element'; import { ToolbarLocation } from 'devextreme/ui/popup'; import { LocateInMenuMode, ShowTextMode } from 'devextreme/ui/toolbar'; diff --git a/packages/devextreme-angular/src/ui/data-grid/nested/from.ts b/packages/devextreme-angular/src/ui/data-grid/nested/from.ts index 35ac8347631e..b3c614629467 100644 --- a/packages/devextreme-angular/src/ui/data-grid/nested/from.ts +++ b/packages/devextreme-angular/src/ui/data-grid/nested/from.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/data-grid/nested/group-item-dxi.ts b/packages/devextreme-angular/src/ui/data-grid/nested/group-item-dxi.ts index c83ab5b4ca47..e23ef39216c8 100644 --- a/packages/devextreme-angular/src/ui/data-grid/nested/group-item-dxi.ts +++ b/packages/devextreme-angular/src/ui/data-grid/nested/group-item-dxi.ts @@ -12,8 +12,8 @@ import { +import { Format } from 'devextreme/common/core/localization'; import { SummaryType } from 'devextreme/common/grids'; -import { Format } from 'devextreme/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/data-grid/nested/hide.ts b/packages/devextreme-angular/src/ui/data-grid/nested/hide.ts index 2b0aeae0cea5..4caafd92d98e 100644 --- a/packages/devextreme-angular/src/ui/data-grid/nested/hide.ts +++ b/packages/devextreme-angular/src/ui/data-grid/nested/hide.ts @@ -14,8 +14,8 @@ import { -import { AnimationState, AnimationType } from 'devextreme/animation/fx'; import { Direction } from 'devextreme/common'; +import { AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/data-grid/nested/popup.ts b/packages/devextreme-angular/src/ui/data-grid/nested/popup.ts index dba9c0bda3b0..92d4fe667aec 100644 --- a/packages/devextreme-angular/src/ui/data-grid/nested/popup.ts +++ b/packages/devextreme-angular/src/ui/data-grid/nested/popup.ts @@ -19,9 +19,8 @@ import { -import { AnimationConfig } from 'devextreme/animation/fx'; -import { PositionConfig } from 'devextreme/animation/position'; import { PositionAlignment, ToolbarItemComponent, ToolbarItemLocation } from 'devextreme/common'; +import { AnimationConfig, PositionConfig } from 'devextreme/common/core/animation'; import { UserDefinedElement } from 'devextreme/core/element'; import { ToolbarLocation } from 'devextreme/ui/popup'; import { LocateInMenuMode, ShowTextMode } from 'devextreme/ui/toolbar'; diff --git a/packages/devextreme-angular/src/ui/data-grid/nested/position.ts b/packages/devextreme-angular/src/ui/data-grid/nested/position.ts index 4dfa5e875005..cab78ca023dc 100644 --- a/packages/devextreme-angular/src/ui/data-grid/nested/position.ts +++ b/packages/devextreme-angular/src/ui/data-grid/nested/position.ts @@ -14,8 +14,8 @@ import { -import { CollisionResolution, CollisionResolutionCombination } from 'devextreme/animation/position'; import { HorizontalAlignment, PositionAlignment, VerticalAlignment } from 'devextreme/common'; +import { CollisionResolution, CollisionResolutionCombination } from 'devextreme/common/core/animation'; import { UserDefinedElement } from 'devextreme/core/element'; import { diff --git a/packages/devextreme-angular/src/ui/data-grid/nested/show.ts b/packages/devextreme-angular/src/ui/data-grid/nested/show.ts index ccea2eef0e03..2df32165d344 100644 --- a/packages/devextreme-angular/src/ui/data-grid/nested/show.ts +++ b/packages/devextreme-angular/src/ui/data-grid/nested/show.ts @@ -14,8 +14,8 @@ import { -import { AnimationState, AnimationType } from 'devextreme/animation/fx'; import { Direction } from 'devextreme/common'; +import { AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/data-grid/nested/summary.ts b/packages/devextreme-angular/src/ui/data-grid/nested/summary.ts index b8638b46f205..5b9ecc8156e9 100644 --- a/packages/devextreme-angular/src/ui/data-grid/nested/summary.ts +++ b/packages/devextreme-angular/src/ui/data-grid/nested/summary.ts @@ -18,8 +18,8 @@ import { import { HorizontalAlignment } from 'devextreme/common'; +import { Format } from 'devextreme/common/core/localization'; import { SummaryType } from 'devextreme/common/grids'; -import { Format } from 'devextreme/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/data-grid/nested/to.ts b/packages/devextreme-angular/src/ui/data-grid/nested/to.ts index ee98029726ab..9c2c85a94905 100644 --- a/packages/devextreme-angular/src/ui/data-grid/nested/to.ts +++ b/packages/devextreme-angular/src/ui/data-grid/nested/to.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/data-grid/nested/total-item-dxi.ts b/packages/devextreme-angular/src/ui/data-grid/nested/total-item-dxi.ts index 92ceabd74f4e..dfbaba1a2888 100644 --- a/packages/devextreme-angular/src/ui/data-grid/nested/total-item-dxi.ts +++ b/packages/devextreme-angular/src/ui/data-grid/nested/total-item-dxi.ts @@ -13,8 +13,8 @@ import { import { HorizontalAlignment } from 'devextreme/common'; +import { Format } from 'devextreme/common/core/localization'; import { SummaryType } from 'devextreme/common/grids'; -import { Format } from 'devextreme/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/date-box/index.ts b/packages/devextreme-angular/src/ui/date-box/index.ts index 1113eb709c54..164d98fbf5f6 100644 --- a/packages/devextreme-angular/src/ui/date-box/index.ts +++ b/packages/devextreme-angular/src/ui/date-box/index.ts @@ -25,7 +25,7 @@ import { import { ApplyValueMode, EditorStyle, LabelMode, Mode, Position, TextEditorButton, ValidationMessageMode, ValidationStatus } from 'devextreme/common'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { Properties as dxCalendarOptions } from 'devextreme/ui/calendar'; import { ChangeEvent, ClosedEvent, ContentReadyEvent, CopyEvent, CutEvent, DatePickerType, DateType, DisposingEvent, EnterKeyEvent, FocusInEvent, FocusOutEvent, InitializedEvent, InputEvent, KeyDownEvent, KeyUpEvent, OpenedEvent, OptionChangedEvent, PasteEvent, ValueChangedEvent } from 'devextreme/ui/date_box'; import { DropDownPredefinedButton } from 'devextreme/ui/drop_down_editor/ui.drop_down_editor'; diff --git a/packages/devextreme-angular/src/ui/date-box/nested/animation.ts b/packages/devextreme-angular/src/ui/date-box/nested/animation.ts index 44b52ee168a3..e4098f25e80b 100644 --- a/packages/devextreme-angular/src/ui/date-box/nested/animation.ts +++ b/packages/devextreme-angular/src/ui/date-box/nested/animation.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig } from 'devextreme/animation/fx'; +import { AnimationConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/date-box/nested/collision.ts b/packages/devextreme-angular/src/ui/date-box/nested/collision.ts index 9fc9e5a49952..f295cc9a4276 100644 --- a/packages/devextreme-angular/src/ui/date-box/nested/collision.ts +++ b/packages/devextreme-angular/src/ui/date-box/nested/collision.ts @@ -14,7 +14,7 @@ import { -import { CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/date-box/nested/drop-down-options.ts b/packages/devextreme-angular/src/ui/date-box/nested/drop-down-options.ts index c5667afdccbe..1e47d8b97de0 100644 --- a/packages/devextreme-angular/src/ui/date-box/nested/drop-down-options.ts +++ b/packages/devextreme-angular/src/ui/date-box/nested/drop-down-options.ts @@ -19,9 +19,8 @@ import { -import { AnimationConfig } from 'devextreme/animation/fx'; -import { PositionConfig } from 'devextreme/animation/position'; import { PositionAlignment, ToolbarItemComponent, ToolbarItemLocation } from 'devextreme/common'; +import { AnimationConfig, PositionConfig } from 'devextreme/common/core/animation'; import { UserDefinedElement } from 'devextreme/core/element'; import { ToolbarLocation } from 'devextreme/ui/popup'; import { LocateInMenuMode, ShowTextMode } from 'devextreme/ui/toolbar'; diff --git a/packages/devextreme-angular/src/ui/date-box/nested/from.ts b/packages/devextreme-angular/src/ui/date-box/nested/from.ts index 14f8a16f2eab..7755cc879f71 100644 --- a/packages/devextreme-angular/src/ui/date-box/nested/from.ts +++ b/packages/devextreme-angular/src/ui/date-box/nested/from.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/date-box/nested/hide.ts b/packages/devextreme-angular/src/ui/date-box/nested/hide.ts index 82112e42d1a9..69d670b4252a 100644 --- a/packages/devextreme-angular/src/ui/date-box/nested/hide.ts +++ b/packages/devextreme-angular/src/ui/date-box/nested/hide.ts @@ -14,8 +14,8 @@ import { -import { AnimationState, AnimationType } from 'devextreme/animation/fx'; import { Direction } from 'devextreme/common'; +import { AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/date-box/nested/position.ts b/packages/devextreme-angular/src/ui/date-box/nested/position.ts index 8db961410dcf..72409ad15685 100644 --- a/packages/devextreme-angular/src/ui/date-box/nested/position.ts +++ b/packages/devextreme-angular/src/ui/date-box/nested/position.ts @@ -14,8 +14,8 @@ import { -import { CollisionResolution, CollisionResolutionCombination } from 'devextreme/animation/position'; import { HorizontalAlignment, PositionAlignment, VerticalAlignment } from 'devextreme/common'; +import { CollisionResolution, CollisionResolutionCombination } from 'devextreme/common/core/animation'; import { UserDefinedElement } from 'devextreme/core/element'; import { diff --git a/packages/devextreme-angular/src/ui/date-box/nested/show.ts b/packages/devextreme-angular/src/ui/date-box/nested/show.ts index 436c5182c955..c6082120eaf7 100644 --- a/packages/devextreme-angular/src/ui/date-box/nested/show.ts +++ b/packages/devextreme-angular/src/ui/date-box/nested/show.ts @@ -14,8 +14,8 @@ import { -import { AnimationState, AnimationType } from 'devextreme/animation/fx'; import { Direction } from 'devextreme/common'; +import { AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/date-box/nested/to.ts b/packages/devextreme-angular/src/ui/date-box/nested/to.ts index d354fb9adeff..26f927f858e6 100644 --- a/packages/devextreme-angular/src/ui/date-box/nested/to.ts +++ b/packages/devextreme-angular/src/ui/date-box/nested/to.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/date-range-box/index.ts b/packages/devextreme-angular/src/ui/date-range-box/index.ts index 2d8b2bf87b3f..cc5c39c8c669 100644 --- a/packages/devextreme-angular/src/ui/date-range-box/index.ts +++ b/packages/devextreme-angular/src/ui/date-range-box/index.ts @@ -25,7 +25,7 @@ import { import { ApplyValueMode, EditorStyle, LabelMode, Mode, Position, TextEditorButton, ValidationMessageMode, ValidationStatus } from 'devextreme/common'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { Properties as dxCalendarOptions } from 'devextreme/ui/calendar'; import { ChangeEvent, ClosedEvent, ContentReadyEvent, CopyEvent, CutEvent, DisposingEvent, EnterKeyEvent, FocusInEvent, FocusOutEvent, InitializedEvent, InputEvent, KeyDownEvent, KeyUpEvent, OpenedEvent, OptionChangedEvent, PasteEvent, ValueChangedEvent } from 'devextreme/ui/date_range_box'; import { DropDownPredefinedButton } from 'devextreme/ui/drop_down_editor/ui.drop_down_editor'; diff --git a/packages/devextreme-angular/src/ui/date-range-box/nested/animation.ts b/packages/devextreme-angular/src/ui/date-range-box/nested/animation.ts index 3f73fa4bd6b3..70af37164f88 100644 --- a/packages/devextreme-angular/src/ui/date-range-box/nested/animation.ts +++ b/packages/devextreme-angular/src/ui/date-range-box/nested/animation.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig } from 'devextreme/animation/fx'; +import { AnimationConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/date-range-box/nested/collision.ts b/packages/devextreme-angular/src/ui/date-range-box/nested/collision.ts index 1ff952ce579b..afa98b591c22 100644 --- a/packages/devextreme-angular/src/ui/date-range-box/nested/collision.ts +++ b/packages/devextreme-angular/src/ui/date-range-box/nested/collision.ts @@ -14,7 +14,7 @@ import { -import { CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/date-range-box/nested/drop-down-options.ts b/packages/devextreme-angular/src/ui/date-range-box/nested/drop-down-options.ts index 45688319909d..d123062df47b 100644 --- a/packages/devextreme-angular/src/ui/date-range-box/nested/drop-down-options.ts +++ b/packages/devextreme-angular/src/ui/date-range-box/nested/drop-down-options.ts @@ -19,9 +19,8 @@ import { -import { AnimationConfig } from 'devextreme/animation/fx'; -import { PositionConfig } from 'devextreme/animation/position'; import { PositionAlignment, ToolbarItemComponent, ToolbarItemLocation } from 'devextreme/common'; +import { AnimationConfig, PositionConfig } from 'devextreme/common/core/animation'; import { UserDefinedElement } from 'devextreme/core/element'; import { ToolbarLocation } from 'devextreme/ui/popup'; import { LocateInMenuMode, ShowTextMode } from 'devextreme/ui/toolbar'; diff --git a/packages/devextreme-angular/src/ui/date-range-box/nested/from.ts b/packages/devextreme-angular/src/ui/date-range-box/nested/from.ts index 0207d77f4b67..432c15d7564b 100644 --- a/packages/devextreme-angular/src/ui/date-range-box/nested/from.ts +++ b/packages/devextreme-angular/src/ui/date-range-box/nested/from.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/date-range-box/nested/hide.ts b/packages/devextreme-angular/src/ui/date-range-box/nested/hide.ts index 5bf3b5d5c9d9..997d434afbb7 100644 --- a/packages/devextreme-angular/src/ui/date-range-box/nested/hide.ts +++ b/packages/devextreme-angular/src/ui/date-range-box/nested/hide.ts @@ -14,8 +14,8 @@ import { -import { AnimationState, AnimationType } from 'devextreme/animation/fx'; import { Direction } from 'devextreme/common'; +import { AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/date-range-box/nested/position.ts b/packages/devextreme-angular/src/ui/date-range-box/nested/position.ts index 48a39bdbd4d2..74488749dbf1 100644 --- a/packages/devextreme-angular/src/ui/date-range-box/nested/position.ts +++ b/packages/devextreme-angular/src/ui/date-range-box/nested/position.ts @@ -14,8 +14,8 @@ import { -import { CollisionResolution, CollisionResolutionCombination } from 'devextreme/animation/position'; import { HorizontalAlignment, PositionAlignment, VerticalAlignment } from 'devextreme/common'; +import { CollisionResolution, CollisionResolutionCombination } from 'devextreme/common/core/animation'; import { UserDefinedElement } from 'devextreme/core/element'; import { diff --git a/packages/devextreme-angular/src/ui/date-range-box/nested/show.ts b/packages/devextreme-angular/src/ui/date-range-box/nested/show.ts index fc5ec9ba5b96..27e95ef807c0 100644 --- a/packages/devextreme-angular/src/ui/date-range-box/nested/show.ts +++ b/packages/devextreme-angular/src/ui/date-range-box/nested/show.ts @@ -14,8 +14,8 @@ import { -import { AnimationState, AnimationType } from 'devextreme/animation/fx'; import { Direction } from 'devextreme/common'; +import { AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/date-range-box/nested/to.ts b/packages/devextreme-angular/src/ui/date-range-box/nested/to.ts index b8d6422ac390..81387cd87520 100644 --- a/packages/devextreme-angular/src/ui/date-range-box/nested/to.ts +++ b/packages/devextreme-angular/src/ui/date-range-box/nested/to.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/defer-rendering/index.ts b/packages/devextreme-angular/src/ui/defer-rendering/index.ts index c2b2b86d1fd9..f8abddfc3dd3 100644 --- a/packages/devextreme-angular/src/ui/defer-rendering/index.ts +++ b/packages/devextreme-angular/src/ui/defer-rendering/index.ts @@ -17,8 +17,8 @@ import { } from '@angular/core'; -import { AnimationConfig } from 'devextreme/animation/fx'; -import { DxPromise } from 'devextreme/core/utils/deferred'; +import { DxPromise } from 'devextreme/common'; +import { AnimationConfig } from 'devextreme/common/core/animation'; import { ContentReadyEvent, DisposingEvent, InitializedEvent, OptionChangedEvent, RenderedEvent, ShownEvent } from 'devextreme/ui/defer_rendering'; import DxDeferRendering from 'devextreme/ui/defer_rendering'; diff --git a/packages/devextreme-angular/src/ui/defer-rendering/nested/animation.ts b/packages/devextreme-angular/src/ui/defer-rendering/nested/animation.ts index 4965c61d13a4..a21a5a6f6b99 100644 --- a/packages/devextreme-angular/src/ui/defer-rendering/nested/animation.ts +++ b/packages/devextreme-angular/src/ui/defer-rendering/nested/animation.ts @@ -14,8 +14,8 @@ import { -import { AnimationState, AnimationType } from 'devextreme/animation/fx'; import { Direction } from 'devextreme/common'; +import { AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/defer-rendering/nested/collision.ts b/packages/devextreme-angular/src/ui/defer-rendering/nested/collision.ts index 85417424ea71..b4f2f9c8ee0c 100644 --- a/packages/devextreme-angular/src/ui/defer-rendering/nested/collision.ts +++ b/packages/devextreme-angular/src/ui/defer-rendering/nested/collision.ts @@ -14,7 +14,7 @@ import { -import { CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/defer-rendering/nested/from.ts b/packages/devextreme-angular/src/ui/defer-rendering/nested/from.ts index ed0b403192c7..5bf137547e7f 100644 --- a/packages/devextreme-angular/src/ui/defer-rendering/nested/from.ts +++ b/packages/devextreme-angular/src/ui/defer-rendering/nested/from.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/defer-rendering/nested/position.ts b/packages/devextreme-angular/src/ui/defer-rendering/nested/position.ts index 3e47170e19ea..6ec30110139c 100644 --- a/packages/devextreme-angular/src/ui/defer-rendering/nested/position.ts +++ b/packages/devextreme-angular/src/ui/defer-rendering/nested/position.ts @@ -14,8 +14,8 @@ import { -import { CollisionResolution, CollisionResolutionCombination } from 'devextreme/animation/position'; import { HorizontalAlignment, PositionAlignment, VerticalAlignment } from 'devextreme/common'; +import { CollisionResolution, CollisionResolutionCombination } from 'devextreme/common/core/animation'; import { UserDefinedElement } from 'devextreme/core/element'; import { diff --git a/packages/devextreme-angular/src/ui/defer-rendering/nested/to.ts b/packages/devextreme-angular/src/ui/defer-rendering/nested/to.ts index 045b06934978..c6d052ce5b90 100644 --- a/packages/devextreme-angular/src/ui/defer-rendering/nested/to.ts +++ b/packages/devextreme-angular/src/ui/defer-rendering/nested/to.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/drop-down-box/nested/animation.ts b/packages/devextreme-angular/src/ui/drop-down-box/nested/animation.ts index f4357f00e3fc..0b9911cc3fe3 100644 --- a/packages/devextreme-angular/src/ui/drop-down-box/nested/animation.ts +++ b/packages/devextreme-angular/src/ui/drop-down-box/nested/animation.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig } from 'devextreme/animation/fx'; +import { AnimationConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/drop-down-box/nested/collision.ts b/packages/devextreme-angular/src/ui/drop-down-box/nested/collision.ts index 46c782f70fd3..733a0006099c 100644 --- a/packages/devextreme-angular/src/ui/drop-down-box/nested/collision.ts +++ b/packages/devextreme-angular/src/ui/drop-down-box/nested/collision.ts @@ -14,7 +14,7 @@ import { -import { CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/drop-down-box/nested/drop-down-options.ts b/packages/devextreme-angular/src/ui/drop-down-box/nested/drop-down-options.ts index e450cc2aefa3..7abcce383d71 100644 --- a/packages/devextreme-angular/src/ui/drop-down-box/nested/drop-down-options.ts +++ b/packages/devextreme-angular/src/ui/drop-down-box/nested/drop-down-options.ts @@ -19,9 +19,8 @@ import { -import { AnimationConfig } from 'devextreme/animation/fx'; -import { PositionConfig } from 'devextreme/animation/position'; import { PositionAlignment, ToolbarItemComponent, ToolbarItemLocation } from 'devextreme/common'; +import { AnimationConfig, PositionConfig } from 'devextreme/common/core/animation'; import { UserDefinedElement } from 'devextreme/core/element'; import { ToolbarLocation } from 'devextreme/ui/popup'; import { LocateInMenuMode, ShowTextMode } from 'devextreme/ui/toolbar'; diff --git a/packages/devextreme-angular/src/ui/drop-down-box/nested/from.ts b/packages/devextreme-angular/src/ui/drop-down-box/nested/from.ts index 0f9a2ae35b13..739262cdb6ce 100644 --- a/packages/devextreme-angular/src/ui/drop-down-box/nested/from.ts +++ b/packages/devextreme-angular/src/ui/drop-down-box/nested/from.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/drop-down-box/nested/hide.ts b/packages/devextreme-angular/src/ui/drop-down-box/nested/hide.ts index bd9261ef68ba..4a56c863e552 100644 --- a/packages/devextreme-angular/src/ui/drop-down-box/nested/hide.ts +++ b/packages/devextreme-angular/src/ui/drop-down-box/nested/hide.ts @@ -14,8 +14,8 @@ import { -import { AnimationState, AnimationType } from 'devextreme/animation/fx'; import { Direction } from 'devextreme/common'; +import { AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/drop-down-box/nested/position.ts b/packages/devextreme-angular/src/ui/drop-down-box/nested/position.ts index 1cde76899f97..29e68be474d4 100644 --- a/packages/devextreme-angular/src/ui/drop-down-box/nested/position.ts +++ b/packages/devextreme-angular/src/ui/drop-down-box/nested/position.ts @@ -14,8 +14,8 @@ import { -import { CollisionResolution, CollisionResolutionCombination } from 'devextreme/animation/position'; import { HorizontalAlignment, PositionAlignment, VerticalAlignment } from 'devextreme/common'; +import { CollisionResolution, CollisionResolutionCombination } from 'devextreme/common/core/animation'; import { UserDefinedElement } from 'devextreme/core/element'; import { diff --git a/packages/devextreme-angular/src/ui/drop-down-box/nested/show.ts b/packages/devextreme-angular/src/ui/drop-down-box/nested/show.ts index 3bfd2e98a565..ab748edf866a 100644 --- a/packages/devextreme-angular/src/ui/drop-down-box/nested/show.ts +++ b/packages/devextreme-angular/src/ui/drop-down-box/nested/show.ts @@ -14,8 +14,8 @@ import { -import { AnimationState, AnimationType } from 'devextreme/animation/fx'; import { Direction } from 'devextreme/common'; +import { AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/drop-down-box/nested/to.ts b/packages/devextreme-angular/src/ui/drop-down-box/nested/to.ts index f4235b576860..8ef6ad765f6e 100644 --- a/packages/devextreme-angular/src/ui/drop-down-box/nested/to.ts +++ b/packages/devextreme-angular/src/ui/drop-down-box/nested/to.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/drop-down-button/nested/animation.ts b/packages/devextreme-angular/src/ui/drop-down-button/nested/animation.ts index 781529c8020a..8d8cd936e825 100644 --- a/packages/devextreme-angular/src/ui/drop-down-button/nested/animation.ts +++ b/packages/devextreme-angular/src/ui/drop-down-button/nested/animation.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig } from 'devextreme/animation/fx'; +import { AnimationConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/drop-down-button/nested/collision.ts b/packages/devextreme-angular/src/ui/drop-down-button/nested/collision.ts index a2c31d7d31f9..b1c7c167e2e0 100644 --- a/packages/devextreme-angular/src/ui/drop-down-button/nested/collision.ts +++ b/packages/devextreme-angular/src/ui/drop-down-button/nested/collision.ts @@ -14,7 +14,7 @@ import { -import { CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/drop-down-button/nested/drop-down-options.ts b/packages/devextreme-angular/src/ui/drop-down-button/nested/drop-down-options.ts index 1d3ae7457cac..40ef2437da9c 100644 --- a/packages/devextreme-angular/src/ui/drop-down-button/nested/drop-down-options.ts +++ b/packages/devextreme-angular/src/ui/drop-down-button/nested/drop-down-options.ts @@ -19,9 +19,8 @@ import { -import { AnimationConfig } from 'devextreme/animation/fx'; -import { PositionConfig } from 'devextreme/animation/position'; import { PositionAlignment, ToolbarItemComponent, ToolbarItemLocation } from 'devextreme/common'; +import { AnimationConfig, PositionConfig } from 'devextreme/common/core/animation'; import { UserDefinedElement } from 'devextreme/core/element'; import { ToolbarLocation } from 'devextreme/ui/popup'; import { LocateInMenuMode, ShowTextMode } from 'devextreme/ui/toolbar'; diff --git a/packages/devextreme-angular/src/ui/drop-down-button/nested/from.ts b/packages/devextreme-angular/src/ui/drop-down-button/nested/from.ts index 8b3d9f53f4e6..55ff680aae74 100644 --- a/packages/devextreme-angular/src/ui/drop-down-button/nested/from.ts +++ b/packages/devextreme-angular/src/ui/drop-down-button/nested/from.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/drop-down-button/nested/hide.ts b/packages/devextreme-angular/src/ui/drop-down-button/nested/hide.ts index fd79026fedc7..64f9d1cdd515 100644 --- a/packages/devextreme-angular/src/ui/drop-down-button/nested/hide.ts +++ b/packages/devextreme-angular/src/ui/drop-down-button/nested/hide.ts @@ -14,8 +14,8 @@ import { -import { AnimationState, AnimationType } from 'devextreme/animation/fx'; import { Direction } from 'devextreme/common'; +import { AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/drop-down-button/nested/position.ts b/packages/devextreme-angular/src/ui/drop-down-button/nested/position.ts index 8d98fde1b924..0ad0b6971473 100644 --- a/packages/devextreme-angular/src/ui/drop-down-button/nested/position.ts +++ b/packages/devextreme-angular/src/ui/drop-down-button/nested/position.ts @@ -14,8 +14,8 @@ import { -import { CollisionResolution, CollisionResolutionCombination } from 'devextreme/animation/position'; import { HorizontalAlignment, PositionAlignment, VerticalAlignment } from 'devextreme/common'; +import { CollisionResolution, CollisionResolutionCombination } from 'devextreme/common/core/animation'; import { UserDefinedElement } from 'devextreme/core/element'; import { diff --git a/packages/devextreme-angular/src/ui/drop-down-button/nested/show.ts b/packages/devextreme-angular/src/ui/drop-down-button/nested/show.ts index 921234f3d438..747136bfe349 100644 --- a/packages/devextreme-angular/src/ui/drop-down-button/nested/show.ts +++ b/packages/devextreme-angular/src/ui/drop-down-button/nested/show.ts @@ -14,8 +14,8 @@ import { -import { AnimationState, AnimationType } from 'devextreme/animation/fx'; import { Direction } from 'devextreme/common'; +import { AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/drop-down-button/nested/to.ts b/packages/devextreme-angular/src/ui/drop-down-button/nested/to.ts index db2ced937087..d88f223fc5cb 100644 --- a/packages/devextreme-angular/src/ui/drop-down-button/nested/to.ts +++ b/packages/devextreme-angular/src/ui/drop-down-button/nested/to.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/filter-builder/nested/field-dxi.ts b/packages/devextreme-angular/src/ui/filter-builder/nested/field-dxi.ts index 1227200fe992..7fb3252a2b97 100644 --- a/packages/devextreme-angular/src/ui/filter-builder/nested/field-dxi.ts +++ b/packages/devextreme-angular/src/ui/filter-builder/nested/field-dxi.ts @@ -13,9 +13,9 @@ import { import { DataType } from 'devextreme/common'; +import { Format } from 'devextreme/common/core/localization'; import { Store } from 'devextreme/data'; import { Options as DataSourceOptions } from 'devextreme/data/data_source'; -import { Format } from 'devextreme/localization'; import { FilterBuilderOperation } from 'devextreme/ui/filter_builder'; import { diff --git a/packages/devextreme-angular/src/ui/funnel/index.ts b/packages/devextreme-angular/src/ui/funnel/index.ts index aefc92eb7191..4dbc6ce5de22 100644 --- a/packages/devextreme-angular/src/ui/funnel/index.ts +++ b/packages/devextreme-angular/src/ui/funnel/index.ts @@ -22,10 +22,10 @@ import { import { ExportFormat, HorizontalAlignment, HorizontalEdge, Orientation, Position, SingleMultipleOrNone, VerticalEdge } from 'devextreme/common'; import { DashStyle, Font, HatchDirection, LabelPosition, Palette, PaletteExtensionMode, ShiftLabelOverlap, TextOverflow, Theme, WordWrap } from 'devextreme/common/charts'; +import { Format } from 'devextreme/common/core/localization'; import { UserDefinedElement } from 'devextreme/core/element'; import { Store } from 'devextreme/data'; import DataSource, { Options as DataSourceOptions } from 'devextreme/data/data_source'; -import { Format } from 'devextreme/localization'; import { DisposingEvent, DrawnEvent, ExportedEvent, ExportingEvent, FileSavingEvent, FunnelAlgorithm, HoverChangedEvent, IncidentOccurredEvent, InitializedEvent, ItemClickEvent, LegendClickEvent, OptionChangedEvent, SelectionChangedEvent } from 'devextreme/viz/funnel'; import DxFunnel from 'devextreme/viz/funnel'; diff --git a/packages/devextreme-angular/src/ui/funnel/nested/label.ts b/packages/devextreme-angular/src/ui/funnel/nested/label.ts index f7e9c53fd0fe..cae647a2ceab 100644 --- a/packages/devextreme-angular/src/ui/funnel/nested/label.ts +++ b/packages/devextreme-angular/src/ui/funnel/nested/label.ts @@ -16,7 +16,7 @@ import { import { HorizontalEdge } from 'devextreme/common'; import { DashStyle, Font, LabelPosition, TextOverflow, WordWrap } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/funnel/nested/tooltip.ts b/packages/devextreme-angular/src/ui/funnel/nested/tooltip.ts index 9d3755ae3fe2..7d72a18e7dba 100644 --- a/packages/devextreme-angular/src/ui/funnel/nested/tooltip.ts +++ b/packages/devextreme-angular/src/ui/funnel/nested/tooltip.ts @@ -15,8 +15,8 @@ import { import { DashStyle, Font } from 'devextreme/common/charts'; +import { Format } from 'devextreme/common/core/localization'; import { UserDefinedElement } from 'devextreme/core/element'; -import { Format } from 'devextreme/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/gantt/nested/column-dxi.ts b/packages/devextreme-angular/src/ui/gantt/nested/column-dxi.ts index fadbbcada796..714cca594fa9 100644 --- a/packages/devextreme-angular/src/ui/gantt/nested/column-dxi.ts +++ b/packages/devextreme-angular/src/ui/gantt/nested/column-dxi.ts @@ -15,10 +15,10 @@ import { import { DataType, HorizontalAlignment, SearchMode, SortOrder } from 'devextreme/common'; +import { Format } from 'devextreme/common/core/localization'; import { ColumnHeaderFilterSearchConfig, FilterOperation, FilterType, HeaderFilterGroupInterval, SelectedFilterOperation } from 'devextreme/common/grids'; import { Store } from 'devextreme/data'; import { Options as DataSourceOptions } from 'devextreme/data/data_source'; -import { Format } from 'devextreme/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/linear-gauge/index.ts b/packages/devextreme-angular/src/ui/linear-gauge/index.ts index 123eb53a12ba..0fb05a6cb52b 100644 --- a/packages/devextreme-angular/src/ui/linear-gauge/index.ts +++ b/packages/devextreme-angular/src/ui/linear-gauge/index.ts @@ -22,8 +22,8 @@ import { import { ExportFormat, HorizontalAlignment, Orientation, VerticalAlignment, VerticalEdge } from 'devextreme/common'; import { AnimationEaseMode, ChartsColor, DashStyle, Font, LabelOverlap, Palette, PaletteExtensionMode, TextOverflow, Theme, WordWrap } from 'devextreme/common/charts'; +import { Format } from 'devextreme/common/core/localization'; import { UserDefinedElement } from 'devextreme/core/element'; -import { Format } from 'devextreme/localization'; import { GaugeIndicator } from 'devextreme/viz/gauges/base_gauge'; import { DisposingEvent, DrawnEvent, ExportedEvent, ExportingEvent, FileSavingEvent, IncidentOccurredEvent, InitializedEvent, OptionChangedEvent, TooltipHiddenEvent, TooltipShownEvent } from 'devextreme/viz/linear_gauge'; diff --git a/packages/devextreme-angular/src/ui/linear-gauge/nested/label.ts b/packages/devextreme-angular/src/ui/linear-gauge/nested/label.ts index 0db11cc19fd5..14bb3e1dce38 100644 --- a/packages/devextreme-angular/src/ui/linear-gauge/nested/label.ts +++ b/packages/devextreme-angular/src/ui/linear-gauge/nested/label.ts @@ -15,7 +15,7 @@ import { import { Font, LabelOverlap } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/linear-gauge/nested/scale.ts b/packages/devextreme-angular/src/ui/linear-gauge/nested/scale.ts index b55eff02a155..6f467c2b0369 100644 --- a/packages/devextreme-angular/src/ui/linear-gauge/nested/scale.ts +++ b/packages/devextreme-angular/src/ui/linear-gauge/nested/scale.ts @@ -16,7 +16,7 @@ import { import { HorizontalAlignment, VerticalAlignment } from 'devextreme/common'; import { Font, LabelOverlap } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/linear-gauge/nested/subvalue-indicator.ts b/packages/devextreme-angular/src/ui/linear-gauge/nested/subvalue-indicator.ts index 344910a8b851..d5903cb83c3e 100644 --- a/packages/devextreme-angular/src/ui/linear-gauge/nested/subvalue-indicator.ts +++ b/packages/devextreme-angular/src/ui/linear-gauge/nested/subvalue-indicator.ts @@ -16,7 +16,7 @@ import { import { HorizontalEdge, VerticalEdge } from 'devextreme/common'; import { ChartsColor, Font, Palette } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/linear-gauge/nested/text.ts b/packages/devextreme-angular/src/ui/linear-gauge/nested/text.ts index 656cb86b6bb5..17b89bb4d393 100644 --- a/packages/devextreme-angular/src/ui/linear-gauge/nested/text.ts +++ b/packages/devextreme-angular/src/ui/linear-gauge/nested/text.ts @@ -15,7 +15,7 @@ import { import { Font } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/linear-gauge/nested/tooltip.ts b/packages/devextreme-angular/src/ui/linear-gauge/nested/tooltip.ts index e2298f497efc..491abae6922a 100644 --- a/packages/devextreme-angular/src/ui/linear-gauge/nested/tooltip.ts +++ b/packages/devextreme-angular/src/ui/linear-gauge/nested/tooltip.ts @@ -15,8 +15,8 @@ import { import { DashStyle, Font } from 'devextreme/common/charts'; +import { Format } from 'devextreme/common/core/localization'; import { UserDefinedElement } from 'devextreme/core/element'; -import { Format } from 'devextreme/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/linear-gauge/nested/value-indicator.ts b/packages/devextreme-angular/src/ui/linear-gauge/nested/value-indicator.ts index 5b263627f69f..4fdf8c5d702f 100644 --- a/packages/devextreme-angular/src/ui/linear-gauge/nested/value-indicator.ts +++ b/packages/devextreme-angular/src/ui/linear-gauge/nested/value-indicator.ts @@ -16,7 +16,7 @@ import { import { HorizontalEdge, VerticalEdge } from 'devextreme/common'; import { ChartsColor, Font, Palette } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/load-panel/index.ts b/packages/devextreme-angular/src/ui/load-panel/index.ts index ae6221da016e..1e40e5655063 100644 --- a/packages/devextreme-angular/src/ui/load-panel/index.ts +++ b/packages/devextreme-angular/src/ui/load-panel/index.ts @@ -17,9 +17,8 @@ import { } from '@angular/core'; -import { AnimationConfig } from 'devextreme/animation/fx'; -import { PositionConfig } from 'devextreme/animation/position'; import { PositionAlignment } from 'devextreme/common'; +import { AnimationConfig, PositionConfig } from 'devextreme/common/core/animation'; import { UserDefinedElement } from 'devextreme/core/element'; import { ContentReadyEvent, DisposingEvent, HiddenEvent, HidingEvent, InitializedEvent, OptionChangedEvent, ShowingEvent, ShownEvent } from 'devextreme/ui/load_panel'; diff --git a/packages/devextreme-angular/src/ui/load-panel/nested/animation.ts b/packages/devextreme-angular/src/ui/load-panel/nested/animation.ts index 2cb5791080dc..c7cff62b2841 100644 --- a/packages/devextreme-angular/src/ui/load-panel/nested/animation.ts +++ b/packages/devextreme-angular/src/ui/load-panel/nested/animation.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig } from 'devextreme/animation/fx'; +import { AnimationConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/load-panel/nested/collision.ts b/packages/devextreme-angular/src/ui/load-panel/nested/collision.ts index 7109f2eb3c11..995b9f1624aa 100644 --- a/packages/devextreme-angular/src/ui/load-panel/nested/collision.ts +++ b/packages/devextreme-angular/src/ui/load-panel/nested/collision.ts @@ -14,7 +14,7 @@ import { -import { CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/load-panel/nested/from.ts b/packages/devextreme-angular/src/ui/load-panel/nested/from.ts index 53f095a9513f..d01f068fd4cf 100644 --- a/packages/devextreme-angular/src/ui/load-panel/nested/from.ts +++ b/packages/devextreme-angular/src/ui/load-panel/nested/from.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/load-panel/nested/hide.ts b/packages/devextreme-angular/src/ui/load-panel/nested/hide.ts index 7f418b418d35..cae81cff2a2b 100644 --- a/packages/devextreme-angular/src/ui/load-panel/nested/hide.ts +++ b/packages/devextreme-angular/src/ui/load-panel/nested/hide.ts @@ -14,8 +14,8 @@ import { -import { AnimationState, AnimationType } from 'devextreme/animation/fx'; import { Direction } from 'devextreme/common'; +import { AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/load-panel/nested/position.ts b/packages/devextreme-angular/src/ui/load-panel/nested/position.ts index 7262ab0fa7cb..20ac307035e7 100644 --- a/packages/devextreme-angular/src/ui/load-panel/nested/position.ts +++ b/packages/devextreme-angular/src/ui/load-panel/nested/position.ts @@ -14,8 +14,8 @@ import { -import { CollisionResolution, CollisionResolutionCombination } from 'devextreme/animation/position'; import { HorizontalAlignment, PositionAlignment, VerticalAlignment } from 'devextreme/common'; +import { CollisionResolution, CollisionResolutionCombination } from 'devextreme/common/core/animation'; import { UserDefinedElement } from 'devextreme/core/element'; import { diff --git a/packages/devextreme-angular/src/ui/load-panel/nested/show.ts b/packages/devextreme-angular/src/ui/load-panel/nested/show.ts index 2159982dafeb..4944af7209c0 100644 --- a/packages/devextreme-angular/src/ui/load-panel/nested/show.ts +++ b/packages/devextreme-angular/src/ui/load-panel/nested/show.ts @@ -14,8 +14,8 @@ import { -import { AnimationState, AnimationType } from 'devextreme/animation/fx'; import { Direction } from 'devextreme/common'; +import { AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/load-panel/nested/to.ts b/packages/devextreme-angular/src/ui/load-panel/nested/to.ts index ce9bb916da11..da284d7812e9 100644 --- a/packages/devextreme-angular/src/ui/load-panel/nested/to.ts +++ b/packages/devextreme-angular/src/ui/load-panel/nested/to.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/lookup/nested/animation.ts b/packages/devextreme-angular/src/ui/lookup/nested/animation.ts index 900c13f36186..05c6d7cc4ecb 100644 --- a/packages/devextreme-angular/src/ui/lookup/nested/animation.ts +++ b/packages/devextreme-angular/src/ui/lookup/nested/animation.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig } from 'devextreme/animation/fx'; +import { AnimationConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/lookup/nested/collision.ts b/packages/devextreme-angular/src/ui/lookup/nested/collision.ts index 753713672a8c..9908a9cfe74d 100644 --- a/packages/devextreme-angular/src/ui/lookup/nested/collision.ts +++ b/packages/devextreme-angular/src/ui/lookup/nested/collision.ts @@ -14,7 +14,7 @@ import { -import { CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/lookup/nested/drop-down-options.ts b/packages/devextreme-angular/src/ui/lookup/nested/drop-down-options.ts index b4f706b40ef6..92bd04f0f5c3 100644 --- a/packages/devextreme-angular/src/ui/lookup/nested/drop-down-options.ts +++ b/packages/devextreme-angular/src/ui/lookup/nested/drop-down-options.ts @@ -19,9 +19,8 @@ import { -import { AnimationConfig } from 'devextreme/animation/fx'; -import { PositionConfig } from 'devextreme/animation/position'; import { Position, ToolbarItemComponent, ToolbarItemLocation } from 'devextreme/common'; +import { AnimationConfig, PositionConfig } from 'devextreme/common/core/animation'; import { UserDefinedElement } from 'devextreme/core/element'; import { ContentReadyEvent, DisposingEvent, HiddenEvent, HidingEvent, InitializedEvent, OptionChangedEvent, ShowingEvent, ShownEvent, TitleRenderedEvent } from 'devextreme/ui/popover'; import { ToolbarLocation } from 'devextreme/ui/popup'; diff --git a/packages/devextreme-angular/src/ui/lookup/nested/from.ts b/packages/devextreme-angular/src/ui/lookup/nested/from.ts index 36e9627ed2df..2aec82a953d3 100644 --- a/packages/devextreme-angular/src/ui/lookup/nested/from.ts +++ b/packages/devextreme-angular/src/ui/lookup/nested/from.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/lookup/nested/hide.ts b/packages/devextreme-angular/src/ui/lookup/nested/hide.ts index e535a3684f22..42ceb0cbc8c3 100644 --- a/packages/devextreme-angular/src/ui/lookup/nested/hide.ts +++ b/packages/devextreme-angular/src/ui/lookup/nested/hide.ts @@ -14,8 +14,8 @@ import { -import { AnimationState, AnimationType } from 'devextreme/animation/fx'; import { Direction } from 'devextreme/common'; +import { AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/lookup/nested/position.ts b/packages/devextreme-angular/src/ui/lookup/nested/position.ts index ee956f6b650a..950d17b02b2c 100644 --- a/packages/devextreme-angular/src/ui/lookup/nested/position.ts +++ b/packages/devextreme-angular/src/ui/lookup/nested/position.ts @@ -14,8 +14,8 @@ import { -import { CollisionResolution, CollisionResolutionCombination } from 'devextreme/animation/position'; import { HorizontalAlignment, PositionAlignment, VerticalAlignment } from 'devextreme/common'; +import { CollisionResolution, CollisionResolutionCombination } from 'devextreme/common/core/animation'; import { UserDefinedElement } from 'devextreme/core/element'; import { diff --git a/packages/devextreme-angular/src/ui/lookup/nested/show.ts b/packages/devextreme-angular/src/ui/lookup/nested/show.ts index 7d18cfac96d6..b8b617e033ba 100644 --- a/packages/devextreme-angular/src/ui/lookup/nested/show.ts +++ b/packages/devextreme-angular/src/ui/lookup/nested/show.ts @@ -14,8 +14,8 @@ import { -import { AnimationState, AnimationType } from 'devextreme/animation/fx'; import { Direction } from 'devextreme/common'; +import { AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/lookup/nested/to.ts b/packages/devextreme-angular/src/ui/lookup/nested/to.ts index e5e04fce98ec..89b998e5ecb2 100644 --- a/packages/devextreme-angular/src/ui/lookup/nested/to.ts +++ b/packages/devextreme-angular/src/ui/lookup/nested/to.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/menu/index.ts b/packages/devextreme-angular/src/ui/menu/index.ts index 356e00453120..8457041a7dd3 100644 --- a/packages/devextreme-angular/src/ui/menu/index.ts +++ b/packages/devextreme-angular/src/ui/menu/index.ts @@ -23,8 +23,8 @@ import { export { ExplicitTypes } from 'devextreme/ui/menu'; -import { AnimationConfig } from 'devextreme/animation/fx'; import { Orientation, SingleOrNone, SubmenuShowMode } from 'devextreme/common'; +import { AnimationConfig } from 'devextreme/common/core/animation'; import { Store } from 'devextreme/data'; import DataSource, { Options as DataSourceOptions } from 'devextreme/data/data_source'; import { ContentReadyEvent, DisposingEvent, dxMenuItem, InitializedEvent, ItemClickEvent, ItemContextMenuEvent, ItemRenderedEvent, OptionChangedEvent, SelectionChangedEvent, SubmenuDirection, SubmenuHiddenEvent, SubmenuHidingEvent, SubmenuShowingEvent, SubmenuShownEvent } from 'devextreme/ui/menu'; diff --git a/packages/devextreme-angular/src/ui/menu/nested/animation.ts b/packages/devextreme-angular/src/ui/menu/nested/animation.ts index cd7e878fc913..a98dab3094cd 100644 --- a/packages/devextreme-angular/src/ui/menu/nested/animation.ts +++ b/packages/devextreme-angular/src/ui/menu/nested/animation.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig } from 'devextreme/animation/fx'; +import { AnimationConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/menu/nested/collision.ts b/packages/devextreme-angular/src/ui/menu/nested/collision.ts index f11ee240aa26..a7c6e8af4beb 100644 --- a/packages/devextreme-angular/src/ui/menu/nested/collision.ts +++ b/packages/devextreme-angular/src/ui/menu/nested/collision.ts @@ -14,7 +14,7 @@ import { -import { CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/menu/nested/from.ts b/packages/devextreme-angular/src/ui/menu/nested/from.ts index f173416ca0de..6235dab8a5dd 100644 --- a/packages/devextreme-angular/src/ui/menu/nested/from.ts +++ b/packages/devextreme-angular/src/ui/menu/nested/from.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/menu/nested/hide.ts b/packages/devextreme-angular/src/ui/menu/nested/hide.ts index c20d7cf19ac5..6dbc6670bcf3 100644 --- a/packages/devextreme-angular/src/ui/menu/nested/hide.ts +++ b/packages/devextreme-angular/src/ui/menu/nested/hide.ts @@ -14,8 +14,8 @@ import { -import { AnimationState, AnimationType } from 'devextreme/animation/fx'; import { Direction } from 'devextreme/common'; +import { AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/menu/nested/position.ts b/packages/devextreme-angular/src/ui/menu/nested/position.ts index de929449e713..000f244bfdaa 100644 --- a/packages/devextreme-angular/src/ui/menu/nested/position.ts +++ b/packages/devextreme-angular/src/ui/menu/nested/position.ts @@ -14,8 +14,8 @@ import { -import { CollisionResolution, CollisionResolutionCombination } from 'devextreme/animation/position'; import { HorizontalAlignment, PositionAlignment, VerticalAlignment } from 'devextreme/common'; +import { CollisionResolution, CollisionResolutionCombination } from 'devextreme/common/core/animation'; import { UserDefinedElement } from 'devextreme/core/element'; import { diff --git a/packages/devextreme-angular/src/ui/menu/nested/show.ts b/packages/devextreme-angular/src/ui/menu/nested/show.ts index d6c31f1c67f3..43390f8fbc71 100644 --- a/packages/devextreme-angular/src/ui/menu/nested/show.ts +++ b/packages/devextreme-angular/src/ui/menu/nested/show.ts @@ -14,8 +14,8 @@ import { -import { AnimationState, AnimationType } from 'devextreme/animation/fx'; import { Direction } from 'devextreme/common'; +import { AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/menu/nested/to.ts b/packages/devextreme-angular/src/ui/menu/nested/to.ts index 37871e39905d..3445d880111c 100644 --- a/packages/devextreme-angular/src/ui/menu/nested/to.ts +++ b/packages/devextreme-angular/src/ui/menu/nested/to.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/nested/argument-axis.ts b/packages/devextreme-angular/src/ui/nested/argument-axis.ts index 161d9aa70846..8a2b3b8fef76 100644 --- a/packages/devextreme-angular/src/ui/nested/argument-axis.ts +++ b/packages/devextreme-angular/src/ui/nested/argument-axis.ts @@ -21,7 +21,7 @@ import { import { HorizontalAlignment, Position, VerticalAlignment } from 'devextreme/common'; import { ArgumentAxisHoverMode, AxisScaleType, ChartsAxisLabelOverlap, ChartsDataType, DashStyle, DiscreteAxisDivisionMode, Font, LabelOverlap, RelativePosition, ScaleBreak, ScaleBreakLineStyle, TextOverflow, TimeInterval, VisualRange, VisualRangeUpdateMode, WordWrap } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { AggregatedPointsPosition, ChartLabelDisplayMode } from 'devextreme/viz/chart'; import { diff --git a/packages/devextreme-angular/src/ui/nested/base/animation-config.ts b/packages/devextreme-angular/src/ui/nested/base/animation-config.ts index 859514f90e03..5f63df1cbb0b 100644 --- a/packages/devextreme-angular/src/ui/nested/base/animation-config.ts +++ b/packages/devextreme-angular/src/ui/nested/base/animation-config.ts @@ -5,9 +5,9 @@ import { Component, } from '@angular/core'; -import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/animation/fx'; import { Direction } from 'devextreme/common'; import { AnimationEaseMode } from 'devextreme/common/charts'; +import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/common/core/animation'; @Component({ template: '' diff --git a/packages/devextreme-angular/src/ui/nested/base/animation-state.ts b/packages/devextreme-angular/src/ui/nested/base/animation-state.ts index 48d3349934e2..9d5c2c2466de 100644 --- a/packages/devextreme-angular/src/ui/nested/base/animation-state.ts +++ b/packages/devextreme-angular/src/ui/nested/base/animation-state.ts @@ -5,7 +5,7 @@ import { Component, } from '@angular/core'; -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; @Component({ template: '' diff --git a/packages/devextreme-angular/src/ui/nested/base/chart-common-series-settings.ts b/packages/devextreme-angular/src/ui/nested/base/chart-common-series-settings.ts index e70286c76673..2530ef135865 100644 --- a/packages/devextreme-angular/src/ui/nested/base/chart-common-series-settings.ts +++ b/packages/devextreme-angular/src/ui/nested/base/chart-common-series-settings.ts @@ -7,7 +7,7 @@ import { import { HorizontalAlignment } from 'devextreme/common'; import { ChartsColor, ChartsDataType, DashStyle, Font, HatchDirection, LabelPosition, PointInteractionMode, PointSymbol, RelativePosition, SeriesHoverMode, SeriesSelectionMode, SeriesType, TextOverflow, ValueErrorBarDisplayMode, ValueErrorBarType, WordWrap } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { ChartSeriesAggregationMethod, FinancialChartReductionLevel } from 'devextreme/viz/chart'; import { PieChartSeriesInteractionMode, SmallValuesGroupingMode } from 'devextreme/viz/pie_chart'; import { PolarChartSeriesType } from 'devextreme/viz/polar_chart'; diff --git a/packages/devextreme-angular/src/ui/nested/base/chart-series-dxi.ts b/packages/devextreme-angular/src/ui/nested/base/chart-series-dxi.ts index dc9cd5bc5c16..d8cc52df0a58 100644 --- a/packages/devextreme-angular/src/ui/nested/base/chart-series-dxi.ts +++ b/packages/devextreme-angular/src/ui/nested/base/chart-series-dxi.ts @@ -7,7 +7,7 @@ import { import { HorizontalAlignment } from 'devextreme/common'; import { ChartsColor, ChartsDataType, DashStyle, Font, HatchDirection, LabelPosition, PointInteractionMode, PointSymbol, RelativePosition, SeriesHoverMode, SeriesSelectionMode, SeriesType, TextOverflow, ValueErrorBarDisplayMode, ValueErrorBarType, WordWrap } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { ChartSeriesAggregationMethod, FinancialChartReductionLevel } from 'devextreme/viz/chart'; import { PieChartSeriesInteractionMode, SmallValuesGroupingMode } from 'devextreme/viz/pie_chart'; import { PolarChartSeriesType } from 'devextreme/viz/polar_chart'; diff --git a/packages/devextreme-angular/src/ui/nested/base/data-grid-column-dxi.ts b/packages/devextreme-angular/src/ui/nested/base/data-grid-column-dxi.ts index 465fd6e907c0..ef55b211cdb5 100644 --- a/packages/devextreme-angular/src/ui/nested/base/data-grid-column-dxi.ts +++ b/packages/devextreme-angular/src/ui/nested/base/data-grid-column-dxi.ts @@ -6,10 +6,10 @@ import { } from '@angular/core'; import { AsyncRule, CompareRule, CustomRule, DataType, EmailRule, HorizontalAlignment, NumericRule, PatternRule, RangeRule, RequiredRule, SearchMode, SortOrder, StringLengthRule } from 'devextreme/common'; +import { Format } from 'devextreme/common/core/localization'; import { ColumnHeaderFilterSearchConfig, FilterOperation, FilterType, FixedPosition, HeaderFilterGroupInterval, SelectedFilterOperation } from 'devextreme/common/grids'; import { Store } from 'devextreme/data'; import { Options as DataSourceOptions } from 'devextreme/data/data_source'; -import { Format } from 'devextreme/localization'; import { DataGridCommandColumnType, DataGridPredefinedColumnButton, dxDataGridColumn, dxDataGridColumnButton } from 'devextreme/ui/data_grid'; import { SimpleItem } from 'devextreme/ui/form'; import { dxTreeListColumn, dxTreeListColumnButton, TreeListCommandColumnType, TreeListPredefinedColumnButton } from 'devextreme/ui/tree_list'; diff --git a/packages/devextreme-angular/src/ui/nested/base/filter-builder-field-dxi.ts b/packages/devextreme-angular/src/ui/nested/base/filter-builder-field-dxi.ts index 2be58f7a5be1..a6cc2ae12485 100644 --- a/packages/devextreme-angular/src/ui/nested/base/filter-builder-field-dxi.ts +++ b/packages/devextreme-angular/src/ui/nested/base/filter-builder-field-dxi.ts @@ -6,9 +6,9 @@ import { } from '@angular/core'; import { DataType } from 'devextreme/common'; +import { Format } from 'devextreme/common/core/localization'; import { Store } from 'devextreme/data'; import { Options as DataSourceOptions } from 'devextreme/data/data_source'; -import { Format } from 'devextreme/localization'; import { FilterBuilderOperation } from 'devextreme/ui/filter_builder'; import { format } from 'devextreme/ui/widget/ui.widget'; diff --git a/packages/devextreme-angular/src/ui/nested/base/gauge-indicator.ts b/packages/devextreme-angular/src/ui/nested/base/gauge-indicator.ts index b808425e48db..78d398d6d07c 100644 --- a/packages/devextreme-angular/src/ui/nested/base/gauge-indicator.ts +++ b/packages/devextreme-angular/src/ui/nested/base/gauge-indicator.ts @@ -7,7 +7,7 @@ import { import { HorizontalEdge, VerticalEdge } from 'devextreme/common'; import { ChartsColor, Font, Palette } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; @Component({ template: '' diff --git a/packages/devextreme-angular/src/ui/nested/base/popup-options.ts b/packages/devextreme-angular/src/ui/nested/base/popup-options.ts index 148143298022..ed8c7cc868ff 100644 --- a/packages/devextreme-angular/src/ui/nested/base/popup-options.ts +++ b/packages/devextreme-angular/src/ui/nested/base/popup-options.ts @@ -5,9 +5,8 @@ import { Component, } from '@angular/core'; -import { AnimationConfig } from 'devextreme/animation/fx'; -import { PositionConfig } from 'devextreme/animation/position'; import { Position, PositionAlignment, ToolbarItemComponent, ToolbarItemLocation } from 'devextreme/common'; +import { AnimationConfig, PositionConfig } from 'devextreme/common/core/animation'; import { UserDefinedElement } from 'devextreme/core/element'; import { ContentReadyEvent, DisposingEvent, HiddenEvent, HidingEvent, InitializedEvent, OptionChangedEvent, ShowingEvent, ShownEvent, TitleRenderedEvent } from 'devextreme/ui/popover'; import { ToolbarLocation } from 'devextreme/ui/popup'; diff --git a/packages/devextreme-angular/src/ui/nested/base/position-config.ts b/packages/devextreme-angular/src/ui/nested/base/position-config.ts index f838b71c3506..c0e802676268 100644 --- a/packages/devextreme-angular/src/ui/nested/base/position-config.ts +++ b/packages/devextreme-angular/src/ui/nested/base/position-config.ts @@ -5,8 +5,8 @@ import { Component, } from '@angular/core'; -import { CollisionResolution, CollisionResolutionCombination } from 'devextreme/animation/position'; import { HorizontalAlignment, PositionAlignment, VerticalAlignment } from 'devextreme/common'; +import { CollisionResolution, CollisionResolutionCombination } from 'devextreme/common/core/animation'; import { UserDefinedElement } from 'devextreme/core/element'; @Component({ diff --git a/packages/devextreme-angular/src/ui/nested/collision.ts b/packages/devextreme-angular/src/ui/nested/collision.ts index 1c795c5c8d35..903767654a73 100644 --- a/packages/devextreme-angular/src/ui/nested/collision.ts +++ b/packages/devextreme-angular/src/ui/nested/collision.ts @@ -14,7 +14,7 @@ import { -import { CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/nested/column-chooser.ts b/packages/devextreme-angular/src/ui/nested/column-chooser.ts index 1365e382fcd7..3e4fa34a6efe 100644 --- a/packages/devextreme-angular/src/ui/nested/column-chooser.ts +++ b/packages/devextreme-angular/src/ui/nested/column-chooser.ts @@ -14,8 +14,8 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; import { SortOrder } from 'devextreme/common'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { ColumnChooserMode, ColumnChooserSearchConfig, ColumnChooserSelectionConfig } from 'devextreme/common/grids'; import { UserDefinedElement } from 'devextreme/core/element'; diff --git a/packages/devextreme-angular/src/ui/nested/crosshair.ts b/packages/devextreme-angular/src/ui/nested/crosshair.ts index 4ebdfbfb59bf..477682bfc464 100644 --- a/packages/devextreme-angular/src/ui/nested/crosshair.ts +++ b/packages/devextreme-angular/src/ui/nested/crosshair.ts @@ -15,7 +15,7 @@ import { import { DashStyle, Font } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/nested/drop-down-options.ts b/packages/devextreme-angular/src/ui/nested/drop-down-options.ts index 3f0a050b4109..f6496c54d1f6 100644 --- a/packages/devextreme-angular/src/ui/nested/drop-down-options.ts +++ b/packages/devextreme-angular/src/ui/nested/drop-down-options.ts @@ -19,8 +19,8 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; import { PositionAlignment } from 'devextreme/common'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/nested/filter-builder-popup.ts b/packages/devextreme-angular/src/ui/nested/filter-builder-popup.ts index 8fbb64ea323f..353146f654cd 100644 --- a/packages/devextreme-angular/src/ui/nested/filter-builder-popup.ts +++ b/packages/devextreme-angular/src/ui/nested/filter-builder-popup.ts @@ -19,8 +19,8 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; import { PositionAlignment } from 'devextreme/common'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/nested/group-item-dxi.ts b/packages/devextreme-angular/src/ui/nested/group-item-dxi.ts index 52dc82043c6b..8adde0461d43 100644 --- a/packages/devextreme-angular/src/ui/nested/group-item-dxi.ts +++ b/packages/devextreme-angular/src/ui/nested/group-item-dxi.ts @@ -12,8 +12,8 @@ import { +import { Format } from 'devextreme/common/core/localization'; import { SummaryType } from 'devextreme/common/grids'; -import { Format } from 'devextreme/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/nested/horizontal-line.ts b/packages/devextreme-angular/src/ui/nested/horizontal-line.ts index 80f837bfbb98..b0c033ffb200 100644 --- a/packages/devextreme-angular/src/ui/nested/horizontal-line.ts +++ b/packages/devextreme-angular/src/ui/nested/horizontal-line.ts @@ -15,7 +15,7 @@ import { import { DashStyle, Font } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/nested/label.ts b/packages/devextreme-angular/src/ui/nested/label.ts index 45699d9be495..be4e272c2ae3 100644 --- a/packages/devextreme-angular/src/ui/nested/label.ts +++ b/packages/devextreme-angular/src/ui/nested/label.ts @@ -20,7 +20,7 @@ import { DOCUMENT } from '@angular/common'; import { HorizontalAlignment, HorizontalEdge, Position, VerticalAlignment, VerticalEdge } from 'devextreme/common'; import { ChartsAxisLabelOverlap, DashStyle, Font, LabelOverlap, LabelPosition, RelativePosition, TextOverflow, WordWrap } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { LabelLocation } from 'devextreme/ui/form'; import { ChartLabelDisplayMode } from 'devextreme/viz/chart'; import { CircularGaugeLabelOverlap } from 'devextreme/viz/circular_gauge'; diff --git a/packages/devextreme-angular/src/ui/nested/legend.ts b/packages/devextreme-angular/src/ui/nested/legend.ts index 8cf1ed2c4038..d006e72bc1f2 100644 --- a/packages/devextreme-angular/src/ui/nested/legend.ts +++ b/packages/devextreme-angular/src/ui/nested/legend.ts @@ -16,7 +16,7 @@ import { import { HorizontalAlignment, Orientation, Position, VerticalEdge } from 'devextreme/common'; import { DashStyle, Font, LegendHoverMode, RelativePosition } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { PieChartLegendHoverMode } from 'devextreme/viz/pie_chart'; import { diff --git a/packages/devextreme-angular/src/ui/nested/marker.ts b/packages/devextreme-angular/src/ui/nested/marker.ts index 173b9dcf3be4..245c671f5e35 100644 --- a/packages/devextreme-angular/src/ui/nested/marker.ts +++ b/packages/devextreme-angular/src/ui/nested/marker.ts @@ -14,7 +14,7 @@ import { -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/nested/popup.ts b/packages/devextreme-angular/src/ui/nested/popup.ts index 2b5b38c36f40..c9840eeaf512 100644 --- a/packages/devextreme-angular/src/ui/nested/popup.ts +++ b/packages/devextreme-angular/src/ui/nested/popup.ts @@ -19,8 +19,8 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; import { PositionAlignment } from 'devextreme/common'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/nested/scale.ts b/packages/devextreme-angular/src/ui/nested/scale.ts index 56bea2049279..3b1d47833168 100644 --- a/packages/devextreme-angular/src/ui/nested/scale.ts +++ b/packages/devextreme-angular/src/ui/nested/scale.ts @@ -19,7 +19,7 @@ import { import { HorizontalAlignment, VerticalAlignment } from 'devextreme/common'; import { ChartsDataType, DiscreteAxisDivisionMode, Font, LabelOverlap, ScaleBreak, ScaleBreakLineStyle, TimeInterval } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { CircularGaugeElementOrientation, CircularGaugeLabelOverlap } from 'devextreme/viz/circular_gauge'; import { AxisScale } from 'devextreme/viz/range_selector'; diff --git a/packages/devextreme-angular/src/ui/nested/slider-marker.ts b/packages/devextreme-angular/src/ui/nested/slider-marker.ts index 0da3ebd79507..78272623c01d 100644 --- a/packages/devextreme-angular/src/ui/nested/slider-marker.ts +++ b/packages/devextreme-angular/src/ui/nested/slider-marker.ts @@ -15,7 +15,7 @@ import { import { Font } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/nested/summary.ts b/packages/devextreme-angular/src/ui/nested/summary.ts index de507d25dc21..0b3c0a05b433 100644 --- a/packages/devextreme-angular/src/ui/nested/summary.ts +++ b/packages/devextreme-angular/src/ui/nested/summary.ts @@ -18,8 +18,8 @@ import { import { HorizontalAlignment } from 'devextreme/common'; +import { Format } from 'devextreme/common/core/localization'; import { SummaryType } from 'devextreme/common/grids'; -import { Format } from 'devextreme/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/nested/text.ts b/packages/devextreme-angular/src/ui/nested/text.ts index 22fd2330441e..5c54bb0697f1 100644 --- a/packages/devextreme-angular/src/ui/nested/text.ts +++ b/packages/devextreme-angular/src/ui/nested/text.ts @@ -15,7 +15,7 @@ import { import { Font } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/nested/tooltip.ts b/packages/devextreme-angular/src/ui/nested/tooltip.ts index 885756c84840..024ccec46dd2 100644 --- a/packages/devextreme-angular/src/ui/nested/tooltip.ts +++ b/packages/devextreme-angular/src/ui/nested/tooltip.ts @@ -16,8 +16,8 @@ import { import { TooltipShowMode, VerticalEdge } from 'devextreme/common'; import { DashStyle, Font } from 'devextreme/common/charts'; +import { Format } from 'devextreme/common/core/localization'; import { UserDefinedElement } from 'devextreme/core/element'; -import { Format } from 'devextreme/localization'; import { ChartTooltipLocation } from 'devextreme/viz/chart'; import { diff --git a/packages/devextreme-angular/src/ui/nested/total-item-dxi.ts b/packages/devextreme-angular/src/ui/nested/total-item-dxi.ts index 274918db3850..8360826e4c03 100644 --- a/packages/devextreme-angular/src/ui/nested/total-item-dxi.ts +++ b/packages/devextreme-angular/src/ui/nested/total-item-dxi.ts @@ -13,8 +13,8 @@ import { import { HorizontalAlignment } from 'devextreme/common'; +import { Format } from 'devextreme/common/core/localization'; import { SummaryType } from 'devextreme/common/grids'; -import { Format } from 'devextreme/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/nested/value-axis-dxi.ts b/packages/devextreme-angular/src/ui/nested/value-axis-dxi.ts index 439e3cc53aac..cf0e23dd86d8 100644 --- a/packages/devextreme-angular/src/ui/nested/value-axis-dxi.ts +++ b/packages/devextreme-angular/src/ui/nested/value-axis-dxi.ts @@ -19,7 +19,7 @@ import { import { HorizontalAlignment, Position, VerticalAlignment } from 'devextreme/common'; import { AxisScaleType, ChartsAxisLabelOverlap, ChartsDataType, DashStyle, DiscreteAxisDivisionMode, Font, RelativePosition, ScaleBreak, ScaleBreakLineStyle, TextOverflow, TimeInterval, VisualRange, VisualRangeUpdateMode, WordWrap } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { AggregatedPointsPosition, ChartLabelDisplayMode } from 'devextreme/viz/chart'; import { diff --git a/packages/devextreme-angular/src/ui/nested/value-axis.ts b/packages/devextreme-angular/src/ui/nested/value-axis.ts index a4c12614ba46..9742edbbfdd0 100644 --- a/packages/devextreme-angular/src/ui/nested/value-axis.ts +++ b/packages/devextreme-angular/src/ui/nested/value-axis.ts @@ -20,7 +20,7 @@ import { import { AxisScaleType, ChartsDataType, DashStyle, DiscreteAxisDivisionMode, Font, LabelOverlap, TimeInterval, VisualRange } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { ValueAxisVisualRangeUpdateMode } from 'devextreme/viz/polar_chart'; import { ChartAxisScale } from 'devextreme/viz/range_selector'; diff --git a/packages/devextreme-angular/src/ui/nested/vertical-line.ts b/packages/devextreme-angular/src/ui/nested/vertical-line.ts index 3d0da13e4fdc..b8fb96f249a6 100644 --- a/packages/devextreme-angular/src/ui/nested/vertical-line.ts +++ b/packages/devextreme-angular/src/ui/nested/vertical-line.ts @@ -15,7 +15,7 @@ import { import { DashStyle, Font } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/number-box/index.ts b/packages/devextreme-angular/src/ui/number-box/index.ts index 616b47ee556a..9e510312e83e 100644 --- a/packages/devextreme-angular/src/ui/number-box/index.ts +++ b/packages/devextreme-angular/src/ui/number-box/index.ts @@ -25,7 +25,7 @@ import { import { EditorStyle, LabelMode, Position, TextEditorButton, ValidationMessageMode, ValidationStatus } from 'devextreme/common'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { ChangeEvent, ContentReadyEvent, CopyEvent, CutEvent, DisposingEvent, EnterKeyEvent, FocusInEvent, FocusOutEvent, InitializedEvent, InputEvent, KeyDownEvent, KeyUpEvent, NumberBoxPredefinedButton, NumberBoxType, OptionChangedEvent, PasteEvent, ValueChangedEvent } from 'devextreme/ui/number_box'; import DxNumberBox from 'devextreme/ui/number_box'; diff --git a/packages/devextreme-angular/src/ui/pie-chart/index.ts b/packages/devextreme-angular/src/ui/pie-chart/index.ts index 8b1f54557732..7c6f20a3ec36 100644 --- a/packages/devextreme-angular/src/ui/pie-chart/index.ts +++ b/packages/devextreme-angular/src/ui/pie-chart/index.ts @@ -24,10 +24,10 @@ import { import { ExportFormat, HorizontalAlignment, Orientation, Position, SingleOrMultiple, VerticalEdge } from 'devextreme/common'; import { AnimationEaseMode, DashStyle, Font, Palette, PaletteExtensionMode, ShiftLabelOverlap, TextOverflow, Theme, WordWrap } from 'devextreme/common/charts'; +import { Format } from 'devextreme/common/core/localization'; import { UserDefinedElement } from 'devextreme/core/element'; import { Store } from 'devextreme/data'; import DataSource, { Options as DataSourceOptions } from 'devextreme/data/data_source'; -import { Format } from 'devextreme/localization'; import { DisposingEvent, DoneEvent, DrawnEvent, dxPieChartAnnotationConfig, dxPieChartCommonAnnotationConfig, ExportedEvent, ExportingEvent, FileSavingEvent, IncidentOccurredEvent, InitializedEvent, LegendClickEvent, OptionChangedEvent, PieChartLegendHoverMode, PieChartSegmentDirection, PieChartSeries, PieChartType, PointClickEvent, PointHoverChangedEvent, PointSelectionChangedEvent, TooltipHiddenEvent, TooltipShownEvent } from 'devextreme/viz/pie_chart'; import DxPieChart from 'devextreme/viz/pie_chart'; diff --git a/packages/devextreme-angular/src/ui/pie-chart/nested/common-series-settings.ts b/packages/devextreme-angular/src/ui/pie-chart/nested/common-series-settings.ts index 877f876d907a..21876f56e00c 100644 --- a/packages/devextreme-angular/src/ui/pie-chart/nested/common-series-settings.ts +++ b/packages/devextreme-angular/src/ui/pie-chart/nested/common-series-settings.ts @@ -15,7 +15,7 @@ import { import { ChartsColor, ChartsDataType, DashStyle, Font, HatchDirection, LabelPosition, TextOverflow, WordWrap } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { PieChartSeriesInteractionMode, SmallValuesGroupingMode } from 'devextreme/viz/pie_chart'; import { diff --git a/packages/devextreme-angular/src/ui/pie-chart/nested/label.ts b/packages/devextreme-angular/src/ui/pie-chart/nested/label.ts index 2b848c2b5278..782caa68b6a0 100644 --- a/packages/devextreme-angular/src/ui/pie-chart/nested/label.ts +++ b/packages/devextreme-angular/src/ui/pie-chart/nested/label.ts @@ -15,7 +15,7 @@ import { import { DashStyle, Font, LabelPosition, TextOverflow, WordWrap } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/pie-chart/nested/series-dxi.ts b/packages/devextreme-angular/src/ui/pie-chart/nested/series-dxi.ts index 943d1229015e..cf7cb1068e02 100644 --- a/packages/devextreme-angular/src/ui/pie-chart/nested/series-dxi.ts +++ b/packages/devextreme-angular/src/ui/pie-chart/nested/series-dxi.ts @@ -13,7 +13,7 @@ import { import { ChartsColor, ChartsDataType, DashStyle, Font, HatchDirection, LabelPosition, TextOverflow, WordWrap } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { PieChartSeriesInteractionMode, SmallValuesGroupingMode } from 'devextreme/viz/pie_chart'; import { diff --git a/packages/devextreme-angular/src/ui/pie-chart/nested/tooltip.ts b/packages/devextreme-angular/src/ui/pie-chart/nested/tooltip.ts index cb16d23a2ec8..71e724f90930 100644 --- a/packages/devextreme-angular/src/ui/pie-chart/nested/tooltip.ts +++ b/packages/devextreme-angular/src/ui/pie-chart/nested/tooltip.ts @@ -15,8 +15,8 @@ import { import { DashStyle, Font } from 'devextreme/common/charts'; +import { Format } from 'devextreme/common/core/localization'; import { UserDefinedElement } from 'devextreme/core/element'; -import { Format } from 'devextreme/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/polar-chart/index.ts b/packages/devextreme-angular/src/ui/polar-chart/index.ts index 9d9edb0dd084..07c4a287ae5e 100644 --- a/packages/devextreme-angular/src/ui/polar-chart/index.ts +++ b/packages/devextreme-angular/src/ui/polar-chart/index.ts @@ -24,10 +24,10 @@ import { import { ExportFormat, HorizontalAlignment, Orientation, Position, SingleOrMultiple, VerticalEdge } from 'devextreme/common'; import { AnimationEaseMode, ArgumentAxisHoverMode, AxisScaleType, ChartsDataType, DashStyle, DiscreteAxisDivisionMode, Font, LabelOverlap, LegendHoverMode, Palette, PaletteExtensionMode, TextOverflow, Theme, TimeInterval, VisualRange, WordWrap } from 'devextreme/common/charts'; +import { Format } from 'devextreme/common/core/localization'; import { UserDefinedElement } from 'devextreme/core/element'; import { Store } from 'devextreme/data'; import DataSource, { Options as DataSourceOptions } from 'devextreme/data/data_source'; -import { Format } from 'devextreme/localization'; import { ArgumentAxisClickEvent, DisposingEvent, DoneEvent, DrawnEvent, dxPolarChartAnnotationConfig, dxPolarChartCommonAnnotationConfig, ExportedEvent, ExportingEvent, FileSavingEvent, IncidentOccurredEvent, InitializedEvent, LegendClickEvent, OptionChangedEvent, PointClickEvent, PointHoverChangedEvent, PointSelectionChangedEvent, PolarChartSeries, SeriesClickEvent, SeriesHoverChangedEvent, SeriesSelectionChangedEvent, TooltipHiddenEvent, TooltipShownEvent, ValueAxisVisualRangeUpdateMode, ZoomEndEvent, ZoomStartEvent } from 'devextreme/viz/polar_chart'; import DxPolarChart from 'devextreme/viz/polar_chart'; diff --git a/packages/devextreme-angular/src/ui/polar-chart/nested/area.ts b/packages/devextreme-angular/src/ui/polar-chart/nested/area.ts index a7222fd56837..45fcaae12b2d 100644 --- a/packages/devextreme-angular/src/ui/polar-chart/nested/area.ts +++ b/packages/devextreme-angular/src/ui/polar-chart/nested/area.ts @@ -15,7 +15,7 @@ import { import { ChartsColor, DashStyle, Font, HatchDirection, PointInteractionMode, PointSymbol, RelativePosition, SeriesHoverMode, SeriesSelectionMode, ValueErrorBarDisplayMode, ValueErrorBarType } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { PolarChartSeriesType } from 'devextreme/viz/polar_chart'; import { diff --git a/packages/devextreme-angular/src/ui/polar-chart/nested/argument-axis.ts b/packages/devextreme-angular/src/ui/polar-chart/nested/argument-axis.ts index 6acdec6c2337..1c16ca0bf90d 100644 --- a/packages/devextreme-angular/src/ui/polar-chart/nested/argument-axis.ts +++ b/packages/devextreme-angular/src/ui/polar-chart/nested/argument-axis.ts @@ -18,7 +18,7 @@ import { import { ArgumentAxisHoverMode, AxisScaleType, ChartsDataType, DashStyle, DiscreteAxisDivisionMode, Font, LabelOverlap, TimeInterval } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/polar-chart/nested/bar.ts b/packages/devextreme-angular/src/ui/polar-chart/nested/bar.ts index 62da52f73c66..b9f0ba56f010 100644 --- a/packages/devextreme-angular/src/ui/polar-chart/nested/bar.ts +++ b/packages/devextreme-angular/src/ui/polar-chart/nested/bar.ts @@ -15,7 +15,7 @@ import { import { ChartsColor, DashStyle, Font, HatchDirection, PointInteractionMode, PointSymbol, RelativePosition, SeriesHoverMode, SeriesSelectionMode, ValueErrorBarDisplayMode, ValueErrorBarType } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { PolarChartSeriesType } from 'devextreme/viz/polar_chart'; import { diff --git a/packages/devextreme-angular/src/ui/polar-chart/nested/common-series-settings.ts b/packages/devextreme-angular/src/ui/polar-chart/nested/common-series-settings.ts index 1c9642785667..45e9c57d1a4a 100644 --- a/packages/devextreme-angular/src/ui/polar-chart/nested/common-series-settings.ts +++ b/packages/devextreme-angular/src/ui/polar-chart/nested/common-series-settings.ts @@ -15,7 +15,7 @@ import { import { ChartsColor, DashStyle, Font, HatchDirection, PointInteractionMode, PointSymbol, RelativePosition, SeriesHoverMode, SeriesSelectionMode, ValueErrorBarDisplayMode, ValueErrorBarType } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { PolarChartSeriesType } from 'devextreme/viz/polar_chart'; import { diff --git a/packages/devextreme-angular/src/ui/polar-chart/nested/label.ts b/packages/devextreme-angular/src/ui/polar-chart/nested/label.ts index 8ed5c74ae901..7ff1f5b284a6 100644 --- a/packages/devextreme-angular/src/ui/polar-chart/nested/label.ts +++ b/packages/devextreme-angular/src/ui/polar-chart/nested/label.ts @@ -15,7 +15,7 @@ import { import { DashStyle, Font, LabelOverlap, RelativePosition } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/polar-chart/nested/line.ts b/packages/devextreme-angular/src/ui/polar-chart/nested/line.ts index 6952edc0c6b6..a9a40363c9a0 100644 --- a/packages/devextreme-angular/src/ui/polar-chart/nested/line.ts +++ b/packages/devextreme-angular/src/ui/polar-chart/nested/line.ts @@ -15,7 +15,7 @@ import { import { ChartsColor, DashStyle, Font, HatchDirection, PointInteractionMode, PointSymbol, RelativePosition, SeriesHoverMode, SeriesSelectionMode, ValueErrorBarDisplayMode, ValueErrorBarType } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { PolarChartSeriesType } from 'devextreme/viz/polar_chart'; import { diff --git a/packages/devextreme-angular/src/ui/polar-chart/nested/scatter.ts b/packages/devextreme-angular/src/ui/polar-chart/nested/scatter.ts index dcf496fdaf1a..c1290c7cf8bf 100644 --- a/packages/devextreme-angular/src/ui/polar-chart/nested/scatter.ts +++ b/packages/devextreme-angular/src/ui/polar-chart/nested/scatter.ts @@ -15,7 +15,7 @@ import { import { ChartsColor, DashStyle, Font, HatchDirection, PointInteractionMode, PointSymbol, RelativePosition, SeriesHoverMode, SeriesSelectionMode, ValueErrorBarDisplayMode, ValueErrorBarType } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { PolarChartSeriesType } from 'devextreme/viz/polar_chart'; import { diff --git a/packages/devextreme-angular/src/ui/polar-chart/nested/series-dxi.ts b/packages/devextreme-angular/src/ui/polar-chart/nested/series-dxi.ts index 25a6ad1c3b22..9cfc5d058592 100644 --- a/packages/devextreme-angular/src/ui/polar-chart/nested/series-dxi.ts +++ b/packages/devextreme-angular/src/ui/polar-chart/nested/series-dxi.ts @@ -13,7 +13,7 @@ import { import { ChartsColor, DashStyle, Font, HatchDirection, PointInteractionMode, PointSymbol, RelativePosition, SeriesHoverMode, SeriesSelectionMode, ValueErrorBarDisplayMode, ValueErrorBarType } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { PolarChartSeriesType } from 'devextreme/viz/polar_chart'; import { diff --git a/packages/devextreme-angular/src/ui/polar-chart/nested/stackedbar.ts b/packages/devextreme-angular/src/ui/polar-chart/nested/stackedbar.ts index 2a04c6edb9d9..b0552fb3b4f0 100644 --- a/packages/devextreme-angular/src/ui/polar-chart/nested/stackedbar.ts +++ b/packages/devextreme-angular/src/ui/polar-chart/nested/stackedbar.ts @@ -15,7 +15,7 @@ import { import { ChartsColor, DashStyle, Font, HatchDirection, PointInteractionMode, PointSymbol, RelativePosition, SeriesHoverMode, SeriesSelectionMode, ValueErrorBarDisplayMode, ValueErrorBarType } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { PolarChartSeriesType } from 'devextreme/viz/polar_chart'; import { diff --git a/packages/devextreme-angular/src/ui/polar-chart/nested/tooltip.ts b/packages/devextreme-angular/src/ui/polar-chart/nested/tooltip.ts index 05b8199ac5dc..c2bed07c16f4 100644 --- a/packages/devextreme-angular/src/ui/polar-chart/nested/tooltip.ts +++ b/packages/devextreme-angular/src/ui/polar-chart/nested/tooltip.ts @@ -15,8 +15,8 @@ import { import { DashStyle, Font } from 'devextreme/common/charts'; +import { Format } from 'devextreme/common/core/localization'; import { UserDefinedElement } from 'devextreme/core/element'; -import { Format } from 'devextreme/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/polar-chart/nested/value-axis.ts b/packages/devextreme-angular/src/ui/polar-chart/nested/value-axis.ts index 9f13aee22148..c6cd452f4083 100644 --- a/packages/devextreme-angular/src/ui/polar-chart/nested/value-axis.ts +++ b/packages/devextreme-angular/src/ui/polar-chart/nested/value-axis.ts @@ -20,7 +20,7 @@ import { import { AxisScaleType, ChartsDataType, DashStyle, DiscreteAxisDivisionMode, Font, LabelOverlap, TimeInterval, VisualRange } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { ValueAxisVisualRangeUpdateMode } from 'devextreme/viz/polar_chart'; import { diff --git a/packages/devextreme-angular/src/ui/popover/index.ts b/packages/devextreme-angular/src/ui/popover/index.ts index 2ec2c48316e1..798a805cd8cd 100644 --- a/packages/devextreme-angular/src/ui/popover/index.ts +++ b/packages/devextreme-angular/src/ui/popover/index.ts @@ -22,9 +22,8 @@ import { } from '@angular/core'; -import { AnimationConfig } from 'devextreme/animation/fx'; -import { PositionConfig } from 'devextreme/animation/position'; import { Position, ToolbarItemComponent, ToolbarItemLocation } from 'devextreme/common'; +import { AnimationConfig, PositionConfig } from 'devextreme/common/core/animation'; import { UserDefinedElement } from 'devextreme/core/element'; import { ContentReadyEvent, DisposingEvent, HiddenEvent, HidingEvent, InitializedEvent, OptionChangedEvent, ShowingEvent, ShownEvent, TitleRenderedEvent } from 'devextreme/ui/popover'; import { ToolbarLocation } from 'devextreme/ui/popup'; diff --git a/packages/devextreme-angular/src/ui/popover/nested/animation.ts b/packages/devextreme-angular/src/ui/popover/nested/animation.ts index d784bdadaf04..38c8781c8890 100644 --- a/packages/devextreme-angular/src/ui/popover/nested/animation.ts +++ b/packages/devextreme-angular/src/ui/popover/nested/animation.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig } from 'devextreme/animation/fx'; +import { AnimationConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/popover/nested/collision.ts b/packages/devextreme-angular/src/ui/popover/nested/collision.ts index 8c5b8e2f0a31..52dab6839e2e 100644 --- a/packages/devextreme-angular/src/ui/popover/nested/collision.ts +++ b/packages/devextreme-angular/src/ui/popover/nested/collision.ts @@ -14,7 +14,7 @@ import { -import { CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/popover/nested/from.ts b/packages/devextreme-angular/src/ui/popover/nested/from.ts index dea87b235570..f888ecbc0634 100644 --- a/packages/devextreme-angular/src/ui/popover/nested/from.ts +++ b/packages/devextreme-angular/src/ui/popover/nested/from.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/popover/nested/hide.ts b/packages/devextreme-angular/src/ui/popover/nested/hide.ts index 10bed4c67518..928f973ea45d 100644 --- a/packages/devextreme-angular/src/ui/popover/nested/hide.ts +++ b/packages/devextreme-angular/src/ui/popover/nested/hide.ts @@ -14,8 +14,8 @@ import { -import { AnimationState, AnimationType } from 'devextreme/animation/fx'; import { Direction } from 'devextreme/common'; +import { AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/popover/nested/position.ts b/packages/devextreme-angular/src/ui/popover/nested/position.ts index 7e56a48e07b5..7d9512d7ac70 100644 --- a/packages/devextreme-angular/src/ui/popover/nested/position.ts +++ b/packages/devextreme-angular/src/ui/popover/nested/position.ts @@ -14,8 +14,8 @@ import { -import { CollisionResolution, CollisionResolutionCombination } from 'devextreme/animation/position'; import { HorizontalAlignment, PositionAlignment, VerticalAlignment } from 'devextreme/common'; +import { CollisionResolution, CollisionResolutionCombination } from 'devextreme/common/core/animation'; import { UserDefinedElement } from 'devextreme/core/element'; import { diff --git a/packages/devextreme-angular/src/ui/popover/nested/show.ts b/packages/devextreme-angular/src/ui/popover/nested/show.ts index 4e13a29dd031..420e8034baa9 100644 --- a/packages/devextreme-angular/src/ui/popover/nested/show.ts +++ b/packages/devextreme-angular/src/ui/popover/nested/show.ts @@ -14,8 +14,8 @@ import { -import { AnimationState, AnimationType } from 'devextreme/animation/fx'; import { Direction } from 'devextreme/common'; +import { AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/popover/nested/to.ts b/packages/devextreme-angular/src/ui/popover/nested/to.ts index 4a9de746d777..5000a1ac3293 100644 --- a/packages/devextreme-angular/src/ui/popover/nested/to.ts +++ b/packages/devextreme-angular/src/ui/popover/nested/to.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/popup/component.ts b/packages/devextreme-angular/src/ui/popup/component.ts index f11aafd359b5..f7078f59f6ea 100644 --- a/packages/devextreme-angular/src/ui/popup/component.ts +++ b/packages/devextreme-angular/src/ui/popup/component.ts @@ -22,9 +22,8 @@ import { } from '@angular/core'; -import { AnimationConfig } from 'devextreme/animation/fx'; -import { PositionConfig } from 'devextreme/animation/position'; import { PositionAlignment, ToolbarItemComponent, ToolbarItemLocation } from 'devextreme/common'; +import { AnimationConfig, PositionConfig } from 'devextreme/common/core/animation'; import { UserDefinedElement } from 'devextreme/core/element'; import { ToolbarLocation } from 'devextreme/ui/popup'; import { LocateInMenuMode, ShowTextMode } from 'devextreme/ui/toolbar'; diff --git a/packages/devextreme-angular/src/ui/popup/nested/animation.ts b/packages/devextreme-angular/src/ui/popup/nested/animation.ts index c2630d3bfad1..a050f8eccd3d 100644 --- a/packages/devextreme-angular/src/ui/popup/nested/animation.ts +++ b/packages/devextreme-angular/src/ui/popup/nested/animation.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig } from 'devextreme/animation/fx'; +import { AnimationConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/popup/nested/collision.ts b/packages/devextreme-angular/src/ui/popup/nested/collision.ts index 9edb75160069..57363e68ef79 100644 --- a/packages/devextreme-angular/src/ui/popup/nested/collision.ts +++ b/packages/devextreme-angular/src/ui/popup/nested/collision.ts @@ -14,7 +14,7 @@ import { -import { CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/popup/nested/from.ts b/packages/devextreme-angular/src/ui/popup/nested/from.ts index be32f403443c..3834b7d3ee0a 100644 --- a/packages/devextreme-angular/src/ui/popup/nested/from.ts +++ b/packages/devextreme-angular/src/ui/popup/nested/from.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/popup/nested/hide.ts b/packages/devextreme-angular/src/ui/popup/nested/hide.ts index 6a2024401cbd..19d451bf7462 100644 --- a/packages/devextreme-angular/src/ui/popup/nested/hide.ts +++ b/packages/devextreme-angular/src/ui/popup/nested/hide.ts @@ -14,8 +14,8 @@ import { -import { AnimationState, AnimationType } from 'devextreme/animation/fx'; import { Direction } from 'devextreme/common'; +import { AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/popup/nested/position.ts b/packages/devextreme-angular/src/ui/popup/nested/position.ts index a711027831af..e39284b3c72d 100644 --- a/packages/devextreme-angular/src/ui/popup/nested/position.ts +++ b/packages/devextreme-angular/src/ui/popup/nested/position.ts @@ -14,8 +14,8 @@ import { -import { CollisionResolution, CollisionResolutionCombination } from 'devextreme/animation/position'; import { HorizontalAlignment, PositionAlignment, VerticalAlignment } from 'devextreme/common'; +import { CollisionResolution, CollisionResolutionCombination } from 'devextreme/common/core/animation'; import { UserDefinedElement } from 'devextreme/core/element'; import { diff --git a/packages/devextreme-angular/src/ui/popup/nested/show.ts b/packages/devextreme-angular/src/ui/popup/nested/show.ts index 8daa6d6eee22..76fcd20d12c0 100644 --- a/packages/devextreme-angular/src/ui/popup/nested/show.ts +++ b/packages/devextreme-angular/src/ui/popup/nested/show.ts @@ -14,8 +14,8 @@ import { -import { AnimationState, AnimationType } from 'devextreme/animation/fx'; import { Direction } from 'devextreme/common'; +import { AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/popup/nested/to.ts b/packages/devextreme-angular/src/ui/popup/nested/to.ts index 45f10f0cfa6e..ad1ead9058aa 100644 --- a/packages/devextreme-angular/src/ui/popup/nested/to.ts +++ b/packages/devextreme-angular/src/ui/popup/nested/to.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/range-selector/index.ts b/packages/devextreme-angular/src/ui/range-selector/index.ts index 8ced51fe4c9e..d859766d1840 100644 --- a/packages/devextreme-angular/src/ui/range-selector/index.ts +++ b/packages/devextreme-angular/src/ui/range-selector/index.ts @@ -24,9 +24,9 @@ import { import { ExportFormat, HorizontalAlignment, SliderValueChangeMode, VerticalEdge } from 'devextreme/common'; import { ChartsDataType, DiscreteAxisDivisionMode, Font, LabelOverlap, Palette, PaletteExtensionMode, ScaleBreak, ScaleBreakLineStyle, TextOverflow, Theme, TimeInterval, VisualRange, VisualRangeUpdateMode, WordWrap } from 'devextreme/common/charts'; +import { Format } from 'devextreme/common/core/localization'; import { Store } from 'devextreme/data'; import DataSource, { Options as DataSourceOptions } from 'devextreme/data/data_source'; -import { Format } from 'devextreme/localization'; import { ChartSeries } from 'devextreme/viz/common'; import { AxisScale, BackgroundImageLocation, ChartAxisScale, DisposingEvent, DrawnEvent, ExportedEvent, ExportingEvent, FileSavingEvent, IncidentOccurredEvent, InitializedEvent, OptionChangedEvent, ValueChangedCallMode, ValueChangedEvent } from 'devextreme/viz/range_selector'; diff --git a/packages/devextreme-angular/src/ui/range-selector/nested/area.ts b/packages/devextreme-angular/src/ui/range-selector/nested/area.ts index 554d3be09d38..27f8d2c65fcb 100644 --- a/packages/devextreme-angular/src/ui/range-selector/nested/area.ts +++ b/packages/devextreme-angular/src/ui/range-selector/nested/area.ts @@ -16,7 +16,7 @@ import { import { HorizontalAlignment } from 'devextreme/common'; import { ChartsColor, DashStyle, Font, HatchDirection, PointInteractionMode, PointSymbol, RelativePosition, SeriesHoverMode, SeriesSelectionMode, SeriesType, ValueErrorBarDisplayMode, ValueErrorBarType } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { ChartSeriesAggregationMethod, FinancialChartReductionLevel } from 'devextreme/viz/chart'; import { diff --git a/packages/devextreme-angular/src/ui/range-selector/nested/bar.ts b/packages/devextreme-angular/src/ui/range-selector/nested/bar.ts index 805a09d33c6a..c99ab5188233 100644 --- a/packages/devextreme-angular/src/ui/range-selector/nested/bar.ts +++ b/packages/devextreme-angular/src/ui/range-selector/nested/bar.ts @@ -16,7 +16,7 @@ import { import { HorizontalAlignment } from 'devextreme/common'; import { ChartsColor, DashStyle, Font, HatchDirection, PointInteractionMode, PointSymbol, RelativePosition, SeriesHoverMode, SeriesSelectionMode, SeriesType, ValueErrorBarDisplayMode, ValueErrorBarType } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { ChartSeriesAggregationMethod, FinancialChartReductionLevel } from 'devextreme/viz/chart'; import { diff --git a/packages/devextreme-angular/src/ui/range-selector/nested/bubble.ts b/packages/devextreme-angular/src/ui/range-selector/nested/bubble.ts index ea9264b79075..9002da0b70b8 100644 --- a/packages/devextreme-angular/src/ui/range-selector/nested/bubble.ts +++ b/packages/devextreme-angular/src/ui/range-selector/nested/bubble.ts @@ -16,7 +16,7 @@ import { import { HorizontalAlignment } from 'devextreme/common'; import { ChartsColor, DashStyle, Font, HatchDirection, PointInteractionMode, PointSymbol, RelativePosition, SeriesHoverMode, SeriesSelectionMode, SeriesType, ValueErrorBarDisplayMode, ValueErrorBarType } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { ChartSeriesAggregationMethod, FinancialChartReductionLevel } from 'devextreme/viz/chart'; import { diff --git a/packages/devextreme-angular/src/ui/range-selector/nested/candlestick.ts b/packages/devextreme-angular/src/ui/range-selector/nested/candlestick.ts index b55ca38a49f0..39e4e465c61a 100644 --- a/packages/devextreme-angular/src/ui/range-selector/nested/candlestick.ts +++ b/packages/devextreme-angular/src/ui/range-selector/nested/candlestick.ts @@ -16,7 +16,7 @@ import { import { HorizontalAlignment } from 'devextreme/common'; import { ChartsColor, DashStyle, Font, HatchDirection, PointInteractionMode, PointSymbol, RelativePosition, SeriesHoverMode, SeriesSelectionMode, SeriesType, ValueErrorBarDisplayMode, ValueErrorBarType } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { ChartSeriesAggregationMethod, FinancialChartReductionLevel } from 'devextreme/viz/chart'; import { diff --git a/packages/devextreme-angular/src/ui/range-selector/nested/common-series-settings.ts b/packages/devextreme-angular/src/ui/range-selector/nested/common-series-settings.ts index 4e3a16e0c121..a316f00a905a 100644 --- a/packages/devextreme-angular/src/ui/range-selector/nested/common-series-settings.ts +++ b/packages/devextreme-angular/src/ui/range-selector/nested/common-series-settings.ts @@ -16,7 +16,7 @@ import { import { HorizontalAlignment } from 'devextreme/common'; import { ChartsColor, DashStyle, Font, HatchDirection, PointInteractionMode, PointSymbol, RelativePosition, SeriesHoverMode, SeriesSelectionMode, SeriesType, ValueErrorBarDisplayMode, ValueErrorBarType } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { ChartSeriesAggregationMethod, FinancialChartReductionLevel } from 'devextreme/viz/chart'; import { diff --git a/packages/devextreme-angular/src/ui/range-selector/nested/fullstackedarea.ts b/packages/devextreme-angular/src/ui/range-selector/nested/fullstackedarea.ts index 30b32b55d24b..37a4166a4ea0 100644 --- a/packages/devextreme-angular/src/ui/range-selector/nested/fullstackedarea.ts +++ b/packages/devextreme-angular/src/ui/range-selector/nested/fullstackedarea.ts @@ -16,7 +16,7 @@ import { import { HorizontalAlignment } from 'devextreme/common'; import { ChartsColor, DashStyle, Font, HatchDirection, PointInteractionMode, PointSymbol, RelativePosition, SeriesHoverMode, SeriesSelectionMode, SeriesType, ValueErrorBarDisplayMode, ValueErrorBarType } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { ChartSeriesAggregationMethod, FinancialChartReductionLevel } from 'devextreme/viz/chart'; import { diff --git a/packages/devextreme-angular/src/ui/range-selector/nested/fullstackedbar.ts b/packages/devextreme-angular/src/ui/range-selector/nested/fullstackedbar.ts index 0eac2ce17fb8..2367de09b6cb 100644 --- a/packages/devextreme-angular/src/ui/range-selector/nested/fullstackedbar.ts +++ b/packages/devextreme-angular/src/ui/range-selector/nested/fullstackedbar.ts @@ -16,7 +16,7 @@ import { import { HorizontalAlignment } from 'devextreme/common'; import { ChartsColor, DashStyle, Font, HatchDirection, PointInteractionMode, PointSymbol, RelativePosition, SeriesHoverMode, SeriesSelectionMode, SeriesType, ValueErrorBarDisplayMode, ValueErrorBarType } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { ChartSeriesAggregationMethod, FinancialChartReductionLevel } from 'devextreme/viz/chart'; import { diff --git a/packages/devextreme-angular/src/ui/range-selector/nested/fullstackedline.ts b/packages/devextreme-angular/src/ui/range-selector/nested/fullstackedline.ts index 6cf81e18b213..3efa565c6f55 100644 --- a/packages/devextreme-angular/src/ui/range-selector/nested/fullstackedline.ts +++ b/packages/devextreme-angular/src/ui/range-selector/nested/fullstackedline.ts @@ -16,7 +16,7 @@ import { import { HorizontalAlignment } from 'devextreme/common'; import { ChartsColor, DashStyle, Font, HatchDirection, PointInteractionMode, PointSymbol, RelativePosition, SeriesHoverMode, SeriesSelectionMode, SeriesType, ValueErrorBarDisplayMode, ValueErrorBarType } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { ChartSeriesAggregationMethod, FinancialChartReductionLevel } from 'devextreme/viz/chart'; import { diff --git a/packages/devextreme-angular/src/ui/range-selector/nested/fullstackedspline.ts b/packages/devextreme-angular/src/ui/range-selector/nested/fullstackedspline.ts index 1f2e2df3e512..544d3396049e 100644 --- a/packages/devextreme-angular/src/ui/range-selector/nested/fullstackedspline.ts +++ b/packages/devextreme-angular/src/ui/range-selector/nested/fullstackedspline.ts @@ -16,7 +16,7 @@ import { import { HorizontalAlignment } from 'devextreme/common'; import { ChartsColor, DashStyle, Font, HatchDirection, PointInteractionMode, PointSymbol, RelativePosition, SeriesHoverMode, SeriesSelectionMode, SeriesType, ValueErrorBarDisplayMode, ValueErrorBarType } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { ChartSeriesAggregationMethod, FinancialChartReductionLevel } from 'devextreme/viz/chart'; import { diff --git a/packages/devextreme-angular/src/ui/range-selector/nested/fullstackedsplinearea.ts b/packages/devextreme-angular/src/ui/range-selector/nested/fullstackedsplinearea.ts index e624671298fe..88309c5699b9 100644 --- a/packages/devextreme-angular/src/ui/range-selector/nested/fullstackedsplinearea.ts +++ b/packages/devextreme-angular/src/ui/range-selector/nested/fullstackedsplinearea.ts @@ -16,7 +16,7 @@ import { import { HorizontalAlignment } from 'devextreme/common'; import { ChartsColor, DashStyle, Font, HatchDirection, PointInteractionMode, PointSymbol, RelativePosition, SeriesHoverMode, SeriesSelectionMode, SeriesType, ValueErrorBarDisplayMode, ValueErrorBarType } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { ChartSeriesAggregationMethod, FinancialChartReductionLevel } from 'devextreme/viz/chart'; import { diff --git a/packages/devextreme-angular/src/ui/range-selector/nested/label.ts b/packages/devextreme-angular/src/ui/range-selector/nested/label.ts index 2191f36fb65d..28e14f22b5b9 100644 --- a/packages/devextreme-angular/src/ui/range-selector/nested/label.ts +++ b/packages/devextreme-angular/src/ui/range-selector/nested/label.ts @@ -16,7 +16,7 @@ import { import { HorizontalAlignment } from 'devextreme/common'; import { DashStyle, Font, LabelOverlap, RelativePosition } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/range-selector/nested/line.ts b/packages/devextreme-angular/src/ui/range-selector/nested/line.ts index 1be50b8336b6..00d163551688 100644 --- a/packages/devextreme-angular/src/ui/range-selector/nested/line.ts +++ b/packages/devextreme-angular/src/ui/range-selector/nested/line.ts @@ -16,7 +16,7 @@ import { import { HorizontalAlignment } from 'devextreme/common'; import { ChartsColor, DashStyle, Font, HatchDirection, PointInteractionMode, PointSymbol, RelativePosition, SeriesHoverMode, SeriesSelectionMode, SeriesType, ValueErrorBarDisplayMode, ValueErrorBarType } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { ChartSeriesAggregationMethod, FinancialChartReductionLevel } from 'devextreme/viz/chart'; import { diff --git a/packages/devextreme-angular/src/ui/range-selector/nested/marker.ts b/packages/devextreme-angular/src/ui/range-selector/nested/marker.ts index b275f8cb6787..d681ec7cc01a 100644 --- a/packages/devextreme-angular/src/ui/range-selector/nested/marker.ts +++ b/packages/devextreme-angular/src/ui/range-selector/nested/marker.ts @@ -14,7 +14,7 @@ import { -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/range-selector/nested/rangearea.ts b/packages/devextreme-angular/src/ui/range-selector/nested/rangearea.ts index 6949c5cc83e9..4fd467ceeb96 100644 --- a/packages/devextreme-angular/src/ui/range-selector/nested/rangearea.ts +++ b/packages/devextreme-angular/src/ui/range-selector/nested/rangearea.ts @@ -16,7 +16,7 @@ import { import { HorizontalAlignment } from 'devextreme/common'; import { ChartsColor, DashStyle, Font, HatchDirection, PointInteractionMode, PointSymbol, RelativePosition, SeriesHoverMode, SeriesSelectionMode, SeriesType, ValueErrorBarDisplayMode, ValueErrorBarType } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { ChartSeriesAggregationMethod, FinancialChartReductionLevel } from 'devextreme/viz/chart'; import { diff --git a/packages/devextreme-angular/src/ui/range-selector/nested/rangebar.ts b/packages/devextreme-angular/src/ui/range-selector/nested/rangebar.ts index 7c5767223db5..0fa97d8e1866 100644 --- a/packages/devextreme-angular/src/ui/range-selector/nested/rangebar.ts +++ b/packages/devextreme-angular/src/ui/range-selector/nested/rangebar.ts @@ -16,7 +16,7 @@ import { import { HorizontalAlignment } from 'devextreme/common'; import { ChartsColor, DashStyle, Font, HatchDirection, PointInteractionMode, PointSymbol, RelativePosition, SeriesHoverMode, SeriesSelectionMode, SeriesType, ValueErrorBarDisplayMode, ValueErrorBarType } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { ChartSeriesAggregationMethod, FinancialChartReductionLevel } from 'devextreme/viz/chart'; import { diff --git a/packages/devextreme-angular/src/ui/range-selector/nested/scale.ts b/packages/devextreme-angular/src/ui/range-selector/nested/scale.ts index 844d31d103be..0134673498d3 100644 --- a/packages/devextreme-angular/src/ui/range-selector/nested/scale.ts +++ b/packages/devextreme-angular/src/ui/range-selector/nested/scale.ts @@ -18,7 +18,7 @@ import { import { ChartsDataType, DiscreteAxisDivisionMode, Font, LabelOverlap, ScaleBreak, ScaleBreakLineStyle, TimeInterval } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { AxisScale } from 'devextreme/viz/range_selector'; import { diff --git a/packages/devextreme-angular/src/ui/range-selector/nested/scatter.ts b/packages/devextreme-angular/src/ui/range-selector/nested/scatter.ts index cdbc39d9e1b0..5c0aa1377031 100644 --- a/packages/devextreme-angular/src/ui/range-selector/nested/scatter.ts +++ b/packages/devextreme-angular/src/ui/range-selector/nested/scatter.ts @@ -16,7 +16,7 @@ import { import { HorizontalAlignment } from 'devextreme/common'; import { ChartsColor, DashStyle, Font, HatchDirection, PointInteractionMode, PointSymbol, RelativePosition, SeriesHoverMode, SeriesSelectionMode, SeriesType, ValueErrorBarDisplayMode, ValueErrorBarType } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { ChartSeriesAggregationMethod, FinancialChartReductionLevel } from 'devextreme/viz/chart'; import { diff --git a/packages/devextreme-angular/src/ui/range-selector/nested/series-dxi.ts b/packages/devextreme-angular/src/ui/range-selector/nested/series-dxi.ts index 34a7743fa98c..f404c175a723 100644 --- a/packages/devextreme-angular/src/ui/range-selector/nested/series-dxi.ts +++ b/packages/devextreme-angular/src/ui/range-selector/nested/series-dxi.ts @@ -14,7 +14,7 @@ import { import { HorizontalAlignment } from 'devextreme/common'; import { ChartsColor, DashStyle, Font, HatchDirection, PointInteractionMode, PointSymbol, RelativePosition, SeriesHoverMode, SeriesSelectionMode, SeriesType, ValueErrorBarDisplayMode, ValueErrorBarType } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { ChartSeriesAggregationMethod, FinancialChartReductionLevel } from 'devextreme/viz/chart'; import { diff --git a/packages/devextreme-angular/src/ui/range-selector/nested/slider-marker.ts b/packages/devextreme-angular/src/ui/range-selector/nested/slider-marker.ts index 0756b5e5289b..6f7938190592 100644 --- a/packages/devextreme-angular/src/ui/range-selector/nested/slider-marker.ts +++ b/packages/devextreme-angular/src/ui/range-selector/nested/slider-marker.ts @@ -15,7 +15,7 @@ import { import { Font } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/range-selector/nested/spline.ts b/packages/devextreme-angular/src/ui/range-selector/nested/spline.ts index 8bd564b0ad8c..d337bdd958e5 100644 --- a/packages/devextreme-angular/src/ui/range-selector/nested/spline.ts +++ b/packages/devextreme-angular/src/ui/range-selector/nested/spline.ts @@ -16,7 +16,7 @@ import { import { HorizontalAlignment } from 'devextreme/common'; import { ChartsColor, DashStyle, Font, HatchDirection, PointInteractionMode, PointSymbol, RelativePosition, SeriesHoverMode, SeriesSelectionMode, SeriesType, ValueErrorBarDisplayMode, ValueErrorBarType } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { ChartSeriesAggregationMethod, FinancialChartReductionLevel } from 'devextreme/viz/chart'; import { diff --git a/packages/devextreme-angular/src/ui/range-selector/nested/splinearea.ts b/packages/devextreme-angular/src/ui/range-selector/nested/splinearea.ts index 332546df3dd2..4f54fa3b2f18 100644 --- a/packages/devextreme-angular/src/ui/range-selector/nested/splinearea.ts +++ b/packages/devextreme-angular/src/ui/range-selector/nested/splinearea.ts @@ -16,7 +16,7 @@ import { import { HorizontalAlignment } from 'devextreme/common'; import { ChartsColor, DashStyle, Font, HatchDirection, PointInteractionMode, PointSymbol, RelativePosition, SeriesHoverMode, SeriesSelectionMode, SeriesType, ValueErrorBarDisplayMode, ValueErrorBarType } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { ChartSeriesAggregationMethod, FinancialChartReductionLevel } from 'devextreme/viz/chart'; import { diff --git a/packages/devextreme-angular/src/ui/range-selector/nested/stackedarea.ts b/packages/devextreme-angular/src/ui/range-selector/nested/stackedarea.ts index 659013727274..a34552a7bf18 100644 --- a/packages/devextreme-angular/src/ui/range-selector/nested/stackedarea.ts +++ b/packages/devextreme-angular/src/ui/range-selector/nested/stackedarea.ts @@ -16,7 +16,7 @@ import { import { HorizontalAlignment } from 'devextreme/common'; import { ChartsColor, DashStyle, Font, HatchDirection, PointInteractionMode, PointSymbol, RelativePosition, SeriesHoverMode, SeriesSelectionMode, SeriesType, ValueErrorBarDisplayMode, ValueErrorBarType } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { ChartSeriesAggregationMethod, FinancialChartReductionLevel } from 'devextreme/viz/chart'; import { diff --git a/packages/devextreme-angular/src/ui/range-selector/nested/stackedbar.ts b/packages/devextreme-angular/src/ui/range-selector/nested/stackedbar.ts index e79d121e7807..3774c155eead 100644 --- a/packages/devextreme-angular/src/ui/range-selector/nested/stackedbar.ts +++ b/packages/devextreme-angular/src/ui/range-selector/nested/stackedbar.ts @@ -16,7 +16,7 @@ import { import { HorizontalAlignment } from 'devextreme/common'; import { ChartsColor, DashStyle, Font, HatchDirection, PointInteractionMode, PointSymbol, RelativePosition, SeriesHoverMode, SeriesSelectionMode, SeriesType, ValueErrorBarDisplayMode, ValueErrorBarType } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { ChartSeriesAggregationMethod, FinancialChartReductionLevel } from 'devextreme/viz/chart'; import { diff --git a/packages/devextreme-angular/src/ui/range-selector/nested/stackedline.ts b/packages/devextreme-angular/src/ui/range-selector/nested/stackedline.ts index e05a88d5a20a..225b41549c02 100644 --- a/packages/devextreme-angular/src/ui/range-selector/nested/stackedline.ts +++ b/packages/devextreme-angular/src/ui/range-selector/nested/stackedline.ts @@ -16,7 +16,7 @@ import { import { HorizontalAlignment } from 'devextreme/common'; import { ChartsColor, DashStyle, Font, HatchDirection, PointInteractionMode, PointSymbol, RelativePosition, SeriesHoverMode, SeriesSelectionMode, SeriesType, ValueErrorBarDisplayMode, ValueErrorBarType } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { ChartSeriesAggregationMethod, FinancialChartReductionLevel } from 'devextreme/viz/chart'; import { diff --git a/packages/devextreme-angular/src/ui/range-selector/nested/stackedspline.ts b/packages/devextreme-angular/src/ui/range-selector/nested/stackedspline.ts index c8975c521442..acef9b0a0b65 100644 --- a/packages/devextreme-angular/src/ui/range-selector/nested/stackedspline.ts +++ b/packages/devextreme-angular/src/ui/range-selector/nested/stackedspline.ts @@ -16,7 +16,7 @@ import { import { HorizontalAlignment } from 'devextreme/common'; import { ChartsColor, DashStyle, Font, HatchDirection, PointInteractionMode, PointSymbol, RelativePosition, SeriesHoverMode, SeriesSelectionMode, SeriesType, ValueErrorBarDisplayMode, ValueErrorBarType } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { ChartSeriesAggregationMethod, FinancialChartReductionLevel } from 'devextreme/viz/chart'; import { diff --git a/packages/devextreme-angular/src/ui/range-selector/nested/stackedsplinearea.ts b/packages/devextreme-angular/src/ui/range-selector/nested/stackedsplinearea.ts index 01d6f5616f19..30d740b71793 100644 --- a/packages/devextreme-angular/src/ui/range-selector/nested/stackedsplinearea.ts +++ b/packages/devextreme-angular/src/ui/range-selector/nested/stackedsplinearea.ts @@ -16,7 +16,7 @@ import { import { HorizontalAlignment } from 'devextreme/common'; import { ChartsColor, DashStyle, Font, HatchDirection, PointInteractionMode, PointSymbol, RelativePosition, SeriesHoverMode, SeriesSelectionMode, SeriesType, ValueErrorBarDisplayMode, ValueErrorBarType } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { ChartSeriesAggregationMethod, FinancialChartReductionLevel } from 'devextreme/viz/chart'; import { diff --git a/packages/devextreme-angular/src/ui/range-selector/nested/steparea.ts b/packages/devextreme-angular/src/ui/range-selector/nested/steparea.ts index 0f2b1f1dec98..40b17e461cba 100644 --- a/packages/devextreme-angular/src/ui/range-selector/nested/steparea.ts +++ b/packages/devextreme-angular/src/ui/range-selector/nested/steparea.ts @@ -16,7 +16,7 @@ import { import { HorizontalAlignment } from 'devextreme/common'; import { ChartsColor, DashStyle, Font, HatchDirection, PointInteractionMode, PointSymbol, RelativePosition, SeriesHoverMode, SeriesSelectionMode, SeriesType, ValueErrorBarDisplayMode, ValueErrorBarType } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { ChartSeriesAggregationMethod, FinancialChartReductionLevel } from 'devextreme/viz/chart'; import { diff --git a/packages/devextreme-angular/src/ui/range-selector/nested/stepline.ts b/packages/devextreme-angular/src/ui/range-selector/nested/stepline.ts index 25fd1d53fa50..03d4909a23ea 100644 --- a/packages/devextreme-angular/src/ui/range-selector/nested/stepline.ts +++ b/packages/devextreme-angular/src/ui/range-selector/nested/stepline.ts @@ -16,7 +16,7 @@ import { import { HorizontalAlignment } from 'devextreme/common'; import { ChartsColor, DashStyle, Font, HatchDirection, PointInteractionMode, PointSymbol, RelativePosition, SeriesHoverMode, SeriesSelectionMode, SeriesType, ValueErrorBarDisplayMode, ValueErrorBarType } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { ChartSeriesAggregationMethod, FinancialChartReductionLevel } from 'devextreme/viz/chart'; import { diff --git a/packages/devextreme-angular/src/ui/range-selector/nested/stock.ts b/packages/devextreme-angular/src/ui/range-selector/nested/stock.ts index 260e6d0224fb..015525589a48 100644 --- a/packages/devextreme-angular/src/ui/range-selector/nested/stock.ts +++ b/packages/devextreme-angular/src/ui/range-selector/nested/stock.ts @@ -16,7 +16,7 @@ import { import { HorizontalAlignment } from 'devextreme/common'; import { ChartsColor, DashStyle, Font, HatchDirection, PointInteractionMode, PointSymbol, RelativePosition, SeriesHoverMode, SeriesSelectionMode, SeriesType, ValueErrorBarDisplayMode, ValueErrorBarType } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { ChartSeriesAggregationMethod, FinancialChartReductionLevel } from 'devextreme/viz/chart'; import { diff --git a/packages/devextreme-angular/src/ui/range-slider/index.ts b/packages/devextreme-angular/src/ui/range-slider/index.ts index d78bd13498f8..0b29fbce00bb 100644 --- a/packages/devextreme-angular/src/ui/range-slider/index.ts +++ b/packages/devextreme-angular/src/ui/range-slider/index.ts @@ -23,7 +23,7 @@ import { import { Position, SliderValueChangeMode, TooltipShowMode, ValidationMessageMode, ValidationStatus, VerticalEdge } from 'devextreme/common'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { ContentReadyEvent, DisposingEvent, InitializedEvent, OptionChangedEvent, ValueChangedEvent } from 'devextreme/ui/range_slider'; import DxRangeSlider from 'devextreme/ui/range_slider'; diff --git a/packages/devextreme-angular/src/ui/range-slider/nested/label.ts b/packages/devextreme-angular/src/ui/range-slider/nested/label.ts index fda488a4f971..48f146f9b94c 100644 --- a/packages/devextreme-angular/src/ui/range-slider/nested/label.ts +++ b/packages/devextreme-angular/src/ui/range-slider/nested/label.ts @@ -15,7 +15,7 @@ import { import { VerticalEdge } from 'devextreme/common'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/range-slider/nested/tooltip.ts b/packages/devextreme-angular/src/ui/range-slider/nested/tooltip.ts index 139adff12ef2..73d246e35cc5 100644 --- a/packages/devextreme-angular/src/ui/range-slider/nested/tooltip.ts +++ b/packages/devextreme-angular/src/ui/range-slider/nested/tooltip.ts @@ -15,7 +15,7 @@ import { import { TooltipShowMode, VerticalEdge } from 'devextreme/common'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/sankey/index.ts b/packages/devextreme-angular/src/ui/sankey/index.ts index 1edf292f2ab3..bca868c5a624 100644 --- a/packages/devextreme-angular/src/ui/sankey/index.ts +++ b/packages/devextreme-angular/src/ui/sankey/index.ts @@ -22,10 +22,10 @@ import { import { ExportFormat, HorizontalAlignment, VerticalAlignment, VerticalEdge } from 'devextreme/common'; import { DashStyle, Font, HatchDirection, Palette, PaletteExtensionMode, TextOverflow, Theme, WordWrap } from 'devextreme/common/charts'; +import { Format } from 'devextreme/common/core/localization'; import { UserDefinedElement } from 'devextreme/core/element'; import { Store } from 'devextreme/data'; import DataSource, { Options as DataSourceOptions } from 'devextreme/data/data_source'; -import { Format } from 'devextreme/localization'; import { DisposingEvent, DrawnEvent, ExportedEvent, ExportingEvent, FileSavingEvent, IncidentOccurredEvent, InitializedEvent, LinkClickEvent, LinkHoverEvent, NodeClickEvent, NodeHoverEvent, OptionChangedEvent, SankeyColorMode } from 'devextreme/viz/sankey'; import DxSankey from 'devextreme/viz/sankey'; diff --git a/packages/devextreme-angular/src/ui/sankey/nested/tooltip.ts b/packages/devextreme-angular/src/ui/sankey/nested/tooltip.ts index 99c489edac87..b4998ec42711 100644 --- a/packages/devextreme-angular/src/ui/sankey/nested/tooltip.ts +++ b/packages/devextreme-angular/src/ui/sankey/nested/tooltip.ts @@ -15,8 +15,8 @@ import { import { DashStyle, Font } from 'devextreme/common/charts'; +import { Format } from 'devextreme/common/core/localization'; import { UserDefinedElement } from 'devextreme/core/element'; -import { Format } from 'devextreme/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/select-box/nested/animation.ts b/packages/devextreme-angular/src/ui/select-box/nested/animation.ts index a7b9b5fe87d6..34ca3515b53b 100644 --- a/packages/devextreme-angular/src/ui/select-box/nested/animation.ts +++ b/packages/devextreme-angular/src/ui/select-box/nested/animation.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig } from 'devextreme/animation/fx'; +import { AnimationConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/select-box/nested/collision.ts b/packages/devextreme-angular/src/ui/select-box/nested/collision.ts index 140a6d979619..0f1cde5cf6b5 100644 --- a/packages/devextreme-angular/src/ui/select-box/nested/collision.ts +++ b/packages/devextreme-angular/src/ui/select-box/nested/collision.ts @@ -14,7 +14,7 @@ import { -import { CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/select-box/nested/drop-down-options.ts b/packages/devextreme-angular/src/ui/select-box/nested/drop-down-options.ts index 92cfe9527747..bbf6129f37a1 100644 --- a/packages/devextreme-angular/src/ui/select-box/nested/drop-down-options.ts +++ b/packages/devextreme-angular/src/ui/select-box/nested/drop-down-options.ts @@ -19,9 +19,8 @@ import { -import { AnimationConfig } from 'devextreme/animation/fx'; -import { PositionConfig } from 'devextreme/animation/position'; import { PositionAlignment, ToolbarItemComponent, ToolbarItemLocation } from 'devextreme/common'; +import { AnimationConfig, PositionConfig } from 'devextreme/common/core/animation'; import { UserDefinedElement } from 'devextreme/core/element'; import { ToolbarLocation } from 'devextreme/ui/popup'; import { LocateInMenuMode, ShowTextMode } from 'devextreme/ui/toolbar'; diff --git a/packages/devextreme-angular/src/ui/select-box/nested/from.ts b/packages/devextreme-angular/src/ui/select-box/nested/from.ts index a59a2637f568..d33c1f81df37 100644 --- a/packages/devextreme-angular/src/ui/select-box/nested/from.ts +++ b/packages/devextreme-angular/src/ui/select-box/nested/from.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/select-box/nested/hide.ts b/packages/devextreme-angular/src/ui/select-box/nested/hide.ts index 9edf70af1772..48689868a75f 100644 --- a/packages/devextreme-angular/src/ui/select-box/nested/hide.ts +++ b/packages/devextreme-angular/src/ui/select-box/nested/hide.ts @@ -14,8 +14,8 @@ import { -import { AnimationState, AnimationType } from 'devextreme/animation/fx'; import { Direction } from 'devextreme/common'; +import { AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/select-box/nested/position.ts b/packages/devextreme-angular/src/ui/select-box/nested/position.ts index 3e67a4d3400d..d9b85b7cd441 100644 --- a/packages/devextreme-angular/src/ui/select-box/nested/position.ts +++ b/packages/devextreme-angular/src/ui/select-box/nested/position.ts @@ -14,8 +14,8 @@ import { -import { CollisionResolution, CollisionResolutionCombination } from 'devextreme/animation/position'; import { HorizontalAlignment, PositionAlignment, VerticalAlignment } from 'devextreme/common'; +import { CollisionResolution, CollisionResolutionCombination } from 'devextreme/common/core/animation'; import { UserDefinedElement } from 'devextreme/core/element'; import { diff --git a/packages/devextreme-angular/src/ui/select-box/nested/show.ts b/packages/devextreme-angular/src/ui/select-box/nested/show.ts index 5c51245081f1..e14db00667ce 100644 --- a/packages/devextreme-angular/src/ui/select-box/nested/show.ts +++ b/packages/devextreme-angular/src/ui/select-box/nested/show.ts @@ -14,8 +14,8 @@ import { -import { AnimationState, AnimationType } from 'devextreme/animation/fx'; import { Direction } from 'devextreme/common'; +import { AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/select-box/nested/to.ts b/packages/devextreme-angular/src/ui/select-box/nested/to.ts index 3f32772932ff..4a9297f5b6da 100644 --- a/packages/devextreme-angular/src/ui/select-box/nested/to.ts +++ b/packages/devextreme-angular/src/ui/select-box/nested/to.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/slider/index.ts b/packages/devextreme-angular/src/ui/slider/index.ts index 17e6a9e3ffa4..795e97731371 100644 --- a/packages/devextreme-angular/src/ui/slider/index.ts +++ b/packages/devextreme-angular/src/ui/slider/index.ts @@ -23,7 +23,7 @@ import { import { Position, SliderValueChangeMode, TooltipShowMode, ValidationMessageMode, ValidationStatus, VerticalEdge } from 'devextreme/common'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { ContentReadyEvent, DisposingEvent, InitializedEvent, OptionChangedEvent, ValueChangedEvent } from 'devextreme/ui/slider'; import DxSlider from 'devextreme/ui/slider'; diff --git a/packages/devextreme-angular/src/ui/slider/nested/label.ts b/packages/devextreme-angular/src/ui/slider/nested/label.ts index 892efda17c2a..81bc35eb017b 100644 --- a/packages/devextreme-angular/src/ui/slider/nested/label.ts +++ b/packages/devextreme-angular/src/ui/slider/nested/label.ts @@ -15,7 +15,7 @@ import { import { VerticalEdge } from 'devextreme/common'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/slider/nested/tooltip.ts b/packages/devextreme-angular/src/ui/slider/nested/tooltip.ts index 36612687ad5d..e387e8828ab9 100644 --- a/packages/devextreme-angular/src/ui/slider/nested/tooltip.ts +++ b/packages/devextreme-angular/src/ui/slider/nested/tooltip.ts @@ -15,7 +15,7 @@ import { import { TooltipShowMode, VerticalEdge } from 'devextreme/common'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/sparkline/index.ts b/packages/devextreme-angular/src/ui/sparkline/index.ts index c62e792ccf84..fc8c7295431d 100644 --- a/packages/devextreme-angular/src/ui/sparkline/index.ts +++ b/packages/devextreme-angular/src/ui/sparkline/index.ts @@ -21,10 +21,10 @@ import { import { DashStyle, Font, PointSymbol, Theme } from 'devextreme/common/charts'; +import { Format } from 'devextreme/common/core/localization'; import { UserDefinedElement } from 'devextreme/core/element'; import { Store } from 'devextreme/data'; import DataSource, { Options as DataSourceOptions } from 'devextreme/data/data_source'; -import { Format } from 'devextreme/localization'; import { DisposingEvent, DrawnEvent, ExportedEvent, ExportingEvent, FileSavingEvent, IncidentOccurredEvent, InitializedEvent, OptionChangedEvent, SparklineType, TooltipHiddenEvent, TooltipShownEvent } from 'devextreme/viz/sparkline'; import DxSparkline from 'devextreme/viz/sparkline'; diff --git a/packages/devextreme-angular/src/ui/sparkline/nested/tooltip.ts b/packages/devextreme-angular/src/ui/sparkline/nested/tooltip.ts index 3e57f433ff76..6c54b34d3997 100644 --- a/packages/devextreme-angular/src/ui/sparkline/nested/tooltip.ts +++ b/packages/devextreme-angular/src/ui/sparkline/nested/tooltip.ts @@ -15,8 +15,8 @@ import { import { DashStyle, Font } from 'devextreme/common/charts'; +import { Format } from 'devextreme/common/core/localization'; import { UserDefinedElement } from 'devextreme/core/element'; -import { Format } from 'devextreme/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/tag-box/nested/animation.ts b/packages/devextreme-angular/src/ui/tag-box/nested/animation.ts index 8f4d9c9aa83f..9e1c688b3b02 100644 --- a/packages/devextreme-angular/src/ui/tag-box/nested/animation.ts +++ b/packages/devextreme-angular/src/ui/tag-box/nested/animation.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig } from 'devextreme/animation/fx'; +import { AnimationConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/tag-box/nested/collision.ts b/packages/devextreme-angular/src/ui/tag-box/nested/collision.ts index c75faa719140..85c893579381 100644 --- a/packages/devextreme-angular/src/ui/tag-box/nested/collision.ts +++ b/packages/devextreme-angular/src/ui/tag-box/nested/collision.ts @@ -14,7 +14,7 @@ import { -import { CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/tag-box/nested/drop-down-options.ts b/packages/devextreme-angular/src/ui/tag-box/nested/drop-down-options.ts index 290f69a2d3a6..0691b6531b3e 100644 --- a/packages/devextreme-angular/src/ui/tag-box/nested/drop-down-options.ts +++ b/packages/devextreme-angular/src/ui/tag-box/nested/drop-down-options.ts @@ -19,9 +19,8 @@ import { -import { AnimationConfig } from 'devextreme/animation/fx'; -import { PositionConfig } from 'devextreme/animation/position'; import { PositionAlignment, ToolbarItemComponent, ToolbarItemLocation } from 'devextreme/common'; +import { AnimationConfig, PositionConfig } from 'devextreme/common/core/animation'; import { UserDefinedElement } from 'devextreme/core/element'; import { ToolbarLocation } from 'devextreme/ui/popup'; import { LocateInMenuMode, ShowTextMode } from 'devextreme/ui/toolbar'; diff --git a/packages/devextreme-angular/src/ui/tag-box/nested/from.ts b/packages/devextreme-angular/src/ui/tag-box/nested/from.ts index 5dd638ed90e6..3291f16a0602 100644 --- a/packages/devextreme-angular/src/ui/tag-box/nested/from.ts +++ b/packages/devextreme-angular/src/ui/tag-box/nested/from.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/tag-box/nested/hide.ts b/packages/devextreme-angular/src/ui/tag-box/nested/hide.ts index 0387371bec07..4d3aae576bd4 100644 --- a/packages/devextreme-angular/src/ui/tag-box/nested/hide.ts +++ b/packages/devextreme-angular/src/ui/tag-box/nested/hide.ts @@ -14,8 +14,8 @@ import { -import { AnimationState, AnimationType } from 'devextreme/animation/fx'; import { Direction } from 'devextreme/common'; +import { AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/tag-box/nested/position.ts b/packages/devextreme-angular/src/ui/tag-box/nested/position.ts index f93fa0177c8a..9d65c556b3d0 100644 --- a/packages/devextreme-angular/src/ui/tag-box/nested/position.ts +++ b/packages/devextreme-angular/src/ui/tag-box/nested/position.ts @@ -14,8 +14,8 @@ import { -import { CollisionResolution, CollisionResolutionCombination } from 'devextreme/animation/position'; import { HorizontalAlignment, PositionAlignment, VerticalAlignment } from 'devextreme/common'; +import { CollisionResolution, CollisionResolutionCombination } from 'devextreme/common/core/animation'; import { UserDefinedElement } from 'devextreme/core/element'; import { diff --git a/packages/devextreme-angular/src/ui/tag-box/nested/show.ts b/packages/devextreme-angular/src/ui/tag-box/nested/show.ts index ddecc81ab6d0..4a71258752f3 100644 --- a/packages/devextreme-angular/src/ui/tag-box/nested/show.ts +++ b/packages/devextreme-angular/src/ui/tag-box/nested/show.ts @@ -14,8 +14,8 @@ import { -import { AnimationState, AnimationType } from 'devextreme/animation/fx'; import { Direction } from 'devextreme/common'; +import { AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/tag-box/nested/to.ts b/packages/devextreme-angular/src/ui/tag-box/nested/to.ts index ad95687a67b5..a03da04325ad 100644 --- a/packages/devextreme-angular/src/ui/tag-box/nested/to.ts +++ b/packages/devextreme-angular/src/ui/tag-box/nested/to.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/toast/index.ts b/packages/devextreme-angular/src/ui/toast/index.ts index b0d47e663b72..10c463464987 100644 --- a/packages/devextreme-angular/src/ui/toast/index.ts +++ b/packages/devextreme-angular/src/ui/toast/index.ts @@ -17,8 +17,7 @@ import { } from '@angular/core'; -import { AnimationConfig } from 'devextreme/animation/fx'; -import { PositionConfig } from 'devextreme/animation/position'; +import { AnimationConfig, PositionConfig } from 'devextreme/common/core/animation'; import { ContentReadyEvent, DisposingEvent, HiddenEvent, HidingEvent, InitializedEvent, OptionChangedEvent, ShowingEvent, ShownEvent, ToastType } from 'devextreme/ui/toast'; import DxToast from 'devextreme/ui/toast'; diff --git a/packages/devextreme-angular/src/ui/toast/nested/animation.ts b/packages/devextreme-angular/src/ui/toast/nested/animation.ts index 06dd2a36410d..a0f9f1438029 100644 --- a/packages/devextreme-angular/src/ui/toast/nested/animation.ts +++ b/packages/devextreme-angular/src/ui/toast/nested/animation.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig } from 'devextreme/animation/fx'; +import { AnimationConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/toast/nested/collision.ts b/packages/devextreme-angular/src/ui/toast/nested/collision.ts index db4bc386a255..f92ec128eddf 100644 --- a/packages/devextreme-angular/src/ui/toast/nested/collision.ts +++ b/packages/devextreme-angular/src/ui/toast/nested/collision.ts @@ -14,7 +14,7 @@ import { -import { CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/toast/nested/from.ts b/packages/devextreme-angular/src/ui/toast/nested/from.ts index 05d6130081b4..418751d7b926 100644 --- a/packages/devextreme-angular/src/ui/toast/nested/from.ts +++ b/packages/devextreme-angular/src/ui/toast/nested/from.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/toast/nested/hide.ts b/packages/devextreme-angular/src/ui/toast/nested/hide.ts index 894c271fc70c..4e4cf2229b74 100644 --- a/packages/devextreme-angular/src/ui/toast/nested/hide.ts +++ b/packages/devextreme-angular/src/ui/toast/nested/hide.ts @@ -14,8 +14,8 @@ import { -import { AnimationState, AnimationType } from 'devextreme/animation/fx'; import { Direction } from 'devextreme/common'; +import { AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/toast/nested/position.ts b/packages/devextreme-angular/src/ui/toast/nested/position.ts index 1fca98f4ebef..9c07821dd4de 100644 --- a/packages/devextreme-angular/src/ui/toast/nested/position.ts +++ b/packages/devextreme-angular/src/ui/toast/nested/position.ts @@ -14,8 +14,8 @@ import { -import { CollisionResolution, CollisionResolutionCombination } from 'devextreme/animation/position'; import { HorizontalAlignment, PositionAlignment, VerticalAlignment } from 'devextreme/common'; +import { CollisionResolution, CollisionResolutionCombination } from 'devextreme/common/core/animation'; import { UserDefinedElement } from 'devextreme/core/element'; import { diff --git a/packages/devextreme-angular/src/ui/toast/nested/show.ts b/packages/devextreme-angular/src/ui/toast/nested/show.ts index 6f33ca133eb6..d7c89bda7a4a 100644 --- a/packages/devextreme-angular/src/ui/toast/nested/show.ts +++ b/packages/devextreme-angular/src/ui/toast/nested/show.ts @@ -14,8 +14,8 @@ import { -import { AnimationState, AnimationType } from 'devextreme/animation/fx'; import { Direction } from 'devextreme/common'; +import { AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/toast/nested/to.ts b/packages/devextreme-angular/src/ui/toast/nested/to.ts index 879deac6622e..e7b55d3f52c1 100644 --- a/packages/devextreme-angular/src/ui/toast/nested/to.ts +++ b/packages/devextreme-angular/src/ui/toast/nested/to.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/tooltip/index.ts b/packages/devextreme-angular/src/ui/tooltip/index.ts index e33c73836927..865811f39c14 100644 --- a/packages/devextreme-angular/src/ui/tooltip/index.ts +++ b/packages/devextreme-angular/src/ui/tooltip/index.ts @@ -17,9 +17,8 @@ import { } from '@angular/core'; -import { AnimationConfig } from 'devextreme/animation/fx'; -import { PositionConfig } from 'devextreme/animation/position'; import { Position } from 'devextreme/common'; +import { AnimationConfig, PositionConfig } from 'devextreme/common/core/animation'; import { UserDefinedElement } from 'devextreme/core/element'; import { ContentReadyEvent, DisposingEvent, HiddenEvent, HidingEvent, InitializedEvent, OptionChangedEvent, ShowingEvent, ShownEvent } from 'devextreme/ui/tooltip'; diff --git a/packages/devextreme-angular/src/ui/tooltip/nested/animation.ts b/packages/devextreme-angular/src/ui/tooltip/nested/animation.ts index 270af13dfbda..23c9849f2d78 100644 --- a/packages/devextreme-angular/src/ui/tooltip/nested/animation.ts +++ b/packages/devextreme-angular/src/ui/tooltip/nested/animation.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig } from 'devextreme/animation/fx'; +import { AnimationConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/tooltip/nested/collision.ts b/packages/devextreme-angular/src/ui/tooltip/nested/collision.ts index ed6b3416ac00..2639bce9ef13 100644 --- a/packages/devextreme-angular/src/ui/tooltip/nested/collision.ts +++ b/packages/devextreme-angular/src/ui/tooltip/nested/collision.ts @@ -14,7 +14,7 @@ import { -import { CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/tooltip/nested/from.ts b/packages/devextreme-angular/src/ui/tooltip/nested/from.ts index 5144c70872ae..79c86175fa6f 100644 --- a/packages/devextreme-angular/src/ui/tooltip/nested/from.ts +++ b/packages/devextreme-angular/src/ui/tooltip/nested/from.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/tooltip/nested/hide.ts b/packages/devextreme-angular/src/ui/tooltip/nested/hide.ts index 9e8cfaa51fd6..1567f948c5c2 100644 --- a/packages/devextreme-angular/src/ui/tooltip/nested/hide.ts +++ b/packages/devextreme-angular/src/ui/tooltip/nested/hide.ts @@ -14,8 +14,8 @@ import { -import { AnimationState, AnimationType } from 'devextreme/animation/fx'; import { Direction } from 'devextreme/common'; +import { AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/tooltip/nested/position.ts b/packages/devextreme-angular/src/ui/tooltip/nested/position.ts index 45a8923a96cd..379563758068 100644 --- a/packages/devextreme-angular/src/ui/tooltip/nested/position.ts +++ b/packages/devextreme-angular/src/ui/tooltip/nested/position.ts @@ -14,8 +14,8 @@ import { -import { CollisionResolution, CollisionResolutionCombination } from 'devextreme/animation/position'; import { HorizontalAlignment, PositionAlignment, VerticalAlignment } from 'devextreme/common'; +import { CollisionResolution, CollisionResolutionCombination } from 'devextreme/common/core/animation'; import { UserDefinedElement } from 'devextreme/core/element'; import { diff --git a/packages/devextreme-angular/src/ui/tooltip/nested/show.ts b/packages/devextreme-angular/src/ui/tooltip/nested/show.ts index ec296e13e34d..dd115161489f 100644 --- a/packages/devextreme-angular/src/ui/tooltip/nested/show.ts +++ b/packages/devextreme-angular/src/ui/tooltip/nested/show.ts @@ -14,8 +14,8 @@ import { -import { AnimationState, AnimationType } from 'devextreme/animation/fx'; import { Direction } from 'devextreme/common'; +import { AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/tooltip/nested/to.ts b/packages/devextreme-angular/src/ui/tooltip/nested/to.ts index 9d90b605e8b5..2efe0dd47553 100644 --- a/packages/devextreme-angular/src/ui/tooltip/nested/to.ts +++ b/packages/devextreme-angular/src/ui/tooltip/nested/to.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/tree-list/index.ts b/packages/devextreme-angular/src/ui/tree-list/index.ts index ee49c6509278..5013b8bee3a2 100644 --- a/packages/devextreme-angular/src/ui/tree-list/index.ts +++ b/packages/devextreme-angular/src/ui/tree-list/index.ts @@ -23,8 +23,8 @@ import { export { ExplicitTypes } from 'devextreme/ui/tree_list'; -import { PositionConfig } from 'devextreme/animation/position'; import { DataStructure, DragDirection, DragHighlight, Mode, ScrollbarMode, ScrollMode, SingleMultipleOrNone, SortOrder } from 'devextreme/common'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { ApplyFilterMode, ColumnChooserMode, ColumnChooserSearchConfig, ColumnChooserSelectionConfig, ColumnResizeMode, DataChange, DataRenderMode, EnterKeyAction, EnterKeyDirection, GridsEditMode, GridsEditRefreshMode, HeaderFilterSearchConfig, Pager, StartEditAction, StateStoreType } from 'devextreme/common/grids'; import { UserDefinedElement } from 'devextreme/core/element'; import { Store } from 'devextreme/data'; diff --git a/packages/devextreme-angular/src/ui/tree-list/nested/animation.ts b/packages/devextreme-angular/src/ui/tree-list/nested/animation.ts index 54d3f19ca2bd..0a6824844552 100644 --- a/packages/devextreme-angular/src/ui/tree-list/nested/animation.ts +++ b/packages/devextreme-angular/src/ui/tree-list/nested/animation.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig } from 'devextreme/animation/fx'; +import { AnimationConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/tree-list/nested/collision.ts b/packages/devextreme-angular/src/ui/tree-list/nested/collision.ts index e9c9a7d53b97..46468bc320db 100644 --- a/packages/devextreme-angular/src/ui/tree-list/nested/collision.ts +++ b/packages/devextreme-angular/src/ui/tree-list/nested/collision.ts @@ -14,7 +14,7 @@ import { -import { CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/tree-list/nested/column-chooser.ts b/packages/devextreme-angular/src/ui/tree-list/nested/column-chooser.ts index e20307da93a1..90f25cbbcfb6 100644 --- a/packages/devextreme-angular/src/ui/tree-list/nested/column-chooser.ts +++ b/packages/devextreme-angular/src/ui/tree-list/nested/column-chooser.ts @@ -14,8 +14,8 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; import { SortOrder } from 'devextreme/common'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { ColumnChooserMode, ColumnChooserSearchConfig, ColumnChooserSelectionConfig } from 'devextreme/common/grids'; import { UserDefinedElement } from 'devextreme/core/element'; diff --git a/packages/devextreme-angular/src/ui/tree-list/nested/column-dxi.ts b/packages/devextreme-angular/src/ui/tree-list/nested/column-dxi.ts index 1c3ef6612598..2c68ee8c00ee 100644 --- a/packages/devextreme-angular/src/ui/tree-list/nested/column-dxi.ts +++ b/packages/devextreme-angular/src/ui/tree-list/nested/column-dxi.ts @@ -18,10 +18,10 @@ import { import { AsyncRule, CompareRule, CustomRule, DataType, EmailRule, HorizontalAlignment, NumericRule, PatternRule, RangeRule, RequiredRule, SearchMode, SortOrder, StringLengthRule } from 'devextreme/common'; +import { Format } from 'devextreme/common/core/localization'; import { ColumnHeaderFilterSearchConfig, FilterOperation, FilterType, FixedPosition, HeaderFilterGroupInterval, SelectedFilterOperation } from 'devextreme/common/grids'; import { Store } from 'devextreme/data'; import { Options as DataSourceOptions } from 'devextreme/data/data_source'; -import { Format } from 'devextreme/localization'; import { SimpleItem } from 'devextreme/ui/form'; import { dxTreeListColumn, dxTreeListColumnButton, TreeListCommandColumnType, TreeListPredefinedColumnButton } from 'devextreme/ui/tree_list'; diff --git a/packages/devextreme-angular/src/ui/tree-list/nested/field-dxi.ts b/packages/devextreme-angular/src/ui/tree-list/nested/field-dxi.ts index 9f9b17c7aa03..2f699393ec9c 100644 --- a/packages/devextreme-angular/src/ui/tree-list/nested/field-dxi.ts +++ b/packages/devextreme-angular/src/ui/tree-list/nested/field-dxi.ts @@ -13,9 +13,9 @@ import { import { DataType } from 'devextreme/common'; +import { Format } from 'devextreme/common/core/localization'; import { Store } from 'devextreme/data'; import { Options as DataSourceOptions } from 'devextreme/data/data_source'; -import { Format } from 'devextreme/localization'; import { FilterBuilderOperation } from 'devextreme/ui/filter_builder'; import { diff --git a/packages/devextreme-angular/src/ui/tree-list/nested/filter-builder-popup.ts b/packages/devextreme-angular/src/ui/tree-list/nested/filter-builder-popup.ts index 7d18f8d90121..31cbce416b6e 100644 --- a/packages/devextreme-angular/src/ui/tree-list/nested/filter-builder-popup.ts +++ b/packages/devextreme-angular/src/ui/tree-list/nested/filter-builder-popup.ts @@ -19,9 +19,8 @@ import { -import { AnimationConfig } from 'devextreme/animation/fx'; -import { PositionConfig } from 'devextreme/animation/position'; import { PositionAlignment, ToolbarItemComponent, ToolbarItemLocation } from 'devextreme/common'; +import { AnimationConfig, PositionConfig } from 'devextreme/common/core/animation'; import { UserDefinedElement } from 'devextreme/core/element'; import { ToolbarLocation } from 'devextreme/ui/popup'; import { LocateInMenuMode, ShowTextMode } from 'devextreme/ui/toolbar'; diff --git a/packages/devextreme-angular/src/ui/tree-list/nested/from.ts b/packages/devextreme-angular/src/ui/tree-list/nested/from.ts index 24e6b43c3f34..bc9d851683d7 100644 --- a/packages/devextreme-angular/src/ui/tree-list/nested/from.ts +++ b/packages/devextreme-angular/src/ui/tree-list/nested/from.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/tree-list/nested/hide.ts b/packages/devextreme-angular/src/ui/tree-list/nested/hide.ts index ee6adbac8f32..8a7a9be77454 100644 --- a/packages/devextreme-angular/src/ui/tree-list/nested/hide.ts +++ b/packages/devextreme-angular/src/ui/tree-list/nested/hide.ts @@ -14,8 +14,8 @@ import { -import { AnimationState, AnimationType } from 'devextreme/animation/fx'; import { Direction } from 'devextreme/common'; +import { AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/tree-list/nested/popup.ts b/packages/devextreme-angular/src/ui/tree-list/nested/popup.ts index de615a2d946c..77c4b59ff69c 100644 --- a/packages/devextreme-angular/src/ui/tree-list/nested/popup.ts +++ b/packages/devextreme-angular/src/ui/tree-list/nested/popup.ts @@ -19,9 +19,8 @@ import { -import { AnimationConfig } from 'devextreme/animation/fx'; -import { PositionConfig } from 'devextreme/animation/position'; import { PositionAlignment, ToolbarItemComponent, ToolbarItemLocation } from 'devextreme/common'; +import { AnimationConfig, PositionConfig } from 'devextreme/common/core/animation'; import { UserDefinedElement } from 'devextreme/core/element'; import { ToolbarLocation } from 'devextreme/ui/popup'; import { LocateInMenuMode, ShowTextMode } from 'devextreme/ui/toolbar'; diff --git a/packages/devextreme-angular/src/ui/tree-list/nested/position.ts b/packages/devextreme-angular/src/ui/tree-list/nested/position.ts index 1176941f641a..42a2005f772d 100644 --- a/packages/devextreme-angular/src/ui/tree-list/nested/position.ts +++ b/packages/devextreme-angular/src/ui/tree-list/nested/position.ts @@ -14,8 +14,8 @@ import { -import { CollisionResolution, CollisionResolutionCombination } from 'devextreme/animation/position'; import { HorizontalAlignment, PositionAlignment, VerticalAlignment } from 'devextreme/common'; +import { CollisionResolution, CollisionResolutionCombination } from 'devextreme/common/core/animation'; import { UserDefinedElement } from 'devextreme/core/element'; import { diff --git a/packages/devextreme-angular/src/ui/tree-list/nested/show.ts b/packages/devextreme-angular/src/ui/tree-list/nested/show.ts index 4b0c3c3d7808..4f0a8fd5e4c4 100644 --- a/packages/devextreme-angular/src/ui/tree-list/nested/show.ts +++ b/packages/devextreme-angular/src/ui/tree-list/nested/show.ts @@ -14,8 +14,8 @@ import { -import { AnimationState, AnimationType } from 'devextreme/animation/fx'; import { Direction } from 'devextreme/common'; +import { AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/tree-list/nested/to.ts b/packages/devextreme-angular/src/ui/tree-list/nested/to.ts index 035eabc3a27b..10f6b797162a 100644 --- a/packages/devextreme-angular/src/ui/tree-list/nested/to.ts +++ b/packages/devextreme-angular/src/ui/tree-list/nested/to.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/tree-map/index.ts b/packages/devextreme-angular/src/ui/tree-map/index.ts index 8af372b9ea53..38961cc2ead4 100644 --- a/packages/devextreme-angular/src/ui/tree-map/index.ts +++ b/packages/devextreme-angular/src/ui/tree-map/index.ts @@ -22,10 +22,10 @@ import { import { ExportFormat, HorizontalAlignment, SingleMultipleOrNone, VerticalEdge } from 'devextreme/common'; import { DashStyle, Font, Palette, PaletteExtensionMode, TextOverflow, Theme, WordWrap } from 'devextreme/common/charts'; +import { Format } from 'devextreme/common/core/localization'; import { UserDefinedElement } from 'devextreme/core/element'; import { Store } from 'devextreme/data'; import DataSource, { Options as DataSourceOptions } from 'devextreme/data/data_source'; -import { Format } from 'devextreme/localization'; import { ClickEvent, DisposingEvent, DrawnEvent, DrillEvent, ExportedEvent, ExportingEvent, FileSavingEvent, HoverChangedEvent, IncidentOccurredEvent, InitializedEvent, NodesInitializedEvent, NodesRenderingEvent, OptionChangedEvent, SelectionChangedEvent, TreeMapColorizerType, TreeMapLayoutAlgorithm, TreeMapLayoutDirection } from 'devextreme/viz/tree_map'; import DxTreeMap from 'devextreme/viz/tree_map'; diff --git a/packages/devextreme-angular/src/ui/tree-map/nested/tooltip.ts b/packages/devextreme-angular/src/ui/tree-map/nested/tooltip.ts index d0be30eb0044..d47bebb93592 100644 --- a/packages/devextreme-angular/src/ui/tree-map/nested/tooltip.ts +++ b/packages/devextreme-angular/src/ui/tree-map/nested/tooltip.ts @@ -15,8 +15,8 @@ import { import { DashStyle, Font } from 'devextreme/common/charts'; +import { Format } from 'devextreme/common/core/localization'; import { UserDefinedElement } from 'devextreme/core/element'; -import { Format } from 'devextreme/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-react/src/accordion.ts b/packages/devextreme-react/src/accordion.ts index 20a1cbbc5bbc..f9a6de09ed4d 100644 --- a/packages/devextreme-react/src/accordion.ts +++ b/packages/devextreme-react/src/accordion.ts @@ -11,7 +11,6 @@ import NestedOption from "./core/nested-option"; import type { dxAccordionItem, ContentReadyEvent, DisposingEvent, InitializedEvent, ItemClickEvent, ItemContextMenuEvent, ItemHoldEvent, ItemRenderedEvent, ItemTitleClickEvent } from "devextreme/ui/accordion"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; -import type { template } from "devextreme/core/templates/template"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; @@ -114,10 +113,10 @@ type IItemProps = React.PropsWithChildren<{ disabled?: boolean; html?: string; icon?: string; - template?: ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any) | template; + template?: any | ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any); text?: string; title?: string; - titleTemplate?: (() => string | any) | template; + titleTemplate?: any | (() => string | any); visible?: boolean; render?: (...params: any) => React.ReactNode; component?: React.ComponentType; diff --git a/packages/devextreme-react/src/action-sheet.ts b/packages/devextreme-react/src/action-sheet.ts index ccdf5b015571..0098d020e8b8 100644 --- a/packages/devextreme-react/src/action-sheet.ts +++ b/packages/devextreme-react/src/action-sheet.ts @@ -10,10 +10,9 @@ import { Component as BaseComponent, IHtmlOptions, ComponentRef, NestedComponent import NestedOption from "./core/nested-option"; import type { dxActionSheetItem, CancelClickEvent, ContentReadyEvent, DisposingEvent, InitializedEvent, ItemClickEvent, ItemContextMenuEvent, ItemHoldEvent, ItemRenderedEvent } from "devextreme/ui/action_sheet"; -import type { NativeEventInfo } from "devextreme/events/index"; +import type { NativeEventInfo } from "devextreme/common/core/events"; import type { ButtonStyle, ButtonType } from "devextreme/common"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; -import type { template } from "devextreme/core/templates/template"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; @@ -101,7 +100,7 @@ type IItemProps = React.PropsWithChildren<{ icon?: string; onClick?: ((e: NativeEventInfo) => void); stylingMode?: ButtonStyle; - template?: ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any) | template; + template?: any | ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any); text?: string; type?: ButtonType; render?: (...params: any) => React.ReactNode; diff --git a/packages/devextreme-react/src/autocomplete.ts b/packages/devextreme-react/src/autocomplete.ts index 98e95cd202a2..e9b7a5a84a34 100644 --- a/packages/devextreme-react/src/autocomplete.ts +++ b/packages/devextreme-react/src/autocomplete.ts @@ -10,11 +10,10 @@ import NestedOption from "./core/nested-option"; import type { ChangeEvent, ClosedEvent, ContentReadyEvent, CopyEvent, CutEvent, DisposingEvent, EnterKeyEvent, FocusInEvent, FocusOutEvent, InitializedEvent, InputEvent, ItemClickEvent, KeyDownEvent, KeyUpEvent, OpenedEvent, PasteEvent, ValueChangedEvent } from "devextreme/ui/autocomplete"; import type { ContentReadyEvent as ButtonContentReadyEvent, DisposingEvent as ButtonDisposingEvent, InitializedEvent as ButtonInitializedEvent, dxButtonOptions, ClickEvent, OptionChangedEvent } from "devextreme/ui/button"; -import type { AnimationConfig, AnimationState, AnimationType } from "devextreme/animation/fx"; +import type { AnimationConfig, CollisionResolution, PositionConfig, AnimationState, AnimationType, CollisionResolutionCombination } from "devextreme/common/core/animation"; import type { HorizontalAlignment, VerticalAlignment, TextEditorButtonLocation, PositionAlignment, Direction, ButtonStyle, ButtonType, ToolbarItemLocation, ToolbarItemComponent } from "devextreme/common"; -import type { CollisionResolution, PositionConfig, CollisionResolutionCombination } from "devextreme/animation/position"; -import type { event, EventInfo } from "devextreme/events/index"; -import type { template } from "devextreme/core/templates/template"; +import type { event } from "devextreme/common/core/events/index"; +import type { EventInfo } from "devextreme/common/core/events"; import type { Component } from "devextreme/core/component"; import type { dxPopupToolbarItem, ToolbarLocation } from "devextreme/ui/popup"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; @@ -242,7 +241,7 @@ type IDropDownOptionsProps = React.PropsWithChildren<{ bindingOptions?: Record; closeOnOutsideClick?: boolean | ((event: event) => boolean); container?: any | string; - contentTemplate?: ((contentElement: any) => string | any) | template; + contentTemplate?: any | ((contentElement: any) => string | any); deferRendering?: boolean; disabled?: boolean; dragAndResizeArea?: any | string; @@ -282,7 +281,7 @@ type IDropDownOptionsProps = React.PropsWithChildren<{ showTitle?: boolean; tabIndex?: number; title?: string; - titleTemplate?: ((titleElement: any) => string | any) | template; + titleTemplate?: any | ((titleElement: any) => string | any); toolbarItems?: Array; visible?: boolean; width?: (() => number | string) | number | string; @@ -394,7 +393,7 @@ const Hide = Object.assign(_componen type IItemProps = React.PropsWithChildren<{ disabled?: boolean; html?: string; - template?: ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any) | template; + template?: any | ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any); text?: string; visible?: boolean; render?: (...params: any) => React.ReactNode; @@ -478,7 +477,7 @@ type IOptionsProps = React.PropsWithChildren<{ rtlEnabled?: boolean; stylingMode?: ButtonStyle; tabIndex?: number; - template?: ((buttonData: { icon: string, text: string }, contentElement: any) => string | any) | template; + template?: any | ((buttonData: { icon: string, text: string }, contentElement: any) => string | any); text?: string; type?: ButtonType | string; useSubmitBehavior?: boolean; @@ -603,10 +602,10 @@ type IToolbarItemProps = React.PropsWithChildren<{ html?: string; locateInMenu?: LocateInMenuMode; location?: ToolbarItemLocation; - menuItemTemplate?: (() => string | any) | template; + menuItemTemplate?: any | (() => string | any); options?: any; showText?: ShowTextMode; - template?: ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any) | template; + template?: any | ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any); text?: string; toolbar?: ToolbarLocation; visible?: boolean; diff --git a/packages/devextreme-react/src/bar-gauge.ts b/packages/devextreme-react/src/bar-gauge.ts index 516a2a28bdaa..13fcd59e0ca8 100644 --- a/packages/devextreme-react/src/bar-gauge.ts +++ b/packages/devextreme-react/src/bar-gauge.ts @@ -11,8 +11,7 @@ import NestedOption from "./core/nested-option"; import type { DisposingEvent, DrawnEvent, ExportedEvent, ExportingEvent, FileSavingEvent, IncidentOccurredEvent, InitializedEvent, TooltipHiddenEvent, TooltipShownEvent, BarGaugeBarInfo, BarGaugeLegendItem } from "devextreme/viz/bar_gauge"; import type { AnimationEaseMode, Font as ChartsFont, TextOverflow, WordWrap, DashStyle } from "devextreme/common/charts"; import type { HorizontalAlignment, VerticalEdge, ExportFormat, Format as CommonFormat, Position, Orientation } from "devextreme/common"; -import type { Format as LocalizationFormat } from "devextreme/localization"; -import type { template } from "devextreme/core/templates/template"; +import type { Format as LocalizationFormat } from "devextreme/common/core/localization"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; @@ -391,7 +390,7 @@ type ILegendProps = React.PropsWithChildren<{ top?: number; }; markerSize?: number; - markerTemplate?: ((legendItem: BarGaugeLegendItem, element: any) => string | any) | template; + markerTemplate?: any | ((legendItem: BarGaugeLegendItem, element: any) => string | any); orientation?: Orientation; paddingLeftRight?: number; paddingTopBottom?: number; @@ -700,7 +699,7 @@ type ITooltipProps = React.PropsWithChildren<{ }; color?: string; container?: any | string; - contentTemplate?: ((scaleValue: { index: number, value: number, valueText: string }, element: any) => string | any) | template; + contentTemplate?: any | ((scaleValue: { index: number, value: number, valueText: string }, element: any) => string | any); cornerRadius?: number; customizeTooltip?: ((scaleValue: { index: number, value: number, valueText: string }) => Record); enabled?: boolean; diff --git a/packages/devextreme-react/src/box.ts b/packages/devextreme-react/src/box.ts index 57643a27f151..4b0a8d97dd88 100644 --- a/packages/devextreme-react/src/box.ts +++ b/packages/devextreme-react/src/box.ts @@ -11,7 +11,6 @@ import NestedOption from "./core/nested-option"; import type { dxBoxItem, ContentReadyEvent, DisposingEvent, InitializedEvent, ItemClickEvent, ItemContextMenuEvent, ItemHoldEvent, ItemRenderedEvent, dxBoxOptions } from "devextreme/ui/box"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; -import type { template } from "devextreme/core/templates/template"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; @@ -97,7 +96,7 @@ type IItemProps = React.PropsWithChildren<{ html?: string; ratio?: number; shrink?: number; - template?: ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any) | template; + template?: any | ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any); text?: string; visible?: boolean; render?: (...params: any) => React.ReactNode; diff --git a/packages/devextreme-react/src/bullet.ts b/packages/devextreme-react/src/bullet.ts index 03464a7c85d7..41b6998b009d 100644 --- a/packages/devextreme-react/src/bullet.ts +++ b/packages/devextreme-react/src/bullet.ts @@ -11,8 +11,7 @@ import NestedOption from "./core/nested-option"; import type { DisposingEvent, DrawnEvent, ExportedEvent, ExportingEvent, FileSavingEvent, IncidentOccurredEvent, InitializedEvent, TooltipHiddenEvent, TooltipShownEvent } from "devextreme/viz/bullet"; import type { DashStyle, Font as ChartsFont } from "devextreme/common/charts"; import type { Format as CommonFormat } from "devextreme/common"; -import type { Format as LocalizationFormat } from "devextreme/localization"; -import type { template } from "devextreme/core/templates/template"; +import type { Format as LocalizationFormat } from "devextreme/common/core/localization"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; @@ -213,7 +212,7 @@ type ITooltipProps = React.PropsWithChildren<{ }; color?: string; container?: any | string; - contentTemplate?: ((pointsInfo: any, element: any) => string | any) | template; + contentTemplate?: any | ((pointsInfo: any, element: any) => string | any); cornerRadius?: number; customizeTooltip?: ((pointsInfo: any) => Record); enabled?: boolean; diff --git a/packages/devextreme-react/src/button-group.ts b/packages/devextreme-react/src/button-group.ts index 7b793ba37864..93e5324b6053 100644 --- a/packages/devextreme-react/src/button-group.ts +++ b/packages/devextreme-react/src/button-group.ts @@ -10,7 +10,6 @@ import NestedOption from "./core/nested-option"; import type { ContentReadyEvent, DisposingEvent, InitializedEvent, ItemClickEvent } from "devextreme/ui/button_group"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; -import type { template } from "devextreme/core/templates/template"; import type { ButtonType } from "devextreme/common"; type ReplaceFieldTypes = { @@ -94,7 +93,7 @@ type IItemProps = React.PropsWithChildren<{ elementAttr?: Record; hint?: string; icon?: string; - template?: ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any) | template; + template?: any | ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any); text?: string; type?: ButtonType; visible?: boolean; diff --git a/packages/devextreme-react/src/chart.ts b/packages/devextreme-react/src/chart.ts index f9103c8cfed6..0d6cc60afc0a 100644 --- a/packages/devextreme-react/src/chart.ts +++ b/packages/devextreme-react/src/chart.ts @@ -10,9 +10,8 @@ import NestedOption from "./core/nested-option"; import type { ArgumentAxisClickEvent, DisposingEvent, DoneEvent, DrawnEvent, ExportedEvent, ExportingEvent, FileSavingEvent, IncidentOccurredEvent, InitializedEvent, LegendClickEvent, PointClickEvent, SeriesClickEvent, TooltipHiddenEvent, TooltipShownEvent, ZoomEndEvent, ZoomStartEvent, chartPointAggregationInfoObject, chartSeriesObject, ChartSeriesAggregationMethod, dxChartAnnotationConfig, AggregatedPointsPosition, ChartLabelDisplayMode, FinancialChartReductionLevel, chartPointObject, ChartTooltipLocation, ChartZoomAndPanMode, EventKeyModifier } from "devextreme/viz/chart"; import type { AnimationEaseMode, DashStyle, Font as ChartsFont, TextOverflow, AnnotationType, WordWrap, TimeInterval, ChartsDataType, ScaleBreak, ScaleBreakLineStyle, RelativePosition, DiscreteAxisDivisionMode, ArgumentAxisHoverMode, ChartsAxisLabelOverlap, AxisScaleType, VisualRangeUpdateMode, ChartsColor, SeriesHoverMode, HatchDirection, PointInteractionMode, PointSymbol, SeriesSelectionMode, SeriesType, ValueErrorBarDisplayMode, ValueErrorBarType, LegendItem, LegendHoverMode } from "devextreme/common/charts"; -import type { template } from "devextreme/core/templates/template"; import type { HorizontalAlignment, VerticalAlignment, Format as CommonFormat, Position, VerticalEdge, ExportFormat, Orientation } from "devextreme/common"; -import type { Format as LocalizationFormat } from "devextreme/localization"; +import type { Format as LocalizationFormat } from "devextreme/common/core/localization"; import type { ChartSeries } from "devextreme/viz/common"; import type * as CommonChartTypes from "devextreme/common/charts"; @@ -247,11 +246,11 @@ type IAnnotationProps = React.PropsWithChildren<{ offsetY?: number; opacity?: number; }; - template?: ((annotation: dxChartAnnotationConfig | any, element: any) => string | any) | template; + template?: any | ((annotation: dxChartAnnotationConfig | any, element: any) => string | any); text?: string; textOverflow?: TextOverflow; tooltipEnabled?: boolean; - tooltipTemplate?: ((annotation: dxChartAnnotationConfig | any, element: any) => string | any) | template; + tooltipTemplate?: any | ((annotation: dxChartAnnotationConfig | any, element: any) => string | any); type?: AnnotationType; value?: Date | number | string; width?: number; @@ -426,7 +425,7 @@ type IArgumentAxisProps = React.PropsWithChildren<{ position?: Position | RelativePosition; rotationAngle?: number; staggeringSpacing?: number; - template?: ((data: { value: Date | number | string, valueText: string }, element: any) => string | any) | template; + template?: any | ((data: { value: Date | number | string, valueText: string }, element: any) => string | any); textOverflow?: TextOverflow; visible?: boolean; wordWrap?: WordWrap; @@ -672,7 +671,7 @@ type IAxisLabelProps = React.PropsWithChildren<{ position?: Position | RelativePosition; rotationAngle?: number; staggeringSpacing?: number; - template?: ((data: { value: Date | number | string, valueText: string }, element: any) => string | any) | template; + template?: any | ((data: { value: Date | number | string, valueText: string }, element: any) => string | any); textOverflow?: TextOverflow; visible?: boolean; wordWrap?: WordWrap; @@ -950,11 +949,11 @@ type ICommonAnnotationSettingsProps = React.PropsWithChildren<{ offsetY?: number; opacity?: number; }; - template?: ((annotation: dxChartAnnotationConfig | any, element: any) => string | any) | template; + template?: any | ((annotation: dxChartAnnotationConfig | any, element: any) => string | any); text?: string; textOverflow?: TextOverflow; tooltipEnabled?: boolean; - tooltipTemplate?: ((annotation: dxChartAnnotationConfig | any, element: any) => string | any) | template; + tooltipTemplate?: any | ((annotation: dxChartAnnotationConfig | any, element: any) => string | any); type?: AnnotationType; value?: Date | number | string; width?: number; @@ -1029,7 +1028,7 @@ type ICommonAxisSettingsProps = React.PropsWithChildren<{ position?: Position | RelativePosition; rotationAngle?: number; staggeringSpacing?: number; - template?: ((data: { value: Date | number | string, valueText: string }, element: any) => string | any) | template; + template?: any | ((data: { value: Date | number | string, valueText: string }, element: any) => string | any); textOverflow?: TextOverflow; visible?: boolean; wordWrap?: WordWrap; @@ -1163,7 +1162,7 @@ type ICommonAxisSettingsLabelProps = React.PropsWithChildren<{ position?: Position | RelativePosition; rotationAngle?: number; staggeringSpacing?: number; - template?: ((data: { value: Date | number | string, valueText: string }, element: any) => string | any) | template; + template?: any | ((data: { value: Date | number | string, valueText: string }, element: any) => string | any); textOverflow?: TextOverflow; visible?: boolean; wordWrap?: WordWrap; @@ -2107,7 +2106,7 @@ type ILabelProps = React.PropsWithChildren<{ overlappingBehavior?: ChartsAxisLabelOverlap; rotationAngle?: number; staggeringSpacing?: number; - template?: ((data: { value: Date | number | string, valueText: string }, element: any) => string | any) | template; + template?: any | ((data: { value: Date | number | string, valueText: string }, element: any) => string | any); textOverflow?: TextOverflow; wordWrap?: WordWrap; argumentFormat?: LocalizationFormat; @@ -2177,7 +2176,7 @@ type ILegendProps = React.PropsWithChildren<{ top?: number; }; markerSize?: number; - markerTemplate?: ((legendItem: LegendItem, element: any) => string | any) | template; + markerTemplate?: any | ((legendItem: LegendItem, element: any) => string | any); orientation?: Orientation; paddingLeftRight?: number; paddingTopBottom?: number; @@ -3290,7 +3289,7 @@ type ITooltipProps = React.PropsWithChildren<{ }; color?: string; container?: any | string; - contentTemplate?: ((pointInfo: any, element: any) => string | any) | template; + contentTemplate?: any | ((pointInfo: any, element: any) => string | any); cornerRadius?: number; customizeTooltip?: ((pointInfo: any) => Record); enabled?: boolean; @@ -3452,7 +3451,7 @@ type IValueAxisProps = React.PropsWithChildren<{ position?: Position | RelativePosition; rotationAngle?: number; staggeringSpacing?: number; - template?: ((data: { value: Date | number | string, valueText: string }, element: any) => string | any) | template; + template?: any | ((data: { value: Date | number | string, valueText: string }, element: any) => string | any); textOverflow?: TextOverflow; visible?: boolean; wordWrap?: WordWrap; diff --git a/packages/devextreme-react/src/circular-gauge.ts b/packages/devextreme-react/src/circular-gauge.ts index f0df6fa60307..db80c87c9e6c 100644 --- a/packages/devextreme-react/src/circular-gauge.ts +++ b/packages/devextreme-react/src/circular-gauge.ts @@ -11,8 +11,7 @@ import NestedOption from "./core/nested-option"; import type { DisposingEvent, DrawnEvent, ExportedEvent, ExportingEvent, FileSavingEvent, IncidentOccurredEvent, InitializedEvent, TooltipHiddenEvent, TooltipShownEvent, CircularGaugeLabelOverlap, CircularGaugeElementOrientation } from "devextreme/viz/circular_gauge"; import type { AnimationEaseMode, DashStyle, Font as ChartsFont, LabelOverlap, ChartsColor, Palette, PaletteExtensionMode, TextOverflow, WordWrap } from "devextreme/common/charts"; import type { ExportFormat, Format as CommonFormat, HorizontalEdge, VerticalEdge, HorizontalAlignment } from "devextreme/common"; -import type { Format as LocalizationFormat } from "devextreme/localization"; -import type { template } from "devextreme/core/templates/template"; +import type { Format as LocalizationFormat } from "devextreme/common/core/localization"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; @@ -709,7 +708,7 @@ type ITooltipProps = React.PropsWithChildren<{ }; color?: string; container?: any | string; - contentTemplate?: ((scaleValue: { value: number, valueText: string }, element: any) => string | any) | template; + contentTemplate?: any | ((scaleValue: { value: number, valueText: string }, element: any) => string | any); cornerRadius?: number; customizeTooltip?: ((scaleValue: { value: number, valueText: string }) => Record); enabled?: boolean; diff --git a/packages/devextreme-react/src/color-box.ts b/packages/devextreme-react/src/color-box.ts index 6d0eed6ac473..c1a2e53c36e9 100644 --- a/packages/devextreme-react/src/color-box.ts +++ b/packages/devextreme-react/src/color-box.ts @@ -10,11 +10,10 @@ import NestedOption from "./core/nested-option"; import type { ChangeEvent, ClosedEvent, CopyEvent, CutEvent, DisposingEvent, EnterKeyEvent, FocusInEvent, FocusOutEvent, InitializedEvent, InputEvent, KeyDownEvent, KeyUpEvent, OpenedEvent, PasteEvent, ValueChangedEvent } from "devextreme/ui/color_box"; import type { DisposingEvent as ButtonDisposingEvent, InitializedEvent as ButtonInitializedEvent, dxButtonOptions, ClickEvent, ContentReadyEvent, OptionChangedEvent } from "devextreme/ui/button"; -import type { AnimationConfig, AnimationState, AnimationType } from "devextreme/animation/fx"; +import type { AnimationConfig, CollisionResolution, PositionConfig, AnimationState, AnimationType, CollisionResolutionCombination } from "devextreme/common/core/animation"; import type { HorizontalAlignment, VerticalAlignment, TextEditorButtonLocation, PositionAlignment, Direction, ButtonStyle, ButtonType, ToolbarItemLocation, ToolbarItemComponent } from "devextreme/common"; -import type { CollisionResolution, PositionConfig, CollisionResolutionCombination } from "devextreme/animation/position"; -import type { event, EventInfo } from "devextreme/events/index"; -import type { template } from "devextreme/core/templates/template"; +import type { event } from "devextreme/common/core/events/index"; +import type { EventInfo } from "devextreme/common/core/events"; import type { Component } from "devextreme/core/component"; import type { dxPopupToolbarItem, ToolbarLocation } from "devextreme/ui/popup"; import type { LocateInMenuMode, ShowTextMode } from "devextreme/ui/toolbar"; @@ -232,7 +231,7 @@ type IDropDownOptionsProps = React.PropsWithChildren<{ bindingOptions?: Record; closeOnOutsideClick?: boolean | ((event: event) => boolean); container?: any | string; - contentTemplate?: ((contentElement: any) => string | any) | template; + contentTemplate?: any | ((contentElement: any) => string | any); deferRendering?: boolean; disabled?: boolean; dragAndResizeArea?: any | string; @@ -272,7 +271,7 @@ type IDropDownOptionsProps = React.PropsWithChildren<{ showTitle?: boolean; tabIndex?: number; title?: string; - titleTemplate?: ((titleElement: any) => string | any) | template; + titleTemplate?: any | ((titleElement: any) => string | any); toolbarItems?: Array; visible?: boolean; width?: (() => number | string) | number | string; @@ -438,7 +437,7 @@ type IOptionsProps = React.PropsWithChildren<{ rtlEnabled?: boolean; stylingMode?: ButtonStyle; tabIndex?: number; - template?: ((buttonData: { icon: string, text: string }, contentElement: any) => string | any) | template; + template?: any | ((buttonData: { icon: string, text: string }, contentElement: any) => string | any); text?: string; type?: ButtonType | string; useSubmitBehavior?: boolean; @@ -563,10 +562,10 @@ type IToolbarItemProps = React.PropsWithChildren<{ html?: string; locateInMenu?: LocateInMenuMode; location?: ToolbarItemLocation; - menuItemTemplate?: (() => string | any) | template; + menuItemTemplate?: any | (() => string | any); options?: any; showText?: ShowTextMode; - template?: ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any) | template; + template?: any | ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any); text?: string; toolbar?: ToolbarLocation; visible?: boolean; diff --git a/packages/devextreme-react/src/common/core/animation.ts b/packages/devextreme-react/src/common/core/animation.ts new file mode 100644 index 000000000000..65dbc2236713 --- /dev/null +++ b/packages/devextreme-react/src/common/core/animation.ts @@ -0,0 +1,12 @@ +export { + AnimationConfig, + animationPresets, + AnimationState, + cancelAnimationFrame, + CollisionResolution, + CollisionResolutionCombination, + fx, + PositionConfig, + requestAnimationFrame, + TransitionExecutor, +} from "devextreme/common/core/animation"; diff --git a/packages/devextreme-react/src/common/core/environment.ts b/packages/devextreme-react/src/common/core/environment.ts new file mode 100644 index 000000000000..4c093b9aef9f --- /dev/null +++ b/packages/devextreme-react/src/common/core/environment.ts @@ -0,0 +1,9 @@ +export { + Device, + devices, + DevicesObject, + dxSchedulerTimeZone, + getTimeZones, + hideTopOverlay, + initMobileViewport, +} from "devextreme/common/core/environment"; diff --git a/packages/devextreme-react/src/common/core/events.ts b/packages/devextreme-react/src/common/core/events.ts new file mode 100644 index 000000000000..838422a19b13 --- /dev/null +++ b/packages/devextreme-react/src/common/core/events.ts @@ -0,0 +1,16 @@ +export { + AsyncCancelable, + Cancelable, + ChangedOptionInfo, + DxEvent, + EventInfo, + EventObject, + InitializedEventInfo, + ItemInfo, + NativeEventInfo, + off, + on, + one, + trigger, + triggerHandler, +} from "devextreme/common/core/events"; diff --git a/packages/devextreme-react/src/common/core/events/index.ts b/packages/devextreme-react/src/common/core/events/index.ts new file mode 100644 index 000000000000..902158b1a7fb --- /dev/null +++ b/packages/devextreme-react/src/common/core/events/index.ts @@ -0,0 +1,4 @@ +export { + event, + eventsHandler, +} from "devextreme/common/core/events/index"; diff --git a/packages/devextreme-react/src/common/core/localization.ts b/packages/devextreme-react/src/common/core/localization.ts new file mode 100644 index 000000000000..8dd8ec2ad04b --- /dev/null +++ b/packages/devextreme-react/src/common/core/localization.ts @@ -0,0 +1,10 @@ +export { + Format, + formatDate, + formatMessage, + formatNumber, + loadMessages, + locale, + parseDate, + parseNumber, +} from "devextreme/common/core/localization"; diff --git a/packages/devextreme-react/src/common/data.ts b/packages/devextreme-react/src/common/data.ts new file mode 100644 index 000000000000..3c5560b87f84 --- /dev/null +++ b/packages/devextreme-react/src/common/data.ts @@ -0,0 +1,47 @@ +export { + applyChanges, + ArrayStore, + ArrayStoreOptions, + base64_encode, + compileGetter, + compileSetter, + CustomStore, + CustomStoreOptions, + DataHelperMixin, + DataSource, + DataSourceLike, + DataSourceOptions, + EdmLiteral, + EndpointSelector, + errorHandler, + FilterDescriptor, + GroupDescriptor, + GroupingInterval, + GroupItem, + isGroupItemsArray, + isItemsArray, + isLoadResultObject, + keyConverters, + LangParams, + LoadOptions, + LoadResult, + LoadResultObject, + LocalStore, + LocalStoreOptions, + ODataContext, + ODataContextOptions, + ODataStore, + ODataStoreOptions, + query, + Query, + ResolvedData, + SearchOperation, + SelectDescriptor, + setErrorHandler, + SortDescriptor, + Store, + StoreBase, + StoreOptions, + StoreOptionsBase, + SummaryDescriptor, +} from "devextreme/common/data"; diff --git a/packages/devextreme-react/src/common/export.ts b/packages/devextreme-react/src/common/export.ts new file mode 100644 index 000000000000..7c4d2823d9cc --- /dev/null +++ b/packages/devextreme-react/src/common/export.ts @@ -0,0 +1,3 @@ +export { + ExportLoadPanel, +} from "devextreme/common/export"; diff --git a/packages/devextreme-react/src/common/export/excel.ts b/packages/devextreme-react/src/common/export/excel.ts new file mode 100644 index 000000000000..0811477e2db8 --- /dev/null +++ b/packages/devextreme-react/src/common/export/excel.ts @@ -0,0 +1,11 @@ +export { + CellAddress, + CellRange, + DataGridCell, + ExcelExportBaseProps, + ExcelExportDataGridProps, + ExcelExportPivotGridProps, + exportDataGrid, + exportPivotGrid, + PivotGridCell, +} from "devextreme/common/export/excel"; diff --git a/packages/devextreme-react/src/common/export/pdf.ts b/packages/devextreme-react/src/common/export/pdf.ts new file mode 100644 index 000000000000..dc2228cc16c7 --- /dev/null +++ b/packages/devextreme-react/src/common/export/pdf.ts @@ -0,0 +1,9 @@ +export { + Cell, + DataGridCell, + exportDataGrid, + exportGantt, + PdfExportDataGridProps, + PdfExportGanttFont, + PdfExportGanttProps, +} from "devextreme/common/export/pdf"; diff --git a/packages/devextreme-react/src/common/file_management.ts b/packages/devextreme-react/src/common/file_management.ts new file mode 100644 index 000000000000..af0107843475 --- /dev/null +++ b/packages/devextreme-react/src/common/file_management.ts @@ -0,0 +1,13 @@ +export { + CustomFileSystemProvider, + CustomFileSystemProviderOptions, + FileSystemError, + FileSystemItem, + FileSystemProviderBase, + FileSystemProviderBaseOptions, + ObjectFileSystemProvider, + ObjectFileSystemProviderOptions, + RemoteFileSystemProvider, + RemoteFileSystemProviderOptions, + UploadInfo, +} from "devextreme/common/file_management"; diff --git a/packages/devextreme-react/src/common/index.ts b/packages/devextreme-react/src/common/index.ts index 4cddfd8869c9..4393213fec9a 100644 --- a/packages/devextreme-react/src/common/index.ts +++ b/packages/devextreme-react/src/common/index.ts @@ -5,21 +5,26 @@ export { ButtonType, CompareRule, ComparisonOperator, + config, CustomRule, DataStructure, DataType, + DefaultOptionsRule, Direction, DisplayMode, DragDirection, Draggable, DragHighlight, + DxPromise, EditorStyle, EmailRule, ExportFormat, FieldChooserLayout, FirstDayOfWeek, + FloatingActionButtonDirection, Format, GlobalConfig, + Guid, HorizontalAlignment, HorizontalEdge, LabelMode, @@ -41,6 +46,7 @@ export { ScrollMode, SearchMode, SelectAllMode, + setTemplateEngine, SimplifiedSearchMode, SingleMultipleAllOrNone, SingleMultipleOrNone, @@ -54,6 +60,7 @@ export { SubmenuShowMode, TabsIconPosition, TabsStyle, + Template, TextBoxPredefinedButton, TextEditorButton, TextEditorButtonLocation, diff --git a/packages/devextreme-react/src/context-menu.ts b/packages/devextreme-react/src/context-menu.ts index a90ad22c7500..84f1a14359db 100644 --- a/packages/devextreme-react/src/context-menu.ts +++ b/packages/devextreme-react/src/context-menu.ts @@ -10,11 +10,9 @@ import { Component as BaseComponent, IHtmlOptions, ComponentRef, NestedComponent import NestedOption from "./core/nested-option"; import type { dxContextMenuItem, ContentReadyEvent, DisposingEvent, HiddenEvent, HidingEvent, InitializedEvent, ItemClickEvent, ItemContextMenuEvent, ItemRenderedEvent, PositioningEvent, ShowingEvent, ShownEvent } from "devextreme/ui/context_menu"; -import type { AnimationConfig, AnimationState, AnimationType } from "devextreme/animation/fx"; +import type { AnimationConfig, CollisionResolution, PositionConfig, AnimationState, AnimationType, CollisionResolutionCombination } from "devextreme/common/core/animation"; import type { HorizontalAlignment, VerticalAlignment, Direction, PositionAlignment, SubmenuShowMode } from "devextreme/common"; -import type { CollisionResolution, PositionConfig, CollisionResolutionCombination } from "devextreme/animation/position"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; -import type { template } from "devextreme/core/templates/template"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; @@ -270,7 +268,7 @@ type IItemProps = React.PropsWithChildren<{ items?: Array; selectable?: boolean; selected?: boolean; - template?: ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any) | template; + template?: any | ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any); text?: string; visible?: boolean; render?: (...params: any) => React.ReactNode; diff --git a/packages/devextreme-react/src/data-grid.ts b/packages/devextreme-react/src/data-grid.ts index 6401bafd401b..76a8a27ba664 100644 --- a/packages/devextreme-react/src/data-grid.ts +++ b/packages/devextreme-react/src/data-grid.ts @@ -14,14 +14,13 @@ import type { DataChange, DataChangeType, FilterOperation, FilterType, FixedPosi import type { Mode, ValidationRuleType, HorizontalAlignment, VerticalAlignment, DataType, Format as CommonFormat, SearchMode, SortOrder, ComparisonOperator, SingleMultipleOrNone, SelectAllMode, PositionAlignment, Direction, ToolbarItemLocation, ToolbarItemComponent, DisplayMode, DragDirection, DragHighlight, ScrollbarMode } from "devextreme/common"; import type { ContentReadyEvent as FilterBuilderContentReadyEvent, DisposingEvent as FilterBuilderDisposingEvent, EditorPreparedEvent as FilterBuilderEditorPreparedEvent, EditorPreparingEvent as FilterBuilderEditorPreparingEvent, InitializedEvent as FilterBuilderInitializedEvent, dxFilterBuilderField, FilterBuilderOperation, dxFilterBuilderCustomOperation, GroupOperation, OptionChangedEvent, ValueChangedEvent } from "devextreme/ui/filter_builder"; import type { ContentReadyEvent as FormContentReadyEvent, DisposingEvent as FormDisposingEvent, InitializedEvent as FormInitializedEvent, dxFormSimpleItem, dxFormOptions, OptionChangedEvent as FormOptionChangedEvent, dxFormGroupItem, dxFormTabbedItem, dxFormEmptyItem, dxFormButtonItem, LabelLocation, FormLabelMode, EditorEnterKeyEvent, FieldDataChangedEvent, FormItemComponent, FormItemType } from "devextreme/ui/form"; -import type { AnimationConfig, AnimationState, AnimationType } from "devextreme/animation/fx"; -import type { template } from "devextreme/core/templates/template"; -import type { CollisionResolution, PositionConfig, CollisionResolutionCombination } from "devextreme/animation/position"; -import type { Format as LocalizationFormat } from "devextreme/localization"; +import type { AnimationConfig, CollisionResolution, PositionConfig, AnimationState, AnimationType, CollisionResolutionCombination } from "devextreme/common/core/animation"; +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"; +import type { Store } from "devextreme/common/data"; import type { dxPopupOptions, dxPopupToolbarItem, ToolbarLocation } from "devextreme/ui/popup"; -import type { event, EventInfo } from "devextreme/events/index"; +import type { event } from "devextreme/common/core/events/index"; +import type { EventInfo } from "devextreme/common/core/events"; import type { Component } from "devextreme/core/component"; import type { LocateInMenuMode, ShowTextMode } from "devextreme/ui/toolbar"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; @@ -305,7 +304,7 @@ type IButtonProps = React.PropsWithChildren<{ icon?: string; name?: DataGridPredefinedColumnButton | string; onClick?: ((e: ColumnButtonClickEvent) => void); - template?: ((cellElement: any, cellInfo: { column: dxDataGridColumn, columnIndex: number, component: dxDataGrid, data: Record, key: any, row: dxDataGridRowObject, rowIndex: number, rowType: string }) => string | any) | template; + template?: any | ((cellElement: any, cellInfo: { column: dxDataGridColumn, columnIndex: number, component: dxDataGrid, data: Record, key: any, row: dxDataGridRowObject, rowIndex: number, rowType: string }) => string | any); text?: string; visible?: boolean | ((options: { column: dxDataGridColumn, component: dxDataGrid, row: dxDataGridRowObject }) => boolean); render?: (...params: any) => React.ReactNode; @@ -416,13 +415,13 @@ type IColumnProps = React.PropsWithChildren<{ calculateGroupValue?: ((rowData: any) => any) | string; calculateSortValue?: ((rowData: any) => any) | string; caption?: string; - cellTemplate?: ((cellElement: any, cellInfo: { column: dxDataGridColumn, columnIndex: number, component: dxDataGrid, data: Record, displayValue: any, oldValue: any, row: dxDataGridRowObject, rowIndex: number, rowType: string, text: string, value: any, watch: (() => void) }) => any) | template; + cellTemplate?: any | ((cellElement: any, cellInfo: { column: dxDataGridColumn, columnIndex: number, component: dxDataGrid, data: Record, displayValue: any, oldValue: any, row: dxDataGridRowObject, rowIndex: number, rowType: string, text: string, value: any, watch: (() => void) }) => any); columns?: Array; cssClass?: string; customizeText?: ((cellInfo: { groupInterval: string | number, target: string, value: any, valueText: string }) => string); dataField?: string; dataType?: DataType; - editCellTemplate?: ((cellElement: any, cellInfo: { column: dxDataGridColumn, columnIndex: number, component: dxDataGrid, data: Record, displayValue: any, row: dxDataGridRowObject, rowIndex: number, rowType: string, setValue(newValue, newText): any, text: string, value: any, watch: (() => void) }) => any) | template; + editCellTemplate?: any | ((cellElement: any, cellInfo: { column: dxDataGridColumn, columnIndex: number, component: dxDataGrid, data: Record, displayValue: any, row: dxDataGridRowObject, rowIndex: number, rowType: string, setValue(newValue, newText): any, text: string, value: any, watch: (() => void) }) => any); editorOptions?: any; encodeHtml?: boolean; falseText?: string; @@ -434,9 +433,9 @@ type IColumnProps = React.PropsWithChildren<{ fixedPosition?: FixedPosition; format?: LocalizationFormat; formItem?: dxFormSimpleItem; - groupCellTemplate?: ((cellElement: any, cellInfo: { column: dxDataGridColumn, columnIndex: number, component: dxDataGrid, data: Record, displayValue: any, groupContinuedMessage: string, groupContinuesMessage: string, row: dxDataGridRowObject, rowIndex: number, summaryItems: Array, text: string, value: any }) => any) | template; + groupCellTemplate?: any | ((cellElement: any, cellInfo: { column: dxDataGridColumn, columnIndex: number, component: dxDataGrid, data: Record, displayValue: any, groupContinuedMessage: string, groupContinuesMessage: string, row: dxDataGridRowObject, rowIndex: number, summaryItems: Array, text: string, value: any }) => any); groupIndex?: number; - headerCellTemplate?: ((columnHeader: any, headerInfo: { column: dxDataGridColumn, columnIndex: number, component: dxDataGrid }) => any) | template; + headerCellTemplate?: any | ((columnHeader: any, headerInfo: { column: dxDataGridColumn, columnIndex: number, component: dxDataGrid }) => any); headerFilter?: Record | { allowSearch?: boolean; allowSelectAll?: boolean; @@ -821,7 +820,7 @@ type ICustomOperationProps = React.PropsWithChildren<{ caption?: string; customizeText?: ((fieldInfo: { field: dxFilterBuilderField, value: string | number | Date, valueText: string }) => string); dataTypes?: Array; - editorTemplate?: ((conditionInfo: { field: dxFilterBuilderField, setValue: (() => void), value: string | number | Date }, container: any) => string | any) | template; + editorTemplate?: any | ((conditionInfo: { field: dxFilterBuilderField, setValue: (() => void), value: string | number | Date }, container: any) => string | any); hasValue?: boolean; icon?: string; name?: string; @@ -1147,7 +1146,7 @@ type IFieldProps = React.PropsWithChildren<{ dataField?: string; dataType?: DataType; editorOptions?: any; - editorTemplate?: ((conditionInfo: { field: dxFilterBuilderField, filterOperation: string, setValue: (() => void), value: string | number | Date }, container: any) => string | any) | template; + editorTemplate?: any | ((conditionInfo: { field: dxFilterBuilderField, filterOperation: string, setValue: (() => void), value: string | number | Date }, container: any) => string | any); falseText?: string; filterOperations?: Array; format?: LocalizationFormat; @@ -1293,7 +1292,7 @@ type IFilterBuilderPopupProps = React.PropsWithChildren<{ bindingOptions?: Record; closeOnOutsideClick?: boolean | ((event: event) => boolean); container?: any | string; - contentTemplate?: ((contentElement: any) => string | any) | template; + contentTemplate?: any | ((contentElement: any) => string | any); deferRendering?: boolean; disabled?: boolean; dragAndResizeArea?: any | string; @@ -1333,7 +1332,7 @@ type IFilterBuilderPopupProps = React.PropsWithChildren<{ showTitle?: boolean; tabIndex?: number; title?: string; - titleTemplate?: ((titleElement: any) => string | any) | template; + titleTemplate?: any | ((titleElement: any) => string | any); toolbarItems?: Array; visible?: boolean; width?: (() => number | string) | number | string; @@ -1614,12 +1613,12 @@ type IFormItemProps = React.PropsWithChildren<{ alignment?: HorizontalAlignment; location?: LabelLocation; showColon?: boolean; - template?: ((itemData: { component: dxForm, dataField: string, editorOptions: any, editorType: string, name: string, text: string }, itemElement: any) => string | any) | template; + template?: any | ((itemData: { component: dxForm, dataField: string, editorOptions: any, editorType: string, name: string, text: string }, itemElement: any) => string | any); text?: string; visible?: boolean; }; name?: string; - template?: ((data: { component: dxForm, dataField: string, editorOptions: Record, editorType: string, name: string }, itemElement: any) => string | any) | template; + template?: any | ((data: { component: dxForm, dataField: string, editorOptions: Record, editorType: string, name: string }, itemElement: any) => string | any); validationRules?: Array; visible?: boolean; visibleIndex?: number; @@ -1907,11 +1906,11 @@ type IItemProps = React.PropsWithChildren<{ html?: string; locateInMenu?: LocateInMenuMode; location?: ToolbarItemLocation; - menuItemTemplate?: (() => string | any) | template; + menuItemTemplate?: any | (() => string | any); name?: DataGridPredefinedToolbarItem | string; options?: any; showText?: ShowTextMode; - template?: ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any) | template; + template?: any | ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any); text?: string; visible?: boolean; widget?: ToolbarItemComponent; @@ -1970,7 +1969,7 @@ type ILabelProps = React.PropsWithChildren<{ alignment?: HorizontalAlignment; location?: LabelLocation; showColon?: boolean; - template?: ((itemData: { component: dxForm, dataField: string, editorOptions: any, editorType: string, name: string, text: string }, itemElement: any) => string | any) | template; + template?: any | ((itemData: { component: dxForm, dataField: string, editorOptions: any, editorType: string, name: string, text: string }, itemElement: any) => string | any); text?: string; visible?: boolean; render?: (...params: any) => React.ReactNode; @@ -2048,7 +2047,7 @@ const Lookup = Object.assign(_comp type IMasterDetailProps = React.PropsWithChildren<{ autoExpandAll?: boolean; enabled?: boolean; - template?: ((detailElement: any, detailInfo: { data: Record, key: any, watch: (() => void) }) => any) | template; + template?: any | ((detailElement: any, detailInfo: { data: Record, key: any, watch: (() => void) }) => any); render?: (...params: any) => React.ReactNode; component?: React.ComponentType; }> @@ -2251,7 +2250,7 @@ type IPopupProps = React.PropsWithChildren<{ bindingOptions?: Record; closeOnOutsideClick?: boolean | ((event: event) => boolean); container?: any | string; - contentTemplate?: ((contentElement: any) => string | any) | template; + contentTemplate?: any | ((contentElement: any) => string | any); deferRendering?: boolean; disabled?: boolean; dragAndResizeArea?: any | string; @@ -2291,7 +2290,7 @@ type IPopupProps = React.PropsWithChildren<{ showTitle?: boolean; tabIndex?: number; title?: string; - titleTemplate?: ((titleElement: any) => string | any) | template; + titleTemplate?: any | ((titleElement: any) => string | any); toolbarItems?: Array; visible?: boolean; width?: (() => number | string) | number | string; @@ -2473,7 +2472,7 @@ type IRowDraggingProps = React.PropsWithChildren<{ }; data?: any; dragDirection?: DragDirection; - dragTemplate?: ((dragInfo: { itemData: any, itemElement: any }, containerElement: any) => string | any) | template; + dragTemplate?: any | ((dragInfo: { itemData: any, itemElement: any }, containerElement: any) => string | any); dropFeedbackMode?: DragHighlight; filter?: string; group?: string; @@ -2940,10 +2939,10 @@ type IToolbarItemProps = React.PropsWithChildren<{ html?: string; locateInMenu?: LocateInMenuMode; location?: ToolbarItemLocation; - menuItemTemplate?: (() => string | any) | template; + menuItemTemplate?: any | (() => string | any); options?: any; showText?: ShowTextMode; - template?: ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any) | template; + template?: any | ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any); text?: string; toolbar?: ToolbarLocation; visible?: boolean; diff --git a/packages/devextreme-react/src/date-box.ts b/packages/devextreme-react/src/date-box.ts index f214d63bfc38..e67caa185b59 100644 --- a/packages/devextreme-react/src/date-box.ts +++ b/packages/devextreme-react/src/date-box.ts @@ -11,11 +11,10 @@ import NestedOption from "./core/nested-option"; import type { ChangeEvent, ClosedEvent, ContentReadyEvent, CopyEvent, CutEvent, DisposingEvent, EnterKeyEvent, FocusInEvent, FocusOutEvent, InitializedEvent, InputEvent, KeyDownEvent, KeyUpEvent, OpenedEvent, PasteEvent, ValueChangedEvent } from "devextreme/ui/date_box"; import type { ContentReadyEvent as ButtonContentReadyEvent, DisposingEvent as ButtonDisposingEvent, InitializedEvent as ButtonInitializedEvent, dxButtonOptions, OptionChangedEvent as ButtonOptionChangedEvent, ClickEvent } from "devextreme/ui/button"; import type { DisposingEvent as CalendarDisposingEvent, InitializedEvent as CalendarInitializedEvent, ValueChangedEvent as CalendarValueChangedEvent, DisabledDate, CalendarZoomLevel, OptionChangedEvent, CalendarSelectionMode, WeekNumberRule } from "devextreme/ui/calendar"; -import type { AnimationConfig, AnimationState, AnimationType } from "devextreme/animation/fx"; +import type { AnimationConfig, CollisionResolution, PositionConfig, AnimationState, AnimationType, CollisionResolutionCombination } from "devextreme/common/core/animation"; import type { HorizontalAlignment, VerticalAlignment, TextEditorButtonLocation, FirstDayOfWeek, ValidationMessageMode, Position as CommonPosition, ValidationStatus, Format, PositionAlignment, Direction, ButtonStyle, ButtonType, ToolbarItemLocation, ToolbarItemComponent } from "devextreme/common"; -import type { template } from "devextreme/core/templates/template"; -import type { CollisionResolution, PositionConfig, CollisionResolutionCombination } from "devextreme/animation/position"; -import type { event, EventInfo } from "devextreme/events/index"; +import type { event } from "devextreme/common/core/events/index"; +import type { EventInfo } from "devextreme/common/core/events"; import type { Component } from "devextreme/core/component"; import type { dxPopupToolbarItem, ToolbarLocation } from "devextreme/ui/popup"; import type { LocateInMenuMode, ShowTextMode } from "devextreme/ui/toolbar"; @@ -206,7 +205,7 @@ type ICalendarOptionsProps = React.PropsWithChildren<{ accessKey?: string; activeStateEnabled?: boolean; bindingOptions?: Record; - cellTemplate?: ((itemData: { date: Date, text: string, view: string }, itemIndex: number, itemElement: any) => string | any) | template; + cellTemplate?: any | ((itemData: { date: Date, text: string, view: string }, itemIndex: number, itemElement: any) => string | any); dateSerializationFormat?: string; disabled?: boolean; disabledDates?: Array | ((data: DisabledDate) => boolean); @@ -326,7 +325,7 @@ type IDropDownOptionsProps = React.PropsWithChildren<{ bindingOptions?: Record; closeOnOutsideClick?: boolean | ((event: event) => boolean); container?: any | string; - contentTemplate?: ((contentElement: any) => string | any) | template; + contentTemplate?: any | ((contentElement: any) => string | any); deferRendering?: boolean; disabled?: boolean; dragAndResizeArea?: any | string; @@ -366,7 +365,7 @@ type IDropDownOptionsProps = React.PropsWithChildren<{ showTitle?: boolean; tabIndex?: number; title?: string; - titleTemplate?: ((titleElement: any) => string | any) | template; + titleTemplate?: any | ((titleElement: any) => string | any); toolbarItems?: Array; visible?: boolean; width?: (() => number | string) | number | string; @@ -532,7 +531,7 @@ type IOptionsProps = React.PropsWithChildren<{ rtlEnabled?: boolean; stylingMode?: ButtonStyle; tabIndex?: number; - template?: ((buttonData: { icon: string, text: string }, contentElement: any) => string | any) | template; + template?: any | ((buttonData: { icon: string, text: string }, contentElement: any) => string | any); text?: string; type?: ButtonType | string; useSubmitBehavior?: boolean; @@ -657,10 +656,10 @@ type IToolbarItemProps = React.PropsWithChildren<{ html?: string; locateInMenu?: LocateInMenuMode; location?: ToolbarItemLocation; - menuItemTemplate?: (() => string | any) | template; + menuItemTemplate?: any | (() => string | any); options?: any; showText?: ShowTextMode; - template?: ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any) | template; + template?: any | ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any); text?: string; toolbar?: ToolbarLocation; visible?: boolean; diff --git a/packages/devextreme-react/src/date-range-box.ts b/packages/devextreme-react/src/date-range-box.ts index 7ffdb6ebe650..2e67d752a132 100644 --- a/packages/devextreme-react/src/date-range-box.ts +++ b/packages/devextreme-react/src/date-range-box.ts @@ -11,11 +11,10 @@ import NestedOption from "./core/nested-option"; import type { ChangeEvent, ClosedEvent, ContentReadyEvent, CopyEvent, CutEvent, DisposingEvent, EnterKeyEvent, FocusInEvent, FocusOutEvent, InitializedEvent, InputEvent, KeyDownEvent, KeyUpEvent, OpenedEvent, PasteEvent, ValueChangedEvent } from "devextreme/ui/date_range_box"; import type { ContentReadyEvent as ButtonContentReadyEvent, DisposingEvent as ButtonDisposingEvent, InitializedEvent as ButtonInitializedEvent, dxButtonOptions, OptionChangedEvent as ButtonOptionChangedEvent, ClickEvent } from "devextreme/ui/button"; import type { DisposingEvent as CalendarDisposingEvent, InitializedEvent as CalendarInitializedEvent, ValueChangedEvent as CalendarValueChangedEvent, DisabledDate, CalendarZoomLevel, OptionChangedEvent, CalendarSelectionMode, WeekNumberRule } from "devextreme/ui/calendar"; -import type { AnimationConfig, AnimationState, AnimationType } from "devextreme/animation/fx"; +import type { AnimationConfig, CollisionResolution, PositionConfig, AnimationState, AnimationType, CollisionResolutionCombination } from "devextreme/common/core/animation"; import type { HorizontalAlignment, VerticalAlignment, TextEditorButtonLocation, FirstDayOfWeek, ValidationMessageMode, Position as CommonPosition, ValidationStatus, Format, PositionAlignment, Direction, ButtonStyle, ButtonType, ToolbarItemLocation, ToolbarItemComponent } from "devextreme/common"; -import type { template } from "devextreme/core/templates/template"; -import type { CollisionResolution, PositionConfig, CollisionResolutionCombination } from "devextreme/animation/position"; -import type { event, EventInfo } from "devextreme/events/index"; +import type { event } from "devextreme/common/core/events/index"; +import type { EventInfo } from "devextreme/common/core/events"; import type { Component } from "devextreme/core/component"; import type { dxPopupToolbarItem, ToolbarLocation } from "devextreme/ui/popup"; import type { LocateInMenuMode, ShowTextMode } from "devextreme/ui/toolbar"; @@ -211,7 +210,7 @@ type ICalendarOptionsProps = React.PropsWithChildren<{ accessKey?: string; activeStateEnabled?: boolean; bindingOptions?: Record; - cellTemplate?: ((itemData: { date: Date, text: string, view: string }, itemIndex: number, itemElement: any) => string | any) | template; + cellTemplate?: any | ((itemData: { date: Date, text: string, view: string }, itemIndex: number, itemElement: any) => string | any); dateSerializationFormat?: string; disabled?: boolean; disabledDates?: Array | ((data: DisabledDate) => boolean); @@ -331,7 +330,7 @@ type IDropDownOptionsProps = React.PropsWithChildren<{ bindingOptions?: Record; closeOnOutsideClick?: boolean | ((event: event) => boolean); container?: any | string; - contentTemplate?: ((contentElement: any) => string | any) | template; + contentTemplate?: any | ((contentElement: any) => string | any); deferRendering?: boolean; disabled?: boolean; dragAndResizeArea?: any | string; @@ -371,7 +370,7 @@ type IDropDownOptionsProps = React.PropsWithChildren<{ showTitle?: boolean; tabIndex?: number; title?: string; - titleTemplate?: ((titleElement: any) => string | any) | template; + titleTemplate?: any | ((titleElement: any) => string | any); toolbarItems?: Array; visible?: boolean; width?: (() => number | string) | number | string; @@ -537,7 +536,7 @@ type IOptionsProps = React.PropsWithChildren<{ rtlEnabled?: boolean; stylingMode?: ButtonStyle; tabIndex?: number; - template?: ((buttonData: { icon: string, text: string }, contentElement: any) => string | any) | template; + template?: any | ((buttonData: { icon: string, text: string }, contentElement: any) => string | any); text?: string; type?: ButtonType | string; useSubmitBehavior?: boolean; @@ -662,10 +661,10 @@ type IToolbarItemProps = React.PropsWithChildren<{ html?: string; locateInMenu?: LocateInMenuMode; location?: ToolbarItemLocation; - menuItemTemplate?: (() => string | any) | template; + menuItemTemplate?: any | (() => string | any); options?: any; showText?: ShowTextMode; - template?: ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any) | template; + template?: any | ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any); text?: string; toolbar?: ToolbarLocation; visible?: boolean; diff --git a/packages/devextreme-react/src/defer-rendering.ts b/packages/devextreme-react/src/defer-rendering.ts index 238ad87299f8..22fe968a0ea8 100644 --- a/packages/devextreme-react/src/defer-rendering.ts +++ b/packages/devextreme-react/src/defer-rendering.ts @@ -9,9 +9,8 @@ import { Component as BaseComponent, IHtmlOptions, ComponentRef, NestedComponent import NestedOption from "./core/nested-option"; import type { ContentReadyEvent, DisposingEvent, InitializedEvent, RenderedEvent, ShownEvent } from "devextreme/ui/defer_rendering"; -import type { AnimationConfig, AnimationState, AnimationType } from "devextreme/animation/fx"; +import type { AnimationConfig, AnimationState, AnimationType, CollisionResolution, PositionConfig, CollisionResolutionCombination } from "devextreme/common/core/animation"; import type { Direction, HorizontalAlignment, VerticalAlignment, PositionAlignment } from "devextreme/common"; -import type { CollisionResolution, PositionConfig, CollisionResolutionCombination } from "devextreme/animation/position"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; diff --git a/packages/devextreme-react/src/diagram.ts b/packages/devextreme-react/src/diagram.ts index 34469e477cc9..e168a7845bf4 100644 --- a/packages/devextreme-react/src/diagram.ts +++ b/packages/devextreme-react/src/diagram.ts @@ -11,9 +11,8 @@ import NestedOption from "./core/nested-option"; import type { ContentReadyEvent, CustomCommandEvent, DisposingEvent, InitializedEvent, ItemClickEvent, ItemDblClickEvent, RequestEditOperationEvent, RequestLayoutUpdateEvent, DataLayoutType, Command as DiagramCommand, CustomCommand, ShapeCategory, ToolboxDisplayMode, ShapeType, dxDiagramShape, ConnectorLineEnd, ConnectorLineType, PanelVisibility } from "devextreme/ui/diagram"; import type { Orientation, ToolbarItemLocation } from "devextreme/common"; import type { dxSVGElement } from "devextreme/core/element"; -import type { template } from "devextreme/core/templates/template"; import type { DataSourceOptions } from "devextreme/data/data_source"; -import type { Store } from "devextreme/data/store"; +import type { Store } from "devextreme/common/data"; import type DataSource from "devextreme/data/data_source"; @@ -286,7 +285,7 @@ type ICustomShapeProps = React.PropsWithChildren<{ maxWidth?: number; minHeight?: number; minWidth?: number; - template?: ((container: dxSVGElement, data: { item: dxDiagramShape }) => void) | template; + template?: any | ((container: dxSVGElement, data: { item: dxDiagramShape }) => void); templateHeight?: number; templateLeft?: number; templateTop?: number; @@ -296,7 +295,7 @@ type ICustomShapeProps = React.PropsWithChildren<{ textTop?: number; textWidth?: number; title?: string; - toolboxTemplate?: ((container: dxSVGElement, data: { item: dxDiagramShape }) => void) | template; + toolboxTemplate?: any | ((container: dxSVGElement, data: { item: dxDiagramShape }) => void); toolboxWidthToHeightRatio?: number; type?: string; render?: (...params: any) => React.ReactNode; diff --git a/packages/devextreme-react/src/drop-down-box.ts b/packages/devextreme-react/src/drop-down-box.ts index 0ea08718c565..e96d7ec2170f 100644 --- a/packages/devextreme-react/src/drop-down-box.ts +++ b/packages/devextreme-react/src/drop-down-box.ts @@ -10,11 +10,10 @@ import NestedOption from "./core/nested-option"; import type { ChangeEvent, ClosedEvent, CopyEvent, CutEvent, DisposingEvent, EnterKeyEvent, FocusInEvent, FocusOutEvent, InitializedEvent, InputEvent, KeyDownEvent, KeyUpEvent, OpenedEvent, PasteEvent, ValueChangedEvent } from "devextreme/ui/drop_down_box"; import type { DisposingEvent as ButtonDisposingEvent, InitializedEvent as ButtonInitializedEvent, dxButtonOptions, ClickEvent, ContentReadyEvent, OptionChangedEvent } from "devextreme/ui/button"; -import type { AnimationConfig, AnimationState, AnimationType } from "devextreme/animation/fx"; +import type { AnimationConfig, CollisionResolution, PositionConfig, AnimationState, AnimationType, CollisionResolutionCombination } from "devextreme/common/core/animation"; import type { HorizontalAlignment, VerticalAlignment, TextEditorButtonLocation, PositionAlignment, Direction, ButtonStyle, ButtonType, ToolbarItemLocation, ToolbarItemComponent } from "devextreme/common"; -import type { CollisionResolution, PositionConfig, CollisionResolutionCombination } from "devextreme/animation/position"; -import type { event, EventInfo } from "devextreme/events/index"; -import type { template } from "devextreme/core/templates/template"; +import type { event } from "devextreme/common/core/events/index"; +import type { EventInfo } from "devextreme/common/core/events"; import type { Component } from "devextreme/core/component"; import type { dxPopupToolbarItem, ToolbarLocation } from "devextreme/ui/popup"; import type { LocateInMenuMode, ShowTextMode } from "devextreme/ui/toolbar"; @@ -236,7 +235,7 @@ type IDropDownOptionsProps = React.PropsWithChildren<{ bindingOptions?: Record; closeOnOutsideClick?: boolean | ((event: event) => boolean); container?: any | string; - contentTemplate?: ((contentElement: any) => string | any) | template; + contentTemplate?: any | ((contentElement: any) => string | any); deferRendering?: boolean; disabled?: boolean; dragAndResizeArea?: any | string; @@ -276,7 +275,7 @@ type IDropDownOptionsProps = React.PropsWithChildren<{ showTitle?: boolean; tabIndex?: number; title?: string; - titleTemplate?: ((titleElement: any) => string | any) | template; + titleTemplate?: any | ((titleElement: any) => string | any); toolbarItems?: Array; visible?: boolean; width?: (() => number | string) | number | string; @@ -442,7 +441,7 @@ type IOptionsProps = React.PropsWithChildren<{ rtlEnabled?: boolean; stylingMode?: ButtonStyle; tabIndex?: number; - template?: ((buttonData: { icon: string, text: string }, contentElement: any) => string | any) | template; + template?: any | ((buttonData: { icon: string, text: string }, contentElement: any) => string | any); text?: string; type?: ButtonType | string; useSubmitBehavior?: boolean; @@ -567,10 +566,10 @@ type IToolbarItemProps = React.PropsWithChildren<{ html?: string; locateInMenu?: LocateInMenuMode; location?: ToolbarItemLocation; - menuItemTemplate?: (() => string | any) | template; + menuItemTemplate?: any | (() => string | any); options?: any; showText?: ShowTextMode; - template?: ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any) | template; + template?: any | ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any); text?: string; toolbar?: ToolbarLocation; visible?: boolean; diff --git a/packages/devextreme-react/src/drop-down-button.ts b/packages/devextreme-react/src/drop-down-button.ts index 34f73bcf836b..e658c2d262f3 100644 --- a/packages/devextreme-react/src/drop-down-button.ts +++ b/packages/devextreme-react/src/drop-down-button.ts @@ -9,11 +9,10 @@ import { Component as BaseComponent, IHtmlOptions, ComponentRef, NestedComponent import NestedOption from "./core/nested-option"; import type { ButtonClickEvent, ContentReadyEvent, DisposingEvent, InitializedEvent, ItemClickEvent } from "devextreme/ui/drop_down_button"; -import type { AnimationConfig, AnimationState, AnimationType } from "devextreme/animation/fx"; +import type { AnimationConfig, CollisionResolution, PositionConfig, AnimationState, AnimationType, CollisionResolutionCombination } from "devextreme/common/core/animation"; import type { HorizontalAlignment, VerticalAlignment, PositionAlignment, Direction, ToolbarItemLocation, ToolbarItemComponent } from "devextreme/common"; -import type { CollisionResolution, PositionConfig, CollisionResolutionCombination } from "devextreme/animation/position"; -import type { event, EventInfo } from "devextreme/events/index"; -import type { template } from "devextreme/core/templates/template"; +import type { event } from "devextreme/common/core/events/index"; +import type { EventInfo } from "devextreme/common/core/events"; import type { Component } from "devextreme/core/component"; import type { dxPopupToolbarItem, ToolbarLocation } from "devextreme/ui/popup"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; @@ -192,7 +191,7 @@ type IDropDownOptionsProps = React.PropsWithChildren<{ bindingOptions?: Record; closeOnOutsideClick?: boolean | ((event: event) => boolean); container?: any | string; - contentTemplate?: ((contentElement: any) => string | any) | template; + contentTemplate?: any | ((contentElement: any) => string | any); deferRendering?: boolean; disabled?: boolean; dragAndResizeArea?: any | string; @@ -232,7 +231,7 @@ type IDropDownOptionsProps = React.PropsWithChildren<{ showTitle?: boolean; tabIndex?: number; title?: string; - titleTemplate?: ((titleElement: any) => string | any) | template; + titleTemplate?: any | ((titleElement: any) => string | any); toolbarItems?: Array; visible?: boolean; width?: (() => number | string) | number | string; @@ -347,7 +346,7 @@ type IItemProps = React.PropsWithChildren<{ html?: string; icon?: string; onClick?: ((e: ItemClickEvent) => void); - template?: ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any) | template; + template?: any | ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any); text?: string; visible?: boolean; render?: (...params: any) => React.ReactNode; @@ -507,10 +506,10 @@ type IToolbarItemProps = React.PropsWithChildren<{ html?: string; locateInMenu?: LocateInMenuMode; location?: ToolbarItemLocation; - menuItemTemplate?: (() => string | any) | template; + menuItemTemplate?: any | (() => string | any); options?: any; showText?: ShowTextMode; - template?: ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any) | template; + template?: any | ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any); text?: string; toolbar?: ToolbarLocation; visible?: boolean; diff --git a/packages/devextreme-react/src/filter-builder.ts b/packages/devextreme-react/src/filter-builder.ts index fb6d6c05e51f..d0c6ba08108f 100644 --- a/packages/devextreme-react/src/filter-builder.ts +++ b/packages/devextreme-react/src/filter-builder.ts @@ -10,10 +10,9 @@ import NestedOption from "./core/nested-option"; import type { ContentReadyEvent, DisposingEvent, EditorPreparedEvent, EditorPreparingEvent, InitializedEvent, ValueChangedEvent, dxFilterBuilderField, FilterBuilderOperation } from "devextreme/ui/filter_builder"; import type { DataType, Format as CommonFormat } from "devextreme/common"; -import type { template } from "devextreme/core/templates/template"; -import type { Format as LocalizationFormat } from "devextreme/localization"; +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"; +import type { Store } from "devextreme/common/data"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; @@ -88,7 +87,7 @@ type ICustomOperationProps = React.PropsWithChildren<{ caption?: string; customizeText?: ((fieldInfo: { field: dxFilterBuilderField, value: string | number | Date, valueText: string }) => string); dataTypes?: Array; - editorTemplate?: ((conditionInfo: { field: dxFilterBuilderField, setValue: (() => void), value: string | number | Date }, container: any) => string | any) | template; + editorTemplate?: any | ((conditionInfo: { field: dxFilterBuilderField, setValue: (() => void), value: string | number | Date }, container: any) => string | any); hasValue?: boolean; icon?: string; name?: string; @@ -123,7 +122,7 @@ type IFieldProps = React.PropsWithChildren<{ dataField?: string; dataType?: DataType; editorOptions?: any; - editorTemplate?: ((conditionInfo: { field: dxFilterBuilderField, filterOperation: string, setValue: (() => void), value: string | number | Date }, container: any) => string | any) | template; + editorTemplate?: any | ((conditionInfo: { field: dxFilterBuilderField, filterOperation: string, setValue: (() => void), value: string | number | Date }, container: any) => string | any); falseText?: string; filterOperations?: Array; format?: LocalizationFormat; diff --git a/packages/devextreme-react/src/form.ts b/packages/devextreme-react/src/form.ts index 87459a6f30e4..a677d9562650 100644 --- a/packages/devextreme-react/src/form.ts +++ b/packages/devextreme-react/src/form.ts @@ -12,10 +12,9 @@ import type { ContentReadyEvent, DisposingEvent, EditorEnterKeyEvent, Initialize import type { ContentReadyEvent as ButtonContentReadyEvent, DisposingEvent as ButtonDisposingEvent, InitializedEvent as ButtonInitializedEvent, dxButtonOptions, ClickEvent, OptionChangedEvent } from "devextreme/ui/button"; import type { ContentReadyEvent as TabPanelContentReadyEvent, DisposingEvent as TabPanelDisposingEvent, InitializedEvent as TabPanelInitializedEvent, OptionChangedEvent as TabPanelOptionChangedEvent, dxTabPanelOptions, dxTabPanelItem, ItemClickEvent, ItemContextMenuEvent, ItemHoldEvent, ItemRenderedEvent, SelectionChangedEvent, SelectionChangingEvent, TitleClickEvent, TitleHoldEvent, TitleRenderedEvent } from "devextreme/ui/tab_panel"; import type { ValidationRuleType, HorizontalAlignment, VerticalAlignment, ButtonStyle, ButtonType, ComparisonOperator, TabsIconPosition, TabsStyle, Position } from "devextreme/common"; -import type { template } from "devextreme/core/templates/template"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; import type { DataSourceOptions } from "devextreme/data/data_source"; -import type { Store } from "devextreme/data/store"; +import type { Store } from "devextreme/common/data"; import type DataSource from "devextreme/data/data_source"; @@ -167,7 +166,7 @@ type IButtonOptionsProps = React.PropsWithChildren<{ rtlEnabled?: boolean; stylingMode?: ButtonStyle; tabIndex?: number; - template?: ((buttonData: { icon: string, text: string }, contentElement: any) => string | any) | template; + template?: any | ((buttonData: { icon: string, text: string }, contentElement: any) => string | any); text?: string; type?: ButtonType | string; useSubmitBehavior?: boolean; @@ -326,7 +325,7 @@ const EmptyItem = Object.assign type IGroupItemProps = React.PropsWithChildren<{ alignItemLabels?: boolean; caption?: string; - captionTemplate?: ((data: { caption: string, component: dxForm, name: string }, itemElement: any) => string | any) | template; + captionTemplate?: any | ((data: { caption: string, component: dxForm, name: string }, itemElement: any) => string | any); colCount?: number; colCountByScreen?: Record | { lg?: number; @@ -339,7 +338,7 @@ type IGroupItemProps = React.PropsWithChildren<{ items?: Array; itemType?: FormItemType; name?: string; - template?: ((data: { component: dxForm, formData: Record }, itemElement: any) => string | any) | template; + template?: any | ((data: { component: dxForm, formData: Record }, itemElement: any) => string | any); visible?: boolean; visibleIndex?: number; captionRender?: (...params: any) => React.ReactNode; @@ -384,8 +383,8 @@ type IItemProps = React.PropsWithChildren<{ disabled?: boolean; html?: string; icon?: string; - tabTemplate?: (() => string | any) | template; - template?: ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any) | template; + tabTemplate?: any | (() => string | any); + template?: any | ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any); text?: string; title?: string; visible?: boolean; @@ -401,7 +400,7 @@ type IItemProps = React.PropsWithChildren<{ alignment?: HorizontalAlignment; location?: LabelLocation; showColon?: boolean; - template?: ((itemData: { component: dxForm, dataField: string, editorOptions: any, editorType: string, name: string, text: string }, itemElement: any) => string | any) | template; + template?: any | ((itemData: { component: dxForm, dataField: string, editorOptions: any, editorType: string, name: string, text: string }, itemElement: any) => string | any); text?: string; visible?: boolean; }; @@ -410,7 +409,7 @@ type IItemProps = React.PropsWithChildren<{ visibleIndex?: number; alignItemLabels?: boolean; caption?: string; - captionTemplate?: ((data: { caption: string, component: dxForm, name: string }, itemElement: any) => string | any) | template; + captionTemplate?: any | ((data: { caption: string, component: dxForm, name: string }, itemElement: any) => string | any); colCount?: number; colCountByScreen?: Record | { lg?: number; @@ -433,8 +432,8 @@ type IItemProps = React.PropsWithChildren<{ disabled?: boolean; icon?: string; items?: Array; - tabTemplate?: ((tabData: any, tabIndex: number, tabElement: any) => any) | template; - template?: ((tabData: any, tabIndex: number, tabElement: any) => any) | template; + tabTemplate?: any | ((tabData: any, tabIndex: number, tabElement: any) => any); + template?: any | ((tabData: any, tabIndex: number, tabElement: any) => any); title?: string; }[]; buttonOptions?: dxButtonOptions; @@ -480,7 +479,7 @@ type ILabelProps = React.PropsWithChildren<{ alignment?: HorizontalAlignment; location?: LabelLocation; showColon?: boolean; - template?: ((itemData: { component: dxForm, dataField: string, editorOptions: any, editorType: string, name: string, text: string }, itemElement: any) => string | any) | template; + template?: any | ((itemData: { component: dxForm, dataField: string, editorOptions: any, editorType: string, name: string, text: string }, itemElement: any) => string | any); text?: string; visible?: boolean; render?: (...params: any) => React.ReactNode; @@ -619,12 +618,12 @@ type ISimpleItemProps = React.PropsWithChildren<{ alignment?: HorizontalAlignment; location?: LabelLocation; showColon?: boolean; - template?: ((itemData: { component: dxForm, dataField: string, editorOptions: any, editorType: string, name: string, text: string }, itemElement: any) => string | any) | template; + template?: any | ((itemData: { component: dxForm, dataField: string, editorOptions: any, editorType: string, name: string, text: string }, itemElement: any) => string | any); text?: string; visible?: boolean; }; name?: string; - template?: ((data: { component: dxForm, dataField: string, editorOptions: Record, editorType: string, name: string }, itemElement: any) => string | any) | template; + template?: any | ((data: { component: dxForm, dataField: string, editorOptions: Record, editorType: string, name: string }, itemElement: any) => string | any); validationRules?: Array; visible?: boolean; visibleIndex?: number; @@ -708,8 +707,8 @@ type ITabProps = React.PropsWithChildren<{ disabled?: boolean; icon?: string; items?: Array; - tabTemplate?: ((tabData: any, tabIndex: number, tabElement: any) => any) | template; - template?: ((tabData: any, tabIndex: number, tabElement: any) => any) | template; + tabTemplate?: any | ((tabData: any, tabIndex: number, tabElement: any) => any); + template?: any | ((tabData: any, tabIndex: number, tabElement: any) => any); title?: string; tabRender?: (...params: any) => React.ReactNode; tabComponent?: React.ComponentType; @@ -763,8 +762,8 @@ type ITabbedItemProps = React.PropsWithChildren<{ disabled?: boolean; icon?: string; items?: Array; - tabTemplate?: ((tabData: any, tabIndex: number, tabElement: any) => any) | template; - template?: ((tabData: any, tabIndex: number, tabElement: any) => any) | template; + tabTemplate?: any | ((tabData: any, tabIndex: number, tabElement: any) => any); + template?: any | ((tabData: any, tabIndex: number, tabElement: any) => any); title?: string; }[]; visible?: boolean; @@ -809,8 +808,8 @@ type ITabPanelOptionsProps = React.PropsWithChildren<{ iconPosition?: TabsIconPosition; itemHoldTimeout?: number; items?: Array; - itemTemplate?: ((itemData: any, itemIndex: number, itemElement: any) => string | any) | template; - itemTitleTemplate?: ((itemData: any, itemIndex: number, itemElement: any) => string | any) | template; + itemTemplate?: any | ((itemData: any, itemIndex: number, itemElement: any) => string | any); + itemTitleTemplate?: any | ((itemData: any, itemIndex: number, itemElement: any) => string | any); loop?: boolean; noDataText?: string; onContentReady?: ((e: TabPanelContentReadyEvent) => void); @@ -888,8 +887,8 @@ type ITabPanelOptionsItemProps = React.PropsWithChildren<{ disabled?: boolean; html?: string; icon?: string; - tabTemplate?: (() => string | any) | template; - template?: ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any) | template; + tabTemplate?: any | (() => string | any); + template?: any | ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any); text?: string; title?: string; visible?: boolean; diff --git a/packages/devextreme-react/src/funnel.ts b/packages/devextreme-react/src/funnel.ts index bde5f5e882ee..4f6c35d69a42 100644 --- a/packages/devextreme-react/src/funnel.ts +++ b/packages/devextreme-react/src/funnel.ts @@ -11,8 +11,7 @@ import NestedOption from "./core/nested-option"; import type { DisposingEvent, DrawnEvent, ExportedEvent, ExportingEvent, FileSavingEvent, IncidentOccurredEvent, InitializedEvent, ItemClickEvent, LegendClickEvent, dxFunnelItem, FunnelLegendItem } from "devextreme/viz/funnel"; import type { DashStyle, Font as ChartsFont, TextOverflow, WordWrap, HatchDirection, LabelPosition } from "devextreme/common/charts"; import type { ExportFormat, Format as CommonFormat, HorizontalAlignment, VerticalEdge, HorizontalEdge, Position, Orientation } from "devextreme/common"; -import type { Format as LocalizationFormat } from "devextreme/localization"; -import type { template } from "devextreme/core/templates/template"; +import type { Format as LocalizationFormat } from "devextreme/common/core/localization"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; @@ -530,7 +529,7 @@ type ILegendProps = React.PropsWithChildren<{ top?: number; }; markerSize?: number; - markerTemplate?: ((legendItem: FunnelLegendItem, element: any) => string | any) | template; + markerTemplate?: any | ((legendItem: FunnelLegendItem, element: any) => string | any); orientation?: Orientation; paddingLeftRight?: number; paddingTopBottom?: number; @@ -872,7 +871,7 @@ type ITooltipProps = React.PropsWithChildren<{ }; color?: string; container?: any | string; - contentTemplate?: ((info: { item: dxFunnelItem, percent: number, percentText: string, value: number, valueText: string }, element: any) => string | any) | template; + contentTemplate?: any | ((info: { item: dxFunnelItem, percent: number, percentText: string, value: number, valueText: string }, element: any) => string | any); cornerRadius?: number; customizeTooltip?: ((info: { item: dxFunnelItem, percent: number, percentText: string, value: number, valueText: string }) => Record); enabled?: boolean; diff --git a/packages/devextreme-react/src/gallery.ts b/packages/devextreme-react/src/gallery.ts index 60b12c214861..388146a09c4f 100644 --- a/packages/devextreme-react/src/gallery.ts +++ b/packages/devextreme-react/src/gallery.ts @@ -11,7 +11,6 @@ import NestedOption from "./core/nested-option"; import type { dxGalleryItem, ContentReadyEvent, DisposingEvent, InitializedEvent, ItemClickEvent, ItemContextMenuEvent, ItemHoldEvent, ItemRenderedEvent } from "devextreme/ui/gallery"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; -import type { template } from "devextreme/core/templates/template"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; @@ -101,7 +100,7 @@ type IItemProps = React.PropsWithChildren<{ html?: string; imageAlt?: string; imageSrc?: string; - template?: ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any) | template; + template?: any | ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any); text?: string; render?: (...params: any) => React.ReactNode; component?: React.ComponentType; diff --git a/packages/devextreme-react/src/gantt.ts b/packages/devextreme-react/src/gantt.ts index f77f0e306530..01d4e32cd070 100644 --- a/packages/devextreme-react/src/gantt.ts +++ b/packages/devextreme-react/src/gantt.ts @@ -11,11 +11,10 @@ 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 { HorizontalAlignment, DataType, Format as CommonFormat, SearchMode, SortOrder, ToolbarItemLocation, ToolbarItemComponent, SingleMultipleOrNone } from "devextreme/common"; import type { dxTreeListColumn, dxTreeListRowObject } from "devextreme/ui/tree_list"; -import type { template } from "devextreme/core/templates/template"; import type { FilterOperation, FilterType, HeaderFilterGroupInterval, ColumnHeaderFilterSearchConfig, SelectedFilterOperation, HeaderFilterSearchConfig } from "devextreme/common/grids"; -import type { Format as LocalizationFormat } from "devextreme/localization"; +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"; +import type { Store } from "devextreme/common/data"; import type { dxContextMenuItem } from "devextreme/ui/context_menu"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; import type { LocateInMenuMode, ShowTextMode } from "devextreme/ui/toolbar"; @@ -157,7 +156,7 @@ type IColumnProps = React.PropsWithChildren<{ calculateFilterExpression?: ((filterValue: any, selectedFilterOperation: string | null, target: string) => string | (() => any) | Array); calculateSortValue?: ((rowData: any) => any) | string; caption?: string; - cellTemplate?: ((cellElement: any, cellInfo: { column: dxTreeListColumn, columnIndex: number, component: dxTreeList, data: Record, displayValue: any, oldValue: any, row: dxTreeListRowObject, rowIndex: number, rowType: string, text: string, value: any, watch: (() => void) }) => any) | template; + cellTemplate?: any | ((cellElement: any, cellInfo: { column: dxTreeListColumn, columnIndex: number, component: dxTreeList, data: Record, displayValue: any, oldValue: any, row: dxTreeListRowObject, rowIndex: number, rowType: string, text: string, value: any, watch: (() => void) }) => any); cssClass?: string; customizeText?: ((cellInfo: { groupInterval: string | number, target: string, value: any, valueText: string }) => string); dataField?: string; @@ -169,7 +168,7 @@ type IColumnProps = React.PropsWithChildren<{ filterValue?: any; filterValues?: Array; format?: LocalizationFormat; - headerCellTemplate?: ((columnHeader: any, headerInfo: { column: dxTreeListColumn, columnIndex: number, component: dxTreeList }) => any) | template; + headerCellTemplate?: any | ((columnHeader: any, headerInfo: { column: dxTreeListColumn, columnIndex: number, component: dxTreeList }) => any); headerFilter?: Record | { allowSearch?: boolean; allowSelectAll?: boolean; @@ -330,7 +329,7 @@ type IContextMenuItemProps = React.PropsWithChildren<{ name?: GanttPredefinedContextMenuItem | string; selectable?: boolean; selected?: boolean; - template?: ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any) | template; + template?: any | ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any); text?: string; visible?: boolean; render?: (...params: any) => React.ReactNode; @@ -546,14 +545,14 @@ type IItemProps = React.PropsWithChildren<{ name?: GanttPredefinedContextMenuItem | string | GanttPredefinedToolbarItem; selectable?: boolean; selected?: boolean; - template?: ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any) | template; + template?: any | ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any); text?: string; visible?: boolean; cssClass?: string; html?: string; locateInMenu?: LocateInMenuMode; location?: ToolbarItemLocation; - menuItemTemplate?: (() => string | any) | template; + menuItemTemplate?: any | (() => string | any); options?: any; showText?: ShowTextMode; widget?: ToolbarItemComponent; @@ -816,11 +815,11 @@ type IToolbarItemProps = React.PropsWithChildren<{ html?: string; locateInMenu?: LocateInMenuMode; location?: ToolbarItemLocation; - menuItemTemplate?: (() => string | any) | template; + menuItemTemplate?: any | (() => string | any); name?: GanttPredefinedToolbarItem | string; options?: any; showText?: ShowTextMode; - template?: ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any) | template; + template?: any | ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any); text?: string; visible?: boolean; widget?: ToolbarItemComponent; diff --git a/packages/devextreme-react/src/html-editor.ts b/packages/devextreme-react/src/html-editor.ts index d026253735b3..32c0e1649688 100644 --- a/packages/devextreme-react/src/html-editor.ts +++ b/packages/devextreme-react/src/html-editor.ts @@ -12,10 +12,9 @@ import type { ContentReadyEvent, DisposingEvent, FocusInEvent, FocusOutEvent, In import type { ContentReadyEvent as FileUploaderContentReadyEvent, DisposingEvent as FileUploaderDisposingEvent, InitializedEvent as FileUploaderInitializedEvent, ValueChangedEvent as FileUploaderValueChangedEvent, BeforeSendEvent, DropZoneEnterEvent, DropZoneLeaveEvent, FilesUploadedEvent, OptionChangedEvent, ProgressEvent, UploadAbortedEvent, UploadedEvent, UploadErrorEvent, UploadStartedEvent, UploadHttpMethod, FileUploadMode, dxFileUploaderOptions } from "devextreme/ui/file_uploader"; import type { ValidationStatus, ToolbarItemLocation, ToolbarItemComponent } from "devextreme/common"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; -import type { template } from "devextreme/core/templates/template"; import type { LocateInMenuMode, ShowTextMode } from "devextreme/ui/toolbar"; import type { DataSourceOptions } from "devextreme/data/data_source"; -import type { Store } from "devextreme/data/store"; +import type { Store } from "devextreme/common/data"; import type UploadInfo from "devextreme/file_management/upload_info"; import type DataSource from "devextreme/data/data_source"; @@ -234,7 +233,7 @@ type IItemProps = React.PropsWithChildren<{ name?: HtmlEditorPredefinedContextMenuItem | HtmlEditorPredefinedToolbarItem | string; selectable?: boolean; selected?: boolean; - template?: ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any) | template; + template?: any | ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any); text?: string; visible?: boolean; acceptedValues?: Array; @@ -244,7 +243,7 @@ type IItemProps = React.PropsWithChildren<{ html?: string; locateInMenu?: LocateInMenuMode; location?: ToolbarItemLocation; - menuItemTemplate?: (() => string | any) | template; + menuItemTemplate?: any | (() => string | any); options?: any; showText?: ShowTextMode; widget?: ToolbarItemComponent; @@ -300,12 +299,12 @@ const MediaResizing = Object.assign | DataSource | DataSourceOptions | null | Store | string; displayExpr?: ((item: any) => string) | string; - itemTemplate?: ((itemData: any, itemIndex: number, itemElement: any) => string | any) | template; + itemTemplate?: any | ((itemData: any, itemIndex: number, itemElement: any) => string | any); marker?: string; minSearchLength?: number; searchExpr?: Array<(() => any) | string> | (() => any) | string; searchTimeout?: number; - template?: ((mentionData: { id: string | number, marker: string, value: any }, contentElement: any) => string | any) | template; + template?: any | ((mentionData: { id: string | number, marker: string, value: any }, contentElement: any) => string | any); valueExpr?: (() => void) | string; itemRender?: (...params: any) => React.ReactNode; itemComponent?: React.ComponentType; @@ -389,7 +388,7 @@ type ITableContextMenuItemProps = React.PropsWithChildren<{ name?: HtmlEditorPredefinedContextMenuItem; selectable?: boolean; selected?: boolean; - template?: ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any) | template; + template?: any | ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any); text?: string; visible?: boolean; render?: (...params: any) => React.ReactNode; @@ -469,11 +468,11 @@ type IToolbarItemProps = React.PropsWithChildren<{ html?: string; locateInMenu?: LocateInMenuMode; location?: ToolbarItemLocation; - menuItemTemplate?: (() => string | any) | template; + menuItemTemplate?: any | (() => string | any); name?: HtmlEditorPredefinedToolbarItem | string; options?: any; showText?: ShowTextMode; - template?: ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any) | template; + template?: any | ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any); text?: string; visible?: boolean; widget?: ToolbarItemComponent; diff --git a/packages/devextreme-react/src/linear-gauge.ts b/packages/devextreme-react/src/linear-gauge.ts index 586ba90d596e..bf34d997a154 100644 --- a/packages/devextreme-react/src/linear-gauge.ts +++ b/packages/devextreme-react/src/linear-gauge.ts @@ -11,8 +11,7 @@ import NestedOption from "./core/nested-option"; import type { DisposingEvent, DrawnEvent, ExportedEvent, ExportingEvent, FileSavingEvent, IncidentOccurredEvent, InitializedEvent, TooltipHiddenEvent, TooltipShownEvent } from "devextreme/viz/linear_gauge"; import type { AnimationEaseMode, DashStyle, Font as ChartsFont, LabelOverlap, ChartsColor, Palette, PaletteExtensionMode, TextOverflow, WordWrap } from "devextreme/common/charts"; import type { ExportFormat, Format as CommonFormat, Orientation, HorizontalAlignment, VerticalAlignment, HorizontalEdge, VerticalEdge } from "devextreme/common"; -import type { Format as LocalizationFormat } from "devextreme/localization"; -import type { template } from "devextreme/core/templates/template"; +import type { Format as LocalizationFormat } from "devextreme/common/core/localization"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; @@ -701,7 +700,7 @@ type ITooltipProps = React.PropsWithChildren<{ }; color?: string; container?: any | string; - contentTemplate?: ((scaleValue: { value: number, valueText: string }, element: any) => string | any) | template; + contentTemplate?: any | ((scaleValue: { value: number, valueText: string }, element: any) => string | any); cornerRadius?: number; customizeTooltip?: ((scaleValue: { value: number, valueText: string }) => Record); enabled?: boolean; diff --git a/packages/devextreme-react/src/list.ts b/packages/devextreme-react/src/list.ts index 1eafae206a5e..a262cb1b96be 100644 --- a/packages/devextreme-react/src/list.ts +++ b/packages/devextreme-react/src/list.ts @@ -15,7 +15,6 @@ import type { ContentReadyEvent as TextBoxContentReadyEvent, DisposingEvent as T import type { DisposingEvent as SortableDisposingEvent, InitializedEvent as SortableInitializedEvent, AddEvent, DragChangeEvent, DragEndEvent, DragMoveEvent, DragStartEvent, OptionChangedEvent, RemoveEvent, ReorderEvent } from "devextreme/ui/sortable"; import type { TextEditorButtonLocation, DragDirection, DragHighlight, Orientation, ButtonStyle, ButtonType, TextBoxPredefinedButton, TextEditorButton, LabelMode, MaskMode, EditorStyle, ValidationMessageMode, Position, ValidationStatus } from "devextreme/common"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; -import type { template } from "devextreme/core/templates/template"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; @@ -170,7 +169,7 @@ type IItemProps = React.PropsWithChildren<{ icon?: string; key?: string; showChevron?: boolean; - template?: ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any) | template; + template?: any | ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any); text?: string; visible?: boolean; render?: (...params: any) => React.ReactNode; @@ -210,7 +209,7 @@ type IItemDraggingProps = React.PropsWithChildren<{ }; data?: any; dragDirection?: DragDirection; - dragTemplate?: ((dragInfo: { fromIndex: number, itemData: any, itemElement: any }, containerElement: any) => string | any) | template; + dragTemplate?: any | ((dragInfo: { fromIndex: number, itemData: any, itemElement: any }, containerElement: any) => string | any); dropFeedbackMode?: DragHighlight; elementAttr?: Record; filter?: string; @@ -298,7 +297,7 @@ type IOptionsProps = React.PropsWithChildren<{ rtlEnabled?: boolean; stylingMode?: ButtonStyle; tabIndex?: number; - template?: ((buttonData: { icon: string, text: string }, contentElement: any) => string | any) | template; + template?: any | ((buttonData: { icon: string, text: string }, contentElement: any) => string | any); text?: string; type?: ButtonType | string; useSubmitBehavior?: boolean; diff --git a/packages/devextreme-react/src/load-panel.ts b/packages/devextreme-react/src/load-panel.ts index 06836975bec5..bec08ca8ddfd 100644 --- a/packages/devextreme-react/src/load-panel.ts +++ b/packages/devextreme-react/src/load-panel.ts @@ -9,9 +9,8 @@ import { Component as BaseComponent, IHtmlOptions, ComponentRef, NestedComponent import NestedOption from "./core/nested-option"; import type { PositionAlignment, HorizontalAlignment, VerticalAlignment, Direction } from "devextreme/common"; -import type { PositionConfig, CollisionResolution, CollisionResolutionCombination } from "devextreme/animation/position"; +import type { PositionConfig, AnimationConfig, CollisionResolution, AnimationState, AnimationType, CollisionResolutionCombination } from "devextreme/common/core/animation"; import type { ContentReadyEvent, DisposingEvent, HiddenEvent, HidingEvent, InitializedEvent, ShowingEvent, ShownEvent } from "devextreme/ui/load_panel"; -import type { AnimationConfig, AnimationState, AnimationType } from "devextreme/animation/fx"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; diff --git a/packages/devextreme-react/src/lookup.ts b/packages/devextreme-react/src/lookup.ts index 5e9f0fb3d906..51fad03e08a4 100644 --- a/packages/devextreme-react/src/lookup.ts +++ b/packages/devextreme-react/src/lookup.ts @@ -10,11 +10,9 @@ import NestedOption from "./core/nested-option"; import type { ClosedEvent, ContentReadyEvent, DisposingEvent, InitializedEvent, ItemClickEvent, OpenedEvent, PageLoadingEvent, PullRefreshEvent, ScrollEvent, ValueChangedEvent } from "devextreme/ui/lookup"; import type { ContentReadyEvent as PopoverContentReadyEvent, DisposingEvent as PopoverDisposingEvent, InitializedEvent as PopoverInitializedEvent, HiddenEvent, HidingEvent, OptionChangedEvent, ShowingEvent, ShownEvent, TitleRenderedEvent } from "devextreme/ui/popover"; -import type { AnimationConfig, AnimationState, AnimationType } from "devextreme/animation/fx"; +import type { AnimationConfig, CollisionResolution, PositionConfig, AnimationState, AnimationType, CollisionResolutionCombination } from "devextreme/common/core/animation"; import type { HorizontalAlignment, VerticalAlignment, Position as CommonPosition, Direction, PositionAlignment, ToolbarItemLocation, ToolbarItemComponent } from "devextreme/common"; -import type { CollisionResolution, PositionConfig, CollisionResolutionCombination } from "devextreme/animation/position"; -import type { event } from "devextreme/events/index"; -import type { template } from "devextreme/core/templates/template"; +import type { event } from "devextreme/common/core/events/index"; import type { dxPopupToolbarItem, ToolbarLocation } from "devextreme/ui/popup"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; import type { LocateInMenuMode, ShowTextMode } from "devextreme/ui/toolbar"; @@ -204,7 +202,7 @@ type IDropDownOptionsProps = React.PropsWithChildren<{ bindingOptions?: Record; closeOnOutsideClick?: boolean | ((event: event) => boolean); container?: any | string; - contentTemplate?: ((contentElement: any) => string | any) | template; + contentTemplate?: any | ((contentElement: any) => string | any); deferRendering?: boolean; disabled?: boolean; enableBodyScroll?: boolean; @@ -242,7 +240,7 @@ type IDropDownOptionsProps = React.PropsWithChildren<{ showTitle?: boolean; target?: any | string; title?: string; - titleTemplate?: ((titleElement: any) => string | any) | template; + titleTemplate?: any | ((titleElement: any) => string | any); toolbarItems?: Array; visible?: boolean; width?: (() => number | string) | number | string; @@ -375,7 +373,7 @@ const HideEvent = Object.assign type IItemProps = React.PropsWithChildren<{ disabled?: boolean; html?: string; - template?: ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any) | template; + template?: any | ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any); text?: string; visible?: boolean; render?: (...params: any) => React.ReactNode; @@ -554,10 +552,10 @@ type IToolbarItemProps = React.PropsWithChildren<{ html?: string; locateInMenu?: LocateInMenuMode; location?: ToolbarItemLocation; - menuItemTemplate?: (() => string | any) | template; + menuItemTemplate?: any | (() => string | any); options?: any; showText?: ShowTextMode; - template?: ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any) | template; + template?: any | ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any); text?: string; toolbar?: ToolbarLocation; visible?: boolean; diff --git a/packages/devextreme-react/src/menu.ts b/packages/devextreme-react/src/menu.ts index 8c9a6333f909..8b8d7f786052 100644 --- a/packages/devextreme-react/src/menu.ts +++ b/packages/devextreme-react/src/menu.ts @@ -10,11 +10,9 @@ import { Component as BaseComponent, IHtmlOptions, ComponentRef, NestedComponent import NestedOption from "./core/nested-option"; import type { dxMenuItem, ContentReadyEvent, DisposingEvent, InitializedEvent, ItemClickEvent, ItemContextMenuEvent, ItemRenderedEvent, SubmenuHiddenEvent, SubmenuHidingEvent, SubmenuShowingEvent, SubmenuShownEvent } from "devextreme/ui/menu"; -import type { AnimationConfig, AnimationState, AnimationType } from "devextreme/animation/fx"; +import type { AnimationConfig, CollisionResolution, PositionConfig, AnimationState, AnimationType, CollisionResolutionCombination } from "devextreme/common/core/animation"; import type { HorizontalAlignment, VerticalAlignment, Direction, PositionAlignment, SubmenuShowMode } from "devextreme/common"; -import type { CollisionResolution, PositionConfig, CollisionResolutionCombination } from "devextreme/animation/position"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; -import type { template } from "devextreme/core/templates/template"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; @@ -267,7 +265,7 @@ type IItemProps = React.PropsWithChildren<{ linkAttr?: Record; selectable?: boolean; selected?: boolean; - template?: ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any) | template; + template?: any | ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any); text?: string; url?: string; visible?: boolean; diff --git a/packages/devextreme-react/src/multi-view.ts b/packages/devextreme-react/src/multi-view.ts index 7654df8dc704..debc73d523f6 100644 --- a/packages/devextreme-react/src/multi-view.ts +++ b/packages/devextreme-react/src/multi-view.ts @@ -11,7 +11,6 @@ import NestedOption from "./core/nested-option"; import type { dxMultiViewItem, ContentReadyEvent, DisposingEvent, InitializedEvent, ItemClickEvent, ItemContextMenuEvent, ItemHoldEvent, ItemRenderedEvent } from "devextreme/ui/multi_view"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; -import type { template } from "devextreme/core/templates/template"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; @@ -99,7 +98,7 @@ const MultiView = memo( type IItemProps = React.PropsWithChildren<{ disabled?: boolean; html?: string; - template?: ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any) | template; + template?: any | ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any); text?: string; visible?: boolean; render?: (...params: any) => React.ReactNode; diff --git a/packages/devextreme-react/src/number-box.ts b/packages/devextreme-react/src/number-box.ts index 389b5d256acc..bd8016d7641f 100644 --- a/packages/devextreme-react/src/number-box.ts +++ b/packages/devextreme-react/src/number-box.ts @@ -11,7 +11,6 @@ import NestedOption from "./core/nested-option"; import type { ChangeEvent, ContentReadyEvent, CopyEvent, CutEvent, DisposingEvent, EnterKeyEvent, FocusInEvent, FocusOutEvent, InitializedEvent, InputEvent, KeyDownEvent, KeyUpEvent, PasteEvent, ValueChangedEvent } from "devextreme/ui/number_box"; import type { ContentReadyEvent as ButtonContentReadyEvent, DisposingEvent as ButtonDisposingEvent, InitializedEvent as ButtonInitializedEvent, dxButtonOptions, ClickEvent, OptionChangedEvent } from "devextreme/ui/button"; import type { TextEditorButtonLocation, Format as CommonFormat, ButtonStyle, ButtonType } from "devextreme/common"; -import type { template } from "devextreme/core/templates/template"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; @@ -152,7 +151,7 @@ type IOptionsProps = React.PropsWithChildren<{ rtlEnabled?: boolean; stylingMode?: ButtonStyle; tabIndex?: number; - template?: ((buttonData: { icon: string, text: string }, contentElement: any) => string | any) | template; + template?: any | ((buttonData: { icon: string, text: string }, contentElement: any) => string | any); text?: string; type?: ButtonType | string; useSubmitBehavior?: boolean; diff --git a/packages/devextreme-react/src/pie-chart.ts b/packages/devextreme-react/src/pie-chart.ts index b27ef1bee160..4822900f8193 100644 --- a/packages/devextreme-react/src/pie-chart.ts +++ b/packages/devextreme-react/src/pie-chart.ts @@ -10,9 +10,8 @@ import NestedOption from "./core/nested-option"; import type { DisposingEvent, DoneEvent, DrawnEvent, ExportedEvent, ExportingEvent, FileSavingEvent, IncidentOccurredEvent, InitializedEvent, LegendClickEvent, PointClickEvent, TooltipHiddenEvent, TooltipShownEvent, dxPieChartAnnotationConfig, PieChartAnnotationLocation, dxPieChartCommonAnnotationConfig, PieChartSeriesInteractionMode, SmallValuesGroupingMode, PieChartLegendItem, PieChartLegendHoverMode, PieChartSeries } from "devextreme/viz/pie_chart"; import type { AnimationEaseMode, DashStyle, Font as ChartsFont, TextOverflow, AnnotationType, WordWrap, ChartsDataType, ChartsColor, HatchDirection, LabelPosition } from "devextreme/common/charts"; -import type { template } from "devextreme/core/templates/template"; import type { Format as CommonFormat, ExportFormat, HorizontalAlignment, Position, Orientation, VerticalEdge } from "devextreme/common"; -import type { Format as LocalizationFormat } from "devextreme/localization"; +import type { Format as LocalizationFormat } from "devextreme/common/core/localization"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; @@ -189,11 +188,11 @@ type IAnnotationProps = React.PropsWithChildren<{ offsetY?: number; opacity?: number; }; - template?: ((annotation: dxPieChartCommonAnnotationConfig | any, element: any) => string | any) | template; + template?: any | ((annotation: dxPieChartCommonAnnotationConfig | any, element: any) => string | any); text?: string; textOverflow?: TextOverflow; tooltipEnabled?: boolean; - tooltipTemplate?: ((annotation: dxPieChartAnnotationConfig | any, element: any) => string | any) | template; + tooltipTemplate?: any | ((annotation: dxPieChartAnnotationConfig | any, element: any) => string | any); type?: AnnotationType; width?: number; wordWrap?: WordWrap; @@ -372,11 +371,11 @@ type ICommonAnnotationSettingsProps = React.PropsWithChildren<{ offsetY?: number; opacity?: number; }; - template?: ((annotation: dxPieChartCommonAnnotationConfig | any, element: any) => string | any) | template; + template?: any | ((annotation: dxPieChartCommonAnnotationConfig | any, element: any) => string | any); text?: string; textOverflow?: TextOverflow; tooltipEnabled?: boolean; - tooltipTemplate?: ((annotation: dxPieChartAnnotationConfig | any, element: any) => string | any) | template; + tooltipTemplate?: any | ((annotation: dxPieChartAnnotationConfig | any, element: any) => string | any); type?: AnnotationType; width?: number; wordWrap?: WordWrap; @@ -767,7 +766,7 @@ type ILegendProps = React.PropsWithChildren<{ top?: number; }; markerSize?: number; - markerTemplate?: ((legendItem: PieChartLegendItem, element: any) => string | any) | template; + markerTemplate?: any | ((legendItem: PieChartLegendItem, element: any) => string | any); orientation?: Orientation; paddingLeftRight?: number; paddingTopBottom?: number; @@ -1322,7 +1321,7 @@ type ITooltipProps = React.PropsWithChildren<{ }; color?: string; container?: any | string; - contentTemplate?: ((pointInfo: any, element: any) => string | any) | template; + contentTemplate?: any | ((pointInfo: any, element: any) => string | any); cornerRadius?: number; customizeTooltip?: ((pointInfo: any) => Record); enabled?: boolean; diff --git a/packages/devextreme-react/src/polar-chart.ts b/packages/devextreme-react/src/polar-chart.ts index d38c9b4dc1e8..bf5e1d7491a9 100644 --- a/packages/devextreme-react/src/polar-chart.ts +++ b/packages/devextreme-react/src/polar-chart.ts @@ -10,8 +10,7 @@ import NestedOption from "./core/nested-option"; import type { ArgumentAxisClickEvent, DisposingEvent, DoneEvent, DrawnEvent, ExportedEvent, ExportingEvent, FileSavingEvent, IncidentOccurredEvent, InitializedEvent, LegendClickEvent, PointClickEvent, SeriesClickEvent, TooltipHiddenEvent, TooltipShownEvent, ZoomEndEvent, ZoomStartEvent, dxPolarChartAnnotationConfig, dxPolarChartCommonAnnotationConfig, PolarChartSeriesType, PolarChartSeries, ValueAxisVisualRangeUpdateMode } from "devextreme/viz/polar_chart"; import type { AnimationEaseMode, DashStyle, Font as ChartsFont, TextOverflow, AnnotationType, WordWrap, ChartsDataType, DiscreteAxisDivisionMode, ArgumentAxisHoverMode, LabelOverlap, TimeInterval, AxisScaleType, ChartsColor, SeriesHoverMode, HatchDirection, RelativePosition, PointInteractionMode, PointSymbol, SeriesSelectionMode, ValueErrorBarDisplayMode, ValueErrorBarType, LegendItem, LegendHoverMode } from "devextreme/common/charts"; -import type { template } from "devextreme/core/templates/template"; -import type { Format as LocalizationFormat } from "devextreme/localization"; +import type { Format as LocalizationFormat } from "devextreme/common/core/localization"; import type { Format as CommonFormat, ExportFormat, HorizontalAlignment, Position, Orientation, VerticalEdge } from "devextreme/common"; import type * as CommonChartTypes from "devextreme/common/charts"; @@ -192,11 +191,11 @@ type IAnnotationProps = React.PropsWithChildren<{ offsetY?: number; opacity?: number; }; - template?: ((annotation: dxPolarChartCommonAnnotationConfig | any, element: any) => string | any) | template; + template?: any | ((annotation: dxPolarChartCommonAnnotationConfig | any, element: any) => string | any); text?: string; textOverflow?: TextOverflow; tooltipEnabled?: boolean; - tooltipTemplate?: ((annotation: dxPolarChartAnnotationConfig | any, element: any) => string | any) | template; + tooltipTemplate?: any | ((annotation: dxPolarChartAnnotationConfig | any, element: any) => string | any); type?: AnnotationType; value?: Date | number | string; width?: number; @@ -602,11 +601,11 @@ type ICommonAnnotationSettingsProps = React.PropsWithChildren<{ offsetY?: number; opacity?: number; }; - template?: ((annotation: dxPolarChartCommonAnnotationConfig | any, element: any) => string | any) | template; + template?: any | ((annotation: dxPolarChartCommonAnnotationConfig | any, element: any) => string | any); text?: string; textOverflow?: TextOverflow; tooltipEnabled?: boolean; - tooltipTemplate?: ((annotation: dxPolarChartAnnotationConfig | any, element: any) => string | any) | template; + tooltipTemplate?: any | ((annotation: dxPolarChartAnnotationConfig | any, element: any) => string | any); type?: AnnotationType; value?: Date | number | string; width?: number; @@ -1475,7 +1474,7 @@ type ILegendProps = React.PropsWithChildren<{ top?: number; }; markerSize?: number; - markerTemplate?: ((legendItem: LegendItem, element: any) => string | any) | template; + markerTemplate?: any | ((legendItem: LegendItem, element: any) => string | any); orientation?: Orientation; paddingLeftRight?: number; paddingTopBottom?: number; @@ -2465,7 +2464,7 @@ type ITooltipProps = React.PropsWithChildren<{ }; color?: string; container?: any | string; - contentTemplate?: ((pointInfo: any, element: any) => string | any) | template; + contentTemplate?: any | ((pointInfo: any, element: any) => string | any); cornerRadius?: number; customizeTooltip?: ((pointInfo: any) => Record); enabled?: boolean; diff --git a/packages/devextreme-react/src/popover.ts b/packages/devextreme-react/src/popover.ts index 95f18c8878f0..eb80e8d343ae 100644 --- a/packages/devextreme-react/src/popover.ts +++ b/packages/devextreme-react/src/popover.ts @@ -9,11 +9,9 @@ import { Component as BaseComponent, IHtmlOptions, ComponentRef, NestedComponent import NestedOption from "./core/nested-option"; import type { Position as CommonPosition, HorizontalAlignment, VerticalAlignment, Direction, PositionAlignment, ToolbarItemLocation, ToolbarItemComponent } from "devextreme/common"; -import type { PositionConfig, CollisionResolution, CollisionResolutionCombination } from "devextreme/animation/position"; +import type { PositionConfig, AnimationConfig, CollisionResolution, AnimationState, AnimationType, CollisionResolutionCombination } from "devextreme/common/core/animation"; import type { ContentReadyEvent, DisposingEvent, HiddenEvent, HidingEvent, InitializedEvent, ShowingEvent, ShownEvent, TitleRenderedEvent } from "devextreme/ui/popover"; -import type { AnimationConfig, AnimationState, AnimationType } from "devextreme/animation/fx"; import type { LocateInMenuMode, ShowTextMode } from "devextreme/ui/toolbar"; -import type { template } from "devextreme/core/templates/template"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; import type { ToolbarLocation } from "devextreme/ui/popup"; @@ -422,10 +420,10 @@ type IToolbarItemProps = React.PropsWithChildren<{ html?: string; locateInMenu?: LocateInMenuMode; location?: ToolbarItemLocation; - menuItemTemplate?: (() => string | any) | template; + menuItemTemplate?: any | (() => string | any); options?: any; showText?: ShowTextMode; - template?: ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any) | template; + template?: any | ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any); text?: string; toolbar?: ToolbarLocation; visible?: boolean; diff --git a/packages/devextreme-react/src/popup.ts b/packages/devextreme-react/src/popup.ts index cdd8998e6056..591898a614e4 100644 --- a/packages/devextreme-react/src/popup.ts +++ b/packages/devextreme-react/src/popup.ts @@ -9,10 +9,8 @@ import { Component as BaseComponent, IHtmlOptions, ComponentRef, NestedComponent import NestedOption from "./core/nested-option"; import type { PositionAlignment, HorizontalAlignment, VerticalAlignment, Direction, ToolbarItemLocation, ToolbarItemComponent } from "devextreme/common"; -import type { PositionConfig, CollisionResolution, CollisionResolutionCombination } from "devextreme/animation/position"; -import type { AnimationConfig, AnimationState, AnimationType } from "devextreme/animation/fx"; +import type { PositionConfig, AnimationConfig, CollisionResolution, AnimationState, AnimationType, CollisionResolutionCombination } from "devextreme/common/core/animation"; import type { LocateInMenuMode, ShowTextMode } from "devextreme/ui/toolbar"; -import type { template } from "devextreme/core/templates/template"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; import type { ToolbarLocation } from "devextreme/ui/popup"; @@ -366,10 +364,10 @@ type IToolbarItemProps = React.PropsWithChildren<{ html?: string; locateInMenu?: LocateInMenuMode; location?: ToolbarItemLocation; - menuItemTemplate?: (() => string | any) | template; + menuItemTemplate?: any | (() => string | any); options?: any; showText?: ShowTextMode; - template?: ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any) | template; + template?: any | ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any); text?: string; toolbar?: ToolbarLocation; visible?: boolean; diff --git a/packages/devextreme-react/src/radio-group.ts b/packages/devextreme-react/src/radio-group.ts index 376c30251d61..c3ac09593aec 100644 --- a/packages/devextreme-react/src/radio-group.ts +++ b/packages/devextreme-react/src/radio-group.ts @@ -10,7 +10,6 @@ import NestedOption from "./core/nested-option"; import type { ContentReadyEvent, DisposingEvent, InitializedEvent, ValueChangedEvent } from "devextreme/ui/radio_group"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; -import type { template } from "devextreme/core/templates/template"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; @@ -88,7 +87,7 @@ const RadioGroup = memo( type IItemProps = React.PropsWithChildren<{ disabled?: boolean; html?: string; - template?: ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any) | template; + template?: any | ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any); text?: string; visible?: boolean; render?: (...params: any) => React.ReactNode; diff --git a/packages/devextreme-react/src/range-selector.ts b/packages/devextreme-react/src/range-selector.ts index 6ed88bf06c44..72322dd85f7d 100644 --- a/packages/devextreme-react/src/range-selector.ts +++ b/packages/devextreme-react/src/range-selector.ts @@ -11,7 +11,7 @@ import NestedOption from "./core/nested-option"; import type { DisposingEvent, DrawnEvent, ExportedEvent, ExportingEvent, FileSavingEvent, IncidentOccurredEvent, InitializedEvent, ValueChangedEvent, BackgroundImageLocation, ValueChangedCallMode, ChartAxisScale, AxisScale } from "devextreme/viz/range_selector"; import type { chartPointAggregationInfoObject, chartSeriesObject, ChartSeriesAggregationMethod, dxChartCommonSeriesSettings, FinancialChartReductionLevel } from "devextreme/viz/chart"; import type { Format as CommonFormat, SliderValueChangeMode, HorizontalAlignment, ExportFormat, VerticalEdge } from "devextreme/common"; -import type { Format as LocalizationFormat } from "devextreme/localization"; +import type { Format as LocalizationFormat } from "devextreme/common/core/localization"; import type { DashStyle, ScaleBreakLineStyle, Palette, PaletteExtensionMode, ChartsDataType, ChartsColor, SeriesHoverMode, HatchDirection, Font as ChartsFont, RelativePosition, PointInteractionMode, PointSymbol, SeriesSelectionMode, SeriesType, ValueErrorBarDisplayMode, ValueErrorBarType, LabelOverlap, TimeInterval, ScaleBreak, DiscreteAxisDivisionMode, TextOverflow, WordWrap } from "devextreme/common/charts"; import type { ChartSeries } from "devextreme/viz/common"; diff --git a/packages/devextreme-react/src/range-slider.ts b/packages/devextreme-react/src/range-slider.ts index 06eb1e3f5726..7cfa337269c4 100644 --- a/packages/devextreme-react/src/range-slider.ts +++ b/packages/devextreme-react/src/range-slider.ts @@ -10,7 +10,7 @@ import NestedOption from "./core/nested-option"; import type { ContentReadyEvent, DisposingEvent, InitializedEvent, ValueChangedEvent } from "devextreme/ui/range_slider"; import type { Format as CommonFormat, VerticalEdge, TooltipShowMode } from "devextreme/common"; -import type { Format as LocalizationFormat } from "devextreme/localization"; +import type { Format as LocalizationFormat } from "devextreme/common/core/localization"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; diff --git a/packages/devextreme-react/src/responsive-box.ts b/packages/devextreme-react/src/responsive-box.ts index 0609997cf4c4..495210caefe2 100644 --- a/packages/devextreme-react/src/responsive-box.ts +++ b/packages/devextreme-react/src/responsive-box.ts @@ -11,7 +11,6 @@ import NestedOption from "./core/nested-option"; import type { dxResponsiveBoxItem, ContentReadyEvent, DisposingEvent, InitializedEvent, ItemClickEvent, ItemContextMenuEvent, ItemHoldEvent, ItemRenderedEvent } from "devextreme/ui/responsive_box"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; -import type { template } from "devextreme/core/templates/template"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; @@ -124,7 +123,7 @@ type IItemProps = React.PropsWithChildren<{ rowspan?: number; screen?: string; }[]; - template?: ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any) | template; + template?: any | ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any); text?: string; visible?: boolean; render?: (...params: any) => React.ReactNode; diff --git a/packages/devextreme-react/src/sankey.ts b/packages/devextreme-react/src/sankey.ts index c3b590248685..465a146fb3ba 100644 --- a/packages/devextreme-react/src/sankey.ts +++ b/packages/devextreme-react/src/sankey.ts @@ -11,8 +11,7 @@ import NestedOption from "./core/nested-option"; import type { DisposingEvent, DrawnEvent, ExportedEvent, ExportingEvent, FileSavingEvent, IncidentOccurredEvent, InitializedEvent, LinkClickEvent, NodeClickEvent, dxSankeyNode, SankeyColorMode } from "devextreme/viz/sankey"; import type { DashStyle, HatchDirection, Font as ChartsFont, TextOverflow, WordWrap } from "devextreme/common/charts"; import type { ExportFormat, Format as CommonFormat, HorizontalAlignment, VerticalEdge } from "devextreme/common"; -import type { Format as LocalizationFormat } from "devextreme/localization"; -import type { template } from "devextreme/core/templates/template"; +import type { Format as LocalizationFormat } from "devextreme/common/core/localization"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; @@ -598,8 +597,8 @@ type ITooltipProps = React.PropsWithChildren<{ enabled?: boolean; font?: ChartsFont; format?: LocalizationFormat; - linkTooltipTemplate?: ((info: { source: string, target: string, weight: number }, element: any) => string | any) | template; - nodeTooltipTemplate?: ((info: { label: string, weightIn: number, weightOut: number }, element: any) => string | any) | template; + linkTooltipTemplate?: any | ((info: { source: string, target: string, weight: number }, element: any) => string | any); + nodeTooltipTemplate?: any | ((info: { label: string, weightIn: number, weightOut: number }, element: any) => string | any); opacity?: number; paddingLeftRight?: number; paddingTopBottom?: number; diff --git a/packages/devextreme-react/src/scheduler.ts b/packages/devextreme-react/src/scheduler.ts index 283e1c8faa22..136d8e78264b 100644 --- a/packages/devextreme-react/src/scheduler.ts +++ b/packages/devextreme-react/src/scheduler.ts @@ -9,11 +9,10 @@ import { Component as BaseComponent, IHtmlOptions, ComponentRef, NestedComponent import NestedOption from "./core/nested-option"; import type { ViewType, AppointmentAddedEvent, AppointmentAddingEvent, AppointmentClickEvent, AppointmentContextMenuEvent, AppointmentDblClickEvent, AppointmentDeletedEvent, AppointmentDeletingEvent, AppointmentFormOpeningEvent, AppointmentRenderedEvent, AppointmentTooltipShowingEvent, AppointmentUpdatedEvent, AppointmentUpdatingEvent, CellClickEvent, CellContextMenuEvent, ContentReadyEvent, DisposingEvent, InitializedEvent, AllDayPanelMode, AppointmentTemplateData, AppointmentTooltipTemplateData, CellAppointmentsLimit, dxSchedulerScrolling } from "devextreme/ui/scheduler"; -import type { event } from "devextreme/events/index"; +import type { event } from "devextreme/common/core/events/index"; import type { DataSourceOptions } from "devextreme/data/data_source"; -import type { Store } from "devextreme/data/store"; +import type { Store } from "devextreme/common/data"; import type { ScrollMode, FirstDayOfWeek, Orientation } from "devextreme/common"; -import type { template } from "devextreme/core/templates/template"; import type dxSortable from "devextreme/ui/sortable"; import type dxDraggable from "devextreme/ui/draggable"; @@ -259,13 +258,13 @@ const Scrolling = Object.assign type IViewProps = React.PropsWithChildren<{ agendaDuration?: number; allDayPanelMode?: AllDayPanelMode; - appointmentCollectorTemplate?: ((data: { appointmentCount: number, isCompact: boolean }, collectorElement: any) => string | any) | template; - appointmentTemplate?: ((model: AppointmentTemplateData | { appointmentData: Record, targetedAppointmentData: Record }, itemIndex: number, contentElement: any) => string | any) | template; - appointmentTooltipTemplate?: ((model: AppointmentTooltipTemplateData | { appointmentData: Record, targetedAppointmentData: Record }, itemIndex: number, contentElement: any) => string | any) | template; + appointmentCollectorTemplate?: any | ((data: { appointmentCount: number, isCompact: boolean }, collectorElement: any) => string | any); + appointmentTemplate?: any | ((model: AppointmentTemplateData | { appointmentData: Record, targetedAppointmentData: Record }, itemIndex: number, contentElement: any) => string | any); + appointmentTooltipTemplate?: any | ((model: AppointmentTooltipTemplateData | { appointmentData: Record, targetedAppointmentData: Record }, itemIndex: number, contentElement: any) => string | any); cellDuration?: number; - dataCellTemplate?: ((itemData: any, itemIndex: number, itemElement: any) => string | any) | template; - dateCellTemplate?: ((itemData: any, itemIndex: number, itemElement: any) => string | any) | template; - dropDownAppointmentTemplate?: ((itemData: any, itemIndex: number, contentElement: any) => string | any) | template; + dataCellTemplate?: any | ((itemData: any, itemIndex: number, itemElement: any) => string | any); + dateCellTemplate?: any | ((itemData: any, itemIndex: number, itemElement: any) => string | any); + dropDownAppointmentTemplate?: any | ((itemData: any, itemIndex: number, contentElement: any) => string | any); endDayHour?: number; firstDayOfWeek?: FirstDayOfWeek; groupByDate?: boolean; @@ -275,11 +274,11 @@ type IViewProps = React.PropsWithChildren<{ maxAppointmentsPerCell?: CellAppointmentsLimit | number; name?: string; offset?: number; - resourceCellTemplate?: ((itemData: any, itemIndex: number, itemElement: any) => string | any) | template; + resourceCellTemplate?: any | ((itemData: any, itemIndex: number, itemElement: any) => string | any); scrolling?: dxSchedulerScrolling; startDate?: Date | number | string; startDayHour?: number; - timeCellTemplate?: ((itemData: any, itemIndex: number, itemElement: any) => string | any) | template; + timeCellTemplate?: any | ((itemData: any, itemIndex: number, itemElement: any) => string | any); type?: ViewType; appointmentCollectorRender?: (...params: any) => React.ReactNode; appointmentCollectorComponent?: React.ComponentType; diff --git a/packages/devextreme-react/src/select-box.ts b/packages/devextreme-react/src/select-box.ts index cb578025cf7d..a8c791083282 100644 --- a/packages/devextreme-react/src/select-box.ts +++ b/packages/devextreme-react/src/select-box.ts @@ -10,11 +10,10 @@ import NestedOption from "./core/nested-option"; import type { ChangeEvent, ClosedEvent, ContentReadyEvent, CopyEvent, CustomItemCreatingEvent, CutEvent, DisposingEvent, EnterKeyEvent, FocusInEvent, FocusOutEvent, InitializedEvent, InputEvent, ItemClickEvent, KeyDownEvent, KeyUpEvent, OpenedEvent, PasteEvent, ValueChangedEvent } from "devextreme/ui/select_box"; import type { ContentReadyEvent as ButtonContentReadyEvent, DisposingEvent as ButtonDisposingEvent, InitializedEvent as ButtonInitializedEvent, dxButtonOptions, ClickEvent, OptionChangedEvent } from "devextreme/ui/button"; -import type { AnimationConfig, AnimationState, AnimationType } from "devextreme/animation/fx"; +import type { AnimationConfig, CollisionResolution, PositionConfig, AnimationState, AnimationType, CollisionResolutionCombination } from "devextreme/common/core/animation"; import type { HorizontalAlignment, VerticalAlignment, TextEditorButtonLocation, PositionAlignment, Direction, ButtonStyle, ButtonType, ToolbarItemLocation, ToolbarItemComponent } from "devextreme/common"; -import type { CollisionResolution, PositionConfig, CollisionResolutionCombination } from "devextreme/animation/position"; -import type { event, EventInfo } from "devextreme/events/index"; -import type { template } from "devextreme/core/templates/template"; +import type { event } from "devextreme/common/core/events/index"; +import type { EventInfo } from "devextreme/common/core/events"; import type { Component } from "devextreme/core/component"; import type { dxPopupToolbarItem, ToolbarLocation } from "devextreme/ui/popup"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; @@ -250,7 +249,7 @@ type IDropDownOptionsProps = React.PropsWithChildren<{ bindingOptions?: Record; closeOnOutsideClick?: boolean | ((event: event) => boolean); container?: any | string; - contentTemplate?: ((contentElement: any) => string | any) | template; + contentTemplate?: any | ((contentElement: any) => string | any); deferRendering?: boolean; disabled?: boolean; dragAndResizeArea?: any | string; @@ -290,7 +289,7 @@ type IDropDownOptionsProps = React.PropsWithChildren<{ showTitle?: boolean; tabIndex?: number; title?: string; - titleTemplate?: ((titleElement: any) => string | any) | template; + titleTemplate?: any | ((titleElement: any) => string | any); toolbarItems?: Array; visible?: boolean; width?: (() => number | string) | number | string; @@ -402,7 +401,7 @@ const Hide = Object.assign(_componen type IItemProps = React.PropsWithChildren<{ disabled?: boolean; html?: string; - template?: ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any) | template; + template?: any | ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any); text?: string; visible?: boolean; render?: (...params: any) => React.ReactNode; @@ -486,7 +485,7 @@ type IOptionsProps = React.PropsWithChildren<{ rtlEnabled?: boolean; stylingMode?: ButtonStyle; tabIndex?: number; - template?: ((buttonData: { icon: string, text: string }, contentElement: any) => string | any) | template; + template?: any | ((buttonData: { icon: string, text: string }, contentElement: any) => string | any); text?: string; type?: ButtonType | string; useSubmitBehavior?: boolean; @@ -611,10 +610,10 @@ type IToolbarItemProps = React.PropsWithChildren<{ html?: string; locateInMenu?: LocateInMenuMode; location?: ToolbarItemLocation; - menuItemTemplate?: (() => string | any) | template; + menuItemTemplate?: any | (() => string | any); options?: any; showText?: ShowTextMode; - template?: ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any) | template; + template?: any | ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any); text?: string; toolbar?: ToolbarLocation; visible?: boolean; diff --git a/packages/devextreme-react/src/slider.ts b/packages/devextreme-react/src/slider.ts index a74eab576ad5..71c4245b0769 100644 --- a/packages/devextreme-react/src/slider.ts +++ b/packages/devextreme-react/src/slider.ts @@ -10,7 +10,7 @@ import NestedOption from "./core/nested-option"; import type { ContentReadyEvent, DisposingEvent, InitializedEvent, ValueChangedEvent } from "devextreme/ui/slider"; import type { Format as CommonFormat, VerticalEdge, TooltipShowMode } from "devextreme/common"; -import type { Format as LocalizationFormat } from "devextreme/localization"; +import type { Format as LocalizationFormat } from "devextreme/common/core/localization"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; diff --git a/packages/devextreme-react/src/sparkline.ts b/packages/devextreme-react/src/sparkline.ts index bb6f79a6ffc6..25c9d638db9b 100644 --- a/packages/devextreme-react/src/sparkline.ts +++ b/packages/devextreme-react/src/sparkline.ts @@ -11,8 +11,7 @@ import NestedOption from "./core/nested-option"; import type { DisposingEvent, DrawnEvent, ExportedEvent, ExportingEvent, FileSavingEvent, IncidentOccurredEvent, InitializedEvent, TooltipHiddenEvent, TooltipShownEvent } from "devextreme/viz/sparkline"; import type { DashStyle, Font as ChartsFont } from "devextreme/common/charts"; import type { Format as CommonFormat } from "devextreme/common"; -import type { Format as LocalizationFormat } from "devextreme/localization"; -import type { template } from "devextreme/core/templates/template"; +import type { Format as LocalizationFormat } from "devextreme/common/core/localization"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; @@ -213,7 +212,7 @@ type ITooltipProps = React.PropsWithChildren<{ }; color?: string; container?: any | string; - contentTemplate?: ((pointsInfo: any, element: any) => string | any) | template; + contentTemplate?: any | ((pointsInfo: any, element: any) => string | any); cornerRadius?: number; customizeTooltip?: ((pointsInfo: any) => Record); enabled?: boolean; diff --git a/packages/devextreme-react/src/splitter.ts b/packages/devextreme-react/src/splitter.ts index 87832f1187a3..306e11e105e6 100644 --- a/packages/devextreme-react/src/splitter.ts +++ b/packages/devextreme-react/src/splitter.ts @@ -11,7 +11,6 @@ import NestedOption from "./core/nested-option"; import type { dxSplitterItem, ContentReadyEvent, DisposingEvent, InitializedEvent, ItemClickEvent, ItemCollapsedEvent, ItemContextMenuEvent, ItemExpandedEvent, ItemRenderedEvent, ResizeEvent, ResizeEndEvent, ResizeStartEvent, dxSplitterOptions } from "devextreme/ui/splitter"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; -import type { template } from "devextreme/core/templates/template"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; @@ -103,7 +102,7 @@ type IItemProps = React.PropsWithChildren<{ resizable?: boolean; size?: number | string; splitter?: dxSplitterOptions; - template?: ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any) | template; + template?: any | ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any); text?: string; visible?: boolean; render?: (...params: any) => React.ReactNode; diff --git a/packages/devextreme-react/src/tab-panel.ts b/packages/devextreme-react/src/tab-panel.ts index 4164d1fcb4a4..39f691995612 100644 --- a/packages/devextreme-react/src/tab-panel.ts +++ b/packages/devextreme-react/src/tab-panel.ts @@ -10,7 +10,6 @@ import { Component as BaseComponent, IHtmlOptions, ComponentRef, NestedComponent import NestedOption from "./core/nested-option"; import type { dxTabPanelItem, ContentReadyEvent, DisposingEvent, InitializedEvent, ItemClickEvent, ItemContextMenuEvent, ItemHoldEvent, ItemRenderedEvent, SelectionChangingEvent, TitleClickEvent, TitleHoldEvent, TitleRenderedEvent } from "devextreme/ui/tab_panel"; -import type { template } from "devextreme/core/templates/template"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; type ReplaceFieldTypes = { @@ -112,8 +111,8 @@ type IItemProps = React.PropsWithChildren<{ disabled?: boolean; html?: string; icon?: string; - tabTemplate?: (() => string | any) | template; - template?: ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any) | template; + tabTemplate?: any | (() => string | any); + template?: any | ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any); text?: string; title?: string; visible?: boolean; diff --git a/packages/devextreme-react/src/tabs.ts b/packages/devextreme-react/src/tabs.ts index d6d6ef54cdf1..bcf15f8a6794 100644 --- a/packages/devextreme-react/src/tabs.ts +++ b/packages/devextreme-react/src/tabs.ts @@ -11,7 +11,6 @@ import NestedOption from "./core/nested-option"; import type { dxTabsItem, ContentReadyEvent, DisposingEvent, InitializedEvent, ItemClickEvent, ItemContextMenuEvent, ItemHoldEvent, ItemRenderedEvent, SelectionChangingEvent } from "devextreme/ui/tabs"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; -import type { template } from "devextreme/core/templates/template"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; @@ -108,7 +107,7 @@ type IItemProps = React.PropsWithChildren<{ disabled?: boolean; html?: string; icon?: string; - template?: ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any) | template; + template?: any | ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any); text?: string; visible?: boolean; render?: (...params: any) => React.ReactNode; diff --git a/packages/devextreme-react/src/tag-box.ts b/packages/devextreme-react/src/tag-box.ts index 44c1ad78416f..dcea49a1688b 100644 --- a/packages/devextreme-react/src/tag-box.ts +++ b/packages/devextreme-react/src/tag-box.ts @@ -10,11 +10,10 @@ import NestedOption from "./core/nested-option"; import type { ChangeEvent, ClosedEvent, ContentReadyEvent, CustomItemCreatingEvent, DisposingEvent, EnterKeyEvent, FocusInEvent, FocusOutEvent, InitializedEvent, InputEvent, ItemClickEvent, KeyDownEvent, KeyUpEvent, MultiTagPreparingEvent, OpenedEvent, SelectAllValueChangedEvent, ValueChangedEvent } from "devextreme/ui/tag_box"; import type { ContentReadyEvent as ButtonContentReadyEvent, DisposingEvent as ButtonDisposingEvent, InitializedEvent as ButtonInitializedEvent, dxButtonOptions, ClickEvent, OptionChangedEvent } from "devextreme/ui/button"; -import type { AnimationConfig, AnimationState, AnimationType } from "devextreme/animation/fx"; +import type { AnimationConfig, CollisionResolution, PositionConfig, AnimationState, AnimationType, CollisionResolutionCombination } from "devextreme/common/core/animation"; import type { HorizontalAlignment, VerticalAlignment, TextEditorButtonLocation, PositionAlignment, Direction, ButtonStyle, ButtonType, ToolbarItemLocation, ToolbarItemComponent } from "devextreme/common"; -import type { CollisionResolution, PositionConfig, CollisionResolutionCombination } from "devextreme/animation/position"; -import type { event, EventInfo } from "devextreme/events/index"; -import type { template } from "devextreme/core/templates/template"; +import type { event } from "devextreme/common/core/events/index"; +import type { EventInfo } from "devextreme/common/core/events"; import type { Component } from "devextreme/core/component"; import type { dxPopupToolbarItem, ToolbarLocation } from "devextreme/ui/popup"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; @@ -256,7 +255,7 @@ type IDropDownOptionsProps = React.PropsWithChildren<{ bindingOptions?: Record; closeOnOutsideClick?: boolean | ((event: event) => boolean); container?: any | string; - contentTemplate?: ((contentElement: any) => string | any) | template; + contentTemplate?: any | ((contentElement: any) => string | any); deferRendering?: boolean; disabled?: boolean; dragAndResizeArea?: any | string; @@ -296,7 +295,7 @@ type IDropDownOptionsProps = React.PropsWithChildren<{ showTitle?: boolean; tabIndex?: number; title?: string; - titleTemplate?: ((titleElement: any) => string | any) | template; + titleTemplate?: any | ((titleElement: any) => string | any); toolbarItems?: Array; visible?: boolean; width?: (() => number | string) | number | string; @@ -408,7 +407,7 @@ const Hide = Object.assign(_componen type IItemProps = React.PropsWithChildren<{ disabled?: boolean; html?: string; - template?: ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any) | template; + template?: any | ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any); text?: string; visible?: boolean; render?: (...params: any) => React.ReactNode; @@ -492,7 +491,7 @@ type IOptionsProps = React.PropsWithChildren<{ rtlEnabled?: boolean; stylingMode?: ButtonStyle; tabIndex?: number; - template?: ((buttonData: { icon: string, text: string }, contentElement: any) => string | any) | template; + template?: any | ((buttonData: { icon: string, text: string }, contentElement: any) => string | any); text?: string; type?: ButtonType | string; useSubmitBehavior?: boolean; @@ -617,10 +616,10 @@ type IToolbarItemProps = React.PropsWithChildren<{ html?: string; locateInMenu?: LocateInMenuMode; location?: ToolbarItemLocation; - menuItemTemplate?: (() => string | any) | template; + menuItemTemplate?: any | (() => string | any); options?: any; showText?: ShowTextMode; - template?: ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any) | template; + template?: any | ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any); text?: string; toolbar?: ToolbarLocation; visible?: boolean; diff --git a/packages/devextreme-react/src/text-box.ts b/packages/devextreme-react/src/text-box.ts index 83dae49d1a97..bbdd7048264b 100644 --- a/packages/devextreme-react/src/text-box.ts +++ b/packages/devextreme-react/src/text-box.ts @@ -11,7 +11,6 @@ import NestedOption from "./core/nested-option"; import type { ChangeEvent, ContentReadyEvent, CopyEvent, CutEvent, DisposingEvent, EnterKeyEvent, FocusInEvent, FocusOutEvent, InitializedEvent, InputEvent, KeyDownEvent, KeyUpEvent, PasteEvent, ValueChangedEvent } from "devextreme/ui/text_box"; import type { ContentReadyEvent as ButtonContentReadyEvent, DisposingEvent as ButtonDisposingEvent, InitializedEvent as ButtonInitializedEvent, dxButtonOptions, ClickEvent, OptionChangedEvent } from "devextreme/ui/button"; import type { TextEditorButtonLocation, ButtonStyle, ButtonType } from "devextreme/common"; -import type { template } from "devextreme/core/templates/template"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; @@ -128,7 +127,7 @@ type IOptionsProps = React.PropsWithChildren<{ rtlEnabled?: boolean; stylingMode?: ButtonStyle; tabIndex?: number; - template?: ((buttonData: { icon: string, text: string }, contentElement: any) => string | any) | template; + template?: any | ((buttonData: { icon: string, text: string }, contentElement: any) => string | any); text?: string; type?: ButtonType | string; useSubmitBehavior?: boolean; diff --git a/packages/devextreme-react/src/tile-view.ts b/packages/devextreme-react/src/tile-view.ts index 2f65dd0837c7..8dd96591cf63 100644 --- a/packages/devextreme-react/src/tile-view.ts +++ b/packages/devextreme-react/src/tile-view.ts @@ -11,7 +11,6 @@ import NestedOption from "./core/nested-option"; import type { dxTileViewItem, ContentReadyEvent, DisposingEvent, InitializedEvent, ItemClickEvent, ItemContextMenuEvent, ItemHoldEvent, ItemRenderedEvent } from "devextreme/ui/tile_view"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; -import type { template } from "devextreme/core/templates/template"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; @@ -94,7 +93,7 @@ type IItemProps = React.PropsWithChildren<{ disabled?: boolean; heightRatio?: number; html?: string; - template?: ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any) | template; + template?: any | ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any); text?: string; visible?: boolean; widthRatio?: number; diff --git a/packages/devextreme-react/src/toast.ts b/packages/devextreme-react/src/toast.ts index f6281208276a..4faa286d2d81 100644 --- a/packages/devextreme-react/src/toast.ts +++ b/packages/devextreme-react/src/toast.ts @@ -8,9 +8,8 @@ import dxToast, { import { Component as BaseComponent, IHtmlOptions, ComponentRef, NestedComponentMeta } from "./core/component"; import NestedOption from "./core/nested-option"; -import type { PositionConfig, CollisionResolution, CollisionResolutionCombination } from "devextreme/animation/position"; +import type { PositionConfig, AnimationConfig, CollisionResolution, AnimationState, AnimationType, CollisionResolutionCombination } from "devextreme/common/core/animation"; import type { ContentReadyEvent, DisposingEvent, HiddenEvent, HidingEvent, InitializedEvent, ShowingEvent, ShownEvent } from "devextreme/ui/toast"; -import type { AnimationConfig, AnimationState, AnimationType } from "devextreme/animation/fx"; import type { HorizontalAlignment, VerticalAlignment, Direction, PositionAlignment } from "devextreme/common"; type ReplaceFieldTypes = { diff --git a/packages/devextreme-react/src/toolbar.ts b/packages/devextreme-react/src/toolbar.ts index 60adb1b14429..59f537f90fc3 100644 --- a/packages/devextreme-react/src/toolbar.ts +++ b/packages/devextreme-react/src/toolbar.ts @@ -11,7 +11,6 @@ import NestedOption from "./core/nested-option"; import type { dxToolbarItem, ContentReadyEvent, DisposingEvent, InitializedEvent, ItemClickEvent, ItemContextMenuEvent, ItemHoldEvent, ItemRenderedEvent, LocateInMenuMode, ShowTextMode } from "devextreme/ui/toolbar"; import type { ToolbarItemLocation, ToolbarItemComponent } from "devextreme/common"; -import type { template } from "devextreme/core/templates/template"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; type ReplaceFieldTypes = { @@ -104,10 +103,10 @@ type IItemProps = React.PropsWithChildren<{ html?: string; locateInMenu?: LocateInMenuMode; location?: ToolbarItemLocation; - menuItemTemplate?: (() => string | any) | template; + menuItemTemplate?: any | (() => string | any); options?: any; showText?: ShowTextMode; - template?: ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any) | template; + template?: any | ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any); text?: string; visible?: boolean; widget?: ToolbarItemComponent; diff --git a/packages/devextreme-react/src/tooltip.ts b/packages/devextreme-react/src/tooltip.ts index 633c86326950..2e19c83cfe19 100644 --- a/packages/devextreme-react/src/tooltip.ts +++ b/packages/devextreme-react/src/tooltip.ts @@ -9,9 +9,8 @@ import { Component as BaseComponent, IHtmlOptions, ComponentRef, NestedComponent import NestedOption from "./core/nested-option"; import type { Position as CommonPosition, HorizontalAlignment, VerticalAlignment, Direction, PositionAlignment } from "devextreme/common"; -import type { PositionConfig, CollisionResolution, CollisionResolutionCombination } from "devextreme/animation/position"; +import type { PositionConfig, AnimationConfig, CollisionResolution, AnimationState, AnimationType, CollisionResolutionCombination } from "devextreme/common/core/animation"; import type { ContentReadyEvent, DisposingEvent, HiddenEvent, HidingEvent, InitializedEvent, ShowingEvent, ShownEvent } from "devextreme/ui/tooltip"; -import type { AnimationConfig, AnimationState, AnimationType } from "devextreme/animation/fx"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; diff --git a/packages/devextreme-react/src/tree-list.ts b/packages/devextreme-react/src/tree-list.ts index 757a953e7e67..8536d6a416fc 100644 --- a/packages/devextreme-react/src/tree-list.ts +++ b/packages/devextreme-react/src/tree-list.ts @@ -13,15 +13,14 @@ import type { dxTreeListColumn, AdaptiveDetailRowPreparingEvent, CellClickEvent, import type { DataChange, DataChangeType, FilterOperation, FilterType, FixedPosition, HeaderFilterGroupInterval, ColumnHeaderFilterSearchConfig, SelectedFilterOperation, ColumnChooserMode, ColumnChooserSearchConfig, ColumnChooserSelectionConfig, GridsEditMode, GridsEditRefreshMode, StartEditAction, GridBase, ApplyFilterMode, HeaderFilterSearchConfig, EnterKeyAction, EnterKeyDirection, PagerPageSize, DataRenderMode, StateStoreType } from "devextreme/common/grids"; import type { ContentReadyEvent as FilterBuilderContentReadyEvent, DisposingEvent as FilterBuilderDisposingEvent, EditorPreparedEvent as FilterBuilderEditorPreparedEvent, EditorPreparingEvent as FilterBuilderEditorPreparingEvent, InitializedEvent as FilterBuilderInitializedEvent, dxFilterBuilderField, FilterBuilderOperation, dxFilterBuilderCustomOperation, GroupOperation, OptionChangedEvent, ValueChangedEvent } from "devextreme/ui/filter_builder"; import type { ContentReadyEvent as FormContentReadyEvent, DisposingEvent as FormDisposingEvent, InitializedEvent as FormInitializedEvent, dxFormSimpleItem, dxFormOptions, OptionChangedEvent as FormOptionChangedEvent, dxFormGroupItem, dxFormTabbedItem, dxFormEmptyItem, dxFormButtonItem, LabelLocation, FormLabelMode, EditorEnterKeyEvent, FieldDataChangedEvent, FormItemComponent, FormItemType } from "devextreme/ui/form"; -import type { AnimationConfig, AnimationState, AnimationType } from "devextreme/animation/fx"; +import type { AnimationConfig, CollisionResolution, PositionConfig, AnimationState, AnimationType, CollisionResolutionCombination } from "devextreme/common/core/animation"; import type { ValidationRuleType, HorizontalAlignment, VerticalAlignment, DataType, Format as CommonFormat, SearchMode, SortOrder, ComparisonOperator, PositionAlignment, Mode, Direction, ToolbarItemLocation, ToolbarItemComponent, DisplayMode, DragDirection, DragHighlight, ScrollMode, ScrollbarMode, SingleMultipleOrNone } from "devextreme/common"; -import type { event, EventInfo } from "devextreme/events/index"; -import type { template } from "devextreme/core/templates/template"; -import type { CollisionResolution, PositionConfig, CollisionResolutionCombination } from "devextreme/animation/position"; -import type { Format as LocalizationFormat } from "devextreme/localization"; +import type { event } from "devextreme/common/core/events/index"; +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"; +import type { Store } from "devextreme/common/data"; import type { dxPopupOptions, dxPopupToolbarItem, ToolbarLocation } from "devextreme/ui/popup"; +import type { EventInfo } from "devextreme/common/core/events"; import type { Component } from "devextreme/core/component"; import type { LocateInMenuMode, ShowTextMode } from "devextreme/ui/toolbar"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; @@ -277,7 +276,7 @@ type IButtonProps = React.PropsWithChildren<{ icon?: string; name?: string | TreeListPredefinedColumnButton; onClick?: ((e: { column: dxTreeListColumn, component: dxTreeList, element: any, event: event, model: any, row: dxTreeListRowObject }) => void); - template?: ((cellElement: any, cellInfo: { column: dxTreeListColumn, columnIndex: number, component: dxTreeList, data: Record, key: any, row: dxTreeListRowObject, rowIndex: number, rowType: string }) => string | any) | template; + template?: any | ((cellElement: any, cellInfo: { column: dxTreeListColumn, columnIndex: number, component: dxTreeList, data: Record, key: any, row: dxTreeListRowObject, rowIndex: number, rowType: string }) => string | any); text?: string; visible?: boolean | ((options: { column: dxTreeListColumn, component: dxTreeList, row: dxTreeListRowObject }) => boolean); render?: (...params: any) => React.ReactNode; @@ -384,13 +383,13 @@ type IColumnProps = React.PropsWithChildren<{ calculateFilterExpression?: ((filterValue: any, selectedFilterOperation: string | null, target: string) => string | (() => any) | Array); calculateSortValue?: ((rowData: any) => any) | string; caption?: string; - cellTemplate?: ((cellElement: any, cellInfo: { column: dxTreeListColumn, columnIndex: number, component: dxTreeList, data: Record, displayValue: any, oldValue: any, row: dxTreeListRowObject, rowIndex: number, rowType: string, text: string, value: any, watch: (() => void) }) => any) | template; + cellTemplate?: any | ((cellElement: any, cellInfo: { column: dxTreeListColumn, columnIndex: number, component: dxTreeList, data: Record, displayValue: any, oldValue: any, row: dxTreeListRowObject, rowIndex: number, rowType: string, text: string, value: any, watch: (() => void) }) => any); columns?: Array; cssClass?: string; customizeText?: ((cellInfo: { groupInterval: string | number, target: string, value: any, valueText: string }) => string); dataField?: string; dataType?: DataType; - editCellTemplate?: ((cellElement: any, cellInfo: { column: dxTreeListColumn, columnIndex: number, component: dxTreeList, data: Record, displayValue: any, row: dxTreeListRowObject, rowIndex: number, rowType: string, setValue(newValue, newText): any, text: string, value: any, watch: (() => void) }) => any) | template; + editCellTemplate?: any | ((cellElement: any, cellInfo: { column: dxTreeListColumn, columnIndex: number, component: dxTreeList, data: Record, displayValue: any, row: dxTreeListRowObject, rowIndex: number, rowType: string, setValue(newValue, newText): any, text: string, value: any, watch: (() => void) }) => any); editorOptions?: any; encodeHtml?: boolean; falseText?: string; @@ -402,7 +401,7 @@ type IColumnProps = React.PropsWithChildren<{ fixedPosition?: FixedPosition; format?: LocalizationFormat; formItem?: dxFormSimpleItem; - headerCellTemplate?: ((columnHeader: any, headerInfo: { column: dxTreeListColumn, columnIndex: number, component: dxTreeList }) => any) | template; + headerCellTemplate?: any | ((columnHeader: any, headerInfo: { column: dxTreeListColumn, columnIndex: number, component: dxTreeList }) => any); headerFilter?: Record | { allowSearch?: boolean; allowSelectAll?: boolean; @@ -777,7 +776,7 @@ type ICustomOperationProps = React.PropsWithChildren<{ caption?: string; customizeText?: ((fieldInfo: { field: dxFilterBuilderField, value: string | number | Date, valueText: string }) => string); dataTypes?: Array; - editorTemplate?: ((conditionInfo: { field: dxFilterBuilderField, setValue: (() => void), value: string | number | Date }, container: any) => string | any) | template; + editorTemplate?: any | ((conditionInfo: { field: dxFilterBuilderField, setValue: (() => void), value: string | number | Date }, container: any) => string | any); hasValue?: boolean; icon?: string; name?: string; @@ -956,7 +955,7 @@ type IFieldProps = React.PropsWithChildren<{ dataField?: string; dataType?: DataType; editorOptions?: any; - editorTemplate?: ((conditionInfo: { field: dxFilterBuilderField, filterOperation: string, setValue: (() => void), value: string | number | Date }, container: any) => string | any) | template; + editorTemplate?: any | ((conditionInfo: { field: dxFilterBuilderField, filterOperation: string, setValue: (() => void), value: string | number | Date }, container: any) => string | any); falseText?: string; filterOperations?: Array; format?: LocalizationFormat; @@ -1102,7 +1101,7 @@ type IFilterBuilderPopupProps = React.PropsWithChildren<{ bindingOptions?: Record; closeOnOutsideClick?: boolean | ((event: event) => boolean); container?: any | string; - contentTemplate?: ((contentElement: any) => string | any) | template; + contentTemplate?: any | ((contentElement: any) => string | any); deferRendering?: boolean; disabled?: boolean; dragAndResizeArea?: any | string; @@ -1142,7 +1141,7 @@ type IFilterBuilderPopupProps = React.PropsWithChildren<{ showTitle?: boolean; tabIndex?: number; title?: string; - titleTemplate?: ((titleElement: any) => string | any) | template; + titleTemplate?: any | ((titleElement: any) => string | any); toolbarItems?: Array; visible?: boolean; width?: (() => number | string) | number | string; @@ -1423,12 +1422,12 @@ type IFormItemProps = React.PropsWithChildren<{ alignment?: HorizontalAlignment; location?: LabelLocation; showColon?: boolean; - template?: ((itemData: { component: dxForm, dataField: string, editorOptions: any, editorType: string, name: string, text: string }, itemElement: any) => string | any) | template; + template?: any | ((itemData: { component: dxForm, dataField: string, editorOptions: any, editorType: string, name: string, text: string }, itemElement: any) => string | any); text?: string; visible?: boolean; }; name?: string; - template?: ((data: { component: dxForm, dataField: string, editorOptions: Record, editorType: string, name: string }, itemElement: any) => string | any) | template; + template?: any | ((data: { component: dxForm, dataField: string, editorOptions: Record, editorType: string, name: string }, itemElement: any) => string | any); validationRules?: Array; visible?: boolean; visibleIndex?: number; @@ -1606,11 +1605,11 @@ type IItemProps = React.PropsWithChildren<{ html?: string; locateInMenu?: LocateInMenuMode; location?: ToolbarItemLocation; - menuItemTemplate?: (() => string | any) | template; + menuItemTemplate?: any | (() => string | any); name?: string | TreeListPredefinedToolbarItem; options?: any; showText?: ShowTextMode; - template?: ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any) | template; + template?: any | ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any); text?: string; visible?: boolean; widget?: ToolbarItemComponent; @@ -1669,7 +1668,7 @@ type ILabelProps = React.PropsWithChildren<{ alignment?: HorizontalAlignment; location?: LabelLocation; showColon?: boolean; - template?: ((itemData: { component: dxForm, dataField: string, editorOptions: any, editorType: string, name: string, text: string }, itemElement: any) => string | any) | template; + template?: any | ((itemData: { component: dxForm, dataField: string, editorOptions: any, editorType: string, name: string, text: string }, itemElement: any) => string | any); text?: string; visible?: boolean; render?: (...params: any) => React.ReactNode; @@ -1923,7 +1922,7 @@ type IPopupProps = React.PropsWithChildren<{ bindingOptions?: Record; closeOnOutsideClick?: boolean | ((event: event) => boolean); container?: any | string; - contentTemplate?: ((contentElement: any) => string | any) | template; + contentTemplate?: any | ((contentElement: any) => string | any); deferRendering?: boolean; disabled?: boolean; dragAndResizeArea?: any | string; @@ -1963,7 +1962,7 @@ type IPopupProps = React.PropsWithChildren<{ showTitle?: boolean; tabIndex?: number; title?: string; - titleTemplate?: ((titleElement: any) => string | any) | template; + titleTemplate?: any | ((titleElement: any) => string | any); toolbarItems?: Array; visible?: boolean; width?: (() => number | string) | number | string; @@ -2142,7 +2141,7 @@ type IRowDraggingProps = React.PropsWithChildren<{ }; data?: any; dragDirection?: DragDirection; - dragTemplate?: ((dragInfo: { itemData: any, itemElement: any }, containerElement: any) => string | any) | template; + dragTemplate?: any | ((dragInfo: { itemData: any, itemElement: any }, containerElement: any) => string | any); dropFeedbackMode?: DragHighlight; filter?: string; group?: string; @@ -2478,10 +2477,10 @@ type IToolbarItemProps = React.PropsWithChildren<{ html?: string; locateInMenu?: LocateInMenuMode; location?: ToolbarItemLocation; - menuItemTemplate?: (() => string | any) | template; + menuItemTemplate?: any | (() => string | any); options?: any; showText?: ShowTextMode; - template?: ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any) | template; + template?: any | ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any); text?: string; toolbar?: ToolbarLocation; visible?: boolean; diff --git a/packages/devextreme-react/src/tree-map.ts b/packages/devextreme-react/src/tree-map.ts index 3f571510e468..84d467f83f45 100644 --- a/packages/devextreme-react/src/tree-map.ts +++ b/packages/devextreme-react/src/tree-map.ts @@ -11,8 +11,7 @@ import NestedOption from "./core/nested-option"; import type { ClickEvent, DisposingEvent, DrawnEvent, DrillEvent, ExportedEvent, ExportingEvent, FileSavingEvent, IncidentOccurredEvent, InitializedEvent, NodesInitializedEvent, NodesRenderingEvent, TreeMapColorizerType, dxTreeMapNode } from "devextreme/viz/tree_map"; import type { DashStyle, Palette, PaletteExtensionMode, Font as ChartsFont, TextOverflow, WordWrap } from "devextreme/common/charts"; import type { ExportFormat, Format as CommonFormat, HorizontalAlignment, VerticalEdge } from "devextreme/common"; -import type { Format as LocalizationFormat } from "devextreme/localization"; -import type { template } from "devextreme/core/templates/template"; +import type { Format as LocalizationFormat } from "devextreme/common/core/localization"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; @@ -602,7 +601,7 @@ type ITooltipProps = React.PropsWithChildren<{ }; color?: string; container?: any | string; - contentTemplate?: ((info: { node: dxTreeMapNode, value: number, valueText: string }, element: any) => string | any) | template; + contentTemplate?: any | ((info: { node: dxTreeMapNode, value: number, valueText: string }, element: any) => string | any); cornerRadius?: number; customizeTooltip?: ((info: { node: dxTreeMapNode, value: number, valueText: string }) => Record); enabled?: boolean; diff --git a/packages/devextreme-react/src/tree-view.ts b/packages/devextreme-react/src/tree-view.ts index e9e15324d2da..3ea78ae24249 100644 --- a/packages/devextreme-react/src/tree-view.ts +++ b/packages/devextreme-react/src/tree-view.ts @@ -14,7 +14,6 @@ import type { ContentReadyEvent as ButtonContentReadyEvent, DisposingEvent as Bu import type { ContentReadyEvent as TextBoxContentReadyEvent, DisposingEvent as TextBoxDisposingEvent, InitializedEvent as TextBoxInitializedEvent, OptionChangedEvent as TextBoxOptionChangedEvent, TextBoxType, ChangeEvent, CopyEvent, CutEvent, EnterKeyEvent, FocusInEvent, FocusOutEvent, InputEvent, KeyDownEvent, KeyUpEvent, PasteEvent, ValueChangedEvent } from "devextreme/ui/text_box"; import type { TextEditorButtonLocation, ButtonStyle, ButtonType, TextBoxPredefinedButton, TextEditorButton, LabelMode, MaskMode, EditorStyle, ValidationMessageMode, Position, ValidationStatus } from "devextreme/common"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; -import type { template } from "devextreme/core/templates/template"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; @@ -131,7 +130,7 @@ type IItemProps = React.PropsWithChildren<{ items?: Array; parentId?: number | string; selected?: boolean; - template?: ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any) | template; + template?: any | ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any); text?: string; visible?: boolean; render?: (...params: any) => React.ReactNode; @@ -177,7 +176,7 @@ type IOptionsProps = React.PropsWithChildren<{ rtlEnabled?: boolean; stylingMode?: ButtonStyle; tabIndex?: number; - template?: ((buttonData: { icon: string, text: string }, contentElement: any) => string | any) | template; + template?: any | ((buttonData: { icon: string, text: string }, contentElement: any) => string | any); text?: string; type?: ButtonType | string; useSubmitBehavior?: boolean; diff --git a/packages/devextreme-react/src/validation-summary.ts b/packages/devextreme-react/src/validation-summary.ts index a9fce1865b99..af911afdb360 100644 --- a/packages/devextreme-react/src/validation-summary.ts +++ b/packages/devextreme-react/src/validation-summary.ts @@ -11,7 +11,6 @@ import NestedOption from "./core/nested-option"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; import type { ContentReadyEvent, DisposingEvent, InitializedEvent, ItemClickEvent } from "devextreme/ui/validation_summary"; -import type { template } from "devextreme/core/templates/template"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; @@ -90,7 +89,7 @@ const ValidationSummary = memo( type IItemProps = React.PropsWithChildren<{ disabled?: boolean; html?: string; - template?: ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any) | template; + template?: any | ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any); text?: string; visible?: boolean; render?: (...params: any) => React.ReactNode; diff --git a/packages/devextreme-react/src/vector-map.ts b/packages/devextreme-react/src/vector-map.ts index b133473c4c1e..c89c68def19c 100644 --- a/packages/devextreme-react/src/vector-map.ts +++ b/packages/devextreme-react/src/vector-map.ts @@ -10,10 +10,9 @@ import NestedOption from "./core/nested-option"; import type { ClickEvent, DisposingEvent, DrawnEvent, ExportedEvent, ExportingEvent, FileSavingEvent, IncidentOccurredEvent, InitializedEvent, TooltipHiddenEvent, TooltipShownEvent, dxVectorMapAnnotationConfig, MapLayerElement, VectorMapMarkerType, VectorMapLayerType, VectorMapLegendItem, VectorMapMarkerShape } from "devextreme/viz/vector_map"; import type { DashStyle, Font as ChartsFont, TextOverflow, AnnotationType, WordWrap, Palette } from "devextreme/common/charts"; -import type { template } from "devextreme/core/templates/template"; import type { HorizontalAlignment, VerticalEdge, ExportFormat, SingleMultipleOrNone, Position, Orientation } from "devextreme/common"; import type { DataSourceOptions } from "devextreme/data/data_source"; -import type { Store } from "devextreme/data/store"; +import type { Store } from "devextreme/common/data"; import type DataSource from "devextreme/data/data_source"; @@ -134,11 +133,11 @@ type IAnnotationProps = React.PropsWithChildren<{ offsetY?: number; opacity?: number; }; - template?: ((annotation: dxVectorMapAnnotationConfig | any, element: any) => string | any) | template; + template?: any | ((annotation: dxVectorMapAnnotationConfig | any, element: any) => string | any); text?: string; textOverflow?: TextOverflow; tooltipEnabled?: boolean; - tooltipTemplate?: ((annotation: dxVectorMapAnnotationConfig | any, element: any) => string | any) | template; + tooltipTemplate?: any | ((annotation: dxVectorMapAnnotationConfig | any, element: any) => string | any); type?: AnnotationType; width?: number; wordWrap?: WordWrap; @@ -285,11 +284,11 @@ type ICommonAnnotationSettingsProps = React.PropsWithChildren<{ offsetY?: number; opacity?: number; }; - template?: ((annotation: dxVectorMapAnnotationConfig | any, element: any) => string | any) | template; + template?: any | ((annotation: dxVectorMapAnnotationConfig | any, element: any) => string | any); text?: string; textOverflow?: TextOverflow; tooltipEnabled?: boolean; - tooltipTemplate?: ((annotation: dxVectorMapAnnotationConfig | any, element: any) => string | any) | template; + tooltipTemplate?: any | ((annotation: dxVectorMapAnnotationConfig | any, element: any) => string | any); type?: AnnotationType; width?: number; wordWrap?: WordWrap; @@ -529,7 +528,7 @@ type ILegendProps = React.PropsWithChildren<{ markerColor?: string; markerShape?: VectorMapMarkerShape; markerSize?: number; - markerTemplate?: ((legendItem: VectorMapLegendItem, element: any) => string | any) | template; + markerTemplate?: any | ((legendItem: VectorMapLegendItem, element: any) => string | any); orientation?: Orientation; paddingLeftRight?: number; paddingTopBottom?: number; @@ -860,7 +859,7 @@ type ITooltipProps = React.PropsWithChildren<{ }; color?: string; container?: any | string; - contentTemplate?: ((info: MapLayerElement, element: any) => string | any) | template; + contentTemplate?: any | ((info: MapLayerElement, element: any) => string | any); cornerRadius?: number; customizeTooltip?: ((info: MapLayerElement) => Record); enabled?: boolean; diff --git a/packages/devextreme-vue/src/common/core/animation.ts b/packages/devextreme-vue/src/common/core/animation.ts new file mode 100644 index 000000000000..65dbc2236713 --- /dev/null +++ b/packages/devextreme-vue/src/common/core/animation.ts @@ -0,0 +1,12 @@ +export { + AnimationConfig, + animationPresets, + AnimationState, + cancelAnimationFrame, + CollisionResolution, + CollisionResolutionCombination, + fx, + PositionConfig, + requestAnimationFrame, + TransitionExecutor, +} from "devextreme/common/core/animation"; diff --git a/packages/devextreme-vue/src/common/core/environment.ts b/packages/devextreme-vue/src/common/core/environment.ts new file mode 100644 index 000000000000..4c093b9aef9f --- /dev/null +++ b/packages/devextreme-vue/src/common/core/environment.ts @@ -0,0 +1,9 @@ +export { + Device, + devices, + DevicesObject, + dxSchedulerTimeZone, + getTimeZones, + hideTopOverlay, + initMobileViewport, +} from "devextreme/common/core/environment"; diff --git a/packages/devextreme-vue/src/common/core/events.ts b/packages/devextreme-vue/src/common/core/events.ts new file mode 100644 index 000000000000..838422a19b13 --- /dev/null +++ b/packages/devextreme-vue/src/common/core/events.ts @@ -0,0 +1,16 @@ +export { + AsyncCancelable, + Cancelable, + ChangedOptionInfo, + DxEvent, + EventInfo, + EventObject, + InitializedEventInfo, + ItemInfo, + NativeEventInfo, + off, + on, + one, + trigger, + triggerHandler, +} from "devextreme/common/core/events"; diff --git a/packages/devextreme-vue/src/common/core/events/index.ts b/packages/devextreme-vue/src/common/core/events/index.ts new file mode 100644 index 000000000000..902158b1a7fb --- /dev/null +++ b/packages/devextreme-vue/src/common/core/events/index.ts @@ -0,0 +1,4 @@ +export { + event, + eventsHandler, +} from "devextreme/common/core/events/index"; diff --git a/packages/devextreme-vue/src/common/core/localization.ts b/packages/devextreme-vue/src/common/core/localization.ts new file mode 100644 index 000000000000..8dd8ec2ad04b --- /dev/null +++ b/packages/devextreme-vue/src/common/core/localization.ts @@ -0,0 +1,10 @@ +export { + Format, + formatDate, + formatMessage, + formatNumber, + loadMessages, + locale, + parseDate, + parseNumber, +} from "devextreme/common/core/localization"; diff --git a/packages/devextreme-vue/src/common/data.ts b/packages/devextreme-vue/src/common/data.ts new file mode 100644 index 000000000000..3c5560b87f84 --- /dev/null +++ b/packages/devextreme-vue/src/common/data.ts @@ -0,0 +1,47 @@ +export { + applyChanges, + ArrayStore, + ArrayStoreOptions, + base64_encode, + compileGetter, + compileSetter, + CustomStore, + CustomStoreOptions, + DataHelperMixin, + DataSource, + DataSourceLike, + DataSourceOptions, + EdmLiteral, + EndpointSelector, + errorHandler, + FilterDescriptor, + GroupDescriptor, + GroupingInterval, + GroupItem, + isGroupItemsArray, + isItemsArray, + isLoadResultObject, + keyConverters, + LangParams, + LoadOptions, + LoadResult, + LoadResultObject, + LocalStore, + LocalStoreOptions, + ODataContext, + ODataContextOptions, + ODataStore, + ODataStoreOptions, + query, + Query, + ResolvedData, + SearchOperation, + SelectDescriptor, + setErrorHandler, + SortDescriptor, + Store, + StoreBase, + StoreOptions, + StoreOptionsBase, + SummaryDescriptor, +} from "devextreme/common/data"; diff --git a/packages/devextreme-vue/src/common/export.ts b/packages/devextreme-vue/src/common/export.ts new file mode 100644 index 000000000000..7c4d2823d9cc --- /dev/null +++ b/packages/devextreme-vue/src/common/export.ts @@ -0,0 +1,3 @@ +export { + ExportLoadPanel, +} from "devextreme/common/export"; diff --git a/packages/devextreme-vue/src/common/export/excel.ts b/packages/devextreme-vue/src/common/export/excel.ts new file mode 100644 index 000000000000..0811477e2db8 --- /dev/null +++ b/packages/devextreme-vue/src/common/export/excel.ts @@ -0,0 +1,11 @@ +export { + CellAddress, + CellRange, + DataGridCell, + ExcelExportBaseProps, + ExcelExportDataGridProps, + ExcelExportPivotGridProps, + exportDataGrid, + exportPivotGrid, + PivotGridCell, +} from "devextreme/common/export/excel"; diff --git a/packages/devextreme-vue/src/common/export/pdf.ts b/packages/devextreme-vue/src/common/export/pdf.ts new file mode 100644 index 000000000000..dc2228cc16c7 --- /dev/null +++ b/packages/devextreme-vue/src/common/export/pdf.ts @@ -0,0 +1,9 @@ +export { + Cell, + DataGridCell, + exportDataGrid, + exportGantt, + PdfExportDataGridProps, + PdfExportGanttFont, + PdfExportGanttProps, +} from "devextreme/common/export/pdf"; diff --git a/packages/devextreme-vue/src/common/file_management.ts b/packages/devextreme-vue/src/common/file_management.ts new file mode 100644 index 000000000000..af0107843475 --- /dev/null +++ b/packages/devextreme-vue/src/common/file_management.ts @@ -0,0 +1,13 @@ +export { + CustomFileSystemProvider, + CustomFileSystemProviderOptions, + FileSystemError, + FileSystemItem, + FileSystemProviderBase, + FileSystemProviderBaseOptions, + ObjectFileSystemProvider, + ObjectFileSystemProviderOptions, + RemoteFileSystemProvider, + RemoteFileSystemProviderOptions, + UploadInfo, +} from "devextreme/common/file_management"; diff --git a/packages/devextreme-vue/src/common/index.ts b/packages/devextreme-vue/src/common/index.ts index 4cddfd8869c9..4393213fec9a 100644 --- a/packages/devextreme-vue/src/common/index.ts +++ b/packages/devextreme-vue/src/common/index.ts @@ -5,21 +5,26 @@ export { ButtonType, CompareRule, ComparisonOperator, + config, CustomRule, DataStructure, DataType, + DefaultOptionsRule, Direction, DisplayMode, DragDirection, Draggable, DragHighlight, + DxPromise, EditorStyle, EmailRule, ExportFormat, FieldChooserLayout, FirstDayOfWeek, + FloatingActionButtonDirection, Format, GlobalConfig, + Guid, HorizontalAlignment, HorizontalEdge, LabelMode, @@ -41,6 +46,7 @@ export { ScrollMode, SearchMode, SelectAllMode, + setTemplateEngine, SimplifiedSearchMode, SingleMultipleAllOrNone, SingleMultipleOrNone, @@ -54,6 +60,7 @@ export { SubmenuShowMode, TabsIconPosition, TabsStyle, + Template, TextBoxPredefinedButton, TextEditorButton, TextEditorButtonLocation, diff --git a/packages/devextreme/ts/dx.all.d.ts b/packages/devextreme/ts/dx.all.d.ts index c710318a0424..da15c683420b 100644 --- a/packages/devextreme/ts/dx.all.d.ts +++ b/packages/devextreme/ts/dx.all.d.ts @@ -545,7 +545,7 @@ declare module DevExpress { /** * [descr:AnimationConfig.from] */ - from?: DevExpress.animation.AnimationState; + from?: DevExpress.common.AnimationState; /** * [descr:AnimationConfig.staggerDelay] */ @@ -560,16 +560,16 @@ declare module DevExpress { /** * [descr:AnimationConfig.to] */ - to?: DevExpress.animation.AnimationState; + to?: DevExpress.common.AnimationState; /** * [descr:AnimationConfig.type] */ - type?: DevExpress.animation.AnimationType; + type?: DevExpress.common.AnimationType; }; /** * [descr:animationPresets] */ - export const animationPresets: { + export declare const animationPresets: { /** * [descr:animationPresets.applyChanges()] */ @@ -697,15 +697,12 @@ declare module DevExpress { */ export function config(config: DevExpress.common.GlobalConfig): void; /** - * [descr:DataHelperMixin] - * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. + * [descr:DefaultOptionsRule] */ - export class DataHelperMixin { - /** - * [descr:DataHelperMixin.getDataSource()] - */ - getDataSource(): DevExpress.data.DataSource; - } + export type DefaultOptionsRule = { + device?: Device | Device[] | ((device: Device) => boolean); + options: DevExpress.core.DeepPartial; + }; /** * [descr:Device] */ @@ -750,7 +747,7 @@ declare module DevExpress { /** * [descr:devices] */ - export const devices: DevicesObject; + export declare const devices: DevicesObject; /** * [descr:DevicesObject] */ @@ -767,19 +764,19 @@ declare module DevExpress { /** * [descr:DevicesObject.off(eventName)] */ - off(eventName: DevExpress.core.EventName): this; + off(eventName: DevExpress.common.EventName): this; /** * [descr:DevicesObject.off(eventName, eventHandler)] */ - off(eventName: DevExpress.core.EventName, eventHandler: Function): this; + off(eventName: DevExpress.common.EventName, eventHandler: Function): this; /** * [descr:DevicesObject.on(eventName, eventHandler)] */ - on(eventName: DevExpress.core.EventName, eventHandler: Function): this; + on(eventName: DevExpress.common.EventName, eventHandler: Function): this; /** * [descr:DevicesObject.on(events)] */ - on(events: { [key in DevExpress.core.EventName]?: Function }): this; + on(events: { [key in DevExpress.common.EventName]?: Function }): this; /** * [descr:DevicesObject.orientation()] */ @@ -817,7 +814,7 @@ declare module DevExpress { * [descr:DOMComponent.defaultOptions(rule)] */ static defaultOptions( - rule: DevExpress.core.DefaultOptionsRule + rule: DefaultOptionsRule ): void; /** @@ -850,8 +847,8 @@ declare module DevExpress { * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ export type OptionChangedEventInfo = - DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; /** * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ @@ -864,8 +861,8 @@ declare module DevExpress { */ export interface DOMComponentOptions extends ComponentOptions< - DevExpress.events.EventInfo, - DevExpress.events.InitializedEventInfo, + DevExpress.common.EventInfo, + DevExpress.common.InitializedEventInfo, DevExpress.DOMComponent.OptionChangedEventInfo > { /** @@ -883,7 +880,7 @@ declare module DevExpress { /** * [descr:DOMComponentOptions.onDisposing] */ - onDisposing?: (e: DevExpress.events.EventInfo) => void; + onDisposing?: (e: DevExpress.common.EventInfo) => void; /** * [descr:DOMComponentOptions.onOptionChanged] */ @@ -899,23 +896,6 @@ declare module DevExpress { */ width?: number | string | (() => number | string); } - /** - * [descr:dxSchedulerTimeZone] - */ - export interface dxSchedulerTimeZone { - /** - * [descr:dxSchedulerTimeZone.id] - */ - id: string; - /** - * [descr:dxSchedulerTimeZone.offset] - */ - offset: number; - /** - * [descr:dxSchedulerTimeZone.title] - */ - title: string; - } /** * [descr:EndpointSelector] */ @@ -968,43 +948,11 @@ declare module DevExpress { */ shadingColor?: string; } - /** - * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. - */ - type ExternalFormat = Intl.DateTimeFormatOptions | Intl.NumberFormatOptions; - /** - * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. - */ - export interface FormatObject { - /** - * [descr:Format.currency] - */ - currency?: string; - /** - * [descr:Format.useCurrencyAccountingStyle] - */ - useCurrencyAccountingStyle?: boolean; - /** - * [descr:Format.formatter] - */ - formatter?: (value: number | Date) => string; - /** - * [descr:Format.parser] - */ - parser?: (value: string) => number | Date; - /** - * [descr:Format.precision] - */ - precision?: number; - /** - * [descr:Format.type] - */ - type?: DevExpress.common.Format | string; - } + export type FloatingActionButtonDirection = 'auto' | 'up' | 'down'; /** * [descr:fx] */ - export const fx: { + export declare const fx: { /** * [descr:fx.animate(element, config)] */ @@ -1027,28 +975,6 @@ declare module DevExpress { * [descr:hideTopOverlay()] */ export function hideTopOverlay(): boolean; - /** - * [descr:PdfExportGanttFont] - * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. - */ - export interface PdfExportGanttFont { - /** - * [descr:PdfExportGanttFont.fontObject] - */ - fontObject: object; - /** - * [descr:PdfExportGanttFont.name] - */ - name: string; - /** - * [descr:PdfExportGanttFont.style] - */ - style?: string; - /** - * [descr:PdfExportGanttFont.weight] - */ - weight?: string | number; - } /** * [descr:PositionConfig] */ @@ -1091,16 +1017,16 @@ declare module DevExpress { * [descr:PositionConfig.collision] */ collision?: - | DevExpress.animation.CollisionResolutionCombination + | DevExpress.common.CollisionResolutionCombination | { /** * [descr:PositionConfig.collision.x] */ - x?: DevExpress.animation.CollisionResolution; + x?: DevExpress.common.CollisionResolution; /** * [descr:PositionConfig.collision.y] */ - y?: DevExpress.animation.CollisionResolution; + y?: DevExpress.common.CollisionResolution; }; /** * [descr:PositionConfig.my] @@ -1163,6 +1089,10 @@ declare module DevExpress { compile?: Function; render?: Function; }): void; + /** + * [descr:Template] + */ + export type Template = string | Function | DevExpress.core.UserDefinedElement; /** * [descr:TransitionExecutor] */ @@ -1240,9 +1170,15 @@ declare module DevExpress { } declare module DevExpress.animation { /** - * @deprecated Use the AnimationConfig type instead + * @deprecated Use the AnimationConfig type from common/core/animation instead */ export type animationConfig = AnimationConfig; + /** + * @deprecated Use the PositionConfig type from common/core/animation instead + */ + export interface positionConfig extends PositionConfig {} +} +declare module DevExpress.common { /** * [descr:AnimationState] */ @@ -1291,29 +1227,35 @@ declare module DevExpress.animation { | 'slide' | 'slideIn' | 'slideOut'; - export type CollisionResolution = 'fit' | 'flip' | 'flipfit' | 'none'; - export type CollisionResolutionCombination = - | 'fit' - | 'fit flip' - | 'fit flipfit' - | 'fit none' - | 'flip' - | 'flip fit' - | 'flip none' - | 'flipfit' - | 'flipfit fit' - | 'flipfit none' - | 'none' - | 'none fit' - | 'none flip' - | 'none flipfit'; + export type ApplyValueMode = 'instantly' | 'useButtons'; /** - * @deprecated Use the PositionConfig type instead + * [descr:ArrayStore] */ - export interface positionConfig extends PositionConfig {} -} -declare module DevExpress.common { - export type ApplyValueMode = 'instantly' | 'useButtons'; + export class ArrayStore extends DevExpress.data + .AbstractStore { + constructor(options?: DevExpress.data.ArrayStoreOptions); + /** + * [descr:ArrayStore.byKey(key)] + */ + byKey(key: TKey): DevExpress.core.utils.DxPromise; + /** + * [descr:ArrayStore.clear()] + */ + clear(): void; + /** + * [descr:ArrayStore.createQuery()] + */ + createQuery(): Query; + } + /** + * [descr:AsyncCancelable] + */ + export type AsyncCancelable = { + /** + * [descr:AsyncCancelable.cancel] + */ + cancel: boolean | PromiseLike; + }; /** * [descr:AsyncRule] */ @@ -1341,6 +1283,52 @@ declare module DevExpress.common { }; export type ButtonStyle = 'text' | 'outlined' | 'contained'; export type ButtonType = 'danger' | 'default' | 'normal' | 'success'; + /** + * [descr:Cancelable] + */ + export interface Cancelable { + /** + * [descr:Cancelable.cancel] + */ + cancel?: boolean; + } + /** + * [descr:ChangedOptionInfo] + */ + export interface ChangedOptionInfo { + /** + * [descr:ChangedOptionInfo.name] + */ + readonly name: string; + /** + * [descr:ChangedOptionInfo.fullName] + */ + readonly fullName: string; + /** + * [descr:ChangedOptionInfo.value] + */ + readonly value?: any; + /** + * [descr:ChangedOptionInfo.previousValue] + */ + readonly previousValue?: any; + } + export type CollisionResolution = 'fit' | 'flip' | 'flipfit' | 'none'; + export type CollisionResolutionCombination = + | 'fit' + | 'fit flip' + | 'fit flipfit' + | 'fit none' + | 'flip' + | 'flip fit' + | 'flip none' + | 'flipfit' + | 'flipfit fit' + | 'flipfit none' + | 'none' + | 'none fit' + | 'none flip' + | 'none flipfit'; /** * [descr:CompareRule] */ @@ -1400,6 +1388,257 @@ declare module DevExpress.common { */ validationCallback?: (options: ValidationCallbackData) => boolean; }; + /** + * [descr:CustomStore] + */ + export class CustomStore extends DevExpress.data + .StoreBase { + constructor(options?: DevExpress.data.CustomStoreOptions); + /** + * [descr:CustomStore.byKey(key, extraOptions)] + */ + byKey( + key: TKey, + extraOptions?: DevExpress.data.LoadOptions + ): DevExpress.core.utils.DxPromise; + /** + * [descr:CustomStore.clearRawDataCache()] + */ + clearRawDataCache(): void; + /** + * [descr:CustomStore.load()] + */ + load(): DevExpress.core.utils.DxExtendedPromise>; + /** + * [descr:CustomStore.load(options)] + */ + load( + options: DevExpress.data.LoadOptions + ): DevExpress.core.utils.DxExtendedPromise>; + } + /** + * [descr:DataHelperMixin] + * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. + */ + export class DataHelperMixin { + /** + * [descr:DataHelperMixin.getDataSource()] + */ + getDataSource(): DataSource; + } + /** + * [descr:DataSource] + */ + export class DataSource { + constructor(data: Array); + constructor( + options: + | DevExpress.data.CustomStoreOptions + | DevExpress.data.DataSourceOptions + ); + constructor(store: DevExpress.data.utils.Store); + constructor(url: string); + /** + * [descr:DataSource.cancel(operationId)] + */ + cancel(operationId: number): boolean; + /** + * [descr:DataSource.dispose()] + */ + dispose(): void; + /** + * [descr:DataSource.filter()] + */ + filter(): FilterDescriptor | Array; + /** + * [descr:DataSource.filter(filterExpr)] + */ + filter(filterExpr: FilterDescriptor | Array): void; + /** + * [descr:DataSource.group()] + */ + group(): GroupDescriptor | Array>; + /** + * [descr:DataSource.group(groupExpr)] + */ + group( + groupExpr: GroupDescriptor | Array> + ): void; + /** + * [descr:DataSource.isLastPage()] + */ + isLastPage(): boolean; + /** + * [descr:DataSource.isLoaded()] + */ + isLoaded(): boolean; + /** + * [descr:DataSource.isLoading()] + */ + isLoading(): boolean; + /** + * [descr:DataSource.items()] + */ + items(): Array; + /** + * [descr:DataSource.key()] + */ + key(): string | Array; + /** + * [descr:DataSource.load()] + */ + load(): DevExpress.core.utils.DxExtendedPromise; + /** + * [descr:DataSource.loadOptions()] + */ + loadOptions(): DevExpress.data.LoadOptions; + /** + * [descr:DataSource.off(eventName)] + */ + off(eventName: DataSourceEventName): this; + /** + * [descr:DataSource.off(eventName, eventHandler)] + */ + off(eventName: DataSourceEventName, eventHandler: Function): this; + /** + * [descr:DataSource.on(eventName, eventHandler)] + */ + on(eventName: DataSourceEventName, eventHandler: Function): this; + /** + * [descr:DataSource.on(events)] + */ + on(events: { [key in DataSourceEventName]?: Function }): this; + /** + * [descr:DataSource.pageIndex()] + */ + pageIndex(): number; + /** + * [descr:DataSource.pageIndex(newIndex)] + */ + pageIndex(newIndex: number): void; + /** + * [descr:DataSource.pageSize()] + */ + pageSize(): number; + /** + * [descr:DataSource.pageSize(value)] + */ + pageSize(value: number): void; + /** + * [descr:DataSource.paginate()] + */ + paginate(): boolean; + /** + * [descr:DataSource.paginate(value)] + */ + paginate(value: boolean): void; + /** + * [descr:DataSource.reload()] + */ + reload(): DevExpress.core.utils.DxExtendedPromise; + /** + * [descr:DataSource.requireTotalCount()] + */ + requireTotalCount(): boolean; + /** + * [descr:DataSource.requireTotalCount(value)] + */ + requireTotalCount(value: boolean): void; + /** + * [descr:DataSource.searchExpr()] + */ + searchExpr(): string & Function & Array; + /** + * [descr:DataSource.searchExpr(expr)] + */ + searchExpr(expr: string | Function | Array): void; + /** + * [descr:DataSource.searchOperation()] + */ + searchOperation(): string; + /** + * [descr:DataSource.searchOperation(op)] + */ + searchOperation(op: string): void; + /** + * [descr:DataSource.searchValue()] + */ + searchValue(): any; + /** + * [descr:DataSource.searchValue(value)] + */ + searchValue(value: any): void; + /** + * [descr:DataSource.select()] + */ + select(): SelectDescriptor; + /** + * [descr:DataSource.select(expr)] + */ + select(expr: SelectDescriptor): void; + /** + * [descr:DataSource.sort()] + */ + sort(): SortDescriptor | Array>; + /** + * [descr:DataSource.sort(sortExpr)] + */ + sort(sortExpr: SortDescriptor | Array>): void; + /** + * [descr:DataSource.store()] + */ + store(): DevExpress.data.utils.Store; + /** + * [descr:DataSource.totalCount()] + */ + totalCount(): number; + } + /** + * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. + */ + type DataSourceEventName = 'changed' | 'loadError' | 'loadingChanged'; + /** + * [descr:DataSourceLike] + * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. + */ + export type DataSourceLike = + | string + | Array + | DevExpress.data.utils.Store + | DataSourceOptionsStub + | DataSource; + /** + * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. + */ + interface DataSourceOptionsStub< + TStoreItem = any, + TMappedItem = TStoreItem, + TItem = TMappedItem + > { + customQueryParams?: any; + expand?: Array | string; + filter?: FilterDescriptor | Array; + group?: GroupDescriptor | Array>; + map?: (dataItem: TStoreItem) => TMappedItem; + onChanged?: (e: { readonly changes?: Array }) => void; + onLoadError?: (error: { readonly message?: string }) => void; + onLoadingChanged?: (isLoading: boolean) => void; + pageSize?: number; + paginate?: boolean; + postProcess?: (data: Array) => Array; + pushAggregationTimeout?: number; + requireTotalCount?: boolean; + reshapeOnPush?: boolean; + searchExpr?: string | Function | Array; + searchOperation?: SearchOperation; + searchValue?: any; + select?: SelectDescriptor; + sort?: SortDescriptor | Array>; + store?: + | Array + | DevExpress.data.utils.Store + | DevExpress.data.utils.StoreOptions; + } export type DataStructure = 'plain' | 'tree'; export type DataType = | 'string' @@ -1414,6 +1653,31 @@ declare module DevExpress.common { export type Draggable = DevExpress.core.OmitInternal; export type DragHighlight = 'push' | 'indicate'; + + /** + * [descr:DxEvent] + * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. + */ + export type DxEvent = {} extends EventType + ? EventObject & TNativeEvent + : EventType; + /** + * [descr:dxSchedulerTimeZone] + */ + export interface dxSchedulerTimeZone { + /** + * [descr:dxSchedulerTimeZone.id] + */ + id: string; + /** + * [descr:dxSchedulerTimeZone.offset] + */ + offset: number; + /** + * [descr:dxSchedulerTimeZone.title] + */ + title: string; + } export type EditorStyle = 'outlined' | 'underlined' | 'filled'; /** * [descr:EmailRule] @@ -1432,8 +1696,106 @@ declare module DevExpress.common { */ type: 'email'; }; + /** + * [descr:event] + * @deprecated [depNote:event] + * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. + */ + export type event = DxEvent; + /** + * [descr:EventInfo] + */ + export interface EventInfo { + /** + * [descr:EventInfo.component] + */ + readonly component: TComponent; + /** + * [descr:EventInfo.element] + */ + readonly element: DevExpress.core.DxElement; + /** + * [descr:EventInfo.model] + */ + readonly model?: any; + } + /** + * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. + */ + type EventName = 'orientationChanged'; + /** + * [descr:EventObject] + */ + export type EventObject = { + /** + * [descr:EventObject.currentTarget] + */ + currentTarget: Element; + + /** + * [descr:EventObject.data] + */ + data: any; + + /** + * [descr:EventObject.delegateTarget] + */ + delegateTarget: Element; + + /** + * [descr:EventObject.target] + */ + target: Element; + /** + * [descr:EventObject.isDefaultPrevented()] + */ + isDefaultPrevented(): boolean; + /** + * [descr:EventObject.isImmediatePropagationStopped()] + */ + isImmediatePropagationStopped(): boolean; + /** + * [descr:EventObject.isPropagationStopped()] + */ + isPropagationStopped(): boolean; + /** + * [descr:EventObject.preventDefault()] + */ + preventDefault(): void; + /** + * [descr:EventObject.stopImmediatePropagation()] + */ + stopImmediatePropagation(): void; + /** + * [descr:EventObject.stopPropagation()] + */ + stopPropagation(): void; + }; + /** + * [descr:handler(event, extraParameters)] + * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. + */ + export function eventsHandler(event: DxEvent, extraParameters: any): boolean; + /** + * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. + */ + export interface EventType {} + /** + * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. + */ + interface EventType extends JQueryEventObject { + cancel?: boolean; + } export type ExportFormat = 'GIF' | 'JPEG' | 'PDF' | 'PNG' | 'SVG'; + /** + * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. + */ + type ExternalFormat = Intl.DateTimeFormatOptions | Intl.NumberFormatOptions; export type FieldChooserLayout = 0 | 1 | 2; + /** + * [descr:FilterDescriptor] + */ + export type FilterDescriptor = any; export type FirstDayOfWeek = 0 | 1 | 2 | 3 | 4 | 5 | 6; export type Format = | 'billions' @@ -1464,6 +1826,35 @@ declare module DevExpress.common { | 'minute' | 'second' | 'shortDateShortTime'; + /** + * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. + */ + export interface FormatObject { + /** + * [descr:Format.currency] + */ + currency?: string; + /** + * [descr:Format.useCurrencyAccountingStyle] + */ + useCurrencyAccountingStyle?: boolean; + /** + * [descr:Format.formatter] + */ + formatter?: (value: number | Date) => string; + /** + * [descr:Format.parser] + */ + parser?: (value: string) => number | Date; + /** + * [descr:Format.precision] + */ + precision?: number; + /** + * [descr:Format.type] + */ + type?: Format | string; + } /** * [descr:GlobalConfig] */ @@ -1496,7 +1887,7 @@ declare module DevExpress.common { /** * [descr:GlobalConfig.floatingActionButtonConfig.direction] */ - direction?: DevExpress.core.FloatingActionButtonDirection; + direction?: FloatingActionButtonDirection; /** * [descr:GlobalConfig.floatingActionButtonConfig.icon] */ @@ -1561,6 +1952,24 @@ declare module DevExpress.common { licenseKey?: string; buyNowLink?: string; }; + /** + * [descr:GroupDescriptor] + */ + export type GroupDescriptor = + | KeySelector + | (OrderingDescriptor & { + groupInterval?: number | GroupingInterval; + isExpanded?: boolean; + }); + export type GroupingInterval = + | 'year' + | 'quarter' + | 'month' + | 'day' + | 'dayOfWeek' + | 'hour' + | 'minute' + | 'second'; /** * [descr:GroupItem] */ @@ -1584,6 +1993,23 @@ declare module DevExpress.common { }; export type HorizontalAlignment = 'center' | 'left' | 'right'; export type HorizontalEdge = 'left' | 'right'; + /** + * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. + */ + export type HttpMethod = 'GET' | 'POST' | 'PATCH' | 'MERGE'; + /** + * [descr:InitializedEventInfo] + */ + export interface InitializedEventInfo { + /** + * [descr:InitializedEventInfo.component] + */ + readonly component?: TComponent; + /** + * [descr:InitializedEventInfo.element] + */ + readonly element?: DevExpress.core.DxElement; + } /** * [descr:isGroupItemsArray] */ @@ -1602,7 +2028,50 @@ declare module DevExpress.common { export function isLoadResultObject( res: LoadResult ): res is LoadResultObject; + /** + * [descr:ItemInfo] + */ + export interface ItemInfo { + /** + * [descr:ItemInfo.itemData] + */ + readonly itemData?: TItemData; + /** + * [descr:ItemInfo.itemElement] + */ + readonly itemElement: DevExpress.core.DxElement; + /** + * [descr:ItemInfo.itemIndex] + */ + readonly itemIndex: number; + } + /** + * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. + */ + type KeySelector = + | string + | ((source: T) => string | number | Date | Object); export type LabelMode = 'static' | 'floating' | 'hidden' | 'outside'; + /** + * [descr:LangParams] + */ + export type LangParams = { + /** + * [descr:LangParams.locale] + */ + locale: string; + /** + * [descr:LangParams.collatorOptions] + */ + collatorOptions?: Intl.CollatorOptions; + }; + /** + * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. + */ + type LoadFunctionResult = + | T + | DevExpress.core.utils.DxPromise + | PromiseLike; /** * [descr:LoadResult] */ @@ -1635,8 +2104,42 @@ declare module DevExpress.common { */ groupCount?: number; }; + /** + * [descr:LocalStore] + */ + export class LocalStore extends ArrayStore< + TItem, + TKey + > { + constructor(options?: DevExpress.data.LocalStoreOptions); + /** + * [descr:LocalStore.clear()] + */ + clear(): void; + } export type MaskMode = 'always' | 'onFocus'; export type Mode = 'auto'; + /** + * [descr:NativeEventInfo] + */ + export interface NativeEventInfo { + /** + * [descr:NativeEventInfo.component] + */ + readonly component: TComponent; + /** + * [descr:NativeEventInfo.element] + */ + readonly element: DevExpress.core.DxElement; + /** + * [descr:NativeEventInfo.model] + */ + readonly model?: any; + /** + * [descr:NativeEventInfo.event] + */ + readonly event?: DxEvent; + } /** * [descr:NumericRule] @@ -1655,6 +2158,78 @@ declare module DevExpress.common { */ type: 'numeric'; }; + /** + * [descr:ODataContext] + */ + export class ODataContext { + constructor(options?: DevExpress.data.ODataContextOptions); + /** + * [descr:ODataContext.get(operationName, params)] + */ + get( + operationName: string, + params: any + ): DevExpress.core.utils.DxPromise; + /** + * [descr:ODataContext.invoke(operationName, params, httpMethod)] + */ + invoke( + operationName: string, + params: any, + httpMethod: HttpMethod + ): DevExpress.core.utils.DxPromise; + /** + * [descr:ODataContext.objectLink(entityAlias, key)] + */ + objectLink(entityAlias: string, key: any | string | number): any; + } + /** + * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. + */ + export interface ODataRequestOptions { + accepts: any; + async: boolean; + contentType: string | boolean; + data: any; + dataType: string; + headers: any; + jsonp?: boolean; + method: string; + timeout: number; + url: string; + xhrFields: any; + } + /** + * [descr:ODataStore] + */ + export class ODataStore extends DevExpress.data + .StoreBase { + constructor(options?: DevExpress.data.ODataStoreOptions); + /** + * [descr:ODataStore.byKey(key, extraOptions)] + */ + byKey( + key: TKey, + extraOptions?: { + expand?: string | Array; + select?: string | Array; + } + ): DevExpress.core.utils.DxPromise; + /** + * [descr:ODataStore.createQuery(loadOptions)] + */ + createQuery(loadOptions?: { + expand?: string | Array; + requireTotalCount?: boolean; + customQueryParams?: any; + }): Query; + } + /** + * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. + */ + type OrderingDescriptor = SelectionDescriptor & { + desc?: boolean; + }; export type Orientation = 'horizontal' | 'vertical'; export type PageLoadMode = 'nextButton' | 'scrollBottom'; export type PageOrientation = 'portrait' | 'landscape'; @@ -1709,6 +2284,28 @@ declare module DevExpress.common { */ type: 'pattern'; }; + /** + * [descr:PdfExportGanttFont] + * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. + */ + export interface PdfExportGanttFont { + /** + * [descr:PdfExportGanttFont.fontObject] + */ + fontObject: object; + /** + * [descr:PdfExportGanttFont.name] + */ + name: string; + /** + * [descr:PdfExportGanttFont.style] + */ + style?: string; + /** + * [descr:PdfExportGanttFont.weight] + */ + weight?: string | number; + } export type Position = 'bottom' | 'left' | 'right' | 'top'; export type PositionAlignment = | 'bottom' @@ -1720,6 +2317,103 @@ declare module DevExpress.common { | 'right bottom' | 'right top' | 'top'; + /** + * [descr:Query] + */ + export interface Query { + /** + * [descr:Query.aggregate(seed, step, finalize)] + */ + aggregate( + seed: any, + step: Function, + finalize: Function + ): DevExpress.core.utils.DxPromise; + /** + * [descr:Query.aggregate(step)] + */ + aggregate(step: Function): DevExpress.core.utils.DxPromise; + /** + * [descr:Query.avg()] + */ + avg(): DevExpress.core.utils.DxPromise; + /** + * [descr:Query.avg(getter)] + */ + avg(getter: any): DevExpress.core.utils.DxPromise; + /** + * [descr:Query.count()] + */ + count(): DevExpress.core.utils.DxPromise; + /** + * [descr:Query.enumerate()] + */ + enumerate(): DevExpress.core.utils.DxPromise; + /** + * [descr:Query.filter(criteria)] + */ + filter(criteria: Array): Query; + /** + * [descr:Query.filter(predicate)] + */ + filter(predicate: Function): Query; + /** + * [descr:Query.groupBy(getter)] + */ + groupBy(getter: any): Query; + /** + * [descr:Query.max()] + */ + max(): DevExpress.core.utils.DxPromise; + /** + * [descr:Query.max(getter)] + */ + max(getter: any): DevExpress.core.utils.DxPromise; + /** + * [descr:Query.min()] + */ + min(): DevExpress.core.utils.DxPromise; + /** + * [descr:Query.min(getter)] + */ + min(getter: any): DevExpress.core.utils.DxPromise; + /** + * [descr:Query.select(getter)] + */ + select(...getters: any[]): Query; + /** + * [descr:Query.slice(skip, take)] + */ + slice(skip: number, take?: number): Query; + /** + * [descr:Query.sortBy(getter)] + */ + sortBy(getter: any): Query; + /** + * [descr:Query.sortBy(getter, desc)] + */ + sortBy(getter: any, desc: boolean): Query; + /** + * [descr:Query.sum()] + */ + sum(): DevExpress.core.utils.DxPromise; + /** + * [descr:Query.sum(getter)] + */ + sum(getter: any): DevExpress.core.utils.DxPromise; + /** + * [descr:Query.thenBy(getter)] + */ + thenBy(getter: any): Query; + /** + * [descr:Query.thenBy(getter, desc)] + */ + thenBy(getter: any, desc: boolean): Query; + /** + * [descr:Query.toArray()] + */ + toArray(): Array; + } /** * [descr:RangeRule] */ @@ -1756,10 +2450,7 @@ declare module DevExpress.common { TComponent extends DevExpress.common.grids.GridBase > = Required< Pick< - DevExpress.events.NativeEventInfo< - TComponent, - PointerEvent | MouseEvent | TouchEvent - >, + NativeEventInfo, 'component' | 'event' > >; @@ -1780,13 +2471,42 @@ declare module DevExpress.common { */ type: 'required'; }; + /** + * [descr:ResolvedData] + * @deprecated [depNote:ResolvedData] + */ + export type ResolvedData = LoadResult; export type Scrollable = DevExpress.core.OmitInternal; export type ScrollbarMode = 'always' | 'never' | 'onHover' | 'onScroll'; export type ScrollDirection = 'both' | 'horizontal' | 'vertical'; export type ScrollMode = 'standard' | 'virtual'; export type SearchMode = 'contains' | 'startswith' | 'equals'; + export type SearchOperation = + | '=' + | '<>' + | '>' + | '>=' + | '<' + | '<=' + | 'startswith' + | 'endswith' + | 'contains' + | 'notcontains'; export type SelectAllMode = 'allPages' | 'page'; + /** + * [descr:SelectDescriptor] + */ + export type SelectDescriptor = + | string + | Array + | ((source: T) => any); + /** + * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. + */ + type SelectionDescriptor = { + selector: KeySelector; + }; export type SimplifiedSearchMode = 'contains' | 'startswith'; export type SingleMultipleAllOrNone = 'single' | 'multiple' | 'all' | 'none'; export type SingleMultipleOrNone = 'single' | 'multiple' | 'none'; @@ -1794,7 +2514,26 @@ declare module DevExpress.common { export type SingleOrNone = 'single' | 'none'; export type SliderValueChangeMode = 'onHandleMove' | 'onHandleRelease'; export type Sortable = DevExpress.core.OmitInternal; + /** + * [descr:SortDescriptor] + */ + export type SortDescriptor = KeySelector | OrderingDescriptor; export type SortOrder = 'asc' | 'desc'; + /** + * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. + */ + type StoreBaseEventName = + | 'loaded' + | 'loading' + | 'inserted' + | 'inserting' + | 'updated' + | 'updating' + | 'push' + | 'removed' + | 'removing' + | 'modified' + | 'modifying'; export type StoreType = 'array' | 'local' | 'odata'; /** * [descr:StringLengthRule] @@ -1826,6 +2565,14 @@ declare module DevExpress.common { type: 'stringLength'; }; export type SubmenuShowMode = 'onClick' | 'onHover'; + /** + * [descr:SummaryDescriptor] + */ + export type SummaryDescriptor = + | KeySelector + | (SelectionDescriptor & { + summaryType?: 'sum' | 'avg' | 'min' | 'max' | 'count'; + }); export type TabsIconPosition = 'top' | 'end' | 'bottom' | 'start'; export type TabsStyle = 'primary' | 'secondary'; export type TextBoxPredefinedButton = 'clear'; @@ -3083,7 +3830,7 @@ declare module DevExpress.common.grids { | DevExpress.ui.dxFilterBuilder.FilterLookupDataSource | ((options: { component?: any; - dataSource?: DevExpress.data.DataSource.Options | null; + dataSource?: DevExpress.data.DataSourceOptions | null; }) => void); /** * [descr:GridBaseColumn.headerFilter.groupInterval] @@ -3631,7 +4378,7 @@ declare module DevExpress.common.grids { * [descr:GridBase.getCombinedFilter(returnDataField)] */ getCombinedFilter(returnDataField: boolean): any; - getDataSource(): DevExpress.data.DataSource; + getDataSource(): DataSource; /** * [descr:GridBase.getKeyByRowIndex(rowIndex)] */ @@ -3827,10 +4574,7 @@ declare module DevExpress.common.grids { /** * [descr:GridBaseOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike< - TRowData, - TKey - > | null; + dataSource?: DataSourceLike | null; /** * [descr:GridBaseOptions.dateSerializationFormat] */ @@ -3907,144 +4651,119 @@ declare module DevExpress.common.grids { * [descr:GridBaseOptions.onAdaptiveDetailRowPreparing] */ onAdaptiveDetailRowPreparing?: ( - e: DevExpress.events.EventInfo & - AdaptiveDetailRowPreparingInfo + e: EventInfo & AdaptiveDetailRowPreparingInfo ) => void; /** * [descr:GridBaseOptions.onDataErrorOccurred] */ onDataErrorOccurred?: ( - e: DevExpress.events.EventInfo & DataErrorOccurredInfo + e: EventInfo & DataErrorOccurredInfo ) => void; /** * [descr:GridBaseOptions.onEditCanceled] */ onEditCanceled?: ( - e: DevExpress.events.EventInfo & - DataChangeInfo + e: EventInfo & DataChangeInfo ) => void; /** * [descr:GridBaseOptions.onEditCanceling] */ onEditCanceling?: ( - e: DevExpress.events.Cancelable & - DevExpress.events.EventInfo & - DataChangeInfo + e: Cancelable & EventInfo & DataChangeInfo ) => void; /** * [descr:GridBaseOptions.onInitNewRow] */ - onInitNewRow?: ( - e: DevExpress.events.EventInfo & NewRowInfo - ) => void; + onInitNewRow?: (e: EventInfo & NewRowInfo) => void; /** * [descr:GridBaseOptions.onKeyDown] */ onKeyDown?: ( - e: DevExpress.events.NativeEventInfo & - KeyDownInfo + e: NativeEventInfo & KeyDownInfo ) => void; /** * [descr:GridBaseOptions.onRowCollapsed] */ - onRowCollapsed?: ( - e: DevExpress.events.EventInfo & RowKeyInfo - ) => void; + onRowCollapsed?: (e: EventInfo & RowKeyInfo) => void; /** * [descr:GridBaseOptions.onRowCollapsing] */ onRowCollapsing?: ( - e: DevExpress.events.Cancelable & - DevExpress.events.EventInfo & - RowKeyInfo + e: Cancelable & EventInfo & RowKeyInfo ) => void; /** * [descr:GridBaseOptions.onRowExpanded] */ - onRowExpanded?: ( - e: DevExpress.events.EventInfo & RowKeyInfo - ) => void; + onRowExpanded?: (e: EventInfo & RowKeyInfo) => void; /** * [descr:GridBaseOptions.onRowExpanding] */ onRowExpanding?: ( - e: DevExpress.events.Cancelable & - DevExpress.events.EventInfo & - RowKeyInfo + e: Cancelable & EventInfo & RowKeyInfo ) => void; /** * [descr:GridBaseOptions.onRowInserted] */ onRowInserted?: ( - e: DevExpress.events.EventInfo & - RowInsertedInfo + e: EventInfo & RowInsertedInfo ) => void; /** * [descr:GridBaseOptions.onRowInserting] */ onRowInserting?: ( - e: DevExpress.events.EventInfo & RowInsertingInfo + e: EventInfo & RowInsertingInfo ) => void; /** * [descr:GridBaseOptions.onRowRemoved] */ onRowRemoved?: ( - e: DevExpress.events.EventInfo & - RowRemovedInfo + e: EventInfo & RowRemovedInfo ) => void; /** * [descr:GridBaseOptions.onRowRemoving] */ onRowRemoving?: ( - e: DevExpress.events.EventInfo & - RowRemovingInfo + e: EventInfo & RowRemovingInfo ) => void; /** * [descr:GridBaseOptions.onRowUpdated] */ onRowUpdated?: ( - e: DevExpress.events.EventInfo & - RowUpdatedInfo + e: EventInfo & RowUpdatedInfo ) => void; /** * [descr:GridBaseOptions.onRowUpdating] */ onRowUpdating?: ( - e: DevExpress.events.EventInfo & - RowUpdatingInfo + e: EventInfo & RowUpdatingInfo ) => void; /** * [descr:GridBaseOptions.onRowValidating] */ onRowValidating?: ( - e: DevExpress.events.EventInfo & - RowValidatingInfo + e: EventInfo & RowValidatingInfo ) => void; /** * [descr:GridBaseOptions.onSaved] */ onSaved?: ( - e: DevExpress.events.EventInfo & - DataChangeInfo + e: EventInfo & DataChangeInfo ) => void; /** * [descr:GridBaseOptions.onSaving] */ - onSaving?: ( - e: DevExpress.events.EventInfo & SavingInfo - ) => void; + onSaving?: (e: EventInfo & SavingInfo) => void; /** * [descr:GridBaseOptions.onSelectionChanged] */ onSelectionChanged?: ( - e: DevExpress.events.EventInfo & - SelectionChangedInfo + e: EventInfo & SelectionChangedInfo ) => void; /** * [descr:GridBaseOptions.onToolbarPreparing] */ onToolbarPreparing?: ( - e: DevExpress.events.EventInfo & ToolbarPreparingInfo + e: EventInfo & ToolbarPreparingInfo ) => void; /** * [descr:GridBaseOptions.pager] @@ -4406,7 +5125,7 @@ declare module DevExpress.common.grids { * [descr:GridBaseOptions.rowDragging.dragTemplate] */ dragTemplate?: - | DevExpress.core.template + | Template | (( dragInfo: RowDraggingTemplateData, containerElement: DevExpress.core.DxElement @@ -4440,7 +5159,7 @@ declare module DevExpress.common.grids { * [descr:GridBaseOptions.rowDragging.onDragChange] */ onDragChange?: ( - e: DevExpress.events.Cancelable & + e: Cancelable & ReducedNativeEventInfo & RowDraggingEventInfo & DragDropInfo @@ -4449,7 +5168,7 @@ declare module DevExpress.common.grids { * [descr:GridBaseOptions.rowDragging.onDragEnd] */ onDragEnd?: ( - e: DevExpress.events.Cancelable & + e: Cancelable & ReducedNativeEventInfo & RowDraggingEventInfo & DragDropInfo @@ -4458,7 +5177,7 @@ declare module DevExpress.common.grids { * [descr:GridBaseOptions.rowDragging.onDragMove] */ onDragMove?: ( - e: DevExpress.events.Cancelable & + e: Cancelable & ReducedNativeEventInfo & RowDraggingEventInfo & DragDropInfo @@ -4467,7 +5186,7 @@ declare module DevExpress.common.grids { * [descr:GridBaseOptions.rowDragging.onDragStart] */ onDragStart?: ( - e: DevExpress.events.Cancelable & + e: Cancelable & ReducedNativeEventInfo & DragStartEventInfo ) => void; @@ -4908,13 +5627,6 @@ declare module DevExpress.core { : { [P in keyof T]?: DeepPartial; }; - /** - * [descr:DefaultOptionsRule] - */ - export type DefaultOptionsRule = { - device?: Device | Device[] | ((device: Device) => boolean); - options: DeepPartial; - }; /** * [descr:dxElement] * @deprecated [depNote:dxElement] @@ -4964,11 +5676,6 @@ declare module DevExpress.core { * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ interface ElementWrapper extends JQuery {} - /** - * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. - */ - type EventName = 'orientationChanged'; - export type FloatingActionButtonDirection = 'auto' | 'up' | 'down'; /** * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ @@ -5010,10 +5717,6 @@ declare module DevExpress.core { | Function | Symbol | Array; - /** - * [descr:template] - */ - export type template = string | Function | UserDefinedElement; /** * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. @@ -5072,7 +5775,7 @@ declare module DevExpress.data { /** * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ - export class AbstractStore extends Store< + export class AbstractStore extends StoreBase< TItem, TKey > { @@ -5101,7 +5804,7 @@ declare module DevExpress.data { * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ interface AbstractStoreOptions - extends DevExpress.data.Store.Options { + extends DevExpress.data.Store.StoreOptionsBase { /** * [descr:StoreOptions.onLoaded] */ @@ -5115,40 +5818,12 @@ declare module DevExpress.data { changes: Array, options?: { keyExpr?: string | Array; immutable?: boolean } ): Array; - /** - * [descr:ArrayStore] - */ - export class ArrayStore extends AbstractStore< - TItem, - TKey - > { - constructor(options?: DevExpress.data.ArrayStore.Options); - /** - * [descr:ArrayStore.byKey(key)] - */ - byKey(key: TKey): DevExpress.core.utils.DxPromise; - /** - * [descr:ArrayStore.clear()] - */ - clear(): void; - /** - * [descr:ArrayStore.createQuery()] - */ - createQuery(): Query; - } - module ArrayStore { - export type Options = ArrayStoreOptions< - TItem, - TKey - >; - } /** * [descr:ArrayStoreOptions] - * @deprecated [depNote:ArrayStoreOptions] * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ export interface ArrayStoreOptions - extends DevExpress.data.AbstractStore.Options { + extends AbstractStoreOptions { /** * [descr:ArrayStoreOptions.data] */ @@ -5158,66 +5833,12 @@ declare module DevExpress.data { * [descr:Utils.base64_encode(input)] */ export function base64_encode(input: string | Array): string; - /** - * [descr:CustomStore] - */ - export class CustomStore extends Store { - constructor(options?: DevExpress.data.CustomStore.Options); - /** - * [descr:CustomStore.byKey(key, extraOptions)] - */ - byKey( - key: TKey, - extraOptions?: LoadOptions - ): DevExpress.core.utils.DxPromise; - /** - * [descr:CustomStore.clearRawDataCache()] - */ - clearRawDataCache(): void; - /** - * [descr:CustomStore.load()] - */ - load(): DevExpress.core.utils.DxExtendedPromise< - DevExpress.common.LoadResult - >; - /** - * [descr:CustomStore.load(options)] - */ - load( - options: LoadOptions - ): DevExpress.core.utils.DxExtendedPromise< - DevExpress.common.LoadResult - >; - } - module CustomStore { - /** - * @deprecated Use GroupItem from common/data/custom-store instead - */ - export type GroupItem = DevExpress.common.GroupItem; - /** - * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. - */ - type LoadFunctionResult = - | T - | DevExpress.core.utils.DxPromise - | PromiseLike; - export type Options = CustomStoreOptions< - TItem, - TKey - >; - /** - * [descr:ResolvedData] - * @deprecated [depNote:ResolvedData] - */ - export type ResolvedData = DevExpress.common.LoadResult; - } /** * [descr:CustomStoreOptions] - * @deprecated [depNote:CustomStoreOptions] * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ export interface CustomStoreOptions - extends DevExpress.data.Store.Options { + extends DevExpress.data.Store.StoreOptionsBase { /** * [descr:CustomStoreOptions.byKey] */ @@ -5238,7 +5859,7 @@ declare module DevExpress.data { */ load: ( options: LoadOptions - ) => DevExpress.data.CustomStore.LoadFunctionResult< + ) => DevExpress.common.LoadFunctionResult< DevExpress.common.LoadResult >; /** @@ -5260,8 +5881,12 @@ declare module DevExpress.data { * [descr:CustomStoreOptions.totalCount] */ totalCount?: (loadOptions: { - filter?: FilterDescriptor | Array; - group?: GroupDescriptor | Array>; + filter?: + | DevExpress.common.FilterDescriptor + | Array; + group?: + | DevExpress.common.GroupDescriptor + | Array>; }) => PromiseLike; /** * [descr:CustomStoreOptions.update] @@ -5272,238 +5897,8 @@ declare module DevExpress.data { */ useDefaultSearch?: boolean; } - /** - * [descr:DataSource] - */ - export class DataSource { - constructor(data: Array); - constructor( - options: - | DevExpress.data.CustomStore.Options - | DevExpress.data.DataSource.Options - ); - constructor(store: DevExpress.data.utils.Store); - constructor(url: string); - /** - * [descr:DataSource.cancel(operationId)] - */ - cancel(operationId: number): boolean; - /** - * [descr:DataSource.dispose()] - */ - dispose(): void; - /** - * [descr:DataSource.filter()] - */ - filter(): FilterDescriptor | Array; - /** - * [descr:DataSource.filter(filterExpr)] - */ - filter(filterExpr: FilterDescriptor | Array): void; - /** - * [descr:DataSource.group()] - */ - group(): GroupDescriptor | Array>; - /** - * [descr:DataSource.group(groupExpr)] - */ - group( - groupExpr: GroupDescriptor | Array> - ): void; - /** - * [descr:DataSource.isLastPage()] - */ - isLastPage(): boolean; - /** - * [descr:DataSource.isLoaded()] - */ - isLoaded(): boolean; - /** - * [descr:DataSource.isLoading()] - */ - isLoading(): boolean; - /** - * [descr:DataSource.items()] - */ - items(): Array; - /** - * [descr:DataSource.key()] - */ - key(): string | Array; - /** - * [descr:DataSource.load()] - */ - load(): DevExpress.core.utils.DxExtendedPromise; - /** - * [descr:DataSource.loadOptions()] - */ - loadOptions(): LoadOptions; - /** - * [descr:DataSource.off(eventName)] - */ - off(eventName: DevExpress.data.DataSource.EventName): this; - /** - * [descr:DataSource.off(eventName, eventHandler)] - */ - off( - eventName: DevExpress.data.DataSource.EventName, - eventHandler: Function - ): this; - /** - * [descr:DataSource.on(eventName, eventHandler)] - */ - on( - eventName: DevExpress.data.DataSource.EventName, - eventHandler: Function - ): this; - /** - * [descr:DataSource.on(events)] - */ - on( - events: { [key in DevExpress.data.DataSource.EventName]?: Function } - ): this; - /** - * [descr:DataSource.pageIndex()] - */ - pageIndex(): number; - /** - * [descr:DataSource.pageIndex(newIndex)] - */ - pageIndex(newIndex: number): void; - /** - * [descr:DataSource.pageSize()] - */ - pageSize(): number; - /** - * [descr:DataSource.pageSize(value)] - */ - pageSize(value: number): void; - /** - * [descr:DataSource.paginate()] - */ - paginate(): boolean; - /** - * [descr:DataSource.paginate(value)] - */ - paginate(value: boolean): void; - /** - * [descr:DataSource.reload()] - */ - reload(): DevExpress.core.utils.DxExtendedPromise; - /** - * [descr:DataSource.requireTotalCount()] - */ - requireTotalCount(): boolean; - /** - * [descr:DataSource.requireTotalCount(value)] - */ - requireTotalCount(value: boolean): void; - /** - * [descr:DataSource.searchExpr()] - */ - searchExpr(): string & Function & Array; - /** - * [descr:DataSource.searchExpr(expr)] - */ - searchExpr(expr: string | Function | Array): void; - /** - * [descr:DataSource.searchOperation()] - */ - searchOperation(): string; - /** - * [descr:DataSource.searchOperation(op)] - */ - searchOperation(op: string): void; - /** - * [descr:DataSource.searchValue()] - */ - searchValue(): any; - /** - * [descr:DataSource.searchValue(value)] - */ - searchValue(value: any): void; - /** - * [descr:DataSource.select()] - */ - select(): SelectDescriptor; - /** - * [descr:DataSource.select(expr)] - */ - select(expr: SelectDescriptor): void; - /** - * [descr:DataSource.sort()] - */ - sort(): SortDescriptor | Array>; - /** - * [descr:DataSource.sort(sortExpr)] - */ - sort(sortExpr: SortDescriptor | Array>): void; - /** - * [descr:DataSource.store()] - */ - store(): DevExpress.data.utils.Store; - /** - * [descr:DataSource.totalCount()] - */ - totalCount(): number; - } - module DataSource { - /** - * [descr:DataSourceLike] - * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. - */ - export type DataSourceLike = - | string - | Array - | DevExpress.data.utils.Store - | DataSourceOptionsStub - | DataSource; - /** - * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. - */ - interface DataSourceOptionsStub< - TStoreItem = any, - TMappedItem = TStoreItem, - TItem = TMappedItem - > { - customQueryParams?: any; - expand?: Array | string; - filter?: FilterDescriptor | Array; - group?: GroupDescriptor | Array>; - map?: (dataItem: TStoreItem) => TMappedItem; - onChanged?: (e: { readonly changes?: Array }) => void; - onLoadError?: (error: { readonly message?: string }) => void; - onLoadingChanged?: (isLoading: boolean) => void; - pageSize?: number; - paginate?: boolean; - postProcess?: (data: Array) => Array; - pushAggregationTimeout?: number; - requireTotalCount?: boolean; - reshapeOnPush?: boolean; - searchExpr?: string | Function | Array; - searchOperation?: SearchOperation; - searchValue?: any; - select?: SelectDescriptor; - sort?: SortDescriptor | Array>; - store?: - | Array - | DevExpress.data.utils.Store - | DevExpress.data.utils.StoreOptions; - } - /** - * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. - */ - type EventName = 'changed' | 'loadError' | 'loadingChanged'; - export type Options< - TStoreItem = any, - TMappedItem = TStoreItem, - TItem = TMappedItem, - TKey = any - > = DataSourceOptions; - } /** * [descr:DataSourceOptions] - * @deprecated [depNote:DataSourceOptions] * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ export interface DataSourceOptions< @@ -5523,15 +5918,19 @@ declare module DevExpress.data { /** * [descr:DataSourceOptions.filter] */ - filter?: FilterDescriptor | Array; + filter?: + | DevExpress.common.FilterDescriptor + | Array; /** * [descr:DataSourceOptions.group] */ - group?: GroupDescriptor | Array>; + group?: + | DevExpress.common.GroupDescriptor + | Array>; /** * [descr:DataSourceOptions.langParams] */ - langParams?: LangParams; + langParams?: DevExpress.common.LangParams; /** * [descr:DataSourceOptions.map] */ @@ -5579,7 +5978,7 @@ declare module DevExpress.data { /** * [descr:DataSourceOptions.searchOperation] */ - searchOperation?: SearchOperation; + searchOperation?: DevExpress.common.SearchOperation; /** * [descr:DataSourceOptions.searchValue] */ @@ -5587,11 +5986,13 @@ declare module DevExpress.data { /** * [descr:DataSourceOptions.select] */ - select?: SelectDescriptor; + select?: DevExpress.common.SelectDescriptor; /** * [descr:DataSourceOptions.sort] */ - sort?: SortDescriptor | Array>; + sort?: + | DevExpress.common.SortDescriptor + | Array>; /** * [descr:DataSourceOptions.store] */ @@ -5615,43 +6016,6 @@ declare module DevExpress.data { * @deprecated [depNote:Utils.errorHandler] */ export function errorHandler(e: Error): void; - /** - * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. - */ - type EventName = - | 'loaded' - | 'loading' - | 'inserted' - | 'inserting' - | 'updated' - | 'updating' - | 'push' - | 'removed' - | 'removing' - | 'modified' - | 'modifying'; - /** - * [descr:FilterDescriptor] - */ - export type FilterDescriptor = any; - /** - * [descr:GroupDescriptor] - */ - export type GroupDescriptor = - | KeySelector - | (OrderingDescriptor & { - groupInterval?: number | GroupingInterval; - isExpanded?: boolean; - }); - export type GroupingInterval = - | 'year' - | 'quarter' - | 'month' - | 'day' - | 'dayOfWeek' - | 'hour' - | 'minute' - | 'second'; /** * [descr:Guid] */ @@ -5667,25 +6031,6 @@ declare module DevExpress.data { */ valueOf(): string; } - /** - * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. - */ - type KeySelector = - | string - | ((source: T) => string | number | Date | Object); - /** - * [descr:LangParams] - */ - export type LangParams = { - /** - * [descr:LangParams.locale] - */ - locale: string; - /** - * [descr:LangParams.collatorOptions] - */ - collatorOptions?: Intl.CollatorOptions; - }; /** * [descr:LoadOptions] */ @@ -5709,15 +6054,21 @@ declare module DevExpress.data { /** * [descr:LoadOptions.filter] */ - filter?: FilterDescriptor | Array; + filter?: + | DevExpress.common.FilterDescriptor + | Array; /** * [descr:LoadOptions.group] */ - group?: GroupDescriptor | Array>; + group?: + | DevExpress.common.GroupDescriptor + | Array>; /** * [descr:LoadOptions.groupSummary] */ - groupSummary?: SummaryDescriptor | Array>; + groupSummary?: + | DevExpress.common.SummaryDescriptor + | Array>; /** * [descr:LoadOptions.parentIds] */ @@ -5737,7 +6088,7 @@ declare module DevExpress.data { /** * [descr:LoadOptions.searchOperation] */ - searchOperation?: SearchOperation; + searchOperation?: DevExpress.common.SearchOperation; /** * [descr:LoadOptions.searchValue] */ @@ -5745,7 +6096,7 @@ declare module DevExpress.data { /** * [descr:LoadOptions.select] */ - select?: SelectDescriptor; + select?: DevExpress.common.SelectDescriptor; /** * [descr:LoadOptions.skip] */ @@ -5753,7 +6104,9 @@ declare module DevExpress.data { /** * [descr:LoadOptions.sort] */ - sort?: SortDescriptor | Array>; + sort?: + | DevExpress.common.SortDescriptor + | Array>; /** * [descr:LoadOptions.take] */ @@ -5761,34 +6114,16 @@ declare module DevExpress.data { /** * [descr:LoadOptions.totalSummary] */ - totalSummary?: SummaryDescriptor | Array>; + totalSummary?: + | DevExpress.common.SummaryDescriptor + | Array>; /** * [descr:LoadOptions.userData] */ userData?: any; } - /** - * [descr:LocalStore] - */ - export class LocalStore extends ArrayStore< - TItem, - TKey - > { - constructor(options?: DevExpress.data.LocalStore.Options); - /** - * [descr:LocalStore.clear()] - */ - clear(): void; - } - module LocalStore { - export type Options = LocalStoreOptions< - TItem, - TKey - >; - } /** * [descr:LocalStoreOptions] - * @deprecated [depNote:LocalStoreOptions] * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ export interface LocalStoreOptions @@ -5806,53 +6141,6 @@ declare module DevExpress.data { */ name?: string; } - /** - * [descr:ODataContext] - */ - export class ODataContext { - constructor(options?: ODataContextOptions); - /** - * [descr:ODataContext.get(operationName, params)] - */ - get( - operationName: string, - params: any - ): DevExpress.core.utils.DxPromise; - /** - * [descr:ODataContext.invoke(operationName, params, httpMethod)] - */ - invoke( - operationName: string, - params: any, - httpMethod: DevExpress.data.ODataContext.HttpMethod - ): DevExpress.core.utils.DxPromise; - /** - * [descr:ODataContext.objectLink(entityAlias, key)] - */ - objectLink(entityAlias: string, key: any | string | number): any; - } - module ODataContext { - /** - * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. - */ - type HttpMethod = 'GET' | 'POST' | 'PATCH' | 'MERGE'; - /** - * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. - */ - export interface ODataRequestOptions { - accepts: any; - async: boolean; - contentType: string | boolean; - data: any; - dataType: string; - headers: any; - jsonp?: boolean; - method: string; - timeout: number; - url: string; - xhrFields: any; - } - } /** * [descr:ODataContextOptions] * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. @@ -5884,7 +6172,7 @@ declare module DevExpress.data { errorHandler?: (e: { httpStatus: number; errorDetails: any; - requestOptions: DevExpress.data.ODataContext.ODataRequestOptions; + requestOptions: DevExpress.common.ODataRequestOptions; }) => void; /** * [descr:ODataContextOptions.filterToLower] @@ -5907,46 +6195,12 @@ declare module DevExpress.data { */ withCredentials?: boolean; } - /** - * [descr:ODataStore] - */ - export class ODataStore extends AbstractStore< - TItem, - TKey - > { - constructor(options?: DevExpress.data.ODataStore.Options); - /** - * [descr:ODataStore.byKey(key, extraOptions)] - */ - byKey( - key: TKey, - extraOptions?: { - expand?: string | Array; - select?: string | Array; - } - ): DevExpress.core.utils.DxPromise; - /** - * [descr:ODataStore.createQuery(loadOptions)] - */ - createQuery(loadOptions?: { - expand?: string | Array; - requireTotalCount?: boolean; - customQueryParams?: any; - }): Query; - } - module ODataStore { - export type Options = ODataStoreOptions< - TItem, - TKey - >; - } /** * [descr:ODataStoreOptions] - * @deprecated [depNote:ODataStoreOptions] * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ export interface ODataStoreOptions - extends DevExpress.data.AbstractStore.Options { + extends DevExpress.data.Store.StoreOptionsBase { /** * [descr:ODataStoreOptions.beforeSend] */ @@ -5969,7 +6223,7 @@ declare module DevExpress.data { errorHandler?: (e: { httpStatus: number; errorDetails: any; - requestOptions: DevExpress.data.ODataContext.ODataRequestOptions; + requestOptions: DevExpress.common.ODataRequestOptions; }) => void; /** * [descr:ODataStoreOptions.fieldTypes] @@ -6009,11 +6263,37 @@ declare module DevExpress.data { withCredentials?: boolean; } /** - * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. + * @deprecated Use ArrayStoreOptions from /common/data instead */ - type OrderingDescriptor = SelectionDescriptor & { - desc?: boolean; - }; + export type Options = ArrayStoreOptions; + /** + * @public + * @deprecated Use CustomStoreOptions from /common/data instead + */ + export type Options = CustomStoreOptions< + TItem, + TKey + >; + /** + * @public + * @deprecated Use DataSourceOptions from /common/data instead + */ + export type Options< + TStoreItem = any, + TMappedItem = TStoreItem, + TItem = TMappedItem, + TKey = any + > = DataSourceOptions; + /** + * @public + * @deprecated Use LocalStoreOptions from /common/data instead + */ + export type Options = LocalStoreOptions; + /** + * @public + * @deprecated Use ODataStoreOptions from /common/data instead + */ + export type Options = ODataStoreOptions; /** * [descr:PivotGridDataSource] */ @@ -6036,7 +6316,7 @@ declare module DevExpress.data { dataIndex?: number; maxRowCount?: number; customColumns?: Array; - }): DataSource; + }): DevExpress.common.DataSource; /** * [descr:PivotGridDataSource.dispose()] */ @@ -6417,176 +6697,65 @@ declare module DevExpress.data { /** * [descr:Utils.query(array, queryOptions)] */ - export function query(array: Array, queryOptions?: any): Query; + export function query( + array: Array, + queryOptions?: any + ): DevExpress.common.Query; /** * [descr:Utils.query(url, queryOptions)] */ - export function query(url: string, queryOptions: any): Query; - /** - * [descr:Query] - */ - export interface Query { - /** - * [descr:Query.aggregate(seed, step, finalize)] - */ - aggregate( - seed: any, - step: Function, - finalize: Function - ): DevExpress.core.utils.DxPromise; - /** - * [descr:Query.aggregate(step)] - */ - aggregate(step: Function): DevExpress.core.utils.DxPromise; - /** - * [descr:Query.avg()] - */ - avg(): DevExpress.core.utils.DxPromise; - /** - * [descr:Query.avg(getter)] - */ - avg(getter: any): DevExpress.core.utils.DxPromise; - /** - * [descr:Query.count()] - */ - count(): DevExpress.core.utils.DxPromise; - /** - * [descr:Query.enumerate()] - */ - enumerate(): DevExpress.core.utils.DxPromise; - /** - * [descr:Query.filter(criteria)] - */ - filter(criteria: Array): Query; - /** - * [descr:Query.filter(predicate)] - */ - filter(predicate: Function): Query; - /** - * [descr:Query.groupBy(getter)] - */ - groupBy(getter: any): Query; - /** - * [descr:Query.max()] - */ - max(): DevExpress.core.utils.DxPromise; - /** - * [descr:Query.max(getter)] - */ - max(getter: any): DevExpress.core.utils.DxPromise; - /** - * [descr:Query.min()] - */ - min(): DevExpress.core.utils.DxPromise; - /** - * [descr:Query.min(getter)] - */ - min(getter: any): DevExpress.core.utils.DxPromise; - /** - * [descr:Query.select(getter)] - */ - select(...getters: any[]): Query; - /** - * [descr:Query.slice(skip, take)] - */ - slice(skip: number, take?: number): Query; - /** - * [descr:Query.sortBy(getter)] - */ - sortBy(getter: any): Query; - /** - * [descr:Query.sortBy(getter, desc)] - */ - sortBy(getter: any, desc: boolean): Query; - /** - * [descr:Query.sum()] - */ - sum(): DevExpress.core.utils.DxPromise; - /** - * [descr:Query.sum(getter)] - */ - sum(getter: any): DevExpress.core.utils.DxPromise; - /** - * [descr:Query.thenBy(getter)] - */ - thenBy(getter: any): Query; - /** - * [descr:Query.thenBy(getter, desc)] - */ - thenBy(getter: any, desc: boolean): Query; - /** - * [descr:Query.toArray()] - */ - toArray(): Array; - } - export type SearchOperation = - | '=' - | '<>' - | '>' - | '>=' - | '<' - | '<=' - | 'startswith' - | 'endswith' - | 'contains' - | 'notcontains'; - /** - * [descr:SelectDescriptor] - */ - export type SelectDescriptor = - | string - | Array - | ((source: T) => any); - /** - * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. - */ - type SelectionDescriptor = { - selector: KeySelector; - }; + export function query( + url: string, + queryOptions: any + ): DevExpress.common.Query; /** * [descr:Utils.setErrorHandler] */ export function setErrorHandler(handler: (e: Error) => void): void; - /** - * [descr:SortDescriptor] - */ - export type SortDescriptor = KeySelector | OrderingDescriptor; /** * [descr:Store] * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ - export class Store { - constructor(options?: DevExpress.data.Store.Options); + export class StoreBase { + constructor(options?: DevExpress.data.Store.StoreOptionsBase); /** - * [descr:Store.insert(values)] + * [descr:StoreBase.insert(values)] */ insert(values: TItem): DevExpress.core.utils.DxExtendedPromise; /** - * [descr:Store.key()] + * [descr:StoreBase.key()] */ key(): string | Array; /** - * [descr:Store.keyOf(obj)] + * [descr:StoreBase.keyOf(obj)] */ keyOf(obj: TItem): TKey; /** - * [descr:Store.off(eventName)] + * [descr:StoreBase.off(eventName)] */ - off(eventName: EventName): this; + off(eventName: DevExpress.common.StoreBaseEventName): this; /** - * [descr:Store.off(eventName, eventHandler)] + * [descr:StoreBase.off(eventName, eventHandler)] */ - off(eventName: EventName, eventHandler: Function): this; + off( + eventName: DevExpress.common.StoreBaseEventName, + eventHandler: Function + ): this; /** - * [descr:Store.on(eventName, eventHandler)] + * [descr:StoreBase.on(eventName, eventHandler)] */ - on(eventName: EventName, eventHandler: Function): this; + on( + eventName: DevExpress.common.StoreBaseEventName, + eventHandler: Function + ): this; /** - * [descr:Store.on(events)] + * [descr:StoreBase.on(events)] */ - on(events: { [key in EventName]?: Function }): this; + on( + events: { [key in DevExpress.common.StoreBaseEventName]?: Function } + ): this; /** - * [descr:Store.push(changes)] + * [descr:StoreBase.push(changes)] */ push( changes: Array<{ @@ -6597,32 +6766,28 @@ declare module DevExpress.data { }> ): void; /** - * [descr:Store.remove(key)] + * [descr:StoreBase.remove(key)] */ remove(key: TKey): DevExpress.core.utils.DxPromise; /** - * [descr:Store.totalCount(options)] + * [descr:StoreBase.totalCount(options)] */ totalCount(obj: { - filter?: FilterDescriptor | Array; - group?: GroupDescriptor | Array>; + filter?: + | DevExpress.common.FilterDescriptor + | Array; + group?: + | DevExpress.common.GroupDescriptor + | Array>; }): DevExpress.core.utils.DxPromise; /** - * [descr:Store.update(key, values)] + * [descr:StoreBase.update(key, values)] */ update( key: TKey, values: DevExpress.core.DeepPartial ): DevExpress.core.utils.DxExtendedPromise; } - /** - * [descr:SummaryDescriptor] - */ - export type SummaryDescriptor = - | KeySelector - | (SelectionDescriptor & { - summaryType?: 'sum' | 'avg' | 'min' | 'max' | 'count'; - }); /** * [descr:XmlaStore] */ @@ -6670,7 +6835,7 @@ declare module DevExpress.data.Store { * [descr:StoreOptions] * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ - export type Options = { + export type StoreOptionsBase = { /** * [descr:StoreOptions.errorHandler] */ @@ -6731,15 +6896,15 @@ declare module DevExpress.data.utils { */ export function compileSetter(expr: string | Array): Function; export type Store = - | CustomStore - | ArrayStore - | LocalStore - | ODataStore; + | DevExpress.common.CustomStore + | DevExpress.common.ArrayStore + | DevExpress.common.LocalStore + | DevExpress.common.ODataStore; export type StoreOptions = - | DevExpress.data.CustomStore.Options - | (DevExpress.data.ArrayStore.Options & { type: 'array' }) - | (DevExpress.data.LocalStore.Options & { type: 'local' }) - | (DevExpress.data.ODataStore.Options & { type: 'odata' }); + | CustomStoreOptions + | (ArrayStoreOptions & { type: 'array' }) + | (LocalStoreOptions & { type: 'local' }) + | (ODataStoreOptions & { type: 'odata' }); } declare module DevExpress.data.utils.odata { /** @@ -6748,190 +6913,6 @@ declare module DevExpress.data.utils.odata { export var keyConverters: any; } declare module DevExpress.events { - /** - * [descr:AsyncCancelable] - */ - export type AsyncCancelable = { - /** - * [descr:AsyncCancelable.cancel] - */ - cancel: boolean | PromiseLike; - }; - /** - * [descr:Cancelable] - */ - export interface Cancelable { - /** - * [descr:Cancelable.cancel] - */ - cancel?: boolean; - } - /** - * [descr:ChangedOptionInfo] - */ - export interface ChangedOptionInfo { - /** - * [descr:ChangedOptionInfo.name] - */ - readonly name: string; - /** - * [descr:ChangedOptionInfo.fullName] - */ - readonly fullName: string; - /** - * [descr:ChangedOptionInfo.value] - */ - readonly value?: any; - /** - * [descr:ChangedOptionInfo.previousValue] - */ - readonly previousValue?: any; - } - - /** - * [descr:DxEvent] - * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. - */ - export type DxEvent = {} extends EventType - ? EventObject & TNativeEvent - : EventType; - /** - * [descr:event] - * @deprecated [depNote:event] - * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. - */ - export type event = DxEvent; - /** - * [descr:EventInfo] - */ - export interface EventInfo { - /** - * [descr:EventInfo.component] - */ - readonly component: TComponent; - /** - * [descr:EventInfo.element] - */ - readonly element: DevExpress.core.DxElement; - /** - * [descr:EventInfo.model] - */ - readonly model?: any; - } - /** - * [descr:EventObject] - */ - export type EventObject = { - /** - * [descr:EventObject.currentTarget] - */ - currentTarget: Element; - - /** - * [descr:EventObject.data] - */ - data: any; - - /** - * [descr:EventObject.delegateTarget] - */ - delegateTarget: Element; - - /** - * [descr:EventObject.target] - */ - target: Element; - /** - * [descr:EventObject.isDefaultPrevented()] - */ - isDefaultPrevented(): boolean; - /** - * [descr:EventObject.isImmediatePropagationStopped()] - */ - isImmediatePropagationStopped(): boolean; - /** - * [descr:EventObject.isPropagationStopped()] - */ - isPropagationStopped(): boolean; - /** - * [descr:EventObject.preventDefault()] - */ - preventDefault(): void; - /** - * [descr:EventObject.stopImmediatePropagation()] - */ - stopImmediatePropagation(): void; - /** - * [descr:EventObject.stopPropagation()] - */ - stopPropagation(): void; - }; - /** - * [descr:handler(event, extraParameters)] - * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. - */ - export function eventsHandler(event: DxEvent, extraParameters: any): boolean; - /** - * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. - */ - export interface EventType {} - /** - * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. - */ - interface EventType extends JQueryEventObject { - cancel?: boolean; - } - /** - * [descr:InitializedEventInfo] - */ - export interface InitializedEventInfo { - /** - * [descr:InitializedEventInfo.component] - */ - readonly component?: TComponent; - /** - * [descr:InitializedEventInfo.element] - */ - readonly element?: DevExpress.core.DxElement; - } - /** - * [descr:ItemInfo] - */ - export interface ItemInfo { - /** - * [descr:ItemInfo.itemData] - */ - readonly itemData?: TItemData; - /** - * [descr:ItemInfo.itemElement] - */ - readonly itemElement: DevExpress.core.DxElement; - /** - * [descr:ItemInfo.itemIndex] - */ - readonly itemIndex: number; - } - /** - * [descr:NativeEventInfo] - */ - export interface NativeEventInfo { - /** - * [descr:NativeEventInfo.component] - */ - readonly component: TComponent; - /** - * [descr:NativeEventInfo.element] - */ - readonly element: DevExpress.core.DxElement; - /** - * [descr:NativeEventInfo.model] - */ - readonly model?: any; - /** - * [descr:NativeEventInfo.event] - */ - readonly event?: DxEvent; - } /** * [descr:events.off(element)] */ @@ -7045,14 +7026,14 @@ declare module DevExpress.events { */ export function trigger( element: Element | Array, - event: string | DxEvent + event: string | DevExpress.common.DxEvent ): void; /** * [descr:events.trigger(element, event, extraParameters)] */ export function trigger( element: Element | Array, - event: string | DxEvent, + event: string | DevExpress.common.DxEvent, extraParameters: any ): void; /** @@ -7061,7 +7042,7 @@ declare module DevExpress.events { */ export function triggerHandler( element: Element | Array, - event: string | DxEvent + event: string | DevExpress.common.DxEvent ): void; /** * [descr:events.triggerHandler(element, event, extraParameters)] @@ -7069,7 +7050,7 @@ declare module DevExpress.events { */ export function triggerHandler( element: Element | Array, - event: string | DxEvent, + event: string | DevExpress.common.DxEvent, extraParameters: any ): void; } @@ -7278,16 +7259,10 @@ declare module DevExpress.fileManagement { * [descr:CustomFileSystemProvider] */ export class CustomFileSystemProvider extends FileSystemProviderBase { - constructor( - options?: DevExpress.fileManagement.CustomFileSystemProvider.Options - ); - } - module CustomFileSystemProvider { - export type Options = CustomFileSystemProviderOptions; + constructor(options?: CustomFileSystemProviderOptions); } /** * [descr:CustomFileSystemProviderOptions] - * @deprecated [depNote:CustomFileSystemProviderOptions] * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ export interface CustomFileSystemProviderOptions @@ -7570,16 +7545,10 @@ declare module DevExpress.fileManagement { * [descr:ObjectFileSystemProvider] */ export class ObjectFileSystemProvider extends FileSystemProviderBase { - constructor( - options?: DevExpress.fileManagement.ObjectFileSystemProvider.Options - ); - } - module ObjectFileSystemProvider { - export type Options = ObjectFileSystemProviderOptions; + constructor(options?: ObjectFileSystemProviderOptions); } /** * [descr:ObjectFileSystemProviderOptions] - * @deprecated [depNote:ObjectFileSystemProviderOptions] * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ export interface ObjectFileSystemProviderOptions @@ -7597,20 +7566,28 @@ declare module DevExpress.fileManagement { */ itemsExpr?: string | Function; } + /** + * @deprecated Use CustomFileSystemProviderOptions from /common/file_management instead + */ + export type Options = CustomFileSystemProviderOptions; + /** + * @public + * @deprecated Use ObjectFileSystemProviderOptions from /common/file_management instead + */ + export type Options = ObjectFileSystemProviderOptions; + /** + * @public + * @deprecated Use RemoteFileSystemProviderOptions from /common/file_management instead + */ + export type Options = RemoteFileSystemProviderOptions; /** * [descr:RemoteFileSystemProvider] */ export class RemoteFileSystemProvider extends FileSystemProviderBase { - constructor( - options?: DevExpress.fileManagement.RemoteFileSystemProvider.Options - ); - } - module RemoteFileSystemProvider { - export type Options = RemoteFileSystemProviderOptions; + constructor(options?: RemoteFileSystemProviderOptions); } /** * [descr:RemoteFileSystemProviderOptions] - * @deprecated [depNote:RemoteFileSystemProviderOptions] * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ export interface RemoteFileSystemProviderOptions @@ -7957,7 +7934,7 @@ declare module DevExpress.pdfExporter { /** * [descr:PdfExportGanttProps.font] */ - font?: PdfExportGanttFont; + font?: DevExpress.common.PdfExportGanttFont; } } declare module DevExpress.ui { @@ -7996,7 +7973,7 @@ declare module DevExpress.ui { TItem extends DevExpress.ui.CollectionWidget.ItemLike = any, TKey = any > extends Widget { - getDataSource(): DevExpress.data.DataSource; + getDataSource(): DevExpress.common.DataSource; } module CollectionWidget { /** @@ -8021,8 +7998,8 @@ declare module DevExpress.ui { * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ export type SelectionChangingEventBase = - DevExpress.events.AsyncCancelable & - DevExpress.events.EventInfo & + DevExpress.common.AsyncCancelable & + DevExpress.common.EventInfo & SelectionChangeInfo; } /** @@ -8042,7 +8019,7 @@ declare module DevExpress.ui { * [descr:CollectionWidgetItem.template] */ template?: - | DevExpress.core.template + | Template | (( itemData: this, itemIndex: number, @@ -8069,7 +8046,7 @@ declare module DevExpress.ui { /** * [descr:CollectionWidgetOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.common.DataSourceLike | null; /** * [descr:CollectionWidgetOptions.itemHoldTimeout] */ @@ -8078,7 +8055,7 @@ declare module DevExpress.ui { * [descr:CollectionWidgetOptions.itemTemplate] */ itemTemplate?: - | DevExpress.core.template + | Template | (( itemData: TItem, itemIndex: number, @@ -8101,39 +8078,39 @@ declare module DevExpress.ui { */ onItemClick?: | (( - e: DevExpress.events.NativeEventInfo< + e: DevExpress.common.NativeEventInfo< TComponent, MouseEvent | PointerEvent > & - DevExpress.events.ItemInfo + DevExpress.common.ItemInfo ) => void) | string; /** * [descr:CollectionWidgetOptions.onItemContextMenu] */ onItemContextMenu?: ( - e: DevExpress.events.NativeEventInfo< + e: DevExpress.common.NativeEventInfo< TComponent, MouseEvent | PointerEvent | TouchEvent > & - DevExpress.events.ItemInfo + DevExpress.common.ItemInfo ) => void; /** * [descr:CollectionWidgetOptions.onItemHold] */ onItemHold?: ( - e: DevExpress.events.NativeEventInfo< + e: DevExpress.common.NativeEventInfo< TComponent, MouseEvent | PointerEvent | TouchEvent > & - DevExpress.events.ItemInfo + DevExpress.common.ItemInfo ) => void; /** * [descr:CollectionWidgetOptions.onItemRendered] */ onItemRendered?: ( - e: DevExpress.events.EventInfo & - DevExpress.events.ItemInfo + e: DevExpress.common.EventInfo & + DevExpress.common.ItemInfo ) => void; /** * [descr:CollectionWidgetOptions.onSelectionChanging] @@ -8145,7 +8122,7 @@ declare module DevExpress.ui { * [descr:CollectionWidgetOptions.onSelectionChanged] */ onSelectionChanged?: ( - e: DevExpress.events.EventInfo & + e: DevExpress.common.EventInfo & DevExpress.ui.CollectionWidget.SelectionChangeInfo ) => void; /** @@ -8179,7 +8156,7 @@ declare module DevExpress.ui { */ export class DataExpressionMixin { constructor(options?: DataExpressionMixinOptions); - getDataSource(): DevExpress.data.DataSource; + getDataSource(): DevExpress.common.DataSource; } /** * [descr:DataExpressionMixinOptions] @@ -8189,7 +8166,7 @@ declare module DevExpress.ui { /** * [descr:DataExpressionMixinOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike< + dataSource?: DevExpress.common.DataSourceLike< CollectionWidgetItem | any > | null; /** @@ -8200,7 +8177,7 @@ declare module DevExpress.ui { * [descr:DataExpressionMixinOptions.itemTemplate] */ itemTemplate?: - | DevExpress.core.template + | Template | (( itemData: any, itemIndex: number, @@ -8383,14 +8360,14 @@ declare module DevExpress.ui { export type ContentReadyEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.EventInfo>; /** * [descr:_ui_accordion_DisposingEvent] */ export type DisposingEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.EventInfo>; export type ExplicitTypes = { Properties: Properties; ContentReadyEvent: ContentReadyEvent; @@ -8410,40 +8387,40 @@ declare module DevExpress.ui { export type InitializedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.InitializedEventInfo>; + > = DevExpress.common.InitializedEventInfo>; /** * [descr:_ui_accordion_ItemClickEvent] */ export type ItemClickEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxAccordion, KeyboardEvent | MouseEvent | PointerEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * [descr:_ui_accordion_ItemContextMenuEvent] */ export type ItemContextMenuEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxAccordion, MouseEvent | PointerEvent | TouchEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * [descr:_ui_accordion_ItemHoldEvent] */ export type ItemHoldEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxAccordion, MouseEvent | PointerEvent | TouchEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ @@ -8454,27 +8431,27 @@ declare module DevExpress.ui { export type ItemRenderedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & - DevExpress.events.ItemInfo; + > = DevExpress.common.EventInfo> & + DevExpress.common.ItemInfo; /** * [descr:_ui_accordion_ItemTitleClickEvent] */ export type ItemTitleClickEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxAccordion, MouseEvent | PointerEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * [descr:_ui_accordion_OptionChangedEvent] */ export type OptionChangedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & - DevExpress.events.ChangedOptionInfo; + > = DevExpress.common.EventInfo> & + DevExpress.common.ChangedOptionInfo; export type Properties< TItem extends ItemLike = any, TKey = any @@ -8485,7 +8462,7 @@ declare module DevExpress.ui { export type SelectionChangedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & DevExpress.ui.CollectionWidget.SelectionChangeInfo; } /** @@ -8505,7 +8482,7 @@ declare module DevExpress.ui { * [descr:dxAccordionItem.titleTemplate] */ titleTemplate?: - | DevExpress.core.template + | Template | (() => string | DevExpress.core.UserDefinedElement); } /** @@ -8527,7 +8504,7 @@ declare module DevExpress.ui { /** * [descr:dxAccordionOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.common.DataSourceLike | null; /** * [descr:dxAccordionOptions.deferRendering] */ @@ -8548,7 +8525,7 @@ declare module DevExpress.ui { * [descr:dxAccordionOptions.itemTemplate] */ itemTemplate?: - | DevExpress.core.template + | Template | (( itemData: TItem, itemIndex: number, @@ -8558,7 +8535,7 @@ declare module DevExpress.ui { * [descr:dxAccordionOptions.itemTitleTemplate] */ itemTitleTemplate?: - | DevExpress.core.template + | Template | (( itemData: TItem, itemIndex: number, @@ -8616,22 +8593,22 @@ declare module DevExpress.ui { export type CancelClickEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.Cancelable & - DevExpress.events.EventInfo>; + > = DevExpress.common.Cancelable & + DevExpress.common.EventInfo>; /** * [descr:_ui_action_sheet_ContentReadyEvent] */ export type ContentReadyEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.EventInfo>; /** * [descr:_ui_action_sheet_DisposingEvent] */ export type DisposingEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.EventInfo>; export type ExplicitTypes, TKey> = { Properties: Properties; CancelClickEvent: CancelClickEvent; @@ -8650,40 +8627,40 @@ declare module DevExpress.ui { export type InitializedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.InitializedEventInfo>; + > = DevExpress.common.InitializedEventInfo>; /** * [descr:_ui_action_sheet_ItemClickEvent] */ export type ItemClickEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxActionSheet, KeyboardEvent | MouseEvent | PointerEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * [descr:_ui_action_sheet_ItemContextMenuEvent] */ export type ItemContextMenuEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxActionSheet, MouseEvent | PointerEvent | TouchEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * [descr:_ui_action_sheet_ItemHoldEvent] */ export type ItemHoldEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxActionSheet, MouseEvent | PointerEvent | TouchEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ @@ -8694,16 +8671,16 @@ declare module DevExpress.ui { export type ItemRenderedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & - DevExpress.events.ItemInfo; + > = DevExpress.common.EventInfo> & + DevExpress.common.ItemInfo; /** * [descr:_ui_action_sheet_OptionChangedEvent] */ export type OptionChangedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & - DevExpress.events.ChangedOptionInfo; + > = DevExpress.common.EventInfo> & + DevExpress.common.ChangedOptionInfo; export type Properties< TItem extends ItemLike = any, TKey = any @@ -8723,7 +8700,7 @@ declare module DevExpress.ui { */ onClick?: | (( - e: DevExpress.events.NativeEventInfo< + e: DevExpress.common.NativeEventInfo< dxActionSheet, MouseEvent | PointerEvent > @@ -8753,7 +8730,7 @@ declare module DevExpress.ui { /** * [descr:dxActionSheetOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.common.DataSourceLike | null; /** * [descr:dxActionSheetOptions.items] */ @@ -8802,56 +8779,56 @@ declare module DevExpress.ui { /** * [descr:_ui_autocomplete_ChangeEvent] */ - export type ChangeEvent = DevExpress.events.NativeEventInfo< + export type ChangeEvent = DevExpress.common.NativeEventInfo< dxAutocomplete, Event >; /** * [descr:_ui_autocomplete_ClosedEvent] */ - export type ClosedEvent = DevExpress.events.EventInfo; + export type ClosedEvent = DevExpress.common.EventInfo; /** * [descr:_ui_autocomplete_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = DevExpress.common.EventInfo; /** * [descr:_ui_autocomplete_CopyEvent] */ - export type CopyEvent = DevExpress.events.NativeEventInfo< + export type CopyEvent = DevExpress.common.NativeEventInfo< dxAutocomplete, ClipboardEvent >; /** * [descr:_ui_autocomplete_CutEvent] */ - export type CutEvent = DevExpress.events.NativeEventInfo< + export type CutEvent = DevExpress.common.NativeEventInfo< dxAutocomplete, ClipboardEvent >; /** * [descr:_ui_autocomplete_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; export type DropDownButtonTemplateData = DevExpress.ui.dxDropDownEditor.DropDownButtonTemplateDataModel; /** * [descr:_ui_autocomplete_EnterKeyEvent] */ - export type EnterKeyEvent = DevExpress.events.NativeEventInfo< + export type EnterKeyEvent = DevExpress.common.NativeEventInfo< dxAutocomplete, KeyboardEvent >; /** * [descr:_ui_autocomplete_FocusInEvent] */ - export type FocusInEvent = DevExpress.events.NativeEventInfo< + export type FocusInEvent = DevExpress.common.NativeEventInfo< dxAutocomplete, FocusEvent >; /** * [descr:_ui_autocomplete_FocusOutEvent] */ - export type FocusOutEvent = DevExpress.events.NativeEventInfo< + export type FocusOutEvent = DevExpress.common.NativeEventInfo< dxAutocomplete, FocusEvent >; @@ -8859,54 +8836,54 @@ declare module DevExpress.ui { * [descr:_ui_autocomplete_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_autocomplete_InputEvent] */ - export type InputEvent = DevExpress.events.NativeEventInfo< + export type InputEvent = DevExpress.common.NativeEventInfo< dxAutocomplete, UIEvent & { target: HTMLInputElement } >; /** * [descr:_ui_autocomplete_ItemClickEvent] */ - export type ItemClickEvent = DevExpress.events.NativeEventInfo< + export type ItemClickEvent = DevExpress.common.NativeEventInfo< dxAutocomplete, KeyboardEvent | MouseEvent | PointerEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * [descr:_ui_autocomplete_KeyDownEvent] */ - export type KeyDownEvent = DevExpress.events.NativeEventInfo< + export type KeyDownEvent = DevExpress.common.NativeEventInfo< dxAutocomplete, KeyboardEvent >; - export type KeyPressEvent = DevExpress.events.NativeEventInfo< + export type KeyPressEvent = DevExpress.common.NativeEventInfo< dxAutocomplete, KeyboardEvent >; /** * [descr:_ui_autocomplete_KeyUpEvent] */ - export type KeyUpEvent = DevExpress.events.NativeEventInfo< + export type KeyUpEvent = DevExpress.common.NativeEventInfo< dxAutocomplete, KeyboardEvent >; /** * [descr:_ui_autocomplete_OpenedEvent] */ - export type OpenedEvent = DevExpress.events.EventInfo; + export type OpenedEvent = DevExpress.common.EventInfo; /** * [descr:_ui_autocomplete_OptionChangedEvent] */ export type OptionChangedEvent = - DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; /** * [descr:_ui_autocomplete_PasteEvent] */ - export type PasteEvent = DevExpress.events.NativeEventInfo< + export type PasteEvent = DevExpress.common.NativeEventInfo< dxAutocomplete, ClipboardEvent >; @@ -8915,12 +8892,12 @@ declare module DevExpress.ui { * [descr:_ui_autocomplete_SelectionChangedEvent] */ export type SelectionChangedEvent = - DevExpress.events.EventInfo & + DevExpress.common.EventInfo & DevExpress.ui.dxDropDownList.SelectionChangedInfo; /** * [descr:_ui_autocomplete_ValueChangedEvent] */ - export type ValueChangedEvent = DevExpress.events.NativeEventInfo< + export type ValueChangedEvent = DevExpress.common.NativeEventInfo< dxAutocomplete, KeyboardEvent | MouseEvent | PointerEvent | Event > & @@ -8970,7 +8947,7 @@ declare module DevExpress.ui { export type ContentReadyEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.EventInfo>; export type CrosswiseDistribution = 'center' | 'end' | 'start' | 'stretch'; /** * [descr:_ui_box_DisposingEvent] @@ -8978,7 +8955,7 @@ declare module DevExpress.ui { export type DisposingEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.EventInfo>; export type Distribution = | 'center' | 'end' @@ -9002,40 +8979,40 @@ declare module DevExpress.ui { export type InitializedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.InitializedEventInfo>; + > = DevExpress.common.InitializedEventInfo>; /** * [descr:_ui_box_ItemClickEvent] */ export type ItemClickEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxBox, MouseEvent | PointerEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * [descr:_ui_box_ItemContextMenuEvent] */ export type ItemContextMenuEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxBox, MouseEvent | PointerEvent | TouchEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * [descr:_ui_box_ItemHoldEvent] */ export type ItemHoldEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxBox, MouseEvent | PointerEvent | TouchEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ @@ -9046,16 +9023,16 @@ declare module DevExpress.ui { export type ItemRenderedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & - DevExpress.events.ItemInfo; + > = DevExpress.common.EventInfo> & + DevExpress.common.ItemInfo; /** * [descr:_ui_box_OptionChangedEvent] */ export type OptionChangedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & - DevExpress.events.ChangedOptionInfo; + > = DevExpress.common.EventInfo> & + DevExpress.common.ChangedOptionInfo; export type Properties< TItem extends ItemLike = any, TKey = any @@ -9102,7 +9079,7 @@ declare module DevExpress.ui { /** * [descr:dxBoxOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.common.DataSourceLike | null; /** * [descr:dxBoxOptions.direction] */ @@ -9120,7 +9097,7 @@ declare module DevExpress.ui { /** * [descr:_ui_button_ClickEvent] */ - export type ClickEvent = DevExpress.events.NativeEventInfo< + export type ClickEvent = DevExpress.common.NativeEventInfo< dxButton, KeyboardEvent | MouseEvent | PointerEvent > & { @@ -9132,21 +9109,21 @@ declare module DevExpress.ui { /** * [descr:_ui_button_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = DevExpress.common.EventInfo; /** * [descr:_ui_button_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_ui_button_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_button_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type Properties = dxButtonOptions; export type TemplateData = { readonly text?: string; @@ -9161,36 +9138,36 @@ declare module DevExpress.ui { /** * [descr:_ui_button_group_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = DevExpress.common.EventInfo; /** * [descr:_ui_button_group_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_ui_button_group_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_button_group_ItemClickEvent] */ - export type ItemClickEvent = DevExpress.events.NativeEventInfo< + export type ItemClickEvent = DevExpress.common.NativeEventInfo< dxButtonGroup, KeyboardEvent | MouseEvent | PointerEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * [descr:_ui_button_group_OptionChangedEvent] */ export type OptionChangedEvent = - DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type Properties = dxButtonGroupOptions; /** * [descr:_ui_button_group_SelectionChangedEvent] */ export type SelectionChangedEvent = - DevExpress.events.EventInfo & + DevExpress.common.EventInfo & DevExpress.ui.CollectionWidget.SelectionChangeInfo; } /** @@ -9226,7 +9203,7 @@ declare module DevExpress.ui { * [descr:dxButtonGroupOptions.buttonTemplate] */ buttonTemplate?: - | DevExpress.core.template + | Template | (( buttonData: any, buttonContent: DevExpress.core.DxElement @@ -9308,7 +9285,7 @@ declare module DevExpress.ui { * [descr:dxButtonOptions.template] */ template?: - | DevExpress.core.template + | Template | (( data: DevExpress.ui.dxButton.TemplateData, contentElement: DevExpress.core.DxElement @@ -9357,7 +9334,7 @@ declare module DevExpress.ui { readonly date: Date; readonly view: string; } - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = DevExpress.common.EventInfo; /** * [descr:DisabledDate] */ @@ -9365,22 +9342,22 @@ declare module DevExpress.ui { /** * [descr:_ui_calendar_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_ui_calendar_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_calendar_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type Properties = dxCalendarOptions; /** * [descr:_ui_calendar_ValueChangedEvent] */ - export type ValueChangedEvent = DevExpress.events.NativeEventInfo< + export type ValueChangedEvent = DevExpress.common.NativeEventInfo< dxCalendar, KeyboardEvent | MouseEvent | PointerEvent | TouchEvent | Event > & @@ -9405,7 +9382,7 @@ declare module DevExpress.ui { * [descr:dxCalendarOptions.cellTemplate] */ cellTemplate?: - | DevExpress.core.template + | Template | (( itemData: DevExpress.ui.dxCalendar.CellTemplateData, itemIndex: number, @@ -9491,13 +9468,13 @@ declare module DevExpress.ui { */ renderMessage(message: DevExpress.ui.dxChat.Message): void; - getDataSource(): DevExpress.data.DataSource; + getDataSource(): DevExpress.common.DataSource; } module dxChat { /** * [descr:_ui_chat_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; export type ExplicitTypes = { Properties: Properties; DisposingEvent: DisposingEvent; @@ -9508,11 +9485,11 @@ declare module DevExpress.ui { * [descr:_ui_chat_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_chat_MessageEnteredEvent] */ - export type MessageEnteredEvent = DevExpress.events.NativeEventInfo< + export type MessageEnteredEvent = DevExpress.common.NativeEventInfo< dxChat, KeyboardEvent | PointerEvent | MouseEvent | TouchEvent > & { @@ -9524,13 +9501,13 @@ declare module DevExpress.ui { /** * [descr:_ui_chat_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type Properties = dxChatOptions; /** * [descr:_ui_chat_TypingEndEvent] */ - export type TypingEndEvent = DevExpress.events.EventInfo & { + export type TypingEndEvent = DevExpress.common.EventInfo & { /** * [descr:_ui_chat_TypingEndEvent.user] */ @@ -9539,7 +9516,7 @@ declare module DevExpress.ui { /** * [descr:_ui_chat_TypingStartEvent] */ - export type TypingStartEvent = DevExpress.events.NativeEventInfo< + export type TypingStartEvent = DevExpress.common.NativeEventInfo< dxChat, UIEvent & { target: HTMLInputElement } > & { @@ -9577,7 +9554,7 @@ declare module DevExpress.ui { /** * [descr:dxChatOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.common.DataSourceLike | null; /** * [descr:dxChatOptions.reloadOnChange] */ @@ -9636,26 +9613,26 @@ declare module DevExpress.ui { /** * [descr:_ui_check_box_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = DevExpress.common.EventInfo; /** * [descr:_ui_check_box_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_ui_check_box_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_check_box_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type Properties = dxCheckBoxOptions; /** * [descr:_ui_check_box_ValueChangedEvent] */ - export type ValueChangedEvent = DevExpress.events.NativeEventInfo< + export type ValueChangedEvent = DevExpress.common.NativeEventInfo< dxCheckBox, KeyboardEvent | MouseEvent | PointerEvent | TouchEvent | Event > & @@ -9713,52 +9690,52 @@ declare module DevExpress.ui { /** * [descr:_ui_color_box_ChangeEvent] */ - export type ChangeEvent = DevExpress.events.NativeEventInfo< + export type ChangeEvent = DevExpress.common.NativeEventInfo< dxColorBox, Event >; /** * [descr:_ui_color_box_ClosedEvent] */ - export type ClosedEvent = DevExpress.events.EventInfo; + export type ClosedEvent = DevExpress.common.EventInfo; /** * [descr:_ui_color_box_CopyEvent] */ - export type CopyEvent = DevExpress.events.NativeEventInfo< + export type CopyEvent = DevExpress.common.NativeEventInfo< dxColorBox, ClipboardEvent >; /** * [descr:_ui_color_box_CutEvent] */ - export type CutEvent = DevExpress.events.NativeEventInfo< + export type CutEvent = DevExpress.common.NativeEventInfo< dxColorBox, ClipboardEvent >; /** * [descr:_ui_color_box_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; export type DropDownButtonTemplateData = DevExpress.ui.dxDropDownEditor.DropDownButtonTemplateDataModel; /** * [descr:_ui_color_box_EnterKeyEvent] */ - export type EnterKeyEvent = DevExpress.events.NativeEventInfo< + export type EnterKeyEvent = DevExpress.common.NativeEventInfo< dxColorBox, KeyboardEvent >; /** * [descr:_ui_color_box_FocusInEvent] */ - export type FocusInEvent = DevExpress.events.NativeEventInfo< + export type FocusInEvent = DevExpress.common.NativeEventInfo< dxColorBox, FocusEvent >; /** * [descr:_ui_color_box_FocusOutEvent] */ - export type FocusOutEvent = DevExpress.events.NativeEventInfo< + export type FocusOutEvent = DevExpress.common.NativeEventInfo< dxColorBox, FocusEvent >; @@ -9766,45 +9743,45 @@ declare module DevExpress.ui { * [descr:_ui_color_box_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_color_box_InputEvent] */ - export type InputEvent = DevExpress.events.NativeEventInfo< + export type InputEvent = DevExpress.common.NativeEventInfo< dxColorBox, UIEvent & { target: HTMLInputElement } >; /** * [descr:_ui_color_box_KeyDownEvent] */ - export type KeyDownEvent = DevExpress.events.NativeEventInfo< + export type KeyDownEvent = DevExpress.common.NativeEventInfo< dxColorBox, KeyboardEvent >; - export type KeyPressEvent = DevExpress.events.NativeEventInfo< + export type KeyPressEvent = DevExpress.common.NativeEventInfo< dxColorBox, KeyboardEvent >; /** * [descr:_ui_color_box_KeyUpEvent] */ - export type KeyUpEvent = DevExpress.events.NativeEventInfo< + export type KeyUpEvent = DevExpress.common.NativeEventInfo< dxColorBox, KeyboardEvent >; /** * [descr:_ui_color_box_OpenedEvent] */ - export type OpenedEvent = DevExpress.events.EventInfo; + export type OpenedEvent = DevExpress.common.EventInfo; /** * [descr:_ui_color_box_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; /** * [descr:_ui_color_box_PasteEvent] */ - export type PasteEvent = DevExpress.events.NativeEventInfo< + export type PasteEvent = DevExpress.common.NativeEventInfo< dxColorBox, ClipboardEvent >; @@ -9812,7 +9789,7 @@ declare module DevExpress.ui { /** * [descr:_ui_color_box_ValueChangedEvent] */ - export type ValueChangedEvent = DevExpress.events.NativeEventInfo< + export type ValueChangedEvent = DevExpress.common.NativeEventInfo< dxColorBox, KeyboardEvent | MouseEvent | PointerEvent | UIEvent | Event > & @@ -9845,7 +9822,7 @@ declare module DevExpress.ui { * [descr:dxColorBoxOptions.fieldTemplate] */ fieldTemplate?: - | DevExpress.core.template + | Template | (( value: string, fieldElement: DevExpress.core.DxElement @@ -9888,14 +9865,14 @@ declare module DevExpress.ui { /** * [descr:_ui_context_menu_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo< + export type ContentReadyEvent = DevExpress.common.EventInfo< dxContextMenu >; export type ContextSubmenuDirection = 'auto' | 'left' | 'right'; /** * [descr:_ui_context_menu_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo< + export type DisposingEvent = DevExpress.common.EventInfo< dxContextMenu >; export type ExplicitTypes = { @@ -9917,55 +9894,55 @@ declare module DevExpress.ui { /** * [descr:_ui_context_menu_HiddenEvent] */ - export type HiddenEvent = DevExpress.events.EventInfo< + export type HiddenEvent = DevExpress.common.EventInfo< dxContextMenu >; /** * [descr:_ui_context_menu_HidingEvent] */ - export type HidingEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo>; + export type HidingEvent = DevExpress.common.Cancelable & + DevExpress.common.EventInfo>; /** * [descr:_ui_context_menu_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo>; + DevExpress.common.InitializedEventInfo>; /** * [descr:_ui_context_menu_ItemClickEvent] */ - export type ItemClickEvent = DevExpress.events.NativeEventInfo< + export type ItemClickEvent = DevExpress.common.NativeEventInfo< dxContextMenu, KeyboardEvent | MouseEvent | PointerEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * [descr:_ui_context_menu_ItemContextMenuEvent] */ export type ItemContextMenuEvent = - DevExpress.events.NativeEventInfo< + DevExpress.common.NativeEventInfo< dxContextMenu, MouseEvent | PointerEvent | TouchEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * [descr:_ui_context_menu_ItemRenderedEvent] */ - export type ItemRenderedEvent = DevExpress.events.EventInfo< + export type ItemRenderedEvent = DevExpress.common.EventInfo< dxContextMenu > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * [descr:_ui_context_menu_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo< + export type OptionChangedEvent = DevExpress.common.EventInfo< dxContextMenu > & - DevExpress.events.ChangedOptionInfo; + DevExpress.common.ChangedOptionInfo; /** * [descr:_ui_context_menu_PositioningEvent] */ export type PositioningEvent = - DevExpress.events.NativeEventInfo< + DevExpress.common.NativeEventInfo< dxContextMenu, MouseEvent | PointerEvent | TouchEvent > & { @@ -9978,19 +9955,19 @@ declare module DevExpress.ui { /** * [descr:_ui_context_menu_SelectionChangedEvent] */ - export type SelectionChangedEvent = DevExpress.events.EventInfo< + export type SelectionChangedEvent = DevExpress.common.EventInfo< dxContextMenu > & DevExpress.ui.CollectionWidget.SelectionChangeInfo; /** * [descr:_ui_context_menu_ShowingEvent] */ - export type ShowingEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo>; + export type ShowingEvent = DevExpress.common.Cancelable & + DevExpress.common.EventInfo>; /** * [descr:_ui_context_menu_ShownEvent] */ - export type ShownEvent = DevExpress.events.EventInfo< + export type ShownEvent = DevExpress.common.EventInfo< dxContextMenu >; } @@ -10017,14 +9994,14 @@ declare module DevExpress.ui { closeOnOutsideClick?: | boolean | (( - event: DevExpress.events.DxEvent< + event: DevExpress.common.DxEvent< MouseEvent | PointerEvent | TouchEvent > ) => boolean); /** * [descr:dxContextMenuOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike< + dataSource?: DevExpress.common.DataSourceLike< DevExpress.ui.dxContextMenu.Item, TKey > | null; @@ -10034,7 +10011,7 @@ declare module DevExpress.ui { hideOnOutsideClick?: | boolean | (( - event: DevExpress.events.DxEvent< + event: DevExpress.common.DxEvent< MouseEvent | PointerEvent | TouchEvent > ) => boolean); @@ -10222,7 +10199,7 @@ declare module DevExpress.ui { ): DevExpress.core.DxElement | undefined; getCombinedFilter(): any; getCombinedFilter(returnDataField: boolean): any; - getDataSource(): DevExpress.data.DataSource; + getDataSource(): DevExpress.common.DataSource; getKeyByRowIndex(rowIndex: number): TKey | undefined; getRowElement( rowIndex: number @@ -10267,7 +10244,7 @@ declare module DevExpress.ui { export type AdaptiveDetailRowPreparingEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & DevExpress.common.grids.AdaptiveDetailRowPreparingInfo; /** * [descr:_ui_data_grid_CellClickEvent] @@ -10275,7 +10252,7 @@ declare module DevExpress.ui { export type CellClickEvent< TRowData = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxDataGrid, PointerEvent | MouseEvent > & { @@ -10330,7 +10307,7 @@ declare module DevExpress.ui { export type CellDblClickEvent< TRowData = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxDataGrid, PointerEvent | MouseEvent > & { @@ -10385,7 +10362,7 @@ declare module DevExpress.ui { export type CellHoverChangedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & { + > = DevExpress.common.EventInfo> & { /** * [descr:_ui_data_grid_CellHoverChangedEvent.eventType] */ @@ -10441,7 +10418,7 @@ declare module DevExpress.ui { export type CellPreparedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & { + > = DevExpress.common.EventInfo> & { /** * [descr:_ui_data_grid_CellPreparedEvent.data] */ @@ -10532,7 +10509,7 @@ declare module DevExpress.ui { export type ColumnButtonClickEvent< TRowData = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxDataGrid, PointerEvent | MouseEvent > & { @@ -10608,14 +10585,14 @@ declare module DevExpress.ui { export type ContentReadyEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.EventInfo>; /** * [descr:_ui_data_grid_ContextMenuPreparingEvent] */ export type ContextMenuPreparingEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & { + > = DevExpress.common.EventInfo> & { /** * [descr:_ui_data_grid_ContextMenuPreparingEvent.items] */ @@ -10659,7 +10636,7 @@ declare module DevExpress.ui { export type DataErrorOccurredEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & DevExpress.common.grids.DataErrorOccurredInfo; export type DataGridCommandColumnType = | 'adaptive' @@ -10701,7 +10678,7 @@ declare module DevExpress.ui { export type DisposingEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.EventInfo>; /** * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ @@ -10716,7 +10693,7 @@ declare module DevExpress.ui { export type EditCanceledEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & DevExpress.common.grids.DataChangeInfo; /** * [descr:_ui_data_grid_EditCancelingEvent] @@ -10724,8 +10701,8 @@ declare module DevExpress.ui { export type EditCancelingEvent< TRowData = any, TKey = any - > = DevExpress.events.Cancelable & - DevExpress.events.EventInfo> & + > = DevExpress.common.Cancelable & + DevExpress.common.EventInfo> & DevExpress.common.grids.DataChangeInfo; /** * [descr:dxDataGridEditing] @@ -10779,8 +10756,8 @@ declare module DevExpress.ui { export type EditingStartEvent< TRowData = any, TKey = any - > = DevExpress.events.Cancelable & - DevExpress.events.EventInfo> & { + > = DevExpress.common.Cancelable & + DevExpress.common.EventInfo> & { /** * [descr:_ui_data_grid_EditingStartEvent.data] */ @@ -10801,7 +10778,7 @@ declare module DevExpress.ui { export type EditorPreparedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & { + > = DevExpress.common.EventInfo> & { /** * [descr:_ui_data_grid_EditorPreparedEvent.parentType] */ @@ -10853,7 +10830,7 @@ declare module DevExpress.ui { export type EditorPreparingEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & { + > = DevExpress.common.EventInfo> & { /** * [descr:_ui_data_grid_EditorPreparingEvent.parentType] */ @@ -11026,8 +11003,8 @@ declare module DevExpress.ui { export type ExportingEvent< TRowData = any, TKey = any - > = DevExpress.events.Cancelable & - DevExpress.events.EventInfo> & { + > = DevExpress.common.Cancelable & + DevExpress.common.EventInfo> & { /** * [descr:_ui_data_grid_ExportingEvent.fileName] */ @@ -11070,7 +11047,7 @@ declare module DevExpress.ui { export type FocusedCellChangedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & { + > = DevExpress.common.EventInfo> & { /** * [descr:_ui_data_grid_FocusedCellChangedEvent.cellElement] */ @@ -11098,8 +11075,8 @@ declare module DevExpress.ui { export type FocusedCellChangingEvent< TRowData = any, TKey = any - > = DevExpress.events.Cancelable & - DevExpress.events.NativeEventInfo< + > = DevExpress.common.Cancelable & + DevExpress.common.NativeEventInfo< dxDataGrid, KeyboardEvent | PointerEvent | MouseEvent | TouchEvent > & { @@ -11142,7 +11119,7 @@ declare module DevExpress.ui { export type FocusedRowChangedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & { + > = DevExpress.common.EventInfo> & { /** * [descr:_ui_data_grid_FocusedRowChangedEvent.rowElement] */ @@ -11162,8 +11139,8 @@ declare module DevExpress.ui { export type FocusedRowChangingEvent< TRowData = any, TKey = any - > = DevExpress.events.Cancelable & - DevExpress.events.NativeEventInfo< + > = DevExpress.common.Cancelable & + DevExpress.common.NativeEventInfo< dxDataGrid, KeyboardEvent | PointerEvent | MouseEvent | TouchEvent > & { @@ -11288,14 +11265,14 @@ declare module DevExpress.ui { export type InitializedEvent< TRowData = any, TKey = any - > = DevExpress.events.InitializedEventInfo>; + > = DevExpress.common.InitializedEventInfo>; /** * [descr:_ui_data_grid_InitNewRowEvent] */ export type InitNewRowEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & DevExpress.common.grids.NewRowInfo; /** * [descr:_ui_data_grid_KeyDownEvent] @@ -11303,7 +11280,7 @@ declare module DevExpress.ui { export type KeyDownEvent< TRowData = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxDataGrid, KeyboardEvent > & @@ -11324,7 +11301,7 @@ declare module DevExpress.ui { * [descr:dxDataGridOptions.masterDetail.template] */ template?: - | DevExpress.core.template + | Template | (( detailElement: DevExpress.core.DxElement, detailInfo: MasterDetailTemplateData @@ -11341,8 +11318,8 @@ declare module DevExpress.ui { export type OptionChangedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & - DevExpress.events.ChangedOptionInfo; + > = DevExpress.common.EventInfo> & + DevExpress.common.ChangedOptionInfo; /** * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ @@ -11436,7 +11413,7 @@ declare module DevExpress.ui { export type RowClickEvent< TRowData = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxDataGrid, PointerEvent | MouseEvent > & { @@ -11495,7 +11472,7 @@ declare module DevExpress.ui { export type RowCollapsedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & DevExpress.common.grids.RowKeyInfo; /** * [descr:_ui_data_grid_RowCollapsingEvent] @@ -11503,8 +11480,8 @@ declare module DevExpress.ui { export type RowCollapsingEvent< TRowData = any, TKey = any - > = DevExpress.events.Cancelable & - DevExpress.events.EventInfo> & + > = DevExpress.common.Cancelable & + DevExpress.common.EventInfo> & DevExpress.common.grids.RowKeyInfo; /** * [descr:_ui_data_grid_RowDblClickEvent] @@ -11512,7 +11489,7 @@ declare module DevExpress.ui { export type RowDblClickEvent< TRowData = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxDataGrid, PointerEvent | MouseEvent > & { @@ -11574,21 +11551,21 @@ declare module DevExpress.ui { export type RowDraggingChangeEvent< TRowData = any, TKey = any - > = DevExpress.events.Cancelable & + > = DevExpress.common.Cancelable & DevExpress.common.ReducedNativeEventInfo> & DevExpress.common.grids.RowDraggingEventInfo & DevExpress.common.grids.DragDropInfo; export type RowDraggingEndEvent< TRowData = any, TKey = any - > = DevExpress.events.Cancelable & + > = DevExpress.common.Cancelable & DevExpress.common.ReducedNativeEventInfo> & DevExpress.common.grids.RowDraggingEventInfo & DevExpress.common.grids.DragDropInfo; export type RowDraggingMoveEvent< TRowData = any, TKey = any - > = DevExpress.events.Cancelable & + > = DevExpress.common.Cancelable & DevExpress.common.ReducedNativeEventInfo> & DevExpress.common.grids.RowDraggingEventInfo & DevExpress.common.grids.DragDropInfo; @@ -11606,7 +11583,7 @@ declare module DevExpress.ui { export type RowDraggingStartEvent< TRowData = any, TKey = any - > = DevExpress.events.Cancelable & + > = DevExpress.common.Cancelable & DevExpress.common.ReducedNativeEventInfo> & DevExpress.common.grids.DragStartEventInfo; /** @@ -11615,7 +11592,7 @@ declare module DevExpress.ui { export type RowExpandedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & DevExpress.common.grids.RowKeyInfo; /** * [descr:_ui_data_grid_RowExpandingEvent] @@ -11623,8 +11600,8 @@ declare module DevExpress.ui { export type RowExpandingEvent< TRowData = any, TKey = any - > = DevExpress.events.Cancelable & - DevExpress.events.EventInfo> & + > = DevExpress.common.Cancelable & + DevExpress.common.EventInfo> & DevExpress.common.grids.RowKeyInfo; /** * [descr:_ui_data_grid_RowInsertedEvent] @@ -11632,7 +11609,7 @@ declare module DevExpress.ui { export type RowInsertedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & DevExpress.common.grids.RowInsertedInfo; /** * [descr:_ui_data_grid_RowInsertingEvent] @@ -11640,7 +11617,7 @@ declare module DevExpress.ui { export type RowInsertingEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & DevExpress.common.grids.RowInsertingInfo; /** * [descr:_ui_data_grid_RowPreparedEvent] @@ -11648,7 +11625,7 @@ declare module DevExpress.ui { export type RowPreparedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & { + > = DevExpress.common.EventInfo> & { /** * [descr:_ui_data_grid_RowPreparedEvent.data] */ @@ -11700,7 +11677,7 @@ declare module DevExpress.ui { export type RowRemovedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & DevExpress.common.grids.RowRemovedInfo; /** * [descr:_ui_data_grid_RowRemovingEvent] @@ -11708,7 +11685,7 @@ declare module DevExpress.ui { export type RowRemovingEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & DevExpress.common.grids.RowRemovingInfo; export type RowTemplateData = { readonly key: TKey; @@ -11728,7 +11705,7 @@ declare module DevExpress.ui { export type RowUpdatedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & DevExpress.common.grids.RowUpdatedInfo; /** * [descr:_ui_data_grid_RowUpdatingEvent] @@ -11736,7 +11713,7 @@ declare module DevExpress.ui { export type RowUpdatingEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & DevExpress.common.grids.RowUpdatingInfo; /** * [descr:_ui_data_grid_RowValidatingEvent] @@ -11744,7 +11721,7 @@ declare module DevExpress.ui { export type RowValidatingEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & DevExpress.common.grids.RowValidatingInfo; /** * [descr:_ui_data_grid_SavedEvent] @@ -11752,7 +11729,7 @@ declare module DevExpress.ui { export type SavedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & DevExpress.common.grids.DataChangeInfo; /** * [descr:_ui_data_grid_SavingEvent] @@ -11760,7 +11737,7 @@ declare module DevExpress.ui { export type SavingEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & DevExpress.common.grids.SavingInfo; /** * [descr:dxDataGridScrolling] @@ -11805,7 +11782,7 @@ declare module DevExpress.ui { export type SelectionChangedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & DevExpress.common.grids.SelectionChangedInfo; export type SelectionSensitivity = 'base' | 'accent' | 'case' | 'variant'; /** @@ -11997,7 +11974,7 @@ declare module DevExpress.ui { export type ToolbarPreparingEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & DevExpress.common.grids.ToolbarPreparingInfo; } /** @@ -12035,7 +12012,7 @@ declare module DevExpress.ui { * [descr:dxDataGridColumn.cellTemplate] */ cellTemplate?: - | DevExpress.core.template + | Template | (( cellElement: DevExpress.core.DxElement, cellInfo: DevExpress.ui.dxDataGrid.ColumnCellTemplateData< @@ -12051,7 +12028,7 @@ declare module DevExpress.ui { * [descr:dxDataGridColumn.editCellTemplate] */ editCellTemplate?: - | DevExpress.core.template + | Template | (( cellElement: DevExpress.core.DxElement, cellInfo: DevExpress.ui.dxDataGrid.ColumnEditCellTemplateData< @@ -12063,7 +12040,7 @@ declare module DevExpress.ui { * [descr:dxDataGridColumn.groupCellTemplate] */ groupCellTemplate?: - | DevExpress.core.template + | Template | (( cellElement: DevExpress.core.DxElement, cellInfo: DevExpress.ui.dxDataGrid.ColumnGroupCellTemplateData< @@ -12079,7 +12056,7 @@ declare module DevExpress.ui { * [descr:dxDataGridColumn.headerCellTemplate] */ headerCellTemplate?: - | DevExpress.core.template + | Template | (( columnHeader: DevExpress.core.DxElement, headerInfo: DevExpress.ui.dxDataGrid.ColumnHeaderCellTemplateData< @@ -12116,7 +12093,7 @@ declare module DevExpress.ui { * [descr:dxDataGridColumnButton.template] */ template?: - | DevExpress.core.template + | Template | (( cellElement: DevExpress.core.DxElement, cellInfo: DevExpress.ui.dxDataGrid.ColumnButtonTemplateData< @@ -12324,7 +12301,7 @@ declare module DevExpress.ui { * @deprecated [depNote:dxDataGridOptions.rowTemplate] */ rowTemplate?: - | DevExpress.core.template + | Template | (( rowElement: DevExpress.core.DxElement, rowInfo: DevExpress.ui.dxDataGrid.RowTemplateData @@ -12333,7 +12310,7 @@ declare module DevExpress.ui { * [descr:dxDataGridOptions.dataRowTemplate] */ dataRowTemplate?: - | DevExpress.core.template + | Template | (( rowElement: DevExpress.core.DxElement, rowInfo: DevExpress.ui.dxDataGrid.DataRowTemplateData @@ -12384,29 +12361,29 @@ declare module DevExpress.ui { /** * [descr:_ui_date_box_ChangeEvent] */ - export type ChangeEvent = DevExpress.events.NativeEventInfo< + export type ChangeEvent = DevExpress.common.NativeEventInfo< dxDateBox, Event >; /** * [descr:_ui_date_box_ClosedEvent] */ - export type ClosedEvent = DevExpress.events.EventInfo; + export type ClosedEvent = DevExpress.common.EventInfo; /** * [descr:_ui_date_box_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = DevExpress.common.EventInfo; /** * [descr:_ui_date_box_CopyEvent] */ - export type CopyEvent = DevExpress.events.NativeEventInfo< + export type CopyEvent = DevExpress.common.NativeEventInfo< dxDateBox, ClipboardEvent >; /** * [descr:_ui_date_box_CutEvent] */ - export type CutEvent = DevExpress.events.NativeEventInfo< + export type CutEvent = DevExpress.common.NativeEventInfo< dxDateBox, ClipboardEvent >; @@ -12417,27 +12394,27 @@ declare module DevExpress.ui { /** * [descr:_ui_date_box_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; export type DropDownButtonTemplateData = DevExpress.ui.dxDropDownEditor.DropDownButtonTemplateDataModel; /** * [descr:_ui_date_box_EnterKeyEvent] */ - export type EnterKeyEvent = DevExpress.events.NativeEventInfo< + export type EnterKeyEvent = DevExpress.common.NativeEventInfo< dxDateBox, KeyboardEvent >; /** * [descr:_ui_date_box_FocusInEvent] */ - export type FocusInEvent = DevExpress.events.NativeEventInfo< + export type FocusInEvent = DevExpress.common.NativeEventInfo< dxDateBox, FocusEvent >; /** * [descr:_ui_date_box_FocusOutEvent] */ - export type FocusOutEvent = DevExpress.events.NativeEventInfo< + export type FocusOutEvent = DevExpress.common.NativeEventInfo< dxDateBox, FocusEvent >; @@ -12445,45 +12422,45 @@ declare module DevExpress.ui { * [descr:_ui_date_box_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_date_box_InputEvent] */ - export type InputEvent = DevExpress.events.NativeEventInfo< + export type InputEvent = DevExpress.common.NativeEventInfo< dxDateBox, UIEvent & { target: HTMLInputElement } >; /** * [descr:_ui_date_box_KeyDownEvent] */ - export type KeyDownEvent = DevExpress.events.NativeEventInfo< + export type KeyDownEvent = DevExpress.common.NativeEventInfo< dxDateBox, KeyboardEvent >; - export type KeyPressEvent = DevExpress.events.NativeEventInfo< + export type KeyPressEvent = DevExpress.common.NativeEventInfo< dxDateBox, KeyboardEvent >; /** * [descr:_ui_date_box_KeyUpEvent] */ - export type KeyUpEvent = DevExpress.events.NativeEventInfo< + export type KeyUpEvent = DevExpress.common.NativeEventInfo< dxDateBox, KeyboardEvent >; /** * [descr:_ui_date_box_OpenedEvent] */ - export type OpenedEvent = DevExpress.events.EventInfo; + export type OpenedEvent = DevExpress.common.EventInfo; /** * [descr:_ui_date_box_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; /** * [descr:_ui_date_box_PasteEvent] */ - export type PasteEvent = DevExpress.events.NativeEventInfo< + export type PasteEvent = DevExpress.common.NativeEventInfo< dxDateBox, ClipboardEvent >; @@ -12491,7 +12468,7 @@ declare module DevExpress.ui { /** * [descr:_ui_date_box_ValueChangedEvent] */ - export type ValueChangedEvent = DevExpress.events.NativeEventInfo< + export type ValueChangedEvent = DevExpress.common.NativeEventInfo< dxDateBox, KeyboardEvent | MouseEvent | PointerEvent | Event > & @@ -12587,53 +12564,53 @@ declare module DevExpress.ui { /** * [descr:_ui_date_range_box_ChangeEvent] */ - export type ChangeEvent = DevExpress.events.NativeEventInfo; + export type ChangeEvent = DevExpress.common.NativeEventInfo; /** * [descr:_ui_date_range_box_ClosedEvent] */ - export type ClosedEvent = DevExpress.events.EventInfo; + export type ClosedEvent = DevExpress.common.EventInfo; /** * [descr:_ui_date_range_box_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = DevExpress.common.EventInfo; /** * [descr:_ui_date_range_box_CopyEvent] */ - export type CopyEvent = DevExpress.events.NativeEventInfo< + export type CopyEvent = DevExpress.common.NativeEventInfo< dxDateRangeBox, ClipboardEvent >; /** * [descr:_ui_date_range_box_CutEvent] */ - export type CutEvent = DevExpress.events.NativeEventInfo< + export type CutEvent = DevExpress.common.NativeEventInfo< dxDateRangeBox, ClipboardEvent >; /** * [descr:_ui_date_range_box_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; export type DropDownButtonTemplateData = DevExpress.ui.dxDropDownEditor.DropDownButtonTemplateDataModel; /** * [descr:_ui_date_range_box_EnterKeyEvent] */ - export type EnterKeyEvent = DevExpress.events.NativeEventInfo< + export type EnterKeyEvent = DevExpress.common.NativeEventInfo< dxDateRangeBox, KeyboardEvent >; /** * [descr:_ui_date_range_box_FocusInEvent] */ - export type FocusInEvent = DevExpress.events.NativeEventInfo< + export type FocusInEvent = DevExpress.common.NativeEventInfo< dxDateRangeBox, FocusEvent >; /** * [descr:_ui_date_range_box_FocusOutEvent] */ - export type FocusOutEvent = DevExpress.events.NativeEventInfo< + export type FocusOutEvent = DevExpress.common.NativeEventInfo< dxDateRangeBox, FocusEvent >; @@ -12641,46 +12618,46 @@ declare module DevExpress.ui { * [descr:_ui_date_range_box_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_date_range_box_InputEvent] */ - export type InputEvent = DevExpress.events.NativeEventInfo< + export type InputEvent = DevExpress.common.NativeEventInfo< dxDateRangeBox, UIEvent & { target: HTMLInputElement } >; /** * [descr:_ui_date_range_box_KeyDownEvent] */ - export type KeyDownEvent = DevExpress.events.NativeEventInfo< + export type KeyDownEvent = DevExpress.common.NativeEventInfo< dxDateRangeBox, KeyboardEvent >; - export type KeyPressEvent = DevExpress.events.NativeEventInfo< + export type KeyPressEvent = DevExpress.common.NativeEventInfo< dxDateRangeBox, KeyboardEvent >; /** * [descr:_ui_date_range_box_KeyUpEvent] */ - export type KeyUpEvent = DevExpress.events.NativeEventInfo< + export type KeyUpEvent = DevExpress.common.NativeEventInfo< dxDateRangeBox, KeyboardEvent >; /** * [descr:_ui_date_range_box_OpenedEvent] */ - export type OpenedEvent = DevExpress.events.EventInfo; + export type OpenedEvent = DevExpress.common.EventInfo; /** * [descr:_ui_date_range_box_OptionChangedEvent] */ export type OptionChangedEvent = - DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; /** * [descr:_ui_date_range_box_PasteEvent] */ - export type PasteEvent = DevExpress.events.NativeEventInfo< + export type PasteEvent = DevExpress.common.NativeEventInfo< dxDateRangeBox, ClipboardEvent >; @@ -12775,7 +12752,7 @@ declare module DevExpress.ui { /** * [descr:_ui_date_range_box_ValueChangedEvent] */ - export type ValueChangedEvent = DevExpress.events.NativeEventInfo< + export type ValueChangedEvent = DevExpress.common.NativeEventInfo< dxDateRangeBox, KeyboardEvent | MouseEvent | PointerEvent | Event > & @@ -12790,31 +12767,31 @@ declare module DevExpress.ui { * [descr:_ui_defer_rendering_ContentReadyEvent] */ export type ContentReadyEvent = - DevExpress.events.EventInfo; + DevExpress.common.EventInfo; /** * [descr:_ui_defer_rendering_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_ui_defer_rendering_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_defer_rendering_OptionChangedEvent] */ export type OptionChangedEvent = - DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type Properties = dxDeferRenderingOptions; /** * [descr:_ui_defer_rendering_RenderedEvent] */ - export type RenderedEvent = DevExpress.events.EventInfo; + export type RenderedEvent = DevExpress.common.EventInfo; /** * [descr:_ui_defer_rendering_ShownEvent] */ - export type ShownEvent = DevExpress.events.EventInfo; + export type ShownEvent = DevExpress.common.EventInfo; } /** * [descr:dxDeferRenderingOptions] @@ -12855,11 +12832,11 @@ declare module DevExpress.ui { /** * [descr:dxDiagram.getNodeDataSource()] */ - getNodeDataSource(): DevExpress.data.DataSource; + getNodeDataSource(): DevExpress.common.DataSource; /** * [descr:dxDiagram.getEdgeDataSource()] */ - getEdgeDataSource(): DevExpress.data.DataSource; + getEdgeDataSource(): DevExpress.common.DataSource; /** * [descr:dxDiagram.getItemByKey(key)] */ @@ -12916,7 +12893,7 @@ declare module DevExpress.ui { /** * [descr:_ui_diagram_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = DevExpress.common.EventInfo; /** * [descr:_ui_diagram_CustomCommandEvent] */ @@ -12943,16 +12920,16 @@ declare module DevExpress.ui { /** * [descr:_ui_diagram_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_ui_diagram_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_diagram_ItemClickEvent] */ - export type ItemClickEvent = DevExpress.events.EventInfo & { + export type ItemClickEvent = DevExpress.common.EventInfo & { /** * [descr:_ui_diagram_ItemClickEvent.item] */ @@ -12961,7 +12938,7 @@ declare module DevExpress.ui { /** * [descr:_ui_diagram_ItemDblClickEvent] */ - export type ItemDblClickEvent = DevExpress.events.EventInfo & { + export type ItemDblClickEvent = DevExpress.common.EventInfo & { /** * [descr:_ui_diagram_ItemDblClickEvent.item] */ @@ -12970,14 +12947,14 @@ declare module DevExpress.ui { /** * [descr:_ui_diagram_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type Properties = dxDiagramOptions; /** * [descr:_ui_diagram_RequestEditOperationEvent] */ export type RequestEditOperationEvent = - DevExpress.events.EventInfo & { + DevExpress.common.EventInfo & { /** * [descr:_ui_diagram_RequestEditOperationEvent.operation] */ @@ -13017,7 +12994,7 @@ declare module DevExpress.ui { * [descr:_ui_diagram_RequestLayoutUpdateEvent] */ export type RequestLayoutUpdateEvent = - DevExpress.events.EventInfo & { + DevExpress.common.EventInfo & { /** * [descr:_ui_diagram_RequestLayoutUpdateEvent.changes] */ @@ -13031,7 +13008,7 @@ declare module DevExpress.ui { * [descr:_ui_diagram_SelectionChangedEvent] */ export type SelectionChangedEvent = - DevExpress.events.EventInfo & { + DevExpress.common.EventInfo & { /** * [descr:_ui_diagram_SelectionChangedEvent.items] */ @@ -13377,7 +13354,7 @@ declare module DevExpress.ui { * [descr:dxDiagramOptions.customShapeTemplate] */ customShapeTemplate?: - | DevExpress.core.template + | Template | (( container: DevExpress.core.DxElement, data: DevExpress.ui.dxDiagram.CustomShapeTemplateData @@ -13386,7 +13363,7 @@ declare module DevExpress.ui { * [descr:dxDiagramOptions.customShapeToolboxTemplate] */ customShapeToolboxTemplate?: - | DevExpress.core.template + | Template | (( container: DevExpress.core.DxElement, data: DevExpress.ui.dxDiagram.CustomShapeToolboxTemplateData @@ -13508,7 +13485,7 @@ declare module DevExpress.ui { * [descr:dxDiagramOptions.customShapes.template] */ template?: - | DevExpress.core.template + | Template | (( container: DevExpress.core.DxElement, data: DevExpress.ui.dxDiagram.CustomShapeTemplateData @@ -13553,7 +13530,7 @@ declare module DevExpress.ui { * [descr:dxDiagramOptions.customShapes.toolboxTemplate] */ toolboxTemplate?: - | DevExpress.core.template + | Template | (( container: DevExpress.core.DxElement, data: DevExpress.ui.dxDiagram.CustomShapeToolboxTemplateData @@ -13660,7 +13637,7 @@ declare module DevExpress.ui { /** * [descr:dxDiagramOptions.edges.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.common.DataSourceLike | null; /** * [descr:dxDiagramOptions.edges.fromExpr] */ @@ -13784,7 +13761,7 @@ declare module DevExpress.ui { /** * [descr:dxDiagramOptions.nodes.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.common.DataSourceLike | null; /** * [descr:dxDiagramOptions.nodes.heightExpr] */ @@ -14191,12 +14168,12 @@ declare module DevExpress.ui { /** * [descr:_ui_draggable_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_ui_draggable_DragEndEvent] */ - export type DragEndEvent = DevExpress.events.Cancelable & - DevExpress.events.NativeEventInfo< + export type DragEndEvent = DevExpress.common.Cancelable & + DevExpress.common.NativeEventInfo< dxDraggable, PointerEvent | MouseEvent | TouchEvent > & { @@ -14228,8 +14205,8 @@ declare module DevExpress.ui { /** * [descr:_ui_draggable_DragMoveEvent] */ - export type DragMoveEvent = DevExpress.events.Cancelable & - DevExpress.events.NativeEventInfo< + export type DragMoveEvent = DevExpress.common.Cancelable & + DevExpress.common.NativeEventInfo< dxDraggable, PointerEvent | MouseEvent | TouchEvent > & { @@ -14261,8 +14238,8 @@ declare module DevExpress.ui { /** * [descr:_ui_draggable_DragStartEvent] */ - export type DragStartEvent = DevExpress.events.Cancelable & - DevExpress.events.NativeEventInfo< + export type DragStartEvent = DevExpress.common.Cancelable & + DevExpress.common.NativeEventInfo< dxDraggable, PointerEvent | MouseEvent | TouchEvent > & { @@ -14287,12 +14264,12 @@ declare module DevExpress.ui { * [descr:_ui_draggable_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_draggable_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type Properties = dxDraggableOptions; } /** @@ -14310,7 +14287,7 @@ declare module DevExpress.ui { * [descr:dxDraggableOptions.dragTemplate] */ dragTemplate?: - | DevExpress.core.template + | Template | (( dragInfo: DevExpress.ui.dxDraggable.DragTemplateData, containerElement: DevExpress.core.DxElement @@ -14353,18 +14330,18 @@ declare module DevExpress.ui { /** * [descr:_ui_drawer_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_ui_drawer_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; export type OpenedStateMode = 'overlap' | 'shrink' | 'push'; /** * [descr:_ui_drawer_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type PanelLocation = | 'left' | 'right' @@ -14395,7 +14372,7 @@ declare module DevExpress.ui { closeOnOutsideClick?: | boolean | (( - event: DevExpress.events.DxEvent< + event: DevExpress.common.DxEvent< MouseEvent | PointerEvent | TouchEvent > ) => boolean); @@ -14430,28 +14407,26 @@ declare module DevExpress.ui { /** * [descr:dxDrawerOptions.template] */ - template?: - | DevExpress.core.template - | ((Element: DevExpress.core.DxElement) => any); + template?: Template | ((Element: DevExpress.core.DxElement) => any); } /** * [descr:dxDropDownBox] */ export class dxDropDownBox extends dxDropDownEditor { - getDataSource(): DevExpress.data.DataSource; + getDataSource(): DevExpress.common.DataSource; } module dxDropDownBox { /** * [descr:_ui_drop_down_box_ChangeEvent] */ - export type ChangeEvent = DevExpress.events.NativeEventInfo< + export type ChangeEvent = DevExpress.common.NativeEventInfo< dxDropDownBox, Event >; /** * [descr:_ui_drop_down_box_ClosedEvent] */ - export type ClosedEvent = DevExpress.events.EventInfo; + export type ClosedEvent = DevExpress.common.EventInfo; export type ContentTemplateData = { component: dxDropDownBox; readonly value?: any; @@ -14459,41 +14434,41 @@ declare module DevExpress.ui { /** * [descr:_ui_drop_down_box_CopyEvent] */ - export type CopyEvent = DevExpress.events.NativeEventInfo< + export type CopyEvent = DevExpress.common.NativeEventInfo< dxDropDownBox, ClipboardEvent >; /** * [descr:_ui_drop_down_box_CutEvent] */ - export type CutEvent = DevExpress.events.NativeEventInfo< + export type CutEvent = DevExpress.common.NativeEventInfo< dxDropDownBox, ClipboardEvent >; /** * [descr:_ui_drop_down_box_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; export type DropDownButtonTemplateData = DevExpress.ui.dxDropDownEditor.DropDownButtonTemplateDataModel; /** * [descr:_ui_drop_down_box_EnterKeyEvent] */ - export type EnterKeyEvent = DevExpress.events.NativeEventInfo< + export type EnterKeyEvent = DevExpress.common.NativeEventInfo< dxDropDownBox, KeyboardEvent >; /** * [descr:_ui_drop_down_box_FocusInEvent] */ - export type FocusInEvent = DevExpress.events.NativeEventInfo< + export type FocusInEvent = DevExpress.common.NativeEventInfo< dxDropDownBox, FocusEvent >; /** * [descr:_ui_drop_down_box_FocusOutEvent] */ - export type FocusOutEvent = DevExpress.events.NativeEventInfo< + export type FocusOutEvent = DevExpress.common.NativeEventInfo< dxDropDownBox, FocusEvent >; @@ -14501,46 +14476,46 @@ declare module DevExpress.ui { * [descr:_ui_drop_down_box_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_drop_down_box_InputEvent] */ - export type InputEvent = DevExpress.events.NativeEventInfo< + export type InputEvent = DevExpress.common.NativeEventInfo< dxDropDownBox, UIEvent & { target: HTMLInputElement } >; /** * [descr:_ui_drop_down_box_KeyDownEvent] */ - export type KeyDownEvent = DevExpress.events.NativeEventInfo< + export type KeyDownEvent = DevExpress.common.NativeEventInfo< dxDropDownBox, KeyboardEvent >; - export type KeyPressEvent = DevExpress.events.NativeEventInfo< + export type KeyPressEvent = DevExpress.common.NativeEventInfo< dxDropDownBox, KeyboardEvent >; /** * [descr:_ui_drop_down_box_KeyUpEvent] */ - export type KeyUpEvent = DevExpress.events.NativeEventInfo< + export type KeyUpEvent = DevExpress.common.NativeEventInfo< dxDropDownBox, KeyboardEvent >; /** * [descr:_ui_drop_down_box_OpenedEvent] */ - export type OpenedEvent = DevExpress.events.EventInfo; + export type OpenedEvent = DevExpress.common.EventInfo; /** * [descr:_ui_drop_down_box_OptionChangedEvent] */ export type OptionChangedEvent = - DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; /** * [descr:_ui_drop_down_box_PasteEvent] */ - export type PasteEvent = DevExpress.events.NativeEventInfo< + export type PasteEvent = DevExpress.common.NativeEventInfo< dxDropDownBox, ClipboardEvent >; @@ -14548,7 +14523,7 @@ declare module DevExpress.ui { /** * [descr:_ui_drop_down_box_ValueChangedEvent] */ - export type ValueChangedEvent = DevExpress.events.NativeEventInfo< + export type ValueChangedEvent = DevExpress.common.NativeEventInfo< dxDropDownBox, KeyboardEvent | MouseEvent | PointerEvent | Event > & @@ -14570,7 +14545,7 @@ declare module DevExpress.ui { * [descr:dxDropDownBoxOptions.contentTemplate] */ contentTemplate?: - | DevExpress.core.template + | Template | (( templateData: DevExpress.ui.dxDropDownBox.ContentTemplateData, contentElement: DevExpress.core.DxElement @@ -14578,7 +14553,7 @@ declare module DevExpress.ui { /** * [descr:dxDropDownBoxOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.common.DataSourceLike | null; /** * [descr:dxDropDownBoxOptions.displayValueFormatter] */ @@ -14587,7 +14562,7 @@ declare module DevExpress.ui { * [descr:dxDropDownBoxOptions.fieldTemplate] */ fieldTemplate?: - | DevExpress.core.template + | Template | (( value: any, fieldElement: DevExpress.core.DxElement @@ -14618,7 +14593,7 @@ declare module DevExpress.ui { * [descr:dxDropDownButton.close()] */ close(): DevExpress.core.utils.DxPromise; - getDataSource(): DevExpress.data.DataSource; + getDataSource(): DevExpress.common.DataSource; /** * [descr:dxDropDownButton.open()] */ @@ -14636,7 +14611,7 @@ declare module DevExpress.ui { /** * [descr:_ui_drop_down_button_ButtonClickEvent] */ - export type ButtonClickEvent = DevExpress.events.NativeEventInfo< + export type ButtonClickEvent = DevExpress.common.NativeEventInfo< dxDropDownButton, KeyboardEvent | MouseEvent | PointerEvent > & { @@ -14649,20 +14624,20 @@ declare module DevExpress.ui { * [descr:_ui_drop_down_button_ContentReadyEvent] */ export type ContentReadyEvent = - DevExpress.events.EventInfo; + DevExpress.common.EventInfo; /** * [descr:_ui_drop_down_button_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_ui_drop_down_button_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_drop_down_button_ItemClickEvent] */ - export type ItemClickEvent = DevExpress.events.NativeEventInfo< + export type ItemClickEvent = DevExpress.common.NativeEventInfo< dxDropDownButton, KeyboardEvent | MouseEvent | PointerEvent > & { @@ -14679,14 +14654,14 @@ declare module DevExpress.ui { * [descr:_ui_drop_down_button_OptionChangedEvent] */ export type OptionChangedEvent = - DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type Properties = dxDropDownButtonOptions; /** * [descr:_ui_drop_down_button_SelectionChangedEvent] */ export type SelectionChangedEvent = - DevExpress.events.EventInfo & { + DevExpress.common.EventInfo & { /** * [descr:_ui_drop_down_button_SelectionChangedEvent.item] */ @@ -14719,7 +14694,7 @@ declare module DevExpress.ui { /** * [descr:dxDropDownButtonOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike< + dataSource?: DevExpress.common.DataSourceLike< DevExpress.ui.dxDropDownButton.Item | any > | null; /** @@ -14734,9 +14709,9 @@ declare module DevExpress.ui { * [descr:dxDropDownButtonOptions.dropDownContentTemplate] */ dropDownContentTemplate?: - | DevExpress.core.template + | Template | (( - data: Array | DevExpress.data.DataSource, + data: Array | DevExpress.common.DataSource, contentElement: DevExpress.core.DxElement ) => string | DevExpress.core.UserDefinedElement); /** @@ -14759,7 +14734,7 @@ declare module DevExpress.ui { * [descr:dxDropDownButtonOptions.itemTemplate] */ itemTemplate?: - | DevExpress.core.template + | Template | (( itemData: any, itemIndex: number, @@ -14823,7 +14798,7 @@ declare module DevExpress.ui { * [descr:dxDropDownButtonOptions.template] */ template?: - | DevExpress.core.template + | Template | (( data: DevExpress.ui.dxButton.TemplateData, contentElement: DevExpress.core.DxElement @@ -14920,7 +14895,7 @@ declare module DevExpress.ui { * [descr:dxDropDownEditorOptions.dropDownButtonTemplate] */ dropDownButtonTemplate?: - | DevExpress.core.template + | Template | (( buttonData: DevExpress.ui.dxDropDownEditor.DropDownButtonTemplateDataModel, contentElement: DevExpress.core.DxElement @@ -14928,11 +14903,11 @@ declare module DevExpress.ui { /** * [descr:dxDropDownEditorOptions.onClosed] */ - onClosed?: (e: DevExpress.events.EventInfo) => void; + onClosed?: (e: DevExpress.common.EventInfo) => void; /** * [descr:dxDropDownEditorOptions.onOpened] */ - onOpened?: (e: DevExpress.events.EventInfo) => void; + onOpened?: (e: DevExpress.common.EventInfo) => void; /** * [descr:dxDropDownEditorOptions.openOnFieldClick] */ @@ -14963,7 +14938,7 @@ declare module DevExpress.ui { export class dxDropDownList< TProperties > extends dxDropDownEditor { - getDataSource(): DevExpress.data.DataSource; + getDataSource(): DevExpress.common.DataSource; } module dxDropDownList { /** @@ -14992,7 +14967,7 @@ declare module DevExpress.ui { * [descr:dxDropDownListOptions.groupTemplate] */ groupTemplate?: - | DevExpress.core.template + | Template | (( itemData: any, itemIndex: number, @@ -15014,24 +14989,24 @@ declare module DevExpress.ui { * [descr:dxDropDownListOptions.onItemClick] */ onItemClick?: ( - e: DevExpress.events.NativeEventInfo< + e: DevExpress.common.NativeEventInfo< TComponent, KeyboardEvent | MouseEvent | PointerEvent > & - DevExpress.events.ItemInfo + DevExpress.common.ItemInfo ) => void; /** * [descr:dxDropDownListOptions.onSelectionChanged] */ onSelectionChanged?: ( - e: DevExpress.events.EventInfo & + e: DevExpress.common.EventInfo & DevExpress.ui.dxDropDownList.SelectionChangedInfo ) => void; /** * [descr:dxDropDownListOptions.onValueChanged] */ onValueChanged?: ( - e: DevExpress.events.NativeEventInfo< + e: DevExpress.common.NativeEventInfo< TComponent, KeyboardEvent | MouseEvent | PointerEvent | Event > & @@ -15117,11 +15092,11 @@ declare module DevExpress.ui { /** * [descr:_ui_file_manager_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = DevExpress.common.EventInfo; /** * [descr:_ui_file_manager_ContextMenuItemClickEvent] */ - export type ContextMenuItemClickEvent = DevExpress.events.NativeEventInfo< + export type ContextMenuItemClickEvent = DevExpress.common.NativeEventInfo< dxFileManager, KeyboardEvent | PointerEvent | MouseEvent > & { @@ -15149,8 +15124,8 @@ declare module DevExpress.ui { /** * [descr:_ui_file_manager_ContextMenuShowingEvent] */ - export type ContextMenuShowingEvent = DevExpress.events.Cancelable & - DevExpress.events.NativeEventInfo< + export type ContextMenuShowingEvent = DevExpress.common.Cancelable & + DevExpress.common.NativeEventInfo< dxFileManager, KeyboardEvent | PointerEvent | MouseEvent > & { @@ -15171,7 +15146,7 @@ declare module DevExpress.ui { * [descr:_ui_file_manager_CurrentDirectoryChangedEvent] */ export type CurrentDirectoryChangedEvent = - DevExpress.events.EventInfo & { + DevExpress.common.EventInfo & { /** * [descr:_ui_file_manager_CurrentDirectoryChangedEvent.directory] */ @@ -15181,7 +15156,7 @@ declare module DevExpress.ui { * [descr:_ui_file_manager_DirectoryCreatedEvent] */ export type DirectoryCreatedEvent = - DevExpress.events.EventInfo & { + DevExpress.common.EventInfo & { /** * [descr:_ui_file_manager_DirectoryCreatedEvent.parentDirectory] */ @@ -15195,7 +15170,7 @@ declare module DevExpress.ui { * [descr:_ui_file_manager_DirectoryCreatingEvent] */ export type DirectoryCreatingEvent = - DevExpress.events.EventInfo & + DevExpress.common.EventInfo & ActionEventInfo & { /** * [descr:_ui_file_manager_DirectoryCreatingEvent.parentDirectory] @@ -15209,12 +15184,12 @@ declare module DevExpress.ui { /** * [descr:_ui_file_manager_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_ui_file_manager_ErrorOccurredEvent] */ export type ErrorOccurredEvent = - DevExpress.events.EventInfo & { + DevExpress.common.EventInfo & { /** * [descr:_ui_file_manager_ErrorOccurredEvent.errorCode] */ @@ -15262,7 +15237,7 @@ declare module DevExpress.ui { * [descr:_ui_file_manager_FileUploadedEvent] */ export type FileUploadedEvent = - DevExpress.events.EventInfo & { + DevExpress.common.EventInfo & { /** * [descr:_ui_file_manager_FileUploadedEvent.fileData] */ @@ -15276,7 +15251,7 @@ declare module DevExpress.ui { * [descr:_ui_file_manager_FileUploadingEvent] */ export type FileUploadingEvent = - DevExpress.events.EventInfo & + DevExpress.common.EventInfo & ActionEventInfo & { /** * [descr:_ui_file_manager_FileUploadingEvent.fileData] @@ -15291,7 +15266,7 @@ declare module DevExpress.ui { * [descr:_ui_file_manager_FocusedItemChangedEvent] */ export type FocusedItemChangedEvent = - DevExpress.events.EventInfo & { + DevExpress.common.EventInfo & { /** * [descr:_ui_file_manager_FocusedItemChangedEvent.item] */ @@ -15305,11 +15280,11 @@ declare module DevExpress.ui { * [descr:_ui_file_manager_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_file_manager_ItemCopiedEvent] */ - export type ItemCopiedEvent = DevExpress.events.EventInfo & { + export type ItemCopiedEvent = DevExpress.common.EventInfo & { /** * [descr:_ui_file_manager_ItemCopiedEvent.sourceItem] */ @@ -15330,7 +15305,7 @@ declare module DevExpress.ui { /** * [descr:_ui_file_manager_ItemCopyingEvent] */ - export type ItemCopyingEvent = DevExpress.events.EventInfo & + export type ItemCopyingEvent = DevExpress.common.EventInfo & ActionEventInfo & { /** * [descr:_ui_file_manager_ItemCopyingEvent.item] @@ -15345,7 +15320,7 @@ declare module DevExpress.ui { * [descr:_ui_file_manager_ItemDeletedEvent] */ export type ItemDeletedEvent = - DevExpress.events.EventInfo & { + DevExpress.common.EventInfo & { /** * [descr:_ui_file_manager_ItemDeletedEvent.item] */ @@ -15354,7 +15329,7 @@ declare module DevExpress.ui { /** * [descr:_ui_file_manager_ItemDeletingEvent] */ - export type ItemDeletingEvent = DevExpress.events.EventInfo & + export type ItemDeletingEvent = DevExpress.common.EventInfo & ActionEventInfo & { /** * [descr:_ui_file_manager_ItemDeletingEvent.item] @@ -15365,7 +15340,7 @@ declare module DevExpress.ui { * [descr:_ui_file_manager_ItemDownloadingEvent] */ export type ItemDownloadingEvent = - DevExpress.events.EventInfo & + DevExpress.common.EventInfo & ActionEventInfo & { /** * [descr:_ui_file_manager_ItemDownloadingEvent.item] @@ -15375,7 +15350,7 @@ declare module DevExpress.ui { /** * [descr:_ui_file_manager_ItemMovedEvent] */ - export type ItemMovedEvent = DevExpress.events.EventInfo & { + export type ItemMovedEvent = DevExpress.common.EventInfo & { /** * [descr:_ui_file_manager_ItemMovedEvent.sourceItem] */ @@ -15396,7 +15371,7 @@ declare module DevExpress.ui { /** * [descr:_ui_file_manager_ItemMovingEvent] */ - export type ItemMovingEvent = DevExpress.events.EventInfo & + export type ItemMovingEvent = DevExpress.common.EventInfo & ActionEventInfo & { /** * [descr:_ui_file_manager_ItemMovingEvent.item] @@ -15411,7 +15386,7 @@ declare module DevExpress.ui { * [descr:_ui_file_manager_ItemRenamedEvent] */ export type ItemRenamedEvent = - DevExpress.events.EventInfo & { + DevExpress.common.EventInfo & { /** * [descr:_ui_file_manager_ItemRenamedEvent.sourceItem] */ @@ -15424,7 +15399,7 @@ declare module DevExpress.ui { /** * [descr:_ui_file_manager_ItemRenamingEvent] */ - export type ItemRenamingEvent = DevExpress.events.EventInfo & + export type ItemRenamingEvent = DevExpress.common.EventInfo & ActionEventInfo & { /** * [descr:_ui_file_manager_ItemRenamingEvent.item] @@ -15439,14 +15414,14 @@ declare module DevExpress.ui { * [descr:_ui_file_manager_OptionChangedEvent] */ export type OptionChangedEvent = - DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type Properties = dxFileManagerOptions; /** * [descr:_ui_file_manager_SelectedFileOpenedEvent] */ export type SelectedFileOpenedEvent = - DevExpress.events.EventInfo & { + DevExpress.common.EventInfo & { /** * [descr:_ui_file_manager_SelectedFileOpenedEvent.file] */ @@ -15456,7 +15431,7 @@ declare module DevExpress.ui { * [descr:_ui_file_manager_SelectionChangedEvent] */ export type SelectionChangedEvent = - DevExpress.events.EventInfo & { + DevExpress.common.EventInfo & { /** * [descr:_ui_file_manager_SelectionChangedEvent.currentSelectedItemKeys] */ @@ -15477,7 +15452,7 @@ declare module DevExpress.ui { /** * [descr:_ui_file_manager_ToolbarItemClickEvent] */ - export type ToolbarItemClickEvent = DevExpress.events.NativeEventInfo< + export type ToolbarItemClickEvent = DevExpress.common.NativeEventInfo< dxFileManager, PointerEvent | MouseEvent > & { @@ -15531,9 +15506,7 @@ declare module DevExpress.ui { /** * [descr:dxFileManagerContextMenuItem.template] */ - template?: - | DevExpress.core.template - | (() => string | DevExpress.core.UserDefinedElement); + template?: Template | (() => string | DevExpress.core.UserDefinedElement); } /** * [descr:dxFileManagerDetailsColumn] @@ -15888,14 +15861,12 @@ declare module DevExpress.ui { /** * [descr:dxFileManagerToolbarItem.template] */ - template?: - | DevExpress.core.template - | (() => string | DevExpress.core.UserDefinedElement); + template?: Template | (() => string | DevExpress.core.UserDefinedElement); /** * [descr:dxFileManagerToolbarItem.menuItemTemplate] */ menuItemTemplate?: - | DevExpress.core.template + | Template | (() => string | DevExpress.core.UserDefinedElement); } /** @@ -15944,7 +15915,7 @@ declare module DevExpress.ui { * [descr:_ui_file_uploader_BeforeSendEvent] */ export type BeforeSendEvent = - DevExpress.events.EventInfo & { + DevExpress.common.EventInfo & { /** * [descr:_ui_file_uploader_BeforeSendEvent.request] */ @@ -15961,15 +15932,15 @@ declare module DevExpress.ui { /** * [descr:_ui_file_uploader_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = DevExpress.common.EventInfo; /** * [descr:_ui_file_uploader_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_ui_file_uploader_DropZoneEnterEvent] */ - export type DropZoneEnterEvent = DevExpress.events.NativeEventInfo< + export type DropZoneEnterEvent = DevExpress.common.NativeEventInfo< dxFileUploader, PointerEvent | MouseEvent > & { @@ -15981,7 +15952,7 @@ declare module DevExpress.ui { /** * [descr:_ui_file_uploader_DropZoneLeaveEvent] */ - export type DropZoneLeaveEvent = DevExpress.events.NativeEventInfo< + export type DropZoneLeaveEvent = DevExpress.common.NativeEventInfo< dxFileUploader, PointerEvent | MouseEvent > & { @@ -15994,24 +15965,24 @@ declare module DevExpress.ui { * [descr:_ui_file_uploader_FilesUploadedEvent] */ export type FilesUploadedEvent = - DevExpress.events.EventInfo; + DevExpress.common.EventInfo; export type FileUploadMode = 'instantly' | 'useButtons' | 'useForm'; /** * [descr:_ui_file_uploader_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_file_uploader_OptionChangedEvent] */ export type OptionChangedEvent = - DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; /** * [descr:_ui_file_uploader_ProgressEvent] */ export type ProgressEvent = - DevExpress.events.NativeEventInfo & { + DevExpress.common.NativeEventInfo & { /** * [descr:_ui_file_uploader_ProgressEvent.file] */ @@ -16038,7 +16009,7 @@ declare module DevExpress.ui { * [descr:_ui_file_uploader_UploadAbortedEvent] */ export type UploadAbortedEvent = - DevExpress.events.NativeEventInfo & { + DevExpress.common.NativeEventInfo & { /** * [descr:_ui_file_uploader_UploadAbortedEvent.file] */ @@ -16056,7 +16027,7 @@ declare module DevExpress.ui { * [descr:_ui_file_uploader_UploadedEvent] */ export type UploadedEvent = - DevExpress.events.NativeEventInfo & { + DevExpress.common.NativeEventInfo & { /** * [descr:_ui_file_uploader_UploadedEvent.file] */ @@ -16074,7 +16045,7 @@ declare module DevExpress.ui { * [descr:_ui_file_uploader_UploadErrorEvent] */ export type UploadErrorEvent = - DevExpress.events.NativeEventInfo & { + DevExpress.common.NativeEventInfo & { /** * [descr:_ui_file_uploader_UploadErrorEvent.file] */ @@ -16097,7 +16068,7 @@ declare module DevExpress.ui { * [descr:_ui_file_uploader_UploadStartedEvent] */ export type UploadStartedEvent = - DevExpress.events.NativeEventInfo & { + DevExpress.common.NativeEventInfo & { /** * [descr:_ui_file_uploader_UploadStartedEvent.file] */ @@ -16111,7 +16082,7 @@ declare module DevExpress.ui { * [descr:_ui_file_uploader_ValueChangedEvent] */ export type ValueChangedEvent = - DevExpress.events.NativeEventInfo & { + DevExpress.common.NativeEventInfo & { /** * [descr:_ui_file_uploader_ValueChangedEvent.value] */ @@ -16340,7 +16311,7 @@ declare module DevExpress.ui { * [descr:_ui_filter_builder_ContentReadyEvent] */ export type ContentReadyEvent = - DevExpress.events.EventInfo; + DevExpress.common.EventInfo; export type CustomOperation = dxFilterBuilderCustomOperation; export type CustomOperationEditorTemplate = { readonly value?: string | number | Date; @@ -16350,12 +16321,12 @@ declare module DevExpress.ui { /** * [descr:_ui_filter_builder_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_ui_filter_builder_EditorPreparedEvent] */ export type EditorPreparedEvent = - DevExpress.events.EventInfo & { + DevExpress.common.EventInfo & { /** * [descr:_ui_filter_builder_EditorPreparedEvent.value] */ @@ -16404,8 +16375,8 @@ declare module DevExpress.ui { /** * [descr:_ui_filter_builder_EditorPreparingEvent] */ - export type EditorPreparingEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo & { + export type EditorPreparingEvent = DevExpress.common.Cancelable & + DevExpress.common.EventInfo & { /** * [descr:_ui_filter_builder_EditorPreparingEvent.value] */ @@ -16482,27 +16453,27 @@ declare module DevExpress.ui { * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ export type FilterLookupDataSource = Exclude< - DevExpress.data.DataSource.DataSourceLike, - string | DevExpress.data.DataSource + DevExpress.common.DataSourceLike, + string | DevExpress.common.DataSource >; export type GroupOperation = 'and' | 'or' | 'notAnd' | 'notOr'; /** * [descr:_ui_filter_builder_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_filter_builder_OptionChangedEvent] */ export type OptionChangedEvent = - DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type Properties = dxFilterBuilderOptions; /** * [descr:_ui_filter_builder_ValueChangedEvent] */ export type ValueChangedEvent = - DevExpress.events.EventInfo & { + DevExpress.common.EventInfo & { /** * [descr:_ui_filter_builder_ValueChangedEvent.value] */ @@ -16545,7 +16516,7 @@ declare module DevExpress.ui { * [descr:dxFilterBuilderCustomOperation.editorTemplate] */ editorTemplate?: - | DevExpress.core.template + | Template | (( conditionInfo: DevExpress.ui.dxFilterBuilder.CustomOperationEditorTemplate, container: DevExpress.core.DxElement @@ -16602,7 +16573,7 @@ declare module DevExpress.ui { * [descr:dxFilterBuilderField.editorTemplate] */ editorTemplate?: - | DevExpress.core.template + | Template | (( conditionInfo: DevExpress.ui.dxFilterBuilder.FieldEditorTemplate, container: DevExpress.core.DxElement @@ -16837,15 +16808,15 @@ declare module DevExpress.ui { /** * [descr:_ui_form_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = DevExpress.common.EventInfo; /** * [descr:_ui_form_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_ui_form_EditorEnterKeyEvent] */ - export type EditorEnterKeyEvent = DevExpress.events.EventInfo & { + export type EditorEnterKeyEvent = DevExpress.common.EventInfo & { /** * [descr:_ui_form_EditorEnterKeyEvent.dataField] */ @@ -16854,7 +16825,7 @@ declare module DevExpress.ui { /** * [descr:_ui_form_FieldDataChangedEvent] */ - export type FieldDataChangedEvent = DevExpress.events.EventInfo & { + export type FieldDataChangedEvent = DevExpress.common.EventInfo & { /** * [descr:_ui_form_FieldDataChangedEvent.dataField] */ @@ -16903,13 +16874,13 @@ declare module DevExpress.ui { * [descr:_ui_form_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; export type LabelLocation = 'left' | 'right' | 'top'; /** * [descr:_ui_form_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type Properties = dxFormOptions; export type SimpleItemLabelTemplateData = SimpleItemTemplateData & { text: string; @@ -17011,7 +16982,7 @@ declare module DevExpress.ui { * [descr:dxFormGroupItem.captionTemplate] */ captionTemplate?: - | DevExpress.core.template + | Template | (( data: DevExpress.ui.dxForm.GroupCaptionTemplateData, itemElement: DevExpress.core.DxElement @@ -17048,7 +17019,7 @@ declare module DevExpress.ui { * [descr:dxFormGroupItem.template] */ template?: - | DevExpress.core.template + | Template | (( data: DevExpress.ui.dxForm.GroupItemTemplateData, itemElement: DevExpress.core.DxElement @@ -17224,7 +17195,7 @@ declare module DevExpress.ui { * [descr:dxFormSimpleItem.label.template] */ template?: - | DevExpress.core.template + | Template | (( itemData: DevExpress.ui.dxForm.SimpleItemLabelTemplateData, itemElement: DevExpress.core.DxElement @@ -17246,7 +17217,7 @@ declare module DevExpress.ui { * [descr:dxFormSimpleItem.template] */ template?: - | DevExpress.core.template + | Template | (( data: DevExpress.ui.dxForm.SimpleItemTemplateData, itemElement: DevExpress.core.DxElement @@ -17335,7 +17306,7 @@ declare module DevExpress.ui { * [descr:dxFormTabbedItem.tabs.tabTemplate] */ tabTemplate?: - | DevExpress.core.template + | Template | (( tabData: any, tabIndex: number, @@ -17345,7 +17316,7 @@ declare module DevExpress.ui { * [descr:dxFormTabbedItem.tabs.template] */ template?: - | DevExpress.core.template + | Template | (( tabData: any, tabIndex: number, @@ -17395,14 +17366,14 @@ declare module DevExpress.ui { export type ContentReadyEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.EventInfo>; /** * [descr:_ui_gallery_DisposingEvent] */ export type DisposingEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.EventInfo>; export type ExplicitTypes = { Properties: Properties; ContentReadyEvent: ContentReadyEvent; @@ -17421,40 +17392,40 @@ declare module DevExpress.ui { export type InitializedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.InitializedEventInfo>; + > = DevExpress.common.InitializedEventInfo>; /** * [descr:_ui_gallery_ItemClickEvent] */ export type ItemClickEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxGallery, KeyboardEvent | MouseEvent | PointerEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * [descr:_ui_gallery_ItemContextMenuEvent] */ export type ItemContextMenuEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxGallery, MouseEvent | PointerEvent | TouchEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * [descr:_ui_gallery_ItemHoldEvent] */ export type ItemHoldEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxGallery, MouseEvent | PointerEvent | TouchEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ @@ -17465,16 +17436,16 @@ declare module DevExpress.ui { export type ItemRenderedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & - DevExpress.events.ItemInfo; + > = DevExpress.common.EventInfo> & + DevExpress.common.ItemInfo; /** * [descr:_ui_gallery_OptionChangedEvent] */ export type OptionChangedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & - DevExpress.events.ChangedOptionInfo; + > = DevExpress.common.EventInfo> & + DevExpress.common.ChangedOptionInfo; export type Properties< TItem extends ItemLike = any, TKey = any @@ -17485,7 +17456,7 @@ declare module DevExpress.ui { export type SelectionChangedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & DevExpress.ui.CollectionWidget.SelectionChangeInfo; } /** @@ -17521,7 +17492,7 @@ declare module DevExpress.ui { /** * [descr:dxGalleryOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.common.DataSourceLike | null; /** * [descr:dxGalleryOptions.focusStateEnabled] */ @@ -17724,11 +17695,11 @@ declare module DevExpress.ui { /** * [descr:_ui_gantt_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = DevExpress.common.EventInfo; /** * [descr:_ui_gantt_ContextMenuPreparingEvent] */ - export type ContextMenuPreparingEvent = DevExpress.events.Cancelable & { + export type ContextMenuPreparingEvent = DevExpress.common.Cancelable & { /** * [descr:_ui_gantt_ContextMenuPreparingEvent.component] */ @@ -17740,7 +17711,7 @@ declare module DevExpress.ui { /** * [descr:_ui_gantt_ContextMenuPreparingEvent.event] */ - readonly event?: DevExpress.events.DxEvent< + readonly event?: DevExpress.common.DxEvent< PointerEvent | MouseEvent | TouchEvent >; /** @@ -17781,7 +17752,7 @@ declare module DevExpress.ui { * [descr:_ui_gantt_DependencyDeletedEvent] */ export type DependencyDeletedEvent = - DevExpress.events.EventInfo & { + DevExpress.common.EventInfo & { /** * [descr:_ui_gantt_DependencyDeletedEvent.values] */ @@ -17794,8 +17765,8 @@ declare module DevExpress.ui { /** * [descr:_ui_gantt_DependencyDeletingEvent] */ - export type DependencyDeletingEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo & { + export type DependencyDeletingEvent = DevExpress.common.Cancelable & + DevExpress.common.EventInfo & { /** * [descr:_ui_gantt_DependencyDeletingEvent.values] */ @@ -17809,7 +17780,7 @@ declare module DevExpress.ui { * [descr:_ui_gantt_DependencyInsertedEvent] */ export type DependencyInsertedEvent = - DevExpress.events.EventInfo & { + DevExpress.common.EventInfo & { /** * [descr:_ui_gantt_DependencyInsertedEvent.values] */ @@ -17822,8 +17793,8 @@ declare module DevExpress.ui { /** * [descr:_ui_gantt_DependencyInsertingEvent] */ - export type DependencyInsertingEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo & { + export type DependencyInsertingEvent = DevExpress.common.Cancelable & + DevExpress.common.EventInfo & { /** * [descr:_ui_gantt_DependencyInsertingEvent.values] */ @@ -17832,7 +17803,7 @@ declare module DevExpress.ui { /** * [descr:_ui_gantt_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ @@ -17902,12 +17873,12 @@ declare module DevExpress.ui { * [descr:_ui_gantt_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_gantt_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type ProgressTooltipTemplateData = { readonly progress: number; }; @@ -17915,7 +17886,7 @@ declare module DevExpress.ui { /** * [descr:_ui_gantt_ResourceAssignedEvent] */ - export type ResourceAssignedEvent = DevExpress.events.EventInfo & { + export type ResourceAssignedEvent = DevExpress.common.EventInfo & { /** * [descr:_ui_gantt_ResourceAssignedEvent.values] */ @@ -17928,8 +17899,8 @@ declare module DevExpress.ui { /** * [descr:_ui_gantt_ResourceAssigningEvent] */ - export type ResourceAssigningEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo & { + export type ResourceAssigningEvent = DevExpress.common.Cancelable & + DevExpress.common.EventInfo & { /** * [descr:_ui_gantt_ResourceAssigningEvent.values] */ @@ -17938,7 +17909,7 @@ declare module DevExpress.ui { /** * [descr:_ui_gantt_ResourceDeletedEvent] */ - export type ResourceDeletedEvent = DevExpress.events.EventInfo & { + export type ResourceDeletedEvent = DevExpress.common.EventInfo & { /** * [descr:_ui_gantt_ResourceDeletedEvent.values] */ @@ -17951,8 +17922,8 @@ declare module DevExpress.ui { /** * [descr:_ui_gantt_ResourceDeletingEvent] */ - export type ResourceDeletingEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo & { + export type ResourceDeletingEvent = DevExpress.common.Cancelable & + DevExpress.common.EventInfo & { /** * [descr:_ui_gantt_ResourceDeletingEvent.values] */ @@ -17965,7 +17936,7 @@ declare module DevExpress.ui { /** * [descr:_ui_gantt_ResourceInsertedEvent] */ - export type ResourceInsertedEvent = DevExpress.events.EventInfo & { + export type ResourceInsertedEvent = DevExpress.common.EventInfo & { /** * [descr:_ui_gantt_ResourceInsertedEvent.values] */ @@ -17978,8 +17949,8 @@ declare module DevExpress.ui { /** * [descr:_ui_gantt_ResourceInsertingEvent] */ - export type ResourceInsertingEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo & { + export type ResourceInsertingEvent = DevExpress.common.Cancelable & + DevExpress.common.EventInfo & { /** * [descr:_ui_gantt_ResourceInsertingEvent.values] */ @@ -17989,8 +17960,8 @@ declare module DevExpress.ui { * [descr:_ui_gantt_ResourceManagerDialogShowingEvent] */ export type ResourceManagerDialogShowingEvent = - DevExpress.events.Cancelable & - DevExpress.events.EventInfo & { + DevExpress.common.Cancelable & + DevExpress.common.EventInfo & { /** * [descr:_ui_gantt_ResourceManagerDialogShowingEvent.values] */ @@ -18000,7 +17971,7 @@ declare module DevExpress.ui { * [descr:_ui_gantt_ResourceUnassignedEvent] */ export type ResourceUnassignedEvent = - DevExpress.events.EventInfo & { + DevExpress.common.EventInfo & { /** * [descr:_ui_gantt_ResourceUnassignedEvent.values] */ @@ -18013,8 +17984,8 @@ declare module DevExpress.ui { /** * [descr:_ui_gantt_ResourceUnassigningEvent] */ - export type ResourceUnassigningEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo & { + export type ResourceUnassigningEvent = DevExpress.common.Cancelable & + DevExpress.common.EventInfo & { /** * [descr:_ui_gantt_ResourceUnassigningEvent.values] */ @@ -18028,7 +17999,7 @@ declare module DevExpress.ui { * [descr:_ui_gantt_ScaleCellPreparedEvent] */ export type ScaleCellPreparedEvent = - DevExpress.events.InitializedEventInfo & { + DevExpress.common.InitializedEventInfo & { /** * [descr:_ui_gantt_ScaleCellPreparedEvent.scaleIndex] */ @@ -18057,7 +18028,7 @@ declare module DevExpress.ui { /** * [descr:_ui_gantt_SelectionChangedEvent] */ - export type SelectionChangedEvent = DevExpress.events.EventInfo & { + export type SelectionChangedEvent = DevExpress.common.EventInfo & { /** * [descr:_ui_gantt_SelectionChangedEvent.selectedRowKey] */ @@ -18066,7 +18037,7 @@ declare module DevExpress.ui { /** * [descr:_ui_gantt_TaskClickEvent] */ - export type TaskClickEvent = DevExpress.events.NativeEventInfo< + export type TaskClickEvent = DevExpress.common.NativeEventInfo< dxGantt, PointerEvent | MouseEvent > & { @@ -18091,8 +18062,8 @@ declare module DevExpress.ui { /** * [descr:_ui_gantt_TaskDblClickEvent] */ - export type TaskDblClickEvent = DevExpress.events.Cancelable & - DevExpress.events.NativeEventInfo & { + export type TaskDblClickEvent = DevExpress.common.Cancelable & + DevExpress.common.NativeEventInfo & { /** * [descr:_ui_gantt_TaskDblClickEvent.key] */ @@ -18105,7 +18076,7 @@ declare module DevExpress.ui { /** * [descr:_ui_gantt_TaskDeletedEvent] */ - export type TaskDeletedEvent = DevExpress.events.EventInfo & { + export type TaskDeletedEvent = DevExpress.common.EventInfo & { /** * [descr:_ui_gantt_TaskDeletedEvent.values] */ @@ -18118,8 +18089,8 @@ declare module DevExpress.ui { /** * [descr:_ui_gantt_TaskDeletingEvent] */ - export type TaskDeletingEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo & { + export type TaskDeletingEvent = DevExpress.common.Cancelable & + DevExpress.common.EventInfo & { /** * [descr:_ui_gantt_TaskDeletingEvent.values] */ @@ -18132,8 +18103,8 @@ declare module DevExpress.ui { /** * [descr:_ui_gantt_TaskEditDialogShowingEvent] */ - export type TaskEditDialogShowingEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo & { + export type TaskEditDialogShowingEvent = DevExpress.common.Cancelable & + DevExpress.common.EventInfo & { /** * [descr:_ui_gantt_TaskEditDialogShowingEvent.values] */ @@ -18154,7 +18125,7 @@ declare module DevExpress.ui { /** * [descr:_ui_gantt_TaskInsertedEvent] */ - export type TaskInsertedEvent = DevExpress.events.EventInfo & { + export type TaskInsertedEvent = DevExpress.common.EventInfo & { /** * [descr:_ui_gantt_TaskInsertedEvent.values] */ @@ -18167,8 +18138,8 @@ declare module DevExpress.ui { /** * [descr:_ui_gantt_TaskInsertingEvent] */ - export type TaskInsertingEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo & { + export type TaskInsertingEvent = DevExpress.common.Cancelable & + DevExpress.common.EventInfo & { /** * [descr:_ui_gantt_TaskInsertingEvent.values] */ @@ -18177,8 +18148,8 @@ declare module DevExpress.ui { /** * [descr:_ui_gantt_TaskMovingEvent] */ - export type TaskMovingEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo & { + export type TaskMovingEvent = DevExpress.common.Cancelable & + DevExpress.common.EventInfo & { /** * [descr:_ui_gantt_TaskMovingEvent.newValues] */ @@ -18195,7 +18166,7 @@ declare module DevExpress.ui { /** * [descr:_ui_gantt_TaskUpdatedEvent] */ - export type TaskUpdatedEvent = DevExpress.events.EventInfo & { + export type TaskUpdatedEvent = DevExpress.common.EventInfo & { /** * [descr:_ui_gantt_TaskUpdatedEvent.values] */ @@ -18208,8 +18179,8 @@ declare module DevExpress.ui { /** * [descr:_ui_gantt_TaskUpdatingEvent] */ - export type TaskUpdatingEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo & { + export type TaskUpdatingEvent = DevExpress.common.Cancelable & + DevExpress.common.EventInfo & { /** * [descr:_ui_gantt_TaskUpdatingEvent.newValues] */ @@ -18553,7 +18524,7 @@ declare module DevExpress.ui { /** * [descr:dxGanttOptions.dependencies.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.common.DataSourceLike | null; /** * [descr:dxGanttOptions.dependencies.keyExpr] */ @@ -18793,7 +18764,7 @@ declare module DevExpress.ui { /** * [descr:dxGanttOptions.resourceAssignments.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.common.DataSourceLike | null; /** * [descr:dxGanttOptions.resourceAssignments.keyExpr] */ @@ -18818,7 +18789,7 @@ declare module DevExpress.ui { /** * [descr:dxGanttOptions.resources.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.common.DataSourceLike | null; /** * [descr:dxGanttOptions.resources.keyExpr] */ @@ -18884,7 +18855,7 @@ declare module DevExpress.ui { /** * [descr:dxGanttOptions.tasks.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.common.DataSourceLike | null; /** * [descr:dxGanttOptions.tasks.endExpr] */ @@ -18926,7 +18897,7 @@ declare module DevExpress.ui { * [descr:dxGanttOptions.taskTooltipContentTemplate] */ taskTooltipContentTemplate?: - | DevExpress.core.template + | Template | (( container: DevExpress.core.DxElement, task: any @@ -18935,7 +18906,7 @@ declare module DevExpress.ui { * [descr:dxGanttOptions.taskTimeTooltipContentTemplate] */ taskTimeTooltipContentTemplate?: - | DevExpress.core.template + | Template | (( container: DevExpress.core.DxElement, item: DevExpress.ui.dxGantt.TimeTooltipTemplateData @@ -18944,7 +18915,7 @@ declare module DevExpress.ui { * [descr:dxGanttOptions.taskProgressTooltipContentTemplate] */ taskProgressTooltipContentTemplate?: - | DevExpress.core.template + | Template | (( container: DevExpress.core.DxElement, item: DevExpress.ui.dxGantt.ProgressTooltipTemplateData @@ -18953,7 +18924,7 @@ declare module DevExpress.ui { * [descr:dxGanttOptions.taskContentTemplate] */ taskContentTemplate?: - | DevExpress.core.template + | Template | (( container: DevExpress.core.DxElement, item: DevExpress.ui.dxGantt.TaskContentTemplateData @@ -19173,22 +19144,22 @@ declare module DevExpress.ui { /** * [descr:_ui_html_editor_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = DevExpress.common.EventInfo; /** * [descr:_ui_html_editor_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_ui_html_editor_FocusInEvent] */ - export type FocusInEvent = DevExpress.events.NativeEventInfo< + export type FocusInEvent = DevExpress.common.NativeEventInfo< dxHtmlEditor, FocusEvent >; /** * [descr:_ui_html_editor_FocusOutEvent] */ - export type FocusOutEvent = DevExpress.events.NativeEventInfo< + export type FocusOutEvent = DevExpress.common.NativeEventInfo< dxHtmlEditor, FocusEvent >; @@ -19292,7 +19263,7 @@ declare module DevExpress.ui { * [descr:_ui_html_editor_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; export interface MentionTemplateData { readonly marker: string; readonly id?: string | number; @@ -19301,13 +19272,13 @@ declare module DevExpress.ui { /** * [descr:_ui_html_editor_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type Properties = dxHtmlEditorOptions; /** * [descr:_ui_html_editor_ValueChangedEvent] */ - export type ValueChangedEvent = DevExpress.events.NativeEventInfo< + export type ValueChangedEvent = DevExpress.common.NativeEventInfo< dxHtmlEditor, KeyboardEvent | ClipboardEvent | Event > & @@ -19374,7 +19345,7 @@ declare module DevExpress.ui { /** * [descr:dxHtmlEditorMention.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.common.DataSourceLike | null; /** * [descr:dxHtmlEditorMention.displayExpr] */ @@ -19383,7 +19354,7 @@ declare module DevExpress.ui { * [descr:dxHtmlEditorMention.itemTemplate] */ itemTemplate?: - | DevExpress.core.template + | Template | (( itemData: any, itemIndex: number, @@ -19409,7 +19380,7 @@ declare module DevExpress.ui { * [descr:dxHtmlEditorMention.template] */ template?: - | DevExpress.core.template + | Template | (( mentionData: DevExpress.ui.dxHtmlEditor.MentionTemplateData, contentElement: DevExpress.core.DxElement @@ -19603,7 +19574,7 @@ declare module DevExpress.ui { /** * [descr:dxHtmlEditorVariables.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.common.DataSourceLike | null; /** * [descr:dxHtmlEditorVariables.escapeChar] */ @@ -19726,14 +19697,14 @@ declare module DevExpress.ui { export type ContentReadyEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.EventInfo>; /** * [descr:_ui_list_DisposingEvent] */ export type DisposingEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.EventInfo>; export type ExplicitTypes = { Properties: Properties; ContentReadyEvent: ContentReadyEvent; @@ -19762,7 +19733,7 @@ declare module DevExpress.ui { export type GroupRenderedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & { + > = DevExpress.common.EventInfo> & { /** * [descr:_ui_list_GroupRenderedEvent.groupData] */ @@ -19782,14 +19753,14 @@ declare module DevExpress.ui { export type InitializedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.InitializedEventInfo>; + > = DevExpress.common.InitializedEventInfo>; /** * [descr:_ui_list_ItemClickEvent] */ export type ItemClickEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxList, KeyboardEvent | MouseEvent | PointerEvent > & @@ -19800,7 +19771,7 @@ declare module DevExpress.ui { export type ItemContextMenuEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxList, MouseEvent | PointerEvent | TouchEvent > & @@ -19811,7 +19782,7 @@ declare module DevExpress.ui { export type ItemDeletedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & ListItemInfo; + > = DevExpress.common.EventInfo> & ListItemInfo; export type ItemDeleteMode = | 'context' | 'slideButton' @@ -19825,7 +19796,7 @@ declare module DevExpress.ui { export type ItemDeletingEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & ListItemInfo & { /** * [descr:_ui_list_ItemDeletingEvent.cancel] @@ -19838,7 +19809,7 @@ declare module DevExpress.ui { export type ItemHoldEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxList, MouseEvent | PointerEvent | TouchEvent > & @@ -19853,15 +19824,15 @@ declare module DevExpress.ui { export type ItemRenderedEvent< TItem extends Item | any = any, TKey = any - > = DevExpress.events.EventInfo> & - DevExpress.events.ItemInfo; + > = DevExpress.common.EventInfo> & + DevExpress.common.ItemInfo; /** * [descr:_ui_list_ItemReorderedEvent] */ export type ItemReorderedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & ListItemInfo & { /** * [descr:_ui_list_ItemReorderedEvent.fromIndex] @@ -19878,7 +19849,7 @@ declare module DevExpress.ui { export type ItemSwipeEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxList, MouseEvent | PointerEvent | TouchEvent > & @@ -19913,15 +19884,15 @@ declare module DevExpress.ui { export type OptionChangedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & - DevExpress.events.ChangedOptionInfo; + > = DevExpress.common.EventInfo> & + DevExpress.common.ChangedOptionInfo; /** * [descr:_ui_list_PageLoadingEvent] */ export type PageLoadingEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.EventInfo>; export type Properties< TItem extends ItemLike = any, TKey = any @@ -19932,14 +19903,14 @@ declare module DevExpress.ui { export type PullRefreshEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.EventInfo>; /** * [descr:_ui_list_ScrollEvent] */ export type ScrollEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo, Event> & + > = DevExpress.common.NativeEventInfo, Event> & ScrollInfo; /** * [descr:ScrollInfo] @@ -19973,7 +19944,7 @@ declare module DevExpress.ui { export type SelectAllValueChangedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & { + > = DevExpress.common.EventInfo> & { /** * [descr:_ui_list_SelectAllValueChangedEvent.value] */ @@ -19985,7 +19956,7 @@ declare module DevExpress.ui { export type SelectionChangedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & DevExpress.ui.CollectionWidget.SelectionChangeInfo; /** * [descr:_ui_list_SelectionChangingEvent] @@ -20047,7 +20018,7 @@ declare module DevExpress.ui { /** * [descr:dxListOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.common.DataSourceLike | null; /** * [descr:dxListOptions.displayExpr] */ @@ -20060,7 +20031,7 @@ declare module DevExpress.ui { * [descr:dxListOptions.groupTemplate] */ groupTemplate?: - | DevExpress.core.template + | Template | (( groupData: any, groupIndex: number, @@ -20255,22 +20226,22 @@ declare module DevExpress.ui { * [descr:_ui_load_indicator_ContentReadyEvent] */ export type ContentReadyEvent = - DevExpress.events.EventInfo; + DevExpress.common.EventInfo; /** * [descr:_ui_load_indicator_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_ui_load_indicator_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_load_indicator_OptionChangedEvent] */ export type OptionChangedEvent = - DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type Properties = dxLoadIndicatorOptions; } /** @@ -20293,40 +20264,40 @@ declare module DevExpress.ui { /** * [descr:_ui_load_panel_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = DevExpress.common.EventInfo; /** * [descr:_ui_load_panel_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_ui_load_panel_HiddenEvent] */ - export type HiddenEvent = DevExpress.events.EventInfo; + export type HiddenEvent = DevExpress.common.EventInfo; /** * [descr:_ui_load_panel_HidingEvent] */ - export type HidingEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo; + export type HidingEvent = DevExpress.common.Cancelable & + DevExpress.common.EventInfo; /** * [descr:_ui_load_panel_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_load_panel_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type Properties = dxLoadPanelOptions; /** * [descr:_ui_load_panel_ShowingEvent] */ - export type ShowingEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo; + export type ShowingEvent = DevExpress.common.Cancelable & + DevExpress.common.EventInfo; /** * [descr:_ui_load_panel_ShownEvent] */ - export type ShownEvent = DevExpress.events.EventInfo; + export type ShownEvent = DevExpress.common.EventInfo; } /** * [descr:dxLoadPanelAnimation] @@ -20413,50 +20384,50 @@ declare module DevExpress.ui { /** * [descr:_ui_lookup_ClosedEvent] */ - export type ClosedEvent = DevExpress.events.EventInfo; + export type ClosedEvent = DevExpress.common.EventInfo; /** * [descr:_ui_lookup_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = DevExpress.common.EventInfo; /** * [descr:_ui_lookup_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_ui_lookup_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_lookup_ItemClickEvent] */ - export type ItemClickEvent = DevExpress.events.NativeEventInfo< + export type ItemClickEvent = DevExpress.common.NativeEventInfo< dxLookup, KeyboardEvent | MouseEvent | PointerEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * [descr:_ui_lookup_OpenedEvent] */ - export type OpenedEvent = DevExpress.events.EventInfo; + export type OpenedEvent = DevExpress.common.EventInfo; /** * [descr:_ui_lookup_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; /** * [descr:_ui_lookup_PageLoadingEvent] */ - export type PageLoadingEvent = DevExpress.events.EventInfo; + export type PageLoadingEvent = DevExpress.common.EventInfo; export type Properties = dxLookupOptions; /** * [descr:_ui_lookup_PullRefreshEvent] */ - export type PullRefreshEvent = DevExpress.events.EventInfo; + export type PullRefreshEvent = DevExpress.common.EventInfo; /** * [descr:_ui_lookup_ScrollEvent] */ - export type ScrollEvent = DevExpress.events.NativeEventInfo< + export type ScrollEvent = DevExpress.common.NativeEventInfo< dxLookup, MouseEvent | Event > & @@ -20464,14 +20435,14 @@ declare module DevExpress.ui { /** * [descr:_ui_lookup_SelectionChangedEvent] */ - export type SelectionChangedEvent = DevExpress.events.EventInfo & + export type SelectionChangedEvent = DevExpress.common.EventInfo & DevExpress.ui.dxDropDownList.SelectionChangedInfo; - export type TitleRenderedEvent = DevExpress.events.EventInfo & + export type TitleRenderedEvent = DevExpress.common.EventInfo & DevExpress.ui.dxPopup.TitleRenderedInfo; /** * [descr:_ui_lookup_ValueChangedEvent] */ - export type ValueChangedEvent = DevExpress.events.NativeEventInfo< + export type ValueChangedEvent = DevExpress.common.NativeEventInfo< dxLookup, KeyboardEvent | MouseEvent | PointerEvent | Event > & @@ -20507,7 +20478,7 @@ declare module DevExpress.ui { * [descr:dxLookupOptions.fieldTemplate] */ fieldTemplate?: - | DevExpress.core.template + | Template | (( selectedItem: any, fieldElement: DevExpress.core.DxElement @@ -20525,7 +20496,7 @@ declare module DevExpress.ui { * [descr:dxLookupOptions.groupTemplate] */ groupTemplate?: - | DevExpress.core.template + | Template | (( itemData: any, itemIndex: number, @@ -20656,25 +20627,25 @@ declare module DevExpress.ui { /** * [descr:_ui_map_ClickEvent] */ - export type ClickEvent = DevExpress.events.NativeEventInfo< + export type ClickEvent = DevExpress.common.NativeEventInfo< dxMap, MouseEvent | PointerEvent >; /** * [descr:_ui_map_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_ui_map_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; export type MapProvider = 'azure' | 'bing' | 'google' | 'googleStatic'; export type MapType = 'hybrid' | 'roadmap' | 'satellite'; /** * [descr:_ui_map_MarkerAddedEvent] */ - export type MarkerAddedEvent = DevExpress.events.EventInfo & { + export type MarkerAddedEvent = DevExpress.common.EventInfo & { /** * [descr:_ui_map_MarkerAddedEvent.options] */ @@ -20687,7 +20658,7 @@ declare module DevExpress.ui { /** * [descr:_ui_map_MarkerRemovedEvent] */ - export type MarkerRemovedEvent = DevExpress.events.EventInfo & { + export type MarkerRemovedEvent = DevExpress.common.EventInfo & { /** * [descr:_ui_map_MarkerRemovedEvent.options] */ @@ -20696,13 +20667,13 @@ declare module DevExpress.ui { /** * [descr:_ui_map_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type Properties = dxMapOptions; /** * [descr:_ui_map_ReadyEvent] */ - export type ReadyEvent = DevExpress.events.EventInfo & { + export type ReadyEvent = DevExpress.common.EventInfo & { /** * [descr:_ui_map_ReadyEvent.originalMap] */ @@ -20711,7 +20682,7 @@ declare module DevExpress.ui { /** * [descr:_ui_map_RouteAddedEvent] */ - export type RouteAddedEvent = DevExpress.events.EventInfo & { + export type RouteAddedEvent = DevExpress.common.EventInfo & { /** * [descr:_ui_map_RouteAddedEvent.options] */ @@ -20725,7 +20696,7 @@ declare module DevExpress.ui { /** * [descr:_ui_map_RouteRemovedEvent] */ - export type RouteRemovedEvent = DevExpress.events.EventInfo & { + export type RouteRemovedEvent = DevExpress.common.EventInfo & { /** * [descr:_ui_map_RouteRemovedEvent.options] */ @@ -20910,13 +20881,13 @@ declare module DevExpress.ui { /** * [descr:_ui_menu_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo< + export type ContentReadyEvent = DevExpress.common.EventInfo< dxMenu >; /** * [descr:_ui_menu_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo< + export type DisposingEvent = DevExpress.common.EventInfo< dxMenu >; export type ExplicitTypes = { @@ -20938,31 +20909,31 @@ declare module DevExpress.ui { * [descr:_ui_menu_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo>; + DevExpress.common.InitializedEventInfo>; /** * [descr:_ui_menu_ItemClickEvent] */ - export type ItemClickEvent = DevExpress.events.NativeEventInfo< + export type ItemClickEvent = DevExpress.common.NativeEventInfo< dxMenu, KeyboardEvent | MouseEvent | PointerEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * [descr:_ui_menu_ItemContextMenuEvent] */ export type ItemContextMenuEvent = - DevExpress.events.NativeEventInfo< + DevExpress.common.NativeEventInfo< dxMenu, MouseEvent | PointerEvent | TouchEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * [descr:_ui_menu_ItemRenderedEvent] */ - export type ItemRenderedEvent = DevExpress.events.EventInfo< + export type ItemRenderedEvent = DevExpress.common.EventInfo< dxMenu > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ @@ -21003,15 +20974,15 @@ declare module DevExpress.ui { /** * [descr:_ui_menu_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo< + export type OptionChangedEvent = DevExpress.common.EventInfo< dxMenu > & - DevExpress.events.ChangedOptionInfo; + DevExpress.common.ChangedOptionInfo; export type Properties = dxMenuOptions; /** * [descr:_ui_menu_SelectionChangedEvent] */ - export type SelectionChangedEvent = DevExpress.events.EventInfo< + export type SelectionChangedEvent = DevExpress.common.EventInfo< dxMenu > & DevExpress.ui.CollectionWidget.SelectionChangeInfo; @@ -21019,7 +20990,7 @@ declare module DevExpress.ui { /** * [descr:_ui_menu_SubmenuHiddenEvent] */ - export type SubmenuHiddenEvent = DevExpress.events.EventInfo< + export type SubmenuHiddenEvent = DevExpress.common.EventInfo< dxMenu > & { /** @@ -21038,8 +21009,8 @@ declare module DevExpress.ui { /** * [descr:_ui_menu_SubmenuHidingEvent] */ - export type SubmenuHidingEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo> & { + export type SubmenuHidingEvent = DevExpress.common.Cancelable & + DevExpress.common.EventInfo> & { /** * [descr:_ui_menu_SubmenuHidingEvent.itemData] */ @@ -21056,7 +21027,7 @@ declare module DevExpress.ui { /** * [descr:_ui_menu_SubmenuShowingEvent] */ - export type SubmenuShowingEvent = DevExpress.events.EventInfo< + export type SubmenuShowingEvent = DevExpress.common.EventInfo< dxMenu > & { /** @@ -21075,7 +21046,7 @@ declare module DevExpress.ui { /** * [descr:_ui_menu_SubmenuShownEvent] */ - export type SubmenuShownEvent = DevExpress.events.EventInfo< + export type SubmenuShownEvent = DevExpress.common.EventInfo< dxMenu > & { /** @@ -21157,7 +21128,7 @@ declare module DevExpress.ui { /** * [descr:dxMenuBaseOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.common.DataSourceLike | null; /** * [descr:dxMenuBaseOptions.items] */ @@ -21228,7 +21199,7 @@ declare module DevExpress.ui { /** * [descr:dxMenuOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike< + dataSource?: DevExpress.common.DataSourceLike< DevExpress.ui.dxMenu.Item, TKey > | null; @@ -21315,14 +21286,14 @@ declare module DevExpress.ui { export type ContentReadyEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.EventInfo>; /** * [descr:_ui_multi_view_DisposingEvent] */ export type DisposingEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.EventInfo>; export type ExplicitTypes = { Properties: Properties; ContentReadyEvent: ContentReadyEvent; @@ -21341,40 +21312,40 @@ declare module DevExpress.ui { export type InitializedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.InitializedEventInfo>; + > = DevExpress.common.InitializedEventInfo>; /** * [descr:_ui_multi_view_ItemClickEvent] */ export type ItemClickEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxMultiView, KeyboardEvent | MouseEvent | PointerEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * [descr:_ui_multi_view_ItemContextMenuEvent] */ export type ItemContextMenuEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxMultiView, MouseEvent | PointerEvent | TouchEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * [descr:_ui_multi_view_ItemHoldEvent] */ export type ItemHoldEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxMultiView, MouseEvent | PointerEvent | TouchEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ @@ -21385,16 +21356,16 @@ declare module DevExpress.ui { export type ItemRenderedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & - DevExpress.events.ItemInfo; + > = DevExpress.common.EventInfo> & + DevExpress.common.ItemInfo; /** * [descr:_ui_multi_view_OptionChangedEvent] */ export type OptionChangedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & - DevExpress.events.ChangedOptionInfo; + > = DevExpress.common.EventInfo> & + DevExpress.common.ChangedOptionInfo; export type Properties< TItem extends ItemLike = any, TKey = any @@ -21405,7 +21376,7 @@ declare module DevExpress.ui { export type SelectionChangedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & DevExpress.ui.CollectionWidget.SelectionChangeInfo; } /** @@ -21425,7 +21396,7 @@ declare module DevExpress.ui { /** * [descr:dxMultiViewOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.common.DataSourceLike | null; /** * [descr:dxMultiViewOptions.deferRendering] */ @@ -21477,50 +21448,50 @@ declare module DevExpress.ui { /** * [descr:_ui_number_box_ChangeEvent] */ - export type ChangeEvent = DevExpress.events.NativeEventInfo< + export type ChangeEvent = DevExpress.common.NativeEventInfo< dxNumberBox, Event >; /** * [descr:_ui_number_box_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = DevExpress.common.EventInfo; /** * [descr:_ui_number_box_CopyEvent] */ - export type CopyEvent = DevExpress.events.NativeEventInfo< + export type CopyEvent = DevExpress.common.NativeEventInfo< dxNumberBox, ClipboardEvent >; /** * [descr:_ui_number_box_CutEvent] */ - export type CutEvent = DevExpress.events.NativeEventInfo< + export type CutEvent = DevExpress.common.NativeEventInfo< dxNumberBox, ClipboardEvent >; /** * [descr:_ui_number_box_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_ui_number_box_EnterKeyEvent] */ - export type EnterKeyEvent = DevExpress.events.NativeEventInfo< + export type EnterKeyEvent = DevExpress.common.NativeEventInfo< dxNumberBox, KeyboardEvent >; /** * [descr:_ui_number_box_FocusInEvent] */ - export type FocusInEvent = DevExpress.events.NativeEventInfo< + export type FocusInEvent = DevExpress.common.NativeEventInfo< dxNumberBox, FocusEvent >; /** * [descr:_ui_number_box_FocusOutEvent] */ - export type FocusOutEvent = DevExpress.events.NativeEventInfo< + export type FocusOutEvent = DevExpress.common.NativeEventInfo< dxNumberBox, FocusEvent >; @@ -21528,29 +21499,29 @@ declare module DevExpress.ui { * [descr:_ui_number_box_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_number_box_InputEvent] */ - export type InputEvent = DevExpress.events.NativeEventInfo< + export type InputEvent = DevExpress.common.NativeEventInfo< dxNumberBox, UIEvent & { target: HTMLInputElement } >; /** * [descr:_ui_number_box_KeyDownEvent] */ - export type KeyDownEvent = DevExpress.events.NativeEventInfo< + export type KeyDownEvent = DevExpress.common.NativeEventInfo< dxNumberBox, KeyboardEvent >; - export type KeyPressEvent = DevExpress.events.NativeEventInfo< + export type KeyPressEvent = DevExpress.common.NativeEventInfo< dxNumberBox, KeyboardEvent >; /** * [descr:_ui_number_box_KeyUpEvent] */ - export type KeyUpEvent = DevExpress.events.NativeEventInfo< + export type KeyUpEvent = DevExpress.common.NativeEventInfo< dxNumberBox, KeyboardEvent >; @@ -21559,12 +21530,12 @@ declare module DevExpress.ui { /** * [descr:_ui_number_box_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; /** * [descr:_ui_number_box_PasteEvent] */ - export type PasteEvent = DevExpress.events.NativeEventInfo< + export type PasteEvent = DevExpress.common.NativeEventInfo< dxNumberBox, ClipboardEvent >; @@ -21572,7 +21543,7 @@ declare module DevExpress.ui { /** * [descr:_ui_number_box_ValueChangedEvent] */ - export type ValueChangedEvent = DevExpress.events.NativeEventInfo< + export type ValueChangedEvent = DevExpress.common.NativeEventInfo< dxNumberBox, KeyboardEvent | MouseEvent | PointerEvent | TouchEvent | Event > & @@ -21685,7 +21656,7 @@ declare module DevExpress.ui { closeOnOutsideClick?: | boolean | (( - event: DevExpress.events.DxEvent< + event: DevExpress.common.DxEvent< MouseEvent | PointerEvent | TouchEvent > ) => boolean); @@ -21693,7 +21664,7 @@ declare module DevExpress.ui { * [descr:dxOverlayOptions.contentTemplate] */ contentTemplate?: - | DevExpress.core.template + | Template | (( contentElement: DevExpress.core.DxElement ) => string | DevExpress.core.UserDefinedElement); @@ -21712,7 +21683,7 @@ declare module DevExpress.ui { hideOnOutsideClick?: | boolean | (( - event: DevExpress.events.DxEvent< + event: DevExpress.common.DxEvent< MouseEvent | PointerEvent | TouchEvent > ) => boolean); @@ -21743,23 +21714,23 @@ declare module DevExpress.ui { /** * [descr:dxOverlayOptions.onHidden] */ - onHidden?: (e: DevExpress.events.EventInfo) => void; + onHidden?: (e: DevExpress.common.EventInfo) => void; /** * [descr:dxOverlayOptions.onHiding] */ onHiding?: ( - e: DevExpress.events.Cancelable & DevExpress.events.EventInfo + e: DevExpress.common.Cancelable & DevExpress.common.EventInfo ) => void; /** * [descr:dxOverlayOptions.onShowing] */ onShowing?: ( - e: DevExpress.events.Cancelable & DevExpress.events.EventInfo + e: DevExpress.common.Cancelable & DevExpress.common.EventInfo ) => void; /** * [descr:dxOverlayOptions.onShown] */ - onShown?: (e: DevExpress.events.EventInfo) => void; + onShown?: (e: DevExpress.common.EventInfo) => void; /** * [descr:dxOverlayOptions.position] */ @@ -21861,8 +21832,8 @@ declare module DevExpress.ui { /** * [descr:_ui_pivot_grid_CellClickEvent] */ - export type CellClickEvent = DevExpress.events.Cancelable & - DevExpress.events.NativeEventInfo< + export type CellClickEvent = DevExpress.common.Cancelable & + DevExpress.common.NativeEventInfo< dxPivotGrid, MouseEvent | PointerEvent > & { @@ -21902,7 +21873,7 @@ declare module DevExpress.ui { /** * [descr:_ui_pivot_grid_CellPreparedEvent] */ - export type CellPreparedEvent = DevExpress.events.EventInfo & { + export type CellPreparedEvent = DevExpress.common.EventInfo & { /** * [descr:_ui_pivot_grid_CellPreparedEvent.area] */ @@ -21927,12 +21898,12 @@ declare module DevExpress.ui { /** * [descr:_ui_pivot_grid_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = DevExpress.common.EventInfo; /** * [descr:_ui_pivot_grid_ContextMenuPreparingEvent] */ export type ContextMenuPreparingEvent = - DevExpress.events.EventInfo & { + DevExpress.common.EventInfo & { /** * [descr:_ui_pivot_grid_ContextMenuPreparingEvent.area] */ @@ -21977,12 +21948,12 @@ declare module DevExpress.ui { /** * [descr:_ui_pivot_grid_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_ui_pivot_grid_ExportingEvent] */ - export type ExportingEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo & { + export type ExportingEvent = DevExpress.common.Cancelable & + DevExpress.common.EventInfo & { /** * [descr:_ui_pivot_grid_ExportingEvent.fileName] */ @@ -21992,12 +21963,12 @@ declare module DevExpress.ui { * [descr:_ui_pivot_grid_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_pivot_grid_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type PivotGridDataFieldArea = 'column' | 'row'; export type PivotGridRowHeaderLayout = 'standard' | 'tree'; export type PivotGridTotalDisplayMode = @@ -22033,12 +22004,12 @@ declare module DevExpress.ui { * [descr:_ui_pivot_grid_field_chooser_ContentReadyEvent] */ export type ContentReadyEvent = - DevExpress.events.EventInfo; + DevExpress.common.EventInfo; /** * [descr:_ui_pivot_grid_field_chooser_ContextMenuPreparingEvent] */ export type ContextMenuPreparingEvent = - DevExpress.events.EventInfo & { + DevExpress.common.EventInfo & { /** * [descr:_ui_pivot_grid_field_chooser_ContextMenuPreparingEvent.area] */ @@ -22050,7 +22021,7 @@ declare module DevExpress.ui { /** * [descr:_ui_pivot_grid_field_chooser_ContextMenuPreparingEvent.event] */ - readonly event?: DevExpress.events.DxEvent; + readonly event?: DevExpress.common.DxEvent; /** * [descr:_ui_pivot_grid_field_chooser_ContextMenuPreparingEvent.items] */ @@ -22060,18 +22031,18 @@ declare module DevExpress.ui { * [descr:_ui_pivot_grid_field_chooser_DisposingEvent] */ export type DisposingEvent = - DevExpress.events.EventInfo; + DevExpress.common.EventInfo; /** * [descr:_ui_pivot_grid_field_chooser_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_pivot_grid_field_chooser_OptionChangedEvent] */ export type OptionChangedEvent = - DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type Properties = dxPivotGridFieldChooserOptions; } /** @@ -22740,30 +22711,30 @@ declare module DevExpress.ui { /** * [descr:_ui_popover_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = DevExpress.common.EventInfo; /** * [descr:_ui_popover_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_ui_popover_HiddenEvent] */ - export type HiddenEvent = DevExpress.events.EventInfo; + export type HiddenEvent = DevExpress.common.EventInfo; /** * [descr:_ui_popover_HidingEvent] */ - export type HidingEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo; + export type HidingEvent = DevExpress.common.Cancelable & + DevExpress.common.EventInfo; /** * [descr:_ui_popover_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_popover_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; /** * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ @@ -22772,16 +22743,16 @@ declare module DevExpress.ui { /** * [descr:_ui_popover_ShowingEvent] */ - export type ShowingEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo; + export type ShowingEvent = DevExpress.common.Cancelable & + DevExpress.common.EventInfo; /** * [descr:_ui_popover_ShownEvent] */ - export type ShownEvent = DevExpress.events.EventInfo; + export type ShownEvent = DevExpress.common.EventInfo; /** * [descr:_ui_popover_TitleRenderedEvent] */ - export type TitleRenderedEvent = DevExpress.events.EventInfo & + export type TitleRenderedEvent = DevExpress.common.EventInfo & DevExpress.ui.dxPopup.TitleRenderedInfo; } /** @@ -22816,7 +22787,7 @@ declare module DevExpress.ui { closeOnOutsideClick?: | boolean | (( - event: DevExpress.events.DxEvent< + event: DevExpress.common.DxEvent< MouseEvent | PointerEvent | TouchEvent > ) => boolean); @@ -22845,7 +22816,7 @@ declare module DevExpress.ui { hideOnOutsideClick?: | boolean | (( - event: DevExpress.events.DxEvent< + event: DevExpress.common.DxEvent< MouseEvent | PointerEvent | TouchEvent > ) => boolean); @@ -22896,39 +22867,39 @@ declare module DevExpress.ui { TProperties = DevExpress.ui.dxPopup.Properties > extends dxOverlay {} module dxPopup { - export type ContentReadyEvent = DevExpress.events.EventInfo; - export type DisposingEvent = DevExpress.events.EventInfo; - export type HiddenEvent = DevExpress.events.EventInfo; - export type HidingEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo; + export type ContentReadyEvent = DevExpress.common.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; + export type HiddenEvent = DevExpress.common.EventInfo; + export type HidingEvent = DevExpress.common.Cancelable & + DevExpress.common.EventInfo; export type InitializedEvent = - DevExpress.events.InitializedEventInfo; - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + DevExpress.common.InitializedEventInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; /** * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ interface PopupInstance extends dxPopup {} export type Properties = dxPopupOptions; - export type ResizeEndEvent = DevExpress.events.NativeEventInfo< + export type ResizeEndEvent = DevExpress.common.NativeEventInfo< dxPopup, MouseEvent | TouchEvent > & DevExpress.ui.dxResizable.ResizeInfo; - export type ResizeEvent = DevExpress.events.NativeEventInfo< + export type ResizeEvent = DevExpress.common.NativeEventInfo< dxPopup, MouseEvent | TouchEvent > & DevExpress.ui.dxResizable.ResizeInfo; - export type ResizeStartEvent = DevExpress.events.NativeEventInfo< + export type ResizeStartEvent = DevExpress.common.NativeEventInfo< dxPopup, MouseEvent | TouchEvent > & DevExpress.ui.dxResizable.ResizeInfo; - export type ShowingEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo; - export type ShownEvent = DevExpress.events.EventInfo; - export type TitleRenderedEvent = DevExpress.events.EventInfo & + export type ShowingEvent = DevExpress.common.Cancelable & + DevExpress.common.EventInfo; + export type ShownEvent = DevExpress.common.EventInfo; + export type TitleRenderedEvent = DevExpress.common.EventInfo & TitleRenderedInfo; /** * [descr:TitleRenderedInfo] @@ -23008,7 +22979,7 @@ declare module DevExpress.ui { * [descr:dxPopupOptions.onTitleRendered] */ onTitleRendered?: ( - e: DevExpress.events.EventInfo & + e: DevExpress.common.EventInfo & DevExpress.ui.dxPopup.TitleRenderedInfo ) => void; /** @@ -23043,7 +23014,7 @@ declare module DevExpress.ui { * [descr:dxPopupOptions.titleTemplate] */ titleTemplate?: - | DevExpress.core.template + | Template | (( titleElement: DevExpress.core.DxElement ) => string | DevExpress.core.UserDefinedElement); @@ -23070,32 +23041,32 @@ declare module DevExpress.ui { * [descr:_ui_progress_bar_CompleteEvent] */ export type CompleteEvent = - DevExpress.events.NativeEventInfo; + DevExpress.common.NativeEventInfo; /** * [descr:_ui_progress_bar_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = DevExpress.common.EventInfo; /** * [descr:_ui_progress_bar_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_ui_progress_bar_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_progress_bar_OptionChangedEvent] */ export type OptionChangedEvent = - DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type Properties = dxProgressBarOptions; /** * [descr:_ui_progress_bar_ValueChangedEvent] */ export type ValueChangedEvent = - DevExpress.events.NativeEventInfo & + DevExpress.common.NativeEventInfo & DevExpress.ui.Editor.ValueChangedInfo; } /** @@ -23126,32 +23097,32 @@ declare module DevExpress.ui { * [descr:dxRadioGroup] */ export class dxRadioGroup extends Editor { - getDataSource(): DevExpress.data.DataSource; + getDataSource(): DevExpress.common.DataSource; } module dxRadioGroup { /** * [descr:_ui_radio_group_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = DevExpress.common.EventInfo; /** * [descr:_ui_radio_group_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_ui_radio_group_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_radio_group_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type Properties = dxRadioGroupOptions; /** * [descr:_ui_radio_group_ValueChangedEvent] */ - export type ValueChangedEvent = DevExpress.events.NativeEventInfo< + export type ValueChangedEvent = DevExpress.common.NativeEventInfo< dxRadioGroup, KeyboardEvent | MouseEvent | PointerEvent | Event > & @@ -23203,27 +23174,27 @@ declare module DevExpress.ui { /** * [descr:_ui_range_slider_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = DevExpress.common.EventInfo; /** * [descr:_ui_range_slider_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_ui_range_slider_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_range_slider_OptionChangedEvent] */ export type OptionChangedEvent = - DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type Properties = dxRangeSliderOptions; /** * [descr:_ui_range_slider_ValueChangedEvent] */ - export type ValueChangedEvent = DevExpress.events.NativeEventInfo< + export type ValueChangedEvent = DevExpress.common.NativeEventInfo< dxRangeSlider, KeyboardEvent | MouseEvent | PointerEvent | TouchEvent | UIEvent | Event > & @@ -23283,23 +23254,23 @@ declare module DevExpress.ui { * [descr:_ui_recurrence_editor_ContentReadyEvent] */ export type ContentReadyEvent = - DevExpress.events.EventInfo; + DevExpress.common.EventInfo; /** * [descr:_ui_recurrence_editor_DisposingEvent] */ export type DisposingEvent = - DevExpress.events.EventInfo; + DevExpress.common.EventInfo; /** * [descr:_ui_recurrence_editor_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_recurrence_editor_OptionChangedEvent] */ export type OptionChangedEvent = - DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; /** * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ @@ -23307,7 +23278,7 @@ declare module DevExpress.ui { /** * [descr:_ui_recurrence_editor_ValueChangedEvent] */ - export type ValueChangedEvent = DevExpress.events.NativeEventInfo< + export type ValueChangedEvent = DevExpress.common.NativeEventInfo< dxRecurrenceEditor, Event > & @@ -23332,22 +23303,22 @@ declare module DevExpress.ui { /** * [descr:_ui_resizable_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_ui_resizable_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_resizable_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type Properties = dxResizableOptions; /** * [descr:_ui_resizable_ResizeEndEvent] */ - export type ResizeEndEvent = DevExpress.events.NativeEventInfo< + export type ResizeEndEvent = DevExpress.common.NativeEventInfo< dxResizable, MouseEvent | TouchEvent > & @@ -23355,7 +23326,7 @@ declare module DevExpress.ui { /** * [descr:_ui_resizable_ResizeEvent] */ - export type ResizeEvent = DevExpress.events.NativeEventInfo< + export type ResizeEvent = DevExpress.common.NativeEventInfo< dxResizable, MouseEvent | TouchEvent > & @@ -23378,7 +23349,7 @@ declare module DevExpress.ui { /** * [descr:_ui_resizable_ResizeStartEvent] */ - export type ResizeStartEvent = DevExpress.events.NativeEventInfo< + export type ResizeStartEvent = DevExpress.common.NativeEventInfo< dxResizable, MouseEvent | TouchEvent > & @@ -23457,14 +23428,14 @@ declare module DevExpress.ui { export type ContentReadyEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.EventInfo>; /** * [descr:_ui_responsive_box_DisposingEvent] */ export type DisposingEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.EventInfo>; export type ExplicitTypes = { Properties: Properties; ContentReadyEvent: ContentReadyEvent; @@ -23482,40 +23453,40 @@ declare module DevExpress.ui { export type InitializedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.InitializedEventInfo>; + > = DevExpress.common.InitializedEventInfo>; /** * [descr:_ui_responsive_box_ItemClickEvent] */ export type ItemClickEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxResponsiveBox, MouseEvent | PointerEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * [descr:_ui_responsive_box_ItemContextMenuEvent] */ export type ItemContextMenuEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxResponsiveBox, MouseEvent | PointerEvent | TouchEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * [descr:_ui_responsive_box_ItemHoldEvent] */ export type ItemHoldEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxResponsiveBox, MouseEvent | PointerEvent | TouchEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ @@ -23526,16 +23497,16 @@ declare module DevExpress.ui { export type ItemRenderedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & - DevExpress.events.ItemInfo; + > = DevExpress.common.EventInfo> & + DevExpress.common.ItemInfo; /** * [descr:_ui_responsive_box_OptionChangedEvent] */ export type OptionChangedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & - DevExpress.events.ChangedOptionInfo; + > = DevExpress.common.EventInfo> & + DevExpress.common.ChangedOptionInfo; export type Properties< TItem extends ItemLike = any, TKey = any @@ -23612,7 +23583,7 @@ declare module DevExpress.ui { /** * [descr:dxResponsiveBoxOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.common.DataSourceLike | null; /** * [descr:dxResponsiveBoxOptions.height] */ @@ -23675,7 +23646,7 @@ declare module DevExpress.ui { date: Date | string, recurrenceEditMode: DevExpress.ui.dxScheduler.RecurrenceEditMode ): void; - getDataSource(): DevExpress.data.DataSource; + getDataSource(): DevExpress.common.DataSource; /** * [descr:dxScheduler.getEndViewDate()] */ @@ -23728,7 +23699,7 @@ declare module DevExpress.ui { * [descr:_ui_scheduler_AppointmentAddedEvent] */ export type AppointmentAddedEvent = - DevExpress.events.EventInfo & { + DevExpress.common.EventInfo & { /** * [descr:_ui_scheduler_AppointmentAddedEvent.appointmentData] */ @@ -23742,7 +23713,7 @@ declare module DevExpress.ui { * [descr:_ui_scheduler_AppointmentAddingEvent] */ export type AppointmentAddingEvent = - DevExpress.events.EventInfo & { + DevExpress.common.EventInfo & { /** * [descr:_ui_scheduler_AppointmentAddingEvent.appointmentData] */ @@ -23755,8 +23726,8 @@ declare module DevExpress.ui { /** * [descr:_ui_scheduler_AppointmentClickEvent] */ - export type AppointmentClickEvent = DevExpress.events.Cancelable & - DevExpress.events.NativeEventInfo< + export type AppointmentClickEvent = DevExpress.common.Cancelable & + DevExpress.common.NativeEventInfo< dxScheduler, KeyboardEvent | MouseEvent | PointerEvent > & @@ -23773,7 +23744,7 @@ declare module DevExpress.ui { /** * [descr:_ui_scheduler_AppointmentContextMenuEvent] */ - export type AppointmentContextMenuEvent = DevExpress.events.NativeEventInfo< + export type AppointmentContextMenuEvent = DevExpress.common.NativeEventInfo< dxScheduler, MouseEvent | PointerEvent | TouchEvent > & @@ -23786,8 +23757,8 @@ declare module DevExpress.ui { /** * [descr:_ui_scheduler_AppointmentDblClickEvent] */ - export type AppointmentDblClickEvent = DevExpress.events.Cancelable & - DevExpress.events.NativeEventInfo< + export type AppointmentDblClickEvent = DevExpress.common.Cancelable & + DevExpress.common.NativeEventInfo< dxScheduler, MouseEvent | PointerEvent > & @@ -23801,7 +23772,7 @@ declare module DevExpress.ui { * [descr:_ui_scheduler_AppointmentDeletedEvent] */ export type AppointmentDeletedEvent = - DevExpress.events.EventInfo & { + DevExpress.common.EventInfo & { /** * [descr:_ui_scheduler_AppointmentDeletedEvent.appointmentData] */ @@ -23815,7 +23786,7 @@ declare module DevExpress.ui { * [descr:_ui_scheduler_AppointmentDeletingEvent] */ export type AppointmentDeletingEvent = - DevExpress.events.EventInfo & { + DevExpress.common.EventInfo & { /** * [descr:_ui_scheduler_AppointmentDeletingEvent.appointmentData] */ @@ -23830,7 +23801,7 @@ declare module DevExpress.ui { readonly toComponent?: dxSortable | dxDraggable; readonly toData?: any; }; - export type AppointmentDraggingEndEvent = DevExpress.events.Cancelable & + export type AppointmentDraggingEndEvent = DevExpress.common.Cancelable & AppointmentDraggingEvent & { readonly fromComponent?: dxSortable | dxDraggable; readonly toComponent?: dxSortable | dxDraggable; @@ -23842,12 +23813,12 @@ declare module DevExpress.ui { */ interface AppointmentDraggingEvent { readonly component: dxScheduler; - readonly event?: DevExpress.events.DxEvent; + readonly event?: DevExpress.common.DxEvent; readonly itemData?: any; readonly itemElement?: DevExpress.core.DxElement; readonly fromData?: any; } - export type AppointmentDraggingMoveEvent = DevExpress.events.Cancelable & + export type AppointmentDraggingMoveEvent = DevExpress.common.Cancelable & AppointmentDraggingEvent & { readonly fromComponent?: dxSortable | dxDraggable; readonly toComponent?: dxSortable | dxDraggable; @@ -23857,15 +23828,15 @@ declare module DevExpress.ui { readonly fromComponent?: dxSortable | dxDraggable; readonly toComponent?: dxSortable | dxDraggable; }; - export type AppointmentDraggingStartEvent = DevExpress.events.Cancelable & + export type AppointmentDraggingStartEvent = DevExpress.common.Cancelable & Omit & { itemData?: any; }; /** * [descr:_ui_scheduler_AppointmentFormOpeningEvent] */ - export type AppointmentFormOpeningEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo & { + export type AppointmentFormOpeningEvent = DevExpress.common.Cancelable & + DevExpress.common.EventInfo & { /** * [descr:_ui_scheduler_AppointmentFormOpeningEvent.appointmentData] */ @@ -23883,7 +23854,7 @@ declare module DevExpress.ui { * [descr:_ui_scheduler_AppointmentRenderedEvent] */ export type AppointmentRenderedEvent = - DevExpress.events.EventInfo & + DevExpress.common.EventInfo & TargetedAppointmentInfo & { /** * [descr:_ui_scheduler_AppointmentRenderedEvent.appointmentElement] @@ -23905,8 +23876,8 @@ declare module DevExpress.ui { /** * [descr:_ui_scheduler_AppointmentTooltipShowingEvent] */ - export type AppointmentTooltipShowingEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo & { + export type AppointmentTooltipShowingEvent = DevExpress.common.Cancelable & + DevExpress.common.EventInfo & { /** * [descr:_ui_scheduler_AppointmentTooltipShowingEvent.targetElement] */ @@ -23929,7 +23900,7 @@ declare module DevExpress.ui { * [descr:_ui_scheduler_AppointmentUpdatedEvent] */ export type AppointmentUpdatedEvent = - DevExpress.events.EventInfo & { + DevExpress.common.EventInfo & { /** * [descr:_ui_scheduler_AppointmentUpdatedEvent.appointmentData] */ @@ -23943,7 +23914,7 @@ declare module DevExpress.ui { * [descr:_ui_scheduler_AppointmentUpdatingEvent] */ export type AppointmentUpdatingEvent = - DevExpress.events.EventInfo & { + DevExpress.common.EventInfo & { /** * [descr:_ui_scheduler_AppointmentUpdatingEvent.oldData] */ @@ -23961,8 +23932,8 @@ declare module DevExpress.ui { /** * [descr:_ui_scheduler_CellClickEvent] */ - export type CellClickEvent = DevExpress.events.Cancelable & - DevExpress.events.NativeEventInfo< + export type CellClickEvent = DevExpress.common.Cancelable & + DevExpress.common.NativeEventInfo< dxScheduler, KeyboardEvent | MouseEvent | PointerEvent > & { @@ -23978,7 +23949,7 @@ declare module DevExpress.ui { /** * [descr:_ui_scheduler_CellContextMenuEvent] */ - export type CellContextMenuEvent = DevExpress.events.NativeEventInfo< + export type CellContextMenuEvent = DevExpress.common.NativeEventInfo< dxScheduler, MouseEvent | PointerEvent | TouchEvent > & { @@ -23994,7 +23965,7 @@ declare module DevExpress.ui { /** * [descr:_ui_scheduler_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = DevExpress.common.EventInfo; export type DateNavigatorTextInfo = { readonly startDate: Date; readonly endDate: Date; @@ -24003,17 +23974,17 @@ declare module DevExpress.ui { /** * [descr:_ui_scheduler_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_ui_scheduler_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_scheduler_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type Properties = dxSchedulerOptions; export type RecurrenceEditMode = 'dialog' | 'occurrence' | 'series'; /** @@ -24089,7 +24060,7 @@ declare module DevExpress.ui { /** * [descr:dxSchedulerAppointment.template] */ - template?: DevExpress.core.template; + template?: Template; /** * [descr:dxSchedulerAppointment.text] */ @@ -24117,7 +24088,7 @@ declare module DevExpress.ui { * [descr:dxSchedulerOptions.appointmentCollectorTemplate] */ appointmentCollectorTemplate?: - | DevExpress.core.template + | Template | (( data: DevExpress.ui.dxScheduler.AppointmentCollectorTemplateData, collectorElement: DevExpress.core.DxElement @@ -24181,7 +24152,7 @@ declare module DevExpress.ui { * [descr:dxSchedulerOptions.appointmentTemplate] */ appointmentTemplate?: - | DevExpress.core.template + | Template | (( model: DevExpress.ui.dxScheduler.AppointmentTemplateData, itemIndex: number, @@ -24191,7 +24162,7 @@ declare module DevExpress.ui { * [descr:dxSchedulerOptions.appointmentTooltipTemplate] */ appointmentTooltipTemplate?: - | DevExpress.core.template + | Template | (( model: DevExpress.ui.dxScheduler.AppointmentTooltipTemplateData, itemIndex: number, @@ -24223,7 +24194,7 @@ declare module DevExpress.ui { * [descr:dxSchedulerOptions.dataCellTemplate] */ dataCellTemplate?: - | DevExpress.core.template + | Template | (( itemData: any, itemIndex: number, @@ -24232,12 +24203,12 @@ declare module DevExpress.ui { /** * [descr:dxSchedulerOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.common.DataSourceLike | null; /** * [descr:dxSchedulerOptions.dateCellTemplate] */ dateCellTemplate?: - | DevExpress.core.template + | Template | (( itemData: any, itemIndex: number, @@ -24256,7 +24227,7 @@ declare module DevExpress.ui { * @deprecated [depNote:dxSchedulerOptions.dropDownAppointmentTemplate] */ dropDownAppointmentTemplate?: - | DevExpress.core.template + | Template | (( itemData: any, itemIndex: number, @@ -24448,7 +24419,7 @@ declare module DevExpress.ui { * [descr:dxSchedulerOptions.resourceCellTemplate] */ resourceCellTemplate?: - | DevExpress.core.template + | Template | (( itemData: any, itemIndex: number, @@ -24469,7 +24440,7 @@ declare module DevExpress.ui { /** * [descr:dxSchedulerOptions.resources.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.common.DataSourceLike | null; /** * [descr:dxSchedulerOptions.resources.displayExpr] */ @@ -24531,7 +24502,7 @@ declare module DevExpress.ui { * [descr:dxSchedulerOptions.timeCellTemplate] */ timeCellTemplate?: - | DevExpress.core.template + | Template | (( itemData: any, itemIndex: number, @@ -24575,7 +24546,7 @@ declare module DevExpress.ui { * [descr:dxSchedulerOptions.views.appointmentCollectorTemplate] */ appointmentCollectorTemplate?: - | DevExpress.core.template + | Template | (( data: DevExpress.ui.dxScheduler.AppointmentCollectorTemplateData, collectorElement: DevExpress.core.DxElement @@ -24584,7 +24555,7 @@ declare module DevExpress.ui { * [descr:dxSchedulerOptions.views.appointmentTemplate] */ appointmentTemplate?: - | DevExpress.core.template + | Template | (( model: DevExpress.ui.dxScheduler.AppointmentTemplateData, itemIndex: number, @@ -24594,7 +24565,7 @@ declare module DevExpress.ui { * [descr:dxSchedulerOptions.views.appointmentTooltipTemplate] */ appointmentTooltipTemplate?: - | DevExpress.core.template + | Template | (( model: DevExpress.ui.dxScheduler.AppointmentTooltipTemplateData, itemIndex: number, @@ -24605,7 +24576,7 @@ declare module DevExpress.ui { * @deprecated [depNote:dxSchedulerOptions.views.dropDownAppointmentTemplate] */ dropDownAppointmentTemplate?: - | DevExpress.core.template + | Template | (( itemData: any, itemIndex: number, @@ -24619,7 +24590,7 @@ declare module DevExpress.ui { * [descr:dxSchedulerOptions.views.dataCellTemplate] */ dataCellTemplate?: - | DevExpress.core.template + | Template | (( itemData: any, itemIndex: number, @@ -24629,7 +24600,7 @@ declare module DevExpress.ui { * [descr:dxSchedulerOptions.views.dateCellTemplate] */ dateCellTemplate?: - | DevExpress.core.template + | Template | (( itemData: any, itemIndex: number, @@ -24673,7 +24644,7 @@ declare module DevExpress.ui { * [descr:dxSchedulerOptions.views.resourceCellTemplate] */ resourceCellTemplate?: - | DevExpress.core.template + | Template | (( itemData: any, itemIndex: number, @@ -24691,7 +24662,7 @@ declare module DevExpress.ui { * [descr:dxSchedulerOptions.views.timeCellTemplate] */ timeCellTemplate?: - | DevExpress.core.template + | Template | (( itemData: any, itemIndex: number, @@ -24795,7 +24766,7 @@ declare module DevExpress.ui { * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ export interface ScrollEventInfo - extends DevExpress.events.NativeEventInfo< + extends DevExpress.common.NativeEventInfo< T, WheelEvent | MouseEvent | Event > { @@ -24887,26 +24858,26 @@ declare module DevExpress.ui { /** * [descr:_ui_scroll_view_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_ui_scroll_view_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_scroll_view_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type Properties = dxScrollViewOptions; /** * [descr:_ui_scroll_view_PullDownEvent] */ - export type PullDownEvent = DevExpress.events.EventInfo; + export type PullDownEvent = DevExpress.common.EventInfo; /** * [descr:_ui_scroll_view_ReachBottomEvent] */ - export type ReachBottomEvent = DevExpress.events.EventInfo; + export type ReachBottomEvent = DevExpress.common.EventInfo; /** * [descr:_ui_scroll_view_ScrollEvent] */ @@ -24960,22 +24931,22 @@ declare module DevExpress.ui { /** * [descr:_ui_select_box_ChangeEvent] */ - export type ChangeEvent = DevExpress.events.NativeEventInfo< + export type ChangeEvent = DevExpress.common.NativeEventInfo< dxSelectBox, Event >; /** * [descr:_ui_select_box_ClosedEvent] */ - export type ClosedEvent = DevExpress.events.EventInfo; + export type ClosedEvent = DevExpress.common.EventInfo; /** * [descr:_ui_select_box_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = DevExpress.common.EventInfo; /** * [descr:_ui_select_box_CopyEvent] */ - export type CopyEvent = DevExpress.events.NativeEventInfo< + export type CopyEvent = DevExpress.common.NativeEventInfo< dxSelectBox, ClipboardEvent >; @@ -24983,7 +24954,7 @@ declare module DevExpress.ui { * [descr:_ui_select_box_CustomItemCreatingEvent] */ export type CustomItemCreatingEvent = - DevExpress.events.EventInfo & CustomItemCreatingInfo; + DevExpress.common.EventInfo & CustomItemCreatingInfo; /** * [descr:CustomItemCreatingInfo] * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. @@ -25001,34 +24972,34 @@ declare module DevExpress.ui { /** * [descr:_ui_select_box_CutEvent] */ - export type CutEvent = DevExpress.events.NativeEventInfo< + export type CutEvent = DevExpress.common.NativeEventInfo< dxSelectBox, ClipboardEvent >; /** * [descr:_ui_select_box_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; export type DropDownButtonTemplateData = DevExpress.ui.dxDropDownEditor.DropDownButtonTemplateDataModel; /** * [descr:_ui_select_box_EnterKeyEvent] */ - export type EnterKeyEvent = DevExpress.events.NativeEventInfo< + export type EnterKeyEvent = DevExpress.common.NativeEventInfo< dxSelectBox, KeyboardEvent >; /** * [descr:_ui_select_box_FocusInEvent] */ - export type FocusInEvent = DevExpress.events.NativeEventInfo< + export type FocusInEvent = DevExpress.common.NativeEventInfo< dxSelectBox, FocusEvent >; /** * [descr:_ui_select_box_FocusOutEvent] */ - export type FocusOutEvent = DevExpress.events.NativeEventInfo< + export type FocusOutEvent = DevExpress.common.NativeEventInfo< dxSelectBox, FocusEvent >; @@ -25036,53 +25007,53 @@ declare module DevExpress.ui { * [descr:_ui_select_box_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_select_box_InputEvent] */ - export type InputEvent = DevExpress.events.NativeEventInfo< + export type InputEvent = DevExpress.common.NativeEventInfo< dxSelectBox, UIEvent & { target: HTMLInputElement } >; /** * [descr:_ui_select_box_ItemClickEvent] */ - export type ItemClickEvent = DevExpress.events.NativeEventInfo< + export type ItemClickEvent = DevExpress.common.NativeEventInfo< dxSelectBox, KeyboardEvent | MouseEvent | PointerEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * [descr:_ui_select_box_KeyDownEvent] */ - export type KeyDownEvent = DevExpress.events.NativeEventInfo< + export type KeyDownEvent = DevExpress.common.NativeEventInfo< dxSelectBox, KeyboardEvent >; - export type KeyPressEvent = DevExpress.events.NativeEventInfo< + export type KeyPressEvent = DevExpress.common.NativeEventInfo< dxSelectBox, KeyboardEvent >; /** * [descr:_ui_select_box_KeyUpEvent] */ - export type KeyUpEvent = DevExpress.events.NativeEventInfo< + export type KeyUpEvent = DevExpress.common.NativeEventInfo< dxSelectBox, KeyboardEvent >; /** * [descr:_ui_select_box_OpenedEvent] */ - export type OpenedEvent = DevExpress.events.EventInfo; + export type OpenedEvent = DevExpress.common.EventInfo; /** * [descr:_ui_select_box_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; /** * [descr:_ui_select_box_PasteEvent] */ - export type PasteEvent = DevExpress.events.NativeEventInfo< + export type PasteEvent = DevExpress.common.NativeEventInfo< dxSelectBox, ClipboardEvent >; @@ -25095,12 +25066,12 @@ declare module DevExpress.ui { * [descr:_ui_select_box_SelectionChangedEvent] */ export type SelectionChangedEvent = - DevExpress.events.EventInfo & + DevExpress.common.EventInfo & DevExpress.ui.dxDropDownList.SelectionChangedInfo; /** * [descr:_ui_select_box_ValueChangedEvent] */ - export type ValueChangedEvent = DevExpress.events.NativeEventInfo< + export type ValueChangedEvent = DevExpress.common.NativeEventInfo< dxSelectBox, KeyboardEvent | MouseEvent | Event > & @@ -25121,7 +25092,7 @@ declare module DevExpress.ui { * [descr:dxSelectBoxOptions.fieldTemplate] */ fieldTemplate?: - | DevExpress.core.template + | Template | (( selectedItem: any, fieldElement: DevExpress.core.DxElement @@ -25130,7 +25101,7 @@ declare module DevExpress.ui { * [descr:dxSelectBoxOptions.onCustomItemCreating] */ onCustomItemCreating?: ( - e: DevExpress.events.EventInfo & + e: DevExpress.common.EventInfo & DevExpress.ui.dxSelectBox.CustomItemCreatingInfo ) => void; /** @@ -25178,26 +25149,26 @@ declare module DevExpress.ui { /** * [descr:_ui_slider_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = DevExpress.common.EventInfo; /** * [descr:_ui_slider_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_ui_slider_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_slider_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type Properties = dxSliderOptions; /** * [descr:_ui_slider_ValueChangedEvent] */ - export type ValueChangedEvent = DevExpress.events.NativeEventInfo< + export type ValueChangedEvent = DevExpress.common.NativeEventInfo< dxSlider, KeyboardEvent | MouseEvent | PointerEvent | TouchEvent | UIEvent | Event > & @@ -25328,7 +25299,7 @@ declare module DevExpress.ui { /** * [descr:_ui_sortable_AddEvent.event] */ - readonly event: DevExpress.events.DxEvent< + readonly event: DevExpress.common.DxEvent< PointerEvent | MouseEvent | TouchEvent >; /** @@ -25371,12 +25342,12 @@ declare module DevExpress.ui { /** * [descr:_ui_sortable_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_ui_sortable_DragChangeEvent] */ - export type DragChangeEvent = DevExpress.events.Cancelable & - DevExpress.events.NativeEventInfo< + export type DragChangeEvent = DevExpress.common.Cancelable & + DevExpress.common.NativeEventInfo< dxSortable, PointerEvent | MouseEvent | TouchEvent > & { @@ -25420,8 +25391,8 @@ declare module DevExpress.ui { /** * [descr:_ui_sortable_DragEndEvent] */ - export type DragEndEvent = DevExpress.events.Cancelable & - DevExpress.events.NativeEventInfo< + export type DragEndEvent = DevExpress.common.Cancelable & + DevExpress.common.NativeEventInfo< dxSortable, PointerEvent | MouseEvent | TouchEvent > & { @@ -25465,8 +25436,8 @@ declare module DevExpress.ui { /** * [descr:_ui_sortable_DragMoveEvent] */ - export type DragMoveEvent = DevExpress.events.Cancelable & - DevExpress.events.NativeEventInfo< + export type DragMoveEvent = DevExpress.common.Cancelable & + DevExpress.common.NativeEventInfo< dxSortable, PointerEvent | MouseEvent | TouchEvent > & { @@ -25510,8 +25481,8 @@ declare module DevExpress.ui { /** * [descr:_ui_sortable_DragStartEvent] */ - export type DragStartEvent = DevExpress.events.Cancelable & - DevExpress.events.NativeEventInfo< + export type DragStartEvent = DevExpress.common.Cancelable & + DevExpress.common.NativeEventInfo< dxSortable, PointerEvent | MouseEvent | TouchEvent > & { @@ -25541,17 +25512,17 @@ declare module DevExpress.ui { * [descr:_ui_sortable_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_sortable_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type Properties = dxSortableOptions; /** * [descr:_ui_sortable_RemoveEvent] */ - export type RemoveEvent = DevExpress.events.NativeEventInfo< + export type RemoveEvent = DevExpress.common.NativeEventInfo< dxSortable, PointerEvent | MouseEvent | TouchEvent > & { @@ -25591,7 +25562,7 @@ declare module DevExpress.ui { /** * [descr:_ui_sortable_ReorderEvent] */ - export type ReorderEvent = DevExpress.events.NativeEventInfo< + export type ReorderEvent = DevExpress.common.NativeEventInfo< dxSortable, PointerEvent | MouseEvent | TouchEvent > & { @@ -25655,7 +25626,7 @@ declare module DevExpress.ui { * [descr:dxSortableOptions.dragTemplate] */ dragTemplate?: - | DevExpress.core.template + | Template | (( dragInfo: DevExpress.ui.dxSortable.DragTemplateData, containerElement: DevExpress.core.DxElement @@ -25713,7 +25684,7 @@ declare module DevExpress.ui { /** * [descr:_ui_speed_dial_action_ClickEvent] */ - export type ClickEvent = DevExpress.events.NativeEventInfo< + export type ClickEvent = DevExpress.common.NativeEventInfo< dxSpeedDialAction, MouseEvent | PointerEvent > & { @@ -25726,7 +25697,7 @@ declare module DevExpress.ui { * [descr:_ui_speed_dial_action_ContentReadyEvent] */ export type ContentReadyEvent = - DevExpress.events.EventInfo & { + DevExpress.common.EventInfo & { /** * [descr:_ui_speed_dial_action_ContentReadyEvent.actionElement] */ @@ -25735,18 +25706,18 @@ declare module DevExpress.ui { /** * [descr:_ui_speed_dial_action_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_ui_speed_dial_action_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_speed_dial_action_OptionChangedEvent] */ export type OptionChangedEvent = - DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type Properties = dxSpeedDialActionOptions; } /** @@ -25801,14 +25772,14 @@ declare module DevExpress.ui { export type ContentReadyEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.EventInfo>; /** * [descr:_ui_splitter_DisposingEvent] */ export type DisposingEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.EventInfo>; export type ExplicitTypes, TKey> = { Properties: Properties; ContentReadyEvent: ContentReadyEvent; @@ -25825,51 +25796,51 @@ declare module DevExpress.ui { export type InitializedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.InitializedEventInfo>; + > = DevExpress.common.InitializedEventInfo>; /** * [descr:_ui_splitter_ItemClickEvent] */ export type ItemClickEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxSplitter, MouseEvent | PointerEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * [descr:_ui_splitter_ItemCollapsedEvent] */ export type ItemCollapsedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxSplitter, KeyboardEvent | PointerEvent | MouseEvent | TouchEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * [descr:_ui_splitter_ItemContextMenuEvent] */ export type ItemContextMenuEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxSplitter, MouseEvent | PointerEvent | TouchEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * [descr:_ui_splitter_ItemExpandedEvent] */ export type ItemExpandedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxSplitter, KeyboardEvent | PointerEvent | MouseEvent | TouchEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ @@ -25880,16 +25851,16 @@ declare module DevExpress.ui { export type ItemRenderedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & - DevExpress.events.ItemInfo; + > = DevExpress.common.EventInfo> & + DevExpress.common.ItemInfo; /** * [descr:_ui_splitter_OptionChangedEvent] */ export type OptionChangedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & - DevExpress.events.ChangedOptionInfo; + > = DevExpress.common.EventInfo> & + DevExpress.common.ChangedOptionInfo; export type Properties< TItem extends ItemLike = any, TKey = any @@ -25897,7 +25868,7 @@ declare module DevExpress.ui { /** * [descr:_ui_splitter_ResizeEndEvent] */ - export type ResizeEndEvent = DevExpress.events.NativeEventInfo< + export type ResizeEndEvent = DevExpress.common.NativeEventInfo< dxSplitter, KeyboardEvent | PointerEvent | MouseEvent | TouchEvent > & @@ -25905,8 +25876,8 @@ declare module DevExpress.ui { /** * [descr:_ui_splitter_ResizeEvent] */ - export type ResizeEvent = DevExpress.events.Cancelable & - DevExpress.events.NativeEventInfo< + export type ResizeEvent = DevExpress.common.Cancelable & + DevExpress.common.NativeEventInfo< dxSplitter, KeyboardEvent | PointerEvent | MouseEvent | TouchEvent > & @@ -25924,8 +25895,8 @@ declare module DevExpress.ui { /** * [descr:_ui_splitter_ResizeStartEvent] */ - export type ResizeStartEvent = DevExpress.events.Cancelable & - DevExpress.events.NativeEventInfo< + export type ResizeStartEvent = DevExpress.common.Cancelable & + DevExpress.common.NativeEventInfo< dxSplitter, KeyboardEvent | PointerEvent | MouseEvent | TouchEvent > & @@ -25980,7 +25951,7 @@ declare module DevExpress.ui { /** * [descr:dxSplitterOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.common.DataSourceLike | null; /** * [descr:dxSplitterOptions.orientation] */ @@ -26031,26 +26002,26 @@ declare module DevExpress.ui { /** * [descr:_ui_switch_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = DevExpress.common.EventInfo; /** * [descr:_ui_switch_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_ui_switch_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_switch_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type Properties = dxSwitchOptions; /** * [descr:_ui_switch_ValueChangedEvent] */ - export type ValueChangedEvent = DevExpress.events.NativeEventInfo< + export type ValueChangedEvent = DevExpress.common.NativeEventInfo< dxSwitch, KeyboardEvent | MouseEvent | PointerEvent | TouchEvent | UIEvent | Event > & @@ -26109,14 +26080,14 @@ declare module DevExpress.ui { export type ContentReadyEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.EventInfo>; /** * [descr:_ui_tab_panel_DisposingEvent] */ export type DisposingEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.EventInfo>; export type ExplicitTypes = { Properties: Properties; ContentReadyEvent: ContentReadyEvent; @@ -26139,40 +26110,40 @@ declare module DevExpress.ui { export type InitializedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.InitializedEventInfo>; + > = DevExpress.common.InitializedEventInfo>; /** * [descr:_ui_tab_panel_ItemClickEvent] */ export type ItemClickEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxTabPanel, KeyboardEvent | MouseEvent | PointerEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * [descr:_ui_tab_panel_ItemContextMenuEvent] */ export type ItemContextMenuEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxTabPanel, MouseEvent | PointerEvent | TouchEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * [descr:_ui_tab_panel_ItemHoldEvent] */ export type ItemHoldEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxTabPanel, MouseEvent | PointerEvent | TouchEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ @@ -26183,16 +26154,16 @@ declare module DevExpress.ui { export type ItemRenderedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & - DevExpress.events.ItemInfo; + > = DevExpress.common.EventInfo> & + DevExpress.common.ItemInfo; /** * [descr:_ui_tab_panel_OptionChangedEvent] */ export type OptionChangedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & - DevExpress.events.ChangedOptionInfo; + > = DevExpress.common.EventInfo> & + DevExpress.common.ChangedOptionInfo; export type Properties< TItem extends ItemLike = any, TKey = any @@ -26203,7 +26174,7 @@ declare module DevExpress.ui { export type SelectionChangedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & DevExpress.ui.CollectionWidget.SelectionChangeInfo; /** * [descr:_ui_tab_panel_SelectionChangingEvent] @@ -26234,7 +26205,7 @@ declare module DevExpress.ui { export type TitleClickEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxTabPanel, KeyboardEvent | MouseEvent | PointerEvent > & @@ -26245,7 +26216,7 @@ declare module DevExpress.ui { export type TitleHoldEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxTabPanel, MouseEvent | PointerEvent | TouchEvent > & @@ -26256,7 +26227,7 @@ declare module DevExpress.ui { export type TitleRenderedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & TabPanelItemInfo; } /** @@ -26276,7 +26247,7 @@ declare module DevExpress.ui { * [descr:dxTabPanelItem.tabTemplate] */ tabTemplate?: - | DevExpress.core.template + | Template | (() => string | DevExpress.core.UserDefinedElement); /** * [descr:dxTabPanelItem.title] @@ -26298,7 +26269,7 @@ declare module DevExpress.ui { /** * [descr:dxTabPanelOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.common.DataSourceLike | null; /** * [descr:dxTabPanelOptions.hoverStateEnabled] */ @@ -26307,7 +26278,7 @@ declare module DevExpress.ui { * [descr:dxTabPanelOptions.itemTitleTemplate] */ itemTitleTemplate?: - | DevExpress.core.template + | Template | (( itemData: TItem, itemIndex: number, @@ -26386,14 +26357,14 @@ declare module DevExpress.ui { export type ContentReadyEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.EventInfo>; /** * [descr:_ui_tabs_DisposingEvent] */ export type DisposingEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.EventInfo>; export type ExplicitTypes = { Properties: Properties; ContentReadyEvent: ContentReadyEvent; @@ -26413,40 +26384,40 @@ declare module DevExpress.ui { export type InitializedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.InitializedEventInfo>; + > = DevExpress.common.InitializedEventInfo>; /** * [descr:_ui_tabs_ItemClickEvent] */ export type ItemClickEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxTabs, KeyboardEvent | MouseEvent | PointerEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * [descr:_ui_tabs_ItemContextMenuEvent] */ export type ItemContextMenuEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxTabs, MouseEvent | PointerEvent | TouchEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * [descr:_ui_tabs_ItemHoldEvent] */ export type ItemHoldEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxTabs, MouseEvent | PointerEvent | TouchEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ @@ -26457,16 +26428,16 @@ declare module DevExpress.ui { export type ItemRenderedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & - DevExpress.events.ItemInfo; + > = DevExpress.common.EventInfo> & + DevExpress.common.ItemInfo; /** * [descr:_ui_tabs_OptionChangedEvent] */ export type OptionChangedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & - DevExpress.events.ChangedOptionInfo; + > = DevExpress.common.EventInfo> & + DevExpress.common.ChangedOptionInfo; export type Properties< TItem extends ItemLike = any, TKey = any @@ -26477,7 +26448,7 @@ declare module DevExpress.ui { export type SelectionChangedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & DevExpress.ui.CollectionWidget.SelectionChangeInfo; /** * [descr:_ui_tabs_SelectionChangingEvent] @@ -26502,7 +26473,7 @@ declare module DevExpress.ui { /** * [descr:dxTabsOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.common.DataSourceLike | null; /** * [descr:dxTabsOptions.focusStateEnabled] */ @@ -26578,48 +26549,48 @@ declare module DevExpress.ui { /** * [descr:_ui_tag_box_ChangeEvent] */ - export type ChangeEvent = DevExpress.events.NativeEventInfo< + export type ChangeEvent = DevExpress.common.NativeEventInfo< dxTagBox, Event >; /** * [descr:_ui_tag_box_ClosedEvent] */ - export type ClosedEvent = DevExpress.events.EventInfo; + export type ClosedEvent = DevExpress.common.EventInfo; /** * [descr:_ui_tag_box_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = DevExpress.common.EventInfo; /** * [descr:_ui_tag_box_CustomItemCreatingEvent] */ export type CustomItemCreatingEvent = - DevExpress.events.EventInfo & + DevExpress.common.EventInfo & DevExpress.ui.dxSelectBox.CustomItemCreatingInfo; /** * [descr:_ui_tag_box_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; export type DropDownButtonTemplateData = DevExpress.ui.dxDropDownEditor.DropDownButtonTemplateDataModel; /** * [descr:_ui_tag_box_EnterKeyEvent] */ - export type EnterKeyEvent = DevExpress.events.NativeEventInfo< + export type EnterKeyEvent = DevExpress.common.NativeEventInfo< dxTagBox, KeyboardEvent >; /** * [descr:_ui_tag_box_FocusInEvent] */ - export type FocusInEvent = DevExpress.events.NativeEventInfo< + export type FocusInEvent = DevExpress.common.NativeEventInfo< dxTagBox, FocusEvent >; /** * [descr:_ui_tag_box_FocusOutEvent] */ - export type FocusOutEvent = DevExpress.events.NativeEventInfo< + export type FocusOutEvent = DevExpress.common.NativeEventInfo< dxTagBox, FocusEvent >; @@ -26627,42 +26598,42 @@ declare module DevExpress.ui { * [descr:_ui_tag_box_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_tag_box_InputEvent] */ - export type InputEvent = DevExpress.events.NativeEventInfo< + export type InputEvent = DevExpress.common.NativeEventInfo< dxTagBox, UIEvent & { target: HTMLInputElement } >; /** * [descr:_ui_tag_box_ItemClickEvent] */ - export type ItemClickEvent = DevExpress.events.NativeEventInfo & - DevExpress.events.ItemInfo; + export type ItemClickEvent = DevExpress.common.NativeEventInfo & + DevExpress.common.ItemInfo; /** * [descr:_ui_tag_box_KeyDownEvent] */ - export type KeyDownEvent = DevExpress.events.NativeEventInfo< + export type KeyDownEvent = DevExpress.common.NativeEventInfo< dxTagBox, KeyboardEvent >; - export type KeyPressEvent = DevExpress.events.NativeEventInfo< + export type KeyPressEvent = DevExpress.common.NativeEventInfo< dxTagBox, KeyboardEvent >; /** * [descr:_ui_tag_box_KeyUpEvent] */ - export type KeyUpEvent = DevExpress.events.NativeEventInfo< + export type KeyUpEvent = DevExpress.common.NativeEventInfo< dxTagBox, KeyboardEvent >; /** * [descr:_ui_tag_box_MultiTagPreparingEvent] */ - export type MultiTagPreparingEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo & { + export type MultiTagPreparingEvent = DevExpress.common.Cancelable & + DevExpress.common.EventInfo & { /** * [descr:_ui_tag_box_MultiTagPreparingEvent.multiTagElement] */ @@ -26679,18 +26650,18 @@ declare module DevExpress.ui { /** * [descr:_ui_tag_box_OpenedEvent] */ - export type OpenedEvent = DevExpress.events.EventInfo; + export type OpenedEvent = DevExpress.common.EventInfo; /** * [descr:_ui_tag_box_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type Properties = dxTagBoxOptions; /** * [descr:_ui_tag_box_SelectAllValueChangedEvent] */ export type SelectAllValueChangedEvent = - DevExpress.events.EventInfo & { + DevExpress.common.EventInfo & { /** * [descr:_ui_tag_box_SelectAllValueChangedEvent.value] */ @@ -26699,12 +26670,12 @@ declare module DevExpress.ui { /** * [descr:_ui_tag_box_SelectionChangedEvent] */ - export type SelectionChangedEvent = DevExpress.events.EventInfo & + export type SelectionChangedEvent = DevExpress.common.EventInfo & DevExpress.ui.CollectionWidget.SelectionChangeInfo; /** * [descr:_ui_tag_box_ValueChangedEvent] */ - export type ValueChangedEvent = DevExpress.events.NativeEventInfo< + export type ValueChangedEvent = DevExpress.common.NativeEventInfo< dxTagBox, KeyboardEvent | MouseEvent | PointerEvent | Event > & @@ -26782,7 +26753,7 @@ declare module DevExpress.ui { * [descr:dxTagBoxOptions.tagTemplate] */ tagTemplate?: - | DevExpress.core.template + | Template | (( itemData: any, itemElement: DevExpress.core.DxElement @@ -26800,50 +26771,50 @@ declare module DevExpress.ui { /** * [descr:_ui_text_area_ChangeEvent] */ - export type ChangeEvent = DevExpress.events.NativeEventInfo< + export type ChangeEvent = DevExpress.common.NativeEventInfo< dxTextArea, Event >; /** * [descr:_ui_text_area_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = DevExpress.common.EventInfo; /** * [descr:_ui_text_area_CopyEvent] */ - export type CopyEvent = DevExpress.events.NativeEventInfo< + export type CopyEvent = DevExpress.common.NativeEventInfo< dxTextArea, ClipboardEvent >; /** * [descr:_ui_text_area_CutEvent] */ - export type CutEvent = DevExpress.events.NativeEventInfo< + export type CutEvent = DevExpress.common.NativeEventInfo< dxTextArea, ClipboardEvent >; /** * [descr:_ui_text_area_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_ui_text_area_EnterKeyEvent] */ - export type EnterKeyEvent = DevExpress.events.NativeEventInfo< + export type EnterKeyEvent = DevExpress.common.NativeEventInfo< dxTextArea, KeyboardEvent >; /** * [descr:_ui_text_area_FocusInEvent] */ - export type FocusInEvent = DevExpress.events.NativeEventInfo< + export type FocusInEvent = DevExpress.common.NativeEventInfo< dxTextArea, FocusEvent >; /** * [descr:_ui_text_area_FocusOutEvent] */ - export type FocusOutEvent = DevExpress.events.NativeEventInfo< + export type FocusOutEvent = DevExpress.common.NativeEventInfo< dxTextArea, FocusEvent >; @@ -26851,41 +26822,41 @@ declare module DevExpress.ui { * [descr:_ui_text_area_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_text_area_InputEvent] */ - export type InputEvent = DevExpress.events.NativeEventInfo< + export type InputEvent = DevExpress.common.NativeEventInfo< dxTextArea, UIEvent & { target: HTMLInputElement } >; /** * [descr:_ui_text_area_KeyDownEvent] */ - export type KeyDownEvent = DevExpress.events.NativeEventInfo< + export type KeyDownEvent = DevExpress.common.NativeEventInfo< dxTextArea, KeyboardEvent >; - export type KeyPressEvent = DevExpress.events.NativeEventInfo< + export type KeyPressEvent = DevExpress.common.NativeEventInfo< dxTextArea, KeyboardEvent >; /** * [descr:_ui_text_area_KeyUpEvent] */ - export type KeyUpEvent = DevExpress.events.NativeEventInfo< + export type KeyUpEvent = DevExpress.common.NativeEventInfo< dxTextArea, KeyboardEvent >; /** * [descr:_ui_text_area_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; /** * [descr:_ui_text_area_PasteEvent] */ - export type PasteEvent = DevExpress.events.NativeEventInfo< + export type PasteEvent = DevExpress.common.NativeEventInfo< dxTextArea, ClipboardEvent >; @@ -26893,7 +26864,7 @@ declare module DevExpress.ui { /** * [descr:_ui_text_area_ValueChangedEvent] */ - export type ValueChangedEvent = DevExpress.events.NativeEventInfo< + export type ValueChangedEvent = DevExpress.common.NativeEventInfo< dxTextArea, KeyboardEvent | MouseEvent | PointerEvent | TouchEvent | Event > & @@ -26937,50 +26908,50 @@ declare module DevExpress.ui { /** * [descr:_ui_text_box_ChangeEvent] */ - export type ChangeEvent = DevExpress.events.NativeEventInfo< + export type ChangeEvent = DevExpress.common.NativeEventInfo< dxTextBox, Event >; /** * [descr:_ui_text_box_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = DevExpress.common.EventInfo; /** * [descr:_ui_text_box_CopyEvent] */ - export type CopyEvent = DevExpress.events.NativeEventInfo< + export type CopyEvent = DevExpress.common.NativeEventInfo< dxTextBox, ClipboardEvent >; /** * [descr:_ui_text_box_CutEvent] */ - export type CutEvent = DevExpress.events.NativeEventInfo< + export type CutEvent = DevExpress.common.NativeEventInfo< dxTextBox, ClipboardEvent >; /** * [descr:_ui_text_box_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_ui_text_box_EnterKeyEvent] */ - export type EnterKeyEvent = DevExpress.events.NativeEventInfo< + export type EnterKeyEvent = DevExpress.common.NativeEventInfo< dxTextBox, KeyboardEvent >; /** * [descr:_ui_text_box_FocusInEvent] */ - export type FocusInEvent = DevExpress.events.NativeEventInfo< + export type FocusInEvent = DevExpress.common.NativeEventInfo< dxTextBox, FocusEvent >; /** * [descr:_ui_text_box_FocusOutEvent] */ - export type FocusOutEvent = DevExpress.events.NativeEventInfo< + export type FocusOutEvent = DevExpress.common.NativeEventInfo< dxTextBox, FocusEvent >; @@ -26988,41 +26959,41 @@ declare module DevExpress.ui { * [descr:_ui_text_box_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_text_box_InputEvent] */ - export type InputEvent = DevExpress.events.NativeEventInfo< + export type InputEvent = DevExpress.common.NativeEventInfo< dxTextBox, UIEvent & { target: HTMLInputElement } >; /** * [descr:_ui_text_box_KeyDownEvent] */ - export type KeyDownEvent = DevExpress.events.NativeEventInfo< + export type KeyDownEvent = DevExpress.common.NativeEventInfo< dxTextBox, KeyboardEvent >; - export type KeyPressEvent = DevExpress.events.NativeEventInfo< + export type KeyPressEvent = DevExpress.common.NativeEventInfo< dxTextBox, KeyboardEvent >; /** * [descr:_ui_text_box_KeyUpEvent] */ - export type KeyUpEvent = DevExpress.events.NativeEventInfo< + export type KeyUpEvent = DevExpress.common.NativeEventInfo< dxTextBox, KeyboardEvent >; /** * [descr:_ui_text_box_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; /** * [descr:_ui_text_box_PasteEvent] */ - export type PasteEvent = DevExpress.events.NativeEventInfo< + export type PasteEvent = DevExpress.common.NativeEventInfo< dxTextBox, ClipboardEvent >; @@ -27041,7 +27012,7 @@ declare module DevExpress.ui { /** * [descr:_ui_text_box_ValueChangedEvent] */ - export type ValueChangedEvent = DevExpress.events.NativeEventInfo< + export type ValueChangedEvent = DevExpress.common.NativeEventInfo< dxTextBox, KeyboardEvent | MouseEvent | PointerEvent | TouchEvent | Event > & @@ -27155,61 +27126,61 @@ declare module DevExpress.ui { * [descr:dxTextEditorOptions.onChange] */ onChange?: ( - e: DevExpress.events.NativeEventInfo + e: DevExpress.common.NativeEventInfo ) => void; /** * [descr:dxTextEditorOptions.onCopy] */ onCopy?: ( - e: DevExpress.events.NativeEventInfo + e: DevExpress.common.NativeEventInfo ) => void; /** * [descr:dxTextEditorOptions.onCut] */ onCut?: ( - e: DevExpress.events.NativeEventInfo + e: DevExpress.common.NativeEventInfo ) => void; /** * [descr:dxTextEditorOptions.onEnterKey] */ onEnterKey?: ( - e: DevExpress.events.NativeEventInfo + e: DevExpress.common.NativeEventInfo ) => void; /** * [descr:dxTextEditorOptions.onFocusIn] */ onFocusIn?: ( - e: DevExpress.events.NativeEventInfo + e: DevExpress.common.NativeEventInfo ) => void; /** * [descr:dxTextEditorOptions.onFocusOut] */ onFocusOut?: ( - e: DevExpress.events.NativeEventInfo + e: DevExpress.common.NativeEventInfo ) => void; /** * [descr:dxTextEditorOptions.onInput] */ onInput?: ( - e: DevExpress.events.NativeEventInfo + e: DevExpress.common.NativeEventInfo ) => void; /** * [descr:dxTextEditorOptions.onKeyDown] */ onKeyDown?: ( - e: DevExpress.events.NativeEventInfo + e: DevExpress.common.NativeEventInfo ) => void; /** * [descr:dxTextEditorOptions.onKeyUp] */ onKeyUp?: ( - e: DevExpress.events.NativeEventInfo + e: DevExpress.common.NativeEventInfo ) => void; /** * [descr:dxTextEditorOptions.onPaste] */ onPaste?: ( - e: DevExpress.events.NativeEventInfo + e: DevExpress.common.NativeEventInfo ) => void; /** * [descr:dxTextEditorOptions.placeholder] @@ -27267,14 +27238,14 @@ declare module DevExpress.ui { export type ContentReadyEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.EventInfo>; /** * [descr:_ui_tile_view_DisposingEvent] */ export type DisposingEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.EventInfo>; export type ExplicitTypes = { Properties: Properties; ContentReadyEvent: ContentReadyEvent; @@ -27292,40 +27263,40 @@ declare module DevExpress.ui { export type InitializedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.InitializedEventInfo>; + > = DevExpress.common.InitializedEventInfo>; /** * [descr:_ui_tile_view_ItemClickEvent] */ export type ItemClickEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxTileView, KeyboardEvent | MouseEvent | PointerEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * [descr:_ui_tile_view_ItemContextMenuEvent] */ export type ItemContextMenuEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxTileView, MouseEvent | PointerEvent | TouchEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * [descr:_ui_tile_view_ItemHoldEvent] */ export type ItemHoldEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxTileView, MouseEvent | PointerEvent | TouchEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ @@ -27336,16 +27307,16 @@ declare module DevExpress.ui { export type ItemRenderedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & - DevExpress.events.ItemInfo; + > = DevExpress.common.EventInfo> & + DevExpress.common.ItemInfo; /** * [descr:_ui_tile_view_OptionChangedEvent] */ export type OptionChangedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & - DevExpress.events.ChangedOptionInfo; + > = DevExpress.common.EventInfo> & + DevExpress.common.ChangedOptionInfo; export type Properties< TItem extends ItemLike = any, TKey = any @@ -27388,7 +27359,7 @@ declare module DevExpress.ui { /** * [descr:dxTileViewOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.common.DataSourceLike | null; /** * [descr:dxTileViewOptions.direction] */ @@ -27426,40 +27397,40 @@ declare module DevExpress.ui { /** * [descr:_ui_toast_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = DevExpress.common.EventInfo; /** * [descr:_ui_toast_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_ui_toast_HiddenEvent] */ - export type HiddenEvent = DevExpress.events.EventInfo; + export type HiddenEvent = DevExpress.common.EventInfo; /** * [descr:_ui_toast_HidingEvent] */ - export type HidingEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo; + export type HidingEvent = DevExpress.common.Cancelable & + DevExpress.common.EventInfo; /** * [descr:_ui_toast_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_toast_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type Properties = dxToastOptions; /** * [descr:_ui_toast_ShowingEvent] */ - export type ShowingEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo; + export type ShowingEvent = DevExpress.common.Cancelable & + DevExpress.common.EventInfo; /** * [descr:_ui_toast_ShownEvent] */ - export type ShownEvent = DevExpress.events.EventInfo; + export type ShownEvent = DevExpress.common.EventInfo; export type ToastType = 'custom' | 'error' | 'info' | 'success' | 'warning'; } /** @@ -27497,7 +27468,7 @@ declare module DevExpress.ui { closeOnOutsideClick?: | boolean | (( - event: DevExpress.events.DxEvent< + event: DevExpress.common.DxEvent< MouseEvent | PointerEvent | TouchEvent > ) => boolean); @@ -27515,7 +27486,7 @@ declare module DevExpress.ui { hideOnOutsideClick?: | boolean | (( - event: DevExpress.events.DxEvent< + event: DevExpress.common.DxEvent< MouseEvent | PointerEvent | TouchEvent > ) => boolean); @@ -27566,14 +27537,14 @@ declare module DevExpress.ui { export type ContentReadyEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.EventInfo>; /** * [descr:_ui_toolbar_DisposingEvent] */ export type DisposingEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.EventInfo>; export type ExplicitTypes = { Properties: Properties; ContentReadyEvent: ContentReadyEvent; @@ -27591,40 +27562,40 @@ declare module DevExpress.ui { export type InitializedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.InitializedEventInfo>; + > = DevExpress.common.InitializedEventInfo>; /** * [descr:_ui_toolbar_ItemClickEvent] */ export type ItemClickEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxToolbar, MouseEvent | PointerEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * [descr:_ui_toolbar_ItemContextMenuEvent] */ export type ItemContextMenuEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxToolbar, MouseEvent | PointerEvent | TouchEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * [descr:_ui_toolbar_ItemHoldEvent] */ export type ItemHoldEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxToolbar, MouseEvent | PointerEvent | TouchEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ @@ -27635,8 +27606,8 @@ declare module DevExpress.ui { export type ItemRenderedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & - DevExpress.events.ItemInfo; + > = DevExpress.common.EventInfo> & + DevExpress.common.ItemInfo; export type LocateInMenuMode = 'always' | 'auto' | 'never'; /** * [descr:_ui_toolbar_OptionChangedEvent] @@ -27644,8 +27615,8 @@ declare module DevExpress.ui { export type OptionChangedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & - DevExpress.events.ChangedOptionInfo; + > = DevExpress.common.EventInfo> & + DevExpress.common.ChangedOptionInfo; export type Properties< TItem extends ItemLike = any, TKey = any @@ -27673,7 +27644,7 @@ declare module DevExpress.ui { * [descr:dxToolbarItem.menuItemTemplate] */ menuItemTemplate?: - | DevExpress.core.template + | Template | (() => string | DevExpress.core.UserDefinedElement); /** * [descr:dxToolbarItem.options] @@ -27699,7 +27670,7 @@ declare module DevExpress.ui { /** * [descr:dxToolbarOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.common.DataSourceLike | null; /** * [descr:dxToolbarOptions.items] */ @@ -27712,7 +27683,7 @@ declare module DevExpress.ui { * [descr:dxToolbarOptions.menuItemTemplate] */ menuItemTemplate?: - | DevExpress.core.template + | Template | (( itemData: TItem, itemIndex: number, @@ -27727,40 +27698,40 @@ declare module DevExpress.ui { /** * [descr:_ui_tooltip_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = DevExpress.common.EventInfo; /** * [descr:_ui_tooltip_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_ui_tooltip_HiddenEvent] */ - export type HiddenEvent = DevExpress.events.EventInfo; + export type HiddenEvent = DevExpress.common.EventInfo; /** * [descr:_ui_tooltip_HidingEvent] */ - export type HidingEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo; + export type HidingEvent = DevExpress.common.Cancelable & + DevExpress.common.EventInfo; /** * [descr:_ui_tooltip_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_tooltip_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type Properties = dxTooltipOptions; /** * [descr:_ui_tooltip_ShowingEvent] */ - export type ShowingEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo; + export type ShowingEvent = DevExpress.common.Cancelable & + DevExpress.common.EventInfo; /** * [descr:_ui_tooltip_ShownEvent] */ - export type ShownEvent = DevExpress.events.EventInfo; + export type ShownEvent = DevExpress.common.EventInfo; } /** * [descr:dxTooltipOptions] @@ -27933,7 +27904,7 @@ declare module DevExpress.ui { ): DevExpress.core.DxElement | undefined; getCombinedFilter(): any; getCombinedFilter(returnDataField: boolean): any; - getDataSource(): DevExpress.data.DataSource; + getDataSource(): DevExpress.common.DataSource; getKeyByRowIndex(rowIndex: number): TKey | undefined; getRowElement( rowIndex: number @@ -27979,7 +27950,7 @@ declare module DevExpress.ui { export type AdaptiveDetailRowPreparingEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & DevExpress.common.grids.AdaptiveDetailRowPreparingInfo; /** * [descr:_ui_tree_list_CellClickEvent] @@ -27987,7 +27958,7 @@ declare module DevExpress.ui { export type CellClickEvent< TRowData = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxTreeList, PointerEvent | MouseEvent > & @@ -27998,7 +27969,7 @@ declare module DevExpress.ui { export type CellDblClickEvent< TRowData = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxTreeList, PointerEvent | MouseEvent > & @@ -28009,7 +27980,7 @@ declare module DevExpress.ui { export type CellHoverChangedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & CellInfo & { /** * [descr:_ui_tree_list_CellHoverChangedEvent.eventType] @@ -28072,7 +28043,7 @@ declare module DevExpress.ui { export type CellPreparedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & CellInfo & { /** * [descr:_ui_tree_list_CellPreparedEvent.isSelected] @@ -28106,7 +28077,7 @@ declare module DevExpress.ui { export type ColumnButtonClickEvent< TRowData = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxTreeList, PointerEvent | MouseEvent > & { @@ -28165,14 +28136,14 @@ declare module DevExpress.ui { export type ContentReadyEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.EventInfo>; /** * [descr:_ui_tree_list_ContextMenuPreparingEvent] */ export type ContextMenuPreparingEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & { + > = DevExpress.common.EventInfo> & { /** * [descr:_ui_tree_list_ContextMenuPreparingEvent.items] */ @@ -28208,7 +28179,7 @@ declare module DevExpress.ui { export type DataErrorOccurredEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & DevExpress.common.grids.DataErrorOccurredInfo; /** * [descr:_ui_tree_list_DisposingEvent] @@ -28216,7 +28187,7 @@ declare module DevExpress.ui { export type DisposingEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.EventInfo>; /** * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ @@ -28231,7 +28202,7 @@ declare module DevExpress.ui { export type EditCanceledEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & DevExpress.common.grids.DataChangeInfo; /** * [descr:_ui_tree_list_EditCancelingEvent] @@ -28239,8 +28210,8 @@ declare module DevExpress.ui { export type EditCancelingEvent< TRowData = any, TKey = any - > = DevExpress.events.Cancelable & - DevExpress.events.EventInfo> & + > = DevExpress.common.Cancelable & + DevExpress.common.EventInfo> & DevExpress.common.grids.DataChangeInfo; /** * [descr:dxTreeListEditing] @@ -28285,8 +28256,8 @@ declare module DevExpress.ui { export type EditingStartEvent< TRowData = any, TKey = any - > = DevExpress.events.Cancelable & - DevExpress.events.EventInfo> & { + > = DevExpress.common.Cancelable & + DevExpress.common.EventInfo> & { /** * [descr:_ui_tree_list_EditingStartEvent.data] */ @@ -28315,7 +28286,7 @@ declare module DevExpress.ui { export type EditorPreparedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & { + > = DevExpress.common.EventInfo> & { /** * [descr:_ui_tree_list_EditorPreparedEvent.parentType] */ @@ -28367,8 +28338,8 @@ declare module DevExpress.ui { export type EditorPreparingEvent< TRowData = any, TKey = any - > = DevExpress.events.Cancelable & - DevExpress.events.EventInfo> & { + > = DevExpress.common.Cancelable & + DevExpress.common.EventInfo> & { /** * [descr:_ui_tree_list_EditorPreparingEvent.parentType] */ @@ -28492,7 +28463,7 @@ declare module DevExpress.ui { export type FocusedCellChangedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & { + > = DevExpress.common.EventInfo> & { /** * [descr:_ui_tree_list_FocusedCellChangedEvent.cellElement] */ @@ -28520,8 +28491,8 @@ declare module DevExpress.ui { export type FocusedCellChangingEvent< TRowData = any, TKey = any - > = DevExpress.events.Cancelable & - DevExpress.events.NativeEventInfo< + > = DevExpress.common.Cancelable & + DevExpress.common.NativeEventInfo< dxTreeList, KeyboardEvent | PointerEvent | MouseEvent | TouchEvent > & { @@ -28564,7 +28535,7 @@ declare module DevExpress.ui { export type FocusedRowChangedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & { + > = DevExpress.common.EventInfo> & { /** * [descr:_ui_tree_list_FocusedRowChangedEvent.rowElement] */ @@ -28584,8 +28555,8 @@ declare module DevExpress.ui { export type FocusedRowChangingEvent< TRowData = any, TKey = any - > = DevExpress.events.Cancelable & - DevExpress.events.NativeEventInfo< + > = DevExpress.common.Cancelable & + DevExpress.common.NativeEventInfo< dxTreeList, KeyboardEvent | PointerEvent | MouseEvent | TouchEvent > & { @@ -28612,14 +28583,14 @@ declare module DevExpress.ui { export type InitializedEvent< TRowData = any, TKey = any - > = DevExpress.events.InitializedEventInfo>; + > = DevExpress.common.InitializedEventInfo>; /** * [descr:_ui_tree_list_InitNewRowEvent] */ export type InitNewRowEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & DevExpress.common.grids.NewRowInfo; /** * [descr:_ui_tree_list_KeyDownEvent] @@ -28627,7 +28598,7 @@ declare module DevExpress.ui { export type KeyDownEvent< TRowData = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxTreeList, KeyboardEvent > & @@ -28671,7 +28642,7 @@ declare module DevExpress.ui { export type NodesInitializedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & { + > = DevExpress.common.EventInfo> & { /** * [descr:_ui_tree_list_NodesInitializedEvent.root] */ @@ -28683,8 +28654,8 @@ declare module DevExpress.ui { export type OptionChangedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & - DevExpress.events.ChangedOptionInfo; + > = DevExpress.common.EventInfo> & + DevExpress.common.ChangedOptionInfo; /** * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ @@ -28791,7 +28762,7 @@ declare module DevExpress.ui { export type RowClickEvent< TRowData = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxTreeList, PointerEvent | MouseEvent > & { @@ -28854,7 +28825,7 @@ declare module DevExpress.ui { export type RowCollapsedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & DevExpress.common.grids.RowKeyInfo; /** * [descr:_ui_tree_list_RowCollapsingEvent] @@ -28862,8 +28833,8 @@ declare module DevExpress.ui { export type RowCollapsingEvent< TRowData = any, TKey = any - > = DevExpress.events.Cancelable & - DevExpress.events.EventInfo> & + > = DevExpress.common.Cancelable & + DevExpress.common.EventInfo> & DevExpress.common.grids.RowKeyInfo; /** * [descr:_ui_tree_list_RowDblClickEvent] @@ -28871,7 +28842,7 @@ declare module DevExpress.ui { export type RowDblClickEvent< TRowData = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxTreeList, PointerEvent | MouseEvent > & { @@ -28925,21 +28896,21 @@ declare module DevExpress.ui { export type RowDraggingChangeEvent< TRowData = any, TKey = any - > = DevExpress.events.Cancelable & + > = DevExpress.common.Cancelable & DevExpress.common.ReducedNativeEventInfo> & DevExpress.common.grids.RowDraggingEventInfo & DevExpress.common.grids.DragDropInfo; export type RowDraggingEndEvent< TRowData = any, TKey = any - > = DevExpress.events.Cancelable & + > = DevExpress.common.Cancelable & DevExpress.common.ReducedNativeEventInfo> & DevExpress.common.grids.RowDraggingEventInfo & DevExpress.common.grids.DragDropInfo; export type RowDraggingMoveEvent< TRowData = any, TKey = any - > = DevExpress.events.Cancelable & + > = DevExpress.common.Cancelable & DevExpress.common.ReducedNativeEventInfo> & DevExpress.common.grids.RowDraggingEventInfo & DevExpress.common.grids.DragDropInfo; @@ -28957,7 +28928,7 @@ declare module DevExpress.ui { export type RowDraggingStartEvent< TRowData = any, TKey = any - > = DevExpress.events.Cancelable & + > = DevExpress.common.Cancelable & DevExpress.common.ReducedNativeEventInfo> & DevExpress.common.grids.DragStartEventInfo; /** @@ -28966,7 +28937,7 @@ declare module DevExpress.ui { export type RowExpandedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & DevExpress.common.grids.RowKeyInfo; /** * [descr:_ui_tree_list_RowExpandingEvent] @@ -28974,8 +28945,8 @@ declare module DevExpress.ui { export type RowExpandingEvent< TRowData = any, TKey = any - > = DevExpress.events.Cancelable & - DevExpress.events.EventInfo> & + > = DevExpress.common.Cancelable & + DevExpress.common.EventInfo> & DevExpress.common.grids.RowKeyInfo; /** * [descr:_ui_tree_list_RowInsertedEvent] @@ -28983,7 +28954,7 @@ declare module DevExpress.ui { export type RowInsertedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & DevExpress.common.grids.RowInsertedInfo; /** * [descr:_ui_tree_list_RowInsertingEvent] @@ -28991,7 +28962,7 @@ declare module DevExpress.ui { export type RowInsertingEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & DevExpress.common.grids.RowInsertingInfo; /** * [descr:_ui_tree_list_RowPreparedEvent] @@ -28999,7 +28970,7 @@ declare module DevExpress.ui { export type RowPreparedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & { + > = DevExpress.common.EventInfo> & { /** * [descr:_ui_tree_list_RowPreparedEvent.data] */ @@ -29055,7 +29026,7 @@ declare module DevExpress.ui { export type RowRemovedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & DevExpress.common.grids.RowRemovedInfo; /** * [descr:_ui_tree_list_RowRemovingEvent] @@ -29063,7 +29034,7 @@ declare module DevExpress.ui { export type RowRemovingEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & DevExpress.common.grids.RowRemovingInfo; /** * [descr:_ui_tree_list_RowUpdatedEvent] @@ -29071,7 +29042,7 @@ declare module DevExpress.ui { export type RowUpdatedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & DevExpress.common.grids.RowUpdatedInfo; /** * [descr:_ui_tree_list_RowUpdatingEvent] @@ -29079,7 +29050,7 @@ declare module DevExpress.ui { export type RowUpdatingEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & DevExpress.common.grids.RowUpdatingInfo; /** * [descr:_ui_tree_list_RowValidatingEvent] @@ -29087,7 +29058,7 @@ declare module DevExpress.ui { export type RowValidatingEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & DevExpress.common.grids.RowValidatingInfo; /** * [descr:_ui_tree_list_SavedEvent] @@ -29095,7 +29066,7 @@ declare module DevExpress.ui { export type SavedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & DevExpress.common.grids.DataChangeInfo; /** * [descr:_ui_tree_list_SavingEvent] @@ -29103,7 +29074,7 @@ declare module DevExpress.ui { export type SavingEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & DevExpress.common.grids.SavingInfo; export type Scrollable = Omit< dxScrollable, @@ -29139,7 +29110,7 @@ declare module DevExpress.ui { export type SelectionChangedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & DevExpress.common.grids.SelectionChangedInfo; /** * [descr:_ui_tree_list_ToolbarPreparingEvent] @@ -29147,7 +29118,7 @@ declare module DevExpress.ui { export type ToolbarPreparingEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & DevExpress.common.grids.ToolbarPreparingInfo; export type TreeListCommandColumnType = 'adaptive' | 'buttons' | 'drag'; export type TreeListFilterMode = @@ -29186,7 +29157,7 @@ declare module DevExpress.ui { * [descr:dxTreeListColumn.cellTemplate] */ cellTemplate?: - | DevExpress.core.template + | Template | (( cellElement: DevExpress.core.DxElement, cellInfo: DevExpress.ui.dxTreeList.ColumnCellTemplateData< @@ -29202,7 +29173,7 @@ declare module DevExpress.ui { * [descr:dxTreeListColumn.editCellTemplate] */ editCellTemplate?: - | DevExpress.core.template + | Template | (( cellElement: DevExpress.core.DxElement, cellInfo: DevExpress.ui.dxTreeList.ColumnEditCellTemplateData< @@ -29214,7 +29185,7 @@ declare module DevExpress.ui { * [descr:dxTreeListColumn.headerCellTemplate] */ headerCellTemplate?: - | DevExpress.core.template + | Template | (( columnHeader: DevExpress.core.DxElement, headerInfo: DevExpress.ui.dxTreeList.ColumnHeaderCellTemplateData< @@ -29247,7 +29218,7 @@ declare module DevExpress.ui { * [descr:dxTreeListColumnButton.template] */ template?: - | DevExpress.core.template + | Template | (( cellElement: DevExpress.core.DxElement, cellInfo: DevExpress.ui.dxTreeList.ColumnButtonTemplateData< @@ -29605,13 +29576,13 @@ declare module DevExpress.ui { /** * [descr:_ui_tree_view_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo< + export type ContentReadyEvent = DevExpress.common.EventInfo< dxTreeView >; /** * [descr:_ui_tree_view_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo< + export type DisposingEvent = DevExpress.common.EventInfo< dxTreeView >; export type ExplicitTypes = { @@ -29635,11 +29606,11 @@ declare module DevExpress.ui { * [descr:_ui_tree_view_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo>; + DevExpress.common.InitializedEventInfo>; /** * [descr:_ui_tree_view_ItemClickEvent] */ - export type ItemClickEvent = DevExpress.events.NativeEventInfo< + export type ItemClickEvent = DevExpress.common.NativeEventInfo< dxTreeView, KeyboardEvent | MouseEvent | PointerEvent > & @@ -29648,7 +29619,7 @@ declare module DevExpress.ui { * [descr:_ui_tree_view_ItemCollapsedEvent] */ export type ItemCollapsedEvent = - DevExpress.events.NativeEventInfo< + DevExpress.common.NativeEventInfo< dxTreeView, MouseEvent | PointerEvent > & @@ -29657,7 +29628,7 @@ declare module DevExpress.ui { * [descr:_ui_tree_view_ItemContextMenuEvent] */ export type ItemContextMenuEvent = - DevExpress.events.NativeEventInfo< + DevExpress.common.NativeEventInfo< dxTreeView, MouseEvent | PointerEvent | TouchEvent > & @@ -29666,7 +29637,7 @@ declare module DevExpress.ui { * [descr:_ui_tree_view_ItemExpandedEvent] */ export type ItemExpandedEvent = - DevExpress.events.NativeEventInfo< + DevExpress.common.NativeEventInfo< dxTreeView, MouseEvent | PointerEvent > & @@ -29674,7 +29645,7 @@ declare module DevExpress.ui { /** * [descr:_ui_tree_view_ItemHoldEvent] */ - export type ItemHoldEvent = DevExpress.events.NativeEventInfo< + export type ItemHoldEvent = DevExpress.common.NativeEventInfo< dxTreeView, MouseEvent | PointerEvent | TouchEvent > & @@ -29704,7 +29675,7 @@ declare module DevExpress.ui { /** * [descr:_ui_tree_view_ItemRenderedEvent] */ - export type ItemRenderedEvent = DevExpress.events.EventInfo< + export type ItemRenderedEvent = DevExpress.common.EventInfo< dxTreeView > & ItemInfo; @@ -29712,7 +29683,7 @@ declare module DevExpress.ui { * [descr:_ui_tree_view_ItemSelectionChangedEvent] */ export type ItemSelectionChangedEvent = - DevExpress.events.EventInfo> & ItemInfo; + DevExpress.common.EventInfo> & ItemInfo; /** * [descr:dxTreeViewNode] */ @@ -29720,10 +29691,10 @@ declare module DevExpress.ui { /** * [descr:_ui_tree_view_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo< + export type OptionChangedEvent = DevExpress.common.EventInfo< dxTreeView > & - DevExpress.events.ChangedOptionInfo; + DevExpress.common.ChangedOptionInfo; export type Properties = dxTreeViewOptions; export type Scrollable = Omit< dxScrollable, @@ -29739,7 +29710,7 @@ declare module DevExpress.ui { * [descr:_ui_tree_view_SelectAllValueChangedEvent] */ export type SelectAllValueChangedEvent = - DevExpress.events.EventInfo> & { + DevExpress.common.EventInfo> & { /** * [descr:_ui_tree_view_SelectAllValueChangedEvent.value] */ @@ -29748,7 +29719,7 @@ declare module DevExpress.ui { /** * [descr:_ui_tree_view_SelectionChangedEvent] */ - export type SelectionChangedEvent = DevExpress.events.EventInfo< + export type SelectionChangedEvent = DevExpress.common.EventInfo< dxTreeView >; export type TreeViewCheckBoxMode = 'none' | 'normal' | 'selectAll'; @@ -29856,7 +29827,7 @@ declare module DevExpress.ui { /** * [descr:dxTreeViewOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike< + dataSource?: DevExpress.common.DataSourceLike< DevExpress.ui.dxTreeView.Item, TKey > | null; @@ -30004,18 +29975,18 @@ declare module DevExpress.ui { /** * [descr:_ui_validation_group_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_ui_validation_group_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_validation_group_OptionChangedEvent] */ export type OptionChangedEvent = - DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type Properties = dxValidationGroupOptions; export type ValidationResult = dxValidationGroupResult; } @@ -30108,14 +30079,14 @@ declare module DevExpress.ui { export type ContentReadyEvent< TItem extends DevExpress.ui.CollectionWidget.ItemLike = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.EventInfo>; /** * [descr:_ui_validation_summary_DisposingEvent] */ export type DisposingEvent< TItem extends DevExpress.ui.CollectionWidget.ItemLike = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.EventInfo>; export type ExplicitTypes< TItem extends DevExpress.ui.CollectionWidget.ItemLike, TKey @@ -30133,7 +30104,7 @@ declare module DevExpress.ui { export type InitializedEvent< TItem extends DevExpress.ui.CollectionWidget.ItemLike = any, TKey = any - > = DevExpress.events.InitializedEventInfo< + > = DevExpress.common.InitializedEventInfo< dxValidationSummary >; /** @@ -30142,19 +30113,19 @@ declare module DevExpress.ui { export type ItemClickEvent< TItem extends DevExpress.ui.CollectionWidget.ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxValidationSummary, MouseEvent | PointerEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * [descr:_ui_validation_summary_OptionChangedEvent] */ export type OptionChangedEvent< TItem extends DevExpress.ui.CollectionWidget.ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & - DevExpress.events.ChangedOptionInfo; + > = DevExpress.common.EventInfo> & + DevExpress.common.ChangedOptionInfo; export type Properties< TItem extends DevExpress.ui.CollectionWidget.ItemLike = any, TKey = any @@ -30195,11 +30166,11 @@ declare module DevExpress.ui { validate(): DevExpress.ui.dxValidator.ValidationResult; } module dxValidator { - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; export type InitializedEvent = - DevExpress.events.InitializedEventInfo; - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + DevExpress.common.InitializedEventInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type Properties = dxValidatorOptions; export type ValidatedEvent = { name?: string; @@ -30359,7 +30330,7 @@ declare module DevExpress.ui { * [descr:EditorOptions.onValueChanged] */ onValueChanged?: ( - e: DevExpress.events.NativeEventInfo & + e: DevExpress.common.NativeEventInfo & DevExpress.ui.Editor.ValueChangedInfo ) => void; /** @@ -30408,13 +30379,13 @@ declare module DevExpress.ui { * [descr:Format] */ export type Format = - | FormatObject + | DevExpress.common.FormatObject | DevExpress.common.Format | string | ((value: number | Date) => string) | ((value: Date) => string) | ((value: number) => string) - | ExternalFormat; + | DevExpress.common.ExternalFormat; /** * [descr:ui.hideToasts()] */ @@ -30590,7 +30561,7 @@ declare module DevExpress.ui { * [descr:ui.template] * @deprecated [depNote:ui.template] */ - export type Template = DevExpress.core.template; + export type Template = Template; /** * [descr:ui.themes] */ @@ -30671,7 +30642,7 @@ declare module DevExpress.ui { /** * [descr:WidgetOptions.onContentReady] */ - onContentReady?: (e: DevExpress.events.EventInfo) => void; + onContentReady?: (e: DevExpress.common.EventInfo) => void; /** * [descr:WidgetOptions.tabIndex] */ @@ -31116,7 +31087,9 @@ declare module DevExpress.utils { /** * [descr:utils.getTimeZones(date)] */ - export function getTimeZones(date?: Date): Array; + export function getTimeZones( + date?: Date + ): Array; /** * [descr:utils.initMobileViewport(options)] */ @@ -31173,7 +31146,7 @@ declare module DevExpress.viz { * [descr:BaseChart.getAllSeries()] */ getAllSeries(): Array; - getDataSource(): DevExpress.data.DataSource; + getDataSource(): DevExpress.common.DataSource; /** * [descr:BaseChart.getSeriesByName(seriesName)] */ @@ -31270,7 +31243,7 @@ declare module DevExpress.viz { * [descr:BaseChartOptions.legend.markerTemplate] */ markerTemplate?: - | DevExpress.core.template + | Template | (( legendItem: DevExpress.common.charts.LegendItem, element: SVGGElement @@ -31320,7 +31293,7 @@ declare module DevExpress.viz { /** * [descr:BaseChartOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.common.DataSourceLike | null; /** * [descr:BaseChartOptions.legend] */ @@ -31328,13 +31301,13 @@ declare module DevExpress.viz { /** * [descr:BaseChartOptions.onDone] */ - onDone?: (e: DevExpress.events.EventInfo) => void; + onDone?: (e: DevExpress.common.EventInfo) => void; /** * [descr:BaseChartOptions.onPointClick] */ onPointClick?: | (( - e: DevExpress.events.NativeEventInfo< + e: DevExpress.common.NativeEventInfo< TComponent, MouseEvent | PointerEvent > & @@ -31345,28 +31318,28 @@ declare module DevExpress.viz { * [descr:BaseChartOptions.onPointHoverChanged] */ onPointHoverChanged?: ( - e: DevExpress.events.EventInfo & + e: DevExpress.common.EventInfo & DevExpress.viz.BaseChart.PointInteractionInfo ) => void; /** * [descr:BaseChartOptions.onPointSelectionChanged] */ onPointSelectionChanged?: ( - e: DevExpress.events.EventInfo & + e: DevExpress.common.EventInfo & DevExpress.viz.BaseChart.PointInteractionInfo ) => void; /** * [descr:BaseChartOptions.onTooltipHidden] */ onTooltipHidden?: ( - e: DevExpress.events.EventInfo & + e: DevExpress.common.EventInfo & DevExpress.viz.BaseChart.TooltipInfo ) => void; /** * [descr:BaseChartOptions.onTooltipShown] */ onTooltipShown?: ( - e: DevExpress.events.EventInfo & + e: DevExpress.common.EventInfo & DevExpress.viz.BaseChart.TooltipInfo ) => void; /** @@ -31403,7 +31376,7 @@ declare module DevExpress.viz { * [descr:BaseChartOptions.tooltip.contentTemplate] */ contentTemplate?: - | DevExpress.core.template + | Template | (( pointInfo: any, element: DevExpress.core.DxElement @@ -31516,14 +31489,14 @@ declare module DevExpress.viz { * [descr:BaseGaugeOptions.onTooltipHidden] */ onTooltipHidden?: ( - e: DevExpress.events.EventInfo & + e: DevExpress.common.EventInfo & DevExpress.viz.BaseGauge.TooltipInfo ) => void; /** * [descr:BaseGaugeOptions.onTooltipShown] */ onTooltipShown?: ( - e: DevExpress.events.EventInfo & + e: DevExpress.common.EventInfo & DevExpress.viz.BaseGauge.TooltipInfo ) => void; /** @@ -31720,7 +31693,7 @@ declare module DevExpress.viz { * [descr:BaseGaugeOptions.tooltip.contentTemplate] */ contentTemplate?: - | DevExpress.core.template + | Template | (( scaleValue: { value?: number; valueText?: string }, element: DevExpress.core.DxElement @@ -31958,11 +31931,11 @@ declare module DevExpress.viz { /** * [descr:BaseSparklineOptions.onTooltipHidden] */ - onTooltipHidden?: (e: DevExpress.events.EventInfo) => void; + onTooltipHidden?: (e: DevExpress.common.EventInfo) => void; /** * [descr:BaseSparklineOptions.onTooltipShown] */ - onTooltipShown?: (e: DevExpress.events.EventInfo) => void; + onTooltipShown?: (e: DevExpress.common.EventInfo) => void; /** * [descr:BaseSparklineOptions.redrawOnResize] */ @@ -31985,7 +31958,7 @@ declare module DevExpress.viz { * [descr:BaseSparklineOptions.tooltip.contentTemplate] */ contentTemplate?: - | DevExpress.core.template + | Template | (( pointsInfo: any, element: DevExpress.core.DxElement @@ -32013,7 +31986,7 @@ declare module DevExpress.viz { * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ static defaultOptions( - rule: DevExpress.core.DefaultOptionsRule + rule: DefaultOptionsRule ): void; /** * [descr:BaseWidget.exportTo(fileName, format)] @@ -32063,7 +32036,7 @@ declare module DevExpress.viz { * [descr:FileSavingEventInfo] * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ - export type FileSavingEventInfo = DevExpress.events.Cancelable & { + export type FileSavingEventInfo = DevExpress.common.Cancelable & { /** * [descr:FileSavingEventInfo.component] */ @@ -32373,16 +32346,16 @@ declare module DevExpress.viz { /** * [descr:BaseWidgetOptions.onDrawn] */ - onDrawn?: (e: DevExpress.events.EventInfo) => void; + onDrawn?: (e: DevExpress.common.EventInfo) => void; /** * [descr:BaseWidgetOptions.onExported] */ - onExported?: (e: DevExpress.events.EventInfo) => void; + onExported?: (e: DevExpress.common.EventInfo) => void; /** * [descr:BaseWidgetOptions.onExporting] */ onExporting?: ( - e: DevExpress.events.EventInfo & + e: DevExpress.common.EventInfo & DevExpress.viz.BaseWidget.ExportInfo ) => void; /** @@ -32395,7 +32368,7 @@ declare module DevExpress.viz { * [descr:BaseWidgetOptions.onIncidentOccurred] */ onIncidentOccurred?: ( - e: DevExpress.events.EventInfo & + e: DevExpress.common.EventInfo & DevExpress.viz.BaseWidget.IncidentInfo ) => void; /** @@ -32890,19 +32863,19 @@ declare module DevExpress.viz { /** * [descr:_viz_bar_gauge_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_viz_bar_gauge_DrawnEvent] */ - export type DrawnEvent = DevExpress.events.EventInfo; + export type DrawnEvent = DevExpress.common.EventInfo; /** * [descr:_viz_bar_gauge_ExportedEvent] */ - export type ExportedEvent = DevExpress.events.EventInfo; + export type ExportedEvent = DevExpress.common.EventInfo; /** * [descr:_viz_bar_gauge_ExportingEvent] */ - export type ExportingEvent = DevExpress.events.EventInfo & + export type ExportingEvent = DevExpress.common.EventInfo & DevExpress.viz.BaseWidget.ExportInfo; /** * [descr:_viz_bar_gauge_FileSavingEvent] @@ -32913,13 +32886,13 @@ declare module DevExpress.viz { * [descr:_viz_bar_gauge_IncidentOccurredEvent] */ export type IncidentOccurredEvent = - DevExpress.events.EventInfo & + DevExpress.common.EventInfo & DevExpress.viz.BaseWidget.IncidentInfo; /** * [descr:_viz_bar_gauge_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:dxBarGaugeLegend] */ @@ -32950,7 +32923,7 @@ declare module DevExpress.viz { * [descr:dxBarGaugeOptions.legend.markerTemplate] */ markerTemplate?: - | DevExpress.core.template + | Template | (( legendItem: LegendItem, element: SVGGElement @@ -32972,8 +32945,8 @@ declare module DevExpress.viz { /** * [descr:_viz_bar_gauge_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type Properties = dxBarGaugeOptions; /** * [descr:dxBarGaugeTooltip] @@ -32983,7 +32956,7 @@ declare module DevExpress.viz { * [descr:dxBarGaugeOptions.tooltip.contentTemplate] */ contentTemplate?: - | DevExpress.core.template + | Template | (( scaleValue: { value?: number; valueText?: string; index?: number }, element: DevExpress.core.DxElement @@ -33004,7 +32977,7 @@ declare module DevExpress.viz { /** * [descr:_viz_bar_gauge_TooltipHiddenEvent] */ - export type TooltipHiddenEvent = DevExpress.events.EventInfo & + export type TooltipHiddenEvent = DevExpress.common.EventInfo & TooltipInfo; /** * [descr:_viz_bar_gauge_TooltipInfo] @@ -33019,7 +32992,7 @@ declare module DevExpress.viz { /** * [descr:_viz_bar_gauge_TooltipShownEvent] */ - export type TooltipShownEvent = DevExpress.events.EventInfo & + export type TooltipShownEvent = DevExpress.common.EventInfo & TooltipInfo; } /** @@ -33065,7 +33038,7 @@ declare module DevExpress.viz { * [descr:dxBarGaugeOptions.centerTemplate] */ centerTemplate?: - | DevExpress.core.template + | Template | (( component: dxBarGauge, element: SVGGElement @@ -33159,19 +33132,19 @@ declare module DevExpress.viz { /** * [descr:_viz_bullet_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_viz_bullet_DrawnEvent] */ - export type DrawnEvent = DevExpress.events.EventInfo; + export type DrawnEvent = DevExpress.common.EventInfo; /** * [descr:_viz_bullet_ExportedEvent] */ - export type ExportedEvent = DevExpress.events.EventInfo; + export type ExportedEvent = DevExpress.common.EventInfo; /** * [descr:_viz_bullet_ExportingEvent] */ - export type ExportingEvent = DevExpress.events.EventInfo & + export type ExportingEvent = DevExpress.common.EventInfo & DevExpress.viz.BaseWidget.ExportInfo; /** * [descr:_viz_bullet_FileSavingEvent] @@ -33181,27 +33154,27 @@ declare module DevExpress.viz { /** * [descr:_viz_bullet_IncidentOccurredEvent] */ - export type IncidentOccurredEvent = DevExpress.events.EventInfo & + export type IncidentOccurredEvent = DevExpress.common.EventInfo & DevExpress.viz.BaseWidget.IncidentInfo; /** * [descr:_viz_bullet_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_viz_bullet_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type Properties = dxBulletOptions; /** * [descr:_viz_bullet_TooltipHiddenEvent] */ - export type TooltipHiddenEvent = DevExpress.events.EventInfo; + export type TooltipHiddenEvent = DevExpress.common.EventInfo; /** * [descr:_viz_bullet_TooltipShownEvent] */ - export type TooltipShownEvent = DevExpress.events.EventInfo; + export type TooltipShownEvent = DevExpress.common.EventInfo; } /** * [descr:dxBulletOptions] @@ -33417,7 +33390,7 @@ declare module DevExpress.viz { /** * [descr:_viz_chart_ArgumentAxisClickEvent] */ - export type ArgumentAxisClickEvent = DevExpress.events.NativeEventInfo< + export type ArgumentAxisClickEvent = DevExpress.common.NativeEventInfo< dxChart, MouseEvent | PointerEvent > & { @@ -33818,7 +33791,7 @@ declare module DevExpress.viz { * [descr:dxChartOptions.commonAxisSettings.label.template] */ template?: - | DevExpress.core.template + | Template | (( data: object, element: SVGGElement @@ -34083,15 +34056,15 @@ declare module DevExpress.viz { /** * [descr:_viz_chart_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_viz_chart_DoneEvent] */ - export type DoneEvent = DevExpress.events.EventInfo; + export type DoneEvent = DevExpress.common.EventInfo; /** * [descr:_viz_chart_DrawnEvent] */ - export type DrawnEvent = DevExpress.events.EventInfo; + export type DrawnEvent = DevExpress.common.EventInfo; /** * @deprecated Use CommonSeriesSettings instead * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. @@ -34101,11 +34074,11 @@ declare module DevExpress.viz { /** * [descr:_viz_chart_ExportedEvent] */ - export type ExportedEvent = DevExpress.events.EventInfo; + export type ExportedEvent = DevExpress.common.EventInfo; /** * [descr:_viz_chart_ExportingEvent] */ - export type ExportingEvent = DevExpress.events.EventInfo & + export type ExportingEvent = DevExpress.common.EventInfo & DevExpress.viz.BaseWidget.ExportInfo; /** * [descr:_viz_chart_FileSavingEvent] @@ -34120,13 +34093,13 @@ declare module DevExpress.viz { /** * [descr:_viz_chart_IncidentOccurredEvent] */ - export type IncidentOccurredEvent = DevExpress.events.EventInfo & + export type IncidentOccurredEvent = DevExpress.common.EventInfo & DevExpress.viz.BaseWidget.IncidentInfo; /** * [descr:_viz_chart_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:dxChartLegend] */ @@ -34159,8 +34132,8 @@ declare module DevExpress.viz { /** * [descr:_viz_chart_LegendClickEvent] */ - export type LegendClickEvent = DevExpress.events.Cancelable & - DevExpress.events.NativeEventInfo & { + export type LegendClickEvent = DevExpress.common.Cancelable & + DevExpress.common.NativeEventInfo & { /** * [descr:_viz_chart_LegendClickEvent.target] */ @@ -34169,8 +34142,8 @@ declare module DevExpress.viz { /** * [descr:_viz_chart_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; /** * [descr:dxChartPanes] */ @@ -34187,25 +34160,25 @@ declare module DevExpress.viz { /** * [descr:_viz_chart_PointClickEvent] */ - export type PointClickEvent = DevExpress.events.Cancelable & - DevExpress.events.NativeEventInfo & + export type PointClickEvent = DevExpress.common.Cancelable & + DevExpress.common.NativeEventInfo & DevExpress.viz.BaseChart.PointInteractionInfo; /** * [descr:_viz_chart_PointHoverChangedEvent] */ - export type PointHoverChangedEvent = DevExpress.events.EventInfo & + export type PointHoverChangedEvent = DevExpress.common.EventInfo & DevExpress.viz.BaseChart.PointInteractionInfo; /** * [descr:_viz_chart_PointSelectionChangedEvent] */ export type PointSelectionChangedEvent = - DevExpress.events.EventInfo & + DevExpress.common.EventInfo & DevExpress.viz.BaseChart.PointInteractionInfo; export type Properties = dxChartOptions; /** * [descr:_viz_chart_SeriesClickEvent] */ - export type SeriesClickEvent = DevExpress.events.NativeEventInfo< + export type SeriesClickEvent = DevExpress.common.NativeEventInfo< dxChart, MouseEvent | PointerEvent > & { @@ -34217,7 +34190,7 @@ declare module DevExpress.viz { /** * [descr:_viz_chart_SeriesHoverChangedEvent] */ - export type SeriesHoverChangedEvent = DevExpress.events.EventInfo & + export type SeriesHoverChangedEvent = DevExpress.common.EventInfo & SeriesInteractionInfo; /** * [descr:_viz_chart_SeriesInteractionInfo] @@ -34233,7 +34206,7 @@ declare module DevExpress.viz { * [descr:_viz_chart_SeriesSelectionChangedEvent] */ export type SeriesSelectionChangedEvent = - DevExpress.events.EventInfo & SeriesInteractionInfo; + DevExpress.common.EventInfo & SeriesInteractionInfo; /** * [descr:dxChartTooltip] * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. @@ -34247,12 +34220,12 @@ declare module DevExpress.viz { /** * [descr:_viz_chart_TooltipHiddenEvent] */ - export type TooltipHiddenEvent = DevExpress.events.EventInfo & + export type TooltipHiddenEvent = DevExpress.common.EventInfo & DevExpress.viz.BaseChart.TooltipInfo; /** * [descr:_viz_chart_TooltipShownEvent] */ - export type TooltipShownEvent = DevExpress.events.EventInfo & + export type TooltipShownEvent = DevExpress.common.EventInfo & DevExpress.viz.BaseChart.TooltipInfo; /** * [descr:dxChartValueAxis] @@ -34511,8 +34484,8 @@ declare module DevExpress.viz { /** * [descr:_viz_chart_ZoomEndEvent] */ - export type ZoomEndEvent = DevExpress.events.Cancelable & - DevExpress.events.NativeEventInfo & { + export type ZoomEndEvent = DevExpress.common.Cancelable & + DevExpress.common.NativeEventInfo & { /** * [descr:_viz_chart_ZoomEndEvent.rangeStart] */ @@ -34549,8 +34522,8 @@ declare module DevExpress.viz { /** * [descr:_viz_chart_ZoomStartEvent] */ - export type ZoomStartEvent = DevExpress.events.Cancelable & - DevExpress.events.NativeEventInfo & { + export type ZoomStartEvent = DevExpress.common.Cancelable & + DevExpress.common.NativeEventInfo & { /** * [descr:_viz_chart_ZoomStartEvent.axis] */ @@ -34594,7 +34567,7 @@ declare module DevExpress.viz { * [descr:dxChartCommonAnnotationConfig.template] */ template?: - | DevExpress.core.template + | Template | (( annotation: dxChartAnnotationConfig | any, element: SVGGElement @@ -34603,7 +34576,7 @@ declare module DevExpress.viz { * [descr:dxChartCommonAnnotationConfig.tooltipTemplate] */ tooltipTemplate?: - | DevExpress.core.template + | Template | (( annotation: dxChartAnnotationConfig | any, element: DevExpress.core.DxElement @@ -36754,19 +36727,19 @@ declare module DevExpress.viz { /** * [descr:_viz_circular_gauge_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_viz_circular_gauge_DrawnEvent] */ - export type DrawnEvent = DevExpress.events.EventInfo; + export type DrawnEvent = DevExpress.common.EventInfo; /** * [descr:_viz_circular_gauge_ExportedEvent] */ - export type ExportedEvent = DevExpress.events.EventInfo; + export type ExportedEvent = DevExpress.common.EventInfo; /** * [descr:_viz_circular_gauge_ExportingEvent] */ - export type ExportingEvent = DevExpress.events.EventInfo & + export type ExportingEvent = DevExpress.common.EventInfo & DevExpress.viz.BaseWidget.ExportInfo; /** * [descr:_viz_circular_gauge_FileSavingEvent] @@ -36777,19 +36750,19 @@ declare module DevExpress.viz { * [descr:_viz_circular_gauge_IncidentOccurredEvent] */ export type IncidentOccurredEvent = - DevExpress.events.EventInfo & + DevExpress.common.EventInfo & DevExpress.viz.BaseWidget.IncidentInfo; /** * [descr:_viz_circular_gauge_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_viz_circular_gauge_OptionChangedEvent] */ export type OptionChangedEvent = - DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type Properties = dxCircularGaugeOptions; /** * [descr:dxCircularGaugeRangeContainer] @@ -36834,13 +36807,13 @@ declare module DevExpress.viz { * [descr:_viz_circular_gauge_TooltipHiddenEvent] */ export type TooltipHiddenEvent = - DevExpress.events.EventInfo & + DevExpress.common.EventInfo & DevExpress.viz.BaseGauge.TooltipInfo; /** * [descr:_viz_circular_gauge_TooltipShownEvent] */ export type TooltipShownEvent = - DevExpress.events.EventInfo & + DevExpress.common.EventInfo & DevExpress.viz.BaseGauge.TooltipInfo; } /** @@ -36867,7 +36840,7 @@ declare module DevExpress.viz { * [descr:dxCircularGaugeOptions.centerTemplate] */ centerTemplate?: - | DevExpress.core.template + | Template | (( component: dxCircularGauge, element: SVGGElement @@ -36901,7 +36874,7 @@ declare module DevExpress.viz { * [descr:dxFunnel.getAllItems()] */ getAllItems(): Array; - getDataSource(): DevExpress.data.DataSource; + getDataSource(): DevExpress.common.DataSource; /** * [descr:dxFunnel.hideTooltip()] */ @@ -36911,19 +36884,19 @@ declare module DevExpress.viz { /** * [descr:_viz_funnel_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_viz_funnel_DrawnEvent] */ - export type DrawnEvent = DevExpress.events.EventInfo; + export type DrawnEvent = DevExpress.common.EventInfo; /** * [descr:_viz_funnel_ExportedEvent] */ - export type ExportedEvent = DevExpress.events.EventInfo; + export type ExportedEvent = DevExpress.common.EventInfo; /** * [descr:_viz_funnel_ExportingEvent] */ - export type ExportingEvent = DevExpress.events.EventInfo & + export type ExportingEvent = DevExpress.common.EventInfo & DevExpress.viz.BaseWidget.ExportInfo; /** * [descr:_viz_funnel_FileSavingEvent] @@ -36944,22 +36917,22 @@ declare module DevExpress.viz { /** * [descr:_viz_funnel_HoverChangedEvent] */ - export type HoverChangedEvent = DevExpress.events.EventInfo & + export type HoverChangedEvent = DevExpress.common.EventInfo & FunnelItemInfo; /** * [descr:_viz_funnel_IncidentOccurredEvent] */ - export type IncidentOccurredEvent = DevExpress.events.EventInfo & + export type IncidentOccurredEvent = DevExpress.common.EventInfo & DevExpress.viz.BaseWidget.IncidentInfo; /** * [descr:_viz_funnel_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_viz_funnel_ItemClickEvent] */ - export type ItemClickEvent = DevExpress.events.NativeEventInfo< + export type ItemClickEvent = DevExpress.common.NativeEventInfo< dxFunnel, MouseEvent | PointerEvent > & @@ -36984,7 +36957,7 @@ declare module DevExpress.viz { * [descr:dxFunnelOptions.legend.markerTemplate] */ markerTemplate?: - | DevExpress.core.template + | Template | (( legendItem: LegendItem, element: SVGGElement @@ -36997,7 +36970,7 @@ declare module DevExpress.viz { /** * [descr:_viz_funnel_LegendClickEvent] */ - export type LegendClickEvent = DevExpress.events.NativeEventInfo< + export type LegendClickEvent = DevExpress.common.NativeEventInfo< dxFunnel, MouseEvent | PointerEvent > & @@ -37005,13 +36978,13 @@ declare module DevExpress.viz { /** * [descr:_viz_funnel_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type Properties = dxFunnelOptions; /** * [descr:_viz_funnel_SelectionChangedEvent] */ - export type SelectionChangedEvent = DevExpress.events.EventInfo & + export type SelectionChangedEvent = DevExpress.common.EventInfo & FunnelItemInfo; /** * [descr:dxFunnelTooltip] @@ -37021,7 +36994,7 @@ declare module DevExpress.viz { * [descr:dxFunnelOptions.tooltip.contentTemplate] */ contentTemplate?: - | DevExpress.core.template + | Template | (( info: { item?: Item; @@ -37128,7 +37101,7 @@ declare module DevExpress.viz { /** * [descr:dxFunnelOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.common.DataSourceLike | null; /** * [descr:dxFunnelOptions.hoverEnabled] */ @@ -37413,19 +37386,19 @@ declare module DevExpress.viz { /** * [descr:_viz_linear_gauge_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_viz_linear_gauge_DrawnEvent] */ - export type DrawnEvent = DevExpress.events.EventInfo; + export type DrawnEvent = DevExpress.common.EventInfo; /** * [descr:_viz_linear_gauge_ExportedEvent] */ - export type ExportedEvent = DevExpress.events.EventInfo; + export type ExportedEvent = DevExpress.common.EventInfo; /** * [descr:_viz_linear_gauge_ExportingEvent] */ - export type ExportingEvent = DevExpress.events.EventInfo & + export type ExportingEvent = DevExpress.common.EventInfo & DevExpress.viz.BaseWidget.ExportInfo; /** * [descr:_viz_linear_gauge_FileSavingEvent] @@ -37436,19 +37409,19 @@ declare module DevExpress.viz { * [descr:_viz_linear_gauge_IncidentOccurredEvent] */ export type IncidentOccurredEvent = - DevExpress.events.EventInfo & + DevExpress.common.EventInfo & DevExpress.viz.BaseWidget.IncidentInfo; /** * [descr:_viz_linear_gauge_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_viz_linear_gauge_OptionChangedEvent] */ export type OptionChangedEvent = - DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type Properties = dxLinearGaugeOptions; /** * [descr:dxLinearGaugeRangeContainer] @@ -37512,12 +37485,12 @@ declare module DevExpress.viz { * [descr:_viz_linear_gauge_TooltipHiddenEvent] */ export type TooltipHiddenEvent = - DevExpress.events.EventInfo & + DevExpress.common.EventInfo & DevExpress.viz.BaseGauge.TooltipInfo; /** * [descr:_viz_linear_gauge_TooltipShownEvent] */ - export type TooltipShownEvent = DevExpress.events.EventInfo & + export type TooltipShownEvent = DevExpress.common.EventInfo & DevExpress.viz.BaseGauge.TooltipInfo; } /** @@ -37575,23 +37548,23 @@ declare module DevExpress.viz { /** * [descr:_viz_pie_chart_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_viz_pie_chart_DoneEvent] */ - export type DoneEvent = DevExpress.events.EventInfo; + export type DoneEvent = DevExpress.common.EventInfo; /** * [descr:_viz_pie_chart_DrawnEvent] */ - export type DrawnEvent = DevExpress.events.EventInfo; + export type DrawnEvent = DevExpress.common.EventInfo; /** * [descr:_viz_pie_chart_ExportedEvent] */ - export type ExportedEvent = DevExpress.events.EventInfo; + export type ExportedEvent = DevExpress.common.EventInfo; /** * [descr:_viz_pie_chart_ExportingEvent] */ - export type ExportingEvent = DevExpress.events.EventInfo & + export type ExportingEvent = DevExpress.common.EventInfo & DevExpress.viz.BaseWidget.ExportInfo; /** * [descr:_viz_pie_chart_FileSavingEvent] @@ -37602,13 +37575,13 @@ declare module DevExpress.viz { * [descr:_viz_pie_chart_IncidentOccurredEvent] */ export type IncidentOccurredEvent = - DevExpress.events.EventInfo & + DevExpress.common.EventInfo & DevExpress.viz.BaseWidget.IncidentInfo; /** * [descr:_viz_pie_chart_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:dxPieChartLegend] */ @@ -37641,7 +37614,7 @@ declare module DevExpress.viz { * [descr:dxPieChartOptions.legend.markerTemplate] */ markerTemplate?: - | DevExpress.core.template + | Template | (( legendItem: LegendItem, element: SVGGElement @@ -37650,7 +37623,7 @@ declare module DevExpress.viz { /** * [descr:_viz_pie_chart_LegendClickEvent] */ - export type LegendClickEvent = DevExpress.events.NativeEventInfo< + export type LegendClickEvent = DevExpress.common.NativeEventInfo< dxPieChart, MouseEvent | PointerEvent > & { @@ -37666,8 +37639,8 @@ declare module DevExpress.viz { /** * [descr:_viz_pie_chart_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type PieChartAnnotationLocation = 'center' | 'edge'; export type PieChartLegendHoverMode = 'none' | 'allArgumentPoints'; export type PieChartSegmentDirection = 'anticlockwise' | 'clockwise'; @@ -37676,7 +37649,7 @@ declare module DevExpress.viz { /** * [descr:_viz_pie_chart_PointClickEvent] */ - export type PointClickEvent = DevExpress.events.NativeEventInfo< + export type PointClickEvent = DevExpress.common.NativeEventInfo< dxPieChart, MouseEvent | PointerEvent > & @@ -37685,13 +37658,13 @@ declare module DevExpress.viz { * [descr:_viz_pie_chart_PointHoverChangedEvent] */ export type PointHoverChangedEvent = - DevExpress.events.EventInfo & + DevExpress.common.EventInfo & DevExpress.viz.BaseChart.PointInteractionInfo; /** * [descr:_viz_pie_chart_PointSelectionChangedEvent] */ export type PointSelectionChangedEvent = - DevExpress.events.EventInfo & + DevExpress.common.EventInfo & DevExpress.viz.BaseChart.PointInteractionInfo; export type Properties = dxPieChartOptions; export type SmallValuesGroupingMode = @@ -37701,12 +37674,12 @@ declare module DevExpress.viz { /** * [descr:_viz_pie_chart_TooltipHiddenEvent] */ - export type TooltipHiddenEvent = DevExpress.events.EventInfo & + export type TooltipHiddenEvent = DevExpress.common.EventInfo & DevExpress.viz.BaseChart.TooltipInfo; /** * [descr:_viz_pie_chart_TooltipShownEvent] */ - export type TooltipShownEvent = DevExpress.events.EventInfo & + export type TooltipShownEvent = DevExpress.common.EventInfo & DevExpress.viz.BaseChart.TooltipInfo; } /** @@ -37746,7 +37719,7 @@ declare module DevExpress.viz { * [descr:dxPieChartCommonAnnotationConfig.template] */ template?: - | DevExpress.core.template + | Template | (( annotation: dxPieChartAnnotationConfig | any, element: SVGGElement @@ -37755,7 +37728,7 @@ declare module DevExpress.viz { * [descr:dxPieChartCommonAnnotationConfig.tooltipTemplate] */ tooltipTemplate?: - | DevExpress.core.template + | Template | (( annotation: dxPieChartAnnotationConfig | any, element: DevExpress.core.DxElement @@ -37775,7 +37748,7 @@ declare module DevExpress.viz { * [descr:dxPieChartOptions.centerTemplate] */ centerTemplate?: - | DevExpress.core.template + | Template | (( component: dxPieChart, element: SVGGElement @@ -38275,7 +38248,7 @@ declare module DevExpress.viz { /** * [descr:_viz_polar_chart_ArgumentAxisClickEvent] */ - export type ArgumentAxisClickEvent = DevExpress.events.NativeEventInfo< + export type ArgumentAxisClickEvent = DevExpress.common.NativeEventInfo< dxPolarChart, MouseEvent | PointerEvent > & { @@ -38642,23 +38615,23 @@ declare module DevExpress.viz { /** * [descr:_viz_polar_chart_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_viz_polar_chart_DoneEvent] */ - export type DoneEvent = DevExpress.events.EventInfo; + export type DoneEvent = DevExpress.common.EventInfo; /** * [descr:_viz_polar_chart_DrawnEvent] */ - export type DrawnEvent = DevExpress.events.EventInfo; + export type DrawnEvent = DevExpress.common.EventInfo; /** * [descr:_viz_polar_chart_ExportedEvent] */ - export type ExportedEvent = DevExpress.events.EventInfo; + export type ExportedEvent = DevExpress.common.EventInfo; /** * [descr:_viz_polar_chart_ExportingEvent] */ - export type ExportingEvent = DevExpress.events.EventInfo & + export type ExportingEvent = DevExpress.common.EventInfo & DevExpress.viz.BaseWidget.ExportInfo; /** * [descr:_viz_polar_chart_FileSavingEvent] @@ -38669,13 +38642,13 @@ declare module DevExpress.viz { * [descr:_viz_polar_chart_IncidentOccurredEvent] */ export type IncidentOccurredEvent = - DevExpress.events.EventInfo & + DevExpress.common.EventInfo & DevExpress.viz.BaseWidget.IncidentInfo; /** * [descr:_viz_polar_chart_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:dxPolarChartLegend] */ @@ -38704,8 +38677,8 @@ declare module DevExpress.viz { /** * [descr:_viz_polar_chart_LegendClickEvent] */ - export type LegendClickEvent = DevExpress.events.Cancelable & - DevExpress.events.NativeEventInfo< + export type LegendClickEvent = DevExpress.common.Cancelable & + DevExpress.common.NativeEventInfo< dxPolarChart, MouseEvent | PointerEvent > & { @@ -38717,13 +38690,13 @@ declare module DevExpress.viz { /** * [descr:_viz_polar_chart_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; /** * [descr:_viz_polar_chart_PointClickEvent] */ - export type PointClickEvent = DevExpress.events.Cancelable & - DevExpress.events.NativeEventInfo< + export type PointClickEvent = DevExpress.common.Cancelable & + DevExpress.common.NativeEventInfo< dxPolarChart, MouseEvent | PointerEvent > & @@ -38732,13 +38705,13 @@ declare module DevExpress.viz { * [descr:_viz_polar_chart_PointHoverChangedEvent] */ export type PointHoverChangedEvent = - DevExpress.events.EventInfo & + DevExpress.common.EventInfo & DevExpress.viz.BaseChart.PointInteractionInfo; /** * [descr:_viz_polar_chart_PointSelectionChangedEvent] */ export type PointSelectionChangedEvent = - DevExpress.events.EventInfo & + DevExpress.common.EventInfo & DevExpress.viz.BaseChart.PointInteractionInfo; export type PolarChartSeriesType = | 'area' @@ -38750,7 +38723,7 @@ declare module DevExpress.viz { /** * [descr:_viz_polar_chart_SeriesClickEvent] */ - export type SeriesClickEvent = DevExpress.events.NativeEventInfo< + export type SeriesClickEvent = DevExpress.common.NativeEventInfo< dxPolarChart, MouseEvent | PointerEvent > & { @@ -38763,7 +38736,7 @@ declare module DevExpress.viz { * [descr:_viz_polar_chart_SeriesHoverChangedEvent] */ export type SeriesHoverChangedEvent = - DevExpress.events.EventInfo & SeriesInteractionInfo; + DevExpress.common.EventInfo & SeriesInteractionInfo; /** * [descr:_viz_polar_chart_SeriesInteractionInfo] * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. @@ -38778,7 +38751,7 @@ declare module DevExpress.viz { * [descr:_viz_polar_chart_SeriesSelectionChangedEvent] */ export type SeriesSelectionChangedEvent = - DevExpress.events.EventInfo & SeriesInteractionInfo; + DevExpress.common.EventInfo & SeriesInteractionInfo; /** * [descr:dxPolarChartTooltip] */ @@ -38791,12 +38764,12 @@ declare module DevExpress.viz { /** * [descr:_viz_polar_chart_TooltipHiddenEvent] */ - export type TooltipHiddenEvent = DevExpress.events.EventInfo & + export type TooltipHiddenEvent = DevExpress.common.EventInfo & DevExpress.viz.BaseChart.TooltipInfo; /** * [descr:_viz_polar_chart_TooltipShownEvent] */ - export type TooltipShownEvent = DevExpress.events.EventInfo & + export type TooltipShownEvent = DevExpress.common.EventInfo & DevExpress.viz.BaseChart.TooltipInfo; /** * [descr:dxPolarChartValueAxis] @@ -38992,8 +38965,8 @@ declare module DevExpress.viz { /** * [descr:_viz_polar_chart_ZoomEndEvent] */ - export type ZoomEndEvent = DevExpress.events.Cancelable & - DevExpress.events.NativeEventInfo< + export type ZoomEndEvent = DevExpress.common.Cancelable & + DevExpress.common.NativeEventInfo< dxPolarChart, MouseEvent | TouchEvent > & { @@ -39025,8 +38998,8 @@ declare module DevExpress.viz { /** * [descr:_viz_polar_chart_ZoomStartEvent] */ - export type ZoomStartEvent = DevExpress.events.Cancelable & - DevExpress.events.NativeEventInfo< + export type ZoomStartEvent = DevExpress.common.Cancelable & + DevExpress.common.NativeEventInfo< dxPolarChart, MouseEvent | TouchEvent > & { @@ -39077,7 +39050,7 @@ declare module DevExpress.viz { * [descr:dxPolarChartCommonAnnotationConfig.template] */ template?: - | DevExpress.core.template + | Template | (( annotation: dxPolarChartAnnotationConfig | any, element: SVGGElement @@ -39086,7 +39059,7 @@ declare module DevExpress.viz { * [descr:dxPolarChartCommonAnnotationConfig.tooltipTemplate] */ tooltipTemplate?: - | DevExpress.core.template + | Template | (( annotation: dxPolarChartAnnotationConfig | any, element: DevExpress.core.DxElement @@ -39853,7 +39826,7 @@ declare module DevExpress.viz { * [descr:dxRangeSelector] */ export class dxRangeSelector extends BaseWidget { - getDataSource(): DevExpress.data.DataSource; + getDataSource(): DevExpress.common.DataSource; /** * [descr:dxRangeSelector.getValue()] */ @@ -39893,19 +39866,19 @@ declare module DevExpress.viz { /** * [descr:_viz_range_selector_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_viz_range_selector_DrawnEvent] */ - export type DrawnEvent = DevExpress.events.EventInfo; + export type DrawnEvent = DevExpress.common.EventInfo; /** * [descr:_viz_range_selector_ExportedEvent] */ - export type ExportedEvent = DevExpress.events.EventInfo; + export type ExportedEvent = DevExpress.common.EventInfo; /** * [descr:_viz_range_selector_ExportingEvent] */ - export type ExportingEvent = DevExpress.events.EventInfo & + export type ExportingEvent = DevExpress.common.EventInfo & DevExpress.viz.BaseWidget.ExportInfo; /** * [descr:_viz_range_selector_FileSavingEvent] @@ -39916,25 +39889,25 @@ declare module DevExpress.viz { * [descr:_viz_range_selector_IncidentOccurredEvent] */ export type IncidentOccurredEvent = - DevExpress.events.EventInfo & + DevExpress.common.EventInfo & DevExpress.viz.BaseWidget.IncidentInfo; /** * [descr:_viz_range_selector_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_viz_range_selector_OptionChangedEvent] */ export type OptionChangedEvent = - DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type Properties = dxRangeSelectorOptions; export type ValueChangedCallMode = 'onMoving' | 'onMovingComplete'; /** * [descr:_viz_range_selector_ValueChangedEvent] */ - export type ValueChangedEvent = DevExpress.events.NativeEventInfo< + export type ValueChangedEvent = DevExpress.common.NativeEventInfo< dxRangeSelector, MouseEvent | TouchEvent > & { @@ -40135,7 +40108,7 @@ declare module DevExpress.viz { /** * [descr:dxRangeSelectorOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.common.DataSourceLike | null; /** * [descr:dxRangeSelectorOptions.dataSourceField] */ @@ -40498,7 +40471,7 @@ declare module DevExpress.viz { * [descr:dxSankey.getAllNodes()] */ getAllNodes(): Array; - getDataSource(): DevExpress.data.DataSource; + getDataSource(): DevExpress.common.DataSource; /** * [descr:dxSankey.hideTooltip()] */ @@ -40508,19 +40481,19 @@ declare module DevExpress.viz { /** * [descr:_viz_sankey_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_viz_sankey_DrawnEvent] */ - export type DrawnEvent = DevExpress.events.EventInfo; + export type DrawnEvent = DevExpress.common.EventInfo; /** * [descr:_viz_sankey_ExportedEvent] */ - export type ExportedEvent = DevExpress.events.EventInfo; + export type ExportedEvent = DevExpress.common.EventInfo; /** * [descr:_viz_sankey_ExportingEvent] */ - export type ExportingEvent = DevExpress.events.EventInfo & + export type ExportingEvent = DevExpress.common.EventInfo & DevExpress.viz.BaseWidget.ExportInfo; /** * [descr:_viz_sankey_FileSavingEvent] @@ -40530,17 +40503,17 @@ declare module DevExpress.viz { /** * [descr:_viz_sankey_IncidentOccurredEvent] */ - export type IncidentOccurredEvent = DevExpress.events.EventInfo & + export type IncidentOccurredEvent = DevExpress.common.EventInfo & DevExpress.viz.BaseWidget.IncidentInfo; /** * [descr:_viz_sankey_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_viz_sankey_LinkClickEvent] */ - export type LinkClickEvent = DevExpress.events.NativeEventInfo< + export type LinkClickEvent = DevExpress.common.NativeEventInfo< dxSankey, MouseEvent | PointerEvent > & { @@ -40552,7 +40525,7 @@ declare module DevExpress.viz { /** * [descr:_viz_sankey_LinkHoverEvent] */ - export type LinkHoverEvent = DevExpress.events.EventInfo & { + export type LinkHoverEvent = DevExpress.common.EventInfo & { /** * [descr:_viz_sankey_LinkHoverEvent.target] */ @@ -40561,7 +40534,7 @@ declare module DevExpress.viz { /** * [descr:_viz_sankey_NodeClickEvent] */ - export type NodeClickEvent = DevExpress.events.NativeEventInfo< + export type NodeClickEvent = DevExpress.common.NativeEventInfo< dxSankey, MouseEvent | PointerEvent > & { @@ -40573,7 +40546,7 @@ declare module DevExpress.viz { /** * [descr:_viz_sankey_NodeHoverEvent] */ - export type NodeHoverEvent = DevExpress.events.EventInfo & { + export type NodeHoverEvent = DevExpress.common.EventInfo & { /** * [descr:_viz_sankey_NodeHoverEvent.target] */ @@ -40582,8 +40555,8 @@ declare module DevExpress.viz { /** * [descr:_viz_sankey_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type Properties = dxSankeyOptions; export type SankeyColorMode = 'none' | 'source' | 'target' | 'gradient'; /** @@ -40615,7 +40588,7 @@ declare module DevExpress.viz { * [descr:dxSankeyOptions.tooltip.linkTooltipTemplate] */ linkTooltipTemplate?: - | DevExpress.core.template + | Template | (( info: { source?: string; target?: string; weight?: number }, element: DevExpress.core.DxElement @@ -40624,7 +40597,7 @@ declare module DevExpress.viz { * [descr:dxSankeyOptions.tooltip.nodeTooltipTemplate] */ nodeTooltipTemplate?: - | DevExpress.core.template + | Template | (( info: { label?: string; weightIn?: number; weightOut?: number }, element: DevExpress.core.DxElement @@ -40746,7 +40719,7 @@ declare module DevExpress.viz { /** * [descr:dxSankeyOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.common.DataSourceLike | null; /** * [descr:dxSankeyOptions.hoverEnabled] */ @@ -41053,25 +41026,25 @@ declare module DevExpress.viz { * [descr:dxSparkline] */ export class dxSparkline extends BaseSparkline { - getDataSource(): DevExpress.data.DataSource; + getDataSource(): DevExpress.common.DataSource; } module dxSparkline { /** * [descr:_viz_sparkline_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_viz_sparkline_DrawnEvent] */ - export type DrawnEvent = DevExpress.events.EventInfo; + export type DrawnEvent = DevExpress.common.EventInfo; /** * [descr:_viz_sparkline_ExportedEvent] */ - export type ExportedEvent = DevExpress.events.EventInfo; + export type ExportedEvent = DevExpress.common.EventInfo; /** * [descr:_viz_sparkline_ExportingEvent] */ - export type ExportingEvent = DevExpress.events.EventInfo & + export type ExportingEvent = DevExpress.common.EventInfo & DevExpress.viz.BaseWidget.ExportInfo; /** * [descr:_viz_sparkline_FileSavingEvent] @@ -41082,18 +41055,18 @@ declare module DevExpress.viz { * [descr:_viz_sparkline_IncidentOccurredEvent] */ export type IncidentOccurredEvent = - DevExpress.events.EventInfo & + DevExpress.common.EventInfo & DevExpress.viz.BaseWidget.IncidentInfo; /** * [descr:_viz_sparkline_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_viz_sparkline_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type Properties = dxSparklineOptions; export type SparklineType = | 'area' @@ -41107,11 +41080,11 @@ declare module DevExpress.viz { /** * [descr:_viz_sparkline_TooltipHiddenEvent] */ - export type TooltipHiddenEvent = DevExpress.events.EventInfo; + export type TooltipHiddenEvent = DevExpress.common.EventInfo; /** * [descr:_viz_sparkline_TooltipShownEvent] */ - export type TooltipShownEvent = DevExpress.events.EventInfo; + export type TooltipShownEvent = DevExpress.common.EventInfo; } /** * [descr:dxSparklineOptions] @@ -41135,7 +41108,7 @@ declare module DevExpress.viz { /** * [descr:dxSparklineOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.common.DataSourceLike | null; /** * [descr:dxSparklineOptions.firstLastColor] */ @@ -41225,7 +41198,7 @@ declare module DevExpress.viz { * [descr:dxTreeMap.getCurrentNode()] */ getCurrentNode(): dxTreeMapNode; - getDataSource(): DevExpress.data.DataSource; + getDataSource(): DevExpress.common.DataSource; /** * [descr:dxTreeMap.getRootNode()] */ @@ -41243,7 +41216,7 @@ declare module DevExpress.viz { /** * [descr:_viz_tree_map_ClickEvent] */ - export type ClickEvent = DevExpress.events.NativeEventInfo< + export type ClickEvent = DevExpress.common.NativeEventInfo< dxTreeMap, MouseEvent | PointerEvent > & { @@ -41255,15 +41228,15 @@ declare module DevExpress.viz { /** * [descr:_viz_tree_map_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_viz_tree_map_DrawnEvent] */ - export type DrawnEvent = DevExpress.events.EventInfo; + export type DrawnEvent = DevExpress.common.EventInfo; /** * [descr:_viz_tree_map_DrillEvent] */ - export type DrillEvent = DevExpress.events.EventInfo & { + export type DrillEvent = DevExpress.common.EventInfo & { /** * [descr:_viz_tree_map_DrillEvent.node] */ @@ -41272,11 +41245,11 @@ declare module DevExpress.viz { /** * [descr:_viz_tree_map_ExportedEvent] */ - export type ExportedEvent = DevExpress.events.EventInfo; + export type ExportedEvent = DevExpress.common.EventInfo; /** * [descr:_viz_tree_map_ExportingEvent] */ - export type ExportingEvent = DevExpress.events.EventInfo & + export type ExportingEvent = DevExpress.common.EventInfo & DevExpress.viz.BaseWidget.ExportInfo; /** * [descr:_viz_tree_map_FileSavingEvent] @@ -41286,18 +41259,18 @@ declare module DevExpress.viz { /** * [descr:_viz_tree_map_HoverChangedEvent] */ - export type HoverChangedEvent = DevExpress.events.EventInfo & + export type HoverChangedEvent = DevExpress.common.EventInfo & InteractionInfo; /** * [descr:_viz_tree_map_IncidentOccurredEvent] */ - export type IncidentOccurredEvent = DevExpress.events.EventInfo & + export type IncidentOccurredEvent = DevExpress.common.EventInfo & DevExpress.viz.BaseWidget.IncidentInfo; /** * [descr:_viz_tree_map_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:InteractionInfo] * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. @@ -41312,7 +41285,7 @@ declare module DevExpress.viz { * [descr:_viz_tree_map_NodesInitializedEvent] */ export type NodesInitializedEvent = - DevExpress.events.EventInfo & { + DevExpress.common.EventInfo & { /** * [descr:_viz_tree_map_NodesInitializedEvent.root] */ @@ -41321,7 +41294,7 @@ declare module DevExpress.viz { /** * [descr:_viz_tree_map_NodesRenderingEvent] */ - export type NodesRenderingEvent = DevExpress.events.EventInfo & { + export type NodesRenderingEvent = DevExpress.common.EventInfo & { /** * [descr:_viz_tree_map_NodesRenderingEvent.node] */ @@ -41330,13 +41303,13 @@ declare module DevExpress.viz { /** * [descr:_viz_tree_map_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type Properties = dxTreeMapOptions; /** * [descr:_viz_tree_map_SelectionChangedEvent] */ - export type SelectionChangedEvent = DevExpress.events.EventInfo & + export type SelectionChangedEvent = DevExpress.common.EventInfo & InteractionInfo; /** * [descr:dxTreeMapTooltip] @@ -41346,7 +41319,7 @@ declare module DevExpress.viz { * [descr:dxTreeMapOptions.tooltip.contentTemplate] */ contentTemplate?: - | DevExpress.core.template + | Template | (( info: { value?: number; valueText?: string; node?: dxTreeMapNode }, element: DevExpress.core.DxElement @@ -41507,7 +41480,7 @@ declare module DevExpress.viz { /** * [descr:dxTreeMapOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.common.DataSourceLike | null; /** * [descr:dxTreeMapOptions.group] */ @@ -41838,7 +41811,7 @@ declare module DevExpress.viz { * [descr:_viz_vector_map_CenterChangedEvent] */ export type CenterChangedEvent = - DevExpress.events.EventInfo & { + DevExpress.common.EventInfo & { /** * [descr:_viz_vector_map_CenterChangedEvent.center] */ @@ -41847,7 +41820,7 @@ declare module DevExpress.viz { /** * [descr:_viz_vector_map_ClickEvent] */ - export type ClickEvent = DevExpress.events.NativeEventInfo< + export type ClickEvent = DevExpress.common.NativeEventInfo< dxVectorMap, MouseEvent | PointerEvent > & { @@ -41859,19 +41832,19 @@ declare module DevExpress.viz { /** * [descr:_viz_vector_map_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_viz_vector_map_DrawnEvent] */ - export type DrawnEvent = DevExpress.events.EventInfo; + export type DrawnEvent = DevExpress.common.EventInfo; /** * [descr:_viz_vector_map_ExportedEvent] */ - export type ExportedEvent = DevExpress.events.EventInfo; + export type ExportedEvent = DevExpress.common.EventInfo; /** * [descr:_viz_vector_map_ExportingEvent] */ - export type ExportingEvent = DevExpress.events.EventInfo & + export type ExportingEvent = DevExpress.common.EventInfo & DevExpress.viz.BaseWidget.ExportInfo; /** * [descr:_viz_vector_map_FileSavingEvent] @@ -41882,13 +41855,13 @@ declare module DevExpress.viz { * [descr:_viz_vector_map_IncidentOccurredEvent] */ export type IncidentOccurredEvent = - DevExpress.events.EventInfo & + DevExpress.common.EventInfo & DevExpress.viz.BaseWidget.IncidentInfo; /** * [descr:_viz_vector_map_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:dxVectorMapLegends] */ @@ -41937,7 +41910,7 @@ declare module DevExpress.viz { * [descr:dxVectorMapOptions.legends.markerTemplate] */ markerTemplate?: - | DevExpress.core.template + | Template | (( legendItem: LegendItem, element: SVGGElement @@ -41959,14 +41932,14 @@ declare module DevExpress.viz { /** * [descr:_viz_vector_map_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type Properties = dxVectorMapOptions; /** * [descr:_viz_vector_map_SelectionChangedEvent] */ export type SelectionChangedEvent = - DevExpress.events.EventInfo & { + DevExpress.common.EventInfo & { /** * [descr:_viz_vector_map_SelectionChangedEvent.target] */ @@ -41980,7 +41953,7 @@ declare module DevExpress.viz { * [descr:dxVectorMapOptions.tooltip.contentTemplate] */ contentTemplate?: - | DevExpress.core.template + | Template | (( info: MapLayerElement, element: DevExpress.core.DxElement @@ -41997,7 +41970,7 @@ declare module DevExpress.viz { /** * [descr:_viz_vector_map_TooltipHiddenEvent] */ - export type TooltipHiddenEvent = DevExpress.events.EventInfo & + export type TooltipHiddenEvent = DevExpress.common.EventInfo & TooltipInfo; /** * [descr:_viz_vector_map_TooltipInfo] @@ -42012,7 +41985,7 @@ declare module DevExpress.viz { /** * [descr:_viz_vector_map_TooltipShownEvent] */ - export type TooltipShownEvent = DevExpress.events.EventInfo & + export type TooltipShownEvent = DevExpress.common.EventInfo & TooltipInfo; export type VectorMapLayerType = 'area' | 'line' | 'marker'; export type VectorMapMarkerShape = 'circle' | 'square'; @@ -42021,7 +41994,7 @@ declare module DevExpress.viz { * [descr:_viz_vector_map_ZoomFactorChangedEvent] */ export type ZoomFactorChangedEvent = - DevExpress.events.EventInfo & { + DevExpress.common.EventInfo & { /** * [descr:_viz_vector_map_ZoomFactorChangedEvent.zoomFactor] */ @@ -42057,7 +42030,7 @@ declare module DevExpress.viz { * [descr:dxVectorMapCommonAnnotationConfig.template] */ template?: - | DevExpress.core.template + | Template | (( annotation: dxVectorMapAnnotationConfig | any, element: SVGGElement @@ -42066,7 +42039,7 @@ declare module DevExpress.viz { * [descr:dxVectorMapCommonAnnotationConfig.tooltipTemplate] */ tooltipTemplate?: - | DevExpress.core.template + | Template | (( annotation: dxVectorMapAnnotationConfig | any, element: DevExpress.core.DxElement @@ -42176,10 +42149,7 @@ declare module DevExpress.viz { /** * [descr:dxVectorMapOptions.layers.dataSource] */ - dataSource?: - | object - | DevExpress.data.DataSource.DataSourceLike - | null; + dataSource?: object | DevExpress.common.DataSourceLike | null; /** * [descr:dxVectorMapOptions.layers.elementType] */ @@ -42286,10 +42256,7 @@ declare module DevExpress.viz { colorGroups?: Array; customize?: (elements: Array) => any; dataField?: string; - dataSource?: - | object - | DevExpress.data.DataSource.DataSourceLike - | null; + dataSource?: object | DevExpress.common.DataSourceLike | null; elementType?: 'bubble' | 'dot' | 'image' | 'pie'; hoverEnabled?: boolean; hoveredBorderColor?: string; @@ -42513,7 +42480,7 @@ declare module DevExpress.viz { /** * [descr:MapLayer.getDataSource()] */ - getDataSource(): DevExpress.data.DataSource; + getDataSource(): DevExpress.common.DataSource; /** * [descr:MapLayer.getElements()] */