Skip to content
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

[DataGrid] Make rowCount part of the state #12406

Merged
merged 7 commits into from
Jun 21, 2024

Conversation

MBilalShafi
Copy link
Member

@MBilalShafi MBilalShafi commented Mar 11, 2024

Cherry-pick #12381 from v7

@MBilalShafi MBilalShafi added component: data grid This is the name of the generic UI component, not the React module! cherry-pick The PR was cherry-picked from the newer alpha/beta/stable branch labels Mar 11, 2024
@mui-bot
Copy link

mui-bot commented Mar 11, 2024

Deploy preview: https://deploy-preview-12406--material-ui-x.netlify.app/

Generated by 🚫 dangerJS against 97230e6

@github-actions github-actions bot added the PR: out-of-date The pull request has merge conflicts and can't be merged label Mar 19, 2024
Copy link

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@MBilalShafi MBilalShafi changed the base branch from master to v6.x March 21, 2024 02:14
@MBilalShafi MBilalShafi marked this pull request as ready for review April 4, 2024 08:21
@MBilalShafi MBilalShafi changed the title [DataGrid] Make rowCount part of the state [DataGrid] Make rowCount part of the state Apr 4, 2024
@MBilalShafi MBilalShafi requested a review from romgrk April 4, 2024 08:21
@github-actions github-actions bot removed the PR: out-of-date The pull request has merge conflicts and can't be merged label Apr 4, 2024
@flaviendelangle
Copy link
Member

@MBilalShafi is there something preventing the merging of this PR?

@MBilalShafi
Copy link
Member Author

@MBilalShafi is there something preventing the merging of this PR?

Not anything specific. I just wanted to wait for a specific request for backporting this one. Till now there have been no such requests which might mean people are okay with updating to v7 for this feature.

But it's correct, merging it should be ok too since most of the work has been done already, I'll fix the failing tests and proceed with the merge! 👍

@MBilalShafi MBilalShafi merged commit be51dfe into mui:v6.x Jun 21, 2024
14 of 16 checks passed
@MBilalShafi MBilalShafi deleted the cherry-pick-12381 branch June 21, 2024 15:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick The PR was cherry-picked from the newer alpha/beta/stable branch component: data grid This is the name of the generic UI component, not the React module! v6.x
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants