shineout 3.9.8-beta.10 → 3.9.8-beta.11

package/cjs/index.js

@@ -522,5 +522,5 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 // 此文件由脚本自动生成，请勿直接修改。
 // This file was generated automatically by a script. Please do not modify it directly.
 var _default = exports.default = {
-  version: '3.9.8-beta.10'
+  version: '3.9.8-beta.11'
 };

package/dist/shineout.js

@@ -12402,7 +12402,7 @@ var handleStyle = function handleStyle(style) {
 };
 /* harmony default export */ var jss_style_handleStyle = (handleStyle);
 ;// CONCATENATED MODULE: ../shineout-style/src/version.ts
-/* harmony default export */ var version = ('3.9.8-beta.10');
+/* harmony default export */ var version = ('3.9.8-beta.11');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -50470,6 +50470,7 @@ function _ReactUnmount() {
 
 
 
+
 var hasMask = false;
 var modal_content_config = {
   instanceIds: [],
@@ -50528,6 +50529,8 @@ var Modal = function Modal(props) {
   var _props$jssStyle, _props$jssStyle$modal;
   var modalClasses = (_props$jssStyle = props.jssStyle) === null || _props$jssStyle === void 0 || (_props$jssStyle$modal = _props$jssStyle.modal) === null || _props$jssStyle$modal === void 0 ? void 0 : _props$jssStyle$modal.call(_props$jssStyle);
   var panelRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)(null);
+  var wrapperRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)(null);
+  var popupCtx = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useContext)(popup_context);
   var isPositionX = ['left', 'right'].includes(props.position || '');
   var isPositionY = ['top', 'bottom'].includes(props.position || '');
   var defaultWidth = isPositionX ? 'auto' : 500;
@@ -50741,6 +50744,22 @@ var Modal = function Modal(props) {
     }
   }, [props.setInnerClose]);
 
+  // 将 Modal 的 ref 注册到父 Popover 的 chain 中，防止点击 Modal 时关闭 Popover
+  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useLayoutEffect)(function () {
+    // Modal 显示或关闭动画播放期间，都需要在 chain 中
+    if (wrapperRef.current) {
+      if (visible) {
+        popupCtx.bindChild(wrapperRef);
+      } else {
+        popupCtx.removeChild(wrapperRef);
+      }
+    }
+    return function () {
+      // 确保清理时移除
+      popupCtx.removeChild(wrapperRef);
+    };
+  }, [visible]);
+
   // render
   var renderIcon = function renderIcon(isEmptyTitle) {
     var iconRoot = classnames_default()(modalClasses === null || modalClasses === void 0 ? void 0 : modalClasses.headerIcon, isEmptyTitle && (modalClasses === null || modalClasses === void 0 ? void 0 : modalClasses.emptyIcon));
@@ -50869,6 +50888,7 @@ var Modal = function Modal(props) {
   context.content = content;
   return /*#__PURE__*/(0,jsx_runtime.jsx)(FormFooterProvider, {
     children: /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
+      ref: wrapperRef,
       onClick: function onClick(e) {
         e.stopPropagation();
       },
@@ -75158,7 +75178,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.9.8-beta.10'
+  version: '3.9.8-beta.11'
 });
 }();
 /******/ 	return __webpack_exports__;