From 4fbb8e2bf597fc6e83c504adb79357dc610114ee Mon Sep 17 00:00:00 2001 From: Robin Malfait Date: Fri, 27 Sep 2024 00:37:25 +0200 Subject: [PATCH 1/2] drop test environment in virtualizer --- .../src/components/combobox/combobox.tsx | 21 +++++---------- .../src/components/combobox/combobox.ts | 27 +++++++------------ 2 files changed, 17 insertions(+), 31 deletions(-) diff --git a/packages/@headlessui-react/src/components/combobox/combobox.tsx b/packages/@headlessui-react/src/components/combobox/combobox.tsx index 6161293008..439d92bed1 100644 --- a/packages/@headlessui-react/src/components/combobox/combobox.tsx +++ b/packages/@headlessui-react/src/components/combobox/combobox.tsx @@ -532,21 +532,14 @@ function VirtualProvider(props: { return } - // Scroll to the active index - { - // Ignore this when we are in a test environment - if (typeof process !== 'undefined' && process.env.JEST_WORKER_ID !== undefined) { - return - } - - // Do not scroll when the mouse/pointer is being used - if (data.activationTrigger === ActivationTrigger.Pointer) { - return - } + // Do not scroll when the mouse/pointer is being used + if (data.activationTrigger === ActivationTrigger.Pointer) { + return + } - if (data.activeOptionIndex !== null && options.length > data.activeOptionIndex) { - virtualizer.scrollToIndex(data.activeOptionIndex) - } + // Scroll to the active index + if (data.activeOptionIndex !== null && options.length > data.activeOptionIndex) { + virtualizer.scrollToIndex(data.activeOptionIndex) } }} > diff --git a/packages/@headlessui-vue/src/components/combobox/combobox.ts b/packages/@headlessui-vue/src/components/combobox/combobox.ts index 5bafc677ea..27b2a1c1d2 100644 --- a/packages/@headlessui-vue/src/components/combobox/combobox.ts +++ b/packages/@headlessui-vue/src/components/combobox/combobox.ts @@ -190,24 +190,17 @@ let VirtualProvider = defineComponent({ return } - // Scroll to the active index - { - // Ignore this when we are in a test environment - if (typeof process !== 'undefined' && process.env.JEST_WORKER_ID !== undefined) { - return - } - - // Do not scroll when the mouse/pointer is being used - if (api.activationTrigger.value === ActivationTrigger.Pointer) { - return - } + // Do not scroll when the mouse/pointer is being used + if (api.activationTrigger.value === ActivationTrigger.Pointer) { + return + } - if ( - api.activeOptionIndex.value !== null && - api.virtual.value!.options.length > api.activeOptionIndex.value - ) { - virtualizer.value.scrollToIndex(api.activeOptionIndex.value) - } + // Scroll to the active index + if ( + api.activeOptionIndex.value !== null && + api.virtual.value!.options.length > api.activeOptionIndex.value + ) { + virtualizer.value.scrollToIndex(api.activeOptionIndex.value) } }, }, From 094725258f70c9241ef7cb3881d8eea344b64234 Mon Sep 17 00:00:00 2001 From: Robin Malfait Date: Fri, 27 Sep 2024 00:43:12 +0200 Subject: [PATCH 2/2] update changelog --- packages/@headlessui-react/CHANGELOG.md | 1 + packages/@headlessui-vue/CHANGELOG.md | 1 + 2 files changed, 2 insertions(+) diff --git a/packages/@headlessui-react/CHANGELOG.md b/packages/@headlessui-react/CHANGELOG.md index 349f117a50..db9fec0c50 100644 --- a/packages/@headlessui-react/CHANGELOG.md +++ b/packages/@headlessui-react/CHANGELOG.md @@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Ensure `Element` is available before polyfilling to prevent crashes in non-browser environments ([#3493](https://github.com/tailwindlabs/headlessui/pull/3493)) - Fix crash when using `instanceof HTMLElement` in some environments ([#3494](https://github.com/tailwindlabs/headlessui/pull/3494)) +- Cleanup `process` in Combobox component when using virtualization ([#3495](https://github.com/tailwindlabs/headlessui/pull/3495)) ## [2.1.8] - 2024-09-12 diff --git a/packages/@headlessui-vue/CHANGELOG.md b/packages/@headlessui-vue/CHANGELOG.md index 4927170da8..33dc311211 100644 --- a/packages/@headlessui-vue/CHANGELOG.md +++ b/packages/@headlessui-vue/CHANGELOG.md @@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Cancel outside click behavior on touch devices when scrolling ([#3266](https://github.com/tailwindlabs/headlessui/pull/3266)) - Fix restoring focus to correct element when closing `Dialog` component ([#3365](https://github.com/tailwindlabs/headlessui/pull/3365)) +- Cleanup `process` in Combobox component when using virtualization ([#3495](https://github.com/tailwindlabs/headlessui/pull/3495)) ## [1.7.22] - 2024-05-08