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

[core] Extract useRippleHandler outside of ButtonBase #44591

Merged
merged 2 commits into from
Dec 2, 2024
Merged

[core] Extract useRippleHandler outside of ButtonBase #44591

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
762daf7
Extract useRippleHandler outside of ButtonBase
albarv340 Nov 28, 2024
cf54828
Move helper function to end + remove unnecessary variable
albarv340 Nov 30, 2024
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
62 changes: 34 additions & 28 deletions packages/mui-material/src/ButtonBase/ButtonBase.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,21 @@ export const ButtonBaseRoot = styled('button', {
},
});

function useRippleHandler(ripple, rippleAction, eventCallback, skipRippleAction = false) {
return useEventCallback((event) => {
if (eventCallback) {
eventCallback(event);
}

const ignore = skipRippleAction;
if (!ignore) {
ripple[rippleAction](event);
}

return true;
});
}

/**
* `ButtonBase` contains as few styles as possible.
* It aims to be a simple building block for creating a button.
Expand Down Expand Up @@ -137,38 +152,29 @@ const ButtonBase = React.forwardRef(function ButtonBase(inProps, ref) {
}
}, [disableRipple, focusRipple, focusVisible, ripple]);

function useRippleHandler(rippleAction, eventCallback, skipRippleAction = disableTouchRipple) {
return useEventCallback((event) => {
if (eventCallback) {
eventCallback(event);
const handleMouseDown = useRippleHandler(ripple, 'start', onMouseDown, disableTouchRipple);
const handleContextMenu = useRippleHandler(ripple, 'stop', onContextMenu, disableTouchRipple);
const handleDragLeave = useRippleHandler(ripple, 'stop', onDragLeave, disableTouchRipple);
const handleMouseUp = useRippleHandler(ripple, 'stop', onMouseUp, disableTouchRipple);
const handleMouseLeave = useRippleHandler(
ripple,
'stop',
(event) => {
if (focusVisible) {
event.preventDefault();
}

const ignore = skipRippleAction;
if (!ignore) {
ripple[rippleAction](event);
if (onMouseLeave) {
onMouseLeave(event);
}

return true;
});
}

const handleMouseDown = useRippleHandler('start', onMouseDown);
const handleContextMenu = useRippleHandler('stop', onContextMenu);
const handleDragLeave = useRippleHandler('stop', onDragLeave);
const handleMouseUp = useRippleHandler('stop', onMouseUp);
const handleMouseLeave = useRippleHandler('stop', (event) => {
if (focusVisible) {
event.preventDefault();
}
if (onMouseLeave) {
onMouseLeave(event);
}
});
const handleTouchStart = useRippleHandler('start', onTouchStart);
const handleTouchEnd = useRippleHandler('stop', onTouchEnd);
const handleTouchMove = useRippleHandler('stop', onTouchMove);
},
disableTouchRipple,
);
const handleTouchStart = useRippleHandler(ripple, 'start', onTouchStart, disableTouchRipple);
const handleTouchEnd = useRippleHandler(ripple, 'stop', onTouchEnd, disableTouchRipple);
const handleTouchMove = useRippleHandler(ripple, 'stop', onTouchMove, disableTouchRipple);

const handleBlur = useRippleHandler(
ripple,
'stop',
(event) => {
if (!isFocusVisible(event.target)) {
Expand Down