AG-13306 Use relative coordinates for focus indicators

ag-grid · Nov 14, 2024 · a1b8965 · a1b8965
1 parent 1ff1c3f
commit a1b8965
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 26 deletions.
diff --git a/packages/ag-charts-community/src/chart/series/cartesian/barSeries.ts b/packages/ag-charts-community/src/chart/series/cartesian/barSeries.ts
@@ -706,6 +706,6 @@ export class BarSeries extends AbstractBarSeries<Rect, BarSeriesProperties, BarN
 
     protected computeFocusBounds({ datumIndex, seriesRect }: PickFocusInputs): BBox | undefined {
         const datumBox = this.contextNodeData?.nodeData[datumIndex].clipBBox;
-        return computeBarFocusBounds(datumBox, this.contentGroup, seriesRect);
+        return computeBarFocusBounds(datumBox, seriesRect);
     }
 }
diff --git a/packages/ag-charts-community/src/chart/series/cartesian/barUtil.ts b/packages/ag-charts-community/src/chart/series/cartesian/barUtil.ts
@@ -7,9 +7,7 @@ import { ContinuousScale } from '../../../scale/continuousScale';
 import type { Scale } from '../../../scale/scale';
 import { BBox } from '../../../scene/bbox';
 import type { DropShadow } from '../../../scene/dropShadow';
-import type { Group } from '../../../scene/group';
 import type { Rect } from '../../../scene/shape/rect';
-import { Transformable } from '../../../scene/transformable';
 import { isNegative } from '../../../util/number';
 import { mergeDefaults } from '../../../util/object';
 import type { ChartAxis } from '../../chartAxis';
@@ -297,11 +295,10 @@ export function resetBarSelectionsFn(_node: Rect, { x, y, width, height, clipBBo
 
 export function computeBarFocusBounds(
     datum: { x: number; y: number; width: number; height: number } | undefined,
-    barGroup: Group,
     seriesRect: BBox | undefined
 ): BBox | undefined {
     if (datum === undefined) return undefined;
 
     const { x, y, width, height } = datum;
-    return Transformable.toCanvas(barGroup, new BBox(x, y, width, height)).clip(seriesRect);
+    return new BBox(x, y, width, height).clip(seriesRect);
 }
diff --git a/packages/ag-charts-community/src/chart/series/cartesian/histogramSeries.ts b/packages/ag-charts-community/src/chart/series/cartesian/histogramSeries.ts
@@ -562,6 +562,6 @@ export class HistogramSeries extends CartesianSeries<Rect, HistogramSeriesProper
     }
 
     protected computeFocusBounds({ datumIndex, seriesRect }: PickFocusInputs): BBox | undefined {
-        return computeBarFocusBounds(this.contextNodeData?.nodeData[datumIndex], this.contentGroup, seriesRect);
+        return computeBarFocusBounds(this.contextNodeData?.nodeData[datumIndex], seriesRect);
     }
 }
diff --git a/packages/ag-charts-community/src/chart/series/cartesian/markerUtil.ts b/packages/ag-charts-community/src/chart/series/cartesian/markerUtil.ts
@@ -2,11 +2,9 @@ import { QUICK_TRANSITION } from '../../../motion/animation';
 import type { NodeUpdateState } from '../../../motion/fromToMotion';
 import { NODE_UPDATE_STATE_TO_PHASE_MAPPING, fromToMotion, staticFromToMotion } from '../../../motion/fromToMotion';
 import { BBox } from '../../../scene/bbox';
-import type { Group } from '../../../scene/group';
 import type { Node } from '../../../scene/node';
 import type { Point, SizedPoint } from '../../../scene/point';
 import type { Selection } from '../../../scene/selection';
-import { Transformable } from '../../../scene/transformable';
 import { clamp } from '../../../util/number';
 import type { AnimationManager } from '../../interaction/animationManager';
 import type { Marker } from '../../marker/marker';
@@ -157,7 +155,6 @@ export function prepareMarkerAnimation(pairMap: PathPointMap<any>, parentStatus:
 type MarkerSeries<TDatum> = {
     getNodeData(): TDatum[] | undefined;
     getFormattedMarkerStyle(datum: TDatum): { size: number };
-    contentGroup: Group;
 };
 
 export function computeMarkerFocusBounds<TDatum extends { point: Point & SizedPoint }>(
@@ -175,5 +172,5 @@ export function computeMarkerFocusBounds<TDatum extends { point: Point & SizedPo
     const radius = size / 2;
     const x = datum.point.x - radius;
     const y = datum.point.y - radius;
-    return Transformable.toCanvas(series.contentGroup, new BBox(x, y, size, size));
+    return new BBox(x, y, size, size);
 }
diff --git a/packages/ag-charts-enterprise/src/series/box-plot/boxPlotSeries.ts b/packages/ag-charts-enterprise/src/series/box-plot/boxPlotSeries.ts
@@ -490,10 +490,6 @@ export class BoxPlotSeries extends _ModuleSupport.AbstractBarSeries<
         datumIndex,
         seriesRect,
     }: _ModuleSupport.PickFocusInputs): _ModuleSupport.BBox | undefined {
-        return computeBarFocusBounds(
-            this.contextNodeData?.nodeData[datumIndex].focusRect,
-            this.contentGroup,
-            seriesRect
-        );
+        return computeBarFocusBounds(this.contextNodeData?.nodeData[datumIndex].focusRect, seriesRect);
     }
 }
diff --git a/packages/ag-charts-enterprise/src/series/candlestick/candlestickUtil.ts b/packages/ag-charts-enterprise/src/series/candlestick/candlestickUtil.ts
@@ -105,7 +105,6 @@ function getCoordinates(datum: CandlestickNodeDatum) {
 
 type AbstractCandlestickSeries = {
     getNodeData(): CandlestickNodeBaseDatum[] | undefined;
-    contentGroup: _ModuleSupport.Group;
 };
 
 export function computeCandleFocusBounds(
@@ -121,5 +120,5 @@ export function computeCandleFocusBounds(
               width: candleDatum.bandwidth,
               height: candleDatum.scaledValues.lowValue - candleDatum.scaledValues.highValue,
           };
-    return computeBarFocusBounds(datum, series.contentGroup, opts.seriesRect);
+    return computeBarFocusBounds(datum, opts.seriesRect);
 }
diff --git a/packages/ag-charts-enterprise/src/series/funnel/baseFunnelSeries.ts b/packages/ag-charts-enterprise/src/series/funnel/baseFunnelSeries.ts
@@ -604,7 +604,7 @@ export abstract class BaseFunnelSeries<
         datumIndex,
         seriesRect,
     }: _ModuleSupport.PickFocusInputs): _ModuleSupport.BBox | undefined {
-        return computeBarFocusBounds(this.contextNodeData?.nodeData[datumIndex], this.contentGroup, seriesRect);
+        return computeBarFocusBounds(this.contextNodeData?.nodeData[datumIndex], seriesRect);
     }
 
     getLegendData(legendType: _ModuleSupport.ChartLegendType): _ModuleSupport.CategoryLegendDatum[] {

diff --git a/packages/ag-charts-enterprise/src/series/heatmap/heatmapSeries.ts b/packages/ag-charts-enterprise/src/series/heatmap/heatmapSeries.ts
@@ -525,6 +525,6 @@ export class HeatmapSeries extends _ModuleSupport.CartesianSeries<
         if (datum === undefined) return undefined;
         const { width, height, midPoint } = datum;
         const focusRect = { x: midPoint.x - width / 2, y: midPoint.y - height / 2, width, height };
-        return computeBarFocusBounds(focusRect, this.contentGroup, seriesRect);
+        return computeBarFocusBounds(focusRect, seriesRect);
     }
 }
diff --git a/packages/ag-charts-enterprise/src/series/map-line/mapLineSeries.ts b/packages/ag-charts-enterprise/src/series/map-line/mapLineSeries.ts
@@ -691,6 +691,6 @@ export class MapLineSeries
 
     protected override computeFocusBounds(opts: _ModuleSupport.PickFocusInputs): _ModuleSupport.BBox | undefined {
         const geometry = findFocusedGeoGeometry(this, opts);
-        return geometry ? _ModuleSupport.Transformable.toCanvas(geometry) : undefined;
+        return geometry ? geometry.getBBox() : undefined;
     }
 }
diff --git a/packages/ag-charts-enterprise/src/series/range-bar/rangeBarSeries.ts b/packages/ag-charts-enterprise/src/series/range-bar/rangeBarSeries.ts
@@ -620,6 +620,6 @@ export class RangeBarSeries extends _ModuleSupport.AbstractBarSeries<
         datumIndex,
         seriesRect,
     }: _ModuleSupport.PickFocusInputs): _ModuleSupport.BBox | undefined {
-        return computeBarFocusBounds(this.contextNodeData?.nodeData[datumIndex], this.contentGroup, seriesRect);
+        return computeBarFocusBounds(this.contextNodeData?.nodeData[datumIndex], seriesRect);
     }
 }
diff --git a/packages/ag-charts-enterprise/src/series/sankey/sankeySeries.ts b/packages/ag-charts-enterprise/src/series/sankey/sankeySeries.ts
@@ -23,7 +23,6 @@ const {
     Logger,
     Rect,
     BBox,
-    Transformable,
 } = _ModuleSupport;
 
 export interface SankeyNodeDataContext
@@ -634,7 +633,7 @@ export class SankeySeries extends FlowProportionSeries<
         if (datum?.type === FlowProportionDatumType.Node) {
             const { x, y, width, height } = datum;
             const bbox = new BBox(x, y, width, height);
-            return Transformable.toCanvas(this.contentGroup, bbox).clip(seriesRect);
+            return bbox.clip(seriesRect);
         } else if (datum?.type === FlowProportionDatumType.Link) {
             for (const link of this.linkSelection) {
                 if (link.datum === datum) {

diff --git a/packages/ag-charts-enterprise/src/series/treemap/treemapSeries.ts b/packages/ag-charts-enterprise/src/series/treemap/treemapSeries.ts
@@ -18,7 +18,6 @@ const {
     clamp,
     isNumberEqual,
     sanitizeHtml,
-    Transformable,
     Rect,
     Group,
     BBox,
@@ -827,6 +826,6 @@ export class TreemapSeries<
         node: _ModuleSupport.HierarchyNode<_ModuleSupport.SeriesNodeDatum>
     ): _ModuleSupport.BBox | undefined {
         const rects = this.groupSelection.selectByClass(Rect);
-        return Transformable.toCanvas(rects[node.index]);
+        return rects[node.index].getBBox();
     }
 }
diff --git a/packages/ag-charts-enterprise/src/series/waterfall/waterfallSeries.ts b/packages/ag-charts-enterprise/src/series/waterfall/waterfallSeries.ts
@@ -879,6 +879,6 @@ export class WaterfallSeries extends _ModuleSupport.AbstractBarSeries<
         datumIndex,
         seriesRect,
     }: _ModuleSupport.PickFocusInputs): _ModuleSupport.BBox | undefined {
-        return computeBarFocusBounds(this.contextNodeData?.nodeData[datumIndex], this.contentGroup, seriesRect);
+        return computeBarFocusBounds(this.contextNodeData?.nodeData[datumIndex], seriesRect);
     }
 }