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] Add Skeleton loading overlay support #13293

Merged
merged 35 commits into from
Jul 5, 2024

Conversation

KenanYusuf
Copy link
Member

@KenanYusuf KenanYusuf commented May 29, 2024

Changes

Closes #1685

  • Updates the GridLoadingOverlay to have two variant props:
    • variant - the loading overlay type that displays when the loading prop is true and there are already rows in the data grid
    • noRowsVariant - the loading overlay type that displays when the loading prop is true and there are no rows in the data grid
    • The variant types are: circular-progress , linear-progress and skeleton
    • Both props are set to circular-progress by default to avoid this changing the default behaviour for users unexpectedly
  • Adds a GridSkeletonLoadingOverlay component to render a dynamic loading skeleton
  • Updates the GridSkeletonCell to consider data type when generating a random width to vary the size slightly
  • Added documentation to Overlays page

Usage

The variants can be set via slotProps:

<DataGrid
  slotProps={{
    loadingOverlay: {
      variant: 'linear-progress',
      noRowsVariant: 'skeleton',
    },
  }}
/>

Loading variants

skeleton.mov
circular-progress.mov
linear-progress.mov

Preview: https://deploy-preview-13293--material-ui-x.netlify.app/x/react-data-grid/overlays/

@KenanYusuf KenanYusuf changed the title Skeleton loading overlay [Data Grid] Skeleton loading overlay May 29, 2024
@mui-bot
Copy link

mui-bot commented May 29, 2024

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

Updated pages:

Generated by 🚫 dangerJS against ba615d4

@KenanYusuf KenanYusuf changed the title [Data Grid] Skeleton loading overlay [DataGrid] Skeleton loading overlay May 29, 2024
@zannager zannager added the component: data grid This is the name of the generic UI component, not the React module! label May 29, 2024
@oliviertassinari oliviertassinari added design This is about UI or UX design, please involve a designer new feature New feature or request labels May 30, 2024
@oliviertassinari oliviertassinari changed the title [DataGrid] Skeleton loading overlay [DataGrid] Add Skeleton loading overlay support May 30, 2024
Copy link
Member

@oliviertassinari oliviertassinari left a comment

Choose a reason for hiding this comment

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

Nice, a quick review on the code

packages/x-data-grid/src/components/GridLoadingOverlay.tsx Outdated Show resolved Hide resolved
import * as React from 'react';
import Skeleton from '@mui/material/Skeleton';

import { styled } from '@mui/system';
Copy link
Member

@oliviertassinari oliviertassinari May 30, 2024

Choose a reason for hiding this comment

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

We should import from Material UI here no? Same for all instances, until we deprecate @mui/material/styles for @mui/system. But until then, we need the theme. mui/material-ui#40594

Copy link
Member Author

Choose a reason for hiding this comment

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

@oliviertassinari I wasn't sure because I found other instances in the same directory where styled is imported from @mui/system e.g. https://github.com/mui/mui-x/blob/master/packages/x-data-grid/src/components/base/GridOverlays.tsx#L3

Copy link
Member

Choose a reason for hiding this comment

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

@oliviertassinari I had a similar discussion on Slack last week with quite a different answer: https://mui-org.slack.com/archives/C0170JAM7ML/p1717077013655759

It would be great to align on this topic to avoid back and forth between those two import paths

Copy link
Member

@oliviertassinari oliviertassinari Jun 3, 2024

Choose a reason for hiding this comment

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

This sounds compatible, if the style of the component needs to access the theme directly, it must import from @mui/material/styles for now, since we don't force people to provide a theme, it needs the default value for the theme value accessed. Otherwise, import from @mui/system.

In the future, everything can be imported from @mui/system (meaning Pigment CSS).

Copy link
Member

@MBilalShafi MBilalShafi Jun 25, 2024

Choose a reason for hiding this comment

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

In the future, everything can be imported from @mui/system (meaning Pigment CSS).

Is there a timeline for this? With v6?

It might impact a priority OKR for the Data Grid where we want to remove all @mui/material imports.

Copy link
Member

Choose a reason for hiding this comment

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

Is there a timeline for this? With v6?

I don't know. I'm actually not even sure it's the direction taken by the MUI System team. cc @brijeshb42 and @siriwatknp. At least, in my mind. @mui/material should include nothing else than Base UI components that are styled. I could see Pigment System as where all the theming and specific styling things of Material UI to be hosted or have it under a separate brand like Material UI System.

@oliviertassinari
Copy link
Member

Maybe there is a simple solution to the scroll sync issue, we solved this with a sticky position for the main grid, but maybe it doesn't matter much, we could sleep on this:

Screen_Recording_20240530_223202_Chrome_1.mp4

@romgrk
Copy link
Contributor

romgrk commented May 31, 2024

If we want it to scroll in sync, the skeleton needs to be a child of the scroll container. Javascript can never scroll stuff in sync, because the scroll events always run after a scroll has already occured (this is defined by the spec).

import * as React from 'react';
import Skeleton from '@mui/material/Skeleton';

import { styled } from '@mui/system';
Copy link
Member

Choose a reason for hiding this comment

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

@oliviertassinari I had a similar discussion on Slack last week with quite a different answer: https://mui-org.slack.com/archives/C0170JAM7ML/p1717077013655759

It would be great to align on this topic to avoid back and forth between those two import paths

@KenanYusuf KenanYusuf requested review from romgrk and Janpot July 1, 2024 13:11
Copy link
Member

@cherniavskii cherniavskii left a comment

Choose a reason for hiding this comment

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

Looks great!

docs/data/data-grid/overlays/LoadingOverlaySkeleton.tsx Outdated Show resolved Hide resolved
minWidth: '100%',
width: 'max-content', // prevents overflow: clip; cutting off the x axis
height: '100%',
overflow: 'clip', // y axis is hidden while the x axis is allowed to overflow
Copy link
Member

Choose a reason for hiding this comment

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

Oh nice, you managed to fix the gap with the right-pinned column 👍🏻

Copy link
Member

@MBilalShafi MBilalShafi left a comment

Choose a reason for hiding this comment

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

Great work @KenanYusuf 🎉
Overall, it feels pretty solid. I added a few minor comments.

Copy link
Contributor

Choose a reason for hiding this comment

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

Could you confirm that it works well with the showCellVerticalBorder prop?

Copy link
Member Author

Choose a reason for hiding this comment

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

Tested and found that it worked well with the showCellVerticalBorder prop when it was not overflowing horizontally, but the right border disappeared when it became scrollable. This turned out to be because I was not providing the correct sectionIndex and sectionLength values to the shouldCellShowRightBorder function.

Fixed here c92a3a3

@KenanYusuf KenanYusuf mentioned this pull request Jul 5, 2024
12 tasks
@KenanYusuf KenanYusuf merged commit 1ea2352 into mui:master Jul 5, 2024
17 checks passed
@KenanYusuf KenanYusuf deleted the skeleton-loading-overlay branch July 5, 2024 12:46
DanailH pushed a commit to DanailH/material-ui-x that referenced this pull request Jul 5, 2024
Signed-off-by: Kenan Yusuf <[email protected]>
Co-authored-by: Olivier Tassinari <[email protected]>
Co-authored-by: Andrew Cherniavskii <[email protected]>
DungTiger pushed a commit to DungTiger/mui-x that referenced this pull request Jul 23, 2024
Signed-off-by: Kenan Yusuf <[email protected]>
Co-authored-by: Olivier Tassinari <[email protected]>
Co-authored-by: Andrew Cherniavskii <[email protected]>
DungTiger pushed a commit to DungTiger/mui-x that referenced this pull request Jul 23, 2024
Signed-off-by: Kenan Yusuf <[email protected]>
Co-authored-by: Olivier Tassinari <[email protected]>
Co-authored-by: Andrew Cherniavskii <[email protected]>
If you want to customize the no rows overlay, a component can be passed to the `loadingOverlay` slot. In the following demo, a [LinearProgress](/material-ui/react-progress/#linear) component is rendered in place of the default circular loading spinner.
If you want to customize the no rows overlay, a component can be passed to the `loadingOverlay` slot.

In the following demo, a labelled determinate [CircularProgress](/material-ui/react-progress/#circular-determinate) component is rendered in place of the default loading overlay, with some additional _Loading rows…_ text.
Copy link
Member

Choose a reason for hiding this comment

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

labelled -> labeled
en-GB -> en-US
Fixed in #14025 😁

@oliviertassinari oliviertassinari added the feature: Row loading Related to the data grid Row loading features label Jul 29, 2024
Copy link
Member

@oliviertassinari oliviertassinari left a comment

Choose a reason for hiding this comment

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

Very clean. I also love that the layout is stable to rerenders https://codesandbox.io/s/epic-chatelet-43pmlk?file=/src/Demo.tsx but changes when remounted.

* Uses the grid state to determine which overlay to display.
* Returns the active overlay type and the active loading overlay variant.
*/
export const useGridOverlays = () => {
Copy link
Member

Choose a reason for hiding this comment

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

Default to named function in top level scope

Suggested change
export const useGridOverlays = () => {
function useGridOverlays(

<div
data-field={field}
className={clsx(classes.root, className)}
style={{ height, maxWidth: width, minWidth: width, ...style }}
Copy link
Member

Choose a reason for hiding this comment

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

Off-topic

I never quite understood why Damien first wrote the cells with minWidth+ maxWidth instead of only width. I suspect a simplification opportunity.

Copy link
Member

Choose a reason for hiding this comment

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

Copy link
Member

Choose a reason for hiding this comment

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

Oh, interesting, I have tried to reproduce the issue and couldn't, so #14448 😁, I don't know, why not;

import * as React from 'react';
import Skeleton from '@mui/material/Skeleton';

import { styled } from '@mui/system';
Copy link
Member

Choose a reason for hiding this comment

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

Is there a timeline for this? With v6?

I don't know. I'm actually not even sure it's the direction taken by the MUI System team. cc @brijeshb42 and @siriwatknp. At least, in my mind. @mui/material should include nothing else than Base UI components that are styled. I could see Pigment System as where all the theming and specific styling things of Material UI to be hosted or have it under a separate brand like Material UI System.

thomasmoon pushed a commit to thomasmoon/mui-x that referenced this pull request Sep 9, 2024
Signed-off-by: Kenan Yusuf <[email protected]>
Co-authored-by: Olivier Tassinari <[email protected]>
Co-authored-by: Andrew Cherniavskii <[email protected]>
thomasmoon pushed a commit to thomasmoon/mui-x that referenced this pull request Sep 9, 2024
Signed-off-by: Kenan Yusuf <[email protected]>
Co-authored-by: Olivier Tassinari <[email protected]>
Co-authored-by: Andrew Cherniavskii <[email protected]>
samuelsycamore pushed a commit to samuelsycamore/mui-x that referenced this pull request Dec 5, 2024
Signed-off-by: Kenan Yusuf <[email protected]>
Co-authored-by: Olivier Tassinari <[email protected]>
Co-authored-by: Andrew Cherniavskii <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
component: data grid This is the name of the generic UI component, not the React module! design This is about UI or UX design, please involve a designer feature: Row loading Related to the data grid Row loading features new feature New feature or request
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

[data grid] Skeleton for loading (replace circular progress?)
10 participants