From 360c0e40fb2cb0910afa94cf78b0b70f4c9a3c4f Mon Sep 17 00:00:00 2001 From: hustcc Date: Fri, 19 May 2023 23:03:54 +0800 Subject: [PATCH 1/2] feat: set tooltip dom classname has g2- prefix --- __tests__/integration/api-chart-emit-item-tooltip.spec.ts | 4 ++-- __tests__/integration/api-chart-emit-pie-tooltip.spec.ts | 2 +- .../integration/api-chart-emit-series-tooltip.spec.ts | 4 ++-- src/interaction/tooltip.ts | 7 +++++-- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/__tests__/integration/api-chart-emit-item-tooltip.spec.ts b/__tests__/integration/api-chart-emit-item-tooltip.spec.ts index 7a26044213..edab11a187 100644 --- a/__tests__/integration/api-chart-emit-item-tooltip.spec.ts +++ b/__tests__/integration/api-chart-emit-item-tooltip.spec.ts @@ -22,13 +22,13 @@ describe('chart.emit', () => { // chart.emit("tooltip:show", options) should show tooltip. await expect(canvas).toMatchDOMSnapshot(dir, 'step0', { - selector: '.tooltip', + selector: '.g2-tooltip', }); // chart.emit("tooltip:hide") should hide tooltip. chart.emit('tooltip:hide'); await expect(canvas).toMatchDOMSnapshot(dir, 'step1', { - selector: '.tooltip', + selector: '.g2-tooltip', }); chart.off(); diff --git a/__tests__/integration/api-chart-emit-pie-tooltip.spec.ts b/__tests__/integration/api-chart-emit-pie-tooltip.spec.ts index 291d07c5f1..96ea3f97be 100644 --- a/__tests__/integration/api-chart-emit-pie-tooltip.spec.ts +++ b/__tests__/integration/api-chart-emit-pie-tooltip.spec.ts @@ -17,7 +17,7 @@ describe('chart.emit', () => { // chart.emit("tooltip:show", options) should show tooltip. await expect(canvas).toMatchDOMSnapshot(dir, 'step0', { - selector: '.tooltip', + selector: '.g2-tooltip', }); }); diff --git a/__tests__/integration/api-chart-emit-series-tooltip.spec.ts b/__tests__/integration/api-chart-emit-series-tooltip.spec.ts index 7833deb7bc..eea4c885e8 100644 --- a/__tests__/integration/api-chart-emit-series-tooltip.spec.ts +++ b/__tests__/integration/api-chart-emit-series-tooltip.spec.ts @@ -23,13 +23,13 @@ describe('chart.emit', () => { // chart.emit("tooltip:show", options) should show tooltip. await expect(canvas).toMatchDOMSnapshot(dir, 'step0', { - selector: '.tooltip', + selector: '.g2-tooltip', }); // chart.emit("tooltip:hide") should hide tooltip. chart.emit('tooltip:hide'); await expect(canvas).toMatchDOMSnapshot(dir, 'step1', { - selector: '.tooltip', + selector: '.g2-tooltip', }); chart.off(); diff --git a/src/interaction/tooltip.ts b/src/interaction/tooltip.ts index 7cabab8d90..23ea950950 100644 --- a/src/interaction/tooltip.ts +++ b/src/interaction/tooltip.ts @@ -75,9 +75,12 @@ function createTooltip( enterable, title: '', offset: [10, 10], + template: { + prefixCls: 'g2-', + }, style: { - '.tooltip': {}, - '.tooltip-title': { + '.g2-tooltip': {}, + '.g2-tooltip-title': { overflow: 'hidden', 'white-space': 'nowrap', 'text-overflow': 'ellipsis', From 8065c935dabf0602c34d310b73e1eb9b85e7486b Mon Sep 17 00:00:00 2001 From: hustcc Date: Mon, 22 May 2023 17:48:36 +0800 Subject: [PATCH 2/2] chore: update tooltip test case snapshots --- .../api-mark-change-data-tooltip.spec.ts | 2 +- .../api/chart-emit-item-tooltip/step0.html | 16 +- .../api/chart-emit-item-tooltip/step1.html | 16 +- .../api/chart-emit-pie-tooltip/step0.html | 14 +- .../api/chart-emit-series-tooltip/step0.html | 16 +- .../api/chart-emit-series-tooltip/step1.html | 16 +- .../snapshots/api/markChangeDataTooltip.html | 16 +- .../step0.html | 16 +- .../step0.html | 16 +- .../step1.html | 16 +- .../aapl-line-area-basic-sample/step0.html | 16 +- .../aapl-line-slider-filter/step1.html | 14 +- .../snapshots/tooltip/aapl-line/step0.html | 16 +- .../aapl2-candlestick-chart/step0.html | 46 ++--- .../alphabet-interval-channel/step0.html | 16 +- .../alphabet-interval-custom-dom/step0.html | 2 +- .../alphabet-interval-custom-dom/step1.html | 2 +- .../step0.html | 2 +- .../step1.html | 2 +- .../tooltip/alphabet-interval-full/step0.html | 26 +-- .../alphabet-interval-multi-field/step0.html | 26 +-- .../alphabet-interval-multi/step0.html | 26 +-- .../alphabet-interval-null-items/step0.html | 6 +- .../alphabet-interval-object/step0.html | 26 +-- .../alphabet-interval-title/step0.html | 16 +- .../step0.html | 2 +- .../step1.html | 2 +- .../alphabet-interval1d-mounted/step0.html | 16 +- .../tooltip/alphabet-interval1d/step0.html | 16 +- .../snapshots/tooltip/body-point2d/step0.html | 26 +-- .../tooltip/cars3-line-xd/step0.html | 76 +++---- .../tooltip/cassette-area-series/step0.html | 56 +++--- .../tooltip/energy-sankey-custom/step0.html | 16 +- .../tooltip/energy-sankey-custom/step1.html | 24 +-- .../flare-point-circle-pack-custom/step0.html | 16 +- .../tooltip/flare-tree-custom/step0.html | 16 +- .../tooltip/flare-tree-custom/step1.html | 24 +-- .../tooltip/flare-treemap-default/step0.html | 16 +- .../step0.html | 44 ++--- .../forecast-range-area-line/step0.html | 44 ++--- .../indices-line-chart-facet/step0.html | 56 +++--- .../indices-line-chart-facet/step1.html | 56 +++--- .../tooltip/indices-line-custom/step0.html | 2 +- .../tooltip/indices-line-custom/step1.html | 2 +- .../tooltip/indices-line-formatter/step0.html | 56 +++--- .../tooltip/indices-line-items/step0.html | 56 +++--- .../indices-line-point-reverse/step0.html | 26 +-- .../indices-line-point-reverse/step1.html | 26 +-- .../tooltip/indices-line-reverse/step0.html | 56 +++--- .../tooltip/indices-line-reverse/step1.html | 56 +++--- .../tooltip/indices-line-series/step0.html | 56 +++--- .../snapshots/tooltip/indices-line/step0.html | 56 +++--- .../languages-interval-stack/step0.html | 14 +- .../tooltip/london-tube-line-geo/step0.html | 6 +- .../tooltip/london-tube-line-geo/step1.html | 24 +-- .../tooltip/miserable-force-custom/step0.html | 24 +-- .../tooltip/miserable-force-custom/step1.html | 16 +- .../tooltip/mock-line-falsy/step0.html | 16 +- .../tooltip/mock-line-falsy/step1.html | 16 +- .../tooltip/mock-line-falsy/step2.html | 16 +- .../tooltip/morley-box-channel/step0.html | 56 +++--- .../tooltip/morley-box-channel/step1.html | 16 +- .../morley-box-default-extend/step0.html | 56 +++--- .../tooltip/morley-box-default/step0.html | 56 +++--- .../tooltip/morley-box-default/step1.html | 16 +- .../snapshots/tooltip/morley-box/step0.html | 56 +++--- .../step0.html | 186 +++++++++--------- .../step1.html | 26 +-- .../provinces-line-group-name/step0.html | 36 ++-- .../score-by-item-area-radar/step0.html | 26 +-- .../step0.html | 16 +- .../state-ages-interval-normalized/step0.html | 16 +- .../state-ages-interval-shared/step0.html | 96 ++++----- .../symbols-line-missing-data/step0.html | 16 +- .../symbols-line-missing-data/step1.html | 16 +- .../temperature2-line-threshold/step0.html | 16 +- .../temperatures-line-discrete/step0.html | 26 +-- .../step0.html | 26 +-- .../unemployment-area-stack/step0.html | 146 +++++++------- .../unemployment-choropleth/step0.html | 16 +- .../unemployment2-rect-bin-x/step0.html | 16 +- .../tooltip/value-area-line-unique/step0.html | 16 +- .../tooltip/weather-line-interval/step0.html | 26 +-- .../tooltip/weather-line-interval/step1.html | 36 ++-- .../tooltip/wind-vector-wind/step0.html | 26 +-- __tests__/integration/spec-tooltip.spec.ts | 2 +- package.json | 2 +- 87 files changed, 1230 insertions(+), 1230 deletions(-) diff --git a/__tests__/integration/api-mark-change-data-tooltip.spec.ts b/__tests__/integration/api-mark-change-data-tooltip.spec.ts index 5cd8aa6659..2fc7078cfa 100644 --- a/__tests__/integration/api-mark-change-data-tooltip.spec.ts +++ b/__tests__/integration/api-mark-change-data-tooltip.spec.ts @@ -30,7 +30,7 @@ describe('mark.changeData tooltip', () => { }), ); await expect(canvas).toMatchDOMSnapshot(dir, render.name, { - selector: `.tooltip`, + selector: '.g2-tooltip', }); }); diff --git a/__tests__/integration/snapshots/api/chart-emit-item-tooltip/step0.html b/__tests__/integration/snapshots/api/chart-emit-item-tooltip/step0.html index f15473bf69..ac87d9f51c 100644 --- a/__tests__/integration/snapshots/api/chart-emit-item-tooltip/step0.html +++ b/__tests__/integration/snapshots/api/chart-emit-item-tooltip/step0.html @@ -1,33 +1,33 @@
Strategy
  • @@ -35,7 +35,7 @@ diff --git a/__tests__/integration/snapshots/api/chart-emit-item-tooltip/step1.html b/__tests__/integration/snapshots/api/chart-emit-item-tooltip/step1.html index 6e556feefa..33a7921a5a 100644 --- a/__tests__/integration/snapshots/api/chart-emit-item-tooltip/step1.html +++ b/__tests__/integration/snapshots/api/chart-emit-item-tooltip/step1.html @@ -1,33 +1,33 @@