Merge branch 'master' into master

JedWatson · Oct 2, 2023 · dea5110 · dea5110
2 parents d6a9040 + b284329
commit dea5110
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/packages/react-select/CHANGELOG.md b/packages/react-select/CHANGELOG.md
@@ -1,5 +1,11 @@
 # react-select
 
+## 5.7.5
+
+### Patch Changes
+
+- [`9d1730ba`](https://github.com/JedWatson/react-select/commit/9d1730ba4f97a51d25c7e704acd1a4c2be8f7182) [#5347](https://github.com/JedWatson/react-select/pull/5347) Thanks [@aszmyd](https://github.com/aszmyd)! - Make scroll lock div work on a document context it belongs to
+
 ## 5.7.4
 
 ### 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.7.4",
+  "version": "5.7.5",
   "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/ScrollManager.tsx b/packages/react-select/src/internal/ScrollManager.tsx
@@ -1,6 +1,6 @@
 /** @jsx jsx */
 import { jsx } from '@emotion/react';
-import { Fragment, ReactElement, RefCallback } from 'react';
+import { Fragment, ReactElement, RefCallback, MouseEvent } from 'react';
 import useScrollCapture from './useScrollCapture';
 import useScrollLock from './useScrollLock';
 
@@ -14,8 +14,13 @@ interface Props {
   readonly onTopLeave?: (event: WheelEvent | TouchEvent) => void;
 }
 
-const blurSelectInput = () =>
-  document.activeElement && (document.activeElement as HTMLElement).blur();
+const blurSelectInput = (event: MouseEvent<HTMLDivElement>) => {
+  const element = event.target as HTMLDivElement;
+  return (
+    element.ownerDocument.activeElement &&
+    (element.ownerDocument.activeElement as HTMLElement).blur()
+  );
+};
 
 export default function ScrollManager({
   children,