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

fix(tooltip): rerender correctly #4962

Merged
merged 1 commit into from
May 9, 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
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<div
xmlns="http://www.w3.org/1999/xhtml"
class="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: 10px; top: 10px;"
>
<div>
<h2>A</h2>
<span>frequency: 0.08167</span>
</div>
</div>;
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<div
xmlns="http://www.w3.org/1999/xhtml"
class="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: 10px; top: 10px;"
>
<div>
<h2>B</h2>
<span>frequency: 0.01492</span>
</div>
</div>;
53 changes: 53 additions & 0 deletions __tests__/plots/tooltip/alphabet-interval-tooltip-render-update.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
import { CustomEvent } from '@antv/g';
import { G2Spec, ELEMENT_CLASS_NAME } from '../../../src';
import { LEGEND_ITEMS_CLASS_NAME } from '../../../src/interaction/legendFilter';

export function alphabetIntervalTooltipRenderUpdate(): G2Spec {
return {
type: 'interval',
paddingLeft: 60,
data: {
type: 'fetch',
value: 'data/alphabet.csv',
transform: [{ type: 'slice', start: 0, end: 3 }],
},
encode: {
x: 'letter',
y: 'frequency',
color: 'letter',
},
interaction: {
legendFilter: true,
tooltip: {
render: (_, { title, items }) =>
`<div><h2>${title}</h2>${items.map(
(d) => `<span>${d.name}: ${d.value}</span>`,
)}</di>`,
},
},
};
}

alphabetIntervalTooltipRenderUpdate.steps = ({ canvas }) => {
const { document } = canvas;
return [
{
changeState: async () => {
const items = document.getElementsByClassName(LEGEND_ITEMS_CLASS_NAME);
const [i0] = items;
i0.dispatchEvent(new CustomEvent('click'));

const elements = document.getElementsByClassName(ELEMENT_CLASS_NAME);
const [e0] = elements;
e0.dispatchEvent(new CustomEvent('pointerover'));
},
},
{
changeState: async () => {
const elements = document.getElementsByClassName(ELEMENT_CLASS_NAME);
const [e0] = elements;
e0.dispatchEvent(new CustomEvent('pointerover'));
},
},
];
};
1 change: 1 addition & 0 deletions __tests__/plots/tooltip/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -61,3 +61,4 @@ export { alphabetIntervalBrushTooltip } from './alphabet-interval-brush-tooltip'
export { mockLineFalsy } from './mock-line-falsy';
export { provincesLineGroupName } from './provinces-line-group-name';
export { pointsPointRegressionQuad } from './points-point-regression-quad';
export { alphabetIntervalTooltipRenderUpdate } from './alphabet-interval-tooltip-render-update';
3 changes: 1 addition & 2 deletions src/runtime/plot.ts
Original file line number Diff line number Diff line change
Expand Up @@ -324,8 +324,7 @@ function updateTooltip(selection, options, view, library, context) {
// Instances for tooltip.
const container = selection.node();
const nameInteraction = container['nameInteraction'];
const { interaction } = options;
const tooltipOptions = inferInteraction(interaction).find(
const tooltipOptions = inferInteraction(options).find(
(d) => d.type === 'tooltip',
);

Expand Down
8 changes: 6 additions & 2 deletions src/transform/filter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export type FilterOptions = Omit<FilterTransform, 'type'>;
*/
export const Filter: TC<FilterOptions> = (options = {}) => {
return (I, mark) => {
const { encode } = mark;
const { encode, data } = mark;
const filters = Object.entries(options)
.map(([key, value]) => {
const [V] = columnOf(encode, key);
Expand Down Expand Up @@ -43,7 +43,11 @@ export const Filter: TC<FilterOptions> = (options = {}) => {
});
return [
newIndex,
deepMix({}, mark, { encode: Object.fromEntries(newEncodes) }),
deepMix({}, mark, {
encode: Object.fromEntries(newEncodes),
// Filter data for tooltip item.
data: FI.map((i) => data[i]),
}),
];
};
};
Expand Down