Skip to content

Commit b6c9696

Browse files
jelbournmmalerba
authored andcommitted
chore: update MatMenu _hovered typing for rxjs 7 (#16771)
Apparently rxjs v7 will have issues in this method, but as of time of this writing this version is not yet available on npm. (cherry picked from commit a0118a6)
1 parent 073b98c commit b6c9696

File tree

3 files changed

+13
-4
lines changed

3 files changed

+13
-4
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
"@webcomponents/custom-elements": "^1.1.0",
5050
"core-js": "^2.6.1",
5151
"material-components-web": "^3.0.0",
52-
"rxjs": "^6.4.0",
52+
"rxjs": "^6.5.2",
5353
"systemjs": "0.19.43",
5454
"tsickle": "^0.35.0",
5555
"tslib": "^1.9.3",

src/material/menu/menu.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -255,9 +255,11 @@ export class _MatMenuBase implements AfterContentInit, MatMenuPanel<MatMenuItem>
255255

256256
/** Stream that emits whenever the hovered menu item changes. */
257257
_hovered(): Observable<MatMenuItem> {
258-
return this._directDescendantItems.changes.pipe(
258+
// Coerce the `changes` property because Angular types it as `Observable<any>`
259+
const itemChanges = this._directDescendantItems.changes as Observable<QueryList<MatMenuItem>>;
260+
return itemChanges.pipe(
259261
startWith(this._directDescendantItems),
260-
switchMap(items => merge<MatMenuItem>(...items.map((item: MatMenuItem) => item._hovered)))
262+
switchMap(items => merge(...items.map((item: MatMenuItem) => item._hovered)))
261263
);
262264
}
263265

yarn.lock

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10394,7 +10394,7 @@ rx@4.1.0:
1039410394
resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782"
1039510395
integrity sha1-pfE/957zt0D+MKqAP7CfmIBdR4I=
1039610396

10397-
rxjs@6.4.0, rxjs@^6.4.0:
10397+
rxjs@6.4.0:
1039810398
version "6.4.0"
1039910399
resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.4.0.tgz#f3bb0fe7bda7fb69deac0c16f17b50b0b8790504"
1040010400
integrity sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==
@@ -10415,6 +10415,13 @@ rxjs@^6.1.0:
1041510415
dependencies:
1041610416
tslib "^1.9.0"
1041710417

10418+
rxjs@^6.5.2:
10419+
version "6.5.2"
10420+
resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.2.tgz#2e35ce815cd46d84d02a209fb4e5921e051dbec7"
10421+
integrity sha512-HUb7j3kvb7p7eCUHE3FqjoDsC1xfZQ4AHFWfTKSpZ+sAhhz5X1WX0ZuUqWbzB2QhSLp3DoLUG+hMdEDKqWo2Zg==
10422+
dependencies:
10423+
tslib "^1.9.0"
10424+
1041810425
safe-buffer@5.1.2, safe-buffer@^5.0.1, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
1041910426
version "5.1.2"
1042010427
resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"

0 commit comments

Comments
 (0)