feat: set tooltip to follow when single value scale

emmacunningham · emmacunningham · commit 121a8fb8cf96 · 2019-07-09T13:50:51.000-07:00
diff --git a/src/lib/utils/interactions.ts b/src/lib/utils/interactions.ts
@@ -72,6 +72,9 @@ export function isCrosshairTooltipType(type: TooltipType) {
 export function isFollowTooltipType(type: TooltipType) {
   return type === TooltipType.Follow;
 }
+export function isNoneTooltipType(type: TooltipType) {
+  return type === TooltipType.None;
+}
 
 export function areIndexedGeometryArraysEquals(arr1: IndexedGeometry[], arr2: IndexedGeometry[]) {
   if (arr1.length !== arr2.length) {
diff --git a/src/state/chart_state.test.ts b/src/state/chart_state.test.ts
@@ -866,4 +866,22 @@ describe('Chart Store', () => {
       expect(store.isCrosshairCursorVisible.get()).toBe(false);
     });
   });
+  test('should set tooltip type to follow when single value x scale', () => {
+    const singleValueSpec: BarSeriesSpec = {
+      id: SPEC_ID,
+      groupId: GROUP_ID,
+      seriesType: 'bar',
+      yScaleToDataExtent: false,
+      data: [{ x: 1, y: 1, g: 0 }],
+      xAccessor: 'x',
+      yAccessors: ['y'],
+      xScaleType: ScaleType.Linear,
+      yScaleType: ScaleType.Linear,
+      hideInLegend: false,
+    };
+
+    store.addSeriesSpec(singleValueSpec);
+    store.computeChart();
+    expect(store.tooltipType.get()).toBe(TooltipType.Follow);
+  });
 });
diff --git a/src/state/chart_state.ts b/src/state/chart_state.ts
@@ -56,6 +56,7 @@ import {
   getValidYPosition,
   isCrosshairTooltipType,
   isFollowTooltipType,
+  isNoneTooltipType,
   TooltipType,
   TooltipValue,
   TooltipValueFormatter,
@@ -876,6 +877,12 @@ export class ChartStore {
     // console.log({ seriesGeometries });
     this.geometries = seriesGeometries.geometries;
     this.xScale = seriesGeometries.scales.xScale;
+
+    const isSingleValueXScale = this.xScale.isSingleValue();
+    if (isSingleValueXScale && !isNoneTooltipType(this.tooltipType.get())) {
+      this.tooltipType.set(TooltipType.Follow);
+    }
+
     this.yScales = seriesGeometries.scales.yScales;
     this.geometriesIndex = seriesGeometries.geometriesIndex;
     this.geometriesIndexKeys = [...this.geometriesIndex.keys()].sort(compareByValueAsc);

Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,9 @@ export function isCrosshairTooltipType(type: TooltipType) {`
`72`	`72`	`export function isFollowTooltipType(type: TooltipType) {`
`73`	`73`	`return type === TooltipType.Follow;`
`74`	`74`	`}`
	`75`	`+export function isNoneTooltipType(type: TooltipType) {`
	`76`	`+ return type === TooltipType.None;`
	`77`	`+}`
`75`	`78`
`76`	`79`	`export function areIndexedGeometryArraysEquals(arr1: IndexedGeometry[], arr2: IndexedGeometry[]) {`
`77`	`80`	`if (arr1.length !== arr2.length) {`