Skip to content

Commit

Permalink
fix(input): clear button can be navigated using screen reader (#29366) (
Browse files Browse the repository at this point in the history
  • Loading branch information
liamdebeasi authored Apr 23, 2024
1 parent f69aa8c commit 5ce0c60
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 5 deletions.
9 changes: 9 additions & 0 deletions core/src/components/input/input.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -831,6 +831,15 @@ export class Input implements ComponentInterface {
*/
ev.preventDefault();
}}
onFocusin={(ev) => {
/**
* Prevent the focusin event from bubbling otherwise it will cause the focusin
* event listener in scroll assist to fire. When this fires, focus will be moved
* back to the input even if the clear button was never tapped. This poses issues
* for screen readers as it means users would be unable to swipe past the clear button.
*/
ev.stopPropagation();
}}
onClick={this.clearTextInput}
>
<ion-icon aria-hidden="true" icon={mode === 'ios' ? closeCircle : closeSharp}></ion-icon>
Expand Down
10 changes: 5 additions & 5 deletions core/src/utils/input-shims/hacks/scroll-assist.ts
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ export const enableScrollAssist = (
const focusOut = () => {
hasKeyboardBeenPresentedForTextField = false;
win?.removeEventListener('ionKeyboardDidShow', keyboardShow);
componentEl.removeEventListener('focusout', focusOut, true);
componentEl.removeEventListener('focusout', focusOut);
};

/**
Expand Down Expand Up @@ -155,15 +155,15 @@ export const enableScrollAssist = (
);

win?.addEventListener('ionKeyboardDidShow', keyboardShow);
componentEl.addEventListener('focusout', focusOut, true);
componentEl.addEventListener('focusout', focusOut);
};

componentEl.addEventListener('focusin', focusIn, true);
componentEl.addEventListener('focusin', focusIn);

return () => {
componentEl.removeEventListener('focusin', focusIn, true);
componentEl.removeEventListener('focusin', focusIn);
win?.removeEventListener('ionKeyboardDidShow', keyboardShow);
componentEl.removeEventListener('focusout', focusOut, true);
componentEl.removeEventListener('focusout', focusOut);
};
};

Expand Down

0 comments on commit 5ce0c60

Please sign in to comment.