Introduce a new attribute input on popup source directive to decide whether to set the popup related aria attributes.

This defaults to true and should be turned off for the popup source in select components where the popup source isn't the click target.

PiperOrigin-RevId: 205179702

Author: cissyshi

lib/src/laminate/popup/dom_popup_source.dart

@@ -28,9 +28,12 @@ class DomPopupSourceFactory {
   /// Returns a new [DomPopupSource] from [sourceElement].
   DomPopupSource createPopupSource(HtmlElement sourceElement,
       {Alignment alignOriginX = Alignment.Start,
-      Alignment alignOriginY = Alignment.Start}) {
+      Alignment alignOriginY = Alignment.Start,
+      bool initAriaAttributes = true}) {
     return new DomPopupSource(_asyncMeasureSize, sourceElement,
-        alignOriginX: alignOriginX, alignOriginY: alignOriginY);
+        alignOriginX: alignOriginX,
+        alignOriginY: alignOriginY,
+        initAriaAttributes: initAriaAttributes);
   }
 
   /// Returns a stream of client sizes for [element], and offsets with the
@@ -54,15 +57,22 @@ class DomPopupSource implements ElementPopupSource {
 
   final AsyncMeasureSize<HtmlElement> _asyncMeasureSize;
   final HtmlElement sourceElement;
+  final bool _initAriaAttributes;
 
   /// Creates a new source from a measure function and source DOM element.
   ///
   /// Setting [alignOriginX] and [alignOriginY] is used for calculating what
   /// the x and y position should be.
+  ///
+  /// [initAriaAttributes] decides whether to set the popup related aria
+  /// attributes. This defaults to true and can be set to false for cases where
+  /// the popup source isn't the focus target.
   DomPopupSource(this._asyncMeasureSize, this.sourceElement,
       {Alignment alignOriginX = Alignment.Start,
       Alignment alignOriginY = Alignment.Start,
-      Point transform = const Point(0, 0)}) {
+      Point transform = const Point(0, 0),
+      bool initAriaAttributes = true})
+      : _initAriaAttributes = initAriaAttributes {
     _alignOriginX = alignOriginX;
     _alignOriginY = alignOriginY;
   }
@@ -89,7 +99,7 @@ class DomPopupSource implements ElementPopupSource {
 
   @override
   set popupId(String id) {
-    if (id == null) return;
+    if (id == null || !_initAriaAttributes) return;
     sourceElement
       ..setAttribute('aria-owns', id)
       ..setAttribute('aria-haspopup', 'true');

lib/src/laminate/popup/popup_source_directive.dart

@@ -11,6 +11,7 @@ import 'package:angular_components/focus/focus_interface.dart';
 import 'package:angular_components/laminate/enums/alignment.dart';
 import 'package:angular_components/src/laminate/popup/dom_popup_source.dart';
 import 'package:angular_components/src/laminate/popup/popup_source.dart';
+import 'package:angular_components/utils/angular/properties/properties.dart';
 import 'package:angular_components/utils/angular/reference/reference.dart';
 
 /// A directive that exposes the [PopupSource] interface as `popupSource`.
@@ -23,6 +24,7 @@ import 'package:angular_components/utils/angular/reference/reference.dart';
 class PopupSourceDirective
     implements ElementPopupSource, AfterViewInit, OnDestroy {
   final DomPopupSourceFactory _domPopupSourceFactory;
+  final bool _initAriaAttributes;
   HtmlElement _element;
   ReferenceDirective _referenceDirective;
   Focusable _focusable;
@@ -33,8 +35,17 @@ class PopupSourceDirective
   PopupSource _popupSource;
   String _popupId;
 
-  PopupSourceDirective(this._domPopupSourceFactory, this._element,
-      @Optional() this._referenceDirective, @Optional() this._focusable);
+  /// [initPopupAriaAttributes] is an attribute input that decide whether to
+  /// set the popup related aria attributes. This defaults to true and can be
+  /// set to false for cases where the popup source isn't the focus target.
+  PopupSourceDirective(
+      this._domPopupSourceFactory,
+      this._element,
+      @Optional() this._referenceDirective,
+      @Optional() this._focusable,
+      @Attribute('initPopupAriaAttributes') String initAriaAttributes)
+      : _initAriaAttributes =
+            attributeToBool(initAriaAttributes, defaultValue: true);
 
   @override
   ngOnDestroy() {
@@ -116,11 +127,10 @@ class PopupSourceDirective
   }
 
   void _updateSource() {
-    _popupSource = _domPopupSourceFactory.createPopupSource(
-      _element,
-      alignOriginX: _alignOriginX,
-      alignOriginY: _alignOriginY,
-    );
+    _popupSource = _domPopupSourceFactory.createPopupSource(_element,
+        alignOriginX: _alignOriginX,
+        alignOriginY: _alignOriginY,
+        initAriaAttributes: _initAriaAttributes);
 
     if (_popupId != null) {
       _popupSource.popupId = _popupId;

lib/src/material_tooltip/tooltip_source.dart

@@ -55,7 +55,8 @@ class MaterialTooltipSourceDirective extends PopupSourceDirective
             domPopupSourceFactory,
             element,
             /* referenceDirective */ null,
-            /* focusable */ null) {
+            /* focusable */ null,
+            /* initAriaAttributes */ null) {
     _show = new DelayedAction(tooltipShowDelay, activate);
   }
 

lib/src/material_tooltip/tooltip_target.dart

@@ -193,7 +193,8 @@ abstract class TooltipTarget extends PopupSourceDirective {
             domPopupSourceFactory,
             _element,
             /* referenceDirective */ null,
-            /* focusable */ null);
+            /* focusable */ null,
+            /* initAriaAttributes */ null);
 
   /// Sets the tooltip associated with this target.
   void setTooltip(Tooltip component) {