Skip to content

Commit a7dd337

Browse files
committed
fix(expandable): fix #4156 by calling stopProp on subgrid scroll
Previously, the stopPropagation function was not on scrollEvent, causing scrolling in subgrids to also scroll the main grid. This PR exposes stopProp and calls it on subgrid scroll fixes #4156
1 parent e6bc300 commit a7dd337

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

src/js/core/directives/ui-grid-render-container.js

+1
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@
113113
}
114114
else {
115115
event.preventDefault();
116+
event.stopPropagation();
116117
scrollEvent.fireThrottledScrollingEvent('', scrollEvent);
117118
}
118119

src/js/core/services/ui-grid-util.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -1393,7 +1393,8 @@ module.service('gridUtil', ['$log', '$window', '$document', '$http', '$templateC
13931393
deltaX: deltaX,
13941394
deltaY: deltaY,
13951395
deltaFactor: lowestDelta,
1396-
preventDefault: function () { event.preventDefault(); }
1396+
preventDefault: function () { event.preventDefault(); },
1397+
stopPropagation: function () { event.stopPropagation(); }
13971398
};
13981399

13991400
// Clearout lowestDelta after sometime to better

0 commit comments

Comments
 (0)