From 9d1730ba4f97a51d25c7e704acd1a4c2be8f7182 Mon Sep 17 00:00:00 2001 From: Adam Szmyd Date: Thu, 21 Sep 2023 01:11:11 +0200 Subject: [PATCH 1/2] Make scroll lock div work on a document context it belongs to (#5347) * Make scroll lock div work on a document context it belongs to * Changeset update --- .changeset/nasty-turkeys-rescue.md | 5 +++++ packages/react-select/src/internal/ScrollManager.tsx | 11 ++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 .changeset/nasty-turkeys-rescue.md diff --git a/.changeset/nasty-turkeys-rescue.md b/.changeset/nasty-turkeys-rescue.md new file mode 100644 index 0000000000..16dd369264 --- /dev/null +++ b/.changeset/nasty-turkeys-rescue.md @@ -0,0 +1,5 @@ +--- +'react-select': patch +--- + +Make scroll lock div work on a document context it belongs to diff --git a/packages/react-select/src/internal/ScrollManager.tsx b/packages/react-select/src/internal/ScrollManager.tsx index 802ab1e76f..4e1440008f 100644 --- 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) => { + const element = event.target as HTMLDivElement; + return ( + element.ownerDocument.activeElement && + (element.ownerDocument.activeElement as HTMLElement).blur() + ); +}; export default function ScrollManager({ children, From b284329ea92a951725fdf1ff48e6432eda545b5c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 21 Sep 2023 09:30:59 +1000 Subject: [PATCH 2/2] Version Packages (#5756) Co-authored-by: github-actions[bot] --- .changeset/nasty-turkeys-rescue.md | 5 ----- packages/react-select/CHANGELOG.md | 6 ++++++ packages/react-select/package.json | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) delete mode 100644 .changeset/nasty-turkeys-rescue.md diff --git a/.changeset/nasty-turkeys-rescue.md b/.changeset/nasty-turkeys-rescue.md deleted file mode 100644 index 16dd369264..0000000000 --- a/.changeset/nasty-turkeys-rescue.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'react-select': patch ---- - -Make scroll lock div work on a document context it belongs to diff --git a/packages/react-select/CHANGELOG.md b/packages/react-select/CHANGELOG.md index cd2f35663c..c01d4c80da 100644 --- 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 index 829c4a87b4..f87891755f 100644 --- 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",