From 6d6963023d1d507f1a5691ee653a606dc73c58d9 Mon Sep 17 00:00:00 2001 From: EugeniyKiyashko Date: Wed, 18 Nov 2026 01:53:00 +0400 Subject: [PATCH 1/3] Viz: add explicit return types where TypeScript infers a concrete type Writes out the inferred return type (void, primitives, named and object types) of 880 functions in js/__internal/viz. Functions whose inferred type is any, never[], {} or unknown are left for typing by hand. Removes the explicit-function-return-type disable from the 13 files that are now clean, and four explicit-module-boundary-types disables that became unused. Exports the DatesDifferences and SvgDomElement interfaces for the new annotations. Emitted JS is unchanged. --- .../js/__internal/core/utils/date.ts | 2 +- .../js/__internal/viz/axes/axes_constants.ts | 4 +- .../js/__internal/viz/axes/axes_utils.ts | 2 +- .../js/__internal/viz/axes/constant_line.ts | 8 +- .../js/__internal/viz/axes/datetime_breaks.ts | 14 +- .../js/__internal/viz/axes/polar_axes.ts | 54 +++--- .../js/__internal/viz/axes/smart_formatter.ts | 23 +-- .../js/__internal/viz/axes/strip.ts | 10 +- .../devextreme/js/__internal/viz/axes/tick.ts | 36 ++-- .../js/__internal/viz/axes/tick_generator.ts | 65 ++++--- .../js/__internal/viz/axes/xy_axes.ts | 83 ++++----- .../devextreme/js/__internal/viz/chart.ts | 50 +++--- .../viz/chart_components/advanced_chart.ts | 6 +- .../viz/chart_components/base_chart.ts | 166 +++++++++--------- .../multi_axes_synchronizer.ts | 26 +-- .../viz/chart_components/shutter_zoom.ts | 21 ++- .../viz/chart_components/tracker.ts | 106 +++++------ .../viz/chart_components/zoom_and_pan.ts | 61 ++++--- .../viz/components/data_validator.ts | 32 ++-- .../__internal/viz/components/parse_utils.ts | 4 +- .../js/__internal/viz/core/annotations.ts | 70 ++++---- .../js/__internal/viz/core/base_widget.ts | 6 +- .../__internal/viz/core/base_widget.utils.ts | 27 +-- .../js/__internal/viz/core/center_template.ts | 19 +- .../js/__internal/viz/core/data_source.ts | 8 +- .../js/__internal/viz/core/export.ts | 59 ++++--- .../js/__internal/viz/core/helpers.ts | 20 +-- .../__internal/viz/core/loading_indicator.ts | 31 ++-- .../js/__internal/viz/core/plaque.ts | 26 +-- .../__internal/viz/core/renderers/renderer.ts | 2 +- .../js/__internal/viz/core/tooltip.ts | 23 ++- .../js/__internal/viz/core/utils.ts | 47 ++--- .../js/__internal/viz/funnel/label.ts | 30 ++-- .../js/__internal/viz/funnel/tiling.ts | 2 +- .../js/__internal/viz/funnel/tooltip.ts | 14 +- .../js/__internal/viz/funnel/tracker.ts | 11 +- .../devextreme/js/__internal/viz/palette.ts | 24 +-- .../devextreme/js/__internal/viz/pie_chart.ts | 49 +++--- .../__internal/viz/range_selector/common.ts | 6 +- .../__internal/viz/sankey/data_validator.ts | 2 +- .../js/__internal/viz/sankey/graph.ts | 4 +- .../js/__internal/viz/sankey/layout.ts | 18 +- .../js/__internal/viz/sankey/tooltip.ts | 10 +- .../js/__internal/viz/sankey/tracker.ts | 11 +- .../js/__internal/viz/series/area_series.ts | 6 +- .../js/__internal/viz/series/bar_series.ts | 18 +- .../js/__internal/viz/series/bubble_series.ts | 2 +- .../series/helpers/range_data_calculator.ts | 26 +-- .../js/__internal/viz/series/line_series.ts | 36 ++-- .../js/__internal/viz/series/pie_series.ts | 7 +- .../__internal/viz/series/points/bar_point.ts | 5 +- .../viz/series/points/symbol_point.ts | 66 +++---- .../js/__internal/viz/series/range_series.ts | 2 +- .../__internal/viz/series/scatter_series.ts | 54 +++--- .../__internal/viz/series/stacked_series.ts | 2 +- .../devextreme/js/__internal/viz/themes.ts | 20 +-- .../viz/translators/category_translator.ts | 14 +- .../viz/translators/interval_translator.ts | 14 +- .../viz/translators/logarithmic_translator.ts | 2 +- .../js/__internal/viz/tree_map/api.ts | 20 +-- .../viz/tree_map/colorizing.discrete.ts | 4 +- .../viz/tree_map/colorizing.gradient.ts | 4 +- .../viz/tree_map/colorizing.range.ts | 2 +- .../js/__internal/viz/tree_map/colorizing.ts | 6 +- .../js/__internal/viz/tree_map/drilldown.ts | 4 +- .../js/__internal/viz/tree_map/hover.ts | 13 +- .../viz/tree_map/plain_data_source.ts | 2 +- .../js/__internal/viz/tree_map/selection.ts | 14 +- .../js/__internal/viz/tree_map/states.ts | 4 +- .../viz/tree_map/tiling.slice_and_dice.ts | 3 +- .../viz/tree_map/tiling.squarified.base.ts | 14 +- .../viz/tree_map/tiling.squarified.ts | 5 +- .../__internal/viz/tree_map/tiling.strip.ts | 5 +- .../js/__internal/viz/tree_map/tiling.ts | 8 +- .../js/__internal/viz/tree_map/tooltip.ts | 10 +- .../js/__internal/viz/tree_map/tracker.ts | 6 +- .../devextreme/js/__internal/viz/utils.ts | 4 +- .../viz/vector_map/control_bar/utils.ts | 2 +- .../viz/vector_map/event_emitter.ts | 13 +- .../js/__internal/viz/vector_map/map_layer.ts | 130 +++++++------- .../viz/vector_map/projection.main.ts | 4 +- .../__internal/viz/vector_map/projection.ts | 3 +- .../viz/vector_map/vector_map.utils.ts | 6 +- 83 files changed, 953 insertions(+), 899 deletions(-) diff --git a/packages/devextreme/js/__internal/core/utils/date.ts b/packages/devextreme/js/__internal/core/utils/date.ts index 00869083d2e8..2ac1b91b4640 100644 --- a/packages/devextreme/js/__internal/core/utils/date.ts +++ b/packages/devextreme/js/__internal/core/utils/date.ts @@ -14,7 +14,7 @@ type DateView = 'month' | 'year' | 'decade' | 'century'; type DateUnitSource = TimeIntervalConfig | Partial>; -interface DatesDifferences { +export interface DatesDifferences { year: boolean; month: boolean; day: boolean; diff --git a/packages/devextreme/js/__internal/viz/axes/axes_constants.ts b/packages/devextreme/js/__internal/viz/axes/axes_constants.ts index 27b28c69302e..08f91eae6c3b 100644 --- a/packages/devextreme/js/__internal/viz/axes/axes_constants.ts +++ b/packages/devextreme/js/__internal/viz/axes/axes_constants.ts @@ -27,7 +27,7 @@ export default { return mode === 'ignore' || mode === 'none' ? mode : 'hide'; }, - getTicksCountInRange(ticks, valueKey, range) { + getTicksCountInRange(ticks, valueKey, range): number { let i = 1; if (ticks.length > 1) { @@ -40,7 +40,7 @@ export default { return i; }, - areLabelsOverlap(bBox1, bBox2, spacing, alignment) { + areLabelsOverlap(bBox1, bBox2, spacing, alignment): boolean { const horizontalInverted = bBox1.x > bBox2.x; const verticalInverted = bBox1.y > bBox2.y; let x1 = bBox1.x; diff --git a/packages/devextreme/js/__internal/viz/axes/axes_utils.ts b/packages/devextreme/js/__internal/viz/axes/axes_utils.ts index 86c79fecd965..60ce931a7b0a 100644 --- a/packages/devextreme/js/__internal/viz/axes/axes_utils.ts +++ b/packages/devextreme/js/__internal/viz/axes/axes_utils.ts @@ -30,7 +30,7 @@ export const calculateCanvasMargins = function (bBoxes, canvas) { }); }; -export const measureLabels = function (items) { +export const measureLabels = function (items): void { items.forEach((item) => { const label = item.getContentContainer(); item.labelBBox = label ? label.getBBox() : { diff --git a/packages/devextreme/js/__internal/viz/axes/constant_line.ts b/packages/devextreme/js/__internal/viz/axes/constant_line.ts index 156c4224d84a..13155d953ef3 100644 --- a/packages/devextreme/js/__internal/viz/axes/constant_line.ts +++ b/packages/devextreme/js/__internal/viz/axes/constant_line.ts @@ -85,11 +85,11 @@ export default function createConstantLine(axis, options) { return this.label; }, - removeLabel() { + removeLabel(): void { this.label && this.label.remove(); }, - updatePosition(animate) { + updatePosition(animate): void { const canvas = axis._getCanvasStartEnd(); const coord = axis._getConstantLinePos(this.getParsedValue(), canvas.start, canvas.end); @@ -115,12 +115,12 @@ export default function createConstantLine(axis, options) { } }, - saveCoords() { + saveCoords(): void { lastStoredCoordinates = storedCoord; storedCoord = this.coord; }, - resetCoordinates() { + resetCoordinates(): void { storedCoord = lastStoredCoordinates; }, }; diff --git a/packages/devextreme/js/__internal/viz/axes/datetime_breaks.ts b/packages/devextreme/js/__internal/viz/axes/datetime_breaks.ts index d44fb2766af0..57c91978032d 100644 --- a/packages/devextreme/js/__internal/viz/axes/datetime_breaks.ts +++ b/packages/devextreme/js/__internal/viz/axes/datetime_breaks.ts @@ -12,15 +12,15 @@ import { dateUtils } from '@ts/core/utils/date'; const days = [0, 1, 2, 3, 4, 5, 6]; -function getWeekendDays(workdays) { +function getWeekendDays(workdays): number[] { return days.filter((day) => !workdays.some((workDay) => workDay === day)); } -function getNextDayIndex(dayIndex) { +function getNextDayIndex(dayIndex): number { return (dayIndex + 1) % 7; } -function dayBetweenWeekend(weekend, day) { +function dayBetweenWeekend(weekend, day): boolean { let { start } = weekend; const { end } = weekend; @@ -34,7 +34,7 @@ function dayBetweenWeekend(weekend, day) { return false; } -function getDaysDistance(day, end) { +function getDaysDistance(day, end): number { let length = 0; while (day !== end) { @@ -70,7 +70,7 @@ function separateBreak(scaleBreak, day) { return result; } -function getWeekEndDayIndices(workDays) { +function getWeekEndDayIndices(workDays): number[] { const indices = getWeekendDays(workDays); if (indices.length < 7) { @@ -139,7 +139,7 @@ function generateDateBreaksForWeekend(min, max, weekendDayIndices) { function excludeWorkDaysFromWeekEndBreaks(breaks, exactWorkDays) { const result = breaks.slice(); let i; - const processWorkDay = function (workday) { + const processWorkDay = function (workday): void { workday = dateUtils.trimTime(new Date(workday)); if (result[i].from <= workday && result[i].to > workday) { const separatedBreak = separateBreak(result[i], workday); @@ -162,7 +162,7 @@ function excludeWorkDaysFromWeekEndBreaks(breaks, exactWorkDays) { function generateBreaksForHolidays(min, max, holidays, weekendDayIndices) { let day; - const dayInWeekend = function (dayIndex) { + const dayInWeekend = function (dayIndex): boolean { return dayIndex === day; }; const adjustedMin = dateUtils.trimTime(min); diff --git a/packages/devextreme/js/__internal/viz/axes/polar_axes.ts b/packages/devextreme/js/__internal/viz/axes/polar_axes.ts index 9be3f6b5714a..0d81ba6b63fd 100644 --- a/packages/devextreme/js/__internal/viz/axes/polar_axes.ts +++ b/packages/devextreme/js/__internal/viz/axes/polar_axes.ts @@ -73,7 +73,7 @@ const circularAxes = { }; }, - applyMargins() { + applyMargins(): void { const margins = this._calculateValueMargins(this._majorTicks); const br = this._translator.getBusinessRange(); @@ -107,7 +107,7 @@ const circularAxes = { return [options.startAngle, options.endAngle]; }, - _updateRadius(canvas) { + _updateRadius(canvas): void { const rad = _min( canvas.width - canvas.left - canvas.right, canvas.height - canvas.top - canvas.bottom, @@ -115,7 +115,7 @@ const circularAxes = { this._radius = rad < 0 ? 0 : rad; }, - _updateCenter(canvas) { + _updateCenter(canvas): void { this._center = { x: canvas.left + (canvas.width - canvas.right - canvas.left) / 2, y: canvas.top + (canvas.height - canvas.top - canvas.bottom) / 2, @@ -133,7 +133,7 @@ const circularAxes = { return this._renderer.circle(); }, - _updateAxisElementPosition() { + _updateAxisElementPosition(): void { const center = this.getCenter(); this._axisElement.attr({ cx: center.x, cy: center.y, r: this.getRadius() }); }, @@ -146,7 +146,7 @@ const circularAxes = { return this._options.firstPointOnStartAngle; }, - _validateOptions(options) { + _validateOptions(options): void { const that = this; let { originValue } = options; const wholeRange = options.wholeRange = {}; @@ -195,7 +195,7 @@ const circularAxes = { return margins; }, - _updateLabelsPosition() { + _updateLabelsPosition(): void { const that = this; measureLabels(that._majorTicks); @@ -212,11 +212,11 @@ const circularAxes = { return this._options.firstPointOnStartAngle || (this._options.type !== constants.discrete); }, - _getTranslatedCoord(value, offset) { + _getTranslatedCoord(value, offset): number { return this._translator.translate(value, offset) - HALF_PI_ANGLE; }, - _getCanvasStartEnd() { + _getCanvasStartEnd(): { start: number; end: number } { return { start: 0 - HALF_PI_ANGLE, end: 360 - HALF_PI_ANGLE, @@ -249,7 +249,7 @@ const circularAxes = { ); }, - _getStripLabelCoords(from, to) { + _getStripLabelCoords(from, to): { x: number; y: number; align: string } { const that = this; const coords = that._getStripGraphicAttributes(from, to); const angle = coords.startAngle + (coords.endAngle - coords.startAngle) / 2; @@ -275,12 +275,12 @@ const circularAxes = { return this._createPathElement(this._getConstantLineGraphicAttributes(value).points, attr); }, - _rotateConstantLine(line, value) { + _rotateConstantLine(line, value): void { const { x, y } = this.getCenter(); line.rotate(value + this.getAngles()[0], x, y); }, - _getConstantLineLabelsCoords(value) { + _getConstantLineLabelsCoords(value): { x: number; y: number } { const that = this; const cosSin = getCosAndSin(-value - that.getAngles()[0]); const halfRad = that.getRadius() / 2; @@ -293,11 +293,11 @@ const circularAxes = { _checkAlignmentConstantLineLabels: _noop, - _adjustDivisionFactor(val) { + _adjustDivisionFactor(val): number { return val * 180 / (this.getRadius() * PI); }, - _getScreenDelta() { + _getScreenDelta(): number { const angles = this.getAngles(); return abs(angles[0] - angles[1]); }, @@ -410,7 +410,7 @@ const circularAxes = { return { x: coords.x, y: coords.y, angle: this.getTranslatedAngle(angle) }; }, - _getAdjustedStripLabelCoords(strip) { + _getAdjustedStripLabelCoords(strip): { translateY: number } { const box = strip.labelBBox; return { @@ -418,11 +418,11 @@ const circularAxes = { }; }, - coordsIn(x, y) { + coordsIn(x, y): boolean { return convertXYToPolar(this.getCenter(), x, y).r > this.getRadius(); }, - _rotateTick(element, coords) { + _rotateTick(element, coords): void { const center = this.getCenter(); element.rotate(coords.angle, center.x, center.y); }, @@ -431,11 +431,11 @@ const circularAxes = { return constants.validateOverlappingMode(mode); }, - _validateDisplayMode() { + _validateDisplayMode(): string { return 'standard'; }, - _getStep(boxes) { + _getStep(boxes): number { const that = this; const radius = that.getRadius() + (that._options.label.indentFromAxis || 0); const maxLabelBox = boxes.reduce((prevValue, box) => { @@ -454,7 +454,7 @@ const circularAxes = { return constants.getTicksCountInRange(that._majorTicks, 'angle', _max(angle1, angle2)); }, - _checkBoundedLabelsOverlapping(majorTicks, boxes, mode) { + _checkBoundedLabelsOverlapping(majorTicks, boxes, mode): void { const labelOpt = this._options.label; mode = mode || this._validateOverlappingMode(labelOpt.overlappingBehavior); if (mode !== 'hide') { @@ -483,12 +483,12 @@ const circularAxes = { } }, - shift(margins) { + shift(margins): void { this._axisGroup.attr({ translateX: margins.right, translateY: margins.bottom }); this._axisElementsGroup.attr({ translateX: margins.right, translateY: margins.bottom }); }, - getTranslatedAngle(angle) { + getTranslatedAngle(angle): number { const startAngle = this.getAngles()[0]; return angle + startAngle - HALF_PI_ANGLE; }, @@ -583,7 +583,7 @@ export const circularSpider = extend({}, circularAxes, { }); export const linear = { - _resetMargins() { + _resetMargins(): void { this._reinitTranslator(this._getViewportRange()); }, _getStick: xyAxesLinear._getStick, @@ -617,7 +617,7 @@ export const linear = { _createAxisElement: xyAxesLinear._createAxisElement, - _updateAxisElementPosition() { + _updateAxisElementPosition(): void { const centerCoord = this.getCenter(); this._axisElement.attr({ @@ -638,7 +638,7 @@ export const linear = { ]; }, - _getLabelAdjustedCoord(tick) { + _getLabelAdjustedCoord(tick): { x: number; y: number } { const that = this; const { labelCoords } = tick; const labelY = labelCoords.y; @@ -683,7 +683,7 @@ export const linear = { }; }, - _getTranslatedValue(value, offset) { + _getTranslatedValue(value, offset): { x: number; y: number; angle: number } { const startAngle = this.getAngles()[0]; const xy = convertPolarToXY( this.getCenter(), @@ -762,7 +762,7 @@ export const linear = { _checkAlignmentConstantLineLabels: _noop, - _rotateTick(element, coords, isGridLine) { + _rotateTick(element, coords, isGridLine): void { !isGridLine && element.rotate(coords.angle + HALF_PI_ANGLE, coords.x, coords.y); }, @@ -770,7 +770,7 @@ export const linear = { _validateDisplayMode: circularAxes._validateDisplayMode, - _getStep(boxes) { + _getStep(boxes): number { const quarter = getPolarQuarter(this.getAngles()[0]); const spacing = this._options.label.minSpacing; const func = quarter === 2 || quarter === 4 diff --git a/packages/devextreme/js/__internal/viz/axes/smart_formatter.ts b/packages/devextreme/js/__internal/viz/axes/smart_formatter.ts index 3e2d41cf6952..5fee3b40fb2d 100644 --- a/packages/devextreme/js/__internal/viz/axes/smart_formatter.ts +++ b/packages/devextreme/js/__internal/viz/axes/smart_formatter.ts @@ -21,6 +21,7 @@ import { isLocaleOnlyFormat, withFormatLocale, } from '@ts/core/global_format_config'; +import type { DatesDifferences } from '@ts/core/utils/date'; import { dateUtils } from '@ts/core/utils/date'; import { adjust, getExponent, getPrecision } from '@ts/core/utils/math'; import { @@ -41,7 +42,7 @@ const INTERVALS_MAP = { longtime: 'second', }; -function patchFirstTickDiff(differences, tickFormatIndex) { +function patchFirstTickDiff(differences, tickFormatIndex): void { for (let i = tickFormatIndex; i < dateUnitIntervals.length - 1; i++) { const dateUnitInterval = dateUnitIntervals[i]; if (i === tickFormatIndex) { @@ -54,7 +55,7 @@ function patchFirstTickDiff(differences, tickFormatIndex) { } } -function patchTickDiff(differences, tickFormatIndex) { +function patchTickDiff(differences, tickFormatIndex): boolean { let patched = false; for (let i = dateUnitIntervals.length - 1; i >= tickFormatIndex; i--) { const dateUnitInterval = dateUnitIntervals[i]; @@ -71,7 +72,7 @@ function patchTickDiff(differences, tickFormatIndex) { return patched; } -function getDatesDifferences(prevDate, curDate, nextDate?, tickIntervalFormat?) { +function getDatesDifferences(prevDate, curDate, nextDate?, tickIntervalFormat?): DatesDifferences { tickIntervalFormat = INTERVALS_MAP[tickIntervalFormat] || tickIntervalFormat; const tickFormatIndex = dateUnitIntervals.indexOf(tickIntervalFormat); @@ -92,7 +93,7 @@ function getDatesDifferences(prevDate, curDate, nextDate?, tickIntervalFormat?) } } -function resetDateUnitInterval(differences, intervalIndex) { +function resetDateUnitInterval(differences, intervalIndex): void { const dateUnitInterval = dateUnitIntervals[intervalIndex]; if (differences[dateUnitInterval]) { @@ -101,7 +102,7 @@ function resetDateUnitInterval(differences, intervalIndex) { } } -function setDateUnitInterval(differences, intervalIndex) { +function setDateUnitInterval(differences, intervalIndex): void { const dateUnitInterval = dateUnitIntervals[intervalIndex]; if (differences[dateUnitInterval] === false) { @@ -110,11 +111,11 @@ function setDateUnitInterval(differences, intervalIndex) { } } -function getNoZeroIndex(str) { +function getNoZeroIndex(str): number { return str.length - parseInt(str).toString().length; } -function getTransitionTickIndex(ticks, value) { +function getTransitionTickIndex(ticks, value): number { let i; let curDiff; let minDiff; @@ -189,7 +190,7 @@ function getDateTimeFormat(tick, { showTransition, ticks, tickInterval }) { return createFormat(typeFormat); } -function getFormatExponential(tick, tickInterval) { +function getFormatExponential(tick, tickInterval): number { const stringTick = abs(tick).toString(); if (isExponential(tick)) { return Math.max( @@ -200,7 +201,7 @@ function getFormatExponential(tick, tickInterval) { return abs(getNoZeroIndex(stringTick.split('.')[1]) - getExponent(tickInterval) + 1); } -function getFormatWithModifier(tick, tickInterval) { +function getFormatWithModifier(tick, tickInterval): { precision: number; type: string } { const tickIntervalIndex = floor(log10(tickInterval)); let tickIndex; let precision = 0; @@ -254,7 +255,7 @@ function getHighAndSelfDiffFormat(diff, interval) { return createFormat(formatHelper.getDateFormatByDifferences(diff)); } -function formatDateRange(startValue, endValue, tickInterval) { +function formatDateRange(startValue, endValue, tickInterval): string { const diff = getDatesDifferences(startValue, endValue); const typeFormat = dateUtils.getDateFormatByTickInterval(tickInterval); const diffFormatType = formatHelper.getDateFormatByDifferences(diff, typeFormat); @@ -372,7 +373,7 @@ export function formatRange({ tickInterval, argumentFormat, axisOptions: { dataType, type, logarithmBase }, -}) { +}): string { if (type === 'discrete') { return ''; } diff --git a/packages/devextreme/js/__internal/viz/axes/strip.ts b/packages/devextreme/js/__internal/viz/axes/strip.ts index 4f3e14315223..94868731ddd5 100644 --- a/packages/devextreme/js/__internal/viz/axes/strip.ts +++ b/packages/devextreme/js/__internal/viz/axes/strip.ts @@ -42,7 +42,7 @@ export default function createStrip(axis, options) { .append(axis._axisStripLabelGroup); }, - draw() { + draw(): void { if (axis._translator.getBusinessRange().isEmpty()) { return; } @@ -74,10 +74,10 @@ export default function createStrip(axis, options) { return this.label; }, - removeLabel() { + removeLabel(): void { }, - updatePosition(animate) { + updatePosition(animate): void { const stripPos = this._getCoord(); if (animate && storedCoord) { @@ -100,12 +100,12 @@ export default function createStrip(axis, options) { } }, - saveCoords() { + saveCoords(): void { lastStoredCoordinates = storedCoord; storedCoord = this._getCoord(); }, - resetCoordinates() { + resetCoordinates(): void { storedCoord = lastStoredCoordinates; }, }; diff --git a/packages/devextreme/js/__internal/viz/axes/tick.ts b/packages/devextreme/js/__internal/viz/axes/tick.ts index 494c9988f9c3..93a7d779a8f6 100644 --- a/packages/devextreme/js/__internal/viz/axes/tick.ts +++ b/packages/devextreme/js/__internal/viz/axes/tick.ts @@ -48,7 +48,7 @@ function createTick( return fontStyle; } - function createLabelHint(tick, range) { + function createLabelHint(tick, range): void { const labelHint = axis.formatHint(tick.value, labelOptions, range); if (isDefined(labelHint) && labelHint !== '') { tick.getContentContainer().setTitle(labelHint); @@ -59,15 +59,15 @@ function createTick( const tick = { value, - updateValue(newValue) { + updateValue(newValue): void { this.value = value = newValue; }, - initCoords() { + initCoords(): void { this.coords = axis._getTranslatedValue(value, tickOffset); this.labelCoords = axis._getTranslatedValue(value); }, - saveCoords() { + saveCoords(): void { when(this._templateDef).done(() => { this._lastStoredCoordinates = { coords: this._storedCoords, @@ -79,13 +79,13 @@ function createTick( : this.labelCoords; }); }, - resetCoordinates() { + resetCoordinates(): void { if (this._lastStoredCoordinates) { this._storedCoords = this._lastStoredCoordinates.coords; this._storedLabelsCoords = this._lastStoredCoordinates.labelCoords; } }, - drawMark(options) { + drawMark(options): void { if (!tickOptions.visible || skippedCategory === value) { return; } @@ -106,11 +106,11 @@ function createTick( } }, - setSkippedCategory(category) { + setSkippedCategory(category): void { skippedCategory = category; }, - _updateLine(lineElement, settings, storedSettings, animate, isGridLine) { + _updateLine(lineElement, settings, storedSettings, animate, isGridLine): void { if (!lineElement) { return; } @@ -138,7 +138,7 @@ function createTick( this.coords.angle && axis._rotateTick(lineElement, this.coords, isGridLine); }, - updateTickPosition(options, animate) { + updateTickPosition(options, animate): void { this._updateLine( this.mark, // @ts-expect-error @@ -151,7 +151,7 @@ function createTick( false, ); }, - drawLabel(range, template) { + drawLabel(range, template): void { if (this.templateContainer && axis.isRendered()) { this.updateLabelPosition(); return; @@ -220,7 +220,7 @@ function createTick( return this.templateContainer || this.label; }, - fadeOutElements() { + fadeOutElements(): void { const startSettings = { opacity: 1 }; const endSettings = { opacity: 0 }; const animationSettings = { @@ -244,7 +244,7 @@ function createTick( } }, - _fadeInLabel() { + _fadeInLabel(): void { const group = axis._renderer.g().attr({ opacity: 0, }).append(axis._axisElementsGroup) @@ -256,7 +256,7 @@ function createTick( this.getContentContainer().append(group); }, - _fadeOutLabel() { + _fadeOutLabel(): void { const group = axis._renderer.g().attr({ opacity: 1, }).animate({ opacity: 0 }, { @@ -275,7 +275,7 @@ function createTick( ); }, - updateLabelPosition(animate) { + updateLabelPosition(animate): void { const { templateContainer } = this; if (!this.getContentContainer()) { return; @@ -313,7 +313,7 @@ function createTick( } }, - updateMultilineTextAlignment() { + updateMultilineTextAlignment(): void { if (labelOptions.template || !this.label) { return; } @@ -322,7 +322,7 @@ function createTick( }); }, - drawGrid(drawLine) { + drawGrid(drawLine): void { if (gridOptions.visible && skippedCategory !== this.value) { if (this.grid) { this.grid.append(axis._axisGridGroup); @@ -335,7 +335,7 @@ function createTick( } }, - updateGridPosition(animate) { + updateGridPosition(animate): void { this._updateLine( this.grid, // @ts-expect-error @@ -346,7 +346,7 @@ function createTick( ); }, - removeLabel() { + removeLabel(): void { const contentContainer = this.getContentContainer(); contentContainer && contentContainer.remove(); this._templateDef && this._templateDef.reject(); diff --git a/packages/devextreme/js/__internal/viz/axes/tick_generator.ts b/packages/devextreme/js/__internal/viz/axes/tick_generator.ts index e8ffb9094522..b25e052ecb0f 100644 --- a/packages/devextreme/js/__internal/viz/axes/tick_generator.ts +++ b/packages/devextreme/js/__internal/viz/axes/tick_generator.ts @@ -61,7 +61,12 @@ const VISIBILITY_DELIMITER = 3; const MINUTE = 60 * 1000; function dummyGenerator(options) { - return function (data, screenDelta, tickInterval, forceTickInterval) { + return function ( + data, + screenDelta, + tickInterval, + forceTickInterval, + ): { ticks: number[]; tickInterval: number } { let count = mathFloor(screenDelta / options.axisDivisionFactor); count = count < 1 ? 1 : count; const interval = screenDelta / count; @@ -86,22 +91,22 @@ function discreteGenerator(options) { } const getValue = (value) => value; -const getLogValue = (base, allowNegatives, linearThreshold) => (value) => getLog( +const getLogValue = (base, allowNegatives, linearThreshold) => (value): number => getLog( value, base, allowNegatives, linearThreshold, ); -const raiseTo = (base, allowNegatives, linearThreshold) => (value) => raiseToExt( +const raiseTo = (base, allowNegatives, linearThreshold) => (value): number => raiseToExt( value, base, allowNegatives, linearThreshold, ); -const mathRaiseTo = (base) => (value) => mathRaise(value, base); -const logAbsValue = (base) => (value) => (value === 0 ? 0 : mathLog(mathAbs(value), base)); +const mathRaiseTo = (base) => (value): number => mathRaise(value, base); +const logAbsValue = (base) => (value): number => (value === 0 ? 0 : mathLog(mathAbs(value), base)); -const correctValueByInterval = (post, round, getValue) => (value, interval) => adjust( +const correctValueByInterval = (post, round, getValue) => (value, interval): number => adjust( post(round(adjust(getValue(value) / interval)) * interval), ); @@ -124,7 +129,7 @@ function correctMinValueByEndOnTick(floorFunc, ceilFunc, resolveEndOnTick, endOn }; } -function resolveEndOnTick(curValue, tickValue, interval, businessViewInfo) { +function resolveEndOnTick(curValue, tickValue, interval, businessViewInfo): boolean { const prevTickDataDiff = interval - mathAbs(tickValue - curValue); const intervalCount = math.max(mathCeil(businessViewInfo.businessDelta / interval), 2); const businessRatio = businessViewInfo.screenDelta / (intervalCount * interval); @@ -142,7 +147,7 @@ function resolveEndOnTick(curValue, tickValue, interval, businessViewInfo) { } function resolveEndOnTickLog(base) { - return function (curValue, tickValue, interval, businessViewInfo) { + return function (curValue, tickValue, interval, businessViewInfo): boolean { return resolveEndOnTick( getLog(curValue, base), getLog(tickValue, base), @@ -152,7 +157,7 @@ function resolveEndOnTickLog(base) { }; } -function resolveEndOnTickDate(curValue, tickValue, interval, businessViewInfo) { +function resolveEndOnTickDate(curValue, tickValue, interval, businessViewInfo): boolean { return resolveEndOnTick( curValue.valueOf(), tickValue.valueOf(), @@ -161,7 +166,7 @@ function resolveEndOnTickDate(curValue, tickValue, interval, businessViewInfo) { ); } -function getBusinessDelta(data, breaks) { +function getBusinessDelta(data, breaks): number { let spacing = 0; if (breaks) { spacing = breaks.reduce((prev, item) => prev + (item.to - item.from), 0); @@ -171,7 +176,7 @@ function getBusinessDelta(data, breaks) { function getBusinessDeltaLog(base, allowNegatives, linearThreshold) { const getLog = getLogValue(base, allowNegatives, linearThreshold); - return function (data, breaks) { + return function (data, breaks): number { let spacing = 0; if (breaks) { spacing = breaks.reduce((prev, item) => prev + mathAbs(getLog(item.to / item.from)), 0); @@ -180,14 +185,19 @@ function getBusinessDeltaLog(base, allowNegatives, linearThreshold) { }; } -function getIntervalByFactor(businessDelta, screenDelta, axisDivisionFactor, addTickCount?) { +function getIntervalByFactor( + businessDelta, + screenDelta, + axisDivisionFactor, + addTickCount?, +): number { let count = (screenDelta / axisDivisionFactor) - (addTickCount || 0); count = count < 1 ? 1 : count; return businessDelta / count; } -function getMultiplierFactor(interval, factorDelta?) { +function getMultiplierFactor(interval, factorDelta?): number { return 10 ** (mathFloor(getLog(interval, 10)) + (factorDelta || 0)); } @@ -232,7 +242,7 @@ function calculateTickInterval( return tickInterval; } -function adjustInterval(interval, multipliers, onlyIntegers) { +function adjustInterval(interval, multipliers, onlyIntegers): number { const factor = getMultiplierFactor(interval, -1); let result = 1; @@ -313,7 +323,15 @@ function getAdjustIntervalLog(skipCalculationLimits) { }; } -function getDataTimeMultipliers(gapSize) { +function getDataTimeMultipliers(gapSize): { + millisecond: number[]; + second: number[]; + minute: number[]; + hour: number[]; + day: number[]; + week: number[]; + month: number[]; +} { if (gapSize && gapSize > 2) { return DATETIME_MULTIPLIERS_WITH_BIG_WEEKEND; } @@ -422,7 +440,7 @@ function getTickIntervalByCustomTicks(getValue, postProcess) { : undefined); } -function addInterval(value, interval, isNegative) { +function addInterval(value, interval, isNegative): Date { return dateUtils.addInterval(value, interval, isNegative); } @@ -430,7 +448,7 @@ function addIntervalLog(log, raise) { return (value, interval, isNegative) => raise(addInterval(log(value), interval, isNegative)); } -function addIntervalDate(value, interval, isNegative?) { +function addIntervalDate(value, interval, isNegative?): Date { return addInterval(value, interval, isNegative); } @@ -905,7 +923,10 @@ function numericGenerator(options) { ); } -const correctValueByIntervalLog = (post, getRound, getValue) => (value, interval) => sign(value) +const correctValueByIntervalLog = (post, getRound, getValue) => ( + value, + interval, +): number => sign(value) * adjust(post(getRound(value)(adjust(getValue(value) / interval)) * interval)); function logarithmicGenerator(options) { @@ -916,8 +937,8 @@ function logarithmicGenerator(options) { const absLog = logAbsValue(base); const absRaise = mathRaiseTo(base); - const absFloor = (value) => (value < 0 ? mathCeil : mathFloor); - const absCeil = (value) => (value < 0 ? mathFloor : mathCeil); + const absFloor = (value): (x: number) => number => (value < 0 ? mathCeil : mathFloor); + const absCeil = (value): (x: number) => number => (value < 0 ? mathFloor : mathCeil); const floor = correctValueByIntervalLog(absRaise, absFloor, absLog); const ceil = correctValueByIntervalLog(absRaise, absCeil, absLog); @@ -960,13 +981,13 @@ function dateGenerator(options) { intervalObject = adjustIntervalDateTime(divider); } - const correctDateWithUnitBeginning = (v) => dateUtils.correctDateWithUnitBeginning( + const correctDateWithUnitBeginning = (v): Date => dateUtils.correctDateWithUnitBeginning( v, intervalObject, null, options.firstDayOfWeek, ); - const floorAtStartDate = (v) => new Date( + const floorAtStartDate = (v): Date => new Date( mathFloor((v.getTime() - v.getTimezoneOffset() * MINUTE) / divider) * divider + v.getTimezoneOffset() * MINUTE, ); diff --git a/packages/devextreme/js/__internal/viz/axes/xy_axes.ts b/packages/devextreme/js/__internal/viz/axes/xy_axes.ts index ceb1ee569453..d04713c2ff8e 100644 --- a/packages/devextreme/js/__internal/viz/axes/xy_axes.ts +++ b/packages/devextreme/js/__internal/viz/axes/xy_axes.ts @@ -22,6 +22,7 @@ /* eslint-disable @typescript-eslint/no-unused-expressions */ /* eslint-disable @typescript-eslint/prefer-optional-chain */ +import type { TimeInterval } from '@js/common/charts'; import formatHelper from '@ts/core/format_helper'; import { noop } from '@ts/core/utils/common'; import { dateUtils } from '@ts/core/utils/date'; @@ -55,7 +56,7 @@ const TICKS_CORRECTIONS = { center: -0.5, }; -function prepareDatesDifferences(datesDifferences, tickInterval) { +function prepareDatesDifferences(datesDifferences, tickInterval): void { let dateUnitInterval; let i; @@ -97,7 +98,7 @@ function getMarkerDates(min, max, markerInterval) { return dates; } -function getStripHorizontalAlignmentPosition(alignment) { +function getStripHorizontalAlignmentPosition(alignment): string { let position = 'start'; if (alignment === 'center') { position = 'center'; @@ -108,7 +109,7 @@ function getStripHorizontalAlignmentPosition(alignment) { return position; } -function getStripVerticalAlignmentPosition(alignment) { +function getStripVerticalAlignmentPosition(alignment): string { let position = 'start'; if (alignment === 'center') { position = 'center'; @@ -119,7 +120,7 @@ function getStripVerticalAlignmentPosition(alignment) { return position; } -function getMarkerInterval(tickInterval) { +function getMarkerInterval(tickInterval): 0 | TimeInterval { let markerInterval = getNextDateUnit(tickInterval); if (markerInterval === 'quarter') { markerInterval = getNextDateUnit(markerInterval); @@ -165,11 +166,11 @@ function getConstantLineLabelMarginForVerticalAlignment(constantLines, alignment ); } -function getLeftMargin(bBox) { +function getLeftMargin(bBox): number { return _math.abs(bBox.x) || 0; } -function getRightMargin(bBox) { +function getRightMargin(bBox): number { return _math.abs(bBox.width - _math.abs(bBox.x)) || 0; } @@ -217,8 +218,8 @@ function generateAutoBreaks( ) { const breaks = []; const getRange = type === 'logarithmic' - ? (min, max) => getLog(max / min, logarithmBase) - : (min, max) => max - min; + ? (min, max): number => getLog(max / min, logarithmBase) + : (min, max): number => max - min; let visibleRange = getRange(minVisible, maxVisible); const points = series.reduce( @@ -275,7 +276,7 @@ function generateAutoBreaks( export default { linear: { - _getStep(boxes, rotationAngle) { + _getStep(boxes, rotationAngle): number { const spacing = this._options.label.minSpacing; const func = this._isHorizontal ? function (box) { return box.width + spacing; } @@ -311,7 +312,7 @@ export default { return this._markerTrackers; }, - _getSharpParam(opposite) { + _getSharpParam(opposite): 'h' | 'v' { return this._isHorizontal ^ opposite ? 'h' : 'v'; }, @@ -319,7 +320,7 @@ export default { return this._renderer.path([], 'line'); }, - _updateAxisElementPosition() { + _updateAxisElementPosition(): void { const axisCoord = this._axisPosition; const canvas = this._getCanvasStartEnd(); @@ -334,7 +335,7 @@ export default { return this._translator.translate(value, offset); }, - _initAxisPositions() { + _initAxisPositions(): void { const that = this; if (that.customPositionIsAvailable()) { @@ -371,7 +372,7 @@ export default { ]; }, - getTickStartPositionShift(length) { + getTickStartPositionShift(length): number { const { width } = this._options; const position = this.getResolvedBoundaryPosition(); return length % 2 === 1 @@ -437,11 +438,11 @@ export default { return text; }, - _updateTitleCoords() { + _updateTitleCoords(): void { this._title && this._title.element.attr(this._getTitleCoords()); }, - _drawTitle() { + _drawTitle(): void { const title = this._drawTitleText(this._axisTitleGroup); if (title) { this._title = { @@ -450,7 +451,7 @@ export default { } }, - _measureTitle() { + _measureTitle(): void { if (this._title) { if (this._title.bBox && !this._title.originalSize) { this._title.originalSize = this._title.bBox; @@ -493,15 +494,15 @@ export default { getEnd() { return this.x + (invert ? -1 : 1) * (textIndent + this.labelBBox.width); }, - setTitle() { + setTitle(): void { this.title = text; }, - hideLabel() { + hideLabel(): void { this.label.dispose(); this.label = null; this.title = text; }, - hide() { + hide(): void { if (pathElement) { pathElement.dispose(); pathElement = null; @@ -630,7 +631,7 @@ export default { return offset + markerOptions.topIndent + markerOptions.separatorHeight; }, - _checkMarkersPosition(invert, dateMarker, prevDateMarker) { + _checkMarkersPosition(invert, dateMarker, prevDateMarker): boolean { if (prevDateMarker === undefined) { return true; } @@ -639,7 +640,7 @@ export default { : dateMarker.x > prevDateMarker.getEnd(); }, - _initializeMarkersTrackers(offset) { + _initializeMarkersTrackers(offset): void { const that = this; const { separatorHeight } = that._options.marker; const renderer = that._renderer; @@ -698,7 +699,7 @@ export default { return markerLabelOptions; }, - _adjustConstantLineLabels(constantLines) { + _adjustConstantLineLabels(constantLines): number { const that = this; const axisPosition = that._options.position; const canvas = that.getCanvas(); @@ -884,7 +885,7 @@ export default { return margins; }, - _checkAlignmentConstantLineLabels(labelOptions) { + _checkAlignmentConstantLineLabels(labelOptions): void { const { position } = labelOptions; let verticalAlignment = (labelOptions.verticalAlignment || '').toLowerCase(); let horizontalAlignment = (labelOptions.horizontalAlignment || '').toLowerCase(); @@ -930,7 +931,7 @@ export default { return { x, y }; }, - _getAdjustedStripLabelCoords(strip) { + _getAdjustedStripLabelCoords(strip): { translateX: number; translateY: number } { const stripOptions = strip.options; const { paddingTopBottom, paddingLeftRight } = stripOptions; const { horizontalAlignment, verticalAlignment } = stripOptions.label; @@ -960,7 +961,7 @@ export default { return { translateX: x, translateY: y }; }, - _adjustTitle(offset) { + _adjustTitle(offset): void { offset = offset || 0; if (!this._title) { return; @@ -998,7 +999,7 @@ export default { title.element.attr(params); }, - _checkTitleOverflow(titleElement) { + _checkTitleOverflow(titleElement): void { if (!this._title && !titleElement) { return; } @@ -1024,7 +1025,7 @@ export default { } }, - coordsIn(x, y) { + coordsIn(x, y): boolean { const canvas = this.getCanvas(); const { isHorizontal, position } = this._options; const coord = isHorizontal ? y : x; @@ -1047,7 +1048,7 @@ export default { max: true, }, - adjust() { + adjust(): void { const that = this; const seriesData = that._seriesData; const viewport = that._series.filter((s) => s.isVisible()).reduce((range, s) => { @@ -1089,7 +1090,7 @@ export default { return this._axisPosition; }, - _getStick() { + _getStick(): boolean { return !this._options.valueMarginsEnabled; }, @@ -1138,7 +1139,7 @@ export default { }; }, - areCoordsOutsideAxis(coords) { + areCoordsOutsideAxis(coords): boolean { const coord = this._isHorizontal ? coords.x : coords.y; const visibleArea = this.getVisibleArea(); @@ -1226,7 +1227,7 @@ export default { return sortingBreaks(breaks); }, - _drawBreak(translatedEnd, positionFrom, positionTo, width, options, group) { + _drawBreak(translatedEnd, positionFrom, positionTo, width, options, group): void { const that = this; const breakStart = translatedEnd - (!that._translator.isInverted() ? width + 1 : 0); const attr = { @@ -1284,7 +1285,7 @@ export default { return group; }, - _disposeBreaksGroup() { + _disposeBreaksGroup(): void { (this._breaksElements || []).forEach((clipRect) => { clipRect.dispose(); }); @@ -1292,7 +1293,7 @@ export default { this._breaksElements = null; }, - drawScaleBreaks(customCanvas) { + drawScaleBreaks(customCanvas): void { const that = this; const options = that._options; const { breakStyle, position } = options; @@ -1365,7 +1366,7 @@ export default { _getSpiderCategoryOption: noop, - shift(margins) { + shift(margins): void { const that = this; const options = that._options; const { isHorizontal } = options; @@ -1464,7 +1465,7 @@ export default { return options.customPosition ?? options.position; }, - customPositionIsAvailable() { + customPositionIsAvailable(): boolean { const options = this.getOptions(); return ( isDefined(this.getOrthogonalAxis()) @@ -1493,7 +1494,7 @@ export default { return this.positionIsBoundary(this._customBoundaryPosition); }, - positionIsBoundary(position) { + positionIsBoundary(position): boolean { return [TOP, LEFT, BOTTOM, RIGHT].includes(position); }, @@ -1501,7 +1502,7 @@ export default { return this._orthogonalPositions?.[position === TOP || position === LEFT ? 'start' : 'end']; }, - resolveOverlappingForCustomPositioning(oppositeAxes) { + resolveOverlappingForCustomPositioning(oppositeAxes): void { const that = this; if ( @@ -1558,7 +1559,7 @@ export default { }); }, - _shiftThroughOrthogonalAxisOverlappedTick(label, orthogonalAxis) { + _shiftThroughOrthogonalAxisOverlappedTick(label, orthogonalAxis): void { const that = this; const labelBBox = label.getBBox(); const orthogonalAxisPosition = orthogonalAxis.getAxisPosition(); @@ -1592,7 +1593,7 @@ export default { } }, - _shiftThroughAxisOverlappedTick(tick) { + _shiftThroughAxisOverlappedTick(tick): void { const that = this; const { label } = tick; @@ -1626,7 +1627,7 @@ export default { } }, - _detectElementsOverlapping(element1, element2) { + _detectElementsOverlapping(element1, element2): boolean { if (!element1 || !element2) { return false; } @@ -1657,7 +1658,7 @@ function getLineDrawer( const elementType = isWaved ? 'bezier' : 'line'; const group = renderer.g().append(root); - return function (offset, attr) { + return function (offset, attr): void { renderer .path( rotatePoints(getPoints(positionFrom, breakStart, positionTo, offset, isWaved)), diff --git a/packages/devextreme/js/__internal/viz/chart.ts b/packages/devextreme/js/__internal/viz/chart.ts index 8d0e69d4e5c5..becf378287d5 100644 --- a/packages/devextreme/js/__internal/viz/chart.ts +++ b/packages/devextreme/js/__internal/viz/chart.ts @@ -71,7 +71,7 @@ function getFirstAxisNameForPane(axes, paneName, defaultPane) { return result; } -function changeVisibilityAxisGrids(axis, gridVisibility, minorGridVisibility) { +function changeVisibilityAxisGrids(axis, gridVisibility, minorGridVisibility): void { const gridOpt = axis.getOptions().grid; const minorGridOpt = axis.getOptions().minorGrid; @@ -79,7 +79,7 @@ function changeVisibilityAxisGrids(axis, gridVisibility, minorGridVisibility) { minorGridOpt && (minorGridOpt.visible = minorGridVisibility); } -function hideGridsOnNonFirstValueAxisForPane(axesForPane) { +function hideGridsOnNonFirstValueAxisForPane(axesForPane): void { let axisShown = false; const hiddenStubAxis = []; const minorGridVisibility = axesForPane.some((axis) => { @@ -149,12 +149,12 @@ function findAxis(paneName, axisName, axes) { } } -function compareAxes(a, b) { +function compareAxes(a, b): number { return a.priority - b.priority; } // checks if pane with provided name exists in this panes array -function doesPaneExist(panes, paneName) { +function doesPaneExist(panes, paneName): boolean { let found = false; _each(panes, (_, pane) => { if (pane.name === paneName) { @@ -173,11 +173,11 @@ function accumulate(field, src1, src2, auxSpacing) { return val1 + val2 + (val1 && val2 ? auxSpacing : 0); } -function pickMax(field, src1, src2) { +function pickMax(field, src1, src2): number { return pickMaxValue(src1[field], src2[field]); } -function pickMaxValue(val1, val2) { +function pickMaxValue(val1, val2): number { return Math.max(val1 || 0, val2 || 0); } @@ -236,7 +236,13 @@ function getVerticalAxesMargins(axes) { }, { panes: {} }); } -function performActionOnAxes(axes, action, actionArgument1?, actionArgument2?, actionArgument3?) { +function performActionOnAxes( + axes, + action, + actionArgument1?, + actionArgument2?, + actionArgument3?, +): void { axes.forEach((axis) => { axis[action]( actionArgument1?.[axis.pane], @@ -252,13 +258,13 @@ function shrinkCanvases(isRotated, canvases, sizes, verticalMargins, horizontalM return m[side]; } - function getMaxMargin(side, margins1, margins2, pane) { + function getMaxMargin(side, margins1, margins2, pane): number { return pickMaxValue(getMargin(side, margins1, pane), getMargin(side, margins2, pane)); } - const getOriginalField = (field) => `original${field[0].toUpperCase()}${field.slice(1)}`; + const getOriginalField = (field): string => `original${field[0].toUpperCase()}${field.slice(1)}`; - function shrink(canvases, paneNames, sizeField, startMargin, endMargin, oppositeMargins) { + function shrink(canvases, paneNames, sizeField, startMargin, endMargin, oppositeMargins): void { paneNames = paneNames.sort((p1, p2) => canvases[p2][startMargin] - canvases[p1][startMargin]); paneNames.forEach((pane) => { const canvas = canvases[pane]; @@ -320,7 +326,7 @@ function shrinkCanvases(isRotated, canvases, sizes, verticalMargins, horizontalM return canvases; } -function drawAxesWithTicks(axes, condition, canvases, panesBorderOptions) { +function drawAxesWithTicks(axes, condition, canvases, panesBorderOptions): void { if (condition) { performActionOnAxes(axes, 'createTicks', canvases); multiAxesSynchronizer.synchronize(axes); @@ -330,7 +336,7 @@ function drawAxesWithTicks(axes, condition, canvases, panesBorderOptions) { function shiftAxis(side1, side2) { const shifts = {}; - return function (axis) { + return function (axis): void { if (!axis.customPositionIsAvailable() || axis.customPositionEqualsToPredefined()) { const shift = shifts[axis.pane] = shifts[axis.pane] || { top: 0, left: 0, bottom: 0, right: 0, @@ -350,7 +356,7 @@ function shiftAxis(side1, side2) { }; } -function getCommonSize(side, margins) { +function getCommonSize(side, margins): number { let size = 0; let paneMargins; @@ -362,7 +368,7 @@ function getCommonSize(side, margins) { return size; } -function checkUsedSpace(sizeShortage, side, axes, getMarginFunc) { +function checkUsedSpace(sizeShortage, side, axes, getMarginFunc): void { let size = 0; if (sizeShortage[side] > 0) { size = getCommonSize(side, getMarginFunc(axes, getAxisMargins)); @@ -433,7 +439,7 @@ function collectMarkersInfoBySeries(allSeries, filteredSeries, argAxis) { return { series, overloadedSeries }; } -const isOverlay = (currentPoint, overlayPoint, pointRadius) => { +const isOverlay = (currentPoint, overlayPoint, pointRadius): boolean => { const pointHitsLeftBorder = overlayPoint.x - pointRadius <= currentPoint.x; const pointHitsRightBorder = overlayPoint.x + pointRadius >= currentPoint.x; const pointHitsTopBorder = overlayPoint.y - pointRadius <= currentPoint.y; @@ -444,7 +450,7 @@ const isOverlay = (currentPoint, overlayPoint, pointRadius) => { return isPointOverlappedHorizontally && isPointOverlappedVertically; }; -const isPointOverlapped = (currentPoint, points, skipSamePointsComparing?) => { +const isPointOverlapped = (currentPoint, points, skipSamePointsComparing?): boolean => { const radiusPoint = currentPoint.getOptions().size / 2; for (let i = 0; i < points.length; i += 1) { @@ -464,7 +470,7 @@ const isPointOverlapped = (currentPoint, points, skipSamePointsComparing?) => { return false; }; -function fastHidingPointMarkersByArea(canvas, markersInfo, series) { +function fastHidingPointMarkersByArea(canvas, markersInfo, series): void { const area = canvas.width * canvas.height; const seriesPoints = markersInfo.series; @@ -483,7 +489,7 @@ function fastHidingPointMarkersByArea(canvas, markersInfo, series) { } } -function updateMarkersInfo(points, overloadedSeries) { +function updateMarkersInfo(points, overloadedSeries): void { let isContinuousSeries = false; for (let i = 0; i < points.length - 1; i += 1) { const curPoint = points[i]; @@ -609,7 +615,7 @@ class Chart extends AdvancedChart { if (_isDefined(valueAxis) && valueAxis !== argumentAxis.getOrthogonalAxis()) { argumentAxis.getOrthogonalAxis = () => valueAxis; - argumentAxis.customPositionIsBoundaryOrthogonalAxis = () => this._valueAxes + argumentAxis.customPositionIsBoundaryOrthogonalAxis = (): boolean => this._valueAxes .some((v) => v.customPositionIsBoundary()); } else if (_isDefined(argumentAxis.getOrthogonalAxis()) && !_isDefined(valueAxis)) { argumentAxis.getOrthogonalAxis = noop; @@ -1051,9 +1057,9 @@ class Chart extends AdvancedChart { const argVisualRange = argAxis.visualRange(); const argAxisIsDiscrete = argAxis.getOptions().type === DISCRETE; const sortingCallback = argAxisIsDiscrete - ? (p1, p2) => argVisualRange.categories.indexOf(p1.argument) + ? (p1, p2): number => argVisualRange.categories.indexOf(p1.argument) - argVisualRange.categories.indexOf(p2.argument) - : (p1, p2) => p1.argument - p2.argument; + : (p1, p2): number => p1.argument - p2.argument; let points = []; markersInfo.series.forEach((s) => { points = points.concat((s as any).points); }); @@ -1592,7 +1598,7 @@ class Chart extends AdvancedChart { ? (box, length) => ({ x: box.x - length, y: box.y }) : (box, length) => ({ x: box.x, y: box.y - length }); - const processor = (a, b) => { + const processor = (a, b): number => { const coordPosition = isRotated ? 1 : 0; const figureCenter1 = a.labels[0].getFigureCenter()[coordPosition]; const figureCenter12 = b.labels[0].getFigureCenter()[coordPosition]; 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 9fa283a85888..86aaa0f95956 100644 --- a/packages/devextreme/js/__internal/viz/chart_components/advanced_chart.ts +++ b/packages/devextreme/js/__internal/viz/chart_components/advanced_chart.ts @@ -67,7 +67,7 @@ function estimateBubbleSize( return Math.min(width, height) * maxSize; } -function setAxisVisualRangeByOption(arg, axis, isDirectOption, index?) { +function setAxisVisualRangeByOption(arg, axis, isDirectOption, index?): void { let options; let visualRange; @@ -559,8 +559,8 @@ export class AdvancedChart extends BaseChart { getValueAxis(name?: string): ThemeValue { return (this._valueAxes || []).find( _isDefined(name) - ? (a) => a.name === name - : (a) => a.pane === this.defaultPane, + ? (a): boolean => a.name === name + : (a): boolean => a.pane === this.defaultPane, ); } diff --git a/packages/devextreme/js/__internal/viz/chart_components/base_chart.ts b/packages/devextreme/js/__internal/viz/chart_components/base_chart.ts index cd491e0821a4..fb3a40d88f2a 100644 --- a/packages/devextreme/js/__internal/viz/chart_components/base_chart.ts +++ b/packages/devextreme/js/__internal/viz/chart_components/base_chart.ts @@ -46,6 +46,8 @@ import { Series } from '@ts/viz/series/base_series'; import BaseWidget from '../core/base_widget'; import { RollingStock } from './rolling_stock'; +type ThemeManagerInstance = InstanceType; + type SortingMethodParams = (a: any, b: any) => number; const { isArray } = Array; @@ -92,7 +94,7 @@ const FORCE_RENDER_REFRESH_ACTION_OPTIONS = [ const FONT = 'font'; -function checkHeightRollingStock(rollingStocks, stubCanvas) { +function checkHeightRollingStock(rollingStocks, stubCanvas): void { const canvasSize = stubCanvas.end - stubCanvas.start; let size = 0; rollingStocks.forEach((rollingStock) => { @@ -126,7 +128,7 @@ function findAndKillSmallValue(rollingStocks) { return width; } -function checkStackOverlap(rollingStocks) { +function checkStackOverlap(rollingStocks): boolean { let i; let j; let iLength; @@ -197,7 +199,7 @@ function resolveLabelOverlappingInOneDirection( return true; } -function checkStacksOverlapping(firstRolling, secondRolling, inTwoSides?) { +function checkStacksOverlapping(firstRolling, secondRolling, inTwoSides?): boolean | undefined { if (!firstRolling || !secondRolling) return; const firstRect = firstRolling.getBoundingRect(); const secondRect = secondRolling.getBoundingRect(); @@ -272,7 +274,7 @@ function moveRollingStock(rollingStocks: (RollingStock | null)[], canvas): void } } -function getLegendFields(name) { +function getLegendFields(name): { nameField: string; colorField: string; indexField: string } { return { nameField: `${name}Name`, colorField: `${name}Color`, @@ -294,7 +296,7 @@ function getLegendSettings(legendDataField, element) { }; } -function checkOverlapping(firstRect, secondRect) { +function checkOverlapping(firstRect, secondRect): boolean { return ((firstRect.x <= secondRect.x && secondRect.x <= firstRect.x + firstRect.width) || (firstRect.x >= secondRect.x && firstRect.x <= secondRect.x + secondRect.width)) && ((firstRect.y <= secondRect.y && secondRect.y <= firstRect.y + firstRect.height) @@ -398,7 +400,7 @@ export class BaseChart extends BaseWidget { return themeOptions; } - _createThemeManager() { + _createThemeManager(): ThemeManagerInstance { const chartOption = this.option(); const themeManager = new ThemeManager(this._getThemeManagerOptions()); @@ -406,7 +408,7 @@ export class BaseChart extends BaseWidget { return themeManager; } - _initCore() { + _initCore(): void { this._canvasClipRect = this._renderer.clipRect(); this._createHtmlStructure(); @@ -439,7 +441,7 @@ export class BaseChart extends BaseWidget { return this._themeManager.getOptions('adaptiveLayout'); } - _reinit() { + _reinit(): void { _setCanvasValues(this._canvas); this._reinitAxes(); @@ -451,7 +453,7 @@ export class BaseChart extends BaseWidget { ]); } - _createHtmlStructure() { + _createHtmlStructure(): void { const renderer = this._renderer; const { root } = renderer; const createConstantLinesGroup = function () { @@ -460,26 +462,26 @@ export class BaseChart extends BaseWidget { }; this._constantLinesGroup = { - dispose() { + dispose(): void { this.under.dispose(); this.above.dispose(); }, - linkOff() { + linkOff(): void { this.under.linkOff(); this.above.linkOff(); }, - clear() { + clear(): void { this.under.linkRemove().clear(); this.above.linkRemove().clear(); }, - linkAppend() { + linkAppend(): void { this.under.linkAppend(); this.above.linkAppend(); }, }; this._labelsAxesGroup = renderer.g().attr({ class: 'dxc-elements-axes-group' }); - const appendLabelsAxesGroup = () => { + const appendLabelsAxesGroup = (): void => { this._labelsAxesGroup.linkOn(root, 'elements'); }; @@ -504,7 +506,7 @@ export class BaseChart extends BaseWidget { this._scrollBarGroup = renderer.g().attr({ class: 'dxc-scroll-bar' }).linkOn(root, 'scroll-bar'); } - _disposeObjectsInArray(propName: string, fieldNames?: string[]) { + _disposeObjectsInArray(propName: string, fieldNames?: string[]): void { (this[propName] || []).forEach((item) => { if (fieldNames && item) { fieldNames.forEach((field) => { @@ -517,7 +519,7 @@ export class BaseChart extends BaseWidget { this[propName] = null; } - _disposeCore() { + _disposeCore(): void { const disposeObject = (propName: string): void => { // TODO: What is the purpose of the `if` check in a private function? if (this[propName]) { @@ -580,7 +582,7 @@ export class BaseChart extends BaseWidget { return this._themeManager.getOptions('animation'); } - _getDefaultSize() { + _getDefaultSize(): { width: number; height: number } { return { width: 400, height: 400 }; } @@ -590,7 +592,7 @@ export class BaseChart extends BaseWidget { return this._themeManager.getOptions(name); } - _applySize(rect) { + _applySize(rect): void { this._rect = rect.slice(); if (!this._changes.has('FULL_RENDER')) { @@ -606,11 +608,11 @@ export class BaseChart extends BaseWidget { // } // } - _resize() { + _resize(): void { this._doRender(this.__renderOptions || { animate: false, isResize: true }); } - _createTracker() { + _createTracker(): void { this._tracker = new trackerModule[this._trackerType]({ seriesGroup: this._seriesGroup, renderer: this._renderer, @@ -633,7 +635,7 @@ export class BaseChart extends BaseWidget { }; } - _updateTracker(trackerCanvases) { + _updateTracker(trackerCanvases): void { this._tracker.update(this._getTrackerSettings()); this._tracker.setCanvases({ left: 0, @@ -655,7 +657,7 @@ export class BaseChart extends BaseWidget { }); } - _doRender(_options) { + _doRender(_options): void { if (this._canvas.width === 0 && this._canvas.height === 0) return; this._resetIsReady(); // T207606 @@ -688,13 +690,13 @@ export class BaseChart extends BaseWidget { this._lastRenderingTime = Number(new Date()) - Number(startTime); } - _preserveOriginalCanvas() { + _preserveOriginalCanvas(): void { this.__originalCanvas = this._canvas; // NOTE: Instance of the original canvas must be preserved this._canvas = extend({}, this._canvas); } - _renderElements(drawOptions) { + _renderElements(drawOptions): void { const preparedOptions = this._prepareToRender(drawOptions); const isRotated = this._isRotated(); const isLegendInside = this._isLegendInside(); @@ -770,18 +772,18 @@ export class BaseChart extends BaseWidget { this._renderer.unlock(); } - _appendSeriesGroups() { + _appendSeriesGroups(): void { this._seriesGroup.linkAppend(); this._labelsGroup.linkAppend(); this._appendAdditionalSeriesGroups(); } - _renderSeries(drawOptions, isRotated, isLegendInside) { + _renderSeries(drawOptions, isRotated, isLegendInside): void { this._calculateSeriesLayout(drawOptions, isRotated); this._renderSeriesElements(drawOptions, isLegendInside); } - _calculateSeriesLayout(drawOptions, isRotated) { + _calculateSeriesLayout(drawOptions, isRotated): void { drawOptions.hideLayoutLabels = this.layoutManager.needMoreSpaceForPanesCanvas( this._getLayoutTargets(), isRotated, @@ -806,7 +808,7 @@ export class BaseChart extends BaseWidget { }); } - _renderSeriesElements(drawOptions, isLegendInside) { + _renderSeriesElements(drawOptions, isLegendInside): void { const { series } = this; const resolveLabelOverlapping = this._themeManager.getOptions('resolveLabelOverlapping'); const pointsToAnimation = this._getPointsToAnimation(series); @@ -838,7 +840,7 @@ export class BaseChart extends BaseWidget { this._seriesElementsDrawn = true; } - _changesApplied() { + _changesApplied(): void { if (this._seriesElementsDrawn) { this._seriesElementsDrawn = false; this._drawn(); @@ -846,13 +848,13 @@ export class BaseChart extends BaseWidget { } } - _locateLabels(resolveLabelOverlapping) { + _locateLabels(resolveLabelOverlapping): void { this._resolveLabelOverlapping(resolveLabelOverlapping); } - _renderExtraElements() {} + _renderExtraElements(): void {} - _clearCanvas() { + _clearCanvas(): void { // T207665, T336349, T503616 this._canvas = this.__originalCanvas; } @@ -879,7 +881,7 @@ export class BaseChart extends BaseWidget { return grep(this.getAllSeries(), (series) => series.isVisible()); } - _resolveLabelOverlappingHide() { + _resolveLabelOverlappingHide(): void { const labels = []; let currentLabel; let nextLabel; @@ -916,7 +918,7 @@ export class BaseChart extends BaseWidget { } } - _cleanGroups() { + _cleanGroups(): void { // TODO: Must be removed in the same place where appended (advanced chart) this._stripsGroup.linkRemove().clear(); // TODO: Must be removed in the same place where appended (advanced chart) @@ -933,11 +935,11 @@ export class BaseChart extends BaseWidget { this._scaleBreaksGroup.linkRemove().clear(); } - _allowLegendInsidePosition() { + _allowLegendInsidePosition(): boolean { return false; } - _createLegend() { + _createLegend(): void { const legendSettings = getLegendSettings(this._legendDataField, this._renderer.root.element); this._legend = new Legend({ @@ -957,7 +959,7 @@ export class BaseChart extends BaseWidget { this._layout.add(this._legend); } - _updateLegend() { + _updateLegend(): void { const themeManager = this._themeManager; const legendOptions = themeManager.getOptions('legend'); const legendData = this._getLegendData(); @@ -989,7 +991,7 @@ export class BaseChart extends BaseWidget { return options; } - _processRefreshData(newRefreshAction) { + _processRefreshData(newRefreshAction): void { const currentRefreshActionPosition = ACTIONS_BY_PRIORITY.indexOf(this._currentRefreshData); const newRefreshActionPosition = ACTIONS_BY_PRIORITY.indexOf(newRefreshAction); if ( @@ -1039,7 +1041,7 @@ export class BaseChart extends BaseWidget { }; } - _disposeSeries(seriesIndex?) { + _disposeSeries(seriesIndex?): void { if (this.series) { if (_isDefined(seriesIndex)) { this.series[seriesIndex].dispose(); @@ -1054,13 +1056,13 @@ export class BaseChart extends BaseWidget { } } - _disposeSeriesFamilies() { + _disposeSeriesFamilies(): void { (this.seriesFamilies || []).forEach((family) => { family.dispose(); }); Object.assign(this, { seriesFamilies: null }); this._needHandleRenderComplete = true; } - _optionChanged(arg) { + _optionChanged(arg): void { this._themeManager.resetOptions(arg.name); super._optionChanged(arg); } @@ -1070,58 +1072,58 @@ export class BaseChart extends BaseWidget { super._applyChanges(); } - _change_ANIMATION() { + _change_ANIMATION(): void { this._renderer.updateAnimationOptions(this._getAnimationOptions()); } - _change_DATA_SOURCE() { + _change_DATA_SOURCE(): void { this._needHandleRenderComplete = true; this._updateDataSource(); } - _change_PALETTE() { + _change_PALETTE(): void { this._themeManager.updatePalette(); this._refreshSeries('DATA_INIT'); } - _change_REFRESH_SERIES_DATA_INIT() { + _change_REFRESH_SERIES_DATA_INIT(): void { this._refreshSeries('DATA_INIT'); } - _change_DATA_INIT() { + _change_DATA_INIT(): void { if ((!this.series || this.needToPopulateSeries) && !this._changes.has('FORCE_DATA_INIT')) { this._dataInit(); } } - _change_FORCE_DATA_INIT() { + _change_FORCE_DATA_INIT(): void { this._dataInit(); } - _change_REFRESH_SERIES_FAMILIES() { + _change_REFRESH_SERIES_FAMILIES(): void { this._processSeriesFamilies(); this._populateBusinessRange(); this._processRefreshData(FORCE_RENDER_REFRESH_ACTION); } - _change_FORCE_RENDER() { + _change_FORCE_RENDER(): void { this._processRefreshData(FORCE_RENDER_REFRESH_ACTION); } - _change_AXES_AND_PANES() { + _change_AXES_AND_PANES(): void { this._refreshSeries('INIT'); } - _change_ROTATED() { + _change_ROTATED(): void { this._createScrollBar(); this._refreshSeries('INIT'); } - _change_REFRESH_SERIES_REINIT() { + _change_REFRESH_SERIES_REINIT(): void { this._refreshSeries('INIT'); } - _change_REFRESH_AXES() { + _change_REFRESH_AXES(): void { _setCanvasValues(this._canvas); this._reinitAxes(); @@ -1131,38 +1133,38 @@ export class BaseChart extends BaseWidget { ]); } - _change_SCROLL_BAR() { + _change_SCROLL_BAR(): void { this._createScrollBar(); this._processRefreshData(FORCE_RENDER_REFRESH_ACTION); } - _change_REINIT() { + _change_REINIT(): void { this._processRefreshData(REINIT_REFRESH_ACTION); } - _change_FORCE_DRAWING() { + _change_FORCE_DRAWING(): void { this._resetComponentsAnimation(); } - _change_FORCE_FIRST_DRAWING() { + _change_FORCE_FIRST_DRAWING(): void { this._resetComponentsAnimation(true); } - _resetComponentsAnimation(isFirstDrawing?) { + _resetComponentsAnimation(isFirstDrawing?): void { this.series.forEach((s) => { s.resetApplyingAnimation(isFirstDrawing); }); this._resetAxesAnimation(isFirstDrawing); } - _refreshSeries(actionName) { + _refreshSeries(actionName): void { this.needToPopulateSeries = true; this._requestChange([actionName]); } - _change_CORRECT_AXIS() { + _change_CORRECT_AXIS(): void { this._correctAxes(); } - _doRefresh() { + _doRefresh(): void { const methodName = this._currentRefreshData; if (methodName) { this._currentRefreshData = null; @@ -1171,7 +1173,7 @@ export class BaseChart extends BaseWidget { } } - _updateCanvasClipRect(canvas) { + _updateCanvasClipRect(canvas): void { const width = Math.max(canvas.width - canvas.left - canvas.right, 0); const height = Math.max(canvas.height - canvas.top - canvas.bottom, 0); @@ -1187,7 +1189,7 @@ export class BaseChart extends BaseWidget { return this._canvasClipRect.id; } - _dataSourceChangedHandler() { + _dataSourceChangedHandler(): void { if (this._changes.has('INIT')) { this._requestChange(['DATA_INIT']); } else { @@ -1195,15 +1197,15 @@ export class BaseChart extends BaseWidget { } } - _dataInit() { + _dataInit(): void { this._dataSpecificInit(true); } - _processSingleSeries(singleSeries) { + _processSingleSeries(singleSeries): void { singleSeries.createPoints(false); } - _handleSeriesDataUpdated() { + _handleSeriesDataUpdated(): void { if (this._getVisibleSeries().some((s) => s.useAggregation())) { this._populateMarginOptions(); } @@ -1211,7 +1213,7 @@ export class BaseChart extends BaseWidget { this.series.forEach((s) => this._processSingleSeries(s), this); } - _dataSpecificInit(needRedraw) { + _dataSpecificInit(needRedraw): void { if (!this.series || this.needToPopulateSeries) { this.series = this._populateSeries(); } @@ -1226,11 +1228,11 @@ export class BaseChart extends BaseWidget { // needRedraw && that._forceRender(); } - _forceRender() { + _forceRender(): void { this._doRender({ force: true }); } - _repopulateSeries() { + _repopulateSeries(): void { const themeManager = this._themeManager; const data = this._dataSourceItems(); const dataValidatorOptions = themeManager.getOptions('dataPrepareSettings'); @@ -1256,7 +1258,7 @@ export class BaseChart extends BaseWidget { this._handleSeriesDataUpdated(); } - _renderCompleteHandler() { + _renderCompleteHandler(): void { let allSeriesInited = true; if (this._needHandleRenderComplete) { this.series.forEach((s) => { @@ -1269,7 +1271,7 @@ export class BaseChart extends BaseWidget { } } - _dataIsReady() { + _dataIsReady(): boolean { // In order to support scenario when chart is created without "dataSource" and it is considered // as data is being loaded the check for state of "dataSource" option is added return _isDefined(this.option('dataSource')) && this._dataIsLoaded(); @@ -1288,7 +1290,7 @@ export class BaseChart extends BaseWidget { let particularSeriesOptions; let seriesTheme; const seriesThemes = []; - const seriesVisibilityChanged = (target) => { + const seriesVisibilityChanged = (target): void => { this._specialProcessSeries(); this._populateBusinessRange(target && target.getValueAxis(), true); this._renderer.stopAllAnimations(true); @@ -1329,7 +1331,7 @@ export class BaseChart extends BaseWidget { this.needToPopulateSeries = false; seriesThemes.forEach((theme) => { - const findSeries = (s) => s.name === theme.name + const findSeries = (s): boolean => s.name === theme.name && !seriesBasis.map((sb: any) => sb.series).includes(s); const curSeries = this.series?.find(findSeries); @@ -1358,7 +1360,7 @@ export class BaseChart extends BaseWidget { this.series = []; disposeSeriesFamilies && this._disposeSeriesFamilies(); this._themeManager.resetPalette(); - const eventPipe = (data) => { + const eventPipe = (data): void => { this.series.forEach((currentSeries) => { currentSeries.notify(data); }); @@ -1413,11 +1415,11 @@ export class BaseChart extends BaseWidget { // API - hideTooltip() { + hideTooltip(): void { this._tracker._hideTooltip(); } - clearHover() { + clearHover(): void { this._tracker.clearHover(); } @@ -1429,7 +1431,7 @@ export class BaseChart extends BaseWidget { return this; } - refresh() { + refresh(): void { this._disposeSeries(); this._disposeSeriesFamilies(); this._requestChange(['CONTAINER_SIZE', 'REFRESH_SERIES_REINIT']); @@ -1440,7 +1442,7 @@ export class BaseChart extends BaseWidget { return [adaptiveLayout.width, adaptiveLayout.height]; } - _change_REFRESH() { + _change_REFRESH(): void { if (!this._changes.has('INIT')) { this._doRefresh(); } else { @@ -1448,16 +1450,16 @@ export class BaseChart extends BaseWidget { } } - _change_FULL_RENDER() { + _change_FULL_RENDER(): void { this._forceRender(); this._changes.remove('FULL_RENDER'); } - _change_INIT() { + _change_INIT(): void { this._reinit(); } - _stopCurrentHandling() { + _stopCurrentHandling(): void { if (this._disposed) { return; } @@ -1584,7 +1586,7 @@ BaseChart.addPlugin(loadingIndicatorPlugin); // layout. // eslint-disable-next-line const { _change_TITLE } = BaseChart.prototype; -BaseChart.prototype._change_TITLE = function () { +BaseChart.prototype._change_TITLE = function (): void { _change_TITLE.call(this); this._change(['FORCE_RENDER']); }; diff --git a/packages/devextreme/js/__internal/viz/chart_components/multi_axes_synchronizer.ts b/packages/devextreme/js/__internal/viz/chart_components/multi_axes_synchronizer.ts index 0033940120d4..ba33a7287479 100644 --- a/packages/devextreme/js/__internal/viz/chart_components/multi_axes_synchronizer.ts +++ b/packages/devextreme/js/__internal/viz/chart_components/multi_axes_synchronizer.ts @@ -35,7 +35,7 @@ function getValueAxesPerPanes(valueAxes) { } const linearConverter = (br) => ({ - transform(v, b) { + transform(v, b): number { return adjust(getLogExt(v, b, br.allowNegatives, br.linearThreshold)); }, getTicks(interval, tickValues, base) { @@ -53,7 +53,7 @@ const linearConverter = (br) => ({ }); const logConverter = (br) => ({ - transform(v, b) { + transform(v, b): number { return adjust(raiseToExt(v, b, br.allowNegatives, br.linearThreshold)); }, getTicks(interval, tickValues, base) { @@ -68,7 +68,7 @@ const logConverter = (br) => ({ }, }); -function convertAxisInfo(axisInfo, converter) { +function convertAxisInfo(axisInfo, converter): void { if (!axisInfo.isLogarithmic) { return; } @@ -152,7 +152,7 @@ function populateAxesInfo(axes) { }, []); } -function updateTickValues(axesInfo) { +function updateTickValues(axesInfo): void { const maxTicksCount = axesInfo.reduce( (max, axisInfo) => _max(max, axisInfo.tickValues.length), 0, @@ -190,11 +190,11 @@ function updateTickValues(axesInfo) { }); } -function getAxisRange(axisInfo) { +function getAxisRange(axisInfo): number { return (axisInfo.maxValue - axisInfo.minValue) || 1; // T153054 } -function correctMinMaxValues(axesInfo) { +function correctMinMaxValues(axesInfo): void { const mainAxisInfo = axesInfo[0]; const mainAxisRange = getAxisRange(mainAxisInfo); @@ -225,7 +225,7 @@ function correctMinMaxValues(axesInfo) { }); } -function calculatePaddings(axesInfo) { +function calculatePaddings(axesInfo): { start: number; end: number } { let minPadding; let maxPadding; let startPadding = 0; @@ -249,7 +249,7 @@ function calculatePaddings(axesInfo) { }; } -function correctMinMaxValuesByPaddings(axesInfo, paddings) { +function correctMinMaxValuesByPaddings(axesInfo, paddings): void { axesInfo.forEach((info) => { const range = getAxisRange(info); const { inverted } = info; @@ -259,7 +259,7 @@ function correctMinMaxValuesByPaddings(axesInfo, paddings) { }); } -function updateTickValuesIfSynchronizedValueUsed(axesInfo) { +function updateTickValuesIfSynchronizedValueUsed(axesInfo): void { let hasSynchronizedValue = false; axesInfo.forEach((info) => { @@ -290,7 +290,7 @@ function updateTickValuesIfSynchronizedValueUsed(axesInfo) { }); } -function applyMinMaxValues(axesInfo) { +function applyMinMaxValues(axesInfo): void { axesInfo.forEach((info) => { const { axis } = info; const range = axis.getTranslator().getBusinessRange(); @@ -316,7 +316,7 @@ function applyMinMaxValues(axesInfo) { }); } -function correctAfterSynchronize(axesInfo) { +function correctAfterSynchronize(axesInfo): void { const invalidAxisInfo = []; let correctValue; @@ -354,7 +354,7 @@ function correctAfterSynchronize(axesInfo) { }); } -function updateMinorTicks(axesInfo) { +function updateMinorTicks(axesInfo): void { axesInfo.forEach((axisInfo) => { if (!axisInfo.minorTickInterval) { return; @@ -413,7 +413,7 @@ function correctPaddings(axesInfo, paddings) { } const multiAxesSynchronizer = { - synchronize(valueAxes) { + synchronize(valueAxes): void { each(getValueAxesPerPanes(valueAxes), (_, axes) => { if (axes.length <= 1) { return; diff --git a/packages/devextreme/js/__internal/viz/chart_components/shutter_zoom.ts b/packages/devextreme/js/__internal/viz/chart_components/shutter_zoom.ts index db760b4129ab..51ac5a2da16f 100644 --- a/packages/devextreme/js/__internal/viz/chart_components/shutter_zoom.ts +++ b/packages/devextreme/js/__internal/viz/chart_components/shutter_zoom.ts @@ -2,7 +2,6 @@ /* eslint-disable @typescript-eslint/prefer-optional-chain */ /* eslint-disable @typescript-eslint/no-unused-vars */ /* eslint-disable func-names */ -/* eslint-disable @typescript-eslint/explicit-module-boundary-types */ /* eslint-disable @typescript-eslint/no-unsafe-return */ /* eslint-disable @typescript-eslint/explicit-function-return-type */ @@ -17,7 +16,7 @@ const DRAG_START_EVENT_NAME = dragEventStart + SHUTTER_EVENTS_NS; const DRAG_UPDATE_EVENT_NAME = dragEventMove + SHUTTER_EVENTS_NS; const DRAG_END_EVENT_NAME = dragEventEnd + SHUTTER_EVENTS_NS; -function getPointerCoord(rootOffset, canvas, rotated, e) { +function getPointerCoord(rootOffset, canvas, rotated, e): number { let coord = Math.floor(rotated ? e.pageY - rootOffset.top : e.pageX - rootOffset.left); const min = rotated ? canvas.y1 : canvas.x1; const max = rotated ? canvas.y2 : canvas.x2; @@ -30,7 +29,7 @@ function getPointerCoord(rootOffset, canvas, rotated, e) { return coord; } -function checkCoords(rootOffset, canvas, e) { +function checkCoords(rootOffset, canvas, e): boolean { const x = e.pageX - rootOffset.left; const y = e.pageY - rootOffset.top; return x >= canvas.x1 && x <= canvas.x2 @@ -38,7 +37,7 @@ function checkCoords(rootOffset, canvas, e) { } function dragStartHandler(ctx) { - return function (e) { + return function (e): void { const offset = ctx.getRootOffset(); const canvas = ctx.getCanvas(); @@ -63,7 +62,7 @@ function dragStartHandler(ctx) { } function dragHandler(ctx) { - return function (e) { + return function (e): void { const curCoord = getPointerCoord(ctx.rootOffset, ctx.canvas, ctx.rotated, e); const attr = {}; ctx.curCoord = curCoord; @@ -75,7 +74,7 @@ function dragHandler(ctx) { } function dragEndHandler(ctx) { - return function (e) { + return function (e): void { ctx.triggerEnd(); ctx.rect.remove(); }; @@ -90,14 +89,14 @@ function shutterZoom(options) { rect, root: renderer.root, rotated, - triggerStart() { chart._eventTrigger('zoomStart'); }, - triggerEnd() { + triggerStart(): void { chart._eventTrigger('zoomStart'); }, + triggerEnd(): void { const tr = chart._argumentAxes[0].getTranslator(); const rangeStart = Math.min(this.startCoord, this.curCoord); const rangeEnd = Math.max(this.startCoord, this.curCoord); chart._eventTrigger('zoomEnd', { rangeStart: tr.from(rangeStart), rangeEnd: tr.from(rangeEnd) }); }, - dispose() { + dispose(): void { renderer.root.off(SHUTTER_EVENTS_NS); rect.dispose(); }, @@ -132,7 +131,7 @@ function shutterZoom(options) { export default { name: 'shutter_zoom', - init() { + init(): void { const options = this.option('shutterZoom') || {}; if (!options.enabled) { @@ -147,7 +146,7 @@ export default { }); }, - dispose() { + dispose(): void { this._shutterZoom && this._shutterZoom.dispose(); }, }; diff --git a/packages/devextreme/js/__internal/viz/chart_components/tracker.ts b/packages/devextreme/js/__internal/viz/chart_components/tracker.ts index 16c67ce3b670..550be5770a77 100644 --- a/packages/devextreme/js/__internal/viz/chart_components/tracker.ts +++ b/packages/devextreme/js/__internal/viz/chart_components/tracker.ts @@ -159,11 +159,11 @@ abstract class BaseTracker { abstract _getArgumentHoverMode(): string; - update(options) { + update(options): void { this._chart = options.chart; } - updateSeries(series, resetDecorations) { + updateSeries(series, resetDecorations): void { const that = this; const noHoveredSeries = !( series?.some((s) => s === that.hoveredSeries) @@ -188,12 +188,12 @@ abstract class BaseTracker { } } - setCanvases(mainCanvas, paneCanvases) { + setCanvases(mainCanvas, paneCanvases): void { this._mainCanvas = mainCanvas; this._canvases = paneCanvases; } - repairTooltip() { + repairTooltip(): void { const point = this.pointAtShownTooltip; if (!point || !point.series || !point.isVisible()) { this._hideTooltip(point, true); @@ -202,7 +202,7 @@ abstract class BaseTracker { } } - _setHoveredPoint(point) { + _setHoveredPoint(point): void { if (point === this._hoveredPoint) { return; } @@ -211,7 +211,7 @@ abstract class BaseTracker { this._hoveredPoint = point; } - _releaseHoveredPoint(isPointerOut?) { + _releaseHoveredPoint(isPointerOut?): void { if (this._hoveredPoint && this._hoveredPoint.getOptions()) { this._hoveredPoint.clearHover(); this._hoveredPoint = null; @@ -221,21 +221,21 @@ abstract class BaseTracker { } } - _setHoveredSeries(series, mode) { + _setHoveredSeries(series, mode): void { this._releaseHoveredSeries(); this._releaseHoveredPoint(); series.hover(mode); this.hoveredSeries = series; } - _releaseHoveredSeries() { // hoveredPoint only for T273289 + _releaseHoveredSeries(): void { // hoveredPoint only for T273289 if (this.hoveredSeries) { this.hoveredSeries.clearHover(); this.hoveredSeries = null; } } - clearSelection() { + clearSelection(): void { this._storedSeries.forEach((series) => { if (series) { series.clearSelection(); @@ -244,19 +244,19 @@ abstract class BaseTracker { }); } - _clean() { + _clean(): void { const that = this; that.hoveredPoint = that.hoveredSeries = that._hoveredArgumentPoints = null; that._hideTooltip(that.pointAtShownTooltip); } - clearHover(isPointerOut?) { + clearHover(isPointerOut?): void { this._resetHoveredArgument(); this._releaseHoveredSeries(); this._releaseHoveredPoint(isPointerOut); } - _hideTooltip(point, silent?, isPointerOut?) { + _hideTooltip(point, silent?, isPointerOut?): void { const that = this; if (!that._tooltip || (point && that.pointAtShownTooltip !== point)) { return; @@ -267,7 +267,7 @@ abstract class BaseTracker { that._tooltip.hide(!!isPointerOut); } - _showTooltip(point) { + _showTooltip(point): void { const that = this; let tooltipFormatObject; const eventData = { target: point }; @@ -288,14 +288,14 @@ abstract class BaseTracker { const rootOffset = that._renderer.getRootOffset(); coords.x += rootOffset.left; coords.y += rootOffset.top; - const callback = (result) => { + const callback = (result): void => { result && (that.pointAtShownTooltip = point); }; callback(that._tooltip.show(tooltipFormatObject, coords, eventData, undefined, callback)); } } - _showPointTooltip(event, point) { + _showPointTooltip(event, point): void { const that = event.data.tracker; const pointWithTooltip = that.pointAtShownTooltip; @@ -305,16 +305,16 @@ abstract class BaseTracker { that._showTooltip(point); } - _hidePointTooltip(event, point) { + _hidePointTooltip(event, point): void { event.data.tracker._hideTooltip(point, false, true); } - _enableOutHandler() { + _enableOutHandler(): void { if (this._outHandler) { return; } const that = this; - const handler = function (e) { + const handler = function (e): void { const rootOffset = that._renderer.getRootOffset(); const x = _floor(e.pageX - rootOffset.left); const y = _floor(e.pageY - rootOffset.top); @@ -332,23 +332,23 @@ abstract class BaseTracker { return this._tooltip.isEnabled() && this._tooltip.isCursorOnTooltip(e.pageX, e.pageY); } - _disableOutHandler() { + _disableOutHandler(): void { this._outHandler && eventsEngine.off(domAdapter.getDocument(), POINTER_ACTION, this._outHandler); this._outHandler = null; } - stopCurrentHandling() { + stopCurrentHandling(): void { this._pointerOut(true); } - _pointerOut(force?) { + _pointerOut(force?): void { this.clearHover(true); (force || this._tooltip.isEnabled()) && this._hideTooltip(this.pointAtShownTooltip, false, true); } - _triggerLegendClick(eventArgs, elementClick) { + _triggerLegendClick(eventArgs, elementClick): void { const eventTrigger = this._eventTrigger; eventTrigger(LEGEND_CLICK, eventArgs, () => { @@ -357,7 +357,7 @@ abstract class BaseTracker { }); } - _hoverLegendItem(x, y) { + _hoverLegendItem(x, y): void { const that = this; const item = that._legend.getItemByCoord(x, y); let series; @@ -374,11 +374,11 @@ abstract class BaseTracker { } } - _processArgumentHoveredPoint(argument, argumentIndex) { + _processArgumentHoveredPoint(argument, argumentIndex): void { this._releaseHoveredPoint(); } - _hoverArgument(argument, argumentIndex?) { + _hoverArgument(argument, argumentIndex?): void { const that = this; const hoverMode = that._getArgumentHoverMode(); @@ -402,7 +402,7 @@ abstract class BaseTracker { } } - _resetHoveredArgument() { + _resetHoveredArgument(): void { const that = this; let hoverMode; @@ -424,13 +424,13 @@ abstract class BaseTracker { } } - _notifySeries(data) { + _notifySeries(data): void { this._storedSeries.forEach((series) => { series.notify(data); }); } - _pointerHandler(e) { + _pointerHandler(e): void { const that = e.data.tracker; const rootOffset = that._renderer.getRootOffset(); const x = _floor(e.pageX - rootOffset.left); @@ -506,17 +506,17 @@ abstract class BaseTracker { that._pointerComplete(point, x, y); } - _pointerOnPoint(point, x, y, e?) { + _pointerOnPoint(point, x, y, e?): void { this._resetHoveredArgument(); this._setHoveredPoint(point); this._pointerComplete(point, x, y); } - _pointerComplete(point?, x?, y?) { + _pointerComplete(point?, x?, y?): void { this.pointAtShownTooltip !== point && this._tooltip.isEnabled() && this._showTooltip(point); } - _clickHandler(e) { + _clickHandler(e): void { const that = e.data.tracker; if (that._isHolding) { @@ -550,7 +550,7 @@ abstract class BaseTracker { } } - dispose() { + dispose(): void { const that = this; that._disableOutHandler(); that._renderer.root.off(DOT_EVENT_NS); @@ -575,7 +575,7 @@ export class ChartTracker extends BaseTracker { _timeoutKeeper; - _pointClick(point, event) { + _pointClick(point, event): void { const that = this; const eventTrigger = that._eventTrigger; const { series } = point; @@ -587,7 +587,7 @@ export class ChartTracker extends BaseTracker { }); } - update(options) { + update(options): void { const that = this; super.update(options); that._argumentAxis = options.argumentAxis || {}; @@ -614,17 +614,17 @@ export class ChartTracker extends BaseTracker { return !canvas && this._stuckSeries && point?.series !== this._stuckSeries; } - _hideCrosshair() { + _hideCrosshair(): void { this._crosshair?.hide(); } - _moveCrosshair(point, x, y) { + _moveCrosshair(point, x, y): void { if (this._crosshair && point?.isVisible()) { this._crosshair.show({ point, x, y }); } } - _clean() { + _clean(): void { const that = this; super._clean(); that._resetTimer(); @@ -655,7 +655,7 @@ export class ChartTracker extends BaseTracker { return point?.series; } - _setTimeout(callback, keeper) { + _setTimeout(callback, keeper): void { const that = this; if (that._timeoutKeeper !== keeper) { that._resetTimer(); @@ -667,19 +667,19 @@ export class ChartTracker extends BaseTracker { } } - _resetTimer() { + _resetTimer(): void { clearTimeout(this._hoverTimeout); this._timeoutKeeper = this._hoverTimeout = null; } - _stopEvent(e) { + _stopEvent(e): void { if (!isDefined(e.cancelable) || e.cancelable) { e.preventDefault(); e.stopPropagation(); // T249548 } } - _setStuckSeries(e, series, x, y) { + _setStuckSeries(e, series, x, y): boolean { if (e.pointerType !== 'mouse') { this._stuckSeries = null; } else { @@ -688,7 +688,7 @@ export class ChartTracker extends BaseTracker { return !!this._stuckSeries; } - _pointerOut(force?) { + _pointerOut(force?): void { const that = this; that._stuckSeries = null; that._hideCrosshair(); @@ -697,7 +697,7 @@ export class ChartTracker extends BaseTracker { } // @ts-expect-error - _hoverArgumentAxis(x, y, e) { + _hoverArgumentAxis(x, y, e): true | undefined { const that = this; that._resetHoveredArgument(); if (that._axisHoverEnabled && that._argumentAxis.coordsIn(x, y)) { @@ -706,7 +706,7 @@ export class ChartTracker extends BaseTracker { } } - _pointerComplete(point?, x?, y?) { + _pointerComplete(point?, x?, y?): void { const that = this; that.hoveredSeries && that.hoveredSeries.updateHover(x, y); that._resetTimer(); @@ -714,18 +714,18 @@ export class ChartTracker extends BaseTracker { super._pointerComplete(point); } - _legendClick(item, e) { + _legendClick(item, e): void { const series = this._storedSeries[item.id]; this._triggerLegendClick({ target: series, event: e }, SERIES_CLICK); } - _hoverLegendItem(x, y) { + _hoverLegendItem(x, y): void { this._stuckSeries = null; this._hideCrosshair(); super._hoverLegendItem(x, y); } - _pointerOnPoint(point, x, y, e) { + _pointerOnPoint(point, x, y, e): void { this._setStuckSeries(e, point.series, x, y); this._releaseHoveredSeries(); super._pointerOnPoint(point, x, y, e); @@ -735,7 +735,7 @@ export class ChartTracker extends BaseTracker { return correctHoverMode(this._argumentAxis); } - dispose() { + dispose(): void { this._resetTimer(); super.dispose(); } @@ -750,11 +750,11 @@ Object.assign(ChartTracker.prototype, { }); export class PieTracker extends BaseTracker { - _isPointerOut(_, point) { + _isPointerOut(_, point): boolean { return !point; } - _legendClick(item, e) { + _legendClick(item, e): void { const that = this; const points = []; @@ -765,11 +765,11 @@ export class PieTracker extends BaseTracker { that._eventTrigger(LEGEND_CLICK, { target: item.argument, points, event: e }); } - _pointClick(point, e) { + _pointClick(point, e): void { this._eventTrigger(POINT_CLICK, { target: point, event: e }); } - _hoverLegendItem(x, y) { + _hoverLegendItem(x, y): void { const that = this; const item = that._legend.getItemByCoord(x, y); @@ -785,7 +785,7 @@ export class PieTracker extends BaseTracker { return correctHoverMode(this._legend); } - _processArgumentHoveredPoint(argument, argumentIndex) { + _processArgumentHoveredPoint(argument, argumentIndex): void { const points = this._storedSeries.flatMap( (series) => series.getPointsByKeys(argument, argumentIndex), ); 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 e98d84c449bc..3b972bd3d5c3 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 @@ -53,7 +53,7 @@ function canvasToRect(canvas) { }; } -function checkCoords(rect, coords) { +function checkCoords(rect, coords): boolean { const { x } = coords; const { y } = coords; return x >= rect.x && x <= (rect.width + rect.x) @@ -104,10 +104,13 @@ function axisZoom(axis, onlyAxisToNotify, getRange, getParameters, actionField, return { stopInteraction, result }; } -function zoomAxes(e, axes, getRange, zoom, params, onlyAxisToNotify?) { +function zoomAxes(e, axes, getRange, zoom, params, onlyAxisToNotify?): boolean { axes = sortAxes(axes, onlyAxisToNotify); let zoomStarted = false; - const getParameters = (silent) => ({ start: !!silent, end: !!silent }); + const getParameters = (silent): { start: boolean; end: boolean } => ({ + start: !!silent, + end: !!silent, + }); getFilteredAxes(axes).some((axis) => { const translator = axis.getTranslator(); const scale = translator.getMinScale(zoom); @@ -124,7 +127,7 @@ function zoomAxes(e, axes, getRange, zoom, params, onlyAxisToNotify?) { return zoomStarted; } -function cancelEvent(e) { +function cancelEvent(e): void { if (e.originalEvent) { cancelEvent(e.originalEvent); } @@ -135,7 +138,7 @@ function cancelEvent(e) { export default { name: 'zoom_and_pan', - init() { + init(): void { const chart = this; const renderer = this._renderer; let lastWheelTimer: number | undefined; @@ -154,7 +157,7 @@ export default { return axes; } - function startAxesViewportChanging(zoomAndPan, actionField, e) { + function startAxesViewportChanging(zoomAndPan, actionField, e): void { const axes = getAxesCopy(zoomAndPan, actionField); getFilteredAxes(axes).some( @@ -163,7 +166,7 @@ export default { } function axesViewportChanging(zoomAndPan, actionField, e, offsetCalc, centerCalc) { - function zoomAxes(axes, criteria, coordField, e, actionData) { + function zoomAxes(axes, criteria, coordField, e, actionData): { zoomed: boolean } { let zoom = { zoomed: false }; criteria && getFilteredAxes(axes).forEach((axis) => { const options = axis.getOptions(); @@ -220,7 +223,7 @@ export default { return zoom; } - function storeOffset(e, actionData, zoom, coordField) { + function storeOffset(e, actionData, zoom, coordField): void { if (zoom.zoomed) { actionData.offset[coordField] = (e.offset ? e.offset[coordField] @@ -228,7 +231,7 @@ export default { } } - function storeCenter(center, actionData, zoom, coordField) { + function storeCenter(center, actionData, zoom, coordField): void { if (zoom.zoomed) { actionData.center[coordField] = center[coordField] + zoom.deltaTranslate; } @@ -261,8 +264,8 @@ export default { || argZoom.enabled || valZoom.enabled; } - function finishAxesViewportChanging(zoomAndPan, actionField, e, offsetCalc) { - function zoomAxes(axes, coordField, actionData, onlyAxisToNotify) { + function finishAxesViewportChanging(zoomAndPan, actionField, e, offsetCalc): void { + function zoomAxes(axes, coordField, actionData, onlyAxisToNotify): boolean { let zoomStarted = false; const scale = e.scale || 1; const getRange = (axis) => { @@ -310,7 +313,7 @@ export default { zoomStarted && chart._requestChange(['VISUAL_RANGE']); } - function panArgumentAxisToThumb(e, scrollRange) { + function panArgumentAxisToThumb(e, scrollRange): void { const axes = getFilteredAxes(chart._argumentAxes); const getRange = (axis) => { const range = getVizRangeObject([scrollRange.startValue, scrollRange.endValue]); @@ -350,7 +353,7 @@ export default { }; } - function getPointerCoord(rect, e) { + function getPointerCoord(rect, e): { x: number; y: number } { const rootOffset = renderer.getRootOffset(); return { x: _min(_max(e.pageX - rootOffset.left, rect.x), rect.width + rect.x), @@ -358,7 +361,7 @@ export default { }; } - function calcCenterForPinch(e) { + function calcCenterForPinch(e): { x: number; y: number } { const rootOffset = renderer.getRootOffset(); const x1 = e.pointers[0].pageX; const x2 = e.pointers[1].pageX; @@ -370,7 +373,7 @@ export default { }; } - function calcCenterForDrag(e) { + function calcCenterForDrag(e): { x: number; y: number } { const rootOffset = renderer.getRootOffset(); return { x: e.pageX - rootOffset.left, @@ -378,11 +381,11 @@ export default { }; } - function calcOffsetForDrag(e, actionData, coordField) { + function calcOffsetForDrag(e, actionData, coordField): number { return e.offset[coordField] - actionData.offset[coordField]; } - function setLastWheelTimer() { + function setLastWheelTimer(): void { clearTimeout(lastWheelTimer); // eslint-disable-next-line no-restricted-globals lastWheelTimer = setTimeout(() => { @@ -402,7 +405,7 @@ export default { } const zoomAndPan = { - dragStartHandler(e) { + dragStartHandler(e): void { // @ts-expect-error const { options } = zoomAndPan; const isTouch = e.pointerType === 'touch'; @@ -450,7 +453,7 @@ export default { startAxesViewportChanging(zoomAndPan, 'pan', e); } }, - dragHandler(e) { + dragHandler(e): void { const rotated = chart.option('rotated'); // @ts-expect-error const { options } = zoomAndPan; @@ -504,7 +507,7 @@ export default { preventDefaults(e); } }, - dragEndHandler(e) { + dragEndHandler(e): void { const rotated = chart.option('rotated'); // @ts-expect-error const { options } = zoomAndPan; @@ -555,7 +558,7 @@ export default { // @ts-expect-error zoomAndPan.actionData = null; }, - pinchStartHandler(e) { + pinchStartHandler(e): void { const actionData = prepareActionData(calcCenterForPinch(e), 'zoom'); if (actionData.cancel) { cancelEvent(e); @@ -565,7 +568,7 @@ export default { zoomAndPan.actionData = actionData; startAxesViewportChanging(zoomAndPan, 'zoom', e); }, - pinchHandler(e) { + pinchHandler(e): void { // @ts-expect-error if (!zoomAndPan.actionData) { return; @@ -581,7 +584,7 @@ export default { ); preventDefaults(e); }, - pinchEndHandler(e) { + pinchEndHandler(e): void { // @ts-expect-error if (!zoomAndPan.actionData) { return; @@ -597,7 +600,7 @@ export default { // @ts-expect-error zoomAndPan.actionData = null; }, - mouseWheelHandler(e) { + mouseWheelHandler(e): void { // @ts-expect-error const { options } = zoomAndPan; const rotated = chart.option('rotated'); @@ -676,7 +679,7 @@ export default { setLastWheelTimer(); } }, - cleanup() { + cleanup(): void { renderer.root.off(EVENTS_NS); // @ts-expect-error zoomAndPan.actionData?.rect?.dispose(); @@ -684,7 +687,7 @@ export default { zoomAndPan.actionData = null; renderer.root.css({ 'touch-action': '' }); }, - setup(options) { + setup(options): void { zoomAndPan.cleanup(); if (!options.argumentAxis.pan) { renderer.root.on(SCROLL_BAR_START_EVENT_NAME, cancelEvent); @@ -754,14 +757,14 @@ export default { this._zoomAndPan = zoomAndPan; }, members: { - _setupZoomAndPan() { + _setupZoomAndPan(): void { this._zoomAndPan.setup(this._themeManager.getOptions('zoomAndPan')); }, }, - dispose() { + dispose(): void { this._zoomAndPan.cleanup(); }, - customize(constructor) { + customize(constructor): void { constructor.addChange({ code: 'ZOOM_AND_PAN', handler() { diff --git a/packages/devextreme/js/__internal/viz/components/data_validator.ts b/packages/devextreme/js/__internal/viz/components/data_validator.ts index 9bacf5972bf8..3a0c6ecf8b17 100644 --- a/packages/devextreme/js/__internal/viz/components/data_validator.ts +++ b/packages/devextreme/js/__internal/viz/components/data_validator.ts @@ -42,7 +42,7 @@ const axisTypeParser = enumParser([STRING, NUMERIC, DATETIME]); const _isArray = Array.isArray; -function groupingValues(data, others, valueField, index) { +function groupingValues(data, others, valueField, index): void { if (index >= 0) { data.slice(index).forEach((cell) => { if (_isDefined(cell[valueField])) { @@ -53,7 +53,7 @@ function groupingValues(data, others, valueField, index) { } } -function processGroups(groups) { +function processGroups(groups): void { groups.forEach((group) => { group.valueType = group.valueAxisType = null; group.series.forEach((series) => { @@ -64,7 +64,13 @@ function processGroups(groups) { } function sortValues(data, asc, selector) { - const func = asc ? function (a, b) { return a - b; } : function (a, b) { return b - a; }; + const func = asc + ? function (a, b): number { + return a - b; + } + : function (a, b): number { + return b - a; + }; data.sort((a, b) => { const valA = selector(a); const valB = selector(b); @@ -75,7 +81,7 @@ function sortValues(data, asc, selector) { return data; } -function resetArgumentAxes(axes) { +function resetArgumentAxes(axes): void { axes && axes.forEach((axis) => { axis.resetTypes(ARGUMENT_TYPE); }); @@ -92,7 +98,7 @@ function parseCategories(categories, parser) { return newArray; } -function parseAxisCategories(groupsData, parsers) { +function parseAxisCategories(groupsData, parsers): void { const argumentCategories = groupsData.argumentOptions && groupsData.argumentOptions.categories; groupsData.groups.forEach((valueGroup, i) => { @@ -123,7 +129,7 @@ function getType(unit, type) { return result; } -function correctAxisType(type, axisType, hasCategories, incidentOccurred) { +function correctAxisType(type, axisType, hasCategories, incidentOccurred): 'logarithmic' | 'discrete' | 'semidiscrete' | 'continuous' { if ( type === STRING && (axisType === CONTINUOUS || axisType === LOGARITHMIC || axisType === SEMIDISCRETE) @@ -140,7 +146,7 @@ function correctAxisType(type, axisType, hasCategories, incidentOccurred) { } // Do we really need this one if all it is only for logarithmic case? -function validUnit(unit, field, incidentOccurred) { +function validUnit(unit, field, incidentOccurred): void { if (unit) { incidentOccurred(!_isNumber(unit) && !_isDate(unit) && !_isString(unit) ? 'E2003' : 'E2004', [field]); } @@ -238,7 +244,7 @@ function findIndexByThreshold(data, valueField, threshold) { return i; } -function groupMinSlices(originalData, argumentField, valueField, smallValuesGrouping) { +function groupMinSlices(originalData, argumentField, valueField, smallValuesGrouping): void { smallValuesGrouping = smallValuesGrouping || {}; const { mode } = smallValuesGrouping; @@ -255,7 +261,7 @@ function groupMinSlices(originalData, argumentField, valueField, smallValuesGrou others[valueField] && originalData.push(others); } -function groupPieData(data, groupsData) { +function groupPieData(data, groupsData): void { const firstSeries = groupsData.groups[0] && groupsData.groups[0].series[0]; const isPie = firstSeries && (firstSeries.type === 'pie' || firstSeries.type === 'doughnut' || firstSeries.type === 'donut'); @@ -273,7 +279,7 @@ function groupPieData(data, groupsData) { }); } -function addUniqueItemToCollection(item, collection, itemsHash) { +function addUniqueItemToCollection(item, collection, itemsHash): void { if (!itemsHash[item]) { collection.push(item); itemsHash[item] = true; @@ -293,7 +299,7 @@ function getUniqueArgumentFields(groupsData) { return uniqueArgumentFields; } -function sort(a, b) { +function sort(a, b): number { const result = a - b; if (isNaN(result)) { @@ -414,7 +420,7 @@ function checkArgumentTypeOfGroup(series, cell, groupsData) { return groupsData.argumentType; } -function checkType(data, groupsData, checkTypeForAllData) { +function checkType(data, groupsData, checkTypeForAllData): void { const groupsWithUndefinedValueType = []; const groupsWithUndefinedArgumentType = []; const argumentTypeGroup = groupsData.argumentOptions @@ -463,7 +469,7 @@ function checkType(data, groupsData, checkTypeForAllData) { } } -function checkAxisType(groupsData, incidentOccurred) { +function checkAxisType(groupsData, incidentOccurred): void { const argumentOptions = groupsData.argumentOptions || {}; const userArgumentCategories = (argumentOptions && argumentOptions.categories) || []; const argumentAxisType = correctAxisType( diff --git a/packages/devextreme/js/__internal/viz/components/parse_utils.ts b/packages/devextreme/js/__internal/viz/components/parse_utils.ts index 52aeefa48a48..87531c5c0137 100644 --- a/packages/devextreme/js/__internal/viz/components/parse_utils.ts +++ b/packages/devextreme/js/__internal/viz/components/parse_utils.ts @@ -9,11 +9,11 @@ import { dateSerialization } from '@ts/core/utils/date_serialization'; import { isDefined } from '@ts/core/utils/type'; const parsers = { - string(val) { + string(val): string { return isDefined(val) ? `${val}` : val; }, - numeric(val) { + numeric(val): number { if (!isDefined(val)) { return val; } diff --git a/packages/devextreme/js/__internal/viz/core/annotations.ts b/packages/devextreme/js/__internal/viz/core/annotations.ts index a35bfaaecc59..02523ff1f4e4 100644 --- a/packages/devextreme/js/__internal/viz/core/annotations.ts +++ b/packages/devextreme/js/__internal/viz/core/annotations.ts @@ -43,7 +43,7 @@ interface PointerEventData extends EngineEvent { function coreAnnotation(options, contentTemplate) { return { - draw(widget, group) { + draw(widget, group): void { const annotationGroup = widget._renderer.g().append(group) .css(patchFontOptions(options.font)); @@ -77,12 +77,12 @@ function coreAnnotation(options, contentTemplate) { hitTest(x, y) { return this.plaque.hitTest(x, y); }, - showTooltip(tooltip, { x, y }) { + showTooltip(tooltip, { x, y }): void { const that = this; const { options } = that; if (tooltip.annotation !== that) { tooltip.setTemplate(options.tooltipTemplate); - const callback = (result) => { + const callback = (result): void => { result && (tooltip.annotation = that); }; callback( @@ -98,7 +98,7 @@ function coreAnnotation(options, contentTemplate) { function getTemplateFunction(options, widget) { let template; if (options.type === 'text') { - template = function (item, groupElement) { + template = function (item, groupElement): void { const text = widget._renderer .text(item.text) .attr({ class: item.cssClass }) @@ -112,7 +112,7 @@ function getTemplateFunction(options, widget) { } }; } else if (options.type === 'image') { - template = function (item, groupElement) { + template = function (item, groupElement): void { const { width, height, url, location, } = item.image || {}; @@ -175,11 +175,11 @@ export let createAnnotations = function ( /// #DEBUG export const __test_utils = { - stub_createAnnotations(stub) { + stub_createAnnotations(stub): void { this.old_createAnnotations = createAnnotations; createAnnotations = stub; }, - restore_createAnnotations() { + restore_createAnnotations(): void { createAnnotations = this.old_createAnnotations; }, }; @@ -187,8 +187,8 @@ export const __test_utils = { const chartPlugin = { name: 'annotations_chart', - init() {}, - dispose() {}, + init(): void {}, + dispose(): void {}, members: { _getAnnotationCoords(annotation) { const coords = { @@ -250,7 +250,7 @@ const chartPlugin = { } return coords; }, - _annotationsPointerEventHandler(event) { + _annotationsPointerEventHandler(event): void { if (this._disposed) { return; } @@ -283,7 +283,7 @@ const chartPlugin = { event.stopPropagation(); } }, - _isAnnotationBounded(options) { + _isAnnotationBounded(options): boolean { return isDefined(options.value) || isDefined(options.argument); }, _pullOptions(options) { @@ -301,10 +301,10 @@ const chartPlugin = { offsetY: options.offsetY, }; }, - _forceAnnotationRender() { + _forceAnnotationRender(): void { this._change(['FORCE_RENDER']); }, - _clear() { + _clear(): void { this.hideTooltip(); this.clearHover(); }, @@ -312,8 +312,8 @@ const chartPlugin = { }; const polarChartPlugin = { name: 'annotations_polar_chart', - init() {}, - dispose() {}, + init(): void {}, + dispose(): void {}, members: { _getAnnotationCoords(annotation) { const coords = { @@ -382,8 +382,8 @@ const polarChartPlugin = { }; const vectorMapPlugin = { name: 'annotations_vector_map', - init() {}, - dispose() { + init(): void {}, + dispose(): void { this._annotations._offTracker(); this._annotations._offTracker = null; }, @@ -404,7 +404,7 @@ const vectorMapPlugin = { return coords; }, _annotationsPointerEventHandler: chartPlugin.members._annotationsPointerEventHandler, - _isAnnotationBounded(options) { + _isAnnotationBounded(options): boolean { return isDefined(options.coordinates); }, _pullOptions(options) { @@ -418,18 +418,18 @@ const vectorMapPlugin = { delete vectorMapOptions.value; return vectorMapOptions; }, - _forceAnnotationRender() { + _forceAnnotationRender(): void { this._change(['EXTRA_ELEMENTS']); }, - _getAnnotationStyles() { + _getAnnotationStyles(): { 'text-anchor': string } { return { 'text-anchor': 'start' }; }, - _clear() {}, + _clear(): void {}, }, extenders: { - _prepareExtraElements() { + _prepareExtraElements(): void { const that = this; - const renderElements = () => { + const renderElements = (): void => { that._renderExtraElements(); }; that._annotations._offTracker = that._tracker.on({ @@ -442,8 +442,8 @@ const vectorMapPlugin = { }; const pieChartPlugin = { name: 'annotations_pie_chart', - init() {}, - dispose() {}, + init(): void {}, + dispose(): void {}, members: { _getAnnotationCoords(annotation) { const coords = { @@ -484,7 +484,7 @@ const pieChartPlugin = { }; const corePlugin = { name: 'annotations_core', - init() { + init(): void { this._annotations = { items: [], _hideToolTipForDrag: false, @@ -494,11 +494,11 @@ const corePlugin = { widgetRoot: this.element(), widget: this, }), - hideTooltip() { + hideTooltip(): void { this.tooltip.annotation = null; this.tooltip.hide(); }, - clearItems() { + clearItems(): void { this.items.forEach((i) => i.plaque.clear()); this.items = []; }, @@ -506,14 +506,14 @@ const corePlugin = { this._annotations.tooltip.setRendererOptions(this._getRendererOptions()); }, - dispose() { + dispose(): void { this._annotationsGroup.linkRemove().linkOff(); eventsEngine.off(getDocument(), DOT_EVENT_NS); this._annotationsGroup.off(DOT_EVENT_NS); this._annotations.tooltip && this._annotations.tooltip.dispose(); }, extenders: { - _createHtmlStructure() { + _createHtmlStructure(): void { this._annotationsGroup = this._renderer.g() .attr({ class: `${this._rootClassPrefix}-annotations` }) .css(this._getAnnotationStyles()) @@ -534,16 +534,16 @@ const corePlugin = { }); this._annotationsGroup.on(POINTER_ACTION, this._annotationsPointerEventHandler.bind(this)); }, - _renderExtraElements() { + _renderExtraElements(): void { this._annotationsGroup.clear(); this._annotations.items.forEach((item) => item.draw(this, this._annotationsGroup)); }, - _stopCurrentHandling() { + _stopCurrentHandling(): void { this._annotations.hideTooltip(); }, }, members: { - _buildAnnotations() { + _buildAnnotations(): void { this._annotations.clearItems(); const items = this._getOption('annotations', true); @@ -552,7 +552,7 @@ const corePlugin = { } this._annotations.items = createAnnotations(this, items, this._getOption('commonAnnotationSettings'), this._getOption('customizeAnnotation', true), this._pullOptions); }, - _setAnnotationTooltipOptions() { + _setAnnotationTooltipOptions(): void { const tooltipOptions = extend({}, this._getOption('tooltip')); tooltipOptions.contentTemplate = tooltipOptions.customizeTooltip = undefined; this._annotations.tooltip.update(tooltipOptions); @@ -561,7 +561,7 @@ const corePlugin = { _pullOptions() { return {}; }, _getAnnotationStyles() { return {}; }, }, - customize(constructor) { + customize(constructor): void { constructor.addChange({ code: 'ANNOTATIONITEMS', handler() { diff --git a/packages/devextreme/js/__internal/viz/core/base_widget.ts b/packages/devextreme/js/__internal/viz/core/base_widget.ts index 0e563f544dd0..0041b2077798 100644 --- a/packages/devextreme/js/__internal/viz/core/base_widget.ts +++ b/packages/devextreme/js/__internal/viz/core/base_widget.ts @@ -348,8 +348,8 @@ class BaseWidget extends DOMComponent { return { items: [], groups: [], - launchRequest: () => {}, - doneRequest: () => {}, + launchRequest: (): void => {}, + doneRequest: (): void => {}, }; } @@ -511,7 +511,7 @@ class BaseWidget extends DOMComponent { } this._proxiedTargetParentsScrollHandler = this._proxiedTargetParentsScrollHandler - || function () { this._stopCurrentHandling(); }.bind(this); + || function (): void { this._stopCurrentHandling(); }.bind(this); eventsEngine.off($('').add(this._$prevRootParents), scrollEvents, this._proxiedTargetParentsScrollHandler); diff --git a/packages/devextreme/js/__internal/viz/core/base_widget.utils.ts b/packages/devextreme/js/__internal/viz/core/base_widget.utils.ts index 1df148917f05..d1ab05ae1d04 100644 --- a/packages/devextreme/js/__internal/viz/core/base_widget.utils.ts +++ b/packages/devextreme/js/__internal/viz/core/base_widget.utils.ts @@ -32,14 +32,14 @@ export function createEventTrigger(eventsMap, callbackGetter) { } }); let changes; - triggerEvent.change = function (name) { + triggerEvent.change = function (name): boolean { const eventInfo = eventsMap[name]; if (eventInfo) { (changes = changes || {})[name] = eventInfo; } return !!eventInfo; }; - triggerEvent.applyChanges = function () { + triggerEvent.applyChanges = function (): void { if (changes) { each(changes, (name, eventInfo) => { createEvent(eventInfo.newName || name); @@ -47,27 +47,27 @@ export function createEventTrigger(eventsMap, callbackGetter) { changes = null; } }; - triggerEvent.dispose = function () { + triggerEvent.dispose = function (): void { // @ts-expect-error eventsMap = callbackGetter = triggers = null; }; return triggerEvent; - function createEvent(name) { + function createEvent(name): void { const eventInfo = eventsMap[name]; triggers[eventInfo.name] = callbackGetter(name, eventInfo.actionSettings); } - function triggerEvent(name, arg, complete) { + function triggerEvent(name, arg, complete): void { triggers[name](arg); complete?.(); } } export let createIncidentOccurred = function (widgetName, eventTrigger) { - return function incidentOccurred(id, args) { + return function incidentOccurred(id, args): void { eventTrigger('incidentOccurred', { target: { id, @@ -83,7 +83,7 @@ export let createIncidentOccurred = function (widgetName, eventTrigger) { }; function getResizeManager(resizeCallback) { - return (observe, unsubscribe) => { + return (observe, unsubscribe): () => void => { const { handler, dispose } = createDeferredHandler(resizeCallback, unsubscribe); observe(handler); @@ -91,17 +91,20 @@ function getResizeManager(resizeCallback) { }; } -function createDeferredHandler(callback, unsubscribe) { +function createDeferredHandler( + callback, + unsubscribe, +): { handler: () => void; dispose: () => void } { let timeout; - const handler = function () { + const handler = function (): void { clearTimeout(timeout); timeout = setTimeout(callback, 100); }; return { handler, - dispose() { + dispose(): void { clearTimeout(timeout); unsubscribe(handler); }, @@ -131,11 +134,11 @@ export { createEventTrigger as DEBUG_createEventTrigger }; export const DEBUG_createIncidentOccurred = createIncidentOccurred; -exports.DEBUG_stub_createIncidentOccurred = function (stub) { +exports.DEBUG_stub_createIncidentOccurred = function (stub): void { createIncidentOccurred = stub; }; -exports.DEBUG_restore_createIncidentOccurred = function () { +exports.DEBUG_restore_createIncidentOccurred = function (): void { createIncidentOccurred = DEBUG_createIncidentOccurred; }; diff --git a/packages/devextreme/js/__internal/viz/core/center_template.ts b/packages/devextreme/js/__internal/viz/core/center_template.ts index b9412610cfc0..a5572b15da22 100644 --- a/packages/devextreme/js/__internal/viz/core/center_template.ts +++ b/packages/devextreme/js/__internal/viz/core/center_template.ts @@ -1,5 +1,4 @@ /* eslint-disable @typescript-eslint/explicit-module-boundary-types */ -/* eslint-disable @typescript-eslint/explicit-function-return-type */ import { noop } from '@ts/core/utils/common'; import { patchFontOptions } from '@ts/viz/core/utils'; @@ -7,11 +6,11 @@ import { patchFontOptions } from '@ts/viz/core/utils'; const pieChartPlugin = { name: 'center_template_pie_chart', init: noop, - dispose() { + dispose(): void { this._centerTemplateGroup.linkOff().dispose(); }, extenders: { - _createHtmlStructure() { + _createHtmlStructure(): void { const patchedFontOptions = patchFontOptions(this._themeManager._font); this._centerTemplateGroup = this._renderer.g() .attr({ class: 'dxc-hole-template' }) @@ -19,12 +18,12 @@ const pieChartPlugin = { .css(patchedFontOptions) .linkAppend(); }, - _renderExtraElements() { + _renderExtraElements(): void { this._requestChange(['CENTER_TEMPLATE']); }, }, members: { - _renderCenterTemplate() { + _renderCenterTemplate(): void { const template = this.option('centerTemplate'); const centerTemplateGroup = this._centerTemplateGroup.clear(); @@ -49,7 +48,7 @@ const pieChartPlugin = { }); }, }, - customize(constructor) { + customize(constructor): void { constructor.addChange({ code: 'CENTER_TEMPLATE', handler() { @@ -65,21 +64,21 @@ const gaugePlugin = { init: noop, dispose: pieChartPlugin.dispose, extenders: { - _initCore() { + _initCore(): void { this._createCenterTemplateGroup(); }, - _renderContent() { + _renderContent(): void { const patchedFontOptions = patchFontOptions(this._themeManager._font); this._centerTemplateGroup.css(patchedFontOptions); this._requestChange(['CENTER_TEMPLATE']); }, - _updateExtraElements() { + _updateExtraElements(): void { this._requestChange(['CENTER_TEMPLATE']); }, }, members: { _renderCenterTemplate: pieChartPlugin.members._renderCenterTemplate, - _createCenterTemplateGroup() { + _createCenterTemplateGroup(): void { this._centerTemplateGroup = this._renderer.g() .attr({ class: 'dxg-hole-template' }) .linkOn(this._renderer.root, 'center-template') diff --git a/packages/devextreme/js/__internal/viz/core/data_source.ts b/packages/devextreme/js/__internal/viz/core/data_source.ts index fa2f1757aa82..83c9fe6e73ca 100644 --- a/packages/devextreme/js/__internal/viz/core/data_source.ts +++ b/packages/devextreme/js/__internal/viz/core/data_source.ts @@ -17,15 +17,15 @@ export interface DataSourcePluginMembers { const { postCtor } = DataHelperMixin; let name; const members = { - _dataSourceLoadErrorHandler() { + _dataSourceLoadErrorHandler(): void { this._dataSourceChangedHandler(); }, - _dataSourceOptions() { + _dataSourceOptions(): { paginate: boolean } { return { paginate: false }; }, - _updateDataSource() { + _updateDataSource(): void { this._refreshDataSource(); if (!this.option('dataSource')) { this._dataSourceChangedHandler(); @@ -51,7 +51,7 @@ for (name in DataHelperMixin) { export const plugin = { name: 'data_source', - init() { + init(): void { postCtor.call(this); }, dispose: noop, diff --git a/packages/devextreme/js/__internal/viz/core/export.ts b/packages/devextreme/js/__internal/viz/core/export.ts index 6c873f9dbb14..4e7cbbc3e824 100644 --- a/packages/devextreme/js/__internal/viz/core/export.ts +++ b/packages/devextreme/js/__internal/viz/core/export.ts @@ -14,6 +14,7 @@ /* eslint-disable @typescript-eslint/no-use-before-define */ /* eslint-disable @typescript-eslint/explicit-function-return-type */ +import type { DeferredObj } from '@js/core/utils/deferred'; import { export as _export, image as imageExporter, pdf as pdfExporter, svg as svgExporter, } from '@js/exporter'; @@ -30,6 +31,7 @@ import { getWindow } from '@ts/core/utils/window'; import { end as hoverEventEnd, start as hoverEventStart } from '@ts/events/hover'; import pointerEvents from '@ts/events/pointer'; import type { ThemeValue } from '@ts/viz/core/base_theme_manager'; +import type { SvgDomElement, SvgElement } from '@ts/viz/core/renderers/renderer'; import { Renderer } from '@ts/viz/core/renderers/renderer'; import { patchFontOptions } from '@ts/viz/core/utils'; import { getTheme } from '@ts/viz/themes'; @@ -128,7 +130,15 @@ interface ExportOptions { __test?: ThemeValue; } -function getRendererWrapper(width, height, backgroundColor) { +type SvgElementInstance = InstanceType; + +interface RendererWrapper { + createGroup: () => SvgElementInstance; + getRootContent: () => SvgDomElement; + dispose: () => void; +} + +function getRendererWrapper(width, height, backgroundColor): RendererWrapper { const rendererContainer = $('
').get(0); const renderer = new Renderer({ @@ -139,13 +149,13 @@ function getRendererWrapper(width, height, backgroundColor) { renderer.root.element.setAttribute('data-backgroundcolor', backgroundColor); return { - createGroup() { + createGroup(): SvgElementInstance { return renderer.g(); }, - getRootContent() { + getRootContent(): SvgDomElement { return renderer.root.element.cloneNode(true); }, - dispose() { + dispose(): void { renderer.dispose(); rendererContainer.remove(); }, @@ -181,7 +191,7 @@ function getCreatorFunc(format) { return imageExporter.getData; } -function print(imageSrc, options) { +function print(imageSrc, options): void { const { document } = getWindow(); const iFrame = document.createElement('iframe'); iFrame.onload = setPrint(imageSrc, options); @@ -193,7 +203,7 @@ function print(imageSrc, options) { document.body.appendChild(iFrame); } -function calculatePrintPageWidth(iFrameBody) { +function calculatePrintPageWidth(iFrameBody): number { iFrameBody.style.width = A4WidthCm; const width = getWidth(iFrameBody); @@ -204,7 +214,7 @@ function calculatePrintPageWidth(iFrameBody) { } function setPrint(imageSrc, options) { - return function () { + return function (): void { let window = this.contentWindow; const img = window.document.createElement('img'); window.document.body.appendChild(img); @@ -224,7 +234,7 @@ function setPrint(imageSrc, options) { window.document.body.style['transform-origin'] = '0 0'; } - const removeFrame = () => { + const removeFrame = (): void => { /// #DEBUG options.__test?.checkAssertions(); /// #ENDDEBUG @@ -326,7 +336,7 @@ function createMenuItem(renderer: ThemeValue, options: ThemeValue, settings: The g: menuItem, rect, resetState: () => rect.attr({ fill: null }), - fixPosition: () => { + fixPosition: (): void => { const textBBox = text.getBBox(); text.move(attr.text.x - textBBox.x - (options.rtl ? textBBox.width : 0)); }, @@ -356,7 +366,7 @@ function createMenuItems(renderer: ThemeValue, options: ThemeValue): MenuItem[] return items; } -function getBackgroundColorFromMarkup(markup) { +function getBackgroundColorFromMarkup(markup): string | undefined { if (!isString(markup)) { return $(markup).attr('data-backgroundcolor'); } @@ -364,7 +374,7 @@ function getBackgroundColorFromMarkup(markup) { return GET_COLOR_REGEX.exec(markup)?.[1]; } -export const exportFromMarkup = function (markup, options) { +export const exportFromMarkup = function (markup, options): void { options.format = validateFormat(options.format) || DEFAULT_EXPORT_FORMAT; options.fileName = options.fileName || 'file'; @@ -381,9 +391,9 @@ export const exportFromMarkup = function (markup, options) { _export(markup, options, getCreatorFunc(options.format)); }; -export const getMarkup = (widgets) => combineMarkups(widgets).root.outerHTML; +export const getMarkup = (widgets): string => combineMarkups(widgets).root.outerHTML; -export const exportWidgets = function (widgets, options) { +export const exportWidgets = function (widgets, options): void { options = options || {}; const markupInfo = combineMarkups(widgets, { gridLayout: options.gridLayout, @@ -486,7 +496,12 @@ export let combineMarkups = function (widgets, options: CombineMarkupsOptions = }; }; -function wrapItemsToElement(width, height, backgroundColor, { exportItems, options, compactView }) { +function wrapItemsToElement( + width, + height, + backgroundColor, + { exportItems, options, compactView }, +): SvgDomElement { const rendererWrapper = getRendererWrapper(width, height, backgroundColor); const getVOffset = (item) => { const align = options.verticalAlignment; @@ -854,7 +869,7 @@ function getExportOptions( export const plugin = { name: 'export', - init() { + init(): void { this._exportMenu = new ExportMenu({ renderer: this._renderer, incidentOccurred: this._incidentOccurred, @@ -863,7 +878,7 @@ export const plugin = { }); this._layout.add(this._exportMenu); }, - dispose() { + dispose(): void { this._exportMenu.dispose(); }, @@ -882,7 +897,7 @@ export const plugin = { return pointerEventsValue; }, - exportTo(fileName, format) { + exportTo(fileName, format): DeferredObj { const menu = this._exportMenu; const options = getExportOptions(this, this._getOption('export') || {}, fileName, format); @@ -900,7 +915,7 @@ export const plugin = { menu?.show(); return promise; }, - print() { + print(): DeferredObj { const menu = this._exportMenu; const options = getExportOptions(this, this._getOption('export') || {}); @@ -913,7 +928,7 @@ export const plugin = { options.margin = 0; options.format = 'PNG'; options.useBase64 = true; - options.fileSavingAction = (eventArgs) => { + options.fileSavingAction = (eventArgs): void => { print(`data:image/png;base64,${eventArgs.data}`, { width: options.width, __test: options.__test }); eventArgs.cancel = true; }; @@ -932,7 +947,7 @@ export const plugin = { return promise; }, }, - customize(constructor) { + customize(constructor): void { const proto = constructor.prototype; constructor.addChange({ @@ -956,11 +971,11 @@ export const plugin = { }; /// #DEBUG -exports.DEBUG_set_combineMarkups = function (value) { +exports.DEBUG_set_combineMarkups = function (value): void { combineMarkups = value; }; -exports.DEBUG_set_ExportMenu = function (value) { +exports.DEBUG_set_ExportMenu = function (value): void { ExportMenu = value; }; /// #ENDDEBUG diff --git a/packages/devextreme/js/__internal/viz/core/helpers.ts b/packages/devextreme/js/__internal/viz/core/helpers.ts index 16990db2411c..b238d32fad1e 100644 --- a/packages/devextreme/js/__internal/viz/core/helpers.ts +++ b/packages/devextreme/js/__internal/viz/core/helpers.ts @@ -58,14 +58,14 @@ function combineLists(baseList, thisList) { return baseList !== thisList ? baseList.concat(thisList) : baseList.slice(); } -function buildTotalChanges(proto) { +function buildTotalChanges(proto): void { proto._totalChangesOrder = proto._optionChangesOrder.concat( proto._layoutChangesOrder, proto._customChangesOrder, ); } -function addChange(settings) { +function addChange(settings): void { const proto = this.prototype; const { code } = settings; @@ -92,13 +92,13 @@ function createChainExecutor() { return result; }; executeChain._chain = []; - executeChain.add = function (item) { executeChain._chain.push(item); }; - executeChain.copy = function (executor) { executeChain._chain = executor._chain.slice(); }; + executeChain.add = function (item): void { executeChain._chain.push(item); }; + executeChain.copy = function (executor): void { executeChain._chain = executor._chain.slice(); }; return executeChain; } -export function expand(target, name, expander) { +export function expand(target, name, expander): void { let current = target[name]; if (!current) { current = expander; @@ -116,7 +116,7 @@ export function expand(target, name, expander) { target[name] = current; } -function addPlugin(plugin) { +function addPlugin(plugin): void { const proto = this.prototype; proto._plugins.push(plugin); plugin.fontFields && proto._fontFields.push.apply(proto._fontFields, plugin.fontFields); @@ -136,7 +136,7 @@ function addPlugin(plugin) { } export const replaceInherit = isServerSide - ? function (widget) { + ? function (widget): void { const _inherit = widget.inherit; widget.inherit = function () { const result = _inherit.apply(this, arguments); @@ -162,7 +162,7 @@ export const replaceInherit = isServerSide widget.addChange = noop; widget.addPlugin = noop; } - : function (widget) { + : function (widget): void { const _inherit = widget.inherit; widget.inherit = function () { let proto = this.prototype; @@ -233,7 +233,7 @@ const INHERITED_LISTS = [ ]; export const setupWidgetPrototype = isServerSide - ? function (Widget, members?) { + ? function (Widget, members?): void { const proto = Widget.prototype; if (members) { Object.assign(proto, members); @@ -250,7 +250,7 @@ export const setupWidgetPrototype = isServerSide }); Widget.addPlugin = noop; } - : function (Widget, members?) { + : function (Widget, members?): void { const proto = Widget.prototype; const baseProto = Object.getPrototypeOf(proto); if (members) { diff --git a/packages/devextreme/js/__internal/viz/core/loading_indicator.ts b/packages/devextreme/js/__internal/viz/core/loading_indicator.ts index 2855a0388092..99c7ccdc2ed3 100644 --- a/packages/devextreme/js/__internal/viz/core/loading_indicator.ts +++ b/packages/devextreme/js/__internal/viz/core/loading_indicator.ts @@ -8,7 +8,6 @@ /* eslint-disable no-multi-assign */ /* eslint-disable @typescript-eslint/explicit-module-boundary-types */ /* eslint-disable @typescript-eslint/no-use-before-define */ -/* eslint-disable @typescript-eslint/explicit-function-return-type */ /* eslint-disable @typescript-eslint/prefer-optional-chain */ import type { ThemeValue } from './base_theme_manager'; @@ -152,7 +151,7 @@ export let LoadingIndicator = class LoadingIndicator { export const plugin = { name: 'loading_indicator', - init() { + init(): void { const that = this; that._loadingIndicator = new LoadingIndicator({ @@ -161,7 +160,7 @@ export const plugin = { notify, }); that._scheduleLoadingIndicatorHiding(); - function notify(state) { + function notify(state): void { // This flag is used to suppress redundant `_optionChanged` notifications caused by the // mechanism that synchronizes the `loadingIndicator.show` option and the loading indicator // visibility @@ -173,53 +172,53 @@ export const plugin = { } } }, - dispose() { + dispose(): void { this._loadingIndicator.dispose(); this._loadingIndicator = null; }, members: { - _scheduleLoadingIndicatorHiding() { + _scheduleLoadingIndicatorHiding(): void { this._loadingIndicator.scheduleHiding(); }, - _fulfillLoadingIndicatorHiding() { + _fulfillLoadingIndicatorHiding(): void { this._loadingIndicator.fulfillHiding(); }, - showLoadingIndicator() { + showLoadingIndicator(): void { this._loadingIndicator.show(); }, - hideLoadingIndicator() { + hideLoadingIndicator(): void { this._loadingIndicator.hide(); }, - _onBeginUpdate() { + _onBeginUpdate(): void { if (!this._optionChangedLocker) { this._scheduleLoadingIndicatorHiding(); } }, }, extenders: { - _dataSourceLoadingChangedHandler(isLoading) { + _dataSourceLoadingChangedHandler(isLoading): void { if (isLoading && (this._options.silent('loadingIndicator') || {}).enabled) { this._loadingIndicator.show(); } }, - _setContentSize() { + _setContentSize(): void { this._loadingIndicator.setSize(this._canvas); }, - endUpdate() { + endUpdate(): void { if (this._initialized && this._dataIsReady()) { this._fulfillLoadingIndicatorHiding(); } }, }, - customize(constructor) { + customize(constructor): void { const proto = constructor.prototype; // Of course this looks dirty - but cleaning it is another task. For now it has been just // extracted from BaseWidget with minimal changes. if (proto._dataSourceChangedHandler) { const { _dataSourceChangedHandler } = proto; - proto._dataSourceChangedHandler = function () { + proto._dataSourceChangedHandler = function (): void { this._scheduleLoadingIndicatorHiding(); _dataSourceChangedHandler.apply(this, arguments); }; @@ -238,7 +237,7 @@ export const plugin = { }); proto._eventsMap.onLoadingIndicatorReady = { name: 'loadingIndicatorReady' }; const { _drawn } = proto; - proto._drawn = function () { + proto._drawn = function (): void { _drawn.apply(this, arguments); if (this._dataIsReady()) { this._fulfillLoadingIndicatorHiding(); @@ -249,7 +248,7 @@ export const plugin = { }; /// #DEBUG -exports.DEBUG_set_LoadingIndicator = function (value) { +exports.DEBUG_set_LoadingIndicator = function (value): void { LoadingIndicator = value; }; /// #ENDDEBUG diff --git a/packages/devextreme/js/__internal/viz/core/plaque.ts b/packages/devextreme/js/__internal/viz/core/plaque.ts index d32b3903568b..c860f5549639 100644 --- a/packages/devextreme/js/__internal/viz/core/plaque.ts +++ b/packages/devextreme/js/__internal/viz/core/plaque.ts @@ -17,13 +17,13 @@ const { round, max, min, sin, cos, asin, PI, } = math; -const buildPath = (...points) => points.join(''); +const buildPath = (...points): string => points.join(''); -function getArc(cornerRadius, xDirection, yDirection) { +function getArc(cornerRadius, xDirection, yDirection): string { return `a ${cornerRadius} ${cornerRadius} 0 0 1 ${xDirection * cornerRadius} ${yDirection * cornerRadius}`; } -function getAbsoluteArc(cornerRadius, x, y) { +function getAbsoluteArc(cornerRadius, x, y): string { return `A ${cornerRadius} ${cornerRadius} 0 0 1 ${x} ${y}`; } @@ -42,7 +42,7 @@ function rotateSize(options, angle) { return options; } -function getCloudAngle({ width, height }, x, y, anchorX, anchorY) { +function getCloudAngle({ width, height }, x, y, anchorX, anchorY): 0 | 90 | 180 | 270 { const halfWidth = width / 2; const halfHeight = height / 2; @@ -83,7 +83,7 @@ function getCloudPoints( anchorY, { arrowWidth, cornerRadius = 0 }, bounded, -) { +): string { const halfArrowWidth = arrowWidth / 2; const halfWidth = width / 2; const halfHeight = height / 2; @@ -396,7 +396,7 @@ export let Plaque = class { draw({ x: anchorX, y: anchorY, canvas = {}, offsetX, offsetY, offset = 0, ...restProps - }) { + }): boolean { const { options } = this; let { x, y } = options; @@ -437,7 +437,7 @@ export let Plaque = class { const contentWidth = options.width > 0 ? options.width : null; const contentHeight = options.height > 0 ? options.height : null; - const onRender = () => { + const onRender = (): void => { const bBox = this._contentBBox = this.measureContent(this.widget, this._contentGroup); const size = this._size = { @@ -520,7 +520,7 @@ export let Plaque = class { return true; } - _draw() { + _draw(): void { const renderer = this.widget._renderer; const { options } = this; @@ -572,7 +572,7 @@ export let Plaque = class { }; } - clear() { + clear(): this { if (this._root) { this._root.remove(); this._shadow.remove(); @@ -581,19 +581,19 @@ export let Plaque = class { return this; } - customizeCloud(attr) { + customizeCloud(attr): void { if (this._cloud) { this._cloud.attr(attr); } } - moveRoot(x, y) { + moveRoot(x, y): void { if (this._root) { this._root.move(x, y); } } - move(x, y) { + move(x, y): void { x = round(x); y = round(y); this.x = x; @@ -623,7 +623,7 @@ export let Plaque = class { ); } - hitTest(x, y) { + hitTest(x, y): boolean { const { width, height } = this._size || {}; return Math.abs(x - this.x) <= width / 2 && Math.abs(y - this.y) <= height / 2; } diff --git a/packages/devextreme/js/__internal/viz/core/renderers/renderer.ts b/packages/devextreme/js/__internal/viz/core/renderers/renderer.ts index ae728eb505fa..575ef67c3a1a 100644 --- a/packages/devextreme/js/__internal/viz/core/renderers/renderer.ts +++ b/packages/devextreme/js/__internal/viz/core/renderers/renderer.ts @@ -108,7 +108,7 @@ interface FuncIriNode extends ChildNode { readonly childNodes: NodeListOf; } -interface SvgDomElement extends SVGElement { +export interface SvgDomElement extends SVGElement { _fixFuncIri?: FuncIriCallback; cloneNode: (deep?: boolean) => SvgDomElement; getBBox?: () => DOMRect; diff --git a/packages/devextreme/js/__internal/viz/core/tooltip.ts b/packages/devextreme/js/__internal/viz/core/tooltip.ts index 517b6ff1e7f0..0928736747c0 100644 --- a/packages/devextreme/js/__internal/viz/core/tooltip.ts +++ b/packages/devextreme/js/__internal/viz/core/tooltip.ts @@ -8,7 +8,6 @@ /* eslint-disable no-multi-assign */ /* eslint-disable @typescript-eslint/explicit-module-boundary-types */ /* eslint-disable @typescript-eslint/no-unsafe-return */ -/* eslint-disable @typescript-eslint/explicit-function-return-type */ /* eslint-disable no-else-return */ /* eslint-disable @typescript-eslint/no-unused-expressions */ /* eslint-disable @typescript-eslint/prefer-optional-chain */ @@ -254,8 +253,8 @@ export let Tooltip = class Tooltip { } const drawTooltip = ({ - group, onRender, eventData, isMoving, templateCallback = () => {}, - }: TooltipDrawParams) => { + group, onRender, eventData, isMoving, templateCallback = (): void => {}, + }: TooltipDrawParams): true | undefined => { const state = this._state; if (!isMoving) { const template = this._template; @@ -587,15 +586,15 @@ export interface TooltipPluginMembers { export const plugin = { name: 'tooltip', - init() { + init(): void { this._initTooltip(); }, - dispose() { + dispose(): void { this._disposeTooltip(); }, members: { // The method exists only to be overridden in sparklines. - _initTooltip() { + _initTooltip(): void { this._tooltip = new Tooltip({ cssClass: `${this._rootClassPrefix}-tooltip`, eventTrigger: this._eventTrigger, @@ -605,25 +604,25 @@ export const plugin = { }); }, // The method exists only to be overridden in sparklines. - _disposeTooltip() { + _disposeTooltip(): void { this._tooltip.dispose(); this._tooltip = null; }, // The method exists only to be overridden in sparklines. - _setTooltipRendererOptions() { + _setTooltipRendererOptions(): void { this._tooltip.setRendererOptions(this._getRendererOptions()); }, // The method exists only to be overridden in sparklines and gauges. - _setTooltipOptions() { + _setTooltipOptions(): void { this._tooltip.update(this._getOption('tooltip')); }, }, extenders: { - _stopCurrentHandling() { + _stopCurrentHandling(): void { this._tooltip && this._tooltip.hide(); }, }, - customize(constructor) { + customize(constructor): void { const proto = constructor.prototype; proto._eventsMap.onTooltipShown = { name: 'tooltipShown' }; @@ -650,7 +649,7 @@ export const plugin = { }; /// #DEBUG -exports.DEBUG_set_tooltip = function (value) { +exports.DEBUG_set_tooltip = function (value): void { Tooltip = value; }; /// #ENDDEBUG diff --git a/packages/devextreme/js/__internal/viz/core/utils.ts b/packages/devextreme/js/__internal/viz/core/utils.ts index 744f2dafb9fa..6549d26ecd1e 100644 --- a/packages/devextreme/js/__internal/viz/core/utils.ts +++ b/packages/devextreme/js/__internal/viz/core/utils.ts @@ -54,43 +54,43 @@ let numDefsSvgElements = 1; export const PANE_PADDING = 10; -export const getLog = function (value, base) { +export const getLog = function (value, base): number { if (!value) { return _NaN; } return log(value) / log(base); }; -export const getAdjustedLog10 = function (value) { +export const getAdjustedLog10 = function (value): number { return adjust(getLog(value, 10)); }; -export const raiseTo = function (power, base) { +export const raiseTo = function (power, base): number { return base ** power; }; // Translates angle to [0, 360) // Expects number, no validation -export const normalizeAngle = function (angle) { +export const normalizeAngle = function (angle): number { return ((angle % 360) + 360) % 360; }; // Maps angle in trigonometric space to angle in 'renderer' space // Expects numbers, no validation -export const convertAngleToRendererSpace = function (angle) { +export const convertAngleToRendererSpace = function (angle): number { return 90 - angle; }; // Maps angle in degrees to angle in radians // Expects number, no validation -export const degreesToRadians = function (value) { +export const degreesToRadians = function (value): number { return PI * value / 180; }; // Calculates sin and cos for in degrees // Expects number, no validation // eslint-disable-next-line import/no-mutable-exports -- description seam for tests -export let getCosAndSin = function (angle) { +export let getCosAndSin = function (angle): { cos: number; sin: number } { const angleInRadians = degreesToRadians(angle); return { cos: _cos(angleInRadians), sin: _sin(angleInRadians) }; }; @@ -101,7 +101,7 @@ const DECIMAL_ORDER_THRESHOLD = 1E-14; // ____________________ // / 2 2 // \/ (y2-y1) + (x2-x1) -export const getDistance = function (x1, y1, x2, y2) { +export const getDistance = function (x1, y1, x2, y2): number { const diffX = x2 - x1; const diffY = y2 - y1; return sqrt(diffY * diffY + diffX * diffX); @@ -141,7 +141,7 @@ export const getAppropriateFormat = function (start, end, count) { return null; }; // @ts-expect-error -export const roundValue = function (value, precision) { +export const roundValue = function (value, precision): number | undefined { if (precision > 20) { precision = 20; } @@ -201,7 +201,7 @@ function decreaseFields(object, keys, eachDecrease, decrease) { return dec; } -export function normalizeEnum(value) { +export function normalizeEnum(value): string { return String(value).toLowerCase(); } @@ -305,7 +305,12 @@ export let patchFontOptions = function (options) { return fontOptions; }; -export function convertPolarToXY(centerCoords, startAngle, angle, radius) { +export function convertPolarToXY( + centerCoords, + startAngle, + angle, + radius, +): { x: number; y: number } { const shiftAngle = 90; const normalizedRadius = radius > 0 ? radius : 0; @@ -318,7 +323,7 @@ export function convertPolarToXY(centerCoords, startAngle, angle, radius) { }; } -export const convertXYToPolar = function (centerCoords, x, y) { +export const convertXYToPolar = function (centerCoords, x, y): { phi: number; r: number } { const radius = getDistance(centerCoords.x, centerCoords.y, x, y); const angle = atan2(y - centerCoords.y, x - centerCoords.x); @@ -389,9 +394,9 @@ export const getCategoriesInfo = function (categories, startValue, endValue) { }; }; -export function isRelativeHeightPane(pane) { return !(pane.unit % 2); } +export function isRelativeHeightPane(pane): boolean { return !(pane.unit % 2); } -export function normalizePanesHeight(panes) { +export function normalizePanesHeight(panes): void { panes.forEach((pane) => { const { height } = pane; let unit = 0; @@ -444,7 +449,7 @@ export function normalizePanesHeight(panes) { } // eslint-disable-next-line import/no-mutable-exports -- description seam for tests -export let updatePanesCanvases = function (panes, canvas, rotated) { +export let updatePanesCanvases = function (panes, canvas, rotated): void { let distributedSpace = 0; const padding = PANE_PADDING; const paneSpace = rotated @@ -573,13 +578,13 @@ export function convertVisualRangeObject(visualRange, convertToVisualRange?) { export function getAddFunction(range, correctZeroLevel) { // T170398 if (range.dataType === 'datetime') { - return function (rangeValue, marginValue, sign = 1) { + return function (rangeValue, marginValue, sign = 1): Date { return new Date(rangeValue.getTime() + sign * marginValue); }; } if (range.axisType === 'logarithmic') { - return function (rangeValue, marginValue, sign = 1) { + return function (rangeValue, marginValue, sign = 1): number { const log = getLogExt(rangeValue, range.base) + sign * marginValue; return raiseToExt(log, range.base); }; @@ -656,7 +661,7 @@ export function adjustVisualRange(options, visualRange, wholeRange, dataRange?) }; } -export function getLogExt(value, base, allowNegatives = false, linearThreshold?) { +export function getLogExt(value, base, allowNegatives = false, linearThreshold?): number { if (!allowNegatives) { return getLog(value, base); } @@ -673,7 +678,7 @@ export function getLogExt(value, base, allowNegatives = false, linearThreshold?) ); } -export function raiseToExt(value, base, allowNegatives = false, linearThreshold?) { +export function raiseToExt(value, base, allowNegatives = false, linearThreshold?): number { if (!allowNegatives) { return raiseTo(value, base); } @@ -710,12 +715,12 @@ export function valueOf(value) { return value && value.valueOf(); } -export function pointInCanvas(canvas, x, y) { +export function pointInCanvas(canvas, x, y): boolean { return x >= canvas.left && x <= canvas.right && y >= canvas.top && y <= canvas.bottom; } // eslint-disable-next-line import/no-mutable-exports -- description seam for tests -export let getNextDefsSvgId = () => `DevExpress_${numDefsSvgElements++}`; +export let getNextDefsSvgId = (): string => `DevExpress_${numDefsSvgElements++}`; export function extractColor(color, isBase?) { if (isString(color) || !color) { diff --git a/packages/devextreme/js/__internal/viz/funnel/label.ts b/packages/devextreme/js/__internal/viz/funnel/label.ts index d651bdb030b0..4b3e1026b00a 100644 --- a/packages/devextreme/js/__internal/viz/funnel/label.ts +++ b/packages/devextreme/js/__internal/viz/funnel/label.ts @@ -21,7 +21,7 @@ const COLUMNS_LABEL_INDENT = 20; const CONNECTOR_INDENT = 4; const PREVENT_EMPTY_PIXEL_OFFSET = 1; -function getLabelIndent(pos) { +function getLabelIndent(pos): 0 | 5 | 20 { pos = normalizeEnum(pos); if (pos === OUTSIDE_POSITION) { return OUTSIDE_LABEL_INDENT; @@ -31,7 +31,7 @@ function getLabelIndent(pos) { return COLUMNS_LABEL_INDENT; } -function isOutsidePosition(pos) { +function isOutsidePosition(pos): boolean { pos = normalizeEnum(pos); return pos === OUTSIDE_POSITION || pos !== INSIDE_POSITION; } @@ -54,7 +54,7 @@ function getOutsideLeftLabelPosition(coords, bBox, options, inverted) { }; } -function getInsideLabelPosition(coords, bBox, options) { +function getInsideLabelPosition(coords, bBox, options): { x: number; y: number } { const width = coords[2] - coords[0]; const height = coords[7] - coords[1]; @@ -94,7 +94,7 @@ function getConnectorStrategy(options, inverted) { } return { - isLabelInside() { + isLabelInside(): boolean { return !isOutsidePosition(options.position); }, getFigureCenter, @@ -108,7 +108,7 @@ function getConnectorStrategy(options, inverted) { .concat([...Array(bBox.height + 1)].map((_, i) => [x1, y + i])); }, - isHorizontal() { return true; }, + isHorizontal(): boolean { return true; }, findFigurePoint(figure) { return getFigureCenter(figure); @@ -172,7 +172,7 @@ function correctLabelPosition(pos, bBox, rect) { return pos; } -function removeEmptySpace(labels, requiredSpace, startPoint) { +function removeEmptySpace(labels, requiredSpace, startPoint): void { labels.reduce((requiredSpace, label, index, labels) => { const prevLabel = labels[index + 1]; if (requiredSpace > 0) { @@ -198,14 +198,14 @@ export const plugin = { init: noop, dispose: noop, extenders: { - _initCore() { + _initCore(): void { this._labelsGroup = this._renderer.g().attr({ class: `${this._rootClassPrefix}-labels`, }).append(this._renderer.root); this._labels = []; }, - _applySize() { + _applySize(): void { const options = this._getOption('label'); const adaptiveLayout = this._getOption('adaptiveLayout'); const rect = this._rect; @@ -250,11 +250,11 @@ export const plugin = { } }, - _buildNodes() { + _buildNodes(): void { this._createLabels(); }, - _change_TILING() { + _change_TILING(): void { const that = this; const options = that._getOption('label'); let getCoords = getInsideLabelPosition; @@ -311,7 +311,7 @@ export const plugin = { }, }, members: { - _resolveLabelOverlapping() { + _resolveLabelOverlapping(): void { const that = this; const resolveLabelOverlapping = normalizeEnum(that._getOption('resolveLabelOverlapping', true)); const labels = this._getOption('inverted', true) ? that._labels.slice().reverse() : that._labels; @@ -368,11 +368,11 @@ export const plugin = { } }, - _defaultLabelTextAlignment() { + _defaultLabelTextAlignment(): 'left' | 'right' { return this._getOption('rtlEnabled', true) ? 'right' : 'left'; }, - _correctLabelWidth(label, item, options) { + _correctLabelWidth(label, item, options): void { const isLeftPos = options.horizontalAlignment === 'left'; const minX = isLeftPos ? this._labelRect[0] : item[2]; const maxX = isLeftPos ? item[0] : this._labelRect[2]; @@ -383,7 +383,7 @@ export const plugin = { } }, - _createLabels() { + _createLabels(): void { const that = this; const labelOptions = that._getOption('label'); const connectorStrategy = getConnectorStrategy(labelOptions, that._getOption('inverted', true)); @@ -421,7 +421,7 @@ export const plugin = { } }, }, - customize(constructor) { + customize(constructor): void { constructor.prototype._proxyData.push(function (x, y) { const that = this; let data; diff --git a/packages/devextreme/js/__internal/viz/funnel/tiling.ts b/packages/devextreme/js/__internal/viz/funnel/tiling.ts index 869d741b47dd..07e3fe826dd3 100644 --- a/packages/devextreme/js/__internal/viz/funnel/tiling.ts +++ b/packages/devextreme/js/__internal/viz/funnel/tiling.ts @@ -12,7 +12,7 @@ export function getAlgorithm(name) { return algorithms[_normalizeEnum(name)] || defaultAlgorithm; } -export function addAlgorithm(name, callback, setDefault?) { +export function addAlgorithm(name, callback, setDefault?): void { algorithms[name] = callback; if (setDefault) { diff --git a/packages/devextreme/js/__internal/viz/funnel/tooltip.ts b/packages/devextreme/js/__internal/viz/funnel/tooltip.ts index 7695956d3e5c..226c485c4bbf 100644 --- a/packages/devextreme/js/__internal/viz/funnel/tooltip.ts +++ b/packages/devextreme/js/__internal/viz/funnel/tooltip.ts @@ -24,11 +24,11 @@ export const plugin = { dispose: noop, extenders: { - _buildNodes() { + _buildNodes(): void { this.hideTooltip(); }, - _change_TILING() { + _change_TILING(): void { if (this._tooltipIndex >= 0) { this._moveTooltip(this._items[this._tooltipIndex]); } @@ -36,19 +36,19 @@ export const plugin = { }, members: { - hideTooltip() { + hideTooltip(): void { if (this._tooltipIndex >= 0) { this._tooltipIndex = -1; this._tooltip.hide(); } }, - _moveTooltip(item, coords) { + _moveTooltip(item, coords): void { const xy = getCoords(coords, item.coords, this._renderer); this._tooltip.move(xy[0], xy[1], 0); }, - _showTooltip(index, coords) { + _showTooltip(index, coords): void { const that = this; const tooltip = that._tooltip; const item = that._items[index]; @@ -58,7 +58,7 @@ export const plugin = { return; } - const callback = (result) => { + const callback = (result): void => { if (result === undefined) { return; } @@ -77,7 +77,7 @@ export const plugin = { }, { x: xy[0], y: xy[1], offset: 0 }, { item }, undefined, callback)); }, }, - customize(constructor) { + customize(constructor): void { constructor.addPlugin(pluginTooltip); }, }; diff --git a/packages/devextreme/js/__internal/viz/funnel/tracker.ts b/packages/devextreme/js/__internal/viz/funnel/tracker.ts index 9bc5f1bd25f1..ee1c5c345159 100644 --- a/packages/devextreme/js/__internal/viz/funnel/tracker.ts +++ b/packages/devextreme/js/__internal/viz/funnel/tracker.ts @@ -5,7 +5,6 @@ /* eslint-disable import/no-mutable-exports */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable consistent-return */ -/* eslint-disable @typescript-eslint/explicit-module-boundary-types */ /* eslint-disable @typescript-eslint/no-unsafe-return */ /* eslint-disable @typescript-eslint/explicit-function-return-type */ /* eslint-disable @typescript-eslint/prefer-optional-chain */ @@ -24,13 +23,13 @@ let _TESTS_dataKey; proto._eventsMap.onItemClick = { name: 'itemClick' }; proto._eventsMap.onLegendClick = { name: 'legendClick' }; -const getDataKey = function () { +const getDataKey = function (): string { return DATA_KEY_BASE + dataKeyModifier++; }; export const plugin = { name: 'tracker', - init() { + init(): void { const that = this; const dataKey = getDataKey(); /// #DEBUG @@ -64,7 +63,7 @@ export const plugin = { getNode(index) { return that._items[index]; }, - click(e) { + click(e): void { const proxyData = getProxyData(e.event); const dataType = proxyData && proxyData.type; const event = dataType === 'legend' ? 'legendClick' : 'itemClick'; @@ -78,11 +77,11 @@ export const plugin = { this._dataKey = dataKey; }, - dispose() { + dispose(): void { this._tracker.dispose(); }, extenders: { - _change_TILING() { + _change_TILING(): void { const dataKey = this._dataKey; this._items.forEach((item, index) => { item.element.data(dataKey, index); diff --git a/packages/devextreme/js/__internal/viz/palette.ts b/packages/devextreme/js/__internal/viz/palette.ts index 184db0f2a8ac..83e85e9fee75 100644 --- a/packages/devextreme/js/__internal/viz/palette.ts +++ b/packages/devextreme/js/__internal/viz/palette.ts @@ -194,7 +194,7 @@ export function getPalette(palette, parameters) { return type ? result[type].slice(0) : result; } -export function registerPalette(name, palette) { +export function registerPalette(name, palette): void { const item = {}; let paletteName; @@ -233,7 +233,7 @@ export let getAccentColor = function (palette, themeDefault) { return palette.accentColor || palette[0]; }; -function RingBuf(buf) { +function RingBuf(buf): void { let ind = 0; this.next = function () { const res = buf[ind++]; @@ -242,7 +242,7 @@ function RingBuf(buf) { } return res; }; - this.reset = function () { + this.reset = function (): void { ind = 0; }; } @@ -252,7 +252,7 @@ function getAlternateColorsStrategy(palette, parameters) { const paletteSteps = new RingBuf([0, stepHighlight, -stepHighlight]); let currentPalette = []; - function reset() { + function reset(): void { const step = paletteSteps.next(); currentPalette = step ? getAlteredPalette(palette, step) : palette.slice(0); } @@ -278,7 +278,7 @@ function getAlternateColorsStrategy(palette, parameters) { return colors; }, - reset() { + reset(): void { paletteSteps.reset(); reset(); }, @@ -307,7 +307,7 @@ function getExtrapolateColorsStrategy(palette, parameters) { return colors; }, - reset() { + reset(): void { }, }; @@ -428,7 +428,7 @@ function getColorMixer(palette, parameters) { } }, - reset() { + reset(): void { }, }; @@ -437,7 +437,7 @@ function getColorMixer(palette, parameters) { // eslint-disable-next-line import/no-mutable-exports -- description seam for tests export let createPalette = function (palette, parameters, themeDefaultPalette?) { const paletteObj = { - dispose() { + dispose(): void { this._extensionStrategy = null; }, @@ -487,7 +487,7 @@ function getAlteredPalette(originalPalette, step) { return palette; } -function getNewColor(currentColor, step) { +function getNewColor(currentColor, step): string { const newColor = new Color(fallbackOf(currentColor)).alter(step); const lightness = getLightness(newColor); let shift = step; @@ -497,7 +497,7 @@ function getNewColor(currentColor, step) { return shiftChannels(currentColor, shift); } -function getLightness(color) { +function getLightness(color): number { return color.r * 0.3 + color.g * 0.59 + color.b * 0.11; } @@ -518,7 +518,7 @@ function createDiscreteColors(source, count) { const gradient = []; let i; - function addColor(pos) { + function addColor(pos): void { const k = sourceCount * pos; const kl = Math.floor(k); const kr = Math.ceil(k); @@ -541,7 +541,7 @@ export function getGradientPalette(source, themeDefaultPalette) { const palette = getPalette(source, { type: 'gradientSet', themeDefault: themeDefaultPalette }); return { - getColor(ratio) { + getColor(ratio): string | null { return ratio >= 0 && ratio <= 1 ? mixColors(palette[0], palette[1], ratio) : null; }, }; diff --git a/packages/devextreme/js/__internal/viz/pie_chart.ts b/packages/devextreme/js/__internal/viz/pie_chart.ts index c8ede6df571c..f151455659ba 100644 --- a/packages/devextreme/js/__internal/viz/pie_chart.ts +++ b/packages/devextreme/js/__internal/viz/pie_chart.ts @@ -10,12 +10,15 @@ import { plugins as annotationsPlugins } from '@ts/viz/core/annotations'; import type { ThemeValue } from '@ts/viz/core/base_theme_manager'; import { setupWidgetPrototype } from '@ts/viz/core/helpers'; import { plugins as centerTemplatePlugins } from '@ts/viz/core/center_template'; +import type { Canvas } from '@ts/viz/core/types'; import { getVerticallyShiftedAngularCoords as _getVerticallyShiftedAngularCoords, normalizeAngle } from '@ts/viz/core/utils'; import { Range } from '@ts/viz/translators/range'; import { Translator1D } from '@ts/viz/translators/translator1d'; import { BaseChart, overlapping } from './chart_components/base_chart'; +type Translator1DInstance = InstanceType; + const { states } = consts; const seriesSpacing = consts.pieSeriesSpacing; @@ -43,7 +46,7 @@ function dividePoints(series, points?) { }, points || { left: [], right: [] }); } -function resolveOverlappedLabels(points, shiftCallback, inverseDirection, canvas) { +function resolveOverlappedLabels(points, shiftCallback, inverseDirection, canvas): boolean { let overlapped = false; if (inverseDirection) { points.left.reverse(); @@ -66,7 +69,7 @@ function resolveOverlappedLabels(points, shiftCallback, inverseDirection, canvas ) || overlapped; } -function getLegendItemAction(points) { +function getLegendItemAction(points): string { let state = NORMAL_STATE; points.forEach((point) => { @@ -100,7 +103,7 @@ function correctPercentValue(value) { } const pieSizeEqualizer = (function () { - function equalize(group, allPies) { + function equalize(group, allPies): void { const pies = allPies.filter((p) => p._isVisible() && p.getSizeGroup() === group); const minRadius = Math.min.apply(null, pies.map((p) => p.getSizeGroupLayout().radius)); const minPie = pies.filter((p) => p.getSizeGroupLayout().radius === minRadius); @@ -123,7 +126,7 @@ const pieSizeEqualizer = (function () { let timers = {}; return { - queue(pie) { + queue(pie): void { const group = pie.getSizeGroup(); pies = addToList(pies, pie); @@ -132,7 +135,7 @@ const pieSizeEqualizer = (function () { equalize(group, pies); }); }, - remove(pie) { + remove(pie): void { pies = removeFromList(pies, pie); if (!pies.length) { @@ -158,12 +161,12 @@ class PieChart extends BaseChart { }); } - _disposeCore() { + _disposeCore(): void { pieSizeEqualizer.remove(this); super._disposeCore(); } - _groupSeries() { + _groupSeries(): void { const { series } = this; this._groupsData = { @@ -175,7 +178,7 @@ class PieChart extends BaseChart { }; } - getArgumentAxis() { + getArgumentAxis(): null { return null; } @@ -184,16 +187,16 @@ class PieChart extends BaseChart { .setCodomain(360, 0); return { - getTranslator() { + getTranslator(): Translator1DInstance { return translator; }, - setBusinessRange(range) { + setBusinessRange(range): void { translator.setDomain(range.min, range.max); }, }; } - _populateBusinessRange() { + _populateBusinessRange(): void { this.series.map((series) => { const range = new Range(); range.addRange(series.getRangeData().val); @@ -202,22 +205,22 @@ class PieChart extends BaseChart { }); } - _specialProcessSeries() { + _specialProcessSeries(): void { _each(this.series, (_, singleSeries) => { singleSeries.arrangePoints(); }); } - _checkPaneName() { + _checkPaneName(): boolean { return true; } - _processSingleSeries(singleSeries) { + _processSingleSeries(singleSeries): void { super._processSingleSeries(singleSeries); singleSeries.arrangePoints(); } - _handleSeriesDataUpdated() { + _handleSeriesDataUpdated(): void { let maxPointCount = 0; this.series.forEach((s) => { maxPointCount = Math.max(s.getPointsCount(), maxPointCount); @@ -275,7 +278,7 @@ class PieChart extends BaseChart { return items; } - _getLayoutTargets() { + _getLayoutTargets(): { canvas: Canvas }[] { return [{ canvas: this._canvas }]; } @@ -326,7 +329,7 @@ class PieChart extends BaseChart { return layout; } - _updateSeriesDimensions(drawOptions) { + _updateSeriesDimensions(drawOptions): void { const visibleSeries = this._getVisibleSeries(); const lengthVisibleSeries = visibleSeries.length; let innerRad; @@ -355,7 +358,7 @@ class PieChart extends BaseChart { } } - _renderSeries(drawOptions, isRotated, isLegendInside) { + _renderSeries(drawOptions, isRotated, isLegendInside): void { this._calculateSeriesLayout(drawOptions, isRotated); if (!drawOptions.sizeGroupLayout && this.getSizeGroup()) { @@ -371,7 +374,7 @@ class PieChart extends BaseChart { return this._center; } - getInnerRadius() { + getInnerRadius(): number { return this._innerRadius; } @@ -379,7 +382,7 @@ class PieChart extends BaseChart { const legend = this._legend; const items = this._getLegendTargets().map((i) => i.legendData); - return (target) => { + return (target): void => { items.forEach((data) => { const points = []; const callback = legend.getActionCallback({ index: data.id }); @@ -402,7 +405,7 @@ class PieChart extends BaseChart { }; } - _locateLabels(resolveLabelOverlapping) { + _locateLabels(resolveLabelOverlapping): void { let iterationCount = 0; let labelsWereOverlapped; let wordWrapApplied; @@ -419,7 +422,7 @@ class PieChart extends BaseChart { return this.series.reduce((r, s) => s.adjustLabels(moveLabelsFromCenter) || r, false); } - _resolveLabelOverlappingShift() { + _resolveLabelOverlappingShift(): boolean { const inverseDirection = this.option('segmentsDirection') === 'anticlockwise'; const seriesByPosition = this.series.reduce((r, s) => { (r[s.getOptions().label.position] || r.outside).push(s); @@ -472,7 +475,7 @@ class PieChart extends BaseChart { return labelsOverlapped; } - _setGeometry({ centerX: x, centerY: y, radiusInner }) { + _setGeometry({ centerX: x, centerY: y, radiusInner }): void { this._center = { x, y }; this._innerRadius = radiusInner; } diff --git a/packages/devextreme/js/__internal/viz/range_selector/common.ts b/packages/devextreme/js/__internal/viz/range_selector/common.ts index c9383f74e48c..2db6c36e4f5e 100644 --- a/packages/devextreme/js/__internal/viz/range_selector/common.ts +++ b/packages/devextreme/js/__internal/viz/range_selector/common.ts @@ -1,6 +1,5 @@ /* eslint-disable func-names */ /* eslint-disable @typescript-eslint/explicit-module-boundary-types */ -/* eslint-disable @typescript-eslint/explicit-function-return-type */ import devices from '@ts/core/devices'; import { browser } from '@ts/core/utils/browser'; @@ -32,7 +31,7 @@ export const formatValue = function ( valueType?, type?, logarithmBase?, -) { +): string { const formatObject = { value, valueText: _format(value, { @@ -51,4 +50,5 @@ export const formatValue = function ( ); }; -export const isFirefoxOnAndroid = () => browser.mozilla && devices.real().android; +export const isFirefoxOnAndroid = (): boolean | undefined => browser.mozilla + && devices.real().android; diff --git a/packages/devextreme/js/__internal/viz/sankey/data_validator.ts b/packages/devextreme/js/__internal/viz/sankey/data_validator.ts index c0057bcf794e..1cde6dab65be 100644 --- a/packages/devextreme/js/__internal/viz/sankey/data_validator.ts +++ b/packages/devextreme/js/__internal/viz/sankey/data_validator.ts @@ -5,7 +5,7 @@ import graphModule from './graph'; const validator = { - validate(data, incidentOccurred) { + validate(data, incidentOccurred): null { let result = null; if (this._hasCycle(data)) { // @ts-expect-error diff --git a/packages/devextreme/js/__internal/viz/sankey/graph.ts b/packages/devextreme/js/__internal/viz/sankey/graph.ts index f660616b6e65..6912ce9142dd 100644 --- a/packages/devextreme/js/__internal/viz/sankey/graph.ts +++ b/packages/devextreme/js/__internal/viz/sankey/graph.ts @@ -11,7 +11,7 @@ const GRAY = 'gray'; const BLACK = 'black'; const routines = { - maxOfArray(arr, callback?) { + maxOfArray(arr, callback?): number { let m = 0; let callback_function = (v) => v; if (callback) { @@ -98,7 +98,7 @@ const struct = { return this._hasCycle; }, - _depthFirstSearch(links, vertices, vertex) { + _depthFirstSearch(links, vertices, vertex): void { vertices[vertex].color = GRAY; const averts = getAdjacentVertices(links, vertex); for (let a = 0; a < averts.length; a++) { diff --git a/packages/devextreme/js/__internal/viz/sankey/layout.ts b/packages/devextreme/js/__internal/viz/sankey/layout.ts index 29a09d1934f1..b78243c32cb9 100644 --- a/packages/devextreme/js/__internal/viz/sankey/layout.ts +++ b/packages/devextreme/js/__internal/viz/sankey/layout.ts @@ -30,7 +30,7 @@ export const layout = { } }, - _getInWeightForNode(nodeTitle, links) { + _getInWeightForNode(nodeTitle, links): number { let w = 0; links.forEach((link) => { if (link[1] === nodeTitle) { @@ -40,7 +40,7 @@ export const layout = { return w; }, - _getOutWeightForNode(nodeTitle, links) { + _getOutWeightForNode(nodeTitle, links): number { let w = 0; links.forEach((link) => { if (link[0] === nodeTitle) { @@ -92,7 +92,7 @@ export const layout = { return cascades; }, - _getWeightForCascade(cascades, cascadeIdx) { + _getWeightForCascade(cascades, cascadeIdx): number { let wMax = 0; const cascade = cascades[cascadeIdx]; Object.keys(cascade).forEach((nodeTitle) => { @@ -101,7 +101,7 @@ export const layout = { return wMax; }, - _getMaxWeightThroughCascades(cascades) { + _getMaxWeightThroughCascades(cascades): number { const max = []; cascades.forEach((cascade) => { let mW = 0; @@ -206,7 +206,7 @@ export const layout = { return null; }, - _findIndexByName(rects, nodeTitle) { + _findIndexByName(rects, nodeTitle): number | null { let index = 0; for (let c = 0; c < rects.length; c++) { for (let r = 0; r < rects[c].length; r++) { @@ -307,7 +307,7 @@ export const layout = { return result; }, - _fitNodeHeight(nodeName, nodeRects, paths) { + _fitNodeHeight(nodeName, nodeRects, paths): void { const targetRect = this._findRectByName(nodeRects, nodeName); let heightOfLinksSummaryIn = 0; let heightOfLinksSummaryOut = 0; @@ -323,7 +323,7 @@ export const layout = { targetRect.height = Math.max(heightOfLinksSummaryIn, heightOfLinksSummaryOut); }, - _fitAllNodesHeight(nodeRects, paths) { + _fitAllNodesHeight(nodeRects, paths): void { for (let c = 0; c < nodeRects.length; c++) { for (let r = 0; r < nodeRects[c].length; r++) { this._fitNodeHeight(nodeRects[c][r]._name, nodeRects, paths); @@ -331,7 +331,7 @@ export const layout = { } }, - _spline(rectLeft, rectRight) { + _spline(rectLeft, rectRight): string { const p_UpLeft = { x: rectLeft.x + rectLeft.width, y: rectLeft.y }; const p_DownLeft = { x: rectLeft.x + rectLeft.width, y: rectLeft.y + rectLeft.height }; const p_UpRight = { x: rectRight.x, y: rectRight.y }; @@ -372,7 +372,7 @@ export const layout = { return result; }, - overlap(box1, box2) { + overlap(box1, box2): boolean { return !(box2.x > box1.x + box1.width || box2.x + box2.width < box1.x || box2.y >= box1.y + box1.height || box2.y + box2.height <= box1.y); }, diff --git a/packages/devextreme/js/__internal/viz/sankey/tooltip.ts b/packages/devextreme/js/__internal/viz/sankey/tooltip.ts index b00aeb8ed001..49171e3e007f 100644 --- a/packages/devextreme/js/__internal/viz/sankey/tooltip.ts +++ b/packages/devextreme/js/__internal/viz/sankey/tooltip.ts @@ -12,10 +12,10 @@ import { extend as _extend } from '@ts/core/utils/extend'; import { isFunction } from '@ts/core/utils/type'; -const defaultCustomizeLinkTooltip = (formatter) => function (info) { +const defaultCustomizeLinkTooltip = (formatter) => function (info): { html: string } { return { html: `${info.source} > ${info.target}
Weight: ${formatter(info.weight)}` }; }; -const defaultCustomizeNodeTooltip = (formatter) => function (info) { +const defaultCustomizeNodeTooltip = (formatter) => function (info): { html: string } { return { html: `${info.label}
Incoming weight: ${formatter(info.weightIn)}
Outgoing weight: ${formatter(info.weightOut)}` }; }; const generateCustomCallback = function (customCallback, defaultCallback) { @@ -30,8 +30,8 @@ const generateCustomCallback = function (customCallback, defaultCallback) { }; }; -export function setTooltipCustomOptions(sankey) { - sankey.prototype._setTooltipOptions = function () { +export function setTooltipCustomOptions(sankey): void { + sankey.prototype._setTooltipOptions = function (): void { const tooltip = this._tooltip; const options = tooltip && this._getOption('tooltip'); @@ -76,7 +76,7 @@ export function setTooltipCustomOptions(sankey) { enabled: options.enabled, })); }; - sankey.prototype.hideTooltip = function () { + sankey.prototype.hideTooltip = function (): void { this._tooltip && this._tooltip.hide(); }; } diff --git a/packages/devextreme/js/__internal/viz/sankey/tracker.ts b/packages/devextreme/js/__internal/viz/sankey/tracker.ts index 3939b36d604d..01f9bfd3de74 100644 --- a/packages/devextreme/js/__internal/viz/sankey/tracker.ts +++ b/packages/devextreme/js/__internal/viz/sankey/tracker.ts @@ -4,7 +4,6 @@ /* eslint-disable func-names */ /* eslint-disable import/no-mutable-exports */ /* eslint-disable @typescript-eslint/naming-convention */ -/* eslint-disable @typescript-eslint/explicit-module-boundary-types */ /* eslint-disable @typescript-eslint/no-unsafe-return */ /* eslint-disable @typescript-eslint/explicit-function-return-type */ /* eslint-disable no-else-return */ @@ -23,13 +22,13 @@ let _TESTS_dataKey; proto._eventsMap.onNodeClick = { name: 'nodeClick' }; proto._eventsMap.onLinkClick = { name: 'linkClick' }; -const getDataKey = function () { +const getDataKey = function (): string { return DATA_KEY_BASE + dataKeyModifier++; }; export const plugin = { name: 'tracker', - init() { + init(): void { const that = this; const dataKey = getDataKey(); /// #DEBUG @@ -49,7 +48,7 @@ export const plugin = { return that._links[index - that._nodes.length]; } }, - click(e) { + click(e): void { const eventName = this.getData(e.event) < that._nodes.length ? 'nodeClick' : 'linkClick'; that._eventTrigger(eventName, { target: e.node, @@ -60,11 +59,11 @@ export const plugin = { this._dataKey = dataKey; }, - dispose() { + dispose(): void { this._tracker.dispose(); }, extenders: { - _change_LINKS_DRAW() { + _change_LINKS_DRAW(): void { const dataKey = this._dataKey; this._nodes.concat(this._links).forEach((item, index) => { item.element.data(dataKey, index); diff --git a/packages/devextreme/js/__internal/viz/series/area_series.ts b/packages/devextreme/js/__internal/viz/series/area_series.ts index 751d9a0d3dbf..3b753fa190fb 100644 --- a/packages/devextreme/js/__internal/viz/series/area_series.ts +++ b/packages/devextreme/js/__internal/viz/series/area_series.ts @@ -59,7 +59,7 @@ const baseAreaMethods = { return defaultSegment; }, - _updateElement(element, segment, animate, complete) { + _updateElement(element, segment, animate, complete): void { const lineParams = { points: segment.line }; const areaParams = { points: segment.area }; const borderElement = element.line; @@ -72,7 +72,7 @@ const baseAreaMethods = { } }, - _removeElement(element) { + _removeElement(element): void { element.line && element.line.remove(); element.area.remove(); }, @@ -84,7 +84,7 @@ const baseAreaMethods = { }; }, - _applyStyle(style) { + _applyStyle(style): void { const that = this; that._elementsGroup && that._elementsGroup.smartAttr(style.elements); diff --git a/packages/devextreme/js/__internal/viz/series/bar_series.ts b/packages/devextreme/js/__internal/viz/series/bar_series.ts index 0aeae70035b3..1eee5e6172c1 100644 --- a/packages/devextreme/js/__internal/viz/series/bar_series.ts +++ b/packages/devextreme/js/__internal/viz/series/bar_series.ts @@ -53,11 +53,11 @@ const baseBarSeriesMethods = { return base; }, - _applyMarkerClipRect(settings) { + _applyMarkerClipRect(settings): void { settings['clip-path'] = null; }, - _setGroupsSettings(animationEnabled, firstDrawing) { + _setGroupsSettings(animationEnabled, firstDrawing): void { const that = this; let settings = {}; // @ts-expect-error @@ -72,7 +72,7 @@ const baseBarSeriesMethods = { that._markersGroup.attr(settings); }, - _drawPoint(options) { + _drawPoint(options): void { options.hasAnimation = options.hasAnimation && !options.firstDrawing; options.firstDrawing = false; // @ts-expect-error @@ -102,7 +102,7 @@ const baseBarSeriesMethods = { }; }, - _updatePointsVisibility() { + _updatePointsVisibility(): void { const visibility = this._options.visible; each(this._points, (_, point) => { point._options.visible = visibility; @@ -113,12 +113,12 @@ const baseBarSeriesMethods = { return this._options; }, - _animate(firstDrawing) { + _animate(firstDrawing): void { const that = this; - const complete = function () { + const complete = function (): void { that._animateComplete(); }; - const animateFunc = function (drawnPoints, complete) { + const animateFunc = function (drawnPoints, complete): void { const lastPointIndex = drawnPoints.length - 1; _each(drawnPoints || [], (i, point) => { point.animate(i === lastPointIndex ? complete : undefined, point.getMarkerCoords()); @@ -137,9 +137,9 @@ const baseBarSeriesMethods = { _defaultAggregator: 'sum', - _defineDrawingState() {}, + _defineDrawingState(): void {}, - usePointsToDefineAutoHiding() { + usePointsToDefineAutoHiding(): boolean { return false; }, }; diff --git a/packages/devextreme/js/__internal/viz/series/bubble_series.ts b/packages/devextreme/js/__internal/viz/series/bubble_series.ts index be2af23ee039..1fb76aad8b54 100644 --- a/packages/devextreme/js/__internal/viz/series/bubble_series.ts +++ b/packages/devextreme/js/__internal/viz/series/bubble_series.ts @@ -113,7 +113,7 @@ chart.bubble = _extend({}, scatterSeries, { const that = this; const lastPointIndex = that._drawnPoints.length - 1; const labelsGroup = that._labelsGroup; - const labelAnimFunc = function () { + const labelAnimFunc = function (): void { labelsGroup && labelsGroup.animate({ opacity: 1 }, { duration: that._defaultDuration }); }; diff --git a/packages/devextreme/js/__internal/viz/series/helpers/range_data_calculator.ts b/packages/devextreme/js/__internal/viz/series/helpers/range_data_calculator.ts index 555d40db0caf..cf33fe959e44 100644 --- a/packages/devextreme/js/__internal/viz/series/helpers/range_data_calculator.ts +++ b/packages/devextreme/js/__internal/viz/series/helpers/range_data_calculator.ts @@ -20,7 +20,7 @@ const { abs, floor, ceil, min, } = Math; -function continuousRangeCalculator(range, minValue, maxValue) { +function continuousRangeCalculator(range, minValue, maxValue): void { range.min = range.min < minValue ? range.min : minValue; range.max = range.max > maxValue ? range.max : maxValue; } @@ -31,7 +31,7 @@ function createGetLogFunction(axisType, axis) { } const base = axis.getOptions().logarithmBase; - return (value) => { + return (value): number => { const log = getLog(abs(value), base); const round = log < 0 ? floor : ceil; return round(log); @@ -41,14 +41,14 @@ function createGetLogFunction(axisType, axis) { function getRangeCalculator(axisType, axis?, getLog?) { let rangeCalculator = continuousRangeCalculator; if (axisType === DISCRETE) { - rangeCalculator = function (range, minValue, maxValue) { + rangeCalculator = function (range, minValue, maxValue): void { if (minValue !== maxValue) { range.categories.push(maxValue); } range.categories.push(minValue); }; } else if (axis) { - rangeCalculator = function (range, value) { + rangeCalculator = function (range, value): void { const interval = axis.calculateInterval(value, range.prevValue); const minInterval = range.interval; @@ -59,7 +59,7 @@ function getRangeCalculator(axisType, axis?, getLog?) { } if (getLog) { - return (range, minValue, maxValue) => { + return (range, minValue, maxValue): void => { const minArgs = []; rangeCalculator(range, minValue, maxValue); // @ts-expect-error @@ -114,12 +114,12 @@ function getValueForArgument(point, extraPoint, x, range) { } } -function calculateRangeBetweenPoints(rangeCalculator, range, point, prevPoint, bound) { +function calculateRangeBetweenPoints(rangeCalculator, range, point, prevPoint, bound): void { const value = getValueForArgument(point, prevPoint, bound, range); rangeCalculator(range, value, value); } -function isLineSeries(series) { +function isLineSeries(series): boolean { return series.type.toLowerCase().indexOf('line') >= 0 || series.type.toLowerCase().indexOf('area') >= 0; } @@ -202,15 +202,15 @@ function getViewPortFilter(viewport) { return (argument) => isDefined(argument) && dictionary[argument.valueOf()]; } if (!isDefined(viewport.startValue) && !isDefined(viewport.endValue)) { - return () => true; + return (): boolean => true; } if (!isDefined(viewport.endValue)) { - return (argument) => argument >= viewport.startValue; + return (argument): boolean => argument >= viewport.startValue; } if (!isDefined(viewport.startValue)) { - return (argument) => argument <= viewport.endValue; + return (argument): boolean => argument <= viewport.endValue; } - return (argument) => argument >= viewport.startValue && argument <= viewport.endValue; + return (argument): boolean => argument >= viewport.startValue && argument <= viewport.endValue; } export default { @@ -340,7 +340,7 @@ export default { const valueViewPort = series.getValueAxis().visualRange() || {}; const valueViewPortFilter = getViewPortFilter(valueViewPort); const points = series.getPoints(); - const addValue = function (values, point, isEdge?) { + const addValue = function (values, point, isEdge?): void { const minValue = point.getMinValue(); const maxValue = point.getMaxValue(); const isMinValueInViewPort = valueViewPortFilter(minValue); @@ -360,7 +360,7 @@ export default { } } }; - const addEdgePoints = isLineSeries(series) ? function (result, points, index) { + const addEdgePoints = isLineSeries(series) ? function (result, points, index): void { const point = points[index]; const prevPoint = points[index - 1]; const nextPoint = points[index + 1]; diff --git a/packages/devextreme/js/__internal/viz/series/line_series.ts b/packages/devextreme/js/__internal/viz/series/line_series.ts index 83ad5f0b567f..60be82e002c2 100644 --- a/packages/devextreme/js/__internal/viz/series/line_series.ts +++ b/packages/devextreme/js/__internal/viz/series/line_series.ts @@ -54,7 +54,7 @@ function getTangentPoint(point, prevPoint, centerPoint, tan, nextStepAngle) { return clonePoint(prevPoint, x, y, correctAngle); } -function obtainCubicBezierTCoef(p, p0, p1, p2, p3) { +function obtainCubicBezierTCoef(p, p0, p1, p2, p3): number[] { const d = p0 - p; const c = 3 * p1 - 3 * p0; const b = 3 * p2 - 6 * p1 + 3 * p0; @@ -64,18 +64,18 @@ function obtainCubicBezierTCoef(p, p0, p1, p2, p3) { } const lineMethods = { - autoHidePointMarkersEnabled() { + autoHidePointMarkersEnabled(): boolean { return true; }, - _applyGroupSettings(style, settings, group) { + _applyGroupSettings(style, settings, group): void { const that = this; settings = extend(settings, style); that._applyElementsClipRect(settings); group.attr(settings); }, - _setGroupsSettings(animationEnabled) { + _setGroupsSettings(animationEnabled): void { const that = this; const style = that._styles.normal; @@ -86,7 +86,7 @@ const lineMethods = { animationEnabled && that._markersGroup && that._markersGroup.attr({ opacity: 0.001 }); }, - _createGroups() { + _createGroups(): void { const that = this; that._createGroup('_elementsGroup', that, that._group); that._areBordersVisible() && that._createGroup('_bordersGroup', that, that._group); @@ -94,7 +94,7 @@ const lineMethods = { chartScatterSeries._createGroups.call(that); }, - _areBordersVisible() { + _areBordersVisible(): boolean { return false; }, @@ -120,7 +120,7 @@ const lineMethods = { return { elements: this._parseLineOptions(options, defaultColor) }; }, - _applyStyle(style) { + _applyStyle(style): void { const that = this; that._elementsGroup && that._elementsGroup.attr(style.elements); each(that._graphics || [], (_, graphic) => { @@ -132,18 +132,18 @@ const lineMethods = { return { line: this._createMainElement(segment.line, { 'stroke-width': this._styles.normal.elements['stroke-width'] }).append(group) }; }, - _removeElement(element) { + _removeElement(element): void { element.line.remove(); }, - _updateElement(element, segment, animate, animationComplete) { + _updateElement(element, segment, animate, animationComplete): void { const params = { points: segment.line }; const lineElement = element.line; animate ? lineElement.animate(params, {}, animationComplete) : lineElement.attr(params); }, - _animateComplete() { + _animateComplete(): void { const that = this; // @ts-expect-error chartScatterSeries._animateComplete.call(that); @@ -151,13 +151,13 @@ const lineMethods = { && that._markersGroup.animate({ opacity: 1 }, { duration: that._defaultDuration }); }, - _animate() { + _animate(): void { const that = this; const lastIndex = that._graphics.length - 1; each(that._graphics || [], (i, elem) => { let complete; if (i === lastIndex) { - complete = function () { + complete = function (): void { that._animateComplete(); }; } @@ -165,7 +165,7 @@ const lineMethods = { }); }, - _drawPoint(options) { + _drawPoint(options): void { // @ts-expect-error chartScatterSeries._drawPoint.call(this, { point: options.point, groups: options.groups }); }, @@ -178,7 +178,7 @@ const lineMethods = { return rotated ? points.sort((p1, p2) => p2.y - p1.y) : points.sort((p1, p2) => p1.x - p2.x); }, - _drawSegment(points, animationEnabled, segmentCount, lastSegment) { + _drawSegment(points, animationEnabled, segmentCount, lastSegment): void { const that = this; const { rotated } = that._options; const segment = that._prepareSegment(points, rotated, lastSegment); @@ -215,13 +215,13 @@ const lineMethods = { ); }, - _updateTrackerElement(segment, element) { + _updateTrackerElement(segment, element): void { const settings = this._getTrackerSettings(segment); settings.points = this._getMainPointsFromSegment(segment); element.attr(settings); }, - checkSeriesViewportCoord(axis, coord) { + checkSeriesViewportCoord(axis, coord): boolean { // @ts-expect-error if (!chartScatterSeries.checkSeriesViewportCoord.call(this)) { return false; @@ -605,8 +605,8 @@ polar.line = extend({}, polarScatterSeries, lineMethods, { const paramName = isArgument ? 'angle' : 'radius'; const coordParam = params[paramName]; const centerPoint = argAxis.getCenter(); - const getLengthByCoords = (p1, p2) => sqrt((p1.x - p2.x) ** 2 + (p1.y - p2.y) ** 2); - const isInsideInterval = (prevPoint, point, { x, y }) => ( + const getLengthByCoords = (p1, p2): number => sqrt((p1.x - p2.x) ** 2 + (p1.y - p2.y) ** 2); + const isInsideInterval = (prevPoint, point, { x, y }): boolean => ( getLengthByCoords({ x, y }, centerPoint) <= argAxis.getRadius() && min(prevPoint.x, point.x) <= x && max(prevPoint.x, point.x) >= x diff --git a/packages/devextreme/js/__internal/viz/series/pie_series.ts b/packages/devextreme/js/__internal/viz/series/pie_series.ts index d7d608fdad40..aade79d0bba4 100644 --- a/packages/devextreme/js/__internal/viz/series/pie_series.ts +++ b/packages/devextreme/js/__internal/viz/series/pie_series.ts @@ -10,7 +10,6 @@ /* eslint-disable no-param-reassign */ /* eslint-disable no-multi-assign */ /* eslint-disable @typescript-eslint/no-unsafe-return */ -/* eslint-disable @typescript-eslint/explicit-function-return-type */ /* eslint-disable no-else-return */ /* eslint-disable @typescript-eslint/no-unused-expressions */ /* eslint-disable @typescript-eslint/prefer-optional-chain */ @@ -306,13 +305,13 @@ export const pie = _extend({}, barSeries, { const that = this; const points = that._points; const pointsCount = points && points.length; - const completeFunc = function () { + const completeFunc = function (): void { that._animateComplete(); }; let animatePoint; if (firstDrawing) { - animatePoint = function (p, i) { + animatePoint = function (p, i): void { p.animate( i === pointsCount - 1 ? completeFunc : undefined, ANIMATION_DURATION, @@ -320,7 +319,7 @@ export const pie = _extend({}, barSeries, { ); }; } else { - animatePoint = function (p, i) { + animatePoint = function (p, i): void { p.animate(i === pointsCount - 1 ? completeFunc : undefined); }; } diff --git a/packages/devextreme/js/__internal/viz/series/points/bar_point.ts b/packages/devextreme/js/__internal/viz/series/points/bar_point.ts index dcdce76f9313..dafbca4435d2 100644 --- a/packages/devextreme/js/__internal/viz/series/points/bar_point.ts +++ b/packages/devextreme/js/__internal/viz/series/points/bar_point.ts @@ -5,7 +5,6 @@ /* eslint-disable no-param-reassign */ /* eslint-disable no-multi-assign */ /* eslint-disable @typescript-eslint/no-unsafe-return */ -/* eslint-disable @typescript-eslint/explicit-function-return-type */ /* eslint-disable @typescript-eslint/no-unused-expressions */ import { extend } from '@ts/core/utils/extend'; @@ -25,7 +24,7 @@ const LEFT = 'left'; const TOP = 'top'; const BOTTOM = 'bottom'; -function getLabelOrientation(point) { +function getLabelOrientation(point): 'top' | 'bottom' { const { initialValue } = point; const { invert } = point._getValTranslator().getBusinessRange(); const isDiscreteValue = point.series.valueAxisType === 'discrete'; @@ -99,7 +98,7 @@ export default _extend({}, symbolPoint, { }, _getLabelPosition() { - let position = getLabelOrientation(this); + let position: string = getLabelOrientation(this); if (this._options.rotated) { position = position === TOP ? RIGHT : LEFT; } diff --git a/packages/devextreme/js/__internal/viz/series/points/symbol_point.ts b/packages/devextreme/js/__internal/viz/series/points/symbol_point.ts index 7f885b9cf9aa..f7a88bf27f95 100644 --- a/packages/devextreme/js/__internal/viz/series/points/symbol_point.ts +++ b/packages/devextreme/js/__internal/viz/series/points/symbol_point.ts @@ -45,7 +45,7 @@ function getSquareMarkerCoords(radius) { ]; } -function getPolygonMarkerCoords(radius) { +function getPolygonMarkerCoords(radius): number[] { const r = _ceil(radius); // T100386 return [ -r, 0, @@ -56,7 +56,7 @@ function getPolygonMarkerCoords(radius) { ]; } -function getCrossMarkerCoords(radius) { +function getCrossMarkerCoords(radius): number[] { const r = _ceil(radius); // T100386 const floorHalfRadius = _floor(r / 2); const ceilHalfRadius = _ceil(r / 2); @@ -96,7 +96,7 @@ function getTriangleUpMarkerCoords(radius) { } export default { - deleteLabel() { + deleteLabel(): void { this._label.dispose(); this._label = null; }, @@ -105,7 +105,7 @@ export default { return this.graphic; }, - clearVisibility() { + clearVisibility(): void { const that = this; const { graphic } = that; if (graphic && graphic.attr('visibility')) { @@ -117,7 +117,7 @@ export default { return this.inVisibleArea && this.series.isVisible(); }, - setInvisibility() { + setInvisibility(): void { const that = this; const { graphic } = that; if (graphic && graphic.attr('visibility') !== 'hidden') { @@ -127,12 +127,12 @@ export default { that._label.draw(false); }, - clearMarker() { + clearMarker(): void { const { graphic } = this; graphic && graphic.attr(this._emptySettings); }, - _createLabel() { + _createLabel(): void { this._label = new Label({ renderer: this.series._renderer, labelsGroup: this.series._labelsGroup, @@ -140,7 +140,7 @@ export default { }); }, - _calculateVisibility(x, y) { + _calculateVisibility(x, y): void { const { minX, maxX, minY, maxY, } = this._getVisibleArea(); @@ -148,24 +148,24 @@ export default { this.inVisibleArea = minX <= x && maxX >= x && minY <= y && maxY >= y; }, - _updateLabelData() { + _updateLabelData(): void { this._label.setData(this._getLabelFormatObject()); }, - _updateLabelOptions() { + _updateLabelOptions(): void { !this._label && this._createLabel(); this._label.setOptions(this._options.label); }, - _checkImage(image) { + _checkImage(image): boolean { return _isDefined(image) && (typeof image === 'string' || _isDefined(image.url)); }, - _fillStyle() { + _fillStyle(): void { this._styles = this._options.styles; }, - _checkSymbol(oldOptions, newOptions) { + _checkSymbol(oldOptions, newOptions): boolean { const oldSymbol = oldOptions.symbol; const newSymbol = newOptions.symbol; const symbolChanged = (oldSymbol === 'circle' && newSymbol !== 'circle') || (oldSymbol !== 'circle' && newSymbol === 'circle'); @@ -190,11 +190,11 @@ export default { } }, - hasCoords() { + hasCoords(): boolean { return this.x !== null && this.y !== null; }, - correctValue(correction) { + correctValue(correction): void { const that = this; const axis = that.series.getValueAxis(); if (that.hasValue()) { @@ -205,12 +205,12 @@ export default { } }, - resetCorrection() { + resetCorrection(): void { this.value = this.properValue = this.initialValue; this.minValue = CANVAS_POSITION_DEFAULT; }, - resetValue() { + resetValue(): void { const that = this; if (that.hasValue()) { that.value = that.properValue = that.initialValue = 0; @@ -279,7 +279,7 @@ export default { return marker; }, - _getSymbolBBox(x, y, r) { + _getSymbolBBox(x, y, r): { x: number; y: number; width: number; height: number } { return { x: x - r, y: y - r, @@ -328,7 +328,7 @@ export default { return this._checkLabelPosition(label, coord); }, - _drawLabel() { + _drawLabel(): void { const that = this; const customVisibility = that._getCustomLabelVisibility(); const label = that._label; @@ -340,7 +340,7 @@ export default { label.draw(!!isVisible); }, - correctLabelPosition(label) { + correctLabelPosition(label): void { const that = this; const coord = that._getShiftLabelCoords(label); if (!that.hideInsideLabel(label, coord)) { @@ -349,7 +349,7 @@ export default { } }, - _showForZeroValues() { + _showForZeroValues(): boolean { return true; }, @@ -367,7 +367,7 @@ export default { return { x: this.x, y: this.y }; }, - _isPointInVisibleArea(visibleArea, graphicBBox) { + _isPointInVisibleArea(visibleArea, graphicBBox): boolean { return ( visibleArea.minX <= graphicBBox.x + graphicBBox.width && visibleArea.maxX >= graphicBBox.x @@ -482,7 +482,7 @@ export default { return { x, y }; }, - _drawMarker(renderer, group, animationEnabled) { + _drawMarker(renderer, group, animationEnabled): void { const that = this; const options = that._options; const translates = that._getTranslates(animationEnabled); @@ -503,15 +503,15 @@ export default { ); }, - _getErrorBarSettings() { + _getErrorBarSettings(): { visibility: string } { return { visibility: 'visible' }; }, - _getErrorBarBaseEdgeLength() { + _getErrorBarBaseEdgeLength(): number { return this.getPointRadius() * 2; }, - _drawErrorBar(renderer, group) { + _drawErrorBar(renderer, group): void { if (!this._options.errorBars) { return; } @@ -575,7 +575,7 @@ export default { }; }, - setPercentValue(absTotal, total, leftHoleTotal, rightHoleTotal) { + setPercentValue(absTotal, total, leftHoleTotal, rightHoleTotal): void { const that = this; const valuePercent = (that.value / absTotal) || 0; const minValuePercent = (that.minValue / absTotal) || 0; @@ -611,7 +611,7 @@ export default { return that._options.trackerR; }, - _translateErrorBars() { + _translateErrorBars(): void { const that = this; const options = that._options; const { rotated, errorBars } = options; @@ -627,7 +627,7 @@ export default { that._baseErrorBarPos = errorBars.type === 'stdDeviation' ? that._lowErrorCoord + (that._highErrorCoord - that._lowErrorCoord) / 2 : rotated ? that.vx : that.vy; }, - _translate() { + _translate(): void { const that = this; const valTranslator = that._getValTranslator(); const argTranslator = that._getArgTranslator(); @@ -647,7 +647,7 @@ export default { that._calculateVisibility(that.x, that.y); }, - _updateData(data) { + _updateData(data): void { const that = this; that.value = that.properValue = that.initialValue = that.originalValue = data.value; that.minValue = that.initialMinValue = that.originalMinValue = _isDefined(data.minValue) @@ -692,7 +692,7 @@ export default { return 0; }, - _updateMarker(animationEnabled, style) { + _updateMarker(animationEnabled, style): void { const that = this; const options = that._options; let settings; @@ -734,7 +734,7 @@ export default { }; }, - _getLabelPosition() { + _getLabelPosition(): 'left' | 'right' | 'top' | 'bottom' { const { rotated } = this._options; if (this.initialValue > 0) { return rotated ? 'right' : 'top'; @@ -771,7 +771,7 @@ export default { return this._options.visible; }, - coordsIn(x, y) { + coordsIn(x, y): boolean { const trackerRadius = this._storeTrackerR(); return ( x >= this.x - trackerRadius diff --git a/packages/devextreme/js/__internal/viz/series/range_series.ts b/packages/devextreme/js/__internal/viz/series/range_series.ts index 0aa6ba0e952e..955f3b9bac47 100644 --- a/packages/devextreme/js/__internal/viz/series/range_series.ts +++ b/packages/devextreme/js/__internal/viz/series/range_series.ts @@ -112,7 +112,7 @@ const baseRangeSeries = { return [this._options.rangeValue1Field || 'val1', this._options.rangeValue2Field || 'val2']; }, - getSeriesPairCoord(coord, isArgument) { + getSeriesPairCoord(coord, isArgument): null { let oppositeCoord = null; const { rotated } = this._options; const isOpposite = !isArgument && !rotated || isArgument && rotated; diff --git a/packages/devextreme/js/__internal/viz/series/scatter_series.ts b/packages/devextreme/js/__internal/viz/series/scatter_series.ts index 268dc070b62e..48c91b1894b7 100644 --- a/packages/devextreme/js/__internal/viz/series/scatter_series.ts +++ b/packages/devextreme/js/__internal/viz/series/scatter_series.ts @@ -58,7 +58,7 @@ const DATETIME = 'datetime'; let chart = {}; let polar = {}; -function sum(array) { +function sum(array): number { let result = 0; _each(array, (_, value) => { result += value; @@ -66,14 +66,14 @@ function sum(array) { return result; } -function isErrorBarTypeCorrect(type) { +function isErrorBarTypeCorrect(type): boolean { // TODO why UNDEFINED is here // return inArray(type, [FIXED, PERCENT, VARIANCE, STANDARD_DEVIATION, STANDARD_ERROR, UNDEFINED]) // !== -1; return [FIXED, PERCENT, VARIANCE, STANDARD_DEVIATION, STANDARD_ERROR].includes(type); } -function variance(array, expectedValue) { +function variance(array, expectedValue): number { return ( sum(_map(array, (value) => (value - expectedValue) * (value - expectedValue))) / array.length ); @@ -150,7 +150,7 @@ function getMinMaxAggregator(compare) { }; } -function checkFields(data, fieldsToCheck, skippedFields) { +function checkFields(data, fieldsToCheck, skippedFields): boolean { let allFieldsIsValid = true; for (const field in fieldsToCheck) { @@ -181,7 +181,7 @@ const baseScatterMethods = { _drawSegment: _noop, - _appendInGroup() { + _appendInGroup(): void { this._group.append(this._extGroups.seriesGroup); }, @@ -194,21 +194,21 @@ const baseScatterMethods = { _getColorId: _noop, - _applyElementsClipRect(settings) { + _applyElementsClipRect(settings): void { settings['clip-path'] = this._paneClipRectID; }, - _applyMarkerClipRect(settings) { + _applyMarkerClipRect(settings): void { settings['clip-path'] = this._forceClipping ? this._paneClipRectID : null; }, - _createGroup(groupName, parent, target, settings) { + _createGroup(groupName, parent, target, settings): void { const group = parent[groupName] = parent[groupName] || this._renderer.g(); target && group.append(target); settings && group.attr(settings); }, - _applyClearingSettings(settings) { + _applyClearingSettings(settings): void { settings.opacity = null; settings.scale = null; if (this._options.rotated) { @@ -218,13 +218,13 @@ const baseScatterMethods = { } }, - _createGroups() { + _createGroups(): void { const that = this; that._createGroup('_markersGroup', that, that._group); that._createGroup('_labelsGroup', that); }, - _setMarkerGroupSettings() { + _setMarkerGroupSettings(): void { const that = this; const settings = that._createPointStyles(that._getMarkerGroupOptions()).normal; settings.class = 'dxc-markers'; @@ -262,7 +262,7 @@ const baseScatterMethods = { return cat; }, - _createErrorBarGroup(animationEnabled) { + _createErrorBarGroup(animationEnabled): void { const that = this; const errorBarOptions = that._options.valueErrorBar; let settings; @@ -281,7 +281,7 @@ const baseScatterMethods = { } }, - _setGroupsSettings(animationEnabled) { + _setGroupsSettings(animationEnabled): void { const that = this; that._setMarkerGroupSettings(); that._setLabelGroupSettings(animationEnabled); @@ -358,7 +358,7 @@ const baseScatterMethods = { }; }, - _checkData(data, skippedFields, fieldsToCheck) { + _checkData(data, skippedFields, fieldsToCheck): boolean { fieldsToCheck = fieldsToCheck || { value: this.getValueFields()[0] }; fieldsToCheck.argument = this.getArgumentField(); return checkFields(data, fieldsToCheck, skippedFields || {}) && data.value === data.value; @@ -377,7 +377,7 @@ const baseScatterMethods = { return undefined; }, - getValueRangeInitialValue() { + getValueRangeInitialValue(): undefined { return undefined; }, @@ -417,7 +417,7 @@ const baseScatterMethods = { }; }, - _errorBarsEnabled() { + _errorBarsEnabled(): boolean { return ( this.valueAxisType !== DISCRETE && this.valueAxisType !== LOGARITHMIC @@ -425,7 +425,7 @@ const baseScatterMethods = { ); }, - _drawPoint(options) { + _drawPoint(options): void { const { point } = options; if (point.isInVisibleArea()) { @@ -437,7 +437,7 @@ const baseScatterMethods = { } }, - _animateComplete() { + _animateComplete(): void { const that = this; const animationSettings = { duration: that._defaultDuration }; @@ -449,14 +449,14 @@ const baseScatterMethods = { ); }, - _animate() { + _animate(): void { const that = this; const lastPointIndex = that._drawnPoints.length - 1; _each(that._drawnPoints || [], (i, p) => { p.animate( i === lastPointIndex - ? () => { + ? (): void => { that._animateComplete(); } : undefined, @@ -559,7 +559,7 @@ const baseScatterMethods = { max: getMinMaxAggregator((a, b) => a > b), }, - _endUpdateData() { + _endUpdateData(): void { delete this._predefinedPointOptions; }, @@ -583,7 +583,7 @@ const baseScatterMethods = { return valueFields; }, - _calculateErrorBars(data) { + _calculateErrorBars(data): void { if (!this.areErrorBarsVisible()) { return; } @@ -601,7 +601,7 @@ const baseScatterMethods = { let valueArrayLength; let meanValue; let processDataItem; - const addSubError = function (_i, item) { + const addSubError = function (_i, item): void { value = item.value; item.lowError = value - floatErrorValue; item.highError = value + floatErrorValue; @@ -612,7 +612,7 @@ const baseScatterMethods = { processDataItem = addSubError; break; case PERCENT: - processDataItem = function (_, item) { + processDataItem = function (_, item): void { value = item.value; const error = value * floatErrorValue / 100; item.lowError = value - error; @@ -620,7 +620,7 @@ const baseScatterMethods = { }; break; case UNDEFINED: // TODO: rework this - processDataItem = function (_, item) { + processDataItem = function (_, item): void { item.lowError = item.data[lowValueField]; item.highError = item.data[highValueField]; }; @@ -640,7 +640,7 @@ const baseScatterMethods = { case STANDARD_DEVIATION: meanValue = sum(valueArray) / valueArrayLength; floatErrorValue = _sqrt(variance(valueArray, meanValue)) * floatErrorValue; - processDataItem = function (_, item) { + processDataItem = function (_, item): void { item.lowError = meanValue - floatErrorValue; item.highError = meanValue + floatErrorValue; }; @@ -670,7 +670,7 @@ const baseScatterMethods = { return options; }, - usePointsToDefineAutoHiding() { + usePointsToDefineAutoHiding(): boolean { return !!this._getOptionsForPoint().visible; }, }; diff --git a/packages/devextreme/js/__internal/viz/series/stacked_series.ts b/packages/devextreme/js/__internal/viz/series/stacked_series.ts index 30014816e843..5ad1ebd99e0c 100644 --- a/packages/devextreme/js/__internal/viz/series/stacked_series.ts +++ b/packages/devextreme/js/__internal/viz/series/stacked_series.ts @@ -26,7 +26,7 @@ const chartBarSeries = _chart.bar; const baseStackedSeries = { _calculateErrorBars: _noop, - _updateOptions(options) { + _updateOptions(options): void { this._stackName = `axis_${options.axis || 'default'}`; }, }; diff --git a/packages/devextreme/js/__internal/viz/themes.ts b/packages/devextreme/js/__internal/viz/themes.ts index bcab7eb2b406..d11bdc98292f 100644 --- a/packages/devextreme/js/__internal/viz/themes.ts +++ b/packages/devextreme/js/__internal/viz/themes.ts @@ -72,7 +72,7 @@ function getThemeInfo(themeName, splitter) { return k > 0 ? { name: themeName.substring(0, k), scheme: themeName.substring(k + 1) } : null; } -function registerThemeName(themeName, targetThemeName) { +function registerThemeName(themeName, targetThemeName): void { const themeInfo = getThemeInfo(themeName, '.') || { name: themeName }; const { name } = themeInfo; // @ts-expect-error @@ -87,7 +87,7 @@ function registerThemeName(themeName, targetThemeName) { } } -export function registerTheme(theme, baseThemeName) { +export function registerTheme(theme, baseThemeName): void { const themeName = normalizeEnum(theme && theme.name); if (themeName) { theme.isDefault && (defaultTheme = themeName); @@ -96,18 +96,18 @@ export function registerTheme(theme, baseThemeName) { } } -export function registerThemeSchemeAlias(from, to) { +export function registerThemeSchemeAlias(from, to): void { themesSchemeMapping[from] = to; } -function mergeScalar(target, field, source, sourceValue?) { +function mergeScalar(target, field, source, sourceValue?): void { const _value = source?.[field] ?? sourceValue; if (_value !== undefined && target[field] === undefined) { target[field] = _value; } } -function mergeObject(target, field, source, sourceValue?) { +function mergeObject(target, field, source, sourceValue?): void { const _value = source?.[field] ?? sourceValue; if (_value !== undefined) { target[field] = _extend(true, {}, _value, target[field]); @@ -197,7 +197,7 @@ function patchTheme(theme) { return theme; } -function patchAxes(theme) { +function patchAxes(theme): void { const commonAxisSettings = theme['chart:common:axis']; const colorFieldName = 'color'; [commonAxisSettings.grid, commonAxisSettings.minorGrid].forEach((obj) => { @@ -218,7 +218,7 @@ function patchAxes(theme) { mergeScalar(theme.rangeSelector.scale.label.font, colorFieldName, null, theme.axisColor); } -function patchMapLayers(theme) { +function patchMapLayers(theme): void { const { map } = theme; ['area', 'line', 'marker'].forEach((section) => { mergeObject(map, `layer:${section}`, null, map.layer); @@ -228,13 +228,13 @@ function patchMapLayers(theme) { }); } -export function addCacheItem(target) { +export function addCacheItem(target): void { const cacheUid = ++nextCacheUid; target._cache = cacheUid; widgetsCache[cacheUid] = target; } -export function removeCacheItem(target) { +export function removeCacheItem(target): void { delete widgetsCache[target._cache]; } @@ -275,7 +275,7 @@ export { widgetsCache, }; -exports.resetCurrentTheme = function () { +exports.resetCurrentTheme = function (): void { currentThemeName = null; }; /// #ENDDEBUG diff --git a/packages/devextreme/js/__internal/viz/translators/category_translator.ts b/packages/devextreme/js/__internal/viz/translators/category_translator.ts index b782de06703e..2acecf3cd35e 100644 --- a/packages/devextreme/js/__internal/viz/translators/category_translator.ts +++ b/packages/devextreme/js/__internal/viz/translators/category_translator.ts @@ -16,7 +16,7 @@ function getValue(value) { return value; } const MIN_VALID_SCALE_OFFSET = 0.05; export default { - translate(category, directionOffset) { + translate(category, directionOffset): number | null { const that = this; const canvasOptions = that._canvasOptions; const categoryIndex = that._categoriesToPoints[category?.valueOf()]; @@ -42,7 +42,7 @@ export default { return this._canvasOptions.interval; }, - getEventScale(zoomEvent) { + getEventScale(zoomEvent): number { const scale = zoomEvent.deltaScale || 1; return 1 - (1 - scale) / (0.75 + this.visibleCategories.length / this._categories.length); }, @@ -115,7 +115,7 @@ export default { }; }, - getMinScale(zoom) { + getMinScale(zoom): number { const that = this; const canvasOptions = that._canvasOptions; let categoriesLength = (that.visibleCategories || that._categories).length; @@ -125,7 +125,7 @@ export default { return canvasOptions.canvasLength / ((Math.max(categoriesLength, 1) * canvasOptions.interval)); }, - getScale(min, max) { + getScale(min, max): number { const that = this; const canvasOptions = that._canvasOptions; const visibleArea = that.getCanvasVisibleArea(); @@ -144,13 +144,13 @@ export default { // dxRangeSelector - isValid(value) { + isValid(value): boolean { return isDefined(value) ? this._categoriesToPoints[value.valueOf()] >= 0 : false; }, getCorrectValue: getValue, - to(value, direction) { + to(value, direction): number { const canvasOptions = this._canvasOptions; const categoryIndex = this._categoriesToPoints[value?.valueOf()]; const startPointIndex = canvasOptions.startPointIndex || 0; @@ -190,7 +190,7 @@ export default { return categories[result]; }, - _add() { + _add(): number { return NaN; }, diff --git a/packages/devextreme/js/__internal/viz/translators/interval_translator.ts b/packages/devextreme/js/__internal/viz/translators/interval_translator.ts index a4691aedf719..d493104ef0e2 100644 --- a/packages/devextreme/js/__internal/viz/translators/interval_translator.ts +++ b/packages/devextreme/js/__internal/viz/translators/interval_translator.ts @@ -51,7 +51,7 @@ export default { return that.to(bp, direction, skipRound, interval); }, - getInterval() { + getInterval(): number { return Math.round( this._canvasOptions.ratioOfCanvasRange * (this._businessRange.interval @@ -59,13 +59,13 @@ export default { ); }, - zoom() { }, + zoom(): void { }, - getMinScale() { }, + getMinScale(): void { }, - getScale() { }, + getScale(): void { }, - _parse(value) { + _parse(value): number | Date { return this._businessRange.dataType === 'datetime' ? new Date(value) : Number(value); }, @@ -77,7 +77,7 @@ export default { return this._parse(value); }, - isValid(value, interval) { + isValid(value, interval): boolean { const that = this; const co = that._canvasOptions; let { rangeMin } = co; @@ -172,7 +172,7 @@ export default { return value; }, - _add() { + _add(): number { return NaN; }, diff --git a/packages/devextreme/js/__internal/viz/translators/logarithmic_translator.ts b/packages/devextreme/js/__internal/viz/translators/logarithmic_translator.ts index 7ccb36e7b4a1..9152916fee18 100644 --- a/packages/devextreme/js/__internal/viz/translators/logarithmic_translator.ts +++ b/packages/devextreme/js/__internal/viz/translators/logarithmic_translator.ts @@ -32,7 +32,7 @@ export default { : value; }, - getMinBarSize(minBarSize) { + getMinBarSize(minBarSize): number { const visibleArea = this.getCanvasVisibleArea(); const minValue = this.from(visibleArea.min + minBarSize); const canvasOptions = this._canvasOptions; diff --git a/packages/devextreme/js/__internal/viz/tree_map/api.ts b/packages/devextreme/js/__internal/viz/tree_map/api.ts index ffc481e6aa7f..3145b79a57e3 100644 --- a/packages/devextreme/js/__internal/viz/tree_map/api.ts +++ b/packages/devextreme/js/__internal/viz/tree_map/api.ts @@ -22,7 +22,7 @@ const nodeProto = Node.prototype; proto._eventsMap.onNodesInitialized = { name: 'nodesInitialized' }; proto._eventsMap.onNodesRendering = { name: 'nodesRendering' }; -proto._createProxyType = function () { +proto._createProxyType = function (): void { const that = this; let nodes; @@ -137,19 +137,19 @@ proto._createProxyType = function () { // TODO: Find a way to make the following methods exist one per module rather then one per // instance - that._handlers.beginBuildNodes = function () { + that._handlers.beginBuildNodes = function (): void { nodes = that._nodes; new Proxy(that._root); }; - that._handlers.buildNode = function (node) { + that._handlers.buildNode = function (node): void { new Proxy(node); }; - that._handlers.endBuildNodes = function () { + that._handlers.endBuildNodes = function (): void { that._eventTrigger('nodesInitialized', { root: that._root.proxy }); }; }; -function change(node, codes) { +function change(node, codes): void { const { ctx } = node; ctx.suspend(); @@ -157,7 +157,7 @@ function change(node, codes) { ctx.resume(); } -function collectNodes(node, list) { +function collectNodes(node, list): void { const { nodes } = node; let i; const ii = nodes?.length; @@ -168,7 +168,7 @@ function collectNodes(node, list) { } } -function updateValue(node, value) { +function updateValue(node, value): void { const delta = value - node.value; while (node) { @@ -180,13 +180,13 @@ function updateValue(node, value) { proto._extendProxyType = noop; const { _resetNodes } = proto; -proto._resetNodes = function () { +proto._resetNodes = function (): void { _resetNodes.call(this); this._eventTrigger('nodesRendering', { node: this._topNode.proxy }); }; const _updateStyles = nodeProto.updateStyles; -nodeProto.updateStyles = function () { +nodeProto.updateStyles = function (): void { const that = this; _updateStyles.call(that); @@ -198,7 +198,7 @@ nodeProto.updateStyles = function () { }; const _updateLabelStyle = nodeProto.updateLabelStyle; -nodeProto.updateLabelStyle = function () { +nodeProto.updateLabelStyle = function (): void { const that = this; const custom = that._custom; diff --git a/packages/devextreme/js/__internal/viz/tree_map/colorizing.discrete.ts b/packages/devextreme/js/__internal/viz/tree_map/colorizing.discrete.ts index 14f0b7f5a7ae..044ffaf8cedb 100644 --- a/packages/devextreme/js/__internal/viz/tree_map/colorizing.discrete.ts +++ b/packages/devextreme/js/__internal/viz/tree_map/colorizing.discrete.ts @@ -18,7 +18,7 @@ function discreteColorizer(options, themeManager, root) { return (options.colorizeGroups ? discreteGroupColorizer : discreteLeafColorizer)(palette, root); } -function getLeafsCount(root) { +function getLeafsCount(root): number { const allNodes = root.nodes.slice(); let i; const ii = allNodes.length; @@ -45,7 +45,7 @@ function discreteLeafColorizer(palette) { }; } -function getNodesCount(root) { +function getNodesCount(root): number { const allNodes = root.nodes.slice(); let i; const ii = allNodes.length; diff --git a/packages/devextreme/js/__internal/viz/tree_map/colorizing.gradient.ts b/packages/devextreme/js/__internal/viz/tree_map/colorizing.gradient.ts index 4c6491dfde6d..fa0de7b1cd69 100644 --- a/packages/devextreme/js/__internal/viz/tree_map/colorizing.gradient.ts +++ b/packages/devextreme/js/__internal/viz/tree_map/colorizing.gradient.ts @@ -20,11 +20,11 @@ function createSimpleColorizer(getColor, range) { }; } -function getRangeData(range) { +function getRangeData(range): number[] { return [Number(range[0]) || 0, (range[1] - range[0]) || 1]; } -function calculateRange(nodes, getValue) { +function calculateRange(nodes, getValue): number[] { let i; const ii = nodes.length; const codes = []; diff --git a/packages/devextreme/js/__internal/viz/tree_map/colorizing.range.ts b/packages/devextreme/js/__internal/viz/tree_map/colorizing.range.ts index d905e10e62d2..195fd657ad6f 100644 --- a/packages/devextreme/js/__internal/viz/tree_map/colorizing.range.ts +++ b/packages/devextreme/js/__internal/viz/tree_map/colorizing.range.ts @@ -8,7 +8,7 @@ import { addColorizer, createColorCodeGetter as _createColorCodeGetter } from '@ts/viz/tree_map/colorizing'; -function getPaletteIndex(value, items) { +function getPaletteIndex(value, items): number { let start = 0; let end = items.length - 1; let index = -1; diff --git a/packages/devextreme/js/__internal/viz/tree_map/colorizing.ts b/packages/devextreme/js/__internal/viz/tree_map/colorizing.ts index 11f36d76498b..65f0a3a34680 100644 --- a/packages/devextreme/js/__internal/viz/tree_map/colorizing.ts +++ b/packages/devextreme/js/__internal/viz/tree_map/colorizing.ts @@ -34,11 +34,11 @@ export function getColorizer(options, themeManager, root) { : _noop; } -export function addColorizer(name, colorizer) { +export function addColorizer(name, colorizer): void { colorizers[name] = colorizer; } -export function setDefaultColorizer(name) { +export function setDefaultColorizer(name): void { defaultColorizerName = name; } @@ -47,7 +47,7 @@ function getValueAsColorCode(node) { } function createColorCode(colorCodeField) { - return function (node) { + return function (node): number { return Number(node.data[colorCodeField]); }; } diff --git a/packages/devextreme/js/__internal/viz/tree_map/drilldown.ts b/packages/devextreme/js/__internal/viz/tree_map/drilldown.ts index 826fbeb1ac38..f9f18de3056f 100644 --- a/packages/devextreme/js/__internal/viz/tree_map/drilldown.ts +++ b/packages/devextreme/js/__internal/viz/tree_map/drilldown.ts @@ -17,7 +17,7 @@ proto._eventsMap.onDrill = { name: 'drill' }; expand(proto, '_extendProxyType', function (proto) { const that = this; - proto.drillDown = function () { + proto.drillDown = function (): void { that._drillToNode(this._id); }; }); @@ -26,7 +26,7 @@ expand(proto, '_onNodesCreated', function () { this._drilldownIndex = -1; }); -proto._drillToNode = function (index) { +proto._drillToNode = function (index): void { const that = this; let node; diff --git a/packages/devextreme/js/__internal/viz/tree_map/hover.ts b/packages/devextreme/js/__internal/viz/tree_map/hover.ts index e021481c4583..4ed2fa048858 100644 --- a/packages/devextreme/js/__internal/viz/tree_map/hover.ts +++ b/packages/devextreme/js/__internal/viz/tree_map/hover.ts @@ -4,7 +4,6 @@ /* eslint-disable func-names */ /* eslint-disable @typescript-eslint/no-shadow */ /* eslint-disable @typescript-eslint/no-use-before-define */ -/* eslint-disable @typescript-eslint/explicit-function-return-type */ import '@ts/viz/tree_map/api'; import '@ts/viz/tree_map/states'; @@ -46,10 +45,10 @@ nodeProto.additionalStates.push(1); expand(proto, '_extendProxyType', function (proto) { const that = this; - proto.setHover = function () { + proto.setHover = function (): void { that._hoverNode(this._id); }; - proto.isHovered = function () { + proto.isHovered = function (): boolean { return that._hoverIndex === this._id; }; }); @@ -66,12 +65,12 @@ expand(proto, '_changeGroupSettings', function () { } }); -proto._applyHoverState = function (index, state) { +proto._applyHoverState = function (index, state): void { setNodeStateRecursive(this._nodes[index], STATE_CODE, state); this._eventTrigger('hoverChanged', { node: this._nodes[index].proxy }); }; -function setNodeStateRecursive(node, code, state) { +function setNodeStateRecursive(node, code, state): void { const nodes = node.isNode() && node.nodes; let i; const ii = nodes?.length; @@ -82,7 +81,7 @@ function setNodeStateRecursive(node, code, state) { } } -proto._hoverNode = function (index) { +proto._hoverNode = function (index): void { const that = this; const currentIndex = that._hoverIndex; @@ -104,6 +103,6 @@ proto._hoverNode = function (index) { } }; -proto.clearHover = function () { +proto.clearHover = function (): void { this._hoverNode(-1); }; diff --git a/packages/devextreme/js/__internal/viz/tree_map/plain_data_source.ts b/packages/devextreme/js/__internal/viz/tree_map/plain_data_source.ts index 0b866fa56e42..28382638cae8 100644 --- a/packages/devextreme/js/__internal/viz/tree_map/plain_data_source.ts +++ b/packages/devextreme/js/__internal/viz/tree_map/plain_data_source.ts @@ -51,7 +51,7 @@ proto._processDataSourceItems = function (items) { return { items: rootNodes, isPlain: true }; }; -function treeFiller(context, items) { +function treeFiller(context, items): void { let currentItem; let i; const { struct } = context; diff --git a/packages/devextreme/js/__internal/viz/tree_map/selection.ts b/packages/devextreme/js/__internal/viz/tree_map/selection.ts index 38bb0cec3340..ae24bba40e17 100644 --- a/packages/devextreme/js/__internal/viz/tree_map/selection.ts +++ b/packages/devextreme/js/__internal/viz/tree_map/selection.ts @@ -44,7 +44,7 @@ expand(proto, '_onNodesCreated', function () { expand(proto, '_extendProxyType', function (proto) { const that = this; - proto.select = function (state) { + proto.select = function (state): void { that._selectNode(this._id, !!state); }; proto.isSelected = function () { @@ -84,7 +84,7 @@ expand(proto, '_applyTilesAppearance', function () { const tileToFront = [leafToFront, groupToFront]; -function bringSelectedTilesToForeground(nodes, selectionList) { +function bringSelectedTilesToForeground(nodes, selectionList): void { let i; const ii = selectionList.length; let node; @@ -95,23 +95,23 @@ function bringSelectedTilesToForeground(nodes, selectionList) { } } -function leafToFront(content) { +function leafToFront(content): void { content.toForeground(); } -function groupToFront(content) { +function groupToFront(content): void { content.outer.toForeground(); content.inner.toForeground(); } -proto._applySelectionState = function (index, state) { +proto._applySelectionState = function (index, state): void { const node = this._nodes[index]; node.setState(STATE_CODE, state); this._eventTrigger('selectionChanged', { node: node.proxy }); }; -proto._selectNode = function (index, state) { +proto._selectNode = function (index, state): void { const that = this; let selectionList; let k; @@ -138,7 +138,7 @@ proto._selectNode = function (index, state) { } }; -proto.clearSelection = function () { +proto.clearSelection = function (): void { const that = this; const selectionList = that._selectionList; let i; diff --git a/packages/devextreme/js/__internal/viz/tree_map/states.ts b/packages/devextreme/js/__internal/viz/tree_map/states.ts index 51df9c408575..5902ed13ed77 100644 --- a/packages/devextreme/js/__internal/viz/tree_map/states.ts +++ b/packages/devextreme/js/__internal/viz/tree_map/states.ts @@ -46,7 +46,7 @@ nodeProto._getState = function () { return this.state[this.statesMap[this.code]]; }; -nodeProto.setState = function (code, state) { +nodeProto.setState = function (code, state): void { if (state) { this.code |= code; } else { @@ -55,7 +55,7 @@ nodeProto.setState = function (code, state) { this.ctx.change(['TILES']); }; -function buildAdditionalStates(states, base, source, list) { +function buildAdditionalStates(states, base, source, list): void { let i; const ii = list.length; diff --git a/packages/devextreme/js/__internal/viz/tree_map/tiling.slice_and_dice.ts b/packages/devextreme/js/__internal/viz/tree_map/tiling.slice_and_dice.ts index 84ca78570bc8..103f8d7ca0d9 100644 --- a/packages/devextreme/js/__internal/viz/tree_map/tiling.slice_and_dice.ts +++ b/packages/devextreme/js/__internal/viz/tree_map/tiling.slice_and_dice.ts @@ -1,9 +1,8 @@ /* eslint-disable @typescript-eslint/explicit-module-boundary-types */ -/* eslint-disable @typescript-eslint/explicit-function-return-type */ import { addAlgorithm, buildSidesData, calculateRectangles } from '@ts/viz/tree_map/tiling'; -function sliceAndDice(data) { +function sliceAndDice(data): void { const { items } = data; const sidesData = buildSidesData(data.rect, data.directions, data.isRotated ? 1 : 0); diff --git a/packages/devextreme/js/__internal/viz/tree_map/tiling.squarified.base.ts b/packages/devextreme/js/__internal/viz/tree_map/tiling.squarified.base.ts index 3e9630b19e48..335f33074609 100644 --- a/packages/devextreme/js/__internal/viz/tree_map/tiling.squarified.base.ts +++ b/packages/devextreme/js/__internal/viz/tree_map/tiling.squarified.base.ts @@ -11,13 +11,17 @@ import { buildSidesData, calculateRectangles, getStaticSideIndex } from '@ts/viz const _max = Math.max; const _round = Math.round; -function compare(a, b) { return b.value - a.value; } +function compare(a, b): number { return b.value - a.value; } -function getAspectRatio(value) { +function getAspectRatio(value): number { return _max(value, 1 / value); } -function findAppropriateCollection(nodes, head, context) { +function findAppropriateCollection( + nodes, + head, + context, +): { sum: number; count: number; side: number } { let bestAspectRatio = Infinity; let nextAspectRatio; let sum = 0; @@ -50,7 +54,7 @@ function findAppropriateCollection(nodes, head, context) { return { sum, count: i - head, side: _round(coeff * sum) }; } -function getArea(rect) { +function getArea(rect): number { return (rect[2] - rect[0]) * (rect[3] - rect[1]); } @@ -68,7 +72,7 @@ function doStep(nodes, head, context) { return head + rowData.count; } -export default function (data, accumulate, isFixedStaticSide) { +export default function (data, accumulate, isFixedStaticSide): void { const { items } = data; const ii = items.length; let i; diff --git a/packages/devextreme/js/__internal/viz/tree_map/tiling.squarified.ts b/packages/devextreme/js/__internal/viz/tree_map/tiling.squarified.ts index 1125adcd8ac1..a106728751b0 100644 --- a/packages/devextreme/js/__internal/viz/tree_map/tiling.squarified.ts +++ b/packages/devextreme/js/__internal/viz/tree_map/tiling.squarified.ts @@ -1,17 +1,16 @@ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable @typescript-eslint/explicit-module-boundary-types */ -/* eslint-disable @typescript-eslint/explicit-function-return-type */ import { addAlgorithm } from '@ts/viz/tree_map/tiling'; import _squarify from '@ts/viz/tree_map/tiling.squarified.base'; const _max = Math.max; -function accumulate(total, current) { +function accumulate(total, current): number { return _max(total, current); } -function squarified(data) { +function squarified(data): void { return _squarify(data, accumulate, false); } diff --git a/packages/devextreme/js/__internal/viz/tree_map/tiling.strip.ts b/packages/devextreme/js/__internal/viz/tree_map/tiling.strip.ts index 8b9003efe357..7f344d3e06f3 100644 --- a/packages/devextreme/js/__internal/viz/tree_map/tiling.strip.ts +++ b/packages/devextreme/js/__internal/viz/tree_map/tiling.strip.ts @@ -1,14 +1,13 @@ /* eslint-disable @typescript-eslint/explicit-module-boundary-types */ -/* eslint-disable @typescript-eslint/explicit-function-return-type */ import { addAlgorithm } from '@ts/viz/tree_map/tiling'; import _squarify from '@ts/viz/tree_map/tiling.squarified.base'; -function accumulate(total, current, count) { +function accumulate(total, current, count): number { return ((count - 1) * total + current) / count; } -function strip(data) { +function strip(data): void { return _squarify(data, accumulate, true); } diff --git a/packages/devextreme/js/__internal/viz/tree_map/tiling.ts b/packages/devextreme/js/__internal/viz/tree_map/tiling.ts index ba2b0c02c213..5e7bd28932c8 100644 --- a/packages/devextreme/js/__internal/viz/tree_map/tiling.ts +++ b/packages/devextreme/js/__internal/viz/tree_map/tiling.ts @@ -19,11 +19,11 @@ export function getAlgorithm(value) { return algorithms[_normalizeEnum(value)] || (_isFunction(value) && value) || defaultAlgorithm; } -export function addAlgorithm(name, callback) { +export function addAlgorithm(name, callback): void { algorithms[name] = callback; } -export function setDefaultAlgorithm(name) { +export function setDefaultAlgorithm(name): void { defaultAlgorithm = algorithms[name]; } @@ -31,7 +31,7 @@ const directionToIndexOffsets = {}; directionToIndexOffsets[-1] = [2, 0]; directionToIndexOffsets[+1] = [0, 2]; -export const getStaticSideIndex = function (rect) { +export const getStaticSideIndex = function (rect): 0 | 1 { return (rect[2] - rect[0]) < (rect[3] - rect[1]) ? 0 : 1; }; @@ -56,7 +56,7 @@ export function buildSidesData(rect, directions, _staticSideIndex) { }; } -export function calculateRectangles(nodes, head, totalRect, sidesData, rowData) { +export function calculateRectangles(nodes, head, totalRect, sidesData, rowData): void { let i; let ii; const variedSidePart = [0, 0, 0, 0]; diff --git a/packages/devextreme/js/__internal/viz/tree_map/tooltip.ts b/packages/devextreme/js/__internal/viz/tree_map/tooltip.ts index 572e5d0dd113..e59b63b07327 100644 --- a/packages/devextreme/js/__internal/viz/tree_map/tooltip.ts +++ b/packages/devextreme/js/__internal/viz/tree_map/tooltip.ts @@ -16,7 +16,7 @@ const proto = TreeMapBase.prototype; expand(proto, '_extendProxyType', function (proto) { const that = this; - proto.showTooltip = function (coords) { + proto.showTooltip = function (coords): void { that._showTooltip(this._id, coords); }; }); @@ -44,7 +44,7 @@ function getCoords(coords, rect, renderer) { ); } -proto._showTooltip = function (index, coords) { +proto._showTooltip = function (index, coords): void { const that = this; const tooltip = that._tooltip; const node = that._nodes[index]; @@ -52,7 +52,7 @@ proto._showTooltip = function (index, coords) { that._moveTooltip(node, coords); return; } - const callback = (result) => { + const callback = (result): void => { if (result === undefined) { return; } @@ -69,13 +69,13 @@ proto._showTooltip = function (index, coords) { }, { x: xy[0], y: xy[1], offset: 0 }, { node: node.proxy }, undefined, callback)); }; -proto._moveTooltip = function (node, coords) { +proto._moveTooltip = function (node, coords): void { const xy = getCoords(coords, node.rect, this._renderer); this._tooltip.move(xy[0], xy[1], 0); }; -proto.hideTooltip = function () { +proto.hideTooltip = function (): void { if (this._tooltipIndex >= 0) { this._tooltipIndex = -1; this._tooltip.hide(); diff --git a/packages/devextreme/js/__internal/viz/tree_map/tracker.ts b/packages/devextreme/js/__internal/viz/tree_map/tracker.ts index 7b2f8b440377..84cc5623e37a 100644 --- a/packages/devextreme/js/__internal/viz/tree_map/tracker.ts +++ b/packages/devextreme/js/__internal/viz/tree_map/tracker.ts @@ -24,7 +24,7 @@ let _TESTS_dataKey; /// #ENDDEBUG proto._eventsMap.onClick = { name: 'click' }; -const getDataKey = function () { +const getDataKey = function (): string { const dataKey = DATA_KEY_BASE + dataKeyModifier++; return dataKey; }; @@ -54,11 +54,11 @@ expand(proto, '_initCore', function () { const { target } = e; return (target.tagName === 'tspan' ? target.parentNode : target)[dataKey]; }, - click(e) { + click(e): void { that._eventTrigger('click', e); }, }); - that._handlers.setTrackerData = function (node, element) { + that._handlers.setTrackerData = function (node, element): void { element.data(dataKey, node._id); }; }); diff --git a/packages/devextreme/js/__internal/viz/utils.ts b/packages/devextreme/js/__internal/viz/utils.ts index 8063d589d3ec..b82173e1165f 100644 --- a/packages/devextreme/js/__internal/viz/utils.ts +++ b/packages/devextreme/js/__internal/viz/utils.ts @@ -81,7 +81,7 @@ export let prepareSegmentRectPoints = function (left, top, width, height, border return { points, pathType: visiblyOpt === 15 ? 'area' : 'line' }; }; -const areCanvasesDifferent = function (canvas1, canvas2) { +const areCanvasesDifferent = function (canvas1, canvas2): boolean { const sizeChangingThreshold = 1; const sizeLessThreshold = ['width', 'height'] @@ -116,7 +116,7 @@ exports._test_prepareSegmentRectPoints = function () { // @ts-expect-error prepareSegmentRectPoints.original = original; // @ts-expect-error - prepareSegmentRectPoints.restore = function () { prepareSegmentRectPoints = original; }; + prepareSegmentRectPoints.restore = function (): void { prepareSegmentRectPoints = original; }; return prepareSegmentRectPoints; }; /// #ENDDEBUG diff --git a/packages/devextreme/js/__internal/viz/vector_map/control_bar/utils.ts b/packages/devextreme/js/__internal/viz/vector_map/control_bar/utils.ts index ffb832d8c1cc..b9ee092a5994 100644 --- a/packages/devextreme/js/__internal/viz/vector_map/control_bar/utils.ts +++ b/packages/devextreme/js/__internal/viz/vector_map/control_bar/utils.ts @@ -15,7 +15,7 @@ export const createTracker = (renderer, root) => renderer export const createVisibilityGroup = (renderer, root, className = '') => renderer.g().attr({ class: className }).append(root); -export const toggleDisplay = (blocks, isVisible) => { +export const toggleDisplay = (blocks, isVisible): void => { const cssDisplayBlock = { display: 'block' }; const cssDisplayNone = { display: 'none' }; const style = isVisible ? cssDisplayBlock : cssDisplayNone; diff --git a/packages/devextreme/js/__internal/viz/vector_map/event_emitter.ts b/packages/devextreme/js/__internal/viz/vector_map/event_emitter.ts index 23b2b1cd5847..c6992806446b 100644 --- a/packages/devextreme/js/__internal/viz/vector_map/event_emitter.ts +++ b/packages/devextreme/js/__internal/viz/vector_map/event_emitter.ts @@ -5,12 +5,11 @@ /* eslint-disable no-multi-assign */ /* eslint-disable @typescript-eslint/explicit-module-boundary-types */ /* eslint-disable @typescript-eslint/no-use-before-define */ -/* eslint-disable @typescript-eslint/explicit-function-return-type */ import { Callbacks } from '@ts/core/utils/callbacks'; const eventEmitterMethods = { - _initEvents() { + _initEvents(): void { const names = this._eventNames; let i; const ii = names.length; @@ -20,7 +19,7 @@ const eventEmitterMethods = { } }, - _disposeEvents() { + _disposeEvents(): void { const events = this._events; let name; for (name in events) { @@ -29,26 +28,26 @@ const eventEmitterMethods = { this._events = null; }, - on(handlers) { + on(handlers): () => void { const events = this._events; let name; for (name in handlers) { events[name].add(handlers[name]); } return dispose; - function dispose() { + function dispose(): void { for (name in handlers) { events[name].remove(handlers[name]); } } }, - _fire(name, arg) { + _fire(name, arg): void { this._events[name].fire(arg); }, }; -export function makeEventEmitter(target) { +export function makeEventEmitter(target): void { const proto = target.prototype; let name; for (name in eventEmitterMethods) { diff --git a/packages/devextreme/js/__internal/viz/vector_map/map_layer.ts b/packages/devextreme/js/__internal/viz/vector_map/map_layer.ts index 985943582ac0..d3a6f4f81149 100644 --- a/packages/devextreme/js/__internal/viz/vector_map/map_layer.ts +++ b/packages/devextreme/js/__internal/viz/vector_map/map_layer.ts @@ -219,7 +219,7 @@ class GeoJsonSource { } } -function isGeoJsonObject(obj) { +function isGeoJsonObject(obj): boolean { return _isArray(obj.features); } @@ -251,17 +251,17 @@ function wrapToDataSource(option) { return option ? isGeoJsonObject(option) ? [option] : option : []; } -function customizeHandles(proxies, callback, widget) { +function customizeHandles(proxies, callback, widget): void { callback.call(widget, proxies); } // TODO: Consider moving it inside a strategy -function setAreaLabelVisibility(label) { +function setAreaLabelVisibility(label): void { label.text.attr({ visibility: label.size[0] / label.spaceSize[0] < TOLERANCE && label.size[1] / label.spaceSize[1] < TOLERANCE ? null : 'hidden' }); } // TODO: Consider moving it inside a strategy -function setLineLabelVisibility(label) { +function setLineLabelVisibility(label): void { label.text.attr({ visibility: label.size[0] / label.spaceSize[0] < TOLERANCE || label.size[1] / label.spaceSize[1] < TOLERANCE ? null : 'hidden' }); } @@ -321,7 +321,7 @@ const strategiesByElementType = {}; let groupByColor; let groupBySize; -let selectStrategy = function (options, data) { +let selectStrategy = function (options, data): LayerStrategy { let type = _normalizeEnum(options.type); let elementType = _normalizeEnum(options.elementType); let sample; @@ -346,7 +346,7 @@ let selectStrategy = function (options, data) { return strategy; }; -function applyElementState(figure, styles, state, field) { +function applyElementState(figure, styles, state, field): void { figure[field].attr(styles[field][state]); } @@ -357,13 +357,13 @@ strategiesByType[TYPE_AREA] = { transformLabel: transformAreaLabel, - draw(context, figure, data) { + draw(context, figure, data): void { figure.root = context.renderer.path([], 'area').data(context.dataKey, data); }, refresh: _noop, - getLabelOffset(label) { + getLabelOffset(label): number[] { setAreaLabelVisibility(label); return [0, 0]; }, @@ -388,13 +388,13 @@ strategiesByType[TYPE_AREA] = { }; }, - setState(figure, styles, state) { + setState(figure, styles, state): void { applyElementState(figure, styles, state, 'root'); }, hasLabelsGroup: true, - updateGrouping(context) { + updateGrouping(context): void { groupByColor(context); }, @@ -408,13 +408,13 @@ strategiesByType[TYPE_LINE] = { transformLabel: transformLineLabel, - draw(context, figure, data) { + draw(context, figure, data): void { figure.root = context.renderer.path([], 'line').data(context.dataKey, data); }, refresh: _noop, - getLabelOffset(label) { + getLabelOffset(label): number[] { setLineLabelVisibility(label); return [0, 0]; }, @@ -438,13 +438,13 @@ strategiesByType[TYPE_LINE] = { }; }, - setState(figure, styles, state) { + setState(figure, styles, state): void { applyElementState(figure, styles, state, 'root'); }, hasLabelsGroup: true, - updateGrouping(context) { + updateGrouping(context): void { groupByColor(context); }, @@ -456,7 +456,7 @@ strategiesByType[TYPE_MARKER] = { transform: transformPoint, - draw(context, figure, data) { + draw(context, figure, data): void { figure.root = context.renderer.g(); this._draw(context, figure, data); }, @@ -465,11 +465,11 @@ strategiesByType[TYPE_MARKER] = { hasLabelsGroup: false, - getLabelOffset(label, settings) { + getLabelOffset(label, settings): number[] { return [_round((label.size[0] + _max(settings.size || 0, 0)) / 2) + 2, 0]; }, - getStyles(settings) { + getStyles(settings): { root: { class: string }[] } { const styles = { root: [ { class: 'dxm-marker' }, @@ -481,12 +481,12 @@ strategiesByType[TYPE_MARKER] = { return styles; }, - setState(figure, styles, state) { + setState(figure, styles, state): void { applyElementState(figure, styles, state, 'root'); this._setState(figure, styles, state); }, - updateGrouping(context) { + updateGrouping(context): void { groupByColor(context); groupBySize(context); }, @@ -509,7 +509,7 @@ strategiesByGeometry[TYPE_AREA] = function () { return { project: projectAreaByGeometry }; }; -function projectLineByGeometry(projection, coordinates) { +function projectLineByGeometry(projection, coordinates): number[][][] { return coordinates[0] && coordinates[0][0] && typeof coordinates[0][0][0] === 'number' @@ -525,25 +525,25 @@ strategiesByElementType[TYPE_MARKER] = { _default: 'dot', dot: { - setup(context) { + setup(context): void { context.filter = context.renderer.shadowFilter('-40%', '-40%', '180%', '200%', 0, 1, 1, '#000000', 0.2); }, - reset(context) { + reset(context): void { context.filter.dispose(); context.filter = null; }, - _draw(ctx, figure, data) { + _draw(ctx, figure, data): void { figure.back = ctx.renderer.circle().sharp().data(ctx.dataKey, data).append(figure.root); figure.dot = ctx.renderer.circle().sharp().data(ctx.dataKey, data).append(figure.root); }, - refresh(ctx, figure, data, proxy, settings) { + refresh(ctx, figure, data, proxy, settings): void { figure.dot.attr({ filter: settings.shadow ? ctx.filter.id : null }); }, - _getStyles(styles, style) { + _getStyles(styles, style): void { const size = style.size > 0 ? _Number(style.size) : 0; const hoveredSize = size; const selectedSize = size + (style.selectedStep > 0 ? _Number(style.selectedStep) : 0); @@ -579,22 +579,22 @@ strategiesByElementType[TYPE_MARKER] = { ]; }, - _setState(figure, styles, state) { + _setState(figure, styles, state): void { applyElementState(figure, styles, state, 'dot'); applyElementState(figure, styles, state, 'back'); }, }, bubble: { - _draw(ctx, figure, data) { + _draw(ctx, figure, data): void { figure.bubble = ctx.renderer.circle().sharp().data(ctx.dataKey, data).append(figure.root); }, - refresh(ctx, figure, data, proxy, settings) { + refresh(ctx, figure, data, proxy, settings): void { figure.bubble.attr({ r: settings.size / 2 }); }, - _getStyles(styles, style) { + _getStyles(styles, style): void { const color = style.color || null; const borderColor = style.borderColor || null; const borderWidth = pick(style.borderWidth, null); @@ -612,11 +612,11 @@ strategiesByElementType[TYPE_MARKER] = { ]; }, - _setState(figure, styles, state) { + _setState(figure, styles, state): void { applyElementState(figure, styles, state, 'bubble'); }, - arrange(context, handles) { + arrange(context, handles): void { const values: number[] = []; let i; const ii = values.length = handles.length; @@ -641,7 +641,7 @@ strategiesByElementType[TYPE_MARKER] = { } }, - updateGrouping(context) { + updateGrouping(context): void { const { dataField } = context.settings; strategiesByType[TYPE_MARKER].updateGrouping(context); groupBySize(context, (proxy) => getDataValue(proxy, dataField)); @@ -649,12 +649,12 @@ strategiesByElementType[TYPE_MARKER] = { }, pie: { - _draw(ctx, figure, data) { + _draw(ctx, figure, data): void { figure.pie = ctx.renderer.g().append(figure.root); figure.border = ctx.renderer.circle().sharp().data(ctx.dataKey, data).append(figure.root); }, - refresh(ctx, figure, data, proxy, settings) { + refresh(ctx, figure, data, proxy, settings): void { const values = getDataValue(proxy, ctx.settings.dataField) || []; const colors = settings._colors; let sum = 0; @@ -680,7 +680,7 @@ strategiesByElementType[TYPE_MARKER] = { figure.border.attr({ r }); }, - _getStyles(styles, style) { + _getStyles(styles, style): void { const opacity = pick(style.opacity, null); const borderColor = style.borderColor || null; const borderWidth = pick(style.borderWidth, null); @@ -696,12 +696,12 @@ strategiesByElementType[TYPE_MARKER] = { ]; }, - _setState(figure, styles, state) { + _setState(figure, styles, state): void { applyElementState(figure, styles, state, 'pie'); applyElementState(figure, styles, state, 'border'); }, - arrange(context, handles) { + arrange(context, handles): void { let i; const ii = handles.length; const { dataField } = context.settings; @@ -728,18 +728,18 @@ strategiesByElementType[TYPE_MARKER] = { }, image: { - _draw(ctx, figure, data) { + _draw(ctx, figure, data): void { figure.image = ctx.renderer.image(null, null, null, null, null, 'center') .attr({ 'pointer-events': 'visible' })// T567545 .data(ctx.dataKey, data) .append(figure.root); }, - refresh(ctx, figure, data, proxy) { + refresh(ctx, figure, data, proxy): void { figure.image.attr({ href: getDataValue(proxy, ctx.settings.dataField) }); }, - _getStyles(styles, style) { + _getStyles(styles, style): void { const size = style.size > 0 ? _Number(style.size) : 0; const hoveredSize = size + (style.hoveredStep > 0 ? _Number(style.hoveredStep) : 0); const selectedSize = size + (style.selectedStep > 0 ? _Number(style.selectedStep) : 0); @@ -769,7 +769,7 @@ strategiesByElementType[TYPE_MARKER] = { ]; }, - _setState(figure, styles, state) { + _setState(figure, styles, state): void { applyElementState(figure, styles, state, 'image'); }, }, @@ -779,7 +779,7 @@ function projectPoint(projection, coordinates) { return projection.project(coordinates); } -function projectPointList(projection, coordinates) { +function projectPointList(projection, coordinates): number[][] { const output: number[][] = []; let i; const ii = output.length = coordinates.length; @@ -789,11 +789,11 @@ function projectPointList(projection, coordinates) { return output; } -function projectLineString(projection, coordinates) { +function projectLineString(projection, coordinates): number[][][] { return [projectPointList(projection, coordinates)]; } -function projectPolygon(projection, coordinates) { +function projectPolygon(projection, coordinates): number[][][] { const output: number[][][] = []; let i; const ii = output.length = coordinates.length; @@ -813,12 +813,12 @@ function projectMultiPolygon(projection, coordinates) { return _concat.apply([], output); } -function transformPoint(content, projection, coordinates) { +function transformPoint(content, projection, coordinates): void { const data = projection.transform(coordinates); content.root.attr({ translateX: data[0], translateY: data[1] }); } -function transformList(projection, coordinates) { +function transformList(projection, coordinates): number[] { const output: number[] = []; let i; const ii = coordinates.length; @@ -832,7 +832,7 @@ function transformList(projection, coordinates) { return output; } -function transformPointList(content, projection, coordinates) { +function transformPointList(content, projection, coordinates): void { const output: number[][] = []; let i; const ii = output.length = coordinates.length; @@ -842,14 +842,14 @@ function transformPointList(content, projection, coordinates) { content.root.attr({ points: output }); } -function transformAreaLabel(label, projection, coordinates) { +function transformAreaLabel(label, projection, coordinates): void { const data = projection.transform(coordinates[0]); label.spaceSize = projection.getSquareSize(coordinates[1]); label.text.attr({ translateX: data[0], translateY: data[1] }); setAreaLabelVisibility(label); } -function transformLineLabel(label, projection, coordinates) { +function transformLineLabel(label, projection, coordinates): void { const data = projection.transform(coordinates[0]); label.spaceSize = projection.getSquareSize(coordinates[1]); label.text.attr({ translateX: data[0], translateY: data[1] }); @@ -865,7 +865,7 @@ function getItemSettings(context, proxy, settings) { return result; } -function applyGrouping(grouping, proxy, settings) { +function applyGrouping(grouping, proxy, settings): void { _each(grouping, (name, data) => { const index = findGroupingIndex(data.callback(proxy, data.field), data.partition); if (index >= 0) { @@ -874,7 +874,7 @@ function applyGrouping(grouping, proxy, settings) { }); } -function findGroupingIndex(value, partition) { +function findGroupingIndex(value, partition): number { let start = 0; let end = partition.length - 1; let index = -1; @@ -897,7 +897,7 @@ function findGroupingIndex(value, partition) { return index; } -function raiseChanged(context, handle, state, name) { +function raiseChanged(context, handle, state, name): void { context.params.eventTrigger(name, { target: handle.proxy, state }); } @@ -932,7 +932,7 @@ function valueCallback(proxy, dataField) { return proxy.attribute(dataField); } -let performGrouping = function (context, partition, settingField, dataField, valuesCallback) { +let performGrouping = function (context, partition, settingField, dataField, valuesCallback): void { let values; if (dataField && partition && partition.length > 1) { values = valuesCallback(partition.length - 1); @@ -950,7 +950,7 @@ let performGrouping = function (context, partition, settingField, dataField, val } }; -function dropGrouping(context) { +function dropGrouping(context): void { const { name } = context; const { dataExchanger } = context.params; _each(context.grouping, (field) => { @@ -959,7 +959,7 @@ function dropGrouping(context) { context.grouping = {}; } -groupByColor = function (context) { +groupByColor = function (context): void { performGrouping(context, context.settings.colorGroups, 'color', context.settings.colorGroupingField, (count) => { const _palette = context.params.themeManager.createDiscretePalette( context.settings.palette, @@ -974,7 +974,7 @@ groupByColor = function (context) { }); }; -groupBySize = function (context, valueCallback) { +groupBySize = function (context, valueCallback): void { const { settings } = context; performGrouping(context, settings.sizeGroups, 'size', valueCallback || settings.sizeGroupingField, (count) => { const minSize = settings.minSize > 0 ? _Number(settings.minSize) : 0; @@ -1001,7 +1001,7 @@ function setFlag(flags, flag, state) { return flags; } -function hasFlag(flags, flag) { +function hasFlag(flags, flag): boolean { return !!(flags & flag); } @@ -1636,7 +1636,7 @@ let MapLayerElement = class MapLayerElement { }; // http://en.wikipedia.org/wiki/Centroid -function calculatePolygonCentroid(coordinates) { +function calculatePolygonCentroid(coordinates): { area: number; center: number[] } { let i; const { length } = coordinates; let v1; @@ -1671,7 +1671,7 @@ function calculatePolygonCentroid(coordinates) { }; } -function calculateLineStringData(coordinates) { +function calculateLineStringData(coordinates): (number | number[])[] { let i; const ii = coordinates.length; let v1; @@ -1896,27 +1896,27 @@ export let MapLayerCollection = class MapLayerCollection { /// #DEBUG export const _TESTS_MapLayer = MapLayer; -export const _TESTS_stub_MapLayer = function (stub) { +export const _TESTS_stub_MapLayer = function (stub): void { MapLayer = stub; }; export const _TESTS_selectStrategy = selectStrategy; -export const _TESTS_stub_selectStrategy = function (stub) { +export const _TESTS_stub_selectStrategy = function (stub): void { selectStrategy = stub; }; export const _TESTS_MapLayerElement = MapLayerElement; -export const _TESTS_stub_MapLayerElement = function (stub) { +export const _TESTS_stub_MapLayerElement = function (stub): void { MapLayerElement = stub; }; export const _TESTS_createProxy = createProxy; -export const _TESTS_stub_performGrouping = function (stub) { +export const _TESTS_stub_performGrouping = function (stub): void { performGrouping = stub; }; export const _TESTS_performGrouping = performGrouping; -export const _TESTS_stub_groupByColor = function (stub) { +export const _TESTS_stub_groupByColor = function (stub): void { groupByColor = stub; }; export const _TESTS_groupByColor = groupByColor; -export const _TESTS_stub_groupBySize = function (stub) { +export const _TESTS_stub_groupBySize = function (stub): void { groupBySize = stub; }; export const _TESTS_groupBySize = groupBySize; diff --git a/packages/devextreme/js/__internal/viz/vector_map/projection.main.ts b/packages/devextreme/js/__internal/viz/vector_map/projection.main.ts index 8c32ed204858..4b7086e87556 100644 --- a/packages/devextreme/js/__internal/viz/vector_map/projection.main.ts +++ b/packages/devextreme/js/__internal/viz/vector_map/projection.main.ts @@ -615,7 +615,7 @@ function findMinMax(p1: number[], p2: number[]): { min: number[]; max: number[] }; } -export const projection = function (parameters) { +export const projection = function (parameters): EngineInstance | null { return parameters && parameters.to ? new Engine(parameters) : null; }; @@ -638,7 +638,7 @@ function createProjectUnprojectMethods(project, unproject, p1, p2, delta) { const y0 = (p1[1] + p2[1]) / 2 - delta / 2; const k = 2 / delta; return { - to(coordinates) { + to(coordinates): number[] { const [p0, p1] = project(coordinates); return [-1 + (p0 - x0) * k, -1 + (p1 - y0) * k]; }, diff --git a/packages/devextreme/js/__internal/viz/vector_map/projection.ts b/packages/devextreme/js/__internal/viz/vector_map/projection.ts index 01fb9b692e9a..87a6c16e8eeb 100644 --- a/packages/devextreme/js/__internal/viz/vector_map/projection.ts +++ b/packages/devextreme/js/__internal/viz/vector_map/projection.ts @@ -1,6 +1,5 @@ /* eslint-disable @stylistic/no-mixed-operators */ /* eslint-disable @typescript-eslint/naming-convention */ -/* eslint-disable @typescript-eslint/explicit-function-return-type */ import { projection } from '@ts/viz/vector_map/projection.main'; @@ -22,7 +21,7 @@ const RADIANS = PI / 180; const MERCATOR_LAT_BOUND = (2 * _atan(_exp(PI)) - PI / 2) / RADIANS; const MILLER_LAT_BOUND = (2.5 * _atan(_exp(0.8 * PI)) - 0.625 * PI) / RADIANS; -function clamp(value, threshold) { +function clamp(value, threshold): number { return _max(_min(value, +threshold), -threshold); } diff --git a/packages/devextreme/js/__internal/viz/vector_map/vector_map.utils.ts b/packages/devextreme/js/__internal/viz/vector_map/vector_map.utils.ts index 8bbfee1698c1..4e76b2933282 100644 --- a/packages/devextreme/js/__internal/viz/vector_map/vector_map.utils.ts +++ b/packages/devextreme/js/__internal/viz/vector_map/vector_map.utils.ts @@ -1,15 +1,13 @@ /* eslint-disable no-plusplus */ -/* eslint-disable @typescript-eslint/explicit-module-boundary-types */ -/* eslint-disable @typescript-eslint/explicit-function-return-type */ let nextDataKey = 1; -export function generateDataKey() { +export function generateDataKey(): string { return `vectormap-data-${nextDataKey++}`; } /// #DEBUG -exports._TESTS_resetDataKey = function () { +exports._TESTS_resetDataKey = function (): void { nextDataKey = 1; }; /// #ENDDEBUG From 25c235c5635688f4530de104862898eb52acc8df Mon Sep 17 00:00:00 2001 From: EugeniyKiyashko Date: Wed, 18 Nov 2026 11:51:24 +0400 Subject: [PATCH 2/3] Viz: widen five return types to what the functions return at runtime TypeScript inferred these from an `any` that flows into the result, so the written-out types were narrower than the runtime values: - tick_generator addInterval: Date and number overloads, like dateUtils.addInterval; - parse_utils string/numeric parsers: also null and undefined; - sankey data_validator validate: the 'E2006' error code or null; - range_series getSeriesPairCoord: the found coordinate or null. --- packages/devextreme/js/__internal/viz/axes/tick_generator.ts | 4 +++- .../devextreme/js/__internal/viz/components/parse_utils.ts | 4 ++-- .../devextreme/js/__internal/viz/sankey/data_validator.ts | 5 ++--- packages/devextreme/js/__internal/viz/series/range_series.ts | 4 ++-- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/packages/devextreme/js/__internal/viz/axes/tick_generator.ts b/packages/devextreme/js/__internal/viz/axes/tick_generator.ts index b25e052ecb0f..3a9247606117 100644 --- a/packages/devextreme/js/__internal/viz/axes/tick_generator.ts +++ b/packages/devextreme/js/__internal/viz/axes/tick_generator.ts @@ -440,7 +440,9 @@ function getTickIntervalByCustomTicks(getValue, postProcess) { : undefined); } -function addInterval(value, interval, isNegative): Date { +function addInterval(value: Date, interval, isNegative): Date; +function addInterval(value: number, interval, isNegative): number; +function addInterval(value, interval, isNegative): Date | number { return dateUtils.addInterval(value, interval, isNegative); } diff --git a/packages/devextreme/js/__internal/viz/components/parse_utils.ts b/packages/devextreme/js/__internal/viz/components/parse_utils.ts index 87531c5c0137..aa343daaf379 100644 --- a/packages/devextreme/js/__internal/viz/components/parse_utils.ts +++ b/packages/devextreme/js/__internal/viz/components/parse_utils.ts @@ -9,11 +9,11 @@ import { dateSerialization } from '@ts/core/utils/date_serialization'; import { isDefined } from '@ts/core/utils/type'; const parsers = { - string(val): string { + string(val): string | null | undefined { return isDefined(val) ? `${val}` : val; }, - numeric(val): number { + numeric(val): number | null | undefined { if (!isDefined(val)) { return val; } diff --git a/packages/devextreme/js/__internal/viz/sankey/data_validator.ts b/packages/devextreme/js/__internal/viz/sankey/data_validator.ts index 1cde6dab65be..ff6ac9c55384 100644 --- a/packages/devextreme/js/__internal/viz/sankey/data_validator.ts +++ b/packages/devextreme/js/__internal/viz/sankey/data_validator.ts @@ -5,10 +5,9 @@ import graphModule from './graph'; const validator = { - validate(data, incidentOccurred): null { - let result = null; + validate(data, incidentOccurred): string | null { + let result: string | null = null; if (this._hasCycle(data)) { - // @ts-expect-error result = 'E2006'; incidentOccurred('E2006'); } diff --git a/packages/devextreme/js/__internal/viz/series/range_series.ts b/packages/devextreme/js/__internal/viz/series/range_series.ts index 955f3b9bac47..2e604eec5d44 100644 --- a/packages/devextreme/js/__internal/viz/series/range_series.ts +++ b/packages/devextreme/js/__internal/viz/series/range_series.ts @@ -112,8 +112,8 @@ const baseRangeSeries = { return [this._options.rangeValue1Field || 'val1', this._options.rangeValue2Field || 'val2']; }, - getSeriesPairCoord(coord, isArgument): null { - let oppositeCoord = null; + getSeriesPairCoord(coord, isArgument): number | null { + let oppositeCoord: number | null = null; const { rotated } = this._options; const isOpposite = !isArgument && !rotated || isArgument && rotated; const coordName = isOpposite ? 'vy' : 'vx'; From 64eeba725aca81fe204800ead293828495748dae Mon Sep 17 00:00:00 2001 From: Andrei Kharitonov Date: Wed, 18 Nov 2026 11:29:34 +0100 Subject: [PATCH 3/3] fix --- .../js/__internal/viz/axes/polar_axes.ts | 5 +-- .../js/__internal/viz/axes/tick_generator.ts | 10 +----- .../viz/chart_components/base_chart.ts | 3 +- .../viz/chart_components/zoom_and_pan.ts | 32 +++++++++++-------- .../__internal/viz/components/parse_utils.ts | 3 +- .../js/__internal/viz/core/utils.ts | 3 +- .../js/__internal/viz/funnel/label.ts | 3 +- .../viz/series/points/symbol_point.ts | 3 +- .../viz/translators/translator2d.ts | 2 +- 9 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/devextreme/js/__internal/viz/axes/polar_axes.ts b/packages/devextreme/js/__internal/viz/axes/polar_axes.ts index 0d81ba6b63fd..6ab2a4c8b475 100644 --- a/packages/devextreme/js/__internal/viz/axes/polar_axes.ts +++ b/packages/devextreme/js/__internal/viz/axes/polar_axes.ts @@ -23,6 +23,7 @@ import constants from '@ts/viz/axes/axes_constants'; import { calculateCanvasMargins, measureLabels } from '@ts/viz/axes/axes_utils'; import { tick } from '@ts/viz/axes/tick'; import xyAxes from '@ts/viz/axes/xy_axes'; +import type { Coords } from '@ts/viz/core/types'; import { convertPolarToXY, convertXYToPolar, getCosAndSin, getDistance, @@ -280,7 +281,7 @@ const circularAxes = { line.rotate(value + this.getAngles()[0], x, y); }, - _getConstantLineLabelsCoords(value): { x: number; y: number } { + _getConstantLineLabelsCoords(value): Coords { const that = this; const cosSin = getCosAndSin(-value - that.getAngles()[0]); const halfRad = that.getRadius() / 2; @@ -638,7 +639,7 @@ export const linear = { ]; }, - _getLabelAdjustedCoord(tick): { x: number; y: number } { + _getLabelAdjustedCoord(tick): Coords { const that = this; const { labelCoords } = tick; const labelY = labelCoords.y; diff --git a/packages/devextreme/js/__internal/viz/axes/tick_generator.ts b/packages/devextreme/js/__internal/viz/axes/tick_generator.ts index 3a9247606117..eb028ae7ab61 100644 --- a/packages/devextreme/js/__internal/viz/axes/tick_generator.ts +++ b/packages/devextreme/js/__internal/viz/axes/tick_generator.ts @@ -323,15 +323,7 @@ function getAdjustIntervalLog(skipCalculationLimits) { }; } -function getDataTimeMultipliers(gapSize): { - millisecond: number[]; - second: number[]; - minute: number[]; - hour: number[]; - day: number[]; - week: number[]; - month: number[]; -} { +function getDataTimeMultipliers(gapSize): typeof DATETIME_MULTIPLIERS { if (gapSize && gapSize > 2) { return DATETIME_MULTIPLIERS_WITH_BIG_WEEKEND; } diff --git a/packages/devextreme/js/__internal/viz/chart_components/base_chart.ts b/packages/devextreme/js/__internal/viz/chart_components/base_chart.ts index fb3a40d88f2a..7e22435fd254 100644 --- a/packages/devextreme/js/__internal/viz/chart_components/base_chart.ts +++ b/packages/devextreme/js/__internal/viz/chart_components/base_chart.ts @@ -40,6 +40,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 { Size } from '@ts/viz/core/types'; import { map as _map, processSeriesTemplate, setCanvasValues as _setCanvasValues } from '@ts/viz/core/utils'; import { Series } from '@ts/viz/series/base_series'; @@ -582,7 +583,7 @@ export class BaseChart extends BaseWidget { return this._themeManager.getOptions('animation'); } - _getDefaultSize(): { width: number; height: number } { + _getDefaultSize(): Size { return { width: 400, height: 400 }; } 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 3b972bd3d5c3..04929e7267a2 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 @@ -20,7 +20,15 @@ import { start as dragEventStart, } from '@ts/events/drag'; import { exportNames as transformEvents } from '@ts/events/transform'; +import type { Coords } from '@ts/viz/core/types'; import { getVizRangeObject, normalizeEnum } from '@ts/viz/core/utils'; +import type { ZoomResult } from '@ts/viz/translators/translator2d'; + +interface ViewportZoom extends Partial { + zoomed: boolean; + deltaTranslate?: number; + enabled?: boolean; +} const EVENTS_NS = '.zoomAndPanNS'; @@ -166,8 +174,8 @@ export default { } function axesViewportChanging(zoomAndPan, actionField, e, offsetCalc, centerCalc) { - function zoomAxes(axes, criteria, coordField, e, actionData): { zoomed: boolean } { - let zoom = { zoomed: false }; + function zoomAxes(axes, criteria, coordField, e, actionData): ViewportZoom { + let zoom: ViewportZoom = { zoomed: false }; criteria && getFilteredAxes(axes).forEach((axis) => { const options = axis.getOptions(); const viewport = axis.visualRange(); @@ -178,7 +186,6 @@ export default { zoom, axis.getTranslator().zoom(translate, scale, axis.getZoomBounds()), ); - // @ts-expect-error let pannedRange = getVizRangeObject([zoom.min, zoom.max]); if (actionField === 'pan' && scale === 1) { pannedRange = axis.adjustPannedRange(pannedRange); @@ -201,8 +208,9 @@ export default { ); if (!stopInteraction) { zoom.zoomed = true; - // @ts-expect-error - zoom.deltaTranslate = translate - zoom.translate; + // extend() above has copied the translator's zoom result into zoom + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + zoom.deltaTranslate = translate - zoom.translate!; } } else if (e.pointerType === 'touch' && options.type === 'discrete') { const isMinPosition = axis.isExtremePosition(false); @@ -216,7 +224,6 @@ export default { || (isMaxPosition && ((translate > 0 && !options.inverted) || (translate < 0 && options.inverted))) ); - // @ts-expect-error zoom.enabled = zoomInEnabled || zoomOutEnabled || panningEnabled; } }); @@ -240,8 +247,8 @@ export default { const rotated = chart.option('rotated'); const { actionData } = zoomAndPan; const { options } = zoomAndPan; - let argZoom = {}; - let valZoom = {}; + let argZoom: Partial = {}; + let valZoom: Partial = {}; if (!actionData.fallback) { argZoom = zoomAxes(chart._argumentAxes, options.argumentAxis[actionField], rotated ? 'y' : 'x', e, actionData); @@ -254,13 +261,10 @@ export default { const center = centerCalc(e); storeCenter(center, actionData, argZoom, rotated ? 'y' : 'x'); storeCenter(center, actionData, valZoom, rotated ? 'x' : 'y'); - // @ts-expect-error if (!argZoom.zoomed && !valZoom.zoomed) { actionData.center = center; } - // @ts-expect-error return argZoom.zoomed || valZoom.zoomed || actionData.fallback - // @ts-expect-error || argZoom.enabled || valZoom.enabled; } @@ -353,7 +357,7 @@ export default { }; } - function getPointerCoord(rect, e): { x: number; y: number } { + function getPointerCoord(rect, e): Coords { const rootOffset = renderer.getRootOffset(); return { x: _min(_max(e.pageX - rootOffset.left, rect.x), rect.width + rect.x), @@ -361,7 +365,7 @@ export default { }; } - function calcCenterForPinch(e): { x: number; y: number } { + function calcCenterForPinch(e): Coords { const rootOffset = renderer.getRootOffset(); const x1 = e.pointers[0].pageX; const x2 = e.pointers[1].pageX; @@ -373,7 +377,7 @@ export default { }; } - function calcCenterForDrag(e): { x: number; y: number } { + function calcCenterForDrag(e): Coords { const rootOffset = renderer.getRootOffset(); return { x: e.pageX - rootOffset.left, diff --git a/packages/devextreme/js/__internal/viz/components/parse_utils.ts b/packages/devextreme/js/__internal/viz/components/parse_utils.ts index aa343daaf379..13fc1b65e4b6 100644 --- a/packages/devextreme/js/__internal/viz/components/parse_utils.ts +++ b/packages/devextreme/js/__internal/viz/components/parse_utils.ts @@ -18,9 +18,8 @@ const parsers = { return val; } - let parsedVal = Number(val); + let parsedVal: number | undefined = Number(val); if (isNaN(parsedVal)) { - // @ts-expect-error parsedVal = undefined; } return parsedVal; diff --git a/packages/devextreme/js/__internal/viz/core/utils.ts b/packages/devextreme/js/__internal/viz/core/utils.ts index 6549d26ecd1e..8926f8907a6d 100644 --- a/packages/devextreme/js/__internal/viz/core/utils.ts +++ b/packages/devextreme/js/__internal/viz/core/utils.ts @@ -25,6 +25,7 @@ import { adjust, sign } from '@ts/core/utils/math'; import { isDefined, isExponential, isFunction, isNumeric, isString, } from '@ts/core/utils/type'; +import type { Coords } from '@ts/viz/core/types'; const { PI, @@ -310,7 +311,7 @@ export function convertPolarToXY( startAngle, angle, radius, -): { x: number; y: number } { +): Coords { const shiftAngle = 90; const normalizedRadius = radius > 0 ? radius : 0; diff --git a/packages/devextreme/js/__internal/viz/funnel/label.ts b/packages/devextreme/js/__internal/viz/funnel/label.ts index 4b3e1026b00a..86991e592f68 100644 --- a/packages/devextreme/js/__internal/viz/funnel/label.ts +++ b/packages/devextreme/js/__internal/viz/funnel/label.ts @@ -11,6 +11,7 @@ import { noop } from '@ts/core/utils/common'; import { extend } from '@ts/core/utils/extend'; +import type { Coords } from '@ts/viz/core/types'; import { normalizeEnum } from '@ts/viz/core/utils'; import { Label } from '@ts/viz/series/points/label'; @@ -54,7 +55,7 @@ function getOutsideLeftLabelPosition(coords, bBox, options, inverted) { }; } -function getInsideLabelPosition(coords, bBox, options): { x: number; y: number } { +function getInsideLabelPosition(coords, bBox, options): Coords { const width = coords[2] - coords[0]; const height = coords[7] - coords[1]; diff --git a/packages/devextreme/js/__internal/viz/series/points/symbol_point.ts b/packages/devextreme/js/__internal/viz/series/points/symbol_point.ts index f7a88bf27f95..46333eda97f9 100644 --- a/packages/devextreme/js/__internal/viz/series/points/symbol_point.ts +++ b/packages/devextreme/js/__internal/viz/series/points/symbol_point.ts @@ -19,6 +19,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 { getWindow, hasProperty } from '@ts/core/utils/window'; +import type { BBox } from '@ts/viz/core/types'; import { normalizeEnum as _normalizeEnum } from '@ts/viz/core/utils'; import { Label } from '@ts/viz/series/points/label'; @@ -279,7 +280,7 @@ export default { return marker; }, - _getSymbolBBox(x, y, r): { x: number; y: number; width: number; height: number } { + _getSymbolBBox(x, y, r): BBox { return { x: x - r, y: y - r, diff --git a/packages/devextreme/js/__internal/viz/translators/translator2d.ts b/packages/devextreme/js/__internal/viz/translators/translator2d.ts index e91798ef05ea..2fe24f8eb9b3 100644 --- a/packages/devextreme/js/__internal/viz/translators/translator2d.ts +++ b/packages/devextreme/js/__internal/viz/translators/translator2d.ts @@ -94,7 +94,7 @@ interface BreaksCheckingMethods { getBreaksSize: (br: TranslatorBreak, lastBreak: TranslatorBreak) => number; } -interface ZoomResult { +export interface ZoomResult { min: ThemeValue; max: ThemeValue; translate: number;