Commit e3f886c

committed

refactor(material/select): account for popovers

Updates the select to account for the fact that when its overlay is rendered in a popover, the event bubbling order is different.

1 parent 5e39b48 commit e3f886cCopy full SHA for e3f886c

File tree

+14

-6

lines changed

+14

-6

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -316,7 +316,7 @@ export class MatSelect implements AfterContentInit, OnChanges, OnDestroy, OnInit`
`316`	`316`	`ngOnInit(): void;`
`317`	`317`	`_onBlur(): void;`
`318`	`318`	`_onChange: (value: any) => void;`
`319`		`- onContainerClick(): void;`
	`319`	`+ onContainerClick(event:MouseEvent): void;`
`320`	`320`	`// (undocumented)`
`321`	`321`	`_onFocus(): void;`
`322`	`322`	`_onTouched: () => void;`

Lines changed: 13 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,7 @@ import {`
`71`	`71`	`NgForm,`
`72`	`72`	`Validators,`
`73`	`73`	`} from '@angular/forms';`
	`74`	`+import {_getEventTarget} from '@angular/cdk/platform';`
`74`	`75`	`import {`
`75`	`76`	`_animationsDisabled,`
`76`	`77`	`_countGroupLabelsBeforeOption,`
`@@ -1461,20 +1462,27 @@ export class MatSelect`
`1461`	`1462`	`* @docs-private`
`1462`	`1463`	`*/`
`1463`	`1464`	`setDescribedByIds(ids: string[]) {`
	`1465`	`+ const element = this._elementRef.nativeElement;`
	`1466`	`+`
`1464`	`1467`	`if (ids.length) {`
`1465`		`- this._elementRef.nativeElement.setAttribute('aria-describedby', ids.join(' '));`
	`1468`	`+ element.setAttribute('aria-describedby', ids.join(' '));`
`1466`	`1469`	`} else {`
`1467`		`- this._elementRef.nativeElement.removeAttribute('aria-describedby');`
	`1470`	`+ element.removeAttribute('aria-describedby');`
`1468`	`1471`	`}`
`1469`	`1472`	`}`
`1470`	`1473`
`1471`	`1474`	`/**`
`1472`	`1475`	`* Implemented as part of MatFormFieldControl.`
`1473`	`1476`	`* @docs-private`
`1474`	`1477`	`*/`
`1475`		`- onContainerClick() {`
`1476`		`- this.focus();`
`1477`		`- this.open();`
	`1478`	`+ onContainerClick(event: MouseEvent) {`
	`1479`	`+ const target = _getEventTarget(event) as Node \| null;`
	`1480`	`+ const overlayHost = this._overlayDir.overlayRef?.hostElement;`
	`1481`	`+`
	`1482`	`+ if (!target \|\| !overlayHost \|\| !overlayHost.contains(target)) {`
	`1483`	`+ this.focus();`
	`1484`	`+ this.open();`
	`1485`	`+ }`
`1478`	`1486`	`}`
`1479`	`1487`
`1480`	`1488`	`/**`

Comments

(0)