amis-ui 2.9.0 → 3.1.0

package/esm/components/Modal.d.ts

@@ -48,7 +48,7 @@ export declare class Modal extends React.Component<ModalProps, ModalState> {
             ref: any;
             childRef(ref: any): void;
             getWrappedInstance(): any;
-            render(): JSX.Element;
+            render(): React.JSX.Element;
             context: unknown;
             setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<Omit<ThemeProps & LocaleProps & {
                 className?: string | undefined;
@@ -167,7 +167,7 @@ export declare class Modal extends React.Component<ModalProps, ModalState> {
                 ref: any;
                 childRef(ref: any): void;
                 getWrappedInstance(): any;
-                render(): JSX.Element;
+                render(): React.JSX.Element;
                 context: unknown;
                 setState<K_1 extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<ThemeProps & LocaleProps & {
                     className?: string | undefined;
@@ -278,21 +278,21 @@ export declare class Modal extends React.Component<ModalProps, ModalState> {
                 onClose?: (() => void) | undefined;
                 children?: React.ReactNode;
                 forwardedRef?: any;
-            } & React.HTMLAttributes<HTMLDivElement>) => JSX.Element>;
+            } & React.HTMLAttributes<HTMLDivElement>) => React.JSX.Element>;
         } & import("hoist-non-react-statics").NonReactStatics<({ classnames: cx, className, showCloseButton, onClose, children, classPrefix, translate: __, forwardedRef, ...rest }: ThemeProps & LocaleProps & {
             className?: string | undefined;
             showCloseButton?: boolean | undefined;
             onClose?: (() => void) | undefined;
             children?: React.ReactNode;
             forwardedRef?: any;
-        } & React.HTMLAttributes<HTMLDivElement>) => JSX.Element, {}> & {
+        } & React.HTMLAttributes<HTMLDivElement>) => React.JSX.Element, {}> & {
             ComposedComponent: ({ classnames: cx, className, showCloseButton, onClose, children, classPrefix, translate: __, forwardedRef, ...rest }: ThemeProps & LocaleProps & {
                 className?: string | undefined;
                 showCloseButton?: boolean | undefined;
                 onClose?: (() => void) | undefined;
                 children?: React.ReactNode;
                 forwardedRef?: any;
-            } & React.HTMLAttributes<HTMLDivElement>) => JSX.Element;
+            } & React.HTMLAttributes<HTMLDivElement>) => React.JSX.Element;
         }>;
     } & import("hoist-non-react-statics").NonReactStatics<{
         new (props: Omit<ThemeProps & LocaleProps & {
@@ -308,7 +308,7 @@ export declare class Modal extends React.Component<ModalProps, ModalState> {
             ref: any;
             childRef(ref: any): void;
             getWrappedInstance(): any;
-            render(): JSX.Element;
+            render(): React.JSX.Element;
             context: unknown;
             setState<K_1 extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<ThemeProps & LocaleProps & {
                 className?: string | undefined;
@@ -419,21 +419,21 @@ export declare class Modal extends React.Component<ModalProps, ModalState> {
             onClose?: (() => void) | undefined;
             children?: React.ReactNode;
             forwardedRef?: any;
-        } & React.HTMLAttributes<HTMLDivElement>) => JSX.Element>;
+        } & React.HTMLAttributes<HTMLDivElement>) => React.JSX.Element>;
     } & import("hoist-non-react-statics").NonReactStatics<({ classnames: cx, className, showCloseButton, onClose, children, classPrefix, translate: __, forwardedRef, ...rest }: ThemeProps & LocaleProps & {
         className?: string | undefined;
         showCloseButton?: boolean | undefined;
         onClose?: (() => void) | undefined;
         children?: React.ReactNode;
         forwardedRef?: any;
-    } & React.HTMLAttributes<HTMLDivElement>) => JSX.Element, {}> & {
+    } & React.HTMLAttributes<HTMLDivElement>) => React.JSX.Element, {}> & {
         ComposedComponent: ({ classnames: cx, className, showCloseButton, onClose, children, classPrefix, translate: __, forwardedRef, ...rest }: ThemeProps & LocaleProps & {
             className?: string | undefined;
             showCloseButton?: boolean | undefined;
             onClose?: (() => void) | undefined;
             children?: React.ReactNode;
             forwardedRef?: any;
-        } & React.HTMLAttributes<HTMLDivElement>) => JSX.Element;
+        } & React.HTMLAttributes<HTMLDivElement>) => React.JSX.Element;
     }, {}> & {
         ComposedComponent: {
             new (props: Omit<ThemeProps & LocaleProps & {
@@ -449,7 +449,7 @@ export declare class Modal extends React.Component<ModalProps, ModalState> {
                 ref: any;
                 childRef(ref: any): void;
                 getWrappedInstance(): any;
-                render(): JSX.Element;
+                render(): React.JSX.Element;
                 context: unknown;
                 setState<K_1 extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<ThemeProps & LocaleProps & {
                     className?: string | undefined;
@@ -560,21 +560,21 @@ export declare class Modal extends React.Component<ModalProps, ModalState> {
                 onClose?: (() => void) | undefined;
                 children?: React.ReactNode;
                 forwardedRef?: any;
-            } & React.HTMLAttributes<HTMLDivElement>) => JSX.Element>;
+            } & React.HTMLAttributes<HTMLDivElement>) => React.JSX.Element>;
         } & import("hoist-non-react-statics").NonReactStatics<({ classnames: cx, className, showCloseButton, onClose, children, classPrefix, translate: __, forwardedRef, ...rest }: ThemeProps & LocaleProps & {
             className?: string | undefined;
             showCloseButton?: boolean | undefined;
             onClose?: (() => void) | undefined;
             children?: React.ReactNode;
             forwardedRef?: any;
-        } & React.HTMLAttributes<HTMLDivElement>) => JSX.Element, {}> & {
+        } & React.HTMLAttributes<HTMLDivElement>) => React.JSX.Element, {}> & {
             ComposedComponent: ({ classnames: cx, className, showCloseButton, onClose, children, classPrefix, translate: __, forwardedRef, ...rest }: ThemeProps & LocaleProps & {
                 className?: string | undefined;
                 showCloseButton?: boolean | undefined;
                 onClose?: (() => void) | undefined;
                 children?: React.ReactNode;
                 forwardedRef?: any;
-            } & React.HTMLAttributes<HTMLDivElement>) => JSX.Element;
+            } & React.HTMLAttributes<HTMLDivElement>) => React.JSX.Element;
         };
     };
     static Title: {
@@ -586,7 +586,7 @@ export declare class Modal extends React.Component<ModalProps, ModalState> {
             ref: any;
             childRef(ref: any): void;
             getWrappedInstance(): any;
-            render(): JSX.Element;
+            render(): React.JSX.Element;
             context: unknown;
             setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<ThemeProps & {
                 className?: string | undefined;
@@ -650,17 +650,17 @@ export declare class Modal extends React.Component<ModalProps, ModalState> {
             className?: string | undefined;
             children?: React.ReactNode;
             forwardedRef?: any;
-        } & React.HTMLAttributes<HTMLDivElement>) => JSX.Element>;
+        } & React.HTMLAttributes<HTMLDivElement>) => React.JSX.Element>;
     } & import("hoist-non-react-statics").NonReactStatics<({ classnames: cx, className, children, classPrefix, forwardedRef, ...rest }: ThemeProps & {
         className?: string | undefined;
         children?: React.ReactNode;
         forwardedRef?: any;
-    } & React.HTMLAttributes<HTMLDivElement>) => JSX.Element, {}> & {
+    } & React.HTMLAttributes<HTMLDivElement>) => React.JSX.Element, {}> & {
         ComposedComponent: ({ classnames: cx, className, children, classPrefix, forwardedRef, ...rest }: ThemeProps & {
             className?: string | undefined;
             children?: React.ReactNode;
             forwardedRef?: any;
-        } & React.HTMLAttributes<HTMLDivElement>) => JSX.Element;
+        } & React.HTMLAttributes<HTMLDivElement>) => React.JSX.Element;
     };
     static Body: {
         new (props: Omit<ThemeProps & {
@@ -671,7 +671,7 @@ export declare class Modal extends React.Component<ModalProps, ModalState> {
             ref: any;
             childRef(ref: any): void;
             getWrappedInstance(): any;
-            render(): JSX.Element;
+            render(): React.JSX.Element;
             context: unknown;
             setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<ThemeProps & {
                 className?: string | undefined;
@@ -735,17 +735,17 @@ export declare class Modal extends React.Component<ModalProps, ModalState> {
             className?: string | undefined;
             children?: React.ReactNode;
             forwardedRef?: any;
-        } & React.HTMLAttributes<HTMLDivElement>) => JSX.Element>;
+        } & React.HTMLAttributes<HTMLDivElement>) => React.JSX.Element>;
     } & import("hoist-non-react-statics").NonReactStatics<({ classnames: cx, className, children, classPrefix, forwardedRef, ...rest }: ThemeProps & {
         className?: string | undefined;
         children?: React.ReactNode;
         forwardedRef?: any;
-    } & React.HTMLAttributes<HTMLDivElement>) => JSX.Element, {}> & {
+    } & React.HTMLAttributes<HTMLDivElement>) => React.JSX.Element, {}> & {
         ComposedComponent: ({ classnames: cx, className, children, classPrefix, forwardedRef, ...rest }: ThemeProps & {
             className?: string | undefined;
             children?: React.ReactNode;
             forwardedRef?: any;
-        } & React.HTMLAttributes<HTMLDivElement>) => JSX.Element;
+        } & React.HTMLAttributes<HTMLDivElement>) => React.JSX.Element;
     };
     static Footer: {
         new (props: Omit<ThemeProps & {
@@ -756,7 +756,7 @@ export declare class Modal extends React.Component<ModalProps, ModalState> {
             ref: any;
             childRef(ref: any): void;
             getWrappedInstance(): any;
-            render(): JSX.Element;
+            render(): React.JSX.Element;
             context: unknown;
             setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<ThemeProps & {
                 className?: string | undefined;
@@ -820,17 +820,17 @@ export declare class Modal extends React.Component<ModalProps, ModalState> {
             className?: string | undefined;
             children?: React.ReactNode;
             forwardedRef?: any;
-        } & React.HTMLAttributes<HTMLDivElement>) => JSX.Element>;
+        } & React.HTMLAttributes<HTMLDivElement>) => React.JSX.Element>;
     } & import("hoist-non-react-statics").NonReactStatics<({ classnames: cx, className, children, classPrefix, forwardedRef, ...rest }: ThemeProps & {
         className?: string | undefined;
         children?: React.ReactNode;
         forwardedRef?: any;
-    } & React.HTMLAttributes<HTMLDivElement>) => JSX.Element, {}> & {
+    } & React.HTMLAttributes<HTMLDivElement>) => React.JSX.Element, {}> & {
         ComposedComponent: ({ classnames: cx, className, children, classPrefix, forwardedRef, ...rest }: ThemeProps & {
             className?: string | undefined;
             children?: React.ReactNode;
             forwardedRef?: any;
-        } & React.HTMLAttributes<HTMLDivElement>) => JSX.Element;
+        } & React.HTMLAttributes<HTMLDivElement>) => React.JSX.Element;
     };
     componentDidMount(): void;
     componentWillUnmount(): void;
@@ -838,9 +838,10 @@ export declare class Modal extends React.Component<ModalProps, ModalState> {
     handleEntered: () => void;
     handleExited: () => void;
     modalRef: (ref: any) => void;
-    handleRootClickCapture(e: MouseEvent): void;
-    handleRootClick(e: MouseEvent): void;
-    render(): JSX.Element;
+    handleRootMouseDownCapture(e: MouseEvent): void;
+    handleRootMouseUpCapture(e: MouseEvent): void;
+    handleRootMouseUp(e: MouseEvent): void;
+    render(): React.JSX.Element;
 }
 declare const _default: {
     new (props: Omit<Pick<Omit<ModalProps, keyof LocaleProps>, "classPrefix" | "classnames" | "children" | "className" | "style" | "theme" | "disabled" | "onHide" | "closeOnEsc" | "contentClassName" | "width" | "height" | "closeOnOutside" | "show" | "onExited" | "onEntered"> & {
@@ -854,7 +855,7 @@ declare const _default: {
         ref: any;
         childRef(ref: any): void;
         getWrappedInstance(): any;
-        render(): JSX.Element;
+        render(): React.JSX.Element;
         context: unknown;
         setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<Pick<Omit<ModalProps, keyof LocaleProps>, "classPrefix" | "classnames" | "children" | "className" | "style" | "theme" | "disabled" | "onHide" | "closeOnEsc" | "contentClassName" | "width" | "height" | "closeOnOutside" | "show" | "onExited" | "onEntered"> & {
             size?: any;
@@ -953,7 +954,7 @@ declare const _default: {
             ref: any;
             childRef(ref: any): void;
             getWrappedInstance(): any;
-            render(): JSX.Element;
+            render(): React.JSX.Element;
             context: unknown;
             setState<K_1 extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Pick<Omit<ModalProps, keyof LocaleProps>, "classPrefix" | "classnames" | "children" | "className" | "style" | "theme" | "disabled" | "onHide" | "closeOnEsc" | "contentClassName" | "width" | "height" | "closeOnOutside" | "show" | "onExited" | "onEntered"> & {
                 size?: any;
@@ -1056,7 +1057,7 @@ declare const _default: {
         ref: any;
         childRef(ref: any): void;
         getWrappedInstance(): any;
-        render(): JSX.Element;
+        render(): React.JSX.Element;
         context: unknown;
         setState<K_1 extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Pick<Omit<ModalProps, keyof LocaleProps>, "classPrefix" | "classnames" | "children" | "className" | "style" | "theme" | "disabled" | "onHide" | "closeOnEsc" | "contentClassName" | "width" | "height" | "closeOnOutside" | "show" | "onExited" | "onEntered"> & {
             size?: any;
@@ -1159,7 +1160,7 @@ declare const _default: {
             ref: any;
             childRef(ref: any): void;
             getWrappedInstance(): any;
-            render(): JSX.Element;
+            render(): React.JSX.Element;
             context: unknown;
             setState<K_1 extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Pick<Omit<ModalProps, keyof LocaleProps>, "classPrefix" | "classnames" | "children" | "className" | "style" | "theme" | "disabled" | "onHide" | "closeOnEsc" | "contentClassName" | "width" | "height" | "closeOnOutside" | "show" | "onExited" | "onEntered"> & {
                 size?: any;

package/esm/components/Modal.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.9.0
+ * amis-ui v3.1.0
  * Copyright 2018-2023 fex
  */
 
@@ -42,10 +42,16 @@ var Modal = /** @class */ (function (_super) {
         };
         _this.handleEntered = function () {
             var onEntered = _this.props.onEntered;
+            document.body.addEventListener('mousedown', _this.handleRootMouseDownCapture, true);
+            document.body.addEventListener('mouseup', _this.handleRootMouseUpCapture, true);
+            document.body.addEventListener('mouseup', _this.handleRootMouseUp);
             onEntered && onEntered();
         };
         _this.handleExited = function () {
             var onExited = _this.props.onExited;
+            document.body.removeEventListener('mouseup', _this.handleRootMouseUp);
+            document.body.removeEventListener('mousedown', _this.handleRootMouseDownCapture, true);
+            document.body.removeEventListener('mouseup', _this.handleRootMouseUpCapture, true);
             onExited && onExited();
             setTimeout(function () {
                 if (!document.querySelector('.amis-dialog-widget')) {
@@ -72,17 +78,13 @@ var Modal = /** @class */ (function (_super) {
             this.handleEnter();
             this.handleEntered();
         }
-        document.body.addEventListener('click', this.handleRootClickCapture, true);
-        document.body.addEventListener('click', this.handleRootClick);
     };
     Modal.prototype.componentWillUnmount = function () {
         if (this.props.show) {
             this.handleExited();
         }
-        document.body.removeEventListener('click', this.handleRootClick);
-        document.body.removeEventListener('click', this.handleRootClickCapture, true);
     };
-    Modal.prototype.handleRootClickCapture = function (e) {
+    Modal.prototype.handleRootMouseDownCapture = function (e) {
         var target = e.target;
         var _a = this.props, closeOnOutside = _a.closeOnOutside, ns = _a.classPrefix;
         var isLeftButton = (e.button === 1 && window.event !== null) || e.button === 0;
@@ -93,7 +95,15 @@ var Modal = /** @class */ (function (_super) {
             ((!this.modalDom.contains(target) && !target.closest('[role=dialog]')) ||
                 (target.matches(".".concat(ns, "Modal")) && target === this.modalDom))); // 干脆过滤掉来自弹框里面的点击
     };
-    Modal.prototype.handleRootClick = function (e) {
+    Modal.prototype.handleRootMouseUpCapture = function (e) {
+        // mousedown 的时候不在弹窗里面，则不需要判断了
+        if (!this.isRootClosed) {
+            return;
+        }
+        // 再判断 mouseup 的时候是不是在弹窗里面
+        this.handleRootMouseDownCapture(e);
+    };
+    Modal.prototype.handleRootMouseUp = function (e) {
         var onHide = this.props.onHide;
         this.isRootClosed && !e.defaultPrevented && onHide(e);
     };
@@ -139,13 +149,19 @@ var Modal = /** @class */ (function (_super) {
         __metadata("design:type", Function),
         __metadata("design:paramtypes", [MouseEvent]),
         __metadata("design:returntype", void 0)
-    ], Modal.prototype, "handleRootClickCapture", null);
+    ], Modal.prototype, "handleRootMouseDownCapture", null);
+    __decorate([
+        autobind,
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", [MouseEvent]),
+        __metadata("design:returntype", void 0)
+    ], Modal.prototype, "handleRootMouseUpCapture", null);
     __decorate([
         autobind,
         __metadata("design:type", Function),
         __metadata("design:paramtypes", [MouseEvent]),
         __metadata("design:returntype", void 0)
-    ], Modal.prototype, "handleRootClick", null);
+    ], Modal.prototype, "handleRootMouseUp", null);
     return Modal;
 }(React__default.Component));
 var FinalModal = themeable(localeable(Modal));

package/esm/components/ModalManager.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.9.0
+ * amis-ui v3.1.0
  * Copyright 2018-2023 fex
  */