diff --git a/src/cdk-experimental/selection/selection-column.ts b/src/cdk-experimental/selection/selection-column.ts index 7d97c7f35aa7..ff90c6e969d0 100644 --- a/src/cdk-experimental/selection/selection-column.ts +++ b/src/cdk-experimental/selection/selection-column.ts @@ -32,12 +32,14 @@ import {CdkSelection} from './selection'; template: ` - + @if (selection.multiple) { + + } - + @if (selection.multiple) { + + } - - - - + @if (_hasLeadingGraphic()) { + + + + + - + } @@ -29,10 +31,10 @@ - - - +@if (_hasTrailingIcon()) { + + + +} {{ariaDescription}} diff --git a/src/material/chips/chip-row.html b/src/material/chips/chip-row.html index 63157ab2919d..1479c3af7f37 100644 --- a/src/material/chips/chip-row.html +++ b/src/material/chips/chip-row.html @@ -1,6 +1,6 @@ - +@if (!_isEditing) { - +} - - - - - + @if (leadingIcon) { + + + + } - - - - + + @if (_isEditing) { + @if (contentEditInput) { + + } @else { + + } + } @else { + + } - - - +@if (_hasTrailingIcon()) { + + + +} {{ariaDescription}} diff --git a/src/material/chips/chip.html b/src/material/chips/chip.html index 9a4bcfe41d0d..cc541c48505a 100644 --- a/src/material/chips/chip.html +++ b/src/material/chips/chip.html @@ -2,9 +2,11 @@ - - - + @if (leadingIcon) { + + + + } @@ -12,8 +14,8 @@ - - - +@if (_hasTrailingIcon()) { + + + +} diff --git a/src/material/chips/module.ts b/src/material/chips/module.ts index 81926f58f27a..eed0a41d76ef 100644 --- a/src/material/chips/module.ts +++ b/src/material/chips/module.ts @@ -7,7 +7,6 @@ */ import {ENTER} from '@angular/cdk/keycodes'; -import {CommonModule} from '@angular/common'; import {NgModule} from '@angular/core'; import {ErrorStateMatcher, MatCommonModule, MatRippleModule} from '@angular/material/core'; import {MatChip} from './chip'; @@ -37,7 +36,7 @@ const CHIP_DECLARATIONS = [ ]; @NgModule({ - imports: [MatCommonModule, CommonModule, MatRippleModule], + imports: [MatCommonModule, MatRippleModule], exports: [MatCommonModule, CHIP_DECLARATIONS], declarations: [MatChipAction, CHIP_DECLARATIONS], providers: [ diff --git a/src/material/core/BUILD.bazel b/src/material/core/BUILD.bazel index c7c979fa913d..77a688c256a8 100644 --- a/src/material/core/BUILD.bazel +++ b/src/material/core/BUILD.bazel @@ -33,7 +33,6 @@ ng_module( "//src/cdk/keycodes", "//src/cdk/platform", "@npm//@angular/animations", - "@npm//@angular/common", "@npm//@angular/core", "@npm//@angular/forms", "@npm//@angular/platform-browser", diff --git a/src/material/core/option/index.ts b/src/material/core/option/index.ts index 96da5f1c97fc..4a129c844a09 100644 --- a/src/material/core/option/index.ts +++ b/src/material/core/option/index.ts @@ -7,7 +7,6 @@ */ import {NgModule} from '@angular/core'; -import {CommonModule} from '@angular/common'; import {MatRippleModule} from '../ripple/index'; import {MatPseudoCheckboxModule} from '../selection/index'; import {MatCommonModule} from '../common-behaviors/common-module'; @@ -15,7 +14,7 @@ import {MatOption} from './option'; import {MatOptgroup} from './optgroup'; @NgModule({ - imports: [MatRippleModule, CommonModule, MatCommonModule, MatPseudoCheckboxModule], + imports: [MatRippleModule, MatCommonModule, MatPseudoCheckboxModule], exports: [MatOption, MatOptgroup], declarations: [MatOption, MatOptgroup], }) diff --git a/src/material/core/option/option.html b/src/material/core/option/option.html index 830bed348864..23f5d9f54944 100644 --- a/src/material/core/option/option.html +++ b/src/material/core/option/option.html @@ -2,20 +2,32 @@ be contributing to issue where sometimes VoiceOver focuses on a TextNode in the a11y tree instead of the Option node (#23202). Most assistive technology will generally ignore non-role, non-text-content elements. Adding aria-hidden seems to make VoiceOver behave more consistently. --> - +@if (multiple) { + +} - +@if (!multiple && selected && !hideSingleSelectionIndicator) { + +} -({{ group.label }}) +@if (group && group._inert) { + ({{ group.label }}) +}