Merge branch 'master' into master

JedWatson · Oct 31, 2024 · 6423178 · 6423178
2 parents 037f099 + 28251dc
commit 6423178
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -10,7 +10,7 @@ The Select control for [React](https://reactjs.org). Initially built for use in
 See [react-select.com](https://www.react-select.com) for live demos and comprehensive docs.
 
 `react-select` is funded by [Thinkmill](https://www.thinkmill.com.au) and [Atlassian](https://atlaskit.atlassian.com).
-We are an open source project that is continously supported by the community.
+We are an open source project that is continuously supported by the community.
 
 React Select helps you develop powerful select components that _just work_ out of the box, without stopping you from customising the parts that are important to you.
 

diff --git a/packages/react-select/CHANGELOG.md b/packages/react-select/CHANGELOG.md
@@ -1,5 +1,11 @@
 # react-select
 
+## 5.8.2
+
+### Patch Changes
+
+- [`781284a9`](https://github.com/JedWatson/react-select/commit/781284a97059b80c07eb77bc871540fe99304e8f) [#5771](https://github.com/JedWatson/react-select/pull/5771) Thanks [@tu4mo](https://github.com/tu4mo)! - Fix for calling non-cancellable scroll events
+
 ## 5.8.1
 
 ### Patch Changes

diff --git a/packages/react-select/package.json b/packages/react-select/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-select",
-  "version": "5.8.1",
+  "version": "5.8.2",
   "description": "A Select control built with and for ReactJS",
   "main": "dist/react-select.cjs.js",
   "module": "dist/react-select.esm.js",

diff --git a/packages/react-select/src/internal/useScrollLock.ts b/packages/react-select/src/internal/useScrollLock.ts
@@ -16,7 +16,7 @@ const LOCK_STYLES = {
 };
 
 function preventTouchMove(e: TouchEvent) {
-  e.preventDefault();
+  if (e.cancelable) e.preventDefault();
 }
 
 function allowTouchMove(e: TouchEvent) {