From 697f2c65202c609c7e0c2db09c7ff3a5e3b3fb92 Mon Sep 17 00:00:00 2001 From: pengx17 Date: Mon, 2 Sep 2024 02:59:18 +0000 Subject: [PATCH] fix(core): remove modal default overlay onclick (#8035) fix AF-1300 overlay click is already handled in `handlePointerDownOutSide`. adding onclick to overlay will cause issues on closing nested menus. --- .../frontend/component/src/ui/modal/modal.tsx | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/packages/frontend/component/src/ui/modal/modal.tsx b/packages/frontend/component/src/ui/modal/modal.tsx index 73bf6f1ea..883f978bc 100644 --- a/packages/frontend/component/src/ui/modal/modal.tsx +++ b/packages/frontend/component/src/ui/modal/modal.tsx @@ -9,7 +9,7 @@ import * as Dialog from '@radix-ui/react-dialog'; import * as VisuallyHidden from '@radix-ui/react-visually-hidden'; import { assignInlineVars } from '@vanilla-extract/dynamic'; import clsx from 'clsx'; -import type { CSSProperties, MouseEvent } from 'react'; +import type { CSSProperties } from 'react'; import { forwardRef, useCallback, useEffect, useState } from 'react'; import { isMobile } from '../../utils/env'; @@ -135,7 +135,6 @@ export const ModalInner = forwardRef( overlayOptions: { className: overlayClassName, style: overlayStyle, - onClick: onOverlayClick, ...otherOverlayOptions } = {}, closeButtonOptions, @@ -185,18 +184,6 @@ export const ModalInner = forwardRef( [onEscapeKeyDown, persistent] ); - const handleOverlayClick = useCallback( - (e: MouseEvent) => { - onOverlayClick?.(e); - if (persistent) { - e.preventDefault(); - } else { - onOpenChange?.(false); - } - }, - [onOpenChange, onOverlayClick, persistent] - ); - if (!container) { return; } @@ -219,7 +206,6 @@ export const ModalInner = forwardRef( style={{ ...overlayStyle, }} - onClick={handleOverlayClick} {...otherOverlayOptions} />