@sheinx/base 3.8.4 → 3.8.5-beta.2

package/cjs/modal/modal-content.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"modal-content.d.ts","sourceRoot":"","sources":["modal-content.tsx"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AA8C9D,QAAA,MAAM,KAAK,UAAW,iBAAiB,mDA0YtC,CAAC;AAEF,eAAe,KAAK,CAAC"}
+{"version":3,"file":"modal-content.d.ts","sourceRoot":"","sources":["modal-content.tsx"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AA2D9D,QAAA,MAAM,KAAK,UAAW,iBAAiB,mDAyYtC,CAAC;AAEF,eAAe,KAAK,CAAC"}

package/cjs/modal/modal-content.js

@@ -29,7 +29,8 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 var hasMask = false;
 var config = {
-  instanceIds: []
+  instanceIds: [],
+  originDocumentStyle: null
 };
 var state = (0, _reactive.create)(config);
 var useModalConfig = function useModalConfig() {
@@ -46,6 +47,12 @@ var removeModalInstance = function removeModalInstance(instanceId) {
 var getInstanceIds = function getInstanceIds() {
   return state.mutate.instanceIds;
 };
+var setOriginDocumentStyle = function setOriginDocumentStyle(style) {
+  state.mutate.originDocumentStyle = style;
+};
+var getOriginDocumentStyle = function getOriginDocumentStyle() {
+  return state.mutate.originDocumentStyle;
+};
 var mousePosition = null;
 var getClickPosition = function getClickPosition(e) {
   mousePosition = {
@@ -88,7 +95,6 @@ var Modal = function Modal(props) {
       mouseDownTarget: null,
       mouseUpTarget: null,
       content: null,
-      originDocumentStyle: null,
       instanceId: _hooks.util.generateUUID()
     }),
     context = _useRef.current;
@@ -203,15 +209,16 @@ var Modal = function Modal(props) {
       setAnimation(true);
     }
   }, [props.visible]);
+  var originDocumentStyle = getOriginDocumentStyle();
 
   // 设置 document.body.style.overflow 和 document.body.style.paddingRight，并记录原始值到 context 中
   var setDocumentOverflow = (0, _hooks.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) {
@@ -222,9 +229,10 @@ var Modal = function Modal(props) {
   // 还原 document.body.style.overflow 和 document.body.style.paddingRight
   var resetDocumentOverflow = (0, _hooks.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, _react.useEffect)(function () {

package/cjs/tooltip/tooltip.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tooltip.d.ts","sourceRoot":"","sources":["tooltip.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAQ9C,QAAA,MAAM,OAAO,UAAW,YAAY,mDA8JnC,CAAC;AAEF,eAAe,OAAO,CAAC"}
+{"version":3,"file":"tooltip.d.ts","sourceRoot":"","sources":["tooltip.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAQ9C,QAAA,MAAM,OAAO,UAAW,YAAY,mDA+JnC,CAAC;AAEF,eAAe,OAAO,CAAC"}

package/cjs/tooltip/tooltip.js

@@ -48,6 +48,13 @@ var Tooltip = function Tooltip(props) {
     popsitionProps = _props$position === void 0 ? 'auto' : _props$position,
     _props$popupGap = props.popupGap,
     popupGap = _props$popupGap === void 0 ? 0 : _props$popupGap;
+
+  // Early validation checks BEFORE any hooks
+  if (! /*#__PURE__*/(0, _react.isValidElement)(children)) {
+    devUseWarning.error('Tooltip children expect a single ReactElement.');
+    return null;
+  }
+  if (!tip) return children;
   var tooltipClasses = jssStyle === null || jssStyle === void 0 || (_jssStyle$tooltip = jssStyle.tooltip) === null || _jssStyle$tooltip === void 0 ? void 0 : _jssStyle$tooltip.call(jssStyle);
   var config = (0, _config.useConfig)();
   var persistent = persistentProp !== null && persistentProp !== void 0 ? persistentProp : (_config$tooltip = config.tooltip) === null || _config$tooltip === void 0 ? void 0 : _config$tooltip.persistent;
@@ -106,22 +113,6 @@ var Tooltip = function Tooltip(props) {
       unbindEvents();
     };
   }, [persistent]);
-  if (! /*#__PURE__*/(0, _react.isValidElement)(children)) {
-    devUseWarning.error('Tooltip children expect a single ReactElement.');
-    return null;
-  }
-  if (!tip) return children;
-  var inner = disabledChild ? /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
-    className: tooltipClasses === null || tooltipClasses === void 0 ? void 0 : tooltipClasses.target,
-    style: {
-      cursor: 'not-allowed'
-    },
-    children: /*#__PURE__*/(0, _react.cloneElement)(children, {
-      style: _objectSpread(_objectSpread({}, childrenProps.style), {}, {
-        pointerEvents: 'none'
-      })
-    })
-  }) : children;
   var innerProps = (0, _react.useMemo)(function () {
     if (persistent) {
       return trigger === 'hover' ? _objectSpread(_objectSpread({}, events), {}, {
@@ -133,6 +124,17 @@ var Tooltip = function Tooltip(props) {
     }
     return events;
   }, [persistent, events, trigger]);
+  var inner = disabledChild ? /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+    className: tooltipClasses === null || tooltipClasses === void 0 ? void 0 : tooltipClasses.target,
+    style: {
+      cursor: 'not-allowed'
+    },
+    children: /*#__PURE__*/(0, _react.cloneElement)(children, {
+      style: _objectSpread(_objectSpread({}, childrenProps.style), {}, {
+        pointerEvents: 'none'
+      })
+    })
+  }) : children;
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
     children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("noscript", {
       ref: function ref(el) {

package/esm/modal/modal-content.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"modal-content.d.ts","sourceRoot":"","sources":["modal-content.tsx"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AA8C9D,QAAA,MAAM,KAAK,UAAW,iBAAiB,mDA0YtC,CAAC;AAEF,eAAe,KAAK,CAAC"}
+{"version":3,"file":"modal-content.d.ts","sourceRoot":"","sources":["modal-content.tsx"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AA2D9D,QAAA,MAAM,KAAK,UAAW,iBAAiB,mDAyYtC,CAAC;AAEF,eAAe,KAAK,CAAC"}

package/esm/modal/modal-content.js

@@ -23,7 +23,8 @@ import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 var hasMask = false;
 var config = {
-  instanceIds: []
+  instanceIds: [],
+  originDocumentStyle: null
 };
 var state = create(config);
 var useModalConfig = function useModalConfig() {
@@ -40,6 +41,12 @@ var removeModalInstance = function removeModalInstance(instanceId) {
 var getInstanceIds = function getInstanceIds() {
   return state.mutate.instanceIds;
 };
+var setOriginDocumentStyle = function setOriginDocumentStyle(style) {
+  state.mutate.originDocumentStyle = style;
+};
+var getOriginDocumentStyle = function getOriginDocumentStyle() {
+  return state.mutate.originDocumentStyle;
+};
 var mousePosition = null;
 var getClickPosition = function getClickPosition(e) {
   mousePosition = {
@@ -82,7 +89,6 @@ var Modal = function Modal(props) {
       mouseDownTarget: null,
       mouseUpTarget: null,
       content: null,
-      originDocumentStyle: null,
       instanceId: util.generateUUID()
     }),
     context = _useRef.current;
@@ -197,15 +203,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) {
@@ -216,9 +223,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;
     }
   });
   useEffect(function () {

package/esm/tooltip/tooltip.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tooltip.d.ts","sourceRoot":"","sources":["tooltip.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAQ9C,QAAA,MAAM,OAAO,UAAW,YAAY,mDA8JnC,CAAC;AAEF,eAAe,OAAO,CAAC"}
+{"version":3,"file":"tooltip.d.ts","sourceRoot":"","sources":["tooltip.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAQ9C,QAAA,MAAM,OAAO,UAAW,YAAY,mDA+JnC,CAAC;AAEF,eAAe,OAAO,CAAC"}

package/esm/tooltip/tooltip.js

@@ -41,6 +41,13 @@ var Tooltip = function Tooltip(props) {
     popsitionProps = _props$position === void 0 ? 'auto' : _props$position,
     _props$popupGap = props.popupGap,
     popupGap = _props$popupGap === void 0 ? 0 : _props$popupGap;
+
+  // Early validation checks BEFORE any hooks
+  if (! /*#__PURE__*/isValidElement(children)) {
+    devUseWarning.error('Tooltip children expect a single ReactElement.');
+    return null;
+  }
+  if (!tip) return children;
   var tooltipClasses = jssStyle === null || jssStyle === void 0 || (_jssStyle$tooltip = jssStyle.tooltip) === null || _jssStyle$tooltip === void 0 ? void 0 : _jssStyle$tooltip.call(jssStyle);
   var config = useConfig();
   var persistent = persistentProp !== null && persistentProp !== void 0 ? persistentProp : (_config$tooltip = config.tooltip) === null || _config$tooltip === void 0 ? void 0 : _config$tooltip.persistent;
@@ -99,22 +106,6 @@ var Tooltip = function Tooltip(props) {
       unbindEvents();
     };
   }, [persistent]);
-  if (! /*#__PURE__*/isValidElement(children)) {
-    devUseWarning.error('Tooltip children expect a single ReactElement.');
-    return null;
-  }
-  if (!tip) return children;
-  var inner = disabledChild ? /*#__PURE__*/_jsx("span", {
-    className: tooltipClasses === null || tooltipClasses === void 0 ? void 0 : tooltipClasses.target,
-    style: {
-      cursor: 'not-allowed'
-    },
-    children: /*#__PURE__*/cloneElement(children, {
-      style: _objectSpread(_objectSpread({}, childrenProps.style), {}, {
-        pointerEvents: 'none'
-      })
-    })
-  }) : children;
   var innerProps = useMemo(function () {
     if (persistent) {
       return trigger === 'hover' ? _objectSpread(_objectSpread({}, events), {}, {
@@ -126,6 +117,17 @@ var Tooltip = function Tooltip(props) {
     }
     return events;
   }, [persistent, events, trigger]);
+  var inner = disabledChild ? /*#__PURE__*/_jsx("span", {
+    className: tooltipClasses === null || tooltipClasses === void 0 ? void 0 : tooltipClasses.target,
+    style: {
+      cursor: 'not-allowed'
+    },
+    children: /*#__PURE__*/cloneElement(children, {
+      style: _objectSpread(_objectSpread({}, childrenProps.style), {}, {
+        pointerEvents: 'none'
+      })
+    })
+  }) : children;
   return /*#__PURE__*/_jsxs(_Fragment, {
     children: [/*#__PURE__*/_jsx("noscript", {
       ref: function ref(el) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sheinx/base",
-  "version": "3.8.4",
+  "version": "3.8.5-beta.2",
   "description": "",
   "keywords": [],
   "license": "MIT",
@@ -10,7 +10,7 @@
   "module": "./esm/index.js",
   "typings": "./cjs/index.d.ts",
   "dependencies": {
-    "@sheinx/hooks": "3.8.4",
+    "@sheinx/hooks": "3.8.5-beta.2",
     "immer": "^10.0.0",
     "classnames": "^2.0.0",
     "@shined/reactive": "^0.1.3-alpha.0"