Skip to content

fix(grid-list): incorrectly laying out tiles for nested list #13086

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 2, 2018

Conversation

crisbeto
Copy link
Member

Fixes the grid list picking up the tiles of other nested grid lists, causing them to not being laid out correctly.

Fixes #13074.

@crisbeto crisbeto added the target: patch This PR is targeted for the next patch release label Sep 11, 2018
@crisbeto crisbeto requested a review from jelbourn as a code owner September 11, 2018 21:07
@googlebot googlebot added the cla: yes PR author has agreed to Google's Contributor License Agreement label Sep 11, 2018
@@ -40,10 +41,14 @@ const MAT_FIT_MODE = 'fit';
host: {
'class': 'mat-grid-list',
},
providers: [{
provide: MAT_GRID_LIST,
useExisting: MatGridList
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't quite follow why this is necessary- wouldn't injecting MatGridList do the same thing?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's there to avoid a circular import between the grid list and tile. The grid list has an import of the tile already.

@crisbeto crisbeto force-pushed the 13074/nested-grid-list branch from 9b8408a to 3e061e4 Compare September 12, 2018 05:39
Copy link
Member

@jelbourn jelbourn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@jelbourn jelbourn added pr: lgtm action: merge The PR is ready for merge by the caretaker labels Sep 18, 2018
@ngbot
Copy link

ngbot bot commented Sep 27, 2018

Hi @crisbeto! This PR has merge conflicts due to recent upstream merges.
Please help to unblock it by resolving these conflicts. Thanks!

3 similar comments
@ngbot
Copy link

ngbot bot commented Sep 27, 2018

Hi @crisbeto! This PR has merge conflicts due to recent upstream merges.
Please help to unblock it by resolving these conflicts. Thanks!

@ngbot
Copy link

ngbot bot commented Sep 27, 2018

Hi @crisbeto! This PR has merge conflicts due to recent upstream merges.
Please help to unblock it by resolving these conflicts. Thanks!

@ngbot
Copy link

ngbot bot commented Sep 27, 2018

Hi @crisbeto! This PR has merge conflicts due to recent upstream merges.
Please help to unblock it by resolving these conflicts. Thanks!

Fixes the grid list picking up the tiles of other nested grid lists, causing them to not being laid out correctly.

Fixes angular#13074.
@crisbeto crisbeto force-pushed the 13074/nested-grid-list branch from 3e061e4 to a1c0412 Compare September 29, 2018 13:37
@vivian-hu-zz vivian-hu-zz merged commit 3e1cff0 into angular:master Oct 2, 2018
roboshoes pushed a commit to roboshoes/material2 that referenced this pull request Oct 23, 2018
…#13086)

Fixes the grid list picking up the tiles of other nested grid lists, causing them to not being laid out correctly.

Fixes angular#13074.
@angular-automatic-lock-bot
Copy link

This issue has been automatically locked due to inactivity.
Please file a new issue if you are encountering a similar or related problem.

Read more about our automatic conversation locking policy.

This action has been performed automatically by a bot.

@angular-automatic-lock-bot angular-automatic-lock-bot bot locked and limited conversation to collaborators Sep 9, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
action: merge The PR is ready for merge by the caretaker cla: yes PR author has agreed to Google's Contributor License Agreement target: patch This PR is targeted for the next patch release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Broken nested MatGridList
4 participants