fix(checkbox): add type annotations to CheckboxAdapter methods

Added type annotations to CheckboxAdapter methods to satisfy bazel errors.

Author: ngwattcos

src/material-experimental/mdc-checkbox/checkbox.ts

@@ -59,33 +59,12 @@ const RIPPLE_ANIMATION_CONFIG: RippleAnimationConfig = {
 
 /** Singleton check box adapter. */
 class CheckBoxAdapter implements MDCCheckboxAdapter {
+  constructor(private readonly _delegate: MatCheckbox) {}
 
-  private static _adapter: CheckBoxAdapter;
-
-  private _delegate: MatCheckbox;
-
-  private constructor(delegate: MatCheckbox) {
-    this._delegate = delegate;
-  }
-
-  useDelegate(delegate: MatCheckbox) {
-    if (!this._delegate) {
-      CheckBoxAdapter._adapter = new CheckBoxAdapter(delegate);
-    } else {
-      this._delegate = delegate;
-    }
-
-    return CheckBoxAdapter.getAdapter();
-  }
-
-  static getAdapter() {
-    return CheckBoxAdapter._adapter;
-  }
-
-  addClass(className) {
+  addClass(className: string) {
     return this._delegate.setClass(className, true);
   }
-  removeClass(className) {
+  removeClass(className: string) {
     return this._delegate.setClass(className, false);
   }
   forceLayout() {
@@ -103,24 +82,21 @@ class CheckBoxAdapter implements MDCCheckboxAdapter {
   isIndeterminate() {
     return this._delegate.indeterminate;
   }
-  removeNativeControlAttr(attr)  {
+  removeNativeControlAttr(attr: string)  {
     if (!this._delegate.getAttrBlacklist().has(attr)) {
       this._delegate._nativeCheckbox.nativeElement.removeAttribute(attr);
     }
   }
-  setNativeControlAttr(attr, value)  {
+  setNativeControlAttr(attr: string, value: string)  {
     if (!this._delegate.getAttrBlacklist().has(attr)) {
       this._delegate._nativeCheckbox.nativeElement.setAttribute(attr, value);
     }
   }
-  setNativeControlDisabled(disabled) {
+  setNativeControlDisabled(disabled: boolean) {
     this._delegate.disabled = disabled;
   }
 }
 
-const _singletonCheckboxAdapter = CheckBoxAdapter.getAdapter();
-
-
 @Component({
   selector: 'mat-checkbox',
   templateUrl: 'checkbox.html',
@@ -273,6 +249,9 @@ export class MatCheckbox implements AfterViewInit, OnDestroy, ControlValueAccess
    */
   private _attrBlacklist = new Set(['aria-checked']);
 
+  /** The `MDCCheckboxAdapter` instance for this checkbox. */
+  private _adapter: CheckBoxAdapter;
+
   constructor(
       private _changeDetectorRef: ChangeDetectorRef,
       @Attribute('tabindex') tabIndex: string,
@@ -288,8 +267,8 @@ export class MatCheckbox implements AfterViewInit, OnDestroy, ControlValueAccess
     // Note: We don't need to set up the MDCFormFieldFoundation. Its only purpose is to manage the
     // ripple, which we do ourselves instead.
     this.tabIndex = parseInt(tabIndex) || 0;
-    this._checkboxFoundation = new MDCCheckboxFoundation(
-      _singletonCheckboxAdapter.useDelegate(this));
+    this._adapter = new CheckBoxAdapter(this);
+    this._checkboxFoundation = new MDCCheckboxFoundation(this._adapter);
 
     this._options = this._options || {};
 

src/material-experimental/mdc-radio/radio.ts

@@ -66,29 +66,7 @@ const RIPPLE_ANIMATION_CONFIG: RippleAnimationConfig = {
 };
 
 class RadioAdapter implements MDCRadioAdapter {
-
-  private static _adapter: RadioAdapter;
-
-  private _delegate: MatRadioButton;
-
-  private constructor(delegate: MatRadioButton) {
-    this._delegate = delegate;
-  }
-
-  useDelegate(delegate: MatRadioButton) {
-    if (!this._delegate) {
-      RadioAdapter._adapter = new RadioAdapter(delegate);
-    } else {
-      this._delegate = delegate;
-    }
-
-    return RadioAdapter.getAdapter();
-  }
-
-  static getAdapter() {
-    return RadioAdapter._adapter;
-  }
-
+  constructor(private readonly _delegate: MatRadioButton) {}
   addClass(className: string) {
     return this._delegate.setClass(className, true);
   }
@@ -103,7 +81,6 @@ class RadioAdapter implements MDCRadioAdapter {
   }
 }
 
-const _singletonRadioAdapter = RadioAdapter.getAdapter();
 
 /**
  * A group of radio buttons. May contain one or more `<mat-radio-button>` elements.
@@ -152,11 +129,12 @@ export class MatRadioGroup extends _MatRadioGroupBase<MatRadioButton> {
 })
 export class MatRadioButton extends _MatRadioButtonBase implements AfterViewInit, OnDestroy {
 
+  private _radioAdapter: MDCRadioAdapter;
 
   /** Configuration for the underlying ripple. */
   _rippleAnimation: RippleAnimationConfig = RIPPLE_ANIMATION_CONFIG;
 
-  _radioFoundation = new MDCRadioFoundation(_singletonRadioAdapter.useDelegate(this));
+  _radioFoundation: MDCRadioFoundation;
   _classes: {[key: string]: boolean} = {};
 
   constructor(@Optional() @Inject(MAT_RADIO_GROUP) radioGroup: MatRadioGroup,
@@ -169,6 +147,8 @@ export class MatRadioButton extends _MatRadioButtonBase implements AfterViewInit
               _providerOverride?: MatRadioDefaultOptions) {
     super(radioGroup, elementRef, _changeDetector, _focusMonitor,
         _radioDispatcher, _animationMode, _providerOverride);
+    this._radioAdapter = new RadioAdapter(this);
+    this._radioFoundation = new MDCRadioFoundation(this._radioAdapter);
   }
 
   ngAfterViewInit() {