From b99b964a7835356bf01066cb3a0af9f386173bcd Mon Sep 17 00:00:00 2001 From: pengx17 Date: Thu, 6 Jun 2024 07:27:29 +0000 Subject: [PATCH] fix: temp fix for showing peek view modal for edgeless (#7155) workaround for AFF-1200 --- .../core/src/modules/peek-view/view/modal-container.tsx | 4 +++- .../core/src/modules/peek-view/view/peek-view-manager.tsx | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/frontend/core/src/modules/peek-view/view/modal-container.tsx b/packages/frontend/core/src/modules/peek-view/view/modal-container.tsx index e41d4198d..a18be2d6a 100644 --- a/packages/frontend/core/src/modules/peek-view/view/modal-container.tsx +++ b/packages/frontend/core/src/modules/peek-view/view/modal-container.tsx @@ -63,9 +63,11 @@ export const PeekViewModalContainer = ({ target, controls, children, + hideOnEntering, onAnimateEnd, }: PropsWithChildren<{ open: boolean; + hideOnEntering?: boolean; target?: HTMLElement; onOpenChange: (open: boolean) => void; controls: React.ReactNode; @@ -113,7 +115,7 @@ export const PeekViewModalContainer = ({ className={styles.modalContent} data-state={status} > - {children} + {hideOnEntering && status === 'entering' ? null : children}
{controls} diff --git a/packages/frontend/core/src/modules/peek-view/view/peek-view-manager.tsx b/packages/frontend/core/src/modules/peek-view/view/peek-view-manager.tsx index c64f217f0..dab0e5fd3 100644 --- a/packages/frontend/core/src/modules/peek-view/view/peek-view-manager.tsx +++ b/packages/frontend/core/src/modules/peek-view/view/peek-view-manager.tsx @@ -49,6 +49,8 @@ export const PeekViewManagerModal = () => { : undefined } controls={controls} + // there is a bug for edgeless mode when showing the peek view during start up animation + hideOnEntering={activePeekView?.info.mode === 'edgeless'} onOpenChange={open => { if (!open) { peekViewEntity.close();