A free and open source instant messaging and VoIP chat app built for friends, groups, and communities.
fix(ui): reopen a popout clicked while it is closing (#3318)
Hampusacc1392a539f
diff --git a/fluxer_app/src/app/App.tsx b/fluxer_app/src/app/App.tsxindex b4f13d9be..742693f31 100644--- a/fluxer_app/src/app/App.tsx+++ b/fluxer_app/src/app/App.tsx@@ -94,9 +94,7 @@ export const AppWrapper = observer(({children}: AppWrapperProps) => {() => ({variant: layoutVariant, setVariant: setLayoutVariant}),[layoutVariant],);- const popouts = Popout.getPopouts();- const topPopout = popouts.length ? popouts[popouts.length - 1] : null;- const topPopoutRequiresBackdrop = Boolean(topPopout && !topPopout.disableBackdrop);+ const topPopoutRequiresBackdrop = Popout.requiresBackdrop();const hasBlockingModal = Modal.hasModalOpen();const room = MediaEngine.room;const ringsContainerRef = useRef<HTMLDivElement>(null);diff --git a/fluxer_app/src/features/ui/popover/PopoverPopout.tsx b/fluxer_app/src/features/ui/popover/PopoverPopout.tsxindex 970a99057..c2bf6fca2 100644--- a/fluxer_app/src/features/ui/popover/PopoverPopout.tsx+++ b/fluxer_app/src/features/ui/popover/PopoverPopout.tsx@@ -309,7 +309,7 @@ export const Popout = React.forwardRef<HTMLElement, PopoutProps>((props, ref) =>);const toggle = useCallback((clickPos?: number) => {- if (PopoutState.isOpen(state.id)) {+ if (PopoutState.isOpen(state.id) && !PopoutState.isClosing(state.id)) {if (props.hoverDelay != null && openModeRef.current === 'hover') {clearTimers();open(clickPos, 'click');diff --git a/fluxer_app/src/features/ui/popover/PopoverPopouts.tsx b/fluxer_app/src/features/ui/popover/PopoverPopouts.tsxindex 99802425c..53a3e2ec4 100644--- a/fluxer_app/src/features/ui/popover/PopoverPopouts.tsx+++ b/fluxer_app/src/features/ui/popover/PopoverPopouts.tsx@@ -240,11 +240,21 @@ const PopoutItem: React.FC<PopoutItemProps> = observer(setTargetInDOM(true);}}, [target, ownerDocument, keepOpenOnTargetUnmount, beginClose]);+ const wasClosingRequestedRef = useRef(isClosingRequested);useEffect(() => {+ const wasClosingRequested = wasClosingRequestedRef.current;+ wasClosingRequestedRef.current = isClosingRequested;if (isClosingRequested) {beginClose();+ return;+ }+ if (!wasClosingRequested) return;+ if (closeTimerRef.current != null && ownerWindow != null) {+ ownerWindow.clearTimeout(closeTimerRef.current);+ closeTimerRef.current = null;}- }, [isClosingRequested, beginClose]);+ setIsVisible(true);+ }, [isClosingRequested, beginClose, ownerWindow]);useEffect(() => {return () => {if (closeTimerRef.current != null && ownerWindow != null) {@@ -460,7 +470,7 @@ export const Popouts: React.FC<PopoutsProps> = observer(({ownerDocument}) => {const portalHost = scopePortalHostToDocument(activePortalHost, scopeDocument);const popouts = PopoutState.getPopouts(scopeDocument);const topPopout = popouts.length ? popouts[popouts.length - 1] : null;- const needsBackdrop = Boolean(topPopout && !topPopout.disableBackdrop);+ const needsBackdrop = PopoutState.requiresBackdrop(scopeDocument);useEffect(() => {const currentKeys = new Set(popouts.map((popout) => popout.key.toString()));const prevKeys = prevPopoutKeysRef.current;diff --git a/fluxer_app/src/features/ui/state/Popout.ts b/fluxer_app/src/features/ui/state/Popout.tsindex baa9e64c7..61b22f688 100644--- a/fluxer_app/src/features/ui/state/Popout.ts+++ b/fluxer_app/src/features/ui/state/Popout.ts@@ -218,6 +218,11 @@ class Popout {);}+ requiresBackdrop(ownerDocument: Document = document): boolean {+ const owner = this.getPopouts(ownerDocument).findLast((popout) => !this.isClosing(popout.key));+ return owner != null && !owner.disableBackdrop;+ }+private getParentPopoutChain(dependsOnKey: string): Record<string, PopoutDefinition> {const result: Record<string, PopoutDefinition> = {};let currentKey: string | undefined = dependsOnKey;