nit(combobox): changed class names and parameter types.

angular · Aug 14, 2020 · ddff626 · ddff626
1 parent 065adf1
commit ddff626
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/src/cdk-experimental/combobox/combobox.spec.ts b/src/cdk-experimental/combobox/combobox.spec.ts
@@ -29,7 +29,7 @@ describe('Combobox', () => {
     let comboboxElement: HTMLElement;
 
     let dialog: DebugElement;
-    let dialogInstance: DialogContent<unknown>;
+    let dialogInstance: FakeDialogContent<unknown>;
     let dialogElement: HTMLElement;
 
     let applyButton: DebugElement;
@@ -38,7 +38,7 @@ describe('Combobox', () => {
     beforeEach(async(() => {
       TestBed.configureTestingModule({
         imports: [CdkComboboxModule],
-        declarations: [ComboboxToggle, DialogContent],
+        declarations: [ComboboxToggle, FakeDialogContent],
       }).compileComponents();
     }));
 
@@ -73,8 +73,8 @@ describe('Combobox', () => {
       dispatchMouseEvent(comboboxElement, 'click');
       fixture.detectChanges();
 
-      dialog = fixture.debugElement.query(By.directive(DialogContent));
-      dialogInstance = dialog.injector.get<DialogContent<unknown>>(DialogContent);
+      dialog = fixture.debugElement.query(By.directive(FakeDialogContent));
+      dialogInstance = dialog.injector.get<FakeDialogContent<unknown>>(FakeDialogContent);
 
       expect(comboboxElement.getAttribute('aria-owns')).toBe(dialogInstance.dialogId);
       expect(comboboxElement.getAttribute('aria-haspopup')).toBe('dialog');
@@ -106,7 +106,7 @@ describe('Combobox', () => {
 
       expect(comboboxInstance.isOpen()).toBeTrue();
 
-      dialog = fixture.debugElement.query(By.directive(DialogContent));
+      dialog = fixture.debugElement.query(By.directive(FakeDialogContent));
       dialogElement = dialog.nativeElement;
 
       expect(document.activeElement).toBe(dialogElement);
@@ -191,7 +191,7 @@ describe('Combobox', () => {
     beforeEach(async(() => {
       TestBed.configureTestingModule({
         imports: [CdkComboboxModule],
-        declarations: [ComboboxToggle, DialogContent],
+        declarations: [ComboboxToggle, FakeDialogContent],
       }).compileComponents();
     }));
 
@@ -262,7 +262,7 @@ describe('Combobox', () => {
     beforeEach(async(() => {
       TestBed.configureTestingModule({
         imports: [CdkComboboxModule],
-        declarations: [ComboboxToggle, DialogContent],
+        declarations: [ComboboxToggle, FakeDialogContent],
       }).compileComponents();
     }));
 
@@ -405,7 +405,7 @@ let id = 0;
     'tabIndex': '-1'
   }
 })
-export class DialogContent<V> implements OnInit {
+export class FakeDialogContent<V> implements OnInit {
 
   dialogId = `dialog-${id++}`;
   role = 'dialog';

diff --git a/src/cdk-experimental/combobox/combobox.ts b/src/cdk-experimental/combobox/combobox.ts
@@ -43,7 +43,7 @@ const allowedOpenActions = ['focus', 'click', 'downKey', 'toggle'];
     'class': 'cdk-combobox',
     '(click)': '_handleInteractions("click")',
     '(focus)': '_handleInteractions("focus")',
-    '(keydown)': 'keydown($event)',
+    '(keydown)': '_keydown($event)',
     '(document:click)': '_attemptClose($event)',
     '[attr.aria-disabled]': 'disabled',
     '[attr.aria-owns]': 'contentId',
@@ -112,7 +112,7 @@ export class CdkCombobox<T = unknown> implements OnDestroy, AfterContentInit {
     this.panelValueChanged.complete();
   }
 
-  keydown(event: KeyboardEvent) {
+  _keydown(event: KeyboardEvent) {
     const {keyCode} = event;
 
     if (keyCode === DOWN_ARROW && this._openActions.indexOf('downKey') !== -1) {
@@ -123,7 +123,7 @@ export class CdkCombobox<T = unknown> implements OnDestroy, AfterContentInit {
     }
   }
 
-  _handleInteractions(interaction: string) {
+  _handleInteractions(interaction: OpenAction) {
     if (interaction === 'click') {
       if (this._openActions.indexOf('toggle') !== -1) {
         this.toggle();