fix: maskClosable of popup not work

ZhongAnTech · Oct 7, 2023 · 287ca2e · 287ca2e
1 parent 57cbf25
commit 287ca2e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/packages/zarm/src/popup/Popup.tsx b/packages/zarm/src/popup/Popup.tsx
@@ -67,9 +67,6 @@ const Popup = React.forwardRef<HTMLDivElement, PopupProps>((props, ref) => {
           mountContainer={props.mountContainer}
           forceRender={forceRender}
           destroy={destroy}
-          onClick={() => {
-            onMaskClick?.();
-          }}
         />
       )}
       <Transition
@@ -96,14 +93,23 @@ const Popup = React.forwardRef<HTMLDivElement, PopupProps>((props, ref) => {
           const { display, ...restStyle } = style;
           return renderToContainer(
             props.mountContainer ?? globalMountContainer,
-            <div className={bem('wrapper', [props.className])} style={{ ...props.style, display }}>
+            <div
+              className={bem('wrapper', [props.className])}
+              style={{ ...props.style, display }}
+              onClick={() => {
+                onMaskClick?.();
+              }}
+            >
               <div
                 ref={setNodeRef}
                 className={bem([{ [`${direction}`]: !!direction }, className])}
                 style={{
                   ...restStyle,
                   width,
                 }}
+                onClick={(e) => {
+                  e.stopPropagation();
+                }}
               >
                 {children}
               </div>

diff --git a/packages/zarm/src/popup/style/component.scss b/packages/zarm/src/popup/style/component.scss
@@ -1,7 +1,6 @@
 @include b(popup) {
   -webkit-overflow-scrolling: touch;
   margin: auto;
-  pointer-events: all;
   transform: perspective(0);
 
   @include e(wrapper) {