Charts - Move Font type to common/charts (#25745)

Co-authored-by: Mikhail Preyskurantov <[email protected]>
DevExpress · Oct 20, 2023 · a60843e · a60843e
1 parent 29910e4
commit a60843e
Show file tree

Hide file tree

Showing 74 changed files with 413 additions and 436 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -30,7 +30,7 @@
     "@types/shelljs": "0.8.13",
     "cheerio": "1.0.0-rc.10",
     "codelyzer": "^6.0.2",
-    "devextreme-internal-tools": "12.0.0-beta.5",
+    "devextreme-internal-tools": "12.0.0-beta.6",
     "eslint": "8.47.0",
     "eslint-config-airbnb-base": "15.0.0",
     "eslint-config-airbnb-typescript": "17.0.0",

diff --git a/packages/devextreme-angular/src/common/charts.ts b/packages/devextreme-angular/src/common/charts.ts
@@ -9,6 +9,7 @@ export {
     ChartsLabelOverlap,
     DashStyle,
     DiscreteAxisDivisionMode,
+    Font,
     GradientColor,
     HatchDirection,
     LabelOverlap,

diff --git a/packages/devextreme-angular/src/ui/bar-gauge/index.ts b/packages/devextreme-angular/src/ui/bar-gauge/index.ts
@@ -22,11 +22,10 @@ import {
 
 
 import { ExportFormat, HorizontalAlignment, Orientation, Position, VerticalEdge } from 'devextreme/common';
-import { AnimationEaseMode, DashStyle, Palette, PaletteExtensionMode, ShiftLabelOverlap, TextOverflow, Theme, WordWrap } from 'devextreme/common/charts';
+import { AnimationEaseMode, DashStyle, Font, Palette, PaletteExtensionMode, ShiftLabelOverlap, TextOverflow, Theme, WordWrap } from 'devextreme/common/charts';
 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 { Font } from 'devextreme/viz/core/base_widget';
 
 import DxBarGauge from 'devextreme/viz/bar_gauge';
 

diff --git a/packages/devextreme-angular/src/ui/bullet/index.ts b/packages/devextreme-angular/src/ui/bullet/index.ts
@@ -18,11 +18,10 @@ import {
 } from '@angular/core';
 
 
-import { DashStyle, Theme } from 'devextreme/common/charts';
+import { DashStyle, Font, Theme } from 'devextreme/common/charts';
 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 { Font } from 'devextreme/viz/core/base_widget';
 
 import DxBullet from 'devextreme/viz/bullet';
 

diff --git a/packages/devextreme-angular/src/ui/chart/index.ts b/packages/devextreme-angular/src/ui/chart/index.ts
@@ -25,13 +25,12 @@ import {
 
 import DevExpress from 'devextreme/bundles/dx.all';
 import { ExportFormat, HorizontalAlignment, Orientation, Position, SingleOrMultiple, VerticalAlignment, VerticalEdge } from 'devextreme/common';
-import { AnimationEaseMode, ArgumentAxisHoverMode, AxisScaleType, ChartsAxisLabelOverlap, ChartsDataType, ChartsLabelOverlap, DashStyle, DiscreteAxisDivisionMode, LegendHoverMode, Palette, PaletteExtensionMode, RelativePosition, ScaleBreakLineStyle, TextOverflow, Theme, TimeInterval, VisualRangeUpdateMode, WordWrap } from 'devextreme/common/charts';
+import { AnimationEaseMode, ArgumentAxisHoverMode, AxisScaleType, ChartsAxisLabelOverlap, ChartsDataType, ChartsLabelOverlap, DashStyle, DiscreteAxisDivisionMode, Font, LegendHoverMode, Palette, PaletteExtensionMode, RelativePosition, ScaleBreakLineStyle, TextOverflow, Theme, TimeInterval, VisualRangeUpdateMode, WordWrap } from 'devextreme/common/charts';
 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, dxChartCommonAnnotationConfig, EventKeyModifier, ExportedEvent, ExportingEvent, FileSavingEvent, IncidentOccurredEvent, InitializedEvent, LegendClickEvent, OptionChangedEvent, PointClickEvent, PointHoverChangedEvent, PointSelectionChangedEvent, SeriesClickEvent, SeriesHoverChangedEvent, SeriesSelectionChangedEvent, TooltipHiddenEvent, TooltipShownEvent, ZoomEndEvent, ZoomStartEvent } from 'devextreme/viz/chart';
-import { Font } from 'devextreme/viz/core/base_widget';
 
 import DxChart from 'devextreme/viz/chart';
 

diff --git a/packages/devextreme-angular/src/ui/circular-gauge/index.ts b/packages/devextreme-angular/src/ui/circular-gauge/index.ts
@@ -23,11 +23,10 @@ import {
 
 import DevExpress from 'devextreme/bundles/dx.all';
 import { ExportFormat, HorizontalAlignment, VerticalEdge } from 'devextreme/common';
-import { AnimationEaseMode, DashStyle, LabelOverlap, Palette, PaletteExtensionMode, TextOverflow, Theme, WordWrap } from 'devextreme/common/charts';
+import { AnimationEaseMode, DashStyle, Font, LabelOverlap, Palette, PaletteExtensionMode, TextOverflow, Theme, WordWrap } from 'devextreme/common/charts';
 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 { Font } from 'devextreme/viz/core/base_widget';
 
 import DxCircularGauge from 'devextreme/viz/circular_gauge';
 

diff --git a/packages/devextreme-angular/src/ui/funnel/index.ts b/packages/devextreme-angular/src/ui/funnel/index.ts
@@ -22,12 +22,11 @@ import {
 
 
 import { ExportFormat, HorizontalAlignment, HorizontalEdge, Orientation, Position, SingleMultipleOrNone, VerticalEdge } from 'devextreme/common';
-import { DashStyle, HatchDirection, LabelPosition, Palette, PaletteExtensionMode, ShiftLabelOverlap, TextOverflow, Theme, WordWrap } from 'devextreme/common/charts';
+import { DashStyle, Font, HatchDirection, LabelPosition, Palette, PaletteExtensionMode, ShiftLabelOverlap, TextOverflow, Theme, WordWrap } from 'devextreme/common/charts';
 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 { Font } from 'devextreme/viz/core/base_widget';
 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/linear-gauge/index.ts b/packages/devextreme-angular/src/ui/linear-gauge/index.ts
@@ -23,10 +23,9 @@ import {
 
 import DevExpress from 'devextreme/bundles/dx.all';
 import { ExportFormat, HorizontalAlignment, Orientation, VerticalAlignment, VerticalEdge } from 'devextreme/common';
-import { AnimationEaseMode, DashStyle, LabelOverlap, Palette, PaletteExtensionMode, TextOverflow, Theme, WordWrap } from 'devextreme/common/charts';
+import { AnimationEaseMode, DashStyle, Font, LabelOverlap, Palette, PaletteExtensionMode, TextOverflow, Theme, WordWrap } from 'devextreme/common/charts';
 import { UserDefinedElement } from 'devextreme/core/element';
 import { Format } from 'devextreme/localization';
-import { Font } from 'devextreme/viz/core/base_widget';
 import { DisposingEvent, DrawnEvent, ExportedEvent, ExportingEvent, FileSavingEvent, IncidentOccurredEvent, InitializedEvent, OptionChangedEvent, TooltipHiddenEvent, TooltipShownEvent } from 'devextreme/viz/linear_gauge';
 
 import DxLinearGauge from 'devextreme/viz/linear_gauge';

diff --git a/packages/devextreme-angular/src/ui/nested/argument-axis.ts b/packages/devextreme-angular/src/ui/nested/argument-axis.ts
@@ -21,10 +21,9 @@ import {
 
 import DevExpress from 'devextreme/bundles/dx.all';
 import { HorizontalAlignment, Position, VerticalAlignment } from 'devextreme/common';
-import { ArgumentAxisHoverMode, AxisScaleType, ChartsAxisLabelOverlap, ChartsDataType, DashStyle, DiscreteAxisDivisionMode, LabelOverlap, RelativePosition, ScaleBreakLineStyle, TextOverflow, TimeInterval, VisualRangeUpdateMode, WordWrap } from 'devextreme/common/charts';
+import { ArgumentAxisHoverMode, AxisScaleType, ChartsAxisLabelOverlap, ChartsDataType, DashStyle, DiscreteAxisDivisionMode, Font, LabelOverlap, RelativePosition, ScaleBreakLineStyle, TextOverflow, TimeInterval, VisualRangeUpdateMode, WordWrap } from 'devextreme/common/charts';
 import { Format } from 'devextreme/localization';
 import { AggregatedPointsPosition, ChartLabelDisplayMode } from 'devextreme/viz/chart';
-import { Font } from 'devextreme/viz/core/base_widget';
 
 import {
     NestedOptionHost,

diff --git a/packages/devextreme-angular/src/ui/nested/base/chart-annotation-config-dxi.ts b/packages/devextreme-angular/src/ui/nested/base/chart-annotation-config-dxi.ts
@@ -5,8 +5,7 @@ import {
     Component,
 } from '@angular/core';
 
-import { AnnotationType, DashStyle, TextOverflow, WordWrap } from 'devextreme/common/charts';
-import { Font } from 'devextreme/viz/core/base_widget';
+import { AnnotationType, DashStyle, Font, TextOverflow, WordWrap } from 'devextreme/common/charts';
 import { PieChartAnnotationLocation } from 'devextreme/viz/pie_chart';
 
 @Component({

diff --git a/packages/devextreme-angular/src/ui/nested/base/chart-common-annotation-config.ts b/packages/devextreme-angular/src/ui/nested/base/chart-common-annotation-config.ts
@@ -5,8 +5,7 @@ import {
     Component,
 } from '@angular/core';
 
-import { AnnotationType, DashStyle, TextOverflow, WordWrap } from 'devextreme/common/charts';
-import { Font } from 'devextreme/viz/core/base_widget';
+import { AnnotationType, DashStyle, Font, TextOverflow, WordWrap } from 'devextreme/common/charts';
 import { PieChartAnnotationLocation } from 'devextreme/viz/pie_chart';
 
 @Component({

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
@@ -7,10 +7,9 @@ import {
 
 import DevExpress from 'devextreme/bundles/dx.all';
 import { HorizontalAlignment } from 'devextreme/common';
-import { ChartsDataType, DashStyle, HatchDirection, LabelPosition, PointInteractionMode, PointSymbol, RelativePosition, SeriesHoverMode, SeriesSelectionMode, SeriesType, TextOverflow, ValueErrorBarDisplayMode, ValueErrorBarType, WordWrap } from 'devextreme/common/charts';
+import { 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 { ChartSeriesAggregationMethod, FinancialChartReductionLevel } from 'devextreme/viz/chart';
-import { Font } from 'devextreme/viz/core/base_widget';
 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
@@ -7,10 +7,9 @@ import {
 
 import DevExpress from 'devextreme/bundles/dx.all';
 import { HorizontalAlignment } from 'devextreme/common';
-import { ChartsDataType, DashStyle, HatchDirection, LabelPosition, PointInteractionMode, PointSymbol, RelativePosition, SeriesHoverMode, SeriesSelectionMode, SeriesType, TextOverflow, ValueErrorBarDisplayMode, ValueErrorBarType, WordWrap } from 'devextreme/common/charts';
+import { 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 { ChartSeriesAggregationMethod, FinancialChartReductionLevel } from 'devextreme/viz/chart';
-import { Font } from 'devextreme/viz/core/base_widget';
 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/gauge-indicator.ts b/packages/devextreme-angular/src/ui/nested/base/gauge-indicator.ts
@@ -7,9 +7,8 @@ import {
 
 import DevExpress from 'devextreme/bundles/dx.all';
 import { HorizontalEdge, VerticalEdge } from 'devextreme/common';
-import { Palette } from 'devextreme/common/charts';
+import { Font, Palette } from 'devextreme/common/charts';
 import { Format } from 'devextreme/localization';
-import { Font } from 'devextreme/viz/core/base_widget';
 
 @Component({
     template: ''

diff --git a/packages/devextreme-angular/src/ui/nested/common-axis-settings.ts b/packages/devextreme-angular/src/ui/nested/common-axis-settings.ts
@@ -15,9 +15,8 @@ import {
 
 
 import { HorizontalAlignment, Position, VerticalAlignment } from 'devextreme/common';
-import { ChartsAxisLabelOverlap, DashStyle, DiscreteAxisDivisionMode, LabelOverlap, RelativePosition, ScaleBreakLineStyle, TextOverflow, WordWrap } from 'devextreme/common/charts';
+import { ChartsAxisLabelOverlap, DashStyle, DiscreteAxisDivisionMode, Font, LabelOverlap, RelativePosition, ScaleBreakLineStyle, TextOverflow, WordWrap } from 'devextreme/common/charts';
 import { AggregatedPointsPosition, ChartLabelDisplayMode } from 'devextreme/viz/chart';
-import { Font } from 'devextreme/viz/core/base_widget';
 
 import {
     NestedOptionHost,

diff --git a/packages/devextreme-angular/src/ui/nested/constant-line-dxi.ts b/packages/devextreme-angular/src/ui/nested/constant-line-dxi.ts
@@ -13,8 +13,7 @@ import {
 
 
 import { HorizontalAlignment, VerticalAlignment } from 'devextreme/common';
-import { DashStyle, RelativePosition } from 'devextreme/common/charts';
-import { Font } from 'devextreme/viz/core/base_widget';
+import { DashStyle, Font, RelativePosition } from 'devextreme/common/charts';
 
 import {
     NestedOptionHost,

diff --git a/packages/devextreme-angular/src/ui/nested/constant-line-style.ts b/packages/devextreme-angular/src/ui/nested/constant-line-style.ts
@@ -15,8 +15,7 @@ import {
 
 
 import { HorizontalAlignment, VerticalAlignment } from 'devextreme/common';
-import { DashStyle, RelativePosition } from 'devextreme/common/charts';
-import { Font } from 'devextreme/viz/core/base_widget';
+import { DashStyle, Font, RelativePosition } from 'devextreme/common/charts';
 
 import {
     NestedOptionHost,

diff --git a/packages/devextreme-angular/src/ui/nested/crosshair.ts b/packages/devextreme-angular/src/ui/nested/crosshair.ts
@@ -14,9 +14,8 @@ import {
 
 
 
-import { DashStyle } from 'devextreme/common/charts';
+import { DashStyle, Font } from 'devextreme/common/charts';
 import { Format } from 'devextreme/localization';
-import { Font } from 'devextreme/viz/core/base_widget';
 
 import {
     NestedOptionHost,

diff --git a/packages/devextreme-angular/src/ui/nested/group.ts b/packages/devextreme-angular/src/ui/nested/group.ts
@@ -14,8 +14,7 @@ import {
 
 
 
-import { TextOverflow } from 'devextreme/common/charts';
-import { Font } from 'devextreme/viz/core/base_widget';
+import { Font, TextOverflow } from 'devextreme/common/charts';
 
 import {
     NestedOptionHost,

diff --git a/packages/devextreme-angular/src/ui/nested/horizontal-line.ts b/packages/devextreme-angular/src/ui/nested/horizontal-line.ts
@@ -14,9 +14,8 @@ import {
 
 
 
-import { DashStyle } from 'devextreme/common/charts';
+import { DashStyle, Font } from 'devextreme/common/charts';
 import { Format } from 'devextreme/localization';
-import { Font } from 'devextreme/viz/core/base_widget';
 
 import {
     NestedOptionHost,

diff --git a/packages/devextreme-angular/src/ui/nested/label.ts b/packages/devextreme-angular/src/ui/nested/label.ts
@@ -15,12 +15,11 @@ import {
 
 
 import { HorizontalAlignment, HorizontalEdge, Position, VerticalAlignment, VerticalEdge } from 'devextreme/common';
-import { ChartsAxisLabelOverlap, DashStyle, LabelOverlap, LabelPosition, RelativePosition, TextOverflow, WordWrap } from 'devextreme/common/charts';
+import { ChartsAxisLabelOverlap, DashStyle, Font, LabelOverlap, LabelPosition, RelativePosition, TextOverflow, WordWrap } from 'devextreme/common/charts';
 import { Format } from 'devextreme/localization';
 import { LabelLocation } from 'devextreme/ui/form';
 import { ChartLabelDisplayMode } from 'devextreme/viz/chart';
 import { CircularGaugeLabelOverlap } from 'devextreme/viz/circular_gauge';
-import { Font } from 'devextreme/viz/core/base_widget';
 
 import {
     NestedOptionHost,

diff --git a/packages/devextreme-angular/src/ui/nested/layer-dxi.ts b/packages/devextreme-angular/src/ui/nested/layer-dxi.ts
@@ -13,10 +13,9 @@ import {
 
 
 import { SingleMultipleOrNone } from 'devextreme/common';
-import { Palette } from 'devextreme/common/charts';
+import { Font, Palette } from 'devextreme/common/charts';
 import { Store } from 'devextreme/data';
 import DataSource, { Options as DataSourceOptions } from 'devextreme/data/data_source';
-import { Font } from 'devextreme/viz/core/base_widget';
 import { VectorMapLayerType, VectorMapMarkerType } from 'devextreme/viz/vector_map';
 
 import {

diff --git a/packages/devextreme-angular/src/ui/nested/legend-dxi.ts b/packages/devextreme-angular/src/ui/nested/legend-dxi.ts
@@ -13,8 +13,7 @@ import {
 
 
 import { HorizontalAlignment, Orientation, Position, VerticalEdge } from 'devextreme/common';
-import { DashStyle } from 'devextreme/common/charts';
-import { Font } from 'devextreme/viz/core/base_widget';
+import { DashStyle, Font } from 'devextreme/common/charts';
 import { VectorMapMarkerShape } from 'devextreme/viz/vector_map';
 
 import {

diff --git a/packages/devextreme-angular/src/ui/nested/legend.ts b/packages/devextreme-angular/src/ui/nested/legend.ts
@@ -15,9 +15,8 @@ import {
 
 
 import { HorizontalAlignment, Orientation, Position, VerticalEdge } from 'devextreme/common';
-import { DashStyle, LegendHoverMode, RelativePosition } from 'devextreme/common/charts';
+import { DashStyle, Font, LegendHoverMode, RelativePosition } from 'devextreme/common/charts';
 import { Format } from 'devextreme/localization';
-import { Font } from 'devextreme/viz/core/base_widget';
 import { PieChartLegendHoverMode } from 'devextreme/viz/pie_chart';
 
 import {

diff --git a/packages/devextreme-angular/src/ui/nested/loading-indicator.ts b/packages/devextreme-angular/src/ui/nested/loading-indicator.ts
@@ -16,7 +16,7 @@ import {
 
 
 
-import { Font } from 'devextreme/viz/core/base_widget';
+import { Font } from 'devextreme/common/charts';
 
 import {
     NestedOptionHost,

diff --git a/packages/devextreme-angular/src/ui/nested/scale.ts b/packages/devextreme-angular/src/ui/nested/scale.ts
@@ -19,10 +19,9 @@ import {
 
 import DevExpress from 'devextreme/bundles/dx.all';
 import { HorizontalAlignment, VerticalAlignment } from 'devextreme/common';
-import { ChartsDataType, DiscreteAxisDivisionMode, LabelOverlap, ScaleBreakLineStyle, TimeInterval } from 'devextreme/common/charts';
+import { ChartsDataType, DiscreteAxisDivisionMode, Font, LabelOverlap, ScaleBreakLineStyle, TimeInterval } from 'devextreme/common/charts';
 import { Format } from 'devextreme/localization';
 import { CircularGaugeElementOrientation, CircularGaugeLabelOverlap } from 'devextreme/viz/circular_gauge';
-import { Font } from 'devextreme/viz/core/base_widget';
 import { AxisScale } from 'devextreme/viz/range_selector';
 
 import {

diff --git a/packages/devextreme-angular/src/ui/nested/slider-marker.ts b/packages/devextreme-angular/src/ui/nested/slider-marker.ts
@@ -14,8 +14,8 @@ import {
 
 
 
+import { Font } from 'devextreme/common/charts';
 import { Format } from 'devextreme/localization';
-import { Font } from 'devextreme/viz/core/base_widget';
 
 import {
     NestedOptionHost,

diff --git a/packages/devextreme-angular/src/ui/nested/strip-dxi.ts b/packages/devextreme-angular/src/ui/nested/strip-dxi.ts
@@ -13,7 +13,7 @@ import {
 
 
 import { HorizontalAlignment, VerticalAlignment } from 'devextreme/common';
-import { Font } from 'devextreme/viz/core/base_widget';
+import { Font } from 'devextreme/common/charts';
 
 import {
     NestedOptionHost,

diff --git a/packages/devextreme-angular/src/ui/nested/strip-style.ts b/packages/devextreme-angular/src/ui/nested/strip-style.ts
@@ -15,7 +15,7 @@ import {
 
 
 import { HorizontalAlignment, VerticalAlignment } from 'devextreme/common';
-import { Font } from 'devextreme/viz/core/base_widget';
+import { Font } from 'devextreme/common/charts';
 
 import {
     NestedOptionHost,

diff --git a/packages/devextreme-angular/src/ui/nested/subtitle.ts b/packages/devextreme-angular/src/ui/nested/subtitle.ts
@@ -14,8 +14,7 @@ import {
 
 
 
-import { TextOverflow, WordWrap } from 'devextreme/common/charts';
-import { Font } from 'devextreme/viz/core/base_widget';
+import { Font, TextOverflow, WordWrap } from 'devextreme/common/charts';
 
 import {
     NestedOptionHost,

diff --git a/packages/devextreme-angular/src/ui/nested/text.ts b/packages/devextreme-angular/src/ui/nested/text.ts
@@ -14,8 +14,8 @@ import {
 
 
 
+import { Font } from 'devextreme/common/charts';
 import { Format } from 'devextreme/localization';
-import { Font } from 'devextreme/viz/core/base_widget';
 
 import {
     NestedOptionHost,

diff --git a/packages/devextreme-angular/src/ui/nested/tile.ts b/packages/devextreme-angular/src/ui/nested/tile.ts
@@ -14,8 +14,7 @@ import {
 
 
 
-import { TextOverflow, WordWrap } from 'devextreme/common/charts';
-import { Font } from 'devextreme/viz/core/base_widget';
+import { Font, TextOverflow, WordWrap } from 'devextreme/common/charts';
 
 import {
     NestedOptionHost,

diff --git a/packages/devextreme-angular/src/ui/nested/title.ts b/packages/devextreme-angular/src/ui/nested/title.ts
@@ -15,8 +15,7 @@ import {
 
 
 import { HorizontalAlignment, VerticalEdge } from 'devextreme/common';
-import { TextOverflow, WordWrap } from 'devextreme/common/charts';
-import { Font } from 'devextreme/viz/core/base_widget';
+import { Font, TextOverflow, WordWrap } from 'devextreme/common/charts';
 
 import {
     NestedOptionHost,

diff --git a/packages/devextreme-angular/src/ui/nested/tooltip.ts b/packages/devextreme-angular/src/ui/nested/tooltip.ts
@@ -15,11 +15,10 @@ import {
 
 
 import { TooltipShowMode, VerticalEdge } from 'devextreme/common';
-import { DashStyle } from 'devextreme/common/charts';
+import { DashStyle, Font } from 'devextreme/common/charts';
 import { UserDefinedElement } from 'devextreme/core/element';
 import { Format } from 'devextreme/localization';
 import { ChartTooltipLocation } from 'devextreme/viz/chart';
-import { Font } from 'devextreme/viz/core/base_widget';
 
 import {
     NestedOptionHost,