Skip to content

Commit b1b0c62

Browse files
authored
[SwipeableDrawer] Fix prevented inner scroll (mui#22254)
1 parent 940d5ca commit b1b0c62

File tree

4 files changed

+178
-111
lines changed

4 files changed

+178
-111
lines changed

packages/material-ui/src/Slider/Slider.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ function createTouches(touches) {
2626
}
2727

2828
describe('<Slider />', () => {
29-
// Not support by IE 11
29+
// only run in supported browsers
3030
if (typeof Touch === 'undefined') {
3131
return;
3232
}

packages/material-ui/src/StepButton/StepButton.test.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ describe('<StepButton />', () => {
7272

7373
describe('event handlers', () => {
7474
it('should forward mouseenter, mouseleave and touchstart', function touchTests() {
75+
// only run in supported browsers
7576
if (typeof Touch === 'undefined') {
7677
this.skip();
7778
}

packages/material-ui/src/SwipeableDrawer/SwipeableDrawer.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ function getDomTreeShapes(element, rootNode) {
5454
// Adapted from https://github.com/oliviertassinari/react-swipeable-views/blob/7666de1dba253b896911adf2790ce51467670856/packages/react-swipeable-views/src/SwipeableViews.js#L129
5555
let domTreeShapes = [];
5656

57-
while (element && element !== rootNode) {
57+
while (element && element !== rootNode.parentElement) {
5858
const style = ownerWindow(rootNode).getComputedStyle(element);
5959

6060
if (

0 commit comments

Comments
 (0)