From b8049fbc45e6195f233db4dcffb1fb8df4b5acda Mon Sep 17 00:00:00 2001 From: Dominic McPhee Date: Fri, 12 Nov 2021 10:15:29 -0500 Subject: [PATCH 1/2] [Popover] Reverting exit timer to base duration --- .../Popover/components/PopoverOverlay/PopoverOverlay.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/Popover/components/PopoverOverlay/PopoverOverlay.tsx b/src/components/Popover/components/PopoverOverlay/PopoverOverlay.tsx index b5df502f0ad..f318c56ddb3 100644 --- a/src/components/Popover/components/PopoverOverlay/PopoverOverlay.tsx +++ b/src/components/Popover/components/PopoverOverlay/PopoverOverlay.tsx @@ -1,5 +1,5 @@ import React, {PureComponent, Children, createRef} from 'react'; -import {durationFast} from '@shopify/polaris-tokens'; +import {durationFast, durationBase} from '@shopify/polaris-tokens'; import {findFirstFocusableNode} from '../../../../utilities/focus'; import {ThemeProvider, ThemeProviderProps} from '../../../ThemeProvider'; @@ -111,7 +111,7 @@ export class PopoverOverlay extends PureComponent { this.clearTransitionTimeout(); this.exitingTimer = window.setTimeout(() => { this.setState({transitionStatus: TransitionStatus.Exited}); - }, 0); + }, durationBase); }); } } From 975ba8155cb1db822296e9d7f959daebc9609ce1 Mon Sep 17 00:00:00 2001 From: Dominic McPhee Date: Fri, 12 Nov 2021 10:29:51 -0500 Subject: [PATCH 2/2] Add to unreleased --- UNRELEASED.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/UNRELEASED.md b/UNRELEASED.md index 7eef3841d6e..803b0e96e69 100644 --- a/UNRELEASED.md +++ b/UNRELEASED.md @@ -8,6 +8,8 @@ Use [the changelog guidelines](/documentation/Versioning%20and%20changelog.md) t ### Bug fixes +- Reverted popover exit timeout to avoid race conditions ([#4633](https://github.com/Shopify/polaris-react/pull/4633)) + ### Documentation ### Development workflow