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.
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
fix(cdk/a11y): Fix the touch/program origin regression introduced in the recent FocusMonitor refactor. #22754
Merged
wagnermaciel
merged 4 commits into
angular:input-modality
from
zelliott:focus-monitor-touch-fix
May 25, 2021
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
e9d334a
fix(cdk/a11y): Fix the touch/program origin regression introduced in …
zelliott e38b545
fix(cdk/a11y): Add detailed comment describing edge case.
zelliott 06b1e7a
fix(cdk/a11y): Accept goldens and fix circular deps
zelliott 504b7d8
fix(cdk/a11y): Fix lint error
zelliott File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -100,6 +100,12 @@ export class InputModalityDetector implements OnDestroy { | |
return this._modality.value; | ||
} | ||
|
||
/** | ||
* The most recently detected input modality event target. Is null if no input modality has been | ||
* detected or if the associated event target is null for some unknown reason. | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I'm not sure in what case the event target would be null, but apparently it's possible (at least per the types). |
||
*/ | ||
_mostRecentTarget: HTMLElement | null = null; | ||
|
||
/** The underlying BehaviorSubject that emits whenever an input modality is detected. */ | ||
private readonly _modality = new BehaviorSubject<InputModality>(null); | ||
|
||
|
@@ -122,6 +128,7 @@ export class InputModalityDetector implements OnDestroy { | |
if (this._options?.ignoreKeys?.some(keyCode => keyCode === event.keyCode)) { return; } | ||
|
||
this._modality.next('keyboard'); | ||
this._mostRecentTarget = getTarget(event); | ||
} | ||
|
||
/** | ||
|
@@ -137,6 +144,7 @@ export class InputModalityDetector implements OnDestroy { | |
// Fake mousedown events are fired by some screen readers when controls are activated by the | ||
// screen reader. Attribute them to keyboard input modality. | ||
this._modality.next(isFakeMousedownFromScreenReader(event) ? 'keyboard' : 'mouse'); | ||
this._mostRecentTarget = getTarget(event); | ||
} | ||
|
||
/** | ||
|
@@ -156,6 +164,7 @@ export class InputModalityDetector implements OnDestroy { | |
this._lastTouchMs = Date.now(); | ||
|
||
this._modality.next('touch'); | ||
this._mostRecentTarget = getTarget(event); | ||
} | ||
|
||
constructor( | ||
|
@@ -194,3 +203,10 @@ export class InputModalityDetector implements OnDestroy { | |
document.removeEventListener('touchstart', this._onTouchstart, modalityEventListenerOptions); | ||
} | ||
} | ||
|
||
/** Gets the target of an event, accounting for Shadow DOM. */ | ||
export function getTarget(event: Event): HTMLElement|null { | ||
// If an event is bound outside the Shadow DOM, the `event.target` will | ||
// point to the shadow root so we have to use `composedPath` instead. | ||
return (event.composedPath ? event.composedPath()[0] : event.target) as HTMLElement | null; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Essentially copied from
components/src/cdk/a11y/focus-monitor/focus-monitor.ts
Line 418 in 25665dc