refactor(material-experimental/mdc-radio): remove adapter usage (#24925)

Removes the dependency on the MDC radio adapter from the radio button component.
angular · May 16, 2022 · 2c11c0d · 2c11c0d
1 parent 5d578ef
commit 2c11c0d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 43 deletions.
diff --git a/src/material-experimental/mdc-radio/radio.html b/src/material-experimental/mdc-radio/radio.html
@@ -1,6 +1,6 @@
 <div class="mdc-form-field" #formField
      [class.mdc-form-field--align-end]="labelPosition == 'before'">
-  <div class="mdc-radio" [ngClass]="_classes">
+  <div class="mdc-radio" [class.mdc-radio--disabled]="disabled">
     <!-- Render this element first so the input is on top. -->
     <div class="mat-mdc-radio-touch-target" (click)="_onInputInteraction($event)"></div>
     <input #input class="mdc-radio__native-control" type="radio"

diff --git a/src/material-experimental/mdc-radio/radio.ts b/src/material-experimental/mdc-radio/radio.ts
@@ -7,7 +7,6 @@
  */
 
 import {
-  AfterViewInit,
   Attribute,
   ChangeDetectionStrategy,
   ChangeDetectorRef,
@@ -18,12 +17,10 @@ import {
   forwardRef,
   Inject,
   InjectionToken,
-  OnDestroy,
   Optional,
   QueryList,
   ViewEncapsulation,
 } from '@angular/core';
-import {MDCRadioAdapter, MDCRadioFoundation} from '@material/radio';
 import {
   MAT_RADIO_DEFAULT_OPTIONS,
   _MatRadioButtonBase,
@@ -107,21 +104,7 @@ export class MatRadioGroup extends _MatRadioGroupBase<MatRadioButton> {
   encapsulation: ViewEncapsulation.None,
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class MatRadioButton extends _MatRadioButtonBase implements AfterViewInit, OnDestroy {
-  private _radioAdapter: MDCRadioAdapter = {
-    addClass: (className: string) => this._setClass(className, true),
-    removeClass: (className: string) => this._setClass(className, false),
-    setNativeControlDisabled: (disabled: boolean) => {
-      if (this.disabled !== disabled) {
-        this.disabled = disabled;
-        this._changeDetector.markForCheck();
-      }
-    },
-  };
-
-  _radioFoundation = new MDCRadioFoundation(this._radioAdapter);
-  _classes: {[key: string]: boolean} = {};
-
+export class MatRadioButton extends _MatRadioButtonBase {
   constructor(
     @Optional() @Inject(MAT_RADIO_GROUP) radioGroup: MatRadioGroup,
     elementRef: ElementRef,
@@ -145,28 +128,4 @@ export class MatRadioButton extends _MatRadioButtonBase implements AfterViewInit
       tabIndex,
     );
   }
-
-  override ngAfterViewInit() {
-    super.ngAfterViewInit();
-    this._radioFoundation.init();
-  }
-
-  override ngOnDestroy() {
-    super.ngOnDestroy();
-    this._radioFoundation.destroy();
-  }
-
-  private _setClass(cssClass: string, active: boolean) {
-    this._classes = {...this._classes, [cssClass]: active};
-    this._changeDetector.markForCheck();
-  }
-
-  /**
-   * Overrides the parent function so that the foundation can be set with the current
-   * disabled state.
-   */
-  protected override _setDisabled(value: boolean) {
-    super._setDisabled(value);
-    this._radioFoundation.setDisabled(this.disabled);
-  }
 }