amis-ui 2.9.0 → 3.1.0

package/lib/components/Modal.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.9.0
+ * amis-ui v3.1.0
  * Copyright 2018-2023 fex
  */
 
@@ -52,10 +52,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')) {
@@ -82,17 +88,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;
@@ -103,7 +105,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);
     };
@@ -149,13 +159,19 @@ var Modal = /** @class */ (function (_super) {
         tslib.__metadata("design:type", Function),
         tslib.__metadata("design:paramtypes", [MouseEvent]),
         tslib.__metadata("design:returntype", void 0)
-    ], Modal.prototype, "handleRootClickCapture", null);
+    ], Modal.prototype, "handleRootMouseDownCapture", null);
+    tslib.__decorate([
+        amisCore.autobind,
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", [MouseEvent]),
+        tslib.__metadata("design:returntype", void 0)
+    ], Modal.prototype, "handleRootMouseUpCapture", null);
     tslib.__decorate([
         amisCore.autobind,
         tslib.__metadata("design:type", Function),
         tslib.__metadata("design:paramtypes", [MouseEvent]),
         tslib.__metadata("design:returntype", void 0)
-    ], Modal.prototype, "handleRootClick", null);
+    ], Modal.prototype, "handleRootMouseUp", null);
     return Modal;
 }(React__default["default"].Component));
 var FinalModal = amisCore.themeable(amisCore.localeable(Modal));

package/lib/components/ModalManager.js

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