shineout 3.8.4-beta.9 → 3.8.5-beta.1

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.8.4-beta.9'
+  version: '3.8.5-beta.1'
 };

package/dist/shineout.js

@@ -12386,7 +12386,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.8.4-beta.9');
+/* harmony default export */ var version = ('3.8.5-beta.1');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -49388,7 +49388,8 @@ function _ReactUnmount() {
 
 var hasMask = false;
 var modal_content_config = {
-  instanceIds: []
+  instanceIds: [],
+  originDocumentStyle: null
 };
 var modal_content_state = createWithHooks(modal_content_config);
 var useModalConfig = function useModalConfig() {
@@ -49405,6 +49406,12 @@ var removeModalInstance = function removeModalInstance(instanceId) {
 var getInstanceIds = function getInstanceIds() {
   return modal_content_state.mutate.instanceIds;
 };
+var setOriginDocumentStyle = function setOriginDocumentStyle(style) {
+  modal_content_state.mutate.originDocumentStyle = style;
+};
+var getOriginDocumentStyle = function getOriginDocumentStyle() {
+  return modal_content_state.mutate.originDocumentStyle;
+};
 var mousePosition = null;
 var getClickPosition = function getClickPosition(e) {
   mousePosition = {
@@ -49447,7 +49454,6 @@ var Modal = function Modal(props) {
       mouseDownTarget: null,
       mouseUpTarget: null,
       content: null,
-      originDocumentStyle: null,
       instanceId: generateUUID()
     }),
     context = _useRef.current;
@@ -49562,15 +49568,16 @@ var Modal = function Modal(props) {
       setAnimation(true);
     }
   }, [props.visible]);
+  var originDocumentStyle = getOriginDocumentStyle();
 
   // 设置 document.body.style.overflow 和 document.body.style.paddingRight，并记录原始值到 context 中
   var setDocumentOverflow = usePersistFn(function () {
     var doc = document.body.parentNode;
-    if (context.isMask && !context.originDocumentStyle) {
-      context.originDocumentStyle = {
+    if (context.isMask && !originDocumentStyle) {
+      setOriginDocumentStyle({
         overflow: doc.style.overflow,
         paddingRight: doc.style.paddingRight
-      };
+      });
     }
     doc.style.overflow = 'hidden';
     if (!doc.style.paddingRight) {
@@ -49581,9 +49588,10 @@ var Modal = function Modal(props) {
   // 还原 document.body.style.overflow 和 document.body.style.paddingRight
   var resetDocumentOverflow = usePersistFn(function () {
     var doc = document.body.parentNode;
-    if (context.originDocumentStyle) {
-      doc.style.overflow = context.originDocumentStyle.overflow;
-      doc.style.paddingRight = context.originDocumentStyle.paddingRight;
+    // 把originDocumentStyle放到全局管理后，多个modal连续打开关闭场景下，可以正确还原
+    if (originDocumentStyle) {
+      doc.style.overflow = originDocumentStyle.overflow;
+      doc.style.paddingRight = originDocumentStyle.paddingRight;
     }
   });
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
@@ -73279,7 +73287,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.8.4-beta.9'
+  version: '3.8.5-beta.1'
 });
 }();
 /******/ 	return __webpack_exports__;