shineout 3.7.2-beta.2 → 3.7.2-beta.4

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.7.2-beta.2'
+  version: '3.7.2-beta.4'
 };

package/dist/shineout.js

@@ -12234,7 +12234,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.7.2-beta.2');
+/* harmony default export */ var version = ('3.7.2-beta.4');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -14371,6 +14371,7 @@ var selectTokens = {
   selectLargeTagLineHeight: 'Line-height-dynamic',
   selectInnerPaddingX: 'Spacing-8',
   selectInnerPaddingY: 'Spacing-5',
+  selectInnerTitleMarginY: 'Spacing-2',
   selectPlaceholderColor: 'Neutral-text-2',
   selectPlaceholderMarginY: 'Spacing-2',
   selectBackgroundColor: 'Neutral-fill-1',
@@ -17325,6 +17326,7 @@ var cascaderStyle = objectSpread2_default()(objectSpread2_default()({
     },
     '& $tag': {
       marginTop: 0,
+      marginBottom: src.selectInnerTitleMarginY,
       paddingTop: 0,
       paddingBottom: 0,
       height: selectTagHeight,
@@ -23189,6 +23191,7 @@ var selectStyle = objectSpread2_default()(objectSpread2_default()({
     },
     '& $tag': {
       marginTop: 0,
+      marginBottom: src.selectInnerTitleMarginY,
       paddingTop: 0,
       paddingBottom: 0,
       height: select_selectTagHeight,
@@ -28724,6 +28727,7 @@ var treeSelectStyle = objectSpread2_default()(objectSpread2_default()({
     },
     '& $tag': {
       marginTop: 0,
+      marginBottom: src.selectInnerTitleMarginY,
       paddingTop: 0,
       paddingBottom: 0,
       height: tree_select_selectTagHeight,
@@ -48256,7 +48260,11 @@ var Modal = function Modal(props) {
       isMask: false,
       mouseDownTarget: null,
       mouseUpTarget: null,
-      content: null
+      content: null,
+      originDocumentStyle: {
+        overflow: '',
+        paddingRight: ''
+      }
     }),
     context = _useRef.current;
   var _useState3 = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(props.visible || props.autoShow),
@@ -48356,18 +48364,33 @@ var Modal = function Modal(props) {
       setAnimation(true);
     }
   }, [props.visible]);
+
+  // 设置 document.body.style.overflow 和 document.body.style.paddingRight，并记录原始值到 context 中
+  var setDocumentOverflow = usePersistFn(function () {
+    var doc = document.body.parentNode;
+    if (context.isMask) {
+      context.originDocumentStyle.overflow = doc.style.overflow;
+      context.originDocumentStyle.paddingRight = doc.style.paddingRight;
+    }
+    doc.style.overflow = 'hidden';
+    if (!doc.style.paddingRight) {
+      doc.style.paddingRight = "".concat(window.innerWidth - docSize.width, "px");
+    }
+  });
+
+  // 还原 document.body.style.overflow 和 document.body.style.paddingRight
+  var resetDocumentOverflow = usePersistFn(function () {
+    var doc = document.body.parentNode;
+    doc.style.overflow = context.originDocumentStyle.overflow;
+    doc.style.paddingRight = context.originDocumentStyle.paddingRight;
+  });
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
     if (!props.hideMask) {
-      var doc = document.body.parentNode;
       if (visible) {
-        doc.style.overflow = 'hidden';
-        if (!doc.style.paddingRight) {
-          doc.style.paddingRight = "".concat(window.innerWidth - docSize.width, "px");
-        }
+        setDocumentOverflow();
       } else {
         if (!context.isMask) return;
-        doc.style.paddingRight = '';
-        doc.style.overflow = '';
+        resetDocumentOverflow();
       }
     }
   }, [visible]);
@@ -48381,20 +48404,15 @@ var Modal = function Modal(props) {
     // unmount
     return function () {
       var _props$shouldDestroy2;
+      if (context.isMask) {
+        resetDocumentOverflow();
+      }
+      ;
       (_props$shouldDestroy2 = props.shouldDestroy) === null || _props$shouldDestroy2 === void 0 || _props$shouldDestroy2.call(props, true);
-      // if (props.autoShow) {
-      //   props.onClose?.();
-      // }
       if (context.isMask) {
         context.isMask = false;
         hasMask = false;
       }
-      {
-        if (!context.isMask) return;
-        var doc = document.body.parentNode;
-        doc.style.paddingRight = '';
-        doc.style.overflow = '';
-      }
     };
   }, []);
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
@@ -71415,7 +71433,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.7.2-beta.2'
+  version: '3.7.2-beta.4'
 });
 }();
 /******/ 	return __webpack_exports__;