Skip to content

Commit

Permalink
[material-ui][Dialog] Fix broken scrolling in full screen mode (#43626)
Browse files Browse the repository at this point in the history
Signed-off-by: Diego Andai <diego@mui.com>
Co-authored-by: Diego Andai <diego@mui.com>
Co-authored-by: ZeeshanTamboli <zeeshan.tamboli@gmail.com>
  • Loading branch information
3 people committed Sep 7, 2024
1 parent fc65397 commit efc1396
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 0 deletions.
1 change: 1 addition & 0 deletions packages/mui-material/src/Dialog/Dialog.js
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ const DialogPaper = styled(Paper, {
memoTheme(({ theme }) => ({
margin: 32,
position: 'relative',
overflowY: 'auto',
'@media print': {
overflowY: 'visible',
boxShadow: 'none',
Expand Down
29 changes: 29 additions & 0 deletions packages/mui-material/src/Dialog/Dialog.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -318,6 +318,35 @@ describe('<Dialog />', () => {
);
expect(getByTestId('paper')).not.to.have.class(classes.paperFullScreen);
});

it('scrolls if overflown on the Y axis', function test() {
if (/jsdom/.test(window.navigator.userAgent)) {
this.skip();
}

const ITEM_HEIGHT = 100;
const ITEM_COUNT = 10;

const { getByTestId } = render(
<Dialog
open
fullScreen
PaperProps={{ 'data-testid': 'paper', sx: { height: ITEM_HEIGHT } }}
>
{Array.from(Array(ITEM_COUNT).keys()).map((item) => (
<div key={item} style={{ flexShrink: 0, height: ITEM_HEIGHT }}>
{item}
</div>
))}
</Dialog>,
);
const paperElement = getByTestId('paper');
expect(paperElement.scrollTop).to.equal(0);
expect(paperElement.clientHeight).to.equal(ITEM_HEIGHT);
expect(paperElement.scrollHeight).to.equal(ITEM_HEIGHT * ITEM_COUNT);
fireEvent.scroll(paperElement, { target: { scrollTop: ITEM_HEIGHT } });
expect(paperElement.scrollTop).to.equal(ITEM_HEIGHT);
});
});

describe('prop: PaperProps.className', () => {
Expand Down

0 comments on commit efc1396

Please sign in to comment.