Add a HasDisabled interface to ACX components that support a disabled input.

Googler · nshahan · commit bb86fdf43139 · 2018-05-18T15:41:32.000-07:00
PiperOrigin-RevId: 197037610
diff --git a/lib/button_decorator/button_decorator.dart b/lib/button_decorator/button_decorator.dart
@@ -7,6 +7,7 @@ import 'dart:html';
 
 import 'package:angular/angular.dart';
 import 'package:angular_components/focus/focus.dart';
+import 'package:angular_components/interfaces/has_disabled.dart';
 import 'package:angular_components/mixins/has_tab_index.dart';
 import 'package:angular_components/utils/browser/events/events.dart';
 
@@ -26,7 +27,9 @@ import 'package:angular_components/utils/browser/events/events.dart';
   // Injected by [DisablePendingClickHandlerDirective].
   visibility: Visibility.all,
 )
-class ButtonDirective extends RootFocusable with HasTabIndex implements OnInit {
+class ButtonDirective extends RootFocusable
+    with HasTabIndex
+    implements OnInit, HasDisabled {
   /// Will emit Event on mouse click or keyboard activation.
   @Output()
   Stream<UIEvent> get trigger => _trigger.stream;
diff --git a/lib/interfaces/has_disabled.dart b/lib/interfaces/has_disabled.dart
@@ -0,0 +1,8 @@
+// Copyright (c) 2016, the Dart project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+/// Interface for classes accepting a disabled setting.
+abstract class HasDisabled {
+  bool disabled;
+}
diff --git a/lib/material_button/material_button.dart b/lib/material_button/material_button.dart
@@ -6,6 +6,7 @@ import 'dart:html';
 
 import 'package:angular/angular.dart';
 import 'package:angular_components/button_decorator/button_decorator.dart';
+import 'package:angular_components/interfaces/has_disabled.dart';
 import 'package:angular_components/material_ripple/material_ripple.dart';
 import 'package:angular_components/theme/dark_theme.dart';
 
@@ -106,7 +107,8 @@ import 'material_button_base.dart';
   templateUrl: 'material_button.html',
   providers: const [
     AcxDarkTheme,
-    const Provider(ButtonDirective, useExisting: MaterialButtonComponent)
+    const Provider(ButtonDirective, useExisting: MaterialButtonComponent),
+    const Provider(HasDisabled, useExisting: MaterialButtonComponent),
   ],
   styleUrls: const ['material_button.scss.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
diff --git a/lib/material_checkbox/material_checkbox.dart b/lib/material_checkbox/material_checkbox.dart
@@ -8,6 +8,7 @@ import 'dart:html';
 import 'package:angular/angular.dart';
 import 'package:angular_forms/angular_forms.dart';
 import 'package:meta/meta.dart';
+import 'package:angular_components/interfaces/has_disabled.dart';
 import 'package:angular_components/focus/focus.dart';
 import 'package:angular_components/glyph/glyph.dart';
 import 'package:angular_components/material_ripple/material_ripple.dart';
@@ -64,12 +65,16 @@ const indeterminateAriaState = 'mixed';
 ///
 @Component(
   selector: 'material-checkbox',
+  providers: const [
+    const Provider(HasDisabled, useExisting: MaterialCheckboxComponent),
+  ],
   directives: const [GlyphComponent, MaterialRippleComponent, NgIf],
   templateUrl: 'material_checkbox.html',
   styleUrls: const ['material_checkbox.scss.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
 )
-class MaterialCheckboxComponent implements ControlValueAccessor, Focusable {
+class MaterialCheckboxComponent
+    implements ControlValueAccessor, HasDisabled, Focusable {
   @HostBinding('class')
   static const hostClass = 'themeable';
 
diff --git a/lib/material_datepicker/material_date_range_picker.dart b/lib/material_datepicker/material_date_range_picker.dart
@@ -10,6 +10,7 @@ import 'package:intl/intl.dart';
 import 'package:quiver/time.dart';
 import 'package:angular_components/button_decorator/button_decorator.dart';
 import 'package:angular_components/content/deferred_content.dart';
+import 'package:angular_components/interfaces/has_disabled.dart';
 import 'package:angular_components/focus/focus_trap.dart';
 import 'package:angular_components/focus/keyboard_only_focus_indicator.dart';
 import 'package:angular_components/glyph/glyph.dart';
@@ -78,11 +79,12 @@ import 'package:angular_components/utils/disposer/disposer.dart';
   ],
   providers: const [
     const Provider(DateRangeEditorHost,
-        useExisting: MaterialDateRangePickerComponent)
+        useExisting: MaterialDateRangePickerComponent),
+    const Provider(HasDisabled, useExisting: MaterialDateRangePickerComponent),
   ],
 )
 class MaterialDateRangePickerComponent extends KeyboardHandlerMixin
-    implements OnInit, OnDestroy, DateRangeEditorHost {
+    implements HasDisabled, OnInit, OnDestroy, DateRangeEditorHost {
   DateRangeEditorComponent _dateRangeEditor;
   bool _focusOnDateRangeEditorInit = false;
 
diff --git a/lib/material_datepicker/material_date_time_picker.dart b/lib/material_datepicker/material_date_time_picker.dart
@@ -7,6 +7,7 @@ import 'dart:async';
 import 'package:angular/angular.dart';
 import 'package:intl/intl.dart';
 import 'package:quiver/time.dart';
+import 'package:angular_components/interfaces/has_disabled.dart';
 import 'package:angular_components/material_datepicker/material_datepicker.dart';
 import 'package:angular_components/material_datepicker/material_time_picker.dart';
 import 'package:angular_components/material_datepicker/module.dart';
@@ -33,8 +34,11 @@ import 'package:angular_components/model/date/date.dart';
     MaterialTimePickerComponent,
     MaterialInputComponent,
   ],
+  providers: const [
+    const Provider(HasDisabled, useExisting: MaterialDateTimePickerComponent),
+  ],
 )
-class MaterialDateTimePickerComponent {
+class MaterialDateTimePickerComponent implements HasDisabled {
   final Clock _clock;
 
   /// The format used to format dates.
diff --git a/lib/material_datepicker/material_datepicker.dart b/lib/material_datepicker/material_datepicker.dart
@@ -10,6 +10,7 @@ import 'package:intl/intl.dart';
 import 'package:quiver/time.dart';
 import 'package:angular_components/button_decorator/button_decorator.dart';
 import 'package:angular_components/content/deferred_content.dart';
+import 'package:angular_components/interfaces/has_disabled.dart';
 import 'package:angular_components/focus/focus.dart';
 import 'package:angular_components/focus/focus_trap.dart';
 import 'package:angular_components/focus/keyboard_only_focus_indicator.dart';
@@ -68,12 +69,15 @@ import 'package:angular_components/model/date/date.dart';
     NgIf,
     PopupSourceDirective,
   ],
+  providers: const [
+    const Provider(HasDisabled, useExisting: MaterialDatepickerComponent),
+  ],
   styleUrls: const ['material_datepicker.scss.css'],
   templateUrl: 'material_datepicker.html',
 )
 class MaterialDatepickerComponent extends KeyboardHandlerMixin
     with FocusableMixin
-    implements AfterViewInit {
+    implements AfterViewInit, HasDisabled {
   /// The format used to format dates.
   ///
   /// Defaults to `yMMMd`, e.g. 'Jan 23, 2015'.
diff --git a/lib/material_datepicker/material_time_picker.dart b/lib/material_datepicker/material_time_picker.dart
@@ -8,6 +8,7 @@ import 'dart:html';
 import 'package:angular/angular.dart';
 import 'package:intl/intl.dart';
 import 'package:quiver/time.dart';
+import 'package:angular_components/interfaces/has_disabled.dart';
 import 'package:angular_components/material_datepicker/module.dart';
 import 'package:angular_components/material_input/material_input.dart';
 import 'package:angular_components/material_select/material_dropdown_select.dart';
@@ -26,11 +27,14 @@ import 'package:angular_components/utils/disposer/disposer.dart';
     materialInputDirectives,
     NgStyle,
   ],
+  providers: const [
+    const Provider(HasDisabled, useExisting: MaterialTimePickerComponent),
+  ],
   templateUrl: 'material_time_picker.html',
   styleUrls: const ['material_time_picker.scss.css'],
 )
 class MaterialTimePickerComponent extends KeyboardHandlerMixin
-    implements OnInit, OnDestroy {
+    implements HasDisabled, OnInit, OnDestroy {
   static DateTime _utcTime(int hour, [int minute = 0]) => new DateTime.utc(
       _unixEpoch.year, _unixEpoch.month, _unixEpoch.day, hour, minute);
 
diff --git a/lib/material_expansionpanel/material_expansionpanel.dart b/lib/material_expansionpanel/material_expansionpanel.dart
@@ -9,6 +9,7 @@ import 'package:angular/angular.dart';
 import 'package:intl/intl.dart';
 import 'package:angular_components/button_decorator/button_decorator.dart';
 import 'package:angular_components/content/deferred_content_aware.dart';
+import 'package:angular_components/interfaces/has_disabled.dart';
 import 'package:angular_components/focus/focus.dart';
 import 'package:angular_components/material_icon/material_icon.dart';
 import 'package:angular_components/material_yes_no_buttons/material_yes_no_buttons.dart';
@@ -112,15 +113,16 @@ import 'package:angular_components/utils/disposer/disposer.dart';
     KeyUpBoundaryDirective
   ],
   providers: const [
-    const Provider(DeferredContentAware, useExisting: MaterialExpansionPanel)
+    const Provider(DeferredContentAware, useExisting: MaterialExpansionPanel),
+    const Provider(HasDisabled, useExisting: MaterialExpansionPanel),
   ],
   templateUrl: 'material_expansionpanel.html',
   styleUrls: const ['material_expansionpanel.scss.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
   visibility: Visibility.all, // injected
 )
 class MaterialExpansionPanel
-    implements DeferredContentAware, OnInit, OnDestroy {
+    implements DeferredContentAware, HasDisabled, OnInit, OnDestroy {
   final NgZone _ngZone;
   final ChangeDetectorRef _changeDetector;
   final DomService _domService;
diff --git a/lib/material_input/base_material_input.dart b/lib/material_input/base_material_input.dart
@@ -9,6 +9,7 @@ import 'package:angular/angular.dart';
 import 'package:angular_forms/angular_forms.dart';
 import 'package:intl/intl.dart';
 import 'package:quiver/strings.dart' show isEmpty, isNotEmpty;
+import 'package:angular_components/interfaces/has_disabled.dart';
 import 'package:angular_components/focus/focus.dart';
 import 'package:angular_components/forms/error_renderer.dart' show ErrorFn;
 import 'package:angular_components/mixins/focusable_mixin.dart';
@@ -33,7 +34,7 @@ enum BottomPanelState {
 
 /// Base class for behavior that is shared between material input components.
 class BaseMaterialInput extends FocusableMixin
-    implements Focusable, AfterViewInit, OnDestroy {
+    implements HasDisabled, Focusable, AfterViewInit, OnDestroy {
   final ChangeDetectorRef _changeDetector;
   final _disposer = new Disposer.oneShot();
 
diff --git a/lib/material_input/material_auto_suggest_input.dart b/lib/material_input/material_auto_suggest_input.dart
@@ -13,6 +13,7 @@ import 'package:angular_components/dynamic_component/dynamic_component.dart';
 import 'package:angular_components/focus/focus.dart';
 import 'package:angular_components/focus/focus_trap.dart';
 import 'package:angular_components/focus/keyboard_only_focus_indicator.dart';
+import 'package:angular_components/interfaces/has_disabled.dart';
 import 'package:angular_components/laminate/enums/alignment.dart';
 import 'package:angular_components/laminate/popup/popup.dart';
 import 'package:angular_components/material_icon/material_icon.dart';
@@ -120,6 +121,7 @@ typedef String _InputChangeCallback(String inputText);
 @Component(
   selector: 'material-auto-suggest-input',
   providers: const [
+    const Provider(HasDisabled, useExisting: MaterialAutoSuggestInputComponent),
     const Provider(HasRenderer, useExisting: MaterialAutoSuggestInputComponent),
     const Provider(SelectionContainer,
         useExisting: MaterialAutoSuggestInputComponent),
diff --git a/lib/material_input/material_input.dart b/lib/material_input/material_input.dart
@@ -6,6 +6,7 @@ import 'package:angular/angular.dart';
 import 'package:angular_forms/angular_forms.dart';
 import 'package:quiver/strings.dart' show isNotEmpty;
 import 'package:angular_components/focus/focus.dart';
+import 'package:angular_components/interfaces/has_disabled.dart';
 import 'package:angular_components/material_icon/material_icon.dart';
 import 'package:angular_components/utils/angular/properties/properties.dart';
 import 'package:angular_components/utils/angular/reference/reference.dart';
@@ -141,6 +142,7 @@ const String materialInputErrorKey = 'material-input-error';
     const Provider(NG_VALIDATORS, useExisting: DeferredValidator, multi: true),
     const Provider(ReferenceDirective, useExisting: MaterialInputComponent),
     const Provider(Focusable, useExisting: MaterialInputComponent),
+    const Provider(HasDisabled, useExisting: MaterialInputComponent),
     const Provider(BaseMaterialInput, useExisting: MaterialInputComponent)
   ],
   templateUrl: 'material_input.html',
diff --git a/lib/material_input/material_input_multiline.dart b/lib/material_input/material_input_multiline.dart
@@ -7,6 +7,7 @@ import 'dart:html';
 import 'package:angular/angular.dart';
 import 'package:angular_forms/angular_forms.dart';
 import 'package:angular_components/focus/focus.dart';
+import 'package:angular_components/interfaces/has_disabled.dart';
 import 'package:angular_components/utils/angular/properties/properties.dart';
 import 'package:angular_components/utils/angular/reference/reference.dart';
 import 'package:angular_components/utils/browser/dom_service/angular_2.dart';
@@ -82,6 +83,7 @@ export 'base_material_input.dart' show ValidityCheck, CharacterCounter;
   changeDetection: ChangeDetectionStrategy.OnPush,
   providers: const [
     DeferredValidator,
+    const Provider(HasDisabled, useExisting: MaterialMultilineInputComponent),
     const Provider(NG_VALIDATORS, useExisting: DeferredValidator, multi: true),
     const Provider(ReferenceDirective,
         useExisting: MaterialMultilineInputComponent),
diff --git a/lib/material_list/material_list_item.dart b/lib/material_list/material_list_item.dart
@@ -6,6 +6,7 @@ import 'dart:html' as dom;
 
 import 'package:angular/angular.dart';
 import 'package:angular_components/button_decorator/button_decorator.dart';
+import 'package:angular_components/interfaces/has_disabled.dart';
 import 'package:angular_components/mixins/material_dropdown_base.dart';
 import 'package:angular_components/model/a11y/active_item_mixin.dart';
 import 'package:angular_components/utils/browser/dom_service/dom_service.dart';
@@ -43,6 +44,9 @@ import 'package:angular_components/utils/disposer/disposer.dart';
 // TODO(google): should activate/deactivate on mouse hover
 @Component(
   selector: 'material-list-item',
+  providers: const [
+    const Provider(HasDisabled, useExisting: MaterialListItemComponent),
+  ],
   styleUrls: const ['material_list_item.scss.css'],
   template: '<ng-content></ng-content>',
   changeDetection: ChangeDetectionStrategy.OnPush,
diff --git a/lib/material_menu/dropdown_menu.dart b/lib/material_menu/dropdown_menu.dart
@@ -3,6 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:angular/angular.dart';
+import 'package:angular_components/interfaces/has_disabled.dart';
 import 'package:angular_components/focus/focus.dart';
 import 'package:angular_components/material_menu/menu_popup.dart';
 import 'package:angular_components/material_menu/menu_popup_wrapper.dart';
@@ -20,14 +21,17 @@ import 'package:angular_components/utils/disposer/disposer.dart';
     MenuPopupComponent,
     PopupSourceDirective
   ],
+  providers: const [
+    const Provider(HasDisabled, useExisting: DropdownMenuComponent),
+  ],
   templateUrl: 'dropdown_menu.html',
   changeDetection: ChangeDetectionStrategy.OnPush,
   // TODO(google): Change preserveWhitespace to false to improve codesize.
   preserveWhitespace: true,
 )
 class DropdownMenuComponent extends Object
     with FocusableMixin, MenuPopupWrapper
-    implements AfterViewInit, OnDestroy {
+    implements AfterViewInit, HasDisabled, OnDestroy {
   final _disposer = new Disposer.oneShot();
 
   DropdownMenuComponent(ChangeDetectorRef _changeDetector) {
diff --git a/lib/material_menu/material_menu.dart b/lib/material_menu/material_menu.dart
@@ -5,6 +5,7 @@
 import 'dart:async';
 
 import 'package:angular/angular.dart';
+import 'package:angular_components/interfaces/has_disabled.dart';
 import 'package:angular_components/focus/focus.dart';
 import 'package:angular_components/material_button/material_button.dart';
 import 'package:angular_components/material_icon/material_icon.dart';
@@ -37,11 +38,14 @@ import 'package:angular_components/utils/disposer/disposer.dart';
       NgIf,
       PopupSourceDirective
     ],
+    providers: const [
+      const Provider(HasDisabled, useExisting: MaterialMenuComponent),
+    ],
     templateUrl: 'material_menu.html',
     changeDetection: ChangeDetectionStrategy.OnPush)
 class MaterialMenuComponent extends Object
     with FocusableMixin, MenuPopupWrapper
-    implements AfterViewInit, OnDestroy {
+    implements AfterViewInit, HasDisabled, OnDestroy {
   final _onTrigger = new StreamController<Null>();
   final _disposer = new Disposer.oneShot();
 
diff --git a/lib/material_menu/menu_item_affix_list.dart b/lib/material_menu/menu_item_affix_list.dart
@@ -8,6 +8,7 @@ import 'dart:html';
 import 'package:angular/angular.dart';
 import 'package:observable/observable.dart';
 import 'package:angular_components/button_decorator/button_decorator.dart';
+import 'package:angular_components/interfaces/has_disabled.dart';
 import 'package:angular_components/material_icon/material_icon.dart';
 import 'package:angular_components/material_menu/menu_root.dart';
 import 'package:angular_components/model/menu/menu_item_affix.dart';
@@ -26,12 +27,15 @@ import 'package:angular_components/model/ui/icon.dart';
     NgFor,
     NgIf,
   ],
+  providers: const [
+    const Provider(HasDisabled, useExisting: MenuItemAffixListComponent),
+  ],
   templateUrl: 'menu_item_affix_list.html',
   styleUrls: const ['menu_item_affix_list.scss.css'],
   // TODO(google): Change preserveWhitespace to false to improve codesize.
   preserveWhitespace: true,
 )
-class MenuItemAffixListComponent implements OnDestroy {
+class MenuItemAffixListComponent implements HasDisabled, OnDestroy {
   final ChangeDetectorRef _cdRef;
 
   StreamSubscription _itemChangeStreamSub;
@@ -52,6 +56,8 @@ class MenuItemAffixListComponent implements OnDestroy {
     _disabled = disabled;
   }
 
+  bool get disabled => _disabled;
+
   /// Observable list of affix items.
   @Input()
   set items(ObservableList<MenuItemAffix> items) {
diff --git a/lib/material_radio/material_radio.dart b/lib/material_radio/material_radio.dart
@@ -8,6 +8,7 @@ import 'dart:html';
 import 'package:angular/angular.dart';
 import 'package:angular_forms/angular_forms.dart';
 import 'package:meta/meta.dart';
+import 'package:angular_components/interfaces/has_disabled.dart';
 import 'package:angular_components/focus/focus.dart';
 import 'package:angular_components/material_icon/material_icon.dart';
 import 'package:angular_components/material_radio/material_radio_group.dart';
@@ -32,11 +33,18 @@ const Icon checkedIcon = const Icon('radio_button_checked');
 @Component(
     selector: 'material-radio',
     directives: const [MaterialIconComponent, MaterialRippleComponent, NgIf],
+    providers: const [
+      const Provider(HasDisabled, useExisting: MaterialRadioComponent),
+    ],
     templateUrl: 'material_radio.html',
     styleUrls: const ['material_radio.scss.css'],
     changeDetection: ChangeDetectionStrategy.OnPush)
 class MaterialRadioComponent extends RootFocusable
-    implements ControlValueAccessor<bool>, FocusableItem, OnDestroy {
+    implements
+        ControlValueAccessor<bool>,
+        HasDisabled,
+        FocusableItem,
+        OnDestroy {
   final ChangeDetectorRef _changeDetector;
   final MaterialRadioGroupComponent _group;
   final HtmlElement _root;
diff --git a/lib/material_select/dropdown_button.dart b/lib/material_select/dropdown_button.dart
diff --git a/lib/material_select/material_dropdown_select.dart b/lib/material_select/material_dropdown_select.dart
diff --git a/lib/material_select/material_select.dart b/lib/material_select/material_select.dart
diff --git a/lib/material_select/material_select_item.dart b/lib/material_select/material_select_item.dart
diff --git a/lib/material_toggle/material_toggle.dart b/lib/material_toggle/material_toggle.dart
diff --git a/lib/material_yes_no_buttons/material_yes_no_buttons.dart b/lib/material_yes_no_buttons/material_yes_no_buttons.dart
diff --git a/lib/mixins/button_wrapper.dart b/lib/mixins/button_wrapper.dart
