shineout 3.8.6-beta.4 → 3.8.6-beta.6

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.6-beta.4'
+  version: '3.8.6-beta.6'
 };

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.6-beta.4');
+/* harmony default export */ var version = ('3.8.6-beta.6');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -31147,12 +31147,14 @@ var getPositionStyle = function getPositionStyle(position, config) {
   return newStyle;
 };
 ;// CONCATENATED MODULE: ../hooks/src/common/use-position-style/get-sizing-style.ts
-// 第一阶段：支持上下边界的高度限制
+// 第一阶段：支持上下边界的高度限制，为vertical模式的Menu实现的
 // TODO 后续支持左右边界的宽度限制
 var getSizingStyle = function getSizingStyle(position, _ref) {
   var boundary = _ref.boundary,
     parentRect = _ref.parentRect;
-  var boundaryRect = boundary.getBoundingClientRect();
+  var boundaryEl = boundary();
+  if (!boundaryEl) return {};
+  var boundaryRect = boundaryEl.getBoundingClientRect();
   var maxHeight;
   if (position.endsWith('-top')) {
     maxHeight = boundaryRect.bottom - parentRect.top;
@@ -31481,7 +31483,6 @@ var getScrollPosition = function getScrollPosition(element) {
 
 
 
-
 var horizontalPosition = ['left-bottom', 'left-top', 'right-bottom', 'right-top', 'left', 'right'];
 var verticalPosition = ['bottom-left', 'bottom-right', 'top-left', 'top-right', 'bottom', 'top'];
 var hideStyle = {
@@ -31520,12 +31521,15 @@ var usePositionStyle = function usePositionStyle(config) {
     updateKey = _ref.updateKey,
     adjust = _ref.adjust,
     offset = _ref.offset,
-    checkPosition = _ref.checkPosition;
+    checkPosition = _ref.checkPosition,
+    setSizingStyle = _ref.setSizingStyle;
   // 初次渲染无样式的时候， 隐藏展示
   var _useState = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(hideStyle),
     _useState2 = slicedToArray_default()(_useState, 2),
     style = _useState2[0],
     setStyle = _useState2[1];
+  // const [sizingStyle, setSizingStyle] = useState<React.CSSProperties>();
+
   var _React$useRef = external_root_React_commonjs2_react_commonjs_react_amd_react_default().useRef({
       containerRect: {
         left: 0,
@@ -31694,7 +31698,7 @@ var usePositionStyle = function usePositionStyle(config) {
     if (verticalPosition.includes(targetPosition)) {
       var _targetPosition$split = targetPosition.split('-'),
         _targetPosition$split2 = slicedToArray_default()(_targetPosition$split, 2),
-        v = _targetPosition$split2[0],
+        _v = _targetPosition$split2[0],
         h = _targetPosition$split2[1];
       var overRight = 0;
       var overLeft = 0;
@@ -31732,7 +31736,7 @@ var usePositionStyle = function usePositionStyle(config) {
           style.left += overLeft;
         }
       }
-      if (v === 'bottom') {
+      if (_v === 'bottom') {
         style.top = rect.bottom - containerRect.top + containerScroll.top + popupGap;
       } else {
         style.top = rect.top - containerRect.top + containerScroll.top - popupGap;
@@ -31742,11 +31746,11 @@ var usePositionStyle = function usePositionStyle(config) {
       var _targetPosition$split3 = targetPosition.split('-'),
         _targetPosition$split4 = slicedToArray_default()(_targetPosition$split3, 2),
         _h = _targetPosition$split4[0],
-        _v = _targetPosition$split4[1];
-      if (_v === 'top') {
+        _v2 = _targetPosition$split4[1];
+      if (_v2 === 'top') {
         style.top = rect.top - containerRect.top + containerScroll.top - (offset ? offset[1] : 0);
         setTransform(style, 'translateX(0%)');
-      } else if (_v === 'bottom') {
+      } else if (_v2 === 'bottom') {
         style.top = rect.bottom - containerRect.top + containerScroll.top + (offset ? offset[1] : 0);
         setTransform(style, 'translateY(-100%)');
       } else {
@@ -31812,7 +31816,9 @@ var usePositionStyle = function usePositionStyle(config) {
     var _ref2 = config || {},
       position = _ref2.position,
       absolute = _ref2.absolute;
-    if (!position || !show || !parentElRef.current) return style;
+    if (!position || !show || !parentElRef.current) return {
+      newStyle: style
+    };
     context.parentRect = parentElRef.current.getBoundingClientRect();
     var realPosition = position;
     if (adjust) {
@@ -31840,19 +31846,27 @@ var usePositionStyle = function usePositionStyle(config) {
       newStyle.transformOrigin = 'center top';
     }
     if (boundary && show && popupElRef.current) {
-      var sizingStyle = getSizingStyle(realPosition, {
+      var newSizingStyle = getSizingStyle(realPosition, {
         boundary: boundary,
         parentRect: context.parentRect
       });
-      return objectSpread2_default()(objectSpread2_default()({}, newStyle), sizingStyle);
+      return {
+        newStyle: newStyle,
+        newSizingStyle: newSizingStyle
+      };
     }
-    return newStyle;
+    return {
+      newStyle: newStyle
+    };
   };
   var updateStyle = use_persist_fn(function () {
-    var newStyle = getStyle();
+    var _getStyle = getStyle(),
+      newStyle = _getStyle.newStyle,
+      newSizingStyle = _getStyle.newSizingStyle;
     if (newStyle && !shallow_equal(style, newStyle)) {
       setStyle(newStyle);
     }
+    setSizingStyle === null || setSizingStyle === void 0 || setSizingStyle(newSizingStyle);
 
     // 当父元素的滚动容器滚动时，判断是否需要更新弹出层位置，包括是否隐藏弹出层（通过hideStyle隐藏，不是show状态）
     if (show) {
@@ -32529,6 +32543,7 @@ var AbsoluteList = function AbsoluteList(props) {
     adjust = props.adjust,
     onAdjust = props.onAdjust,
     offset = props.offset,
+    setSizingStyle = props.setSizingStyle,
     _props$destroy = props.destroy,
     destroy = _props$destroy === void 0 ? false : _props$destroy,
     _props$lazy = props.lazy,
@@ -32576,7 +32591,8 @@ var AbsoluteList = function AbsoluteList(props) {
       adjust: adjust,
       offset: offset,
       onAdjust: onAdjust,
-      checkPosition: checkPosition
+      checkPosition: checkPosition,
+      setSizingStyle: setSizingStyle
     }),
     style = _usePositionStyle.style;
   var childStyle = children.props.style;
@@ -32671,11 +32687,15 @@ var Popover = function Popover(props) {
     _React$useState2 = slicedToArray_default()(_React$useState, 2),
     positionState = _React$useState2[0],
     setPositionState = _React$useState2[1];
-  var events = getTargetProps();
-  var _React$useState3 = external_root_React_commonjs2_react_commonjs_react_amd_react_default().useState(0),
+  var _React$useState3 = external_root_React_commonjs2_react_commonjs_react_amd_react_default().useState(),
     _React$useState4 = slicedToArray_default()(_React$useState3, 2),
-    updateKey = _React$useState4[0],
-    setUpdateKey = _React$useState4[1];
+    contentStyle = _React$useState4[0],
+    setContentStyle = _React$useState4[1];
+  var events = getTargetProps();
+  var _React$useState5 = external_root_React_commonjs2_react_commonjs_react_amd_react_default().useState(0),
+    _React$useState6 = slicedToArray_default()(_React$useState5, 2),
+    updateKey = _React$useState6[0],
+    setUpdateKey = _React$useState6[1];
   var handleUpdateKey = usePersistFn(function () {
     setUpdateKey(function (prev) {
       return (prev + 1) % 2;
@@ -32784,6 +32804,7 @@ var Popover = function Popover(props) {
     lazy: props.lazy,
     offset: props.offset,
     updateKey: updateKey,
+    setSizingStyle: props.boundary ? setContentStyle : undefined,
     children: /*#__PURE__*/(0,jsx_runtime.jsxs)("div", objectSpread2_default()(objectSpread2_default()(objectSpread2_default()({
       className: classnames_default()(className, popoverStyle === null || popoverStyle === void 0 ? void 0 : popoverStyle.rootClass, popoverStyle === null || popoverStyle === void 0 ? void 0 : popoverStyle.wrapper, open && (popoverStyle === null || popoverStyle === void 0 ? void 0 : popoverStyle.wrapperOpen), !showArrow && (popoverStyle === null || popoverStyle === void 0 ? void 0 : popoverStyle.hideArrow)),
       style: containerStyle
@@ -32799,7 +32820,7 @@ var Popover = function Popover(props) {
         className: classnames_default()(popoverStyle === null || popoverStyle === void 0 ? void 0 : popoverStyle.arrow, props.arrowClass),
         dir: config.direction
       }), /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
-        style: style,
+        style: objectSpread2_default()(objectSpread2_default()({}, contentStyle), style),
         onClick: emptyEvent,
         className: classnames_default()(popoverStyle === null || popoverStyle === void 0 ? void 0 : popoverStyle.content, (typeof childrened === 'string' || props.useTextStyle) && (popoverStyle === null || popoverStyle === void 0 ? void 0 : popoverStyle.text)),
         children: /*#__PURE__*/(0,jsx_runtime.jsx)(Provider, {
@@ -49663,7 +49684,6 @@ var Modal = function Modal(props) {
     if (props.setInnerClose) {
       props.setInnerClose(function () {
         setVisible(false);
-        setAnimation(true);
       });
     }
   }, [props.setInnerClose]);
@@ -59785,7 +59805,10 @@ var MenuItem = function MenuItem(props) {
           minWidth: liRef.current.clientWidth
         };
       }
-      return /*#__PURE__*/(0,jsx_runtime.jsx)(src_popover_popover, {
+      return /*#__PURE__*/(0,jsx_runtime.jsx)(src_popover_popover
+      // popover现在有出现动画了，避免快速切换子菜单时的动画太多，也加上toggleDuration
+      , {
+        mouseEnterDelay: toggleDuration,
         mouseLeaveDelay: toggleDuration,
         className: classnames_default()(classes === null || classes === void 0 ? void 0 : classes.popover),
         attributes: getDataAttribute({
@@ -59800,7 +59823,9 @@ var MenuItem = function MenuItem(props) {
         lazy: false,
         offset: offset,
         style: popoverContentStyle,
-        boundary: mode !== 'horizontal' ? props.scrollRef.current : undefined,
+        boundary: mode !== 'horizontal' ? function () {
+          return props.scrollRef.current;
+        } : undefined,
         children: function children(close) {
           return content(close);
         }
@@ -73325,7 +73350,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.8.6-beta.4'
+  version: '3.8.6-beta.6'
 });
 }();
 /******/ 	return __webpack_exports__;