Merge 5ca090e into 5904f1d

Author: alexandrumorariu

CHANGELOG.md

@@ -14,6 +14,8 @@ The following is a curated list of changes in the Enact project, newest changes
 
 ### Fixed
 
+- `ui/Scrollable/ScrollableNative` to stop scroller momentum when the window resizes
+- `ui/useScroll/useScroll` to stop scroller momentum when the window resizes
 - `spotlight/SpotlightRootDecorator` to show focus effect after initial loading
 - `ui/MarqueeDecorator` to restart animation when text changed while focus retained
 

packages/ui/Scrollable/ScrollableNative.js

@@ -489,9 +489,19 @@ class ScrollableBaseNative extends Component {
 			if (handleResizeWindow) {
 				handleResizeWindow();
 			}
+			if ( platform.platformName === 'androidChrome' || platform.platformName === 'ios' ) {
+				this.childRefCurrent.containerRef.current.style.overflow = 'hidden';
+			}
 			this.childRefCurrent.containerRef.current.style.scrollBehavior = null;
+
 			this.childRefCurrent.scrollToPosition(0, 0);
-			this.childRefCurrent.containerRef.current.style.scrollBehavior = 'smooth';
+
+			setTimeout(() => {
+				if ( platform.platformName === 'androidChrome' || platform.platformName === 'ios' ) {
+					this.childRefCurrent.containerRef.current.style.overflow = '';
+				}
+				this.childRefCurrent.containerRef.current.style.scrollBehavior = 'smooth';
+			}, 100);
 
 			this.enqueueForceUpdate();
 		});

packages/ui/useScroll/useScroll.js

@@ -368,9 +368,19 @@ const useScrollBase = (props) => {
 			if (scrollMode === 'translate') {
 				scrollTo({position: {x: 0, y: 0}, animate: false});
 			} else {
+				if ( platform.platformName === 'androidChrome' || platform.platformName === 'ios' ) {
+					scrollContentRef.current.style.overflow = 'hidden';
+				}
 				scrollContentRef.current.style.scrollBehavior = null;
+
 				scrollContentHandle.current.scrollToPosition(0, 0);
-				scrollContentRef.current.style.scrollBehavior = 'smooth';
+
+				setTimeout(() => {
+					if ( platform.platformName === 'androidChrome' || platform.platformName === 'ios' ) {
+						scrollContentRef.current.style.overflow = '';
+					}
+					scrollContentRef.current.style.scrollBehavior = 'smooth';
+				}, 100);
 			}
 
 			enqueueForceUpdate();