From 9f426455d9f03ea6653d261fcb70e77aa22cce8d Mon Sep 17 00:00:00 2001 From: andrewseguin Date: Fri, 17 Jul 2020 06:50:26 -0700 Subject: [PATCH 1/3] fix(material-experimental/chips): fix empty check when no chips --- src/material-experimental/mdc-chips/chip-grid.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/material-experimental/mdc-chips/chip-grid.ts b/src/material-experimental/mdc-chips/chip-grid.ts index 088c1f67443f..e74f1da5d2d4 100644 --- a/src/material-experimental/mdc-chips/chip-grid.ts +++ b/src/material-experimental/mdc-chips/chip-grid.ts @@ -154,7 +154,7 @@ export class MatChipGrid extends _MatChipGridMixinBase implements AfterContentIn * Implemented as part of MatFormFieldControl. * @docs-private */ - get empty(): boolean { return this._chipInput.empty && this._chips.length === 0; } + get empty(): boolean { return this._chipInput.empty && (!this._chips || this._chips.length === 0); } /** The ARIA role applied to the chip grid. */ get role(): string | null { return this.empty ? null : 'grid'; } From 74277c718e22b61dbab48159b78b8e851f86d99d Mon Sep 17 00:00:00 2001 From: andrewseguin Date: Fri, 17 Jul 2020 07:20:18 -0700 Subject: [PATCH 2/3] same for chipset --- src/material-experimental/mdc-chips/chip-set.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/material-experimental/mdc-chips/chip-set.ts b/src/material-experimental/mdc-chips/chip-set.ts index 970bad6f24f6..8436fedad638 100644 --- a/src/material-experimental/mdc-chips/chip-set.ts +++ b/src/material-experimental/mdc-chips/chip-set.ts @@ -193,7 +193,7 @@ export class MatChipSet extends _MatChipSetMixinBase implements AfterContentInit /** Checks whether any of the chips is focused. */ protected _hasFocusedChip() { - return this._chips.some(chip => chip._hasFocus); + return this._chips && this._chips.some(chip => chip._hasFocus); } /** Syncs the chip-set's state with the individual chips. */ From e1d717919e29baf0b7897ff86ce4d7ac30acd1b6 Mon Sep 17 00:00:00 2001 From: andrewseguin Date: Fri, 17 Jul 2020 10:32:55 -0700 Subject: [PATCH 3/3] check for input too --- src/material-experimental/mdc-chips/chip-grid.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/material-experimental/mdc-chips/chip-grid.ts b/src/material-experimental/mdc-chips/chip-grid.ts index e74f1da5d2d4..1c73dfa7dae7 100644 --- a/src/material-experimental/mdc-chips/chip-grid.ts +++ b/src/material-experimental/mdc-chips/chip-grid.ts @@ -154,7 +154,10 @@ export class MatChipGrid extends _MatChipGridMixinBase implements AfterContentIn * Implemented as part of MatFormFieldControl. * @docs-private */ - get empty(): boolean { return this._chipInput.empty && (!this._chips || this._chips.length === 0); } + get empty(): boolean { + return (!this._chipInput || this._chipInput.empty) && + (!this._chips || this._chips.length === 0); + } /** The ARIA role applied to the chip grid. */ get role(): string | null { return this.empty ? null : 'grid'; }