Skip to content

Commit c2ab9e9

Browse files
mmalerbammalerba
committed
fix(material-experimental/mdc-list): update material-components-web to
pick up multi-select list keyboard support
1 parent cff93c8 commit c2ab9e9

File tree

4 files changed

+670
-667
lines changed

4 files changed

+670
-667
lines changed

‎package.json

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
"@angular/platform-browser": "13.2.0",
6161
"@types/google.maps": "^3.47.3",
6262
"@types/youtube": "^0.0.46",
63-
"material-components-web": "14.0.0-canary.c047f7c19.0",
63+
"material-components-web": "14.0.0-canary.9736ddce9.0",
6464
"rxjs": "^6.6.7",
6565
"rxjs-tslint-rules": "^4.34.8",
6666
"tslib": "^2.3.1",
@@ -92,53 +92,53 @@
9292
"@bazel/terser": "4.4.5",
9393
"@bazel/typescript": "4.4.5",
9494
"@firebase/app-types": "^0.7.0",
95-
"@material/animation": "14.0.0-canary.c047f7c19.0",
96-
"@material/auto-init": "14.0.0-canary.c047f7c19.0",
97-
"@material/banner": "14.0.0-canary.c047f7c19.0",
98-
"@material/base": "14.0.0-canary.c047f7c19.0",
99-
"@material/button": "14.0.0-canary.c047f7c19.0",
100-
"@material/card": "14.0.0-canary.c047f7c19.0",
101-
"@material/checkbox": "14.0.0-canary.c047f7c19.0",
102-
"@material/chips": "14.0.0-canary.c047f7c19.0",
103-
"@material/circular-progress": "14.0.0-canary.c047f7c19.0",
104-
"@material/data-table": "14.0.0-canary.c047f7c19.0",
105-
"@material/density": "14.0.0-canary.c047f7c19.0",
106-
"@material/dialog": "14.0.0-canary.c047f7c19.0",
107-
"@material/dom": "14.0.0-canary.c047f7c19.0",
108-
"@material/drawer": "14.0.0-canary.c047f7c19.0",
109-
"@material/elevation": "14.0.0-canary.c047f7c19.0",
110-
"@material/fab": "14.0.0-canary.c047f7c19.0",
111-
"@material/feature-targeting": "14.0.0-canary.c047f7c19.0",
112-
"@material/floating-label": "14.0.0-canary.c047f7c19.0",
113-
"@material/form-field": "14.0.0-canary.c047f7c19.0",
114-
"@material/icon-button": "14.0.0-canary.c047f7c19.0",
115-
"@material/image-list": "14.0.0-canary.c047f7c19.0",
116-
"@material/layout-grid": "14.0.0-canary.c047f7c19.0",
117-
"@material/line-ripple": "14.0.0-canary.c047f7c19.0",
118-
"@material/linear-progress": "14.0.0-canary.c047f7c19.0",
119-
"@material/list": "14.0.0-canary.c047f7c19.0",
120-
"@material/menu": "14.0.0-canary.c047f7c19.0",
121-
"@material/menu-surface": "14.0.0-canary.c047f7c19.0",
122-
"@material/notched-outline": "14.0.0-canary.c047f7c19.0",
123-
"@material/radio": "14.0.0-canary.c047f7c19.0",
124-
"@material/ripple": "14.0.0-canary.c047f7c19.0",
125-
"@material/rtl": "14.0.0-canary.c047f7c19.0",
126-
"@material/segmented-button": "14.0.0-canary.c047f7c19.0",
127-
"@material/select": "14.0.0-canary.c047f7c19.0",
128-
"@material/shape": "14.0.0-canary.c047f7c19.0",
129-
"@material/slider": "14.0.0-canary.c047f7c19.0",
130-
"@material/snackbar": "14.0.0-canary.c047f7c19.0",
131-
"@material/switch": "14.0.0-canary.c047f7c19.0",
132-
"@material/tab": "14.0.0-canary.c047f7c19.0",
133-
"@material/tab-bar": "14.0.0-canary.c047f7c19.0",
134-
"@material/tab-indicator": "14.0.0-canary.c047f7c19.0",
135-
"@material/tab-scroller": "14.0.0-canary.c047f7c19.0",
136-
"@material/textfield": "14.0.0-canary.c047f7c19.0",
137-
"@material/theme": "14.0.0-canary.c047f7c19.0",
138-
"@material/tooltip": "14.0.0-canary.c047f7c19.0",
139-
"@material/top-app-bar": "14.0.0-canary.c047f7c19.0",
140-
"@material/touch-target": "14.0.0-canary.c047f7c19.0",
141-
"@material/typography": "14.0.0-canary.c047f7c19.0",
95+
"@material/animation": "14.0.0-canary.9736ddce9.0",
96+
"@material/auto-init": "14.0.0-canary.9736ddce9.0",
97+
"@material/banner": "14.0.0-canary.9736ddce9.0",
98+
"@material/base": "14.0.0-canary.9736ddce9.0",
99+
"@material/button": "14.0.0-canary.9736ddce9.0",
100+
"@material/card": "14.0.0-canary.9736ddce9.0",
101+
"@material/checkbox": "14.0.0-canary.9736ddce9.0",
102+
"@material/chips": "14.0.0-canary.9736ddce9.0",
103+
"@material/circular-progress": "14.0.0-canary.9736ddce9.0",
104+
"@material/data-table": "14.0.0-canary.9736ddce9.0",
105+
"@material/density": "14.0.0-canary.9736ddce9.0",
106+
"@material/dialog": "14.0.0-canary.9736ddce9.0",
107+
"@material/dom": "14.0.0-canary.9736ddce9.0",
108+
"@material/drawer": "14.0.0-canary.9736ddce9.0",
109+
"@material/elevation": "14.0.0-canary.9736ddce9.0",
110+
"@material/fab": "14.0.0-canary.9736ddce9.0",
111+
"@material/feature-targeting": "14.0.0-canary.9736ddce9.0",
112+
"@material/floating-label": "14.0.0-canary.9736ddce9.0",
113+
"@material/form-field": "14.0.0-canary.9736ddce9.0",
114+
"@material/icon-button": "14.0.0-canary.9736ddce9.0",
115+
"@material/image-list": "14.0.0-canary.9736ddce9.0",
116+
"@material/layout-grid": "14.0.0-canary.9736ddce9.0",
117+
"@material/line-ripple": "14.0.0-canary.9736ddce9.0",
118+
"@material/linear-progress": "14.0.0-canary.9736ddce9.0",
119+
"@material/list": "14.0.0-canary.9736ddce9.0",
120+
"@material/menu": "14.0.0-canary.9736ddce9.0",
121+
"@material/menu-surface": "14.0.0-canary.9736ddce9.0",
122+
"@material/notched-outline": "14.0.0-canary.9736ddce9.0",
123+
"@material/radio": "14.0.0-canary.9736ddce9.0",
124+
"@material/ripple": "14.0.0-canary.9736ddce9.0",
125+
"@material/rtl": "14.0.0-canary.9736ddce9.0",
126+
"@material/segmented-button": "14.0.0-canary.9736ddce9.0",
127+
"@material/select": "14.0.0-canary.9736ddce9.0",
128+
"@material/shape": "14.0.0-canary.9736ddce9.0",
129+
"@material/slider": "14.0.0-canary.9736ddce9.0",
130+
"@material/snackbar": "14.0.0-canary.9736ddce9.0",
131+
"@material/switch": "14.0.0-canary.9736ddce9.0",
132+
"@material/tab": "14.0.0-canary.9736ddce9.0",
133+
"@material/tab-bar": "14.0.0-canary.9736ddce9.0",
134+
"@material/tab-indicator": "14.0.0-canary.9736ddce9.0",
135+
"@material/tab-scroller": "14.0.0-canary.9736ddce9.0",
136+
"@material/textfield": "14.0.0-canary.9736ddce9.0",
137+
"@material/theme": "14.0.0-canary.9736ddce9.0",
138+
"@material/tooltip": "14.0.0-canary.9736ddce9.0",
139+
"@material/top-app-bar": "14.0.0-canary.9736ddce9.0",
140+
"@material/touch-target": "14.0.0-canary.9736ddce9.0",
141+
"@material/typography": "14.0.0-canary.9736ddce9.0",
142142
"@octokit/rest": "18.3.5",
143143
"@rollup/plugin-commonjs": "^21.0.0",
144144
"@rollup/plugin-node-resolve": "^13.1.3",

‎src/material-experimental/mdc-list/interactive-list-base.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ export abstract class MatInteractiveListBase<T extends MatListItemBase>
4242
this._foundation.handleClick(
4343
this._indexForElement(event.target as HTMLElement),
4444
/* isCheckboxAlreadyUpdatedInAdapter */ false,
45+
event,
4546
);
4647
}
4748

@@ -84,6 +85,7 @@ export abstract class MatInteractiveListBase<T extends MatListItemBase>
8485
protected _initWithAdapter(adapter: MDCListAdapter) {
8586
this._adapter = adapter;
8687
this._foundation = new MDCListFoundation(adapter);
88+
this._foundation.setDisabledItemsFocusable(false);
8789
}
8890

8991
ngAfterViewInit() {

‎src/material-experimental/mdc-list/selection-list.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ describe('MDC-based MatSelectionList without forms', () => {
345345
const event = dispatchKeyboardEvent(listOptions[2].nativeElement, 'keydown', HOME);
346346
fixture.detectChanges();
347347

348-
expect(getFocusIndex()).toBe(0);
348+
expect(getFocusIndex()).toBe(1); // Skips 0th item because it is disabled.
349349
expect(event.defaultPrevented).toBe(true);
350350
});
351351

0 commit comments

Comments
 (0)