diff --git a/src/A11y.tsx b/src/A11y.tsx index b1c5527..ba89af7 100644 --- a/src/A11y.tsx +++ b/src/A11y.tsx @@ -113,11 +113,9 @@ export const A11y: React.FC = ({ a11yElStyle ); - const [a11yState, setA11yState] = useState({ - hovered: false, - focused: false, - pressed: startPressed ? startPressed : false, - }); + const [a11yStateHovered, setA11yStateHovered] = useState(false); + const [a11yStateFocused, setA11yStateFocused] = useState(false); + const [a11yStatePressed, setA11yStatePressed] = useState(startPressed); const a11yScreenReader = useAnnounceStore((state) => state.a11yScreenReader); @@ -147,11 +145,7 @@ export const A11y: React.FC = ({ if (role !== 'content' && role !== 'image' && !disabled) { domElement.style.cursor = 'pointer'; } - setA11yState({ - hovered: true, - focused: a11yState.focused, - pressed: a11yState.pressed, - }); + setA11yStateHovered(true); } }; // @ts-ignore @@ -164,11 +158,7 @@ export const A11y: React.FC = ({ if (!overHtml.current && !overMesh.current) { if (componentIsMounted.current) { domElement.style.cursor = 'default'; - setA11yState({ - hovered: false, - focused: a11yState.focused, - pressed: a11yState.pressed, - }); + setA11yStateHovered(false); } } }; @@ -183,17 +173,13 @@ export const A11y: React.FC = ({ } function handleToggleBtnClick() { - if (a11yState.pressed) { + if (a11yStatePressed) { if (typeof deactivationMsg === 'string') a11yScreenReader(deactivationMsg); } else { if (typeof activationMsg === 'string') a11yScreenReader(activationMsg); } - setA11yState({ - hovered: a11yState.hovered, - focused: a11yState.focused, - pressed: !a11yState.pressed, - }); + setA11yStatePressed(!a11yStatePressed); if (typeof actionCall === 'function') actionCall(); } @@ -209,7 +195,7 @@ export const A11y: React.FC = ({