Combobox listbox refactor

src/cdk-experimental/combobox/combobox-panel.ts

@@ -20,7 +20,7 @@ import {Subject} from 'rxjs';
 })
 export class CdkComboboxPanel<T = unknown> {
 
-  valueUpdated: Subject<T> = new Subject<T>();
+  valueUpdated: Subject<T | T[]> = new Subject<T | T[]>();
   contentIdUpdated: Subject<string> = new Subject<string>();
   contentTypeUpdated: Subject<AriaHasPopupValue> = new Subject<AriaHasPopupValue>();
 
@@ -32,7 +32,7 @@ export class CdkComboboxPanel<T = unknown> {
   ) {}
 
   /** Tells the parent combobox to close the panel and sends back the content value. */
-  closePanel(data?: T) {
+  closePanel(data?: T | T[]) {
     this.valueUpdated.next(data);
   }
 
@@ -44,6 +44,11 @@ export class CdkComboboxPanel<T = unknown> {
 
   /** Registers the content's id and the content type with the panel. */
   _registerContent(contentId: string, contentType: AriaHasPopupValue) {
+    // If content has already been registered, no further contentIds are registered.
+    if (this.contentType && this.contentType !== contentType) {
+      return;
+    }
+
     this.contentId = contentId;
     if (contentType !== 'listbox' && contentType !== 'dialog') {
       throw Error('CdkComboboxPanel currently only supports listbox or dialog content.');

src/cdk-experimental/combobox/combobox-popup.ts

@@ -6,7 +6,14 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Directive, Inject, InjectionToken, Input, OnInit, Optional} from '@angular/core';
+import {
+  Directive,
+  ElementRef,
+  Inject,
+  InjectionToken,
+  Input,
+  OnInit,
+  Optional} from '@angular/core';
 import {AriaHasPopupValue, CdkComboboxPanel} from './combobox-panel';
 
 export const PANEL = new InjectionToken<CdkComboboxPanel>('CdkComboboxPanel');
@@ -20,7 +27,8 @@ let nextId = 0;
     'class': 'cdk-combobox-popup',
     '[attr.role]': 'role',
     '[id]': 'id',
-    'tabindex': '-1'
+    'tabindex': '-1',
+    '(focus)': 'focusFirstElement()'
   }
 })
 export class CdkComboboxPopup<T = unknown> implements OnInit {
@@ -33,11 +41,21 @@ export class CdkComboboxPopup<T = unknown> implements OnInit {
   }
   private _role: AriaHasPopupValue = 'dialog';
 
+  @Input()
+  get firstFocus(): HTMLElement {
+    return this._firstFocusElement;
+  }
+  set firstFocus(id: HTMLElement) {
+    this._firstFocusElement = id;
+  }
+  private _firstFocusElement: HTMLElement;
+
   @Input() id = `cdk-combobox-popup-${nextId++}`;
 
   @Input('parentPanel') private readonly _explicitPanel: CdkComboboxPanel;
 
   constructor(
+    private readonly _elementRef: ElementRef<HTMLElement>,
     @Optional() @Inject(PANEL) readonly _parentPanel?: CdkComboboxPanel<T>,
   ) { }
 
@@ -52,4 +70,12 @@ export class CdkComboboxPopup<T = unknown> implements OnInit {
       this._parentPanel._registerContent(this.id, this._role);
     }
   }
+
+  focusFirstElement() {
+    if (this._firstFocusElement) {
+      this._firstFocusElement.focus();
+    } else {
+      this._elementRef.nativeElement.focus();
+    }
+  }
 }

src/cdk-experimental/combobox/combobox.ts

@@ -6,6 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+
 export type OpenAction = 'focus' | 'click' | 'downKey' | 'toggle';
 export type OpenActionInput = OpenAction | OpenAction[] | string | null | undefined;
 
@@ -30,7 +31,7 @@ import {
 } from '@angular/cdk/overlay';
 import {Directionality} from '@angular/cdk/bidi';
 import {BooleanInput, coerceBooleanProperty, coerceArray} from '@angular/cdk/coercion';
-import {DOWN_ARROW, ESCAPE} from '@angular/cdk/keycodes';
+import {DOWN_ARROW, ENTER, ESCAPE, TAB} from '@angular/cdk/keycodes';
 
 const allowedOpenActions = ['focus', 'click', 'downKey', 'toggle'];
 
@@ -58,7 +59,7 @@ export class CdkCombobox<T = unknown> implements OnDestroy, AfterContentInit {
   private _panel: CdkComboboxPanel<T> | undefined;
 
   @Input()
-  value: T;
+  value: T | T[];
 
   @Input()
   get disabled(): boolean { return this._disabled; }
@@ -74,9 +75,16 @@ export class CdkCombobox<T = unknown> implements OnDestroy, AfterContentInit {
   }
   private _openActions: OpenAction[] = ['click'];
 
+  /** Whether the textContent is automatically updated upon change of the combobox value. */
+  @Input()
+  get autoSetText(): boolean { return this._autoSetText; }
+  set autoSetText(value: boolean) { this._autoSetText = coerceBooleanProperty(value); }
+  private _autoSetText: boolean = true;
+
   @Output('comboboxPanelOpened') readonly opened: EventEmitter<void> = new EventEmitter<void>();
   @Output('comboboxPanelClosed') readonly closed: EventEmitter<void> = new EventEmitter<void>();
-  @Output('panelValueChanged') readonly panelValueChanged: EventEmitter<T> = new EventEmitter<T>();
+  @Output('panelValueChanged') readonly panelValueChanged: EventEmitter<T[]>
+      = new EventEmitter<T[]>();
 
   private _overlayRef: OverlayRef;
   private _panelContent: TemplatePortal;
@@ -114,14 +122,28 @@ export class CdkCombobox<T = unknown> implements OnDestroy, AfterContentInit {
   _keydown(event: KeyboardEvent) {
     const {keyCode} = event;
 
-    if (keyCode === DOWN_ARROW && this._openActions.indexOf('downKey') !== -1) {
-      this.open();
+    if (keyCode === DOWN_ARROW) {
+      if (this.isOpen()) {
+        this._panel?.focusContent();
+      } else if (this._openActions.indexOf('downKey') !== -1) {
+        this.open();
+      }
+    } else if (keyCode === ENTER) {
+      if (this._openActions.indexOf('toggle') !== -1) {
+        this.toggle();
+      } else if (this._openActions.indexOf('click') !== -1) {
+        this.open();
+      }
+
     } else if (keyCode === ESCAPE) {
       event.preventDefault();
       this.close();
+    } else if (keyCode === TAB) {
+      this.close();
     }
   }
 
+  /** Handles click or focus interactions. */
   _handleInteractions(interaction: OpenAction) {
     if (interaction === 'click') {
       if (this._openActions.indexOf('toggle') !== -1) {
@@ -136,6 +158,7 @@ export class CdkCombobox<T = unknown> implements OnDestroy, AfterContentInit {
     }
   }
 
+  /** Given a click in the document, determines if the click was inside a combobox. */
   _attemptClose(event: MouseEvent) {
     if (this.isOpen()) {
       let target = event.composedPath ? event.composedPath()[0] : event.target;
@@ -163,7 +186,9 @@ export class CdkCombobox<T = unknown> implements OnDestroy, AfterContentInit {
       this.opened.next();
       this._overlayRef = this._overlayRef || this._overlay.create(this._getOverlayConfig());
       this._overlayRef.attach(this._getPanelContent());
-      this._panel?.focusContent();
+      if (!this._isTextTrigger()) {
+        this._panel?.focusContent();
+      }
     }
   }
 
@@ -189,22 +214,30 @@ export class CdkCombobox<T = unknown> implements OnDestroy, AfterContentInit {
     return this.disabled ? null : '0';
   }
 
-  private _setComboboxValue(value: T) {
+  private _setComboboxValue(value: T | T[]) {
 
     const valueChanged = (this.value !== value);
     this.value = value;
 
     if (valueChanged) {
-      this.panelValueChanged.emit(value);
-      this._setTextContent(value);
+      this.panelValueChanged.emit(coerceArray(value));
+      if (this._autoSetText) {
+        this._setTextContent(value);
+      }
     }
   }
 
-  private _setTextContent(content: T) {
+  private _setTextContent(content: T | T[]) {
     const contentArray = coerceArray(content);
     this._elementRef.nativeElement.textContent = contentArray.join(' ');
   }
 
+  private _isTextTrigger() {
+    // TODO: Should check if the trigger is contenteditable.
+    const tagName = this._elementRef.nativeElement.tagName.toLowerCase();
+    return tagName === 'input' || tagName === 'textarea' ? true : false;
+  }
+
   private _getOverlayConfig() {
     return new OverlayConfig({
       positionStrategy: this._getOverlayPositionStrategy(),
@@ -247,5 +280,6 @@ export class CdkCombobox<T = unknown> implements OnDestroy, AfterContentInit {
   }
 
   static ngAcceptInputType_openActions: OpenActionInput;
+  static ngAcceptInputType_autoSetText: OpenActionInput;
   static ngAcceptInputType_disabled: BooleanInput;
 }

src/cdk-experimental/listbox/listbox.spec.ts

@@ -16,7 +16,7 @@ import {
 } from '@angular/cdk/testing/private';
 import {A, DOWN_ARROW, END, HOME, SPACE} from '@angular/cdk/keycodes';
 import {FormControl, FormsModule, ReactiveFormsModule} from '@angular/forms';
-import {CdkCombobox, CdkComboboxModule} from '@angular/cdk-experimental/combobox';
+import {CdkCombobox, CdkComboboxModule, CdkComboboxPanel} from '@angular/cdk-experimental/combobox';
 
 
 describe('CdkOption and CdkListbox', () => {
@@ -853,7 +853,7 @@ describe('CdkOption and CdkListbox', () => {
       expect(comboboxInstance.value).toBe('solar');
     });
 
-    it('should not update combobox if listbox is in multiple mode', () => {
+    it('should not close panel if listbox is in multiple mode', () => {
       expect(comboboxInstance.value).toBeUndefined();
       expect(comboboxInstance.isOpen()).toBeFalse();
 
@@ -875,10 +875,11 @@ describe('CdkOption and CdkListbox', () => {
 
       listboxInstance.setActiveOption(optionInstances[1]);
       dispatchKeyboardEvent(listboxElement, 'keydown', SPACE);
+      testComponent.panel.closePanel(testComponent.listbox.getSelectedValues());
       fixture.detectChanges();
 
-      expect(comboboxInstance.isOpen()).toBeTrue();
-      expect(comboboxInstance.value).toBeUndefined();
+      expect(comboboxInstance.isOpen()).toBeFalse();
+      expect(comboboxInstance.value).toEqual(['solar']);
     });
   });
 });
@@ -1009,6 +1010,7 @@ class ListboxInsideCombobox {
   isDisabled: boolean = false;
   isMultiselectable: boolean = false;
   @ViewChild(CdkListbox) listbox: CdkListbox<string>;
+  @ViewChild('panel') panel: CdkComboboxPanel<string>;
 
   onSelectionChange(event: ListboxSelectionChangeEvent<string>) {
     this.changedOption = event.option;