@angular/cdk 12.1.1 → 12.1.2

package/fesm2015/a11y.js

@@ -7,7 +7,7 @@ import { hasModifierKey, A, Z, ZERO, NINE, END, HOME, LEFT_ARROW, RIGHT_ARROW, U
 import { tap, debounceTime, filter, map, take, skip, distinctUntilChanged, takeUntil } from 'rxjs/operators';
 import { coerceBooleanProperty, coerceElement } from '@angular/cdk/coercion';
 import * as i1 from '@angular/cdk/platform';
-import { Platform, _getFocusedElementPierceShadowDom, normalizePassiveListenerOptions, _getShadowRoot, PlatformModule } from '@angular/cdk/platform';
+import { Platform, _getFocusedElementPierceShadowDom, normalizePassiveListenerOptions, _getEventTarget, _getShadowRoot, PlatformModule } from '@angular/cdk/platform';
 import { ContentObserver, ObserversModule } from '@angular/cdk/observers';
 
 /**
@@ -1504,11 +1504,12 @@ ConfigurableFocusTrapFactory.ctorParameters = () => [
  */
 /** Gets whether an event could be a faked `mousedown` event dispatched by a screen reader. */
 function isFakeMousedownFromScreenReader(event) {
-    // We can typically distinguish between these faked mousedown events and real mousedown events
-    // using the "buttons" property. While real mousedowns will indicate the mouse button that was
-    // pressed (e.g. "1" for the left mouse button), faked mousedowns will usually set the property
-    // value to 0.
-    return event.buttons === 0;
+    // Some screen readers will dispatch a fake `mousedown` event when pressing enter or space on
+    // a clickable element. We can distinguish these events when both `offsetX` and `offsetY` are
+    // zero. Note that there's an edge case where the user could click the 0x0 spot of the screen
+    // themselves, but that is unlikely to contain interaction elements. Historially we used to check
+    // `event.buttons === 0`, however that no longer works on recent versions of NVDA.
+    return event.offsetX === 0 && event.offsetY === 0;
 }
 /** Gets whether an event could be a faked `touchstart` event dispatched by a screen reader. */
 function isFakeTouchstartFromScreenReader(event) {
@@ -1610,7 +1611,7 @@ class InputModalityDetector {
                 return;
             }
             this._modality.next('keyboard');
-            this._mostRecentTarget = getTarget(event);
+            this._mostRecentTarget = _getEventTarget(event);
         };
         /**
          * Handles mousedown events. Must be an arrow function in order to preserve the context when it
@@ -1626,7 +1627,7 @@ class InputModalityDetector {
             // 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);
+            this._mostRecentTarget = _getEventTarget(event);
         };
         /**
          * Handles touchstart events. Must be an arrow function in order to preserve the context when it
@@ -1643,7 +1644,7 @@ class InputModalityDetector {
             // triggered via mouse vs touch.
             this._lastTouchMs = Date.now();
             this._modality.next('touch');
-            this._mostRecentTarget = getTarget(event);
+            this._mostRecentTarget = _getEventTarget(event);
         };
         this._options = Object.assign(Object.assign({}, INPUT_MODALITY_DETECTOR_DEFAULT_OPTIONS), options);
         // Skip the first emission as it's null.
@@ -1684,12 +1685,6 @@ InputModalityDetector.ctorParameters = () => [
     { type: Document, decorators: [{ type: Inject, args: [DOCUMENT,] }] },
     { type: undefined, decorators: [{ type: Optional }, { type: Inject, args: [INPUT_MODALITY_DETECTOR_OPTIONS,] }] }
 ];
-/** Gets the target of an event, accounting for Shadow DOM. */
-function getTarget(event) {
-    // 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);
-}
 
 /**
  * @license
@@ -1931,7 +1926,7 @@ class FocusMonitor {
          * Needs to be an arrow function in order to preserve the context when it gets bound.
          */
         this._rootNodeFocusAndBlurListener = (event) => {
-            const target = getTarget(event);
+            const target = _getEventTarget(event);
             const handler = event.type === 'focus' ? this._onFocus : this._onBlur;
             // We need to walk up the ancestor chain in order to support `checkChildren`.
             for (let element = target; element; element = element.parentElement) {
@@ -2112,7 +2107,7 @@ class FocusMonitor {
         // If we are not counting child-element-focus as focused, make sure that the event target is the
         // monitored element itself.
         const elementInfo = this._elementInfo.get(element);
-        const focusEventTarget = getTarget(event);
+        const focusEventTarget = _getEventTarget(event);
         if (!elementInfo || (!elementInfo.checkChildren && element !== focusEventTarget)) {
             return;
         }