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.

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

Jump to bottom

[charts] Add support mobile tooltip #13043

Merged
merged 1 commit into from
May 13, 2024
Merged

[charts] Add support mobile tooltip #13043

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
21 changes: 13 additions & 8 deletions packages/x-charts/src/ChartsTooltip/utils.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,22 +52,27 @@ export function useMouseTracker() {
return () => {};
}

const handleMouseOut = () => {
const handleOut = () => {
setMousePosition(null);
};

const handleMouseMove = (event: MouseEvent) => {
const handleMove = (event: MouseEvent | TouchEvent) => {
const target = 'targetTouches' in event ? event.targetTouches[0] : event;
setMousePosition({
x: event.clientX,
y: event.clientY,
x: target.clientX,
y: target.clientY,
});
};

element.addEventListener('mouseout', handleMouseOut);
element.addEventListener('mousemove', handleMouseMove);
element.addEventListener('mouseout', handleOut);
element.addEventListener('mousemove', handleMove);
element.addEventListener('touchend', handleOut);
element.addEventListener('touchmove', handleMove);
return () => {
element.removeEventListener('mouseout', handleMouseOut);
element.removeEventListener('mousemove', handleMouseMove);
element.removeEventListener('mouseout', handleOut);
element.removeEventListener('mousemove', handleMove);
element.addEventListener('touchend', handleOut);
element.addEventListener('touchmove', handleMove);
};
}, [svgRef]);

Expand Down
19 changes: 12 additions & 7 deletions packages/x-charts/src/hooks/useAxisEvents.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,16 +95,17 @@ export const useAxisEvents = (disableAxisListener: boolean) => {
};
};

const handleMouseOut = () => {
const handleOut = () => {
mousePosition.current = {
x: -1,
y: -1,
};
dispatch({ type: 'exitChart' });
};

const handleMouseMove = (event: MouseEvent) => {
const svgPoint = getSVGPoint(svgRef.current!, event);
const handleMove = (event: MouseEvent | TouchEvent) => {
const target = 'targetTouches' in event ? event.targetTouches[0] : event;
const svgPoint = getSVGPoint(svgRef.current!, target);

mousePosition.current = {
x: svgPoint.x,
Expand All @@ -123,11 +124,15 @@ export const useAxisEvents = (disableAxisListener: boolean) => {
dispatch({ type: 'updateAxis', data: { x: newStateX, y: newStateY } });
};

element.addEventListener('mouseout', handleMouseOut);
element.addEventListener('mousemove', handleMouseMove);
element.addEventListener('mouseout', handleOut);
element.addEventListener('mousemove', handleMove);
element.addEventListener('touchend', handleOut);
element.addEventListener('touchmove', handleMove);
return () => {
element.removeEventListener('mouseout', handleMouseOut);
element.removeEventListener('mousemove', handleMouseMove);
element.removeEventListener('mouseout', handleOut);
element.removeEventListener('mousemove', handleMove);
element.removeEventListener('touchend', handleOut);
element.removeEventListener('touchmove', handleMove);
};
}, [
svgRef,
Expand Down
2 changes: 1 addition & 1 deletion packages/x-charts/src/internals/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export type XOR<T, U> = T | U extends object ? (Without<T, U> & U) | (Without<U,
* @param svg The SVG element
* @param event The mouseEvent to transform
*/
export function getSVGPoint(svg: SVGSVGElement, event: MouseEvent) {
export function getSVGPoint(svg: SVGSVGElement, event: Pick<MouseEvent, 'clientX' | 'clientY'>) {
const pt = svg.createSVGPoint();
pt.x = event.clientX;
pt.y = event.clientY;
Expand Down
Loading