diff --git a/packages/devextreme/js/__internal/viz/core/utils.ts b/packages/devextreme/js/__internal/viz/core/utils.ts index 8926f8907a6d..0be7c023cdc1 100644 --- a/packages/devextreme/js/__internal/viz/core/utils.ts +++ b/packages/devextreme/js/__internal/viz/core/utils.ts @@ -569,6 +569,16 @@ export function normalizeArcParams(x, y, innerRadius, outerRadius, startAngle, e ]; } +interface VisualRangeObject { + startValue: T; + endValue: T; +} + +export function convertVisualRangeObject(visualRange: VisualRangeObject): T[]; +export function convertVisualRangeObject( + visualRange: VisualRangeObject, + convertToVisualRange: boolean, +): T[] | VisualRangeObject; export function convertVisualRangeObject(visualRange, convertToVisualRange?) { if (convertToVisualRange) { return visualRange; diff --git a/packages/devextreme/js/__internal/viz/gauges/base_gauge.ts b/packages/devextreme/js/__internal/viz/gauges/base_gauge.ts index 2f115551bf3d..6af404f0a020 100644 --- a/packages/devextreme/js/__internal/viz/gauges/base_gauge.ts +++ b/packages/devextreme/js/__internal/viz/gauges/base_gauge.ts @@ -1,4 +1,3 @@ -/* eslint-disable @typescript-eslint/no-unsafe-declaration-merging */ import formatHelper from '@ts/core/format_helper'; import { noop } from '@ts/core/utils/common'; import { paintedColor } from '@ts/core/utils/css_variables'; @@ -32,18 +31,31 @@ export interface GaugeFormatOptions { customizeText?: (this: ThemeValue, formatObject: ThemeValue) => ThemeValue; } -export interface BaseGauge extends TooltipPluginMembers { - _change_TITLE: () => void; - _factory: ThemeValue; - _title: ThemeValue; - _updateExtraElements: () => void; +export abstract class BaseGauge extends BaseWidget { + declare _tooltip: TooltipPluginMembers['_tooltip']; - _DEBUG_change_title?: () => void; - _DEBUG_rootRect?: number[]; - _debug_rendered?: () => void; -} + declare _disposeTooltip: TooltipPluginMembers['_disposeTooltip']; + + declare _initTooltip: TooltipPluginMembers['_initTooltip']; + + declare _setTooltipOptions: TooltipPluginMembers['_setTooltipOptions']; + + declare _setTooltipRendererOptions: TooltipPluginMembers['_setTooltipRendererOptions']; + + declare _change_TITLE: () => void; + + declare _factory: ThemeValue; + + declare _title: ThemeValue; + + declare _updateExtraElements: () => void; + + declare _DEBUG_change_title?: () => void; + + declare _DEBUG_rootRect?: number[]; + + declare _debug_rendered?: () => void; -export abstract class BaseGauge extends BaseWidget { _valueChangingLocker!: number; _translator; diff --git a/packages/devextreme/js/__internal/viz/gauges/base_indicators.ts b/packages/devextreme/js/__internal/viz/gauges/base_indicators.ts index cd10ffd7ca68..83136e823e01 100644 --- a/packages/devextreme/js/__internal/viz/gauges/base_indicators.ts +++ b/packages/devextreme/js/__internal/viz/gauges/base_indicators.ts @@ -115,6 +115,8 @@ export abstract class BaseIndicator extends BaseElement { visible?: boolean; + declare index?: number; + _init(): void { this._rootElement = this._createRoot() .linkOn(this._owner, { name: 'value-indicator', after: 'core' }); @@ -251,6 +253,8 @@ export abstract class BaseIndicator extends BaseElement { abstract _clear(): void; abstract _move(): void; + + abstract measure(layout: unknown): IndicatorMeasure; } // The following is from baseMarker.js diff --git a/packages/devextreme/js/__internal/viz/gauges/base_range_container.ts b/packages/devextreme/js/__internal/viz/gauges/base_range_container.ts index 6ac3bfc72d01..60c30613b8c6 100644 --- a/packages/devextreme/js/__internal/viz/gauges/base_range_container.ts +++ b/packages/devextreme/js/__internal/viz/gauges/base_range_container.ts @@ -10,7 +10,7 @@ interface Segment { } export interface RangeInfo extends Segment { - color?: ThemeValue; + color?: string; className?: string; classIndex?: number; startWidth?: number; @@ -222,8 +222,8 @@ abstract class BaseRangeContainer extends BaseElement { abstract _createRange(range: RangeInfo, layout: ThemeValue): ThemeValue; // S170193 - getColorForValue(value: number): ThemeValue { - let color: ThemeValue = null; + getColorForValue(value: number): string | null | undefined { + let color: string | null | undefined = null; each(this._ranges, (_, range: RangeInfo) => { const inRange = (range.start <= value && value <= range.end) || (range.start >= value && value >= range.end); diff --git a/packages/devextreme/js/__internal/viz/gauges/circular_gauge.ts b/packages/devextreme/js/__internal/viz/gauges/circular_gauge.ts index 537d83391bec..990eb9302691 100644 --- a/packages/devextreme/js/__internal/viz/gauges/circular_gauge.ts +++ b/packages/devextreme/js/__internal/viz/gauges/circular_gauge.ts @@ -260,8 +260,7 @@ class CircularGauge extends dxGauge { return this._area.radius; } - _getTicksOrientation(scaleOptions: ThemeValue): string { - // eslint-disable-next-line @typescript-eslint/no-unsafe-return + _getTicksOrientation(scaleOptions: { orientation: string }): string { return scaleOptions.orientation; } diff --git a/packages/devextreme/js/__internal/viz/gauges/common.ts b/packages/devextreme/js/__internal/viz/gauges/common.ts index 1ffd929249c0..8f65969bc3f5 100644 --- a/packages/devextreme/js/__internal/viz/gauges/common.ts +++ b/packages/devextreme/js/__internal/viz/gauges/common.ts @@ -1,5 +1,4 @@ /* eslint-disable max-classes-per-file */ -/* eslint-disable @typescript-eslint/no-unsafe-return */ /* eslint-disable @typescript-eslint/no-use-before-define */ import { noop } from '@ts/core/utils/common'; @@ -10,6 +9,8 @@ import type { ThemeValue } from '@ts/viz/core/base_theme_manager'; import { setupWidgetPrototype } from '@ts/viz/core/helpers'; import { map, normalizeEnum } from '@ts/viz/core/utils'; import { BaseGauge, compareArrays } from '@ts/viz/gauges/base_gauge'; +import type { BaseIndicator } from '@ts/viz/gauges/base_indicators'; +import type BaseRangeContainer from '@ts/viz/gauges/base_range_container'; const SHIFT_ANGLE = 90; @@ -38,6 +39,12 @@ export interface TicksCoefficients { outer: number; } +type GaugeElement = BaseRangeContainer | BaseIndicator | ValueIndicatorsSet; + +type HardModeGauge = Gauge & { _valueIndicators: BaseIndicator[] | null }; + +type HardModeIndicator = BaseIndicator & { index: number }; + function processValue(value: ThemeValue, fallbackValue: ThemeValue): ThemeValue { if (value === null) { return value; @@ -45,7 +52,9 @@ function processValue(value: ThemeValue, fallbackValue: ThemeValue): ThemeValue return isFinite(value) ? Number(value) : fallbackValue; } -function parseArrayOfNumbers(arg: ThemeValue): ThemeValue[] | null { +function parseArrayOfNumbers( + arg: unknown[] | number | string | null | undefined, +): unknown[] | null { if (Array.isArray(arg)) { return arg; } @@ -64,7 +73,7 @@ abstract class Gauge extends BaseGauge { __subvalues!: ThemeValue[] | null; - _rangeContainer; + _rangeContainer!: BaseRangeContainer; _subvalueIndicatorContainer; @@ -74,9 +83,9 @@ abstract class Gauge extends BaseGauge { _scale; - _valueIndicator; + _valueIndicator?: BaseIndicator | null; - _subvalueIndicatorsSet; + _subvalueIndicatorsSet?: ValueIndicatorsSet | null; _baseValue!: number; @@ -132,6 +141,7 @@ abstract class Gauge extends BaseGauge { this._disposeValueIndicators(); this._subvalueIndicatorContainer.linkOff(); + // @ts-expect-error dispose() drops the reference this._rangeContainer = null; this._labelsAxesGroup = null; this._scaleGroup = null; @@ -202,7 +212,7 @@ abstract class Gauge extends BaseGauge { this._renderScale(scaleOptions); this._subvalueIndicatorContainer.linkAppend(); - const elements: ThemeValue[] = map( + const elements: GaugeElement[] = map( [this._rangeContainer].concat(this._prepareValueIndicators()), (element) => (element && element.enabled ? element : null), ); @@ -234,11 +244,11 @@ abstract class Gauge extends BaseGauge { scaleOptions.numberMultipliers = DEFAULT_NUMBER_MULTIPLIERS; scaleOptions.tickOrientation = this._getTicksOrientation(scaleOptions); if (scaleOptions.label.useRangeColors) { - const getColorForValue = (value: number): ThemeValue => this._rangeContainer + const getColorForValue = (value: number): string | null | undefined => this._rangeContainer .getColorForValue(value); scaleOptions.label.customizeColor = function customizeColor( this: { value: number }, - ): ThemeValue { + ): string | null | undefined { return getColorForValue(this.value); }; } @@ -438,6 +448,24 @@ abstract class Gauge extends BaseGauge { this._changeSubvalues(this.option(OPTION_SUBVALUES)); } + _createIndicator( + type: string, + owner: ThemeValue, + className?: string, + trackerType?: string, + trackerIndex?: number, + strict?: false, + ): BaseIndicator; + + _createIndicator( + type: string, + owner: ThemeValue, + className: string, + trackerType: string, + trackerIndex: number, + strict: boolean, + ): BaseIndicator | null; + _createIndicator( type: string, owner: ThemeValue, @@ -445,8 +473,8 @@ abstract class Gauge extends BaseGauge { trackerType?: string, trackerIndex?: number, strict?: boolean, - ): ThemeValue { - const indicator = this._factory.createIndicator({ + ): BaseIndicator | null { + const indicator: BaseIndicator | null = this._factory.createIndicator({ renderer: this._renderer, translator: this._translator, owner, @@ -550,12 +578,12 @@ function selectHardMode(that: ThemeValue): void { } function updateActiveElementsHardMode(this: ThemeValue): void { - this._valueIndicators.forEach((valueIndicator) => { + this._valueIndicators.forEach((valueIndicator: HardModeIndicator) => { valueIndicator.value(this._indicatorValues[valueIndicator.index], this._noAnimation); }); } -function prepareValueIndicatorsHardMode(this: ThemeValue): ThemeValue[] { +function prepareValueIndicatorsHardMode(this: HardModeGauge): ThemeValue[] { const valueIndicators = this._valueIndicators || []; const userOptions = this.option('valueIndicators'); const optionList: ThemeValue[] = []; @@ -568,7 +596,7 @@ function prepareValueIndicatorsHardMode(this: ThemeValue): ThemeValue[] { } const newValueIndicators: ThemeValue[] = []; optionList.forEach((userSettings, index) => { - let valueIndicator = valueIndicators[index]; + let valueIndicator: BaseIndicator | null = valueIndicators[index]; if (!userSettings) { if (valueIndicator) { valueIndicator.dispose(); @@ -594,12 +622,12 @@ function prepareValueIndicatorsHardMode(this: ThemeValue): ThemeValue[] { } function disposeValueIndicatorsHardMode(this: ThemeValue): void { - this._valueIndicators.forEach((valueIndicator) => valueIndicator.dispose()); + this._valueIndicators.forEach((valueIndicator: BaseIndicator) => valueIndicator.dispose()); this._valueIndicators = null; } function cleanValueIndicatorsHardMode(this: ThemeValue): void { - this._valueIndicators.forEach((valueIndicator) => valueIndicator.clean()); + this._valueIndicators.forEach((valueIndicator: BaseIndicator) => valueIndicator.clean()); } function indicatorValueHardMode(this: ThemeValue, index: number, value?: ThemeValue): ThemeValue { @@ -626,18 +654,18 @@ function accessPointerValue( } interface ValueIndicatorsSetParameters { - createIndicator: (type: string, index?: number) => ThemeValue; + createIndicator: (type: string, index?: number) => BaseIndicator; createPalette: (palette: ThemeValue) => ThemeValue; } class ValueIndicatorsSet { _parameters: ValueIndicatorsSetParameters; - _indicators: ThemeValue[]; + _indicators: BaseIndicator[]; _options: ThemeValue; - _sample: ThemeValue; + _sample!: BaseIndicator; _palette: ThemeValue; @@ -647,7 +675,7 @@ class ValueIndicatorsSet { type?: string; - enabled?: boolean; + enabled?: boolean | null; constructor(parameters: ValueIndicatorsSetParameters) { this._parameters = parameters; @@ -669,6 +697,7 @@ class ValueIndicatorsSet { this._indicators.forEach((indicator) => indicator.clean()); this._palette = null; this._options = null; + // @ts-expect-error clean() drops the reference this._sample = null; return this; } diff --git a/packages/devextreme/js/__internal/viz/gauges/linear_gauge.ts b/packages/devextreme/js/__internal/viz/gauges/linear_gauge.ts index f37030d8b70b..79bdb821e225 100644 --- a/packages/devextreme/js/__internal/viz/gauges/linear_gauge.ts +++ b/packages/devextreme/js/__internal/viz/gauges/linear_gauge.ts @@ -71,8 +71,13 @@ class LinearGauge extends dxGauge { _area!: LinearArea; - _getTicksOrientation(scaleOptions: ThemeValue): string { - // eslint-disable-next-line @typescript-eslint/no-unsafe-return + declare _rangeContainer: LinearRangeContainer; + + _getTicksOrientation(scaleOptions: { + isHorizontal: boolean; + verticalOrientation: string; + horizontalOrientation: string; + }): string { return scaleOptions.isHorizontal ? scaleOptions.verticalOrientation : scaleOptions.horizontalOrientation; @@ -86,8 +91,7 @@ class LinearGauge extends dxGauge { } _getInvertedState(): boolean { - // eslint-disable-next-line @typescript-eslint/no-unsafe-return - return !this._area.vertical && this.option('rtlEnabled'); + return !this._area.vertical && (this.option('rtlEnabled') as boolean); } _prepareScaleSettings(): ThemeValue { diff --git a/packages/devextreme/js/__internal/viz/range_selector/common.ts b/packages/devextreme/js/__internal/viz/range_selector/common.ts index 2db6c36e4f5e..704413d1ccc3 100644 --- a/packages/devextreme/js/__internal/viz/range_selector/common.ts +++ b/packages/devextreme/js/__internal/viz/range_selector/common.ts @@ -1,5 +1,4 @@ /* eslint-disable func-names */ -/* eslint-disable @typescript-eslint/explicit-module-boundary-types */ import devices from '@ts/core/devices'; import { browser } from '@ts/core/utils/browser'; @@ -24,13 +23,22 @@ export const consts = { pointerSize: POINTER_SIZE, }; +interface FormatObject { + value: unknown; + valueText: string; +} + +interface ValueFormatOptions { + customizeText?: (this: FormatObject, formatObject: FormatObject) => unknown; +} + export const formatValue = function ( - value, - formatOptions, - tickIntervalsInfo?, - valueType?, - type?, - logarithmBase?, + value: unknown, + formatOptions: ValueFormatOptions, + tickIntervalsInfo?: { ticks: unknown[]; tickInterval?: unknown }, + valueType?: string, + type?: string, + logarithmBase?: number, ): string { const formatObject = { value, diff --git a/packages/devextreme/js/__internal/viz/range_selector/range_selector.ts b/packages/devextreme/js/__internal/viz/range_selector/range_selector.ts index 8008eccda7b5..61419e775b52 100644 --- a/packages/devextreme/js/__internal/viz/range_selector/range_selector.ts +++ b/packages/devextreme/js/__internal/viz/range_selector/range_selector.ts @@ -1,4 +1,3 @@ -/* eslint-disable @typescript-eslint/no-unsafe-declaration-merging */ /* eslint-disable max-classes-per-file */ import type { VisualRange } from '@js/common/charts'; @@ -971,17 +970,20 @@ Object.getOwnPropertyNames(Axis.prototype).forEach((field: string) => { AxisWrapper.prototype[field] = function callAxisMethod( this: { _axis: ThemeValue }, ...args: unknown[] - ): ThemeValue { - const axis: ThemeValue = this._axis; - // eslint-disable-next-line @typescript-eslint/no-unsafe-return + ): unknown { + const axis: Record unknown> = this._axis; return axis[field](...args); }; } }); -interface RangeSelector extends DataSourcePluginMembers {} - class RangeSelector extends BaseWidget { + declare _dataIsLoaded: DataSourcePluginMembers['_dataIsLoaded']; + + declare _dataSourceItems: DataSourcePluginMembers['_dataSourceItems']; + + declare _updateDataSource: DataSourcePluginMembers['_updateDataSource']; + _clipRect; _axis!: ThemeValue; @@ -1513,7 +1515,6 @@ class RangeSelector extends BaseWidget { } getValue(): (number | string | Date)[] { - // eslint-disable-next-line @typescript-eslint/no-unsafe-return return convertVisualRangeObject(this._slidersController.getSelectedRange()); } diff --git a/packages/devextreme/js/__internal/viz/range_selector/range_view.ts b/packages/devextreme/js/__internal/viz/range_selector/range_view.ts index f18104973437..84dcac602f9e 100644 --- a/packages/devextreme/js/__internal/viz/range_selector/range_view.ts +++ b/packages/devextreme/js/__internal/viz/range_selector/range_view.ts @@ -1,6 +1,4 @@ /* eslint-disable @typescript-eslint/init-declarations */ -/* eslint-disable no-param-reassign */ -/* eslint-disable no-multi-assign */ /* eslint-disable @typescript-eslint/prefer-optional-chain */ import type { ThemeValue } from '@ts/viz/core/base_theme_manager'; @@ -48,7 +46,8 @@ function drawSeriesView( valueAxis.setBusinessRange(valueRange); seriesList.forEach((series) => { - series._extGroups.seriesGroup = series._extGroups.labelsGroup = root; + series._extGroups.labelsGroup = root; + series._extGroups.seriesGroup = root; series.draw(isAnimationEnabled); }); } @@ -81,33 +80,33 @@ export let RangeView = class RangeView { const canvasWidth = canvas.width - canvas.left; let seriesGroup; - backgroundOption = backgroundOption || {}; + const background = backgroundOption || {}; root.clear(); this._clipRect.attr({ x: canvas.left, y: canvas.top, width: canvasWidth, height: canvas.height, }); if (!isCompactMode) { - if (merge(backgroundOption.visible, backgroundTheme.visible)) { - if (backgroundOption.color) { + if (merge(background.visible, backgroundTheme.visible)) { + if (background.color) { renderer .rect(canvas.left, canvas.top, canvasWidth + 1, canvas.height) .attr({ // Seems that "backgroundTheme.color" is never used and so can be removed both from // here and from themes // TODO: Check it (special attention to WidgetsGallery) and remove the option - fill: merge(backgroundOption.color, backgroundTheme.color), + fill: merge(background.color, backgroundTheme.color), class: 'dx-range-selector-background', }) .append(root); } - if (backgroundOption.image && backgroundOption.image.url) { + if (background.image && background.image.url) { renderer.image( canvas.left, canvas.top, canvasWidth + 1, canvas.height, - backgroundOption.image.url, - merge(backgroundOption.image.location, backgroundTheme.image.location), + background.image.url, + merge(background.image.location, backgroundTheme.image.location), ).append(root); } } diff --git a/packages/devextreme/js/__internal/viz/range_selector/series_data_source.ts b/packages/devextreme/js/__internal/viz/range_selector/series_data_source.ts index 83a1012d9d1f..5cd7536b9496 100644 --- a/packages/devextreme/js/__internal/viz/range_selector/series_data_source.ts +++ b/packages/devextreme/js/__internal/viz/range_selector/series_data_source.ts @@ -1,8 +1,5 @@ /* eslint-disable @typescript-eslint/init-declarations */ -/* eslint-disable no-plusplus */ /* eslint-disable func-names */ -/* eslint-disable no-nested-ternary */ -/* eslint-disable no-multi-assign */ import { extend } from '@ts/core/utils/extend'; import { each } from '@ts/core/utils/iterator'; @@ -98,7 +95,8 @@ export let SeriesDataSource = class SeriesDataSource { declare argCategories?: ThemeValue[]; constructor(options: SeriesDataSourceOptions) { - const themeManager = this._themeManager = createThemeManager(options.chart); + this._themeManager = createThemeManager(options.chart); + const themeManager = this._themeManager; themeManager.setTheme(options.chart.theme); const topIndent = themeManager.getOptions('topIndent'); @@ -141,13 +139,11 @@ export let SeriesDataSource = class SeriesDataSource { this._hideChart = true; } - allSeriesOptions = Array.isArray(allSeriesOptions) - ? allSeriesOptions - : allSeriesOptions - ? [allSeriesOptions] - : []; + if (!Array.isArray(allSeriesOptions)) { + allSeriesOptions = allSeriesOptions ? [allSeriesOptions] : []; + } - for (i = 0; i < allSeriesOptions.length; i++) { + for (i = 0; i < allSeriesOptions.length; i += 1) { particularSeriesOptions = extend(true, {}, allSeriesOptions[i]); particularSeriesOptions.rotated = false; @@ -187,7 +183,7 @@ export let SeriesDataSource = class SeriesDataSource { }; parsedData = validateData(data, groupsData, options.incidentOccurred, chartThemeManager.getOptions('dataPrepareSettings')); this.argCategories = groupsData.categories; - for (i = 0; i < series.length; i++) { + for (i = 0; i < series.length; i += 1) { series[i].updateData(parsedData[series[i].getArgumentField()]); } } diff --git a/packages/devextreme/js/__internal/viz/range_selector/slider.ts b/packages/devextreme/js/__internal/viz/range_selector/slider.ts index cb89ab91bf1b..7ca94d8a26cd 100644 --- a/packages/devextreme/js/__internal/viz/range_selector/slider.ts +++ b/packages/devextreme/js/__internal/viz/range_selector/slider.ts @@ -1,5 +1,3 @@ -/* eslint-disable no-nested-ternary */ - import supportUtils from '@ts/core/utils/support'; import type { ThemeValue } from '@ts/viz/core/base_theme_manager'; import { formatValue, isFirefoxOnAndroid, utils } from '@ts/viz/range_selector/common'; @@ -20,11 +18,10 @@ interface SliderParams { type SliderEventHandler = (e: ThemeValue) => void; function getSliderTrackerWidth(sliderHandleWidth: number): number { - return supportUtils.touchEvents || supportUtils.pointerEvents - ? TOUCH_SPLITTER_WIDTH - : SPLITTER_WIDTH < sliderHandleWidth - ? sliderHandleWidth - : SPLITTER_WIDTH; + if (supportUtils.touchEvents || supportUtils.pointerEvents) { + return TOUCH_SPLITTER_WIDTH; + } + return SPLITTER_WIDTH < sliderHandleWidth ? sliderHandleWidth : SPLITTER_WIDTH; } class Slider { diff --git a/packages/devextreme/js/__internal/viz/range_selector/slider_marker.ts b/packages/devextreme/js/__internal/viz/range_selector/slider_marker.ts index 9b6df7f631e4..73a96ab38811 100644 --- a/packages/devextreme/js/__internal/viz/range_selector/slider_marker.ts +++ b/packages/devextreme/js/__internal/viz/range_selector/slider_marker.ts @@ -1,13 +1,8 @@ /* eslint-disable @typescript-eslint/no-this-alias */ /* eslint-disable @typescript-eslint/init-declarations */ -/* eslint-disable no-plusplus */ /* eslint-disable no-restricted-globals */ /* eslint-disable func-names */ -/* eslint-disable @typescript-eslint/no-shadow */ -/* eslint-disable no-param-reassign */ -/* eslint-disable no-multi-assign */ /* eslint-disable @typescript-eslint/no-use-before-define */ -/* eslint-disable @typescript-eslint/no-unused-expressions */ import type { ThemeValue } from '@ts/viz/core/base_theme_manager'; import type { Size } from '@ts/viz/core/types'; @@ -108,11 +103,11 @@ class SliderMarker { const position = this._position; const isLeft = this._isLeftPointer; const correctCloudBorders = function (): void { - rectLeftBorder++; - rectRightBorder++; - pointerRightPoint++; - pointerCenterPoint++; - pointerLeftPoint++; + rectLeftBorder += 1; + rectRightBorder += 1; + pointerRightPoint += 1; + pointerCenterPoint += 1; + pointerLeftPoint += 1; }; const checkPointerBorders = function (): void { if (pointerRightPoint > rectRightBorder) { @@ -121,7 +116,9 @@ class SliderMarker { pointerLeftPoint = rectLeftBorder; } - isLeft && correctCloudBorders(); + if (isLeft) { + correctCloudBorders(); + } }; let borderPosition = position; @@ -132,7 +129,8 @@ class SliderMarker { checkPointerBorders(); borderPosition += rectLeftBorder; } else { - rectLeftBorder = pointerLeftPoint = 0; + pointerLeftPoint = 0; + rectLeftBorder = 0; rectRightBorder = rectWidth; } } else if (position - this._range[0] < rectWidth) { @@ -183,30 +181,31 @@ class SliderMarker { const rectSize = that._getRectSize(currentTextSize); textSize = that._textSize || currentTextSize; - textSize = that._textSize = currentTextSize.width > textSize.width + that._textSize = currentTextSize.width > textSize.width || currentTextSize.height > textSize.height ? currentTextSize : textSize; + textSize = that._textSize; that._timeout = setTimeout(() => { updateSliderMarker(currentTextSize, rectSize); that._textSize = currentTextSize; }, SLIDER_MARKER_UPDATE_DELAY); - function updateSliderMarker(size: TextSize, rectSize?: Size): void { - rectSize = rectSize || that._getRectSize(size); - that._group.attr({ translateY: -(rectSize.height + POINTER_SIZE) }); + function updateSliderMarker(size: TextSize, knownRectSize?: Size): void { + const markerRectSize = knownRectSize || that._getRectSize(size); + that._group.attr({ translateY: -(markerRectSize.height + POINTER_SIZE) }); const pointsData = that._getAreaPointsInfo(size); const { points, offset } = pointsData; that._area.attr({ points }); that._border.attr({ x: that._isLeftPointer ? points[0] - 1 : points[2], - height: pointsData.isCut ? rectSize.height : rectSize.height + POINTER_SIZE, + height: pointsData.isCut ? markerRectSize.height : markerRectSize.height + POINTER_SIZE, }); const trackerAttrs: { translateX?: number; x?: number; width: number; height: number } = { translateX: offset, - width: rectSize.width, - height: rectSize.height + POINTER_SIZE, + width: markerRectSize.width, + height: markerRectSize.height + POINTER_SIZE, }; if (isFirefoxOnAndroid()) { trackerAttrs.x = offset; @@ -216,7 +215,7 @@ class SliderMarker { that._label.attr({ translateX: that._paddingLeftRight + offset, - translateY: rectSize.height / 2 - (size.y + size.height / 2), + translateY: markerRectSize.height / 2 - (size.y + size.height / 2), }); } @@ -264,8 +263,8 @@ class SliderMarker { if (this._isOverlapped !== isOverlapped) { if (isOverlapped) { this._border.append(this._group); - } else { - this._isOverlapped && this._border.remove(); + } else if (this._isOverlapped) { + this._border.remove(); } this._isOverlapped = isOverlapped; } diff --git a/packages/devextreme/js/__internal/viz/range_selector/sliders_controller.ts b/packages/devextreme/js/__internal/viz/range_selector/sliders_controller.ts index 9a1f5b5efb98..e3678bf6737f 100644 --- a/packages/devextreme/js/__internal/viz/range_selector/sliders_controller.ts +++ b/packages/devextreme/js/__internal/viz/range_selector/sliders_controller.ts @@ -3,11 +3,7 @@ /* eslint-disable @typescript-eslint/no-this-alias */ /* eslint-disable @typescript-eslint/init-declarations */ /* eslint-disable func-names */ -/* eslint-disable no-nested-ternary */ -/* eslint-disable no-param-reassign */ -/* eslint-disable no-multi-assign */ /* eslint-disable @typescript-eslint/no-use-before-define */ -/* eslint-disable no-else-return */ import { noop } from '@ts/core/utils/common'; import { adjust } from '@ts/core/utils/math'; @@ -21,8 +17,8 @@ const { animationSettings } = utils; const { emptySliderMarkerText } = consts; interface SelectedRange { - startValue: ThemeValue; - endValue: ThemeValue; + startValue: number | string | Date; + endValue: number | string | Date; } interface VisualRangeInput { @@ -92,7 +88,8 @@ function selectClosestValue(target: ThemeValue, values: ThemeValue[] | null): Th val = values[middle]; if (val === target) { return target; - } else if (target < val) { + } + if (target < val) { end = middle; } else { start = middle; @@ -223,7 +220,8 @@ export let SlidersController = class SlidersController { this._sliders[1].update(verticalRange, sliderHandleOptions, sliderMarkerOptions); // This is required for placing sliders and shutter into initial position from which initial // animation will be going. - this._sliders[0]._position = this._sliders[1]._position = startScreenPosition; + this._sliders[1]._position = startScreenPosition; + this._sliders[0]._position = startScreenPosition; this._values = !this._params.translator.isValueProlonged && behavior.snapToTicks ? fullTicks @@ -273,7 +271,8 @@ export let SlidersController = class SlidersController { if (this._params.translator.getBusinessRange().isEmpty()) { sliders[0]._setText(emptySliderMarkerText); sliders[1]._setText(emptySliderMarkerText); - sliders[0]._value = sliders[1]._value = undefined; + sliders[1]._value = undefined; + sliders[0]._value = undefined; [sliders[0]._position, sliders[1]._position] = this._params.translator.getScreenRange(); this._applyTotalPosition(false); suppressSetSelectedRange(this); @@ -284,14 +283,14 @@ export let SlidersController = class SlidersController { _applyTotalPosition(isAnimated: boolean): void { const sliders = this._sliders; - isAnimated = this._animationEnabled && isAnimated; - sliders[0].applyPosition(isAnimated); - sliders[1].applyPosition(isAnimated); + const animate = this._animationEnabled && isAnimated; + sliders[0].applyPosition(animate); + sliders[1].applyPosition(animate); const areOverlapped = sliders[0].getCloudBorder() > sliders[1].getCloudBorder(); sliders[0].setOverlapped(areOverlapped); sliders[1].setOverlapped(areOverlapped); this._applyAreaTrackersPosition(); - this._applySelectedRangePosition(isAnimated); + this._applySelectedRangePosition(animate); if (isFirefoxOnAndroid()) { this._areaTracker.attr({ transform: null }); this._selectedAreaTracker.attr({ transform: null }); @@ -375,7 +374,7 @@ export let SlidersController = class SlidersController { } setSelectedRange(visualRange?: VisualRangeInput | null, e?: ThemeValue): void { - visualRange = visualRange || {}; + const range = visualRange || {}; const { translator } = this._params; const businessRange = translator.getBusinessRange(); const compare = businessRange.axisType === 'discrete' ? function (a: ThemeValue, b: ThemeValue): boolean { @@ -391,13 +390,13 @@ export let SlidersController = class SlidersController { base: businessRange.base, }, { - startValue: translator.isValid(visualRange.startValue) - ? translator.getCorrectValue(visualRange.startValue, +1) + startValue: translator.isValid(range.startValue) + ? translator.getCorrectValue(range.startValue, +1) : undefined, - endValue: translator.isValid(visualRange.endValue) - ? translator.getCorrectValue(visualRange.endValue, -1) + endValue: translator.isValid(range.endValue) + ? translator.getCorrectValue(range.endValue, -1) : undefined, - length: visualRange.length, + length: range.length, }, { min: businessRange.minVisible, @@ -639,9 +638,13 @@ export let SlidersController = class SlidersController { } } slider._setValid(isValid); - slider.setDisplayValue(isValid - ? selectClosestValue(translator.from(pos, dir), that._values) - : isDefined(invalidStateValue) ? invalidStateValue : slider.getValue()); + if (isValid) { + slider.setDisplayValue(selectClosestValue(translator.from(pos, dir), that._values)); + } else { + slider.setDisplayValue( + isDefined(invalidStateValue) ? invalidStateValue : slider.getValue(), + ); + } slider._position = pos; that._applyTotalPosition(false); slider.toForeground(); @@ -674,7 +677,8 @@ export let SlidersController = class SlidersController { sliders[1 - index].setDisplayValue(selectClosestValue(newValue, this._values)); sliders[index]._setValid(true); sliders[index]._marker._update(); // This is to update "text" element - sliders[0]._position = sliders[1]._position = position; + sliders[1]._position = position; + sliders[0]._position = position; } foregroundSlider(index: number): void { diff --git a/packages/devextreme/js/__internal/viz/range_selector/tracker.ts b/packages/devextreme/js/__internal/viz/range_selector/tracker.ts index 93317c0698fc..cc7a0c92250c 100644 --- a/packages/devextreme/js/__internal/viz/range_selector/tracker.ts +++ b/packages/devextreme/js/__internal/viz/range_selector/tracker.ts @@ -1,6 +1,4 @@ /* eslint-disable @typescript-eslint/init-declarations */ -/* eslint-disable no-multi-assign */ -/* eslint-disable @typescript-eslint/no-unsafe-return */ /* eslint-disable @typescript-eslint/no-use-before-define */ /* eslint-disable @typescript-eslint/prefer-optional-chain */ @@ -30,6 +28,23 @@ interface TrackerSlider { on: (events: DocumentEvents) => void; } +interface TouchList { + length: number; +} + +interface TrackerEvent { + which?: number; + type?: string; + touches?: TouchList; + originalEvent?: { + pointerType?: string; + touches?: TouchList; + buttons?: number; + MSPOINTER_TYPE_TOUCH?: string; + MSPOINTER_TYPE_MOUSE?: string; + }; +} + interface TrackerController { getTrackerTargets: () => { area: ThemeValue; selectedArea: ThemeValue; sliders: TrackerSlider[] }; placeSliderAndBeginMoving: ( @@ -51,8 +66,8 @@ interface TrackerParams { controller: TrackerController; } -function isLeftButtonPressed(event: ThemeValue): boolean { - const e = event || window.event; +function isLeftButtonPressed(event: ThemeValue): boolean | undefined { + const e: TrackerEvent = event || window.event; const { originalEvent, touches } = e; const pointerType = originalEvent ? originalEvent.pointerType : false; const eventTouches = originalEvent ? originalEvent.touches : false; @@ -63,7 +78,7 @@ function isLeftButtonPressed(event: ThemeValue): boolean { } function isMultiTouches(event: ThemeValue): boolean | null { - const { originalEvent, touches } = event; + const { originalEvent, touches }: TrackerEvent = event; const eventTouches = originalEvent && originalEvent.touches; return (touches && touches.length > 1) || (eventTouches && eventTouches.length > 1) || null; @@ -83,8 +98,8 @@ function stopPropagationAndPreventDefault(e: ThemeValue): void { } // Q375042 -function isTouchEventArgs(e: ThemeValue): boolean { - return e && e.type && e.type.indexOf('touch') === 0; +function isTouchEventArgs(e: TrackerEvent | undefined): boolean | '' | undefined { + return e && e.type && e.type.startsWith('touch'); } function getEventPageX(event: ThemeValue): number { @@ -167,7 +182,7 @@ function initializeAreaEvents( } } - area.on(pointerEvents.down, (e) => { + area.on(pointerEvents.down, (e: ThemeValue) => { if (!state.enabled || !isLeftButtonPressed(e) || isActive) return; isActive = true; @@ -211,7 +226,7 @@ function initializeSelectedAreaEvents( } } - area.on(pointerEvents.down, (e) => { + area.on(pointerEvents.down, (e: ThemeValue) => { if (!state.enabled || !isLeftButtonPressed(e) || isActive) return; isActive = true; @@ -284,7 +299,8 @@ export let Tracker = class Tracker { declare _docEvents: DocumentEvents[]; constructor(params: TrackerParams) { - const state = this._state = {}; + this._state = {}; + const state = this._state; const targets = params.controller.getTrackerTargets(); if (msPointerEnabled) { params.renderer.root.css({ msTouchAction: 'pinch-zoom' }); diff --git a/packages/devextreme/js/__internal/viz/sparklines/base_sparkline.ts b/packages/devextreme/js/__internal/viz/sparklines/base_sparkline.ts index ade30602d16f..cc05b226a248 100644 --- a/packages/devextreme/js/__internal/viz/sparklines/base_sparkline.ts +++ b/packages/devextreme/js/__internal/viz/sparklines/base_sparkline.ts @@ -1,4 +1,3 @@ -/* eslint-disable @typescript-eslint/no-unsafe-declaration-merging */ import { domAdapter } from '@ts/core/dom_adapter'; import { renderer as $ } from '@ts/core/renderer'; import { noop } from '@ts/core/utils/common'; @@ -133,9 +132,17 @@ function createAxis(isHorizontal?: boolean): SparklineAxis { }; } -interface BaseSparkline extends TooltipPluginMembers {} - abstract class BaseSparkline extends BaseWidget { + declare _tooltip: TooltipPluginMembers['_tooltip']; + + declare _disposeTooltip: TooltipPluginMembers['_disposeTooltip']; + + declare _initTooltip: TooltipPluginMembers['_initTooltip']; + + declare _setTooltipOptions: TooltipPluginMembers['_setTooltipOptions']; + + declare _setTooltipRendererOptions: TooltipPluginMembers['_setTooltipRendererOptions']; + _tooltipTracker; _argumentAxis!: SparklineAxis; diff --git a/packages/devextreme/js/__internal/viz/sparklines/sparkline.ts b/packages/devextreme/js/__internal/viz/sparklines/sparkline.ts index c2adfce93229..2232b213059c 100644 --- a/packages/devextreme/js/__internal/viz/sparklines/sparkline.ts +++ b/packages/devextreme/js/__internal/viz/sparklines/sparkline.ts @@ -1,4 +1,3 @@ -/* eslint-disable @typescript-eslint/no-unsafe-declaration-merging */ // PLUGINS_SECTION import { registerComponent as componentRegistrator } from '@ts/core/component_registrator'; import { isDefined } from '@ts/core/utils/type'; @@ -183,9 +182,13 @@ function createBarCustomizeFunction( }; } -interface Sparkline extends DataSourcePluginMembers {} - class Sparkline extends BaseSparkline { + declare _dataIsLoaded: DataSourcePluginMembers['_dataIsLoaded']; + + declare _dataSourceItems: DataSourcePluginMembers['_dataSourceItems']; + + declare _updateDataSource: DataSourcePluginMembers['_updateDataSource']; + _series; _seriesGroup;