Skip to content

fix(treemap): hit-test canvas nodes in drawing order #2850

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.

Sign up for GitHub

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

Open
minwookshin wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(treemap): hit-test canvas nodes in drawing order #2850

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
84 changes: 84 additions & 0 deletions cypress/src/components/treemap/TreeMapCanvas.cy.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,90 @@ describe('TreeMapCanvas', () => {
cy.mount(<TreeMapCanvas {...defaultProps} />)
})

const interactionProps: TreeMapCanvasProps<Datum> = {
...defaultProps,
width: 300,
height: 180,
margin: { top: 20, right: 10, bottom: 10, left: 40 },
data: {
id: 'root',
children: [
{
id: 'parent',
children: [
{ id: 'left', value: 1 },
{ id: 'right', value: 1 },
],
},
],
},
value: 'value',
tile: 'dice',
outerPadding: 10,
tooltip: ({ node }) => <div data-testid="node-tooltip">{node.id}</div>,
}

for (const pixelRatio of [1, 2]) {
it(`should target the topmost node at pixel ratio ${pixelRatio}`, () => {
cy.mount(
<TreeMapCanvas
{...interactionProps}
pixelRatio={pixelRatio}
onMouseMove={cy.stub().as('onMouseMove')}
onClick={cy.stub().as('onClick')}
/>
)

// Children cover their ancestors; padding still belongs to the visible ancestor.
for (const [id, x, y] of [
['left', 70, 80],
['right', 220, 80],
['parent', 55, 35],
['root', 45, 25],
] as const) {
cy.get('canvas').trigger('mousemove', x, y)
cy.get('@onMouseMove').its('lastCall.args.0.id').should('equal', id)
cy.findByTestId('node-tooltip').should('have.text', id)
cy.get('canvas').click(x, y)
cy.get('@onClick').its('lastCall.args.0.id').should('equal', id)
}

cy.get('canvas').trigger('mousemove', 5, 5).click(5, 5)
cy.findByTestId('node-tooltip').should('not.exist')
cy.get('@onClick').should('have.callCount', 4)
})
}

it('should only target leaves when leavesOnly is enabled', () => {
cy.mount(
<TreeMapCanvas {...interactionProps} leavesOnly onClick={cy.stub().as('onClick')} />
)

cy.get('canvas').trigger('mousemove', 70, 80).click(70, 80)
cy.findByTestId('node-tooltip').should('have.text', 'left')
cy.get('@onClick').its('lastCall.args.0.id').should('equal', 'left')

cy.get('canvas').trigger('mousemove', 55, 35).click(55, 35)
cy.findByTestId('node-tooltip').should('not.exist')
cy.get('@onClick').should('have.been.calledOnce')
})

it('should not handle interactions when isInteractive is disabled', () => {
cy.mount(
<TreeMapCanvas
{...interactionProps}
isInteractive={false}
onMouseMove={cy.stub().as('onMouseMove')}
onClick={cy.stub().as('onClick')}
/>
)

cy.get('canvas').trigger('mousemove', 70, 80).click(70, 80)
cy.findByTestId('node-tooltip').should('not.exist')
cy.get('@onMouseMove').should('not.have.been.called')
cy.get('@onClick').should('not.have.been.called')
})

testChartResponsiveness(defaults => (
<ResponsiveTreeMapCanvas
pixelRatio={1}
Expand Down
15 changes: 11 additions & 4 deletions packages/treemap/src/TreeMapCanvas.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,17 @@ const findNodeUnderCursor = <Datum extends object>(
margin: Margin,
x: number,
y: number
) =>
nodes.find(node =>
isCursorInRect(node.x + margin.left, node.y + margin.top, node.width, node.height, x, y)
)
) => {
// Check in reverse drawing order so children take precedence over their ancestors.
for (let index = nodes.length - 1; index >= 0; index--) {
const node = nodes[index]
if (
isCursorInRect(node.x + margin.left, node.y + margin.top, node.width, node.height, x, y)
) {
return node
}
}
}

type InnerTreeMapCanvasProps<Datum extends object> = Omit<
TreeMapCanvasProps<Datum>,
Expand Down