Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(tooltip): disableNative #5236

Merged
merged 1 commit into from
Jun 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 41 additions & 0 deletions __tests__/integration/api-chart-emit-click-tooltip.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
import { chartEmitClickTooltip as render } from '../plots/api/chart-emit-click-tooltip';
import { kebabCase } from './utils/kebabCase';
import { dispatchFirstElementEvent, dispatchPlotEvent } from './utils/event';
import './utils/useSnapshotMatchers';
import { createDOMGCanvas } from './utils/createDOMGCanvas';

describe('chart.emit', () => {
const dir = `${__dirname}/snapshots/api/${kebabCase(render.name)}`;
const canvas = createDOMGCanvas(640, 480);

it('chart.tooltip should disable native events.', async () => {
const { finished } = render({
canvas,
container: document.createElement('div'),
});
await finished;

// Disable native events.
dispatchFirstElementEvent(canvas, 'pointerover');

await expect(canvas).toMatchDOMSnapshot(dir, 'step0', {
selector: '.g2-tooltip',
});

// Click item to show tooltip.
dispatchFirstElementEvent(canvas, 'click', { detail: 1 });
await expect(canvas).toMatchDOMSnapshot(dir, 'step1', {
selector: '.g2-tooltip',
});

// Click plot to hide tooltip.
dispatchPlotEvent(canvas, 'click', { detail: 1 });
await expect(canvas).toMatchDOMSnapshot(dir, 'step2', {
selector: '.g2-tooltip',
});
});

afterAll(() => {
canvas?.destroy();
});
});
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
null
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
<div
xmlns="http://www.w3.org/1999/xhtml"
class="g2-tooltip"
style="pointer-events: none; position: absolute; visibility: visible; z-index: 8; transition: visibility 0.2s cubic-bezier(0.23, 1, 0.32, 1), left 0.4s cubic-bezier(0.23, 1, 0.32, 1), top 0.4s cubic-bezier(0.23, 1, 0.32, 1); background-color: rgba(255, 255, 255, 0.96); box-shadow: 0 6px 12px 0 rgba(0, 0, 0, 0.12); border-radius: 4px; color: rgba(0, 0, 0, 0.65); font-size: 12px; line-height: 20px; padding: 12px; min-width: 120px; max-width: 360px; font-family: Roboto-Regular; left: 115.93137230592615px; top: 289.8214318411691px;"
>
<div
class="g2-tooltip-title"
style="color: rgba(0, 0, 0, 0.45); overflow: hidden; white-space: nowrap; text-overflow: ellipsis;"
>
Sports
</div>
<ul
class="g2-tooltip-list"
style="margin: 0px; list-style-type: none; padding: 0px;"
>
<li
class="g2-tooltip-list-item"
data-index="0"
style="list-style-type: none; display: flex; line-height: 2em; align-items: center; justify-content: space-between; white-space: nowrap;"
>
<span
class="g2-tooltip-list-item-name"
style="display: flex; align-items: center; max-width: 216px;"
>
<span
class="g2-tooltip-list-item-marker"
style="background: rgb(91, 143, 249); width: 8px; height: 8px; border-radius: 50%; display: inline-block; margin-right: 4px;"
/>
<span
class="g2-tooltip-list-item-name-label"
title="sold"
style="flex: 1; overflow: hidden; white-space: nowrap; text-overflow: ellipsis;"
>
sold
</span>
</span>
<span
class="g2-tooltip-list-item-value"
title="275"
style="display: inline-block; float: right; flex: 1; text-align: right; min-width: 28px; margin-left: 30px; color: rgba(0, 0, 0, 0.85); overflow: hidden; white-space: nowrap; text-overflow: ellipsis;"
>
275
</span>
</li>
</ul>
</div>;
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
<div
xmlns="http://www.w3.org/1999/xhtml"
class="g2-tooltip"
style="pointer-events: none; position: absolute; visibility: hidden; z-index: 8; transition: visibility 0.2s cubic-bezier(0.23, 1, 0.32, 1), left 0.4s cubic-bezier(0.23, 1, 0.32, 1), top 0.4s cubic-bezier(0.23, 1, 0.32, 1); background-color: rgba(255, 255, 255, 0.96); box-shadow: 0 6px 12px 0 rgba(0, 0, 0, 0.12); border-radius: 4px; color: rgba(0, 0, 0, 0.65); font-size: 12px; line-height: 20px; padding: 12px; min-width: 120px; max-width: 360px; font-family: Roboto-Regular; left: 115.93137230592615px; top: 289.8214318411691px;"
>
<div
class="g2-tooltip-title"
style="color: rgba(0, 0, 0, 0.45); overflow: hidden; white-space: nowrap; text-overflow: ellipsis;"
>
Sports
</div>
<ul
class="g2-tooltip-list"
style="margin: 0px; list-style-type: none; padding: 0px;"
>
<li
class="g2-tooltip-list-item"
data-index="0"
style="list-style-type: none; display: flex; line-height: 2em; align-items: center; justify-content: space-between; white-space: nowrap;"
>
<span
class="g2-tooltip-list-item-name"
style="display: flex; align-items: center; max-width: 216px;"
>
<span
class="g2-tooltip-list-item-marker"
style="background: rgb(91, 143, 249); width: 8px; height: 8px; border-radius: 50%; display: inline-block; margin-right: 4px;"
/>
<span
class="g2-tooltip-list-item-name-label"
title="sold"
style="flex: 1; overflow: hidden; white-space: nowrap; text-overflow: ellipsis;"
>
sold
</span>
</span>
<span
class="g2-tooltip-list-item-value"
title="275"
style="display: inline-block; float: right; flex: 1; text-align: right; min-width: 28px; margin-left: 30px; color: rgba(0, 0, 0, 0.85); overflow: hidden; white-space: nowrap; text-overflow: ellipsis;"
>
275
</span>
</li>
</ul>
</div>;
40 changes: 40 additions & 0 deletions __tests__/plots/api/chart-emit-click-tooltip.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
import { Chart } from '../../../src';

export function chartEmitClickTooltip(context) {
const { container, canvas } = context;

const chart = new Chart({
theme: 'classic',
container: container,
canvas,
});

chart
.interval()
.data([
{ genre: 'Sports', sold: 275 },
{ genre: 'Strategy', sold: 115 },
{ genre: 'Action', sold: 120 },
{ genre: 'Shooter', sold: 350 },
{ genre: 'Other', sold: 150 },
])
.encode('x', 'genre')
.encode('y', 'sold')
.encode('color', 'genre')
.interaction('tooltip', { disableNative: true });

const finished = chart.render();

chart.on('element:click', ({ data }) => {
chart.emit('tooltip:show', { data });
});

chart.on('plot:click', () => {
chart.emit('tooltip:hide');
});

return {
chart,
finished,
};
}
1 change: 1 addition & 0 deletions __tests__/plots/api/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,4 @@ export { chartEmitBrushHighlightAxisCross } from './chart-emit-brush-highlight-a
export { chartEmitScrollbarFilter } from './chart-emit-scrollbar-filter';
export { chartOptionsCompositeMark } from './chart-options-composite-mark';
export { chartEmitItemTooltipHideContent } from './chart-emit-item-tooltip-hide-content';
export { chartEmitClickTooltip } from './chart-emit-click-tooltip';
37 changes: 19 additions & 18 deletions site/docs/spec/interaction/tooltip.zh.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,23 +34,24 @@ chart.render();

## 选项

| 属性 | 描述 | 类型 | 默认值 |
| ------------------------- | ------------------------------------ | ------------------------------------------- | ------ |
| wait | 提示信息更新的时间间隔,单位为毫秒 | `number` | 50 |
| leading | 是否在时间间隔开始的时候更新提示信息 | `boolean` | true |
| trailing | 是否在时间间隔结束的时候更新提示信息 | `boolean` | false |
| shared | 相同 x 的元素是否共享 tooltip | `boolean` | false |
| series | 是否是系列元素的 tooltip | `boolean` | - |
| body | 是否展示 tooltip | `boolean` | true |
| groupName | 是否使用 groupName | `boolean` | true |
| position | tooltip 位置 | `TooltipPosition` | - |
| mount | tooltip 渲染的 dom 节点 | `string` \| `HTMLElement` | 图表容器 |
| bounding | tooltip 渲染的限制区域,超出会自动调整位置 | `BBox` | 图表区域大小 |
| crosshairs | 是否暂时指示线 | `boolean` | - |
| `crosshairs${StyleAttrs}` | 指示线的样式 | `number \| string` | - |
| render | 自定义 tooltip 渲染函数 | `(event, options) => HTMLElement \| string` | - |
| sort | item 排序器 | `(d: TooltipItemValue) => any` | - |
| filter | item 筛选器 | `(d: TooltipItemValue) => any` | - |
| 属性 | 描述 | 类型 | 默认值 |
| ------------------------- | ------------------------------------------- | ------------------------------------------- | ------------ |
| wait | 提示信息更新的时间间隔,单位为毫秒 | `number` | 50 |
| leading | 是否在时间间隔开始的时候更新提示信息 | `boolean` | true |
| trailing | 是否在时间间隔结束的时候更新提示信息 | `boolean` | false |
| shared | 相同 x 的元素是否共享 tooltip | `boolean` | false |
| series | 是否是系列元素的 tooltip | `boolean` | - |
| body | 是否展示 tooltip | `boolean` | true |
| groupName | 是否使用 groupName | `boolean` | true |
| position | tooltip 位置 | `TooltipPosition` | - |
| mount | tooltip 渲染的 dom 节点 | `string` \| `HTMLElement` | 图表容器 |
| bounding | tooltip 渲染的限制区域,超出会自动调整位置 | `BBox` | 图表区域大小 |
| crosshairs | 是否暂时指示线 | `boolean` | - |
| `crosshairs${StyleAttrs}` | 指示线的样式 | `number \| string` | - |
| render | 自定义 tooltip 渲染函数 | `(event, options) => HTMLElement \| string` | - |
| sort | item 排序器 | `(d: TooltipItemValue) => any` | - |
| filter | item 筛选器 | `(d: TooltipItemValue) => any` | - |
| disableNative | 是否响应原生事件(pointerover 和 pointerout) | true | `boolean` |

```ts
type TooltipPosition =
Expand All @@ -63,7 +64,7 @@ type TooltipPosition =
| 'bottom-left'
| 'bottom-right';

type BBox = { x: number, y: number, width: number, height: number };
type BBox = { x: number; y: number; width: number; height: number };
```

## 案例
Expand Down
8 changes: 8 additions & 0 deletions site/examples/interaction/interaction/demo/meta.json
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,14 @@
},
"screenshot": "https://mdn.alipayobjects.com/huamei_qa8qxu/afts/img/A*WcxIS4inFuoAAAAAAAAAAAAADmJ7AQ/original"
},
{
"filename": "tooltip-click.ts",
"title": {
"zh": "点击提示",
"en": "Click Tooltip"
},
"screenshot": "https://mdn.alipayobjects.com/huamei_qa8qxu/afts/img/A*4YDhQZN5FogAAAAAAAAAAAAADmJ7AQ/original"
},
{
"filename": "chart-index.ts",
"title": {
Expand Down
25 changes: 25 additions & 0 deletions site/examples/interaction/interaction/demo/tooltip-click.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import { Chart } from '@antv/g2';

const chart = new Chart({
container: 'container',
theme: 'classic',
autoFit: true,
});

chart
.interval()
.data({
type: 'fetch',
value:
'https://gw.alipayobjects.com/os/bmw-prod/fb9db6b7-23a5-4c23-bbef-c54a55fee580.csv',
})
.encode('x', 'letter')
.encode('y', 'frequency')
.axis('y', { labelFormatter: '.0%' })
.interaction('tooltip', { disableNative: true }); // Disable pointerover and pointerout events.

chart.on('element:click', ({ data }) => chart.emit('tooltip:show', { data }));

chart.on('plot:click', () => chart.emit('tooltip:hide'));

chart.render();
35 changes: 23 additions & 12 deletions src/interaction/tooltip.ts
Original file line number Diff line number Diff line change
Expand Up @@ -379,6 +379,7 @@ export function seriesTooltip(
enterable,
mount,
bounding,
disableNative = false,
style: _style = {},
...rest
}: Record<string, any>,
Expand Down Expand Up @@ -601,14 +602,18 @@ export function seriesTooltip(
emitter.on('tooltip:show', onTooltipShow);
emitter.on('tooltip:hide', onTooltipHide);

root.addEventListener('pointerenter', update);
root.addEventListener('pointermove', update);
root.addEventListener('pointerleave', hide);
if (!disableNative) {
root.addEventListener('pointerenter', update);
root.addEventListener('pointermove', update);
root.addEventListener('pointerleave', hide);
}

return () => {
root.removeEventListener('pointerenter', update);
root.removeEventListener('pointermove', update);
root.removeEventListener('pointerleave', hide);
if (!disableNative) {
root.removeEventListener('pointerenter', update);
root.removeEventListener('pointermove', update);
root.removeEventListener('pointerleave', hide);
}
emitter.off('tooltip:show', onTooltipShow);
emitter.off('tooltip:hide', onTooltipHide);
destroyTooltip(root);
Expand Down Expand Up @@ -641,6 +646,7 @@ export function tooltip(
mount,
bounding,
body = true,
disableNative = false,
}: Record<string, any>,
) {
const elements = elementsof(root);
Expand Down Expand Up @@ -730,14 +736,19 @@ export function tooltip(
emitter.on('tooltip:show', onTooltipShow);
emitter.on('tooltip:hide', onTooltipHide);

root.addEventListener('pointerover', pointerover);
root.addEventListener('pointermove', pointerover);
root.addEventListener('pointerout', pointerout);
if (!disableNative) {
root.addEventListener('pointerover', pointerover);
root.addEventListener('pointermove', pointerover);
root.addEventListener('pointerout', pointerout);
}

return () => {
root.removeEventListener('pointerover', pointerover);
root.removeEventListener('pointermove', pointerover);
root.removeEventListener('pointerout', pointerout);
if (!disableNative) {
root.removeEventListener('pointerover', pointerover);
root.removeEventListener('pointermove', pointerover);
root.removeEventListener('pointerout', pointerout);
}

emitter.off('tooltip:show', onTooltipShow);
emitter.off('tooltip:hide', onTooltipHide);
destroyTooltip(root);
Expand Down