diff --git a/packages/devextreme/js/__internal/viz/axes/base_axis.ts b/packages/devextreme/js/__internal/viz/axes/base_axis.ts index 8b6331612a67..cf6872110784 100644 --- a/packages/devextreme/js/__internal/viz/axes/base_axis.ts +++ b/packages/devextreme/js/__internal/viz/axes/base_axis.ts @@ -41,7 +41,7 @@ import { tickGenerator } from '@ts/viz/axes/tick_generator'; import xyMethods from '@ts/viz/axes/xy_axes'; import { getParser } from '@ts/viz/components/parse_utils'; import type { ThemeValue } from '@ts/viz/core/base_theme_manager'; -import type { Bounds } from '@ts/viz/core/types'; +import type { BBox, Bounds, Coords } from '@ts/viz/core/types'; import { adjustVisualRange, @@ -604,7 +604,7 @@ export let Axis = class Axis { declare _getConstantLineLabelsCoords: ( value: number, labelOptions: ThemeValue, - ) => { x: number; y: number }; + ) => Coords; declare _getAdjustedStripLabelCoords: (strip: ThemeValue) => LabelTranslation; @@ -964,7 +964,7 @@ export let Axis = class Axis { _getStripGraphicAttributes( fromPoint: number, toPoint: number, - ): { x: number; y: number; width: number; height: number } { + ): BBox { let x; let y; let width; @@ -3391,7 +3391,7 @@ export let Axis = class Axis { measureLabels( canvas: ThemeValue, withIndents?: boolean, - ): { x: number; y: number; width: number; height: number } { + ): BBox { const options = this._options; const widthAxis = options.visible ? options.width : 0; let ticks; diff --git a/packages/devextreme/js/__internal/viz/axes/xy_axes.ts b/packages/devextreme/js/__internal/viz/axes/xy_axes.ts index d04713c2ff8e..75658d7e7359 100644 --- a/packages/devextreme/js/__internal/viz/axes/xy_axes.ts +++ b/packages/devextreme/js/__internal/viz/axes/xy_axes.ts @@ -177,8 +177,8 @@ function getRightMargin(bBox): number { function generateRangesOnPoints(points, edgePoints, getRange) { let i; let length; - let maxRange = null; - const ranges = []; + let maxRange: { start: number; end: number; length: number } | null = null; + const ranges: { start: number; end: number; length: number }[] = []; let curValue; let prevValue; let curRange; @@ -189,17 +189,13 @@ function generateRangesOnPoints(points, edgePoints, getRange) { curRange = getRange(curValue, prevValue); if (edgePoints.indexOf(curValue) >= 0) { - // @ts-expect-error if (!maxRange || curRange > maxRange.length) { - // @ts-expect-error maxRange = { start: curValue, end: prevValue, length: curRange }; } } else { - // @ts-expect-error if (maxRange && curRange < maxRange.length) { ranges.push(maxRange); } else { - // @ts-expect-error ranges.push({ start: curValue, end: prevValue, length: curRange }); } maxRange = null; @@ -239,11 +235,9 @@ function generateAutoBreaks( const ranges = generateRangesOnPoints(sortedAllPoints, edgePoints, getRange) .filter(({ length }) => !!length) - // @ts-expect-error .sort((a, b) => b.length - a.length); const epsilon = _math.min.apply( null, - // @ts-expect-error ranges.map((r) => r.length), ) / 1000; const _maxAutoBreakCount = isDefined(maxAutoBreakCount) @@ -251,13 +245,10 @@ function generateAutoBreaks( : ranges.length; for (let i = 0; i < _maxAutoBreakCount; i++) { - // @ts-expect-error if (ranges[i].length >= minDiff) { - // @ts-expect-error if (visibleRange <= ranges[i].length) { break; } - // @ts-expect-error visibleRange -= ranges[i].length; if (visibleRange > epsilon || visibleRange < -epsilon) { // @ts-expect-error diff --git a/packages/devextreme/js/__internal/viz/chart_components/advanced_chart.ts b/packages/devextreme/js/__internal/viz/chart_components/advanced_chart.ts index 86aaa0f95956..506eb73d595c 100644 --- a/packages/devextreme/js/__internal/viz/chart_components/advanced_chart.ts +++ b/packages/devextreme/js/__internal/viz/chart_components/advanced_chart.ts @@ -19,6 +19,7 @@ import { Axis } from '@ts/viz/axes/base_axis'; import type { ThemeValue } from '@ts/viz/core/base_theme_manager'; import { setupWidgetPrototype } from '@ts/viz/core/helpers'; import { SeriesFamily } from '@ts/viz/core/series_family'; +import type { Size } from '@ts/viz/core/types'; import { convertVisualRangeObject, map as _map, mergeMarginOptions, rangesAreEqual, setCanvasValues, unique, @@ -56,7 +57,7 @@ function processBubbleMargin(marginOptions, bubbleSize) { } function estimateBubbleSize( - size: { width: number; height: number }, + size: Size, panesCount: number, maxSize: number, rotated: boolean, diff --git a/packages/devextreme/js/__internal/viz/chart_components/layout_manager.ts b/packages/devextreme/js/__internal/viz/chart_components/layout_manager.ts index eaaf774d1e32..87c64c921a54 100644 --- a/packages/devextreme/js/__internal/viz/chart_components/layout_manager.ts +++ b/packages/devextreme/js/__internal/viz/chart_components/layout_manager.ts @@ -14,7 +14,7 @@ import { isNumeric as _isNumber } from '@ts/core/utils/type'; import consts from '@ts/viz/components/consts'; import type { ThemeValue } from '@ts/viz/core/base_theme_manager'; import { WrapperLayoutElement } from '@ts/viz/core/layout_element'; -import type { Canvas } from '@ts/viz/core/types'; +import type { Canvas, Size } from '@ts/viz/core/types'; const { floor, sqrt } = Math; const _min = Math.min; @@ -318,7 +318,7 @@ let LayoutManager = class LayoutManager { panes: ThemeValue[], rotated: boolean, fixedSizeCallback?: (pane: ThemeValue) => PaneFixedSize, - ): { width: number; height: number } | false { + ): Size | false { const options = this._options; const { width, height, piePercentage } = options; const percentageIsValid = _isNumber(piePercentage); diff --git a/packages/devextreme/js/__internal/viz/chart_components/rolling_stock.ts b/packages/devextreme/js/__internal/viz/chart_components/rolling_stock.ts index e9315c100b3b..58c60927dfba 100644 --- a/packages/devextreme/js/__internal/viz/chart_components/rolling_stock.ts +++ b/packages/devextreme/js/__internal/viz/chart_components/rolling_stock.ts @@ -1,8 +1,8 @@ -import type { BBox } from '@ts/viz/core/types'; +import type { BBox, Coords } from '@ts/viz/core/types'; interface RollingStockLabel { getBoundingRect: () => BBox; - hideInsideLabel: (coords: { x: number; y: number }) => boolean; + hideInsideLabel: (coords: Coords) => boolean; getData: () => { value: number | string | Date }; shift: (x: number, y: number) => void; } @@ -21,7 +21,7 @@ export class RollingStock { private readonly shiftFunction: ( bBox: BBox, shiftLength: number, - ) => { x: number; y: number }; + ) => Coords; private readonly initialPosition: number; @@ -30,7 +30,7 @@ export class RollingStock { constructor( label: RollingStockLabel, isRotated: boolean, - shiftFunction: (bBox: BBox, shiftLength: number) => { x: number; y: number }, + shiftFunction: (bBox: BBox, shiftLength: number) => Coords, ) { const bBox = label.getBoundingRect(); const { x } = bBox; diff --git a/packages/devextreme/js/__internal/viz/chart_components/scroll_bar.ts b/packages/devextreme/js/__internal/viz/chart_components/scroll_bar.ts index 43c5879fc1a5..3af1c5d94420 100644 --- a/packages/devextreme/js/__internal/viz/chart_components/scroll_bar.ts +++ b/packages/devextreme/js/__internal/viz/chart_components/scroll_bar.ts @@ -11,7 +11,7 @@ import eventsEngine from '@ts/events/core/events_engine'; import { end as dragEventEnd, move as dragEventMove, start as dragEventStart } from '@ts/events/drag'; import { fireEvent } from '@ts/events/utils/index'; import type { ThemeValue } from '@ts/viz/core/base_theme_manager'; -import type { Bounds, Canvas } from '@ts/viz/core/types'; +import type { Bounds, Canvas, Coords } from '@ts/viz/core/types'; import { Translator2D } from '../translators/translator2d'; @@ -29,7 +29,7 @@ interface ScrollBarLayoutOptions { } interface ScrollBarPointerEvent extends EngineEvent { - offset: { x: number; y: number }; + offset: Coords; } interface ScrollBarRange { @@ -41,7 +41,7 @@ interface ScrollBarDragEvent { type: string; originalEvent: ScrollBarPointerEvent; target: ThemeValue; - offset: { x: number; y: number }; + offset: Coords; scrollRange: ScrollBarRange | undefined; } diff --git a/packages/devextreme/js/__internal/viz/chart_components/zoom_and_pan.ts b/packages/devextreme/js/__internal/viz/chart_components/zoom_and_pan.ts index 04929e7267a2..cb9405b66e9e 100644 --- a/packages/devextreme/js/__internal/viz/chart_components/zoom_and_pan.ts +++ b/packages/devextreme/js/__internal/viz/chart_components/zoom_and_pan.ts @@ -298,7 +298,7 @@ export default { const rotated = chart.option('rotated'); const { actionData } = zoomAndPan; const { options } = zoomAndPan; - let zoomStarted = true; + let zoomStarted: boolean | number = true; if (actionData.fallback) { // @ts-expect-error @@ -311,7 +311,6 @@ export default { getFilteredAxes(axes).forEach((axis) => { axis.handleZooming(null, { start: true }, e, actionField); }); - // @ts-expect-error zoomStarted = axes.length; } zoomStarted && chart._requestChange(['VISUAL_RANGE']); diff --git a/packages/devextreme/js/__internal/viz/components/data_validator.ts b/packages/devextreme/js/__internal/viz/components/data_validator.ts index 3a0c6ecf8b17..b7bb938ab864 100644 --- a/packages/devextreme/js/__internal/viz/components/data_validator.ts +++ b/packages/devextreme/js/__internal/viz/components/data_validator.ts @@ -351,7 +351,10 @@ function sortData(data, groupsData, options, uniqueArgumentFields) { const userCategories = isDiscrete && groupsData.argumentOptions && groupsData.argumentOptions.categories; - let sortFunction = function (data) { return data; }; + let sortFunction: ( + data: unknown[], + argumentField?: string, + ) => unknown[] = function (data) { return data; }; const sortingMethodOption = options.sortingMethod; let reSortCategories; @@ -368,16 +371,13 @@ function sortData(data, groupsData, options, uniqueArgumentFields) { && groupsData.argumentType === STRING && !options._skipArgumentSorting) ) { - // @ts-expect-error sortFunction = getSortByCategories(groupsData.categories); } else if (sortingMethodOption === true && groupsData.argumentType !== STRING) { - // @ts-expect-error sortFunction = sortByArgument; reSortCategories = isDiscrete; } uniqueArgumentFields.forEach((field) => { - // @ts-expect-error dataByArguments[field] = sortFunction(data, field); }); diff --git a/packages/devextreme/js/__internal/viz/components/legend.ts b/packages/devextreme/js/__internal/viz/components/legend.ts index 252f4a7a7d9b..8ae574a6d3d8 100644 --- a/packages/devextreme/js/__internal/viz/components/legend.ts +++ b/packages/devextreme/js/__internal/viz/components/legend.ts @@ -34,7 +34,7 @@ import type { AlignedLayoutRect, LayoutAlignment } from '@ts/viz/core/layout_ele import { LayoutElement, WrapperLayoutElement } from '@ts/viz/core/layout_element'; import { getFuncIri, processHatchingAttrs } from '@ts/viz/core/renderers/renderer'; import { Title } from '@ts/viz/core/title'; -import type { BBox, Bounds } from '@ts/viz/core/types'; +import type { BBox, Bounds, Size } from '@ts/viz/core/types'; import { enumParser, normalizeEnum, patchFontOptions } from '@ts/viz/core/utils'; const _Number = Number; @@ -122,7 +122,7 @@ interface LegendItem extends CreatedLegendItem { markerBBox: BBox; markerSize: number; labelBBox: BBox; - bBox: { width: number; height: number }; + bBox: Size; } interface LegendLineItem { @@ -243,7 +243,7 @@ function getSizeItem( options: ThemeValue, markerBBox: BBox, labelBBox: BBox, -): { width: number; height: number } { +): Size { const defaultXMargin = 7; const defaultTopMargin = 4; let width; @@ -582,7 +582,7 @@ export let Legend = class Legend extends LayoutElement { declare _items: LegendItem[]; - declare _size: { width: number; height: number }; + declare _size: Size; declare _x1: number; diff --git a/packages/devextreme/js/__internal/viz/core/base_widget.ts b/packages/devextreme/js/__internal/viz/core/base_widget.ts index 0041b2077798..e484c7d5c7e3 100644 --- a/packages/devextreme/js/__internal/viz/core/base_widget.ts +++ b/packages/devextreme/js/__internal/viz/core/base_widget.ts @@ -37,7 +37,7 @@ import warnings from '@ts/viz/core/errors_warnings'; import { changes, isDisabledOnServer, replaceInherit } from '@ts/viz/core/helpers'; import _Layout from '@ts/viz/core/layout'; import { Renderer } from '@ts/viz/core/renderers/renderer'; -import type { Canvas } from '@ts/viz/core/types'; +import type { Canvas, Size } from '@ts/viz/core/types'; import { parseScalar as _parseScalar } from '@ts/viz/core/utils'; import { areCanvasesDifferent, floorCanvasDimensions } from '@ts/viz/utils'; @@ -776,7 +776,7 @@ class BaseWidget extends DOMComponent { return this._renderer.svg(); } - getSize(): { width: number; height: number } { + getSize(): Size { const canvas = this._canvas || {}; return { width: canvas.width, height: canvas.height }; } diff --git a/packages/devextreme/js/__internal/viz/core/loading_indicator.ts b/packages/devextreme/js/__internal/viz/core/loading_indicator.ts index 99c7ccdc2ed3..9a68ea1b2905 100644 --- a/packages/devextreme/js/__internal/viz/core/loading_indicator.ts +++ b/packages/devextreme/js/__internal/viz/core/loading_indicator.ts @@ -10,6 +10,8 @@ /* eslint-disable @typescript-eslint/no-use-before-define */ /* eslint-disable @typescript-eslint/prefer-optional-chain */ +import type { Size } from '@ts/viz/core/types'; + import type { ThemeValue } from './base_theme_manager'; import { patchFontOptions as _patchFontOptions } from './utils'; @@ -90,7 +92,7 @@ export let LoadingIndicator = class LoadingIndicator { this._state = STATE_HIDDEN; } - setSize(size: { width: number; height: number }): void { + setSize(size: Size): void { const { width, height } = size; this._rect.attr({ width, height }); this._text.attr({ x: width / 2, y: height / 2 }); diff --git a/packages/devextreme/js/__internal/viz/funnel/funnel.ts b/packages/devextreme/js/__internal/viz/funnel/funnel.ts index 8216956bcc53..b7e737e26424 100644 --- a/packages/devextreme/js/__internal/viz/funnel/funnel.ts +++ b/packages/devextreme/js/__internal/viz/funnel/funnel.ts @@ -7,6 +7,7 @@ import BaseWidget from '@ts/viz/core/base_widget'; import type { DataSourcePluginMembers } from '@ts/viz/core/data_source'; import { plugin } from '@ts/viz/core/data_source'; import { setupWidgetPrototype } from '@ts/viz/core/helpers'; +import type { Size } from '@ts/viz/core/types'; import Item from './item'; import { addAlgorithm, getAlgorithm } from './tiling'; @@ -56,7 +57,7 @@ class Funnel extends BaseWidget { _proxyData!: HitTestCallback[]; - _getDefaultSize(): { width: number; height: number } { + _getDefaultSize(): Size { return { width: 400, height: 400 }; } @@ -264,7 +265,7 @@ class Funnel extends BaseWidget { } _getMinSize(): number[] { - const adaptiveLayout: { width: number; height: number } = this._getOption('adaptiveLayout'); + const adaptiveLayout: Size = this._getOption('adaptiveLayout'); return [adaptiveLayout.width, adaptiveLayout.height]; } diff --git a/packages/devextreme/js/__internal/viz/funnel/label.ts b/packages/devextreme/js/__internal/viz/funnel/label.ts index 48a700d0abc7..53952bb9ad59 100644 --- a/packages/devextreme/js/__internal/viz/funnel/label.ts +++ b/packages/devextreme/js/__internal/viz/funnel/label.ts @@ -11,7 +11,8 @@ import { noop } from '@ts/core/utils/common'; import { extend } from '@ts/core/utils/extend'; -import type { Coords } from '@ts/viz/core/types'; +import type { ThemeValue } from '@ts/viz/core/base_theme_manager'; +import type { BBox, Coords } from '@ts/viz/core/types'; import { normalizeEnum } from '@ts/viz/core/utils'; import { Label } from '@ts/viz/series/points/label'; @@ -258,17 +259,20 @@ export const plugin = { _change_TILING(): void { const that = this; const options = that._getOption('label'); - let getCoords = getInsideLabelPosition; + let getCoords: ( + coords: Coords, + bBox: BBox, + options: ThemeValue, + inverted?: boolean, + ) => Coords = getInsideLabelPosition; const inverted = that._getOption('inverted', true); let textAlignment; if (isOutsidePosition(options.position)) { if (normalizeEnum(options.position) === OUTSIDE_POSITION) { - // @ts-expect-error getCoords = options.horizontalAlignment === 'left' ? getOutsideLeftLabelPosition : getOutsideRightLabelPosition; } else { textAlignment = this._defaultLabelTextAlignment(); - // @ts-expect-error getCoords = options.horizontalAlignment === 'left' ? getColumnLabelLeftPosition(this._labelRect, this._rect, textAlignment) : getColumnLabelRightPosition(this._labelRect, this._rect, textAlignment); } } @@ -298,7 +302,6 @@ export const plugin = { const bBox = label.getBoundingRect(); const pos = correctLabelPosition( - // @ts-expect-error getCoords(coords, bBox, options, inverted), bBox, that._labelRect, diff --git a/packages/devextreme/js/__internal/viz/gauges/bar_gauge.ts b/packages/devextreme/js/__internal/viz/gauges/bar_gauge.ts index 55bcf7eacc53..e86267aaf90b 100644 --- a/packages/devextreme/js/__internal/viz/gauges/bar_gauge.ts +++ b/packages/devextreme/js/__internal/viz/gauges/bar_gauge.ts @@ -9,7 +9,7 @@ import { plugin as pluginLegend } from '@ts/viz/components/legend'; import type { ThemeValue } from '@ts/viz/core/base_theme_manager'; import { plugins as centerTemplatePlugins } from '@ts/viz/core/center_template'; import { setupWidgetPrototype } from '@ts/viz/core/helpers'; -import type { Coords } from '@ts/viz/core/types'; +import type { Coords, Size } from '@ts/viz/core/types'; import { convertAngleToRendererSpace, getCosAndSin, @@ -463,7 +463,7 @@ class BarGauge extends BaseGauge { this._baseValue = isFinite(baseValue) ? baseValue : domainMin; } - _getDefaultSize(): { width: number; height: number } { + _getDefaultSize(): Size { return { width: 300, height: 300 }; } diff --git a/packages/devextreme/js/__internal/viz/gauges/circular_gauge.ts b/packages/devextreme/js/__internal/viz/gauges/circular_gauge.ts index 537d83391bec..6fafea72c858 100644 --- a/packages/devextreme/js/__internal/viz/gauges/circular_gauge.ts +++ b/packages/devextreme/js/__internal/viz/gauges/circular_gauge.ts @@ -5,7 +5,7 @@ import { clone } from '@ts/core/utils/object'; import type { ThemeValue } from '@ts/viz/core/base_theme_manager'; import { plugins as centerTemplatePlugins } from '@ts/viz/core/center_template'; import { setupWidgetPrototype } from '@ts/viz/core/helpers'; -import type { Bounds } from '@ts/viz/core/types'; +import type { Bounds, Size } from '@ts/viz/core/types'; import { getCosAndSin, normalizeAngle } from '@ts/viz/core/utils'; import { BaseGauge } from '@ts/viz/gauges/base_gauge'; import * as circularIndicators from '@ts/viz/gauges/circular_indicators'; @@ -377,7 +377,7 @@ class CircularGauge extends dxGauge { return (-this._translator.getCodomainRange() * r * PI) / 180; } - _getDefaultSize(): { width: number; height: number } { + _getDefaultSize(): Size { return { width: 300, height: 300 }; } } diff --git a/packages/devextreme/js/__internal/viz/gauges/linear_gauge.ts b/packages/devextreme/js/__internal/viz/gauges/linear_gauge.ts index f37030d8b70b..2949f117a391 100644 --- a/packages/devextreme/js/__internal/viz/gauges/linear_gauge.ts +++ b/packages/devextreme/js/__internal/viz/gauges/linear_gauge.ts @@ -4,7 +4,7 @@ import { each } from '@ts/core/utils/iterator'; import { clone } from '@ts/core/utils/object'; import type { ThemeValue } from '@ts/viz/core/base_theme_manager'; import { setupWidgetPrototype } from '@ts/viz/core/helpers'; -import type { Bounds } from '@ts/viz/core/types'; +import type { Bounds, Size } from '@ts/viz/core/types'; import { normalizeEnum } from '@ts/viz/core/utils'; import { BaseGauge } from '@ts/viz/gauges/base_gauge'; import type { ScaleMeasure, TicksCoefficients } from '@ts/viz/gauges/common'; @@ -266,7 +266,7 @@ class LinearGauge extends dxGauge { return s; } - _getDefaultSize(): { width: number; height: number } { + _getDefaultSize(): Size { const geometry = this.option('geometry') || {}; if (geometry.orientation === 'vertical') { return { width: 100, height: 300 }; diff --git a/packages/devextreme/js/__internal/viz/range_selector/range_selector.ts b/packages/devextreme/js/__internal/viz/range_selector/range_selector.ts index f9445edf9555..b1a514462147 100644 --- a/packages/devextreme/js/__internal/viz/range_selector/range_selector.ts +++ b/packages/devextreme/js/__internal/viz/range_selector/range_selector.ts @@ -24,7 +24,7 @@ import { plugin as exportPlugin } from '@ts/viz/core/export'; import { setupWidgetPrototype } from '@ts/viz/core/helpers'; import { plugin as LoadingIndicatorPlugin } from '@ts/viz/core/loading_indicator'; import { plugin as titlePlugin } from '@ts/viz/core/title'; -import type { Bounds } from '@ts/viz/core/types'; +import type { Bounds, Size } from '@ts/viz/core/types'; import { convertVisualRangeObject, getCategoriesInfo, @@ -1004,7 +1004,7 @@ class RangeSelector extends BaseWidget { return this._dataIsLoaded(); } - _getDefaultSize(): { width: number; height: number } { + _getDefaultSize(): Size { return { width: 400, height: 160, }; diff --git a/packages/devextreme/js/__internal/viz/range_selector/series_data_source.ts b/packages/devextreme/js/__internal/viz/range_selector/series_data_source.ts index 83a1012d9d1f..b615bd1c8748 100644 --- a/packages/devextreme/js/__internal/viz/range_selector/series_data_source.ts +++ b/packages/devextreme/js/__internal/viz/range_selector/series_data_source.ts @@ -11,6 +11,7 @@ import { ThemeManager as ChartThemeManager } from '@ts/viz/components/chart_them import { validateData } from '@ts/viz/components/data_validator'; import type { ThemeValue } from '@ts/viz/core/base_theme_manager'; import { SeriesFamily } from '@ts/viz/core/series_family'; +import type { Size } from '@ts/viz/core/types'; import { mergeMarginOptions, processSeriesTemplate } from '@ts/viz/core/utils'; import { Series } from '@ts/viz/series/base_series'; import { Range } from '@ts/viz/translators/range'; @@ -287,7 +288,7 @@ export let SeriesDataSource = class SeriesDataSource { return { arg: argRange, val: valRange }; } - getMarginOptions(canvas: { width: number; height: number }): ThemeValue { + getMarginOptions(canvas: Size): ThemeValue { const bubbleSize = Math.min(canvas.width, canvas.height) * this._themeManager.getOptions('maxBubbleSize'); return this._series.reduce((marginOptions, series) => { diff --git a/packages/devextreme/js/__internal/viz/sankey/link_item.ts b/packages/devextreme/js/__internal/viz/sankey/link_item.ts index 3cdc473c51c2..e3c2331e8fff 100644 --- a/packages/devextreme/js/__internal/viz/sankey/link_item.ts +++ b/packages/devextreme/js/__internal/viz/sankey/link_item.ts @@ -4,7 +4,7 @@ import { isDefined } from '@ts/core/utils/type'; import type { ThemeValue } from '@ts/viz/core/base_theme_manager'; -import type { BBox } from '@ts/viz/core/types'; +import type { BBox, Coords } from '@ts/viz/core/types'; import { COLOR_MODE_GRADIENT, COLOR_MODE_SOURCE, COLOR_MODE_TARGET } from '@ts/viz/sankey/constants'; const states = ['normal', 'adjacentNodeHover', 'hover']; @@ -29,7 +29,7 @@ interface LinkConnection { interface LinkWidget { _renderer: { getRootOffset: () => { left: number; top: number } }; _tooltip?: { - show: (target: ThemeValue, coords: { x: number; y: number }) => void; + show: (target: ThemeValue, coords: Coords) => void; hide: () => void; }; _getOption: (name: string, isScalar?: boolean) => ThemeValue; @@ -109,7 +109,7 @@ class Link { declare boundingRect: BBox; - declare coords: { x: number; y: number }; + declare coords: Coords; declare states: LinkStates; diff --git a/packages/devextreme/js/__internal/viz/sankey/node_item.ts b/packages/devextreme/js/__internal/viz/sankey/node_item.ts index b4e8018ae62e..c923a827703c 100644 --- a/packages/devextreme/js/__internal/viz/sankey/node_item.ts +++ b/packages/devextreme/js/__internal/viz/sankey/node_item.ts @@ -6,6 +6,7 @@ import { isDefined } from '@ts/core/utils/type'; import type { ThemeValue } from '@ts/viz/core/base_theme_manager'; +import type { Coords } from '@ts/viz/core/types'; import { patchFontOptions } from '@ts/viz/core/utils'; import type Link from '@ts/viz/sankey/link_item'; @@ -36,7 +37,7 @@ interface NodeLayoutLink { interface NodeWidget { _renderer: { getRootOffset: () => { left: number; top: number } }; _tooltip?: { - show: (target: ThemeValue, coords: { x: number; y: number }) => void; + show: (target: ThemeValue, coords: Coords) => void; hide: () => void; }; _links: Link[]; @@ -136,7 +137,7 @@ class Node { declare label: string; - declare coords: { x: number; y: number }; + declare coords: Coords; declare id: number; diff --git a/packages/devextreme/js/__internal/viz/sankey/sankey.ts b/packages/devextreme/js/__internal/viz/sankey/sankey.ts index 53db3fb94d96..fdd993d82011 100644 --- a/packages/devextreme/js/__internal/viz/sankey/sankey.ts +++ b/packages/devextreme/js/__internal/viz/sankey/sankey.ts @@ -8,6 +8,7 @@ import BaseWidget from '@ts/viz/core/base_widget'; import type { DataSourcePluginMembers } from '@ts/viz/core/data_source'; import { plugin as pluginDataSource } from '@ts/viz/core/data_source'; import { setupWidgetPrototype } from '@ts/viz/core/helpers'; +import type { Size } from '@ts/viz/core/types'; import { COLOR_MODE_GRADIENT, COLOR_MODE_SOURCE, COLOR_MODE_TARGET } from '@ts/viz/sankey/constants'; import { layout as defaultLayoutBuilder } from '@ts/viz/sankey/layout'; import Link from '@ts/viz/sankey/link_item'; @@ -101,7 +102,7 @@ class Sankey extends BaseWidget { _proxyData!: HitTestCallback[]; - _getDefaultSize(): { width: number; height: number } { + _getDefaultSize(): Size { return { width: 400, height: 400 }; } @@ -417,7 +418,7 @@ class Sankey extends BaseWidget { } _getMinSize(): number[] { - const adaptiveLayout: { width: number; height: number } = this._getOption('adaptiveLayout'); + const adaptiveLayout: Size = this._getOption('adaptiveLayout'); return [adaptiveLayout.width, adaptiveLayout.height]; } diff --git a/packages/devextreme/js/__internal/viz/series/bar_series.ts b/packages/devextreme/js/__internal/viz/series/bar_series.ts index 1eee5e6172c1..43b61a8857e1 100644 --- a/packages/devextreme/js/__internal/viz/series/bar_series.ts +++ b/packages/devextreme/js/__internal/viz/series/bar_series.ts @@ -14,6 +14,7 @@ import { extend } from '@ts/core/utils/extend'; import { each } from '@ts/core/utils/iterator'; import { isDefined as _isDefined } from '@ts/core/utils/type'; +import type { Coords } from '@ts/viz/core/types'; import { convertPolarToXY, extractColor } from '@ts/viz/core/utils'; import { chart as areaChart } from './area_series'; @@ -251,7 +252,7 @@ polar.bar = _extend({}, polarSeries, baseBarSeriesMethods, { }, getSeriesPairCoord(params, isArgument) { - let coords = null; + let coords: Coords | null = null; const paramName = isArgument ? 'argument' : 'radius'; const points = this.getVisiblePoints(); const argAxis = this.getArgumentAxis(); @@ -271,7 +272,6 @@ polar.bar = _extend({}, polarSeries, baseBarSeriesMethods, { : undefined; if (_isDefined(tmpPoint)) { - // @ts-expect-error coords = tmpPoint; break; } diff --git a/packages/devextreme/js/__internal/viz/series/line_series.ts b/packages/devextreme/js/__internal/viz/series/line_series.ts index 60be82e002c2..ba67bfb29e7d 100644 --- a/packages/devextreme/js/__internal/viz/series/line_series.ts +++ b/packages/devextreme/js/__internal/viz/series/line_series.ts @@ -19,6 +19,7 @@ import { extend } from '@ts/core/utils/extend'; import { each } from '@ts/core/utils/iterator'; import { solveCubicEquation, trunc } from '@ts/core/utils/math'; import { clone } from '@ts/core/utils/object'; +import type { ThemeValue } from '@ts/viz/core/base_theme_manager'; import { extractColor, getCosAndSin, @@ -460,7 +461,7 @@ chart.spline = extend({}, lineSeries, { getSeriesPairCoord(coord, isArgument) { const that = this; - let oppositeCoord = null; + let oppositeCoord: number | null = null; const isOpposite = !isArgument && !this._options.rotated || isArgument && this._options.rotated; const coordName = !isOpposite ? 'vx' : 'vy'; const bezierCoordName = !isOpposite ? 'x' : 'y'; @@ -492,7 +493,6 @@ chart.spline = extend({}, lineSeries, { + 3 * (1 - t) * t * t * p[2][bezierOppositeCoordName] + t * t * t * p[3][oppositeCoordName]; if (visibleArea[0] <= tmpCoord && visibleArea[1] >= tmpCoord) { - // @ts-expect-error oppositeCoord = tmpCoord; } } @@ -575,24 +575,21 @@ polar.line = extend({}, polarScatterSeries, lineMethods, { }, _getTangentPoints(point, prevPoint, centerPoint, isLastSegment) { - let tangentPoints = []; + let tangentPoints: ThemeValue[] = []; const betweenAngle = Math.round(prevPoint.angle - point.angle); const tan = (prevPoint.radius - point.radius) / betweenAngle; let i; if (betweenAngle === 0) { - // @ts-expect-error tangentPoints = [prevPoint, point]; } else if (betweenAngle > 0) { const angle = isLastSegment ? betweenAngle : betweenAngle - 1; for (i = angle; i >= 0; i--) { - // @ts-expect-error tangentPoints.push(getTangentPoint(point, prevPoint, centerPoint, tan, i)); } } else { const angle = isLastSegment ? betweenAngle : betweenAngle + 1; for (i = 0; i >= angle; i--) { - // @ts-expect-error tangentPoints.push(getTangentPoint(point, prevPoint, centerPoint, tan, betweenAngle - i)); } } diff --git a/packages/devextreme/js/__internal/viz/series/scatter_series.ts b/packages/devextreme/js/__internal/viz/series/scatter_series.ts index 48c91b1894b7..25fbcb24400d 100644 --- a/packages/devextreme/js/__internal/viz/series/scatter_series.ts +++ b/packages/devextreme/js/__internal/viz/series/scatter_series.ts @@ -27,6 +27,7 @@ import { noop as _noop } from '@ts/core/utils/common'; import { extend as _extend } from '@ts/core/utils/extend'; import { each as _each } from '@ts/core/utils/iterator'; import { isDefined as _isDefined, isString as _isString } from '@ts/core/utils/type'; +import type { Coords } from '@ts/viz/core/types'; import { convertXYToPolar, extractColor, map as _map, normalizeEnum as _normalizeEnum, } from '@ts/viz/core/utils'; @@ -864,7 +865,7 @@ polar = _extend({}, baseScatterMethods, { }, getSeriesPairCoord(params, isArgument) { - let coords = null; + let coords: Coords | null = null; const paramName = isArgument ? 'argument' : 'radius'; const points = this.getVisiblePoints(); @@ -877,7 +878,6 @@ polar = _extend({}, baseScatterMethods, { : undefined; if (_isDefined(tmpPoint)) { - // @ts-expect-error coords = tmpPoint; break; } diff --git a/packages/devextreme/js/__internal/viz/sparklines/bullet.ts b/packages/devextreme/js/__internal/viz/sparklines/bullet.ts index 89b0d4f068ed..dd7a6cab6e7d 100644 --- a/packages/devextreme/js/__internal/viz/sparklines/bullet.ts +++ b/packages/devextreme/js/__internal/viz/sparklines/bullet.ts @@ -1,6 +1,7 @@ import { registerComponent as componentRegistrator } from '@ts/core/component_registrator'; import type { ThemeValue } from '@ts/viz/core/base_theme_manager'; import { setupWidgetPrototype } from '@ts/viz/core/helpers'; +import type { Coords } from '@ts/viz/core/types'; import BaseSparkline from '@ts/viz/sparklines/base_sparkline'; const TARGET_MIN_Y = 0.02; @@ -223,7 +224,7 @@ class Bullet extends BaseSparkline { this._barValuePath.attr(this._getBarValueParams()).append(this._renderer.root); } - _getTooltipCoords(): { x: number; y: number } { + _getTooltipCoords(): Coords { const canvas = this._canvas; const rootOffset = this._renderer.getRootOffset(); const bBox = this._barValuePath.getBBox(); diff --git a/packages/devextreme/js/__internal/viz/tree_map/tree_map.base.ts b/packages/devextreme/js/__internal/viz/tree_map/tree_map.base.ts index 3ac9b616d747..1312d7792fbf 100644 --- a/packages/devextreme/js/__internal/viz/tree_map/tree_map.base.ts +++ b/packages/devextreme/js/__internal/viz/tree_map/tree_map.base.ts @@ -11,6 +11,7 @@ import BaseWidget from '@ts/viz/core/base_widget'; import type { DataSourcePluginMembers } from '@ts/viz/core/data_source'; import { plugin } from '@ts/viz/core/data_source'; import { setupWidgetPrototype } from '@ts/viz/core/helpers'; +import type { Size } from '@ts/viz/core/types'; import { patchFontOptions } from '@ts/viz/core/utils'; import { getColorizer, setDefaultColorizer } from '@ts/viz/tree_map/colorizing'; import { buildRectAppearance, buildTextAppearance } from '@ts/viz/tree_map/common'; @@ -313,7 +314,7 @@ class TreeMapBase extends BaseWidget { _isSyncData?: boolean; - _getDefaultSize(): { width: number; height: number } { + _getDefaultSize(): Size { return { width: 400, height: 400 }; } diff --git a/packages/devextreme/js/__internal/viz/vector_map/control_bar/control_bar.ts b/packages/devextreme/js/__internal/viz/vector_map/control_bar/control_bar.ts index 6de5ee072d6d..3725c2fc0a9f 100644 --- a/packages/devextreme/js/__internal/viz/vector_map/control_bar/control_bar.ts +++ b/packages/devextreme/js/__internal/viz/vector_map/control_bar/control_bar.ts @@ -17,6 +17,7 @@ /* eslint-disable max-classes-per-file */ import type { ThemeValue } from '@ts/viz/core/base_theme_manager'; +import type { Size } from '@ts/viz/core/types'; import { enumParser, parseScalar as _parseScalar } from '@ts/viz/core/utils'; import { createTracker, createVisibilityGroup, toggleDisplay } from '@ts/viz/vector_map/control_bar/utils'; @@ -407,7 +408,7 @@ export let ControlBar = class ControlBar { } // BEGIN: Implementation of LayoutTarget interface - resize(size: { width: number; height: number } | null): void { + resize(size: Size | null): void { if (this._isActive) { this._root.attr({ visibility: size !== null ? null : 'hidden' }); } diff --git a/packages/devextreme/js/__internal/viz/vector_map/legend.ts b/packages/devextreme/js/__internal/viz/vector_map/legend.ts index bcd32da2d1a5..676d31807ece 100644 --- a/packages/devextreme/js/__internal/viz/vector_map/legend.ts +++ b/packages/devextreme/js/__internal/viz/vector_map/legend.ts @@ -14,6 +14,7 @@ import { each } from '@ts/core/utils/iterator'; import type { LegendDataItem } from '@ts/viz/components/legend'; import { Legend as _BaseLegend } from '@ts/viz/components/legend'; import type { ThemeValue } from '@ts/viz/core/base_theme_manager'; +import type { Size } from '@ts/viz/core/types'; const _extend = extend; const _each = each; @@ -114,7 +115,7 @@ let Legend = class Legend extends _BaseLegend { } // This method is called only by the layout - resize(size: { width: number; height: number } | null): void { + resize(size: Size | null): void { this._params.notifyDirty(); if (size === null) { this.erase(); diff --git a/packages/devextreme/js/__internal/viz/vector_map/vector_map.ts b/packages/devextreme/js/__internal/viz/vector_map/vector_map.ts index 816ce4680c38..ff6069d99d96 100644 --- a/packages/devextreme/js/__internal/viz/vector_map/vector_map.ts +++ b/packages/devextreme/js/__internal/viz/vector_map/vector_map.ts @@ -13,7 +13,7 @@ import { plugin as LoadingIndicatorPlugin } from '@ts/viz/core/loading_indicator import { plugin as TitlePlugin } from '@ts/viz/core/title'; import type { TooltipPluginMembers } from '@ts/viz/core/tooltip'; import { plugin as TooltipPlugin } from '@ts/viz/core/tooltip'; -import type { Canvas } from '@ts/viz/core/types'; +import type { Canvas, Size } from '@ts/viz/core/types'; import { parseScalar } from '@ts/viz/core/utils'; import { ControlBar } from '@ts/viz/vector_map/control_bar/control_bar'; import { DataExchanger } from '@ts/viz/vector_map/data_exchanger'; @@ -69,7 +69,7 @@ class VectorMap extends BaseWidget { _notifyReady!: () => void; - _getDefaultSize(): { width: number; height: number } { + _getDefaultSize(): Size { return { width: DEFAULT_WIDTH, height: DEFAULT_HEIGHT }; }