shineout 3.8.4-beta.6 → 3.8.4-beta.8

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

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.6');
+/* harmony default export */ var version = ('3.8.4-beta.8');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -30750,6 +30750,10 @@ var usePopup = function usePopup(props) {
   var handleMouseEnter = use_persist_fn(function (e) {
     var _targetEvents$onMouse, _targetRef$current, _popupRef$current2;
     targetEvents === null || targetEvents === void 0 || (_targetEvents$onMouse = targetEvents.onMouseEnter) === null || _targetEvents$onMouse === void 0 || _targetEvents$onMouse.call(targetEvents, e);
+    // todo: 考虑是否严格一些执行，比如需要判断是否是子元素
+    // if (targetRef.current?.contains(e.target as Node)) {
+    //   targetEvents?.onMouseEnter?.(e);
+    // }
     if (trigger !== 'hover') return;
     var isParentContainsCurrent = (_targetRef$current = targetRef.current) === null || _targetRef$current === void 0 ? void 0 : _targetRef$current.contains(e.target);
     if (isParentContainsCurrent || popupRef !== null && popupRef !== void 0 && (_popupRef$current2 = popupRef.current) !== null && _popupRef$current2 !== void 0 && _popupRef$current2.contains(e.target)) {
@@ -30759,6 +30763,10 @@ var usePopup = function usePopup(props) {
   var handleMouseLeave = use_persist_fn(function (e) {
     var _targetEvents$onMouse2, _popupRef$current3;
     targetEvents === null || targetEvents === void 0 || (_targetEvents$onMouse2 = targetEvents.onMouseLeave) === null || _targetEvents$onMouse2 === void 0 || _targetEvents$onMouse2.call(targetEvents, e);
+    // todo: 考虑是否严格一些执行，比如需要判断是否是子元素
+    // if (targetRef.current?.contains(e.target as Node)) {
+    //   targetEvents?.onMouseLeave?.(e);
+    // }
     if (trigger !== 'hover') return;
     // @ts-ignore
     if (e.relatedTarget instanceof HTMLElement && (_popupRef$current3 = popupRef.current) !== null && _popupRef$current3 !== void 0 && _popupRef$current3.contains(e.relatedTarget)) {
@@ -31535,10 +31543,43 @@ var usePositionStyle = function usePositionStyle(config) {
       setPopupElWidth(popupElRef.current.getBoundingClientRect().width);
     }
   }, [show, popupElRef.current]);
-  var adjustPosition = function adjustPosition(position) {
+  var adjustHorizontalPosition = function adjustHorizontalPosition(position) {
+    var _config$onAdjust;
+    var winWidth = docSize.width;
     var winHeight = docSize.height;
-    if (!verticalPosition.includes(position)) return position;
     var newPosition = position;
+    var _position$split = position.split('-'),
+      _position$split2 = slicedToArray_default()(_position$split, 2),
+      h = _position$split2[0],
+      v = _position$split2[1];
+    if (h === 'right') {
+      var horizontalPoint = context.parentRect.left + context.parentRect.width;
+      if (horizontalPoint / winWidth > 0.5 && horizontalPoint + context.popUpWidth > winWidth) {
+        newPosition = position.replace('right', 'left');
+      }
+    } else if (h === 'left') {
+      var _horizontalPoint = context.parentRect.left;
+      if (_horizontalPoint / winWidth < 0.5 && _horizontalPoint < context.popUpWidth) {
+        newPosition = position.replace('left', 'right');
+      }
+    }
+    if (v === 'top') {
+      var verticalPoint = context.parentRect.top;
+      if (verticalPoint / winHeight > 0.5 && verticalPoint + context.popUpHeight > winHeight) {
+        newPosition = newPosition.replace('top', 'bottom');
+      }
+    } else if (v === 'bottom') {
+      var _verticalPoint = context.parentRect.bottom;
+      if (_verticalPoint / winHeight < 0.5 && _verticalPoint < context.popUpHeight) {
+        newPosition = newPosition.replace('bottom', 'top');
+      }
+    }
+    config === null || config === void 0 || (_config$onAdjust = config.onAdjust) === null || _config$onAdjust === void 0 || _config$onAdjust.call(config, newPosition);
+    return newPosition;
+  };
+  var adjustVerticalPosition = function adjustVerticalPosition(position) {
+    var newPosition = position;
+    var winHeight = docSize.height;
     var verticalPoint = context.parentRect.top + context.parentRect.height / 2;
     if (position.startsWith('top')) {
       if (verticalPoint / winHeight < 0.5 && context.parentRect.top - context.popUpHeight - popupGap < 0) {
@@ -31563,15 +31604,21 @@ var usePositionStyle = function usePositionStyle(config) {
       }
     } else {
       // absolute 场景下，右侧溢出判断需要考虑弹出层元素的尺寸
-      var _position$split = position.split('-'),
-        _position$split2 = slicedToArray_default()(_position$split, 2),
-        _horizontalPosition = _position$split2[1];
+      var _position$split3 = position.split('-'),
+        _position$split4 = slicedToArray_default()(_position$split3, 2),
+        _horizontalPosition = _position$split4[1];
       if (_horizontalPosition === 'left' && context.parentRect.left + (popupElWidth || context.popUpWidth) > docSize.width) {
         newPosition = newPosition.replace('left', 'right');
       }
     }
     return newPosition;
   };
+  var adjustPosition = function adjustPosition(position) {
+    if (!verticalPosition.includes(position)) {
+      return adjustHorizontalPosition(position);
+    }
+    return adjustVerticalPosition(position);
+  };
   var getPopUpInfo = function getPopUpInfo(parentRect) {
     var _popupElRef$current$p;
     if (!popupElRef.current) return {
@@ -32451,6 +32498,7 @@ var AbsoluteList = function AbsoluteList(props) {
     updateKey = props.updateKey,
     popupGap = props.popupGap,
     adjust = props.adjust,
+    onAdjust = props.onAdjust,
     offset = props.offset,
     _props$destroy = props.destroy,
     destroy = _props$destroy === void 0 ? false : _props$destroy,
@@ -32494,7 +32542,8 @@ var AbsoluteList = function AbsoluteList(props) {
       updateKey: updateKey,
       popupGap: popupGap,
       adjust: adjust,
-      offset: offset
+      offset: offset,
+      onAdjust: onAdjust
     }),
     style = _usePositionStyle.style;
   var childStyle = children.props.style;
@@ -32585,11 +32634,15 @@ var Popover = function Popover(props) {
     closePop = _usePopup.closePop,
     Provider = _usePopup.Provider,
     providerValue = _usePopup.providerValue;
-  var events = getTargetProps();
-  var _React$useState = external_root_React_commonjs2_react_commonjs_react_amd_react_default().useState(0),
+  var _React$useState = external_root_React_commonjs2_react_commonjs_react_amd_react_default().useState(position),
     _React$useState2 = slicedToArray_default()(_React$useState, 2),
-    updateKey = _React$useState2[0],
-    setUpdateKey = _React$useState2[1];
+    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),
+    _React$useState4 = slicedToArray_default()(_React$useState3, 2),
+    updateKey = _React$useState4[0],
+    setUpdateKey = _React$useState4[1];
   var handleUpdateKey = usePersistFn(function () {
     setUpdateKey(function (prev) {
       return (prev + 1) % 2;
@@ -32693,6 +32746,7 @@ var Popover = function Popover(props) {
     destroy: destroy,
     zIndex: zIndex,
     adjust: props.adjust,
+    onAdjust: props.adjust ? setPositionState : undefined,
     lazy: props.lazy,
     offset: props.offset,
     updateKey: updateKey,
@@ -32700,7 +32754,7 @@ var Popover = function Popover(props) {
       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
     }, getDataAttribute({
-      position: position,
+      position: props.adjust ? positionState : position,
       type: type
     })), props.attributes), {}, {
       ref: popupRef,
@@ -33482,6 +33536,17 @@ var Tooltip = function Tooltip(props) {
       })
     })
   }) : children;
+  var innerProps = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useMemo)(function () {
+    if (persistent) {
+      return trigger === 'hover' ? objectSpread2_default()(objectSpread2_default()({}, events), {}, {
+        onMouseEnter: undefined,
+        onMouseLeave: undefined
+      }) : objectSpread2_default()(objectSpread2_default()({}, events), {}, {
+        onClick: undefined
+      });
+    }
+    return events;
+  }, [persistent, events, trigger]);
   return /*#__PURE__*/(0,jsx_runtime.jsxs)(jsx_runtime.Fragment, {
     children: [/*#__PURE__*/(0,jsx_runtime.jsx)("noscript", {
       ref: function ref(el) {
@@ -33491,7 +33556,7 @@ var Tooltip = function Tooltip(props) {
         if (targetRef.current === targetEl) return;
         targetRef.current = targetEl;
       }
-    }, 'ns'), /*#__PURE__*/(0,external_root_React_commonjs2_react_commonjs_react_amd_react_.cloneElement)(inner, events), /*#__PURE__*/(0,jsx_runtime.jsx)(absolute_list, {
+    }, 'ns'), /*#__PURE__*/(0,external_root_React_commonjs2_react_commonjs_react_amd_react_.cloneElement)(inner, innerProps), /*#__PURE__*/(0,jsx_runtime.jsx)(absolute_list, {
       focus: open,
       parentElRef: targetRef,
       popupElRef: popupRef,
@@ -50213,7 +50278,7 @@ var Dropdown = function Dropdown(props) {
       fixedWidth: 'min',
       popupGap: 4,
       popupElRef: popupRef,
-      adjust: !isSub && adjust,
+      adjust: adjust,
       children: /*#__PURE__*/(0,jsx_runtime.jsx)(animation_list, {
         display: columns ? 'grid' : 'block',
         className: classnames_default()(dropdownClasses === null || dropdownClasses === void 0 ? void 0 : dropdownClasses.list, hasChildren && (dropdownClasses === null || dropdownClasses === void 0 ? void 0 : dropdownClasses.listHasChildren), columns !== undefined && columns > 1 && (dropdownClasses === null || dropdownClasses === void 0 ? void 0 : dropdownClasses.boxList), size === 'small' && (dropdownClasses === null || dropdownClasses === void 0 ? void 0 : dropdownClasses.listSmall), size === 'large' && (dropdownClasses === null || dropdownClasses === void 0 ? void 0 : dropdownClasses.listLarge)),
@@ -73213,7 +73278,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.8.4-beta.6'
+  version: '3.8.4-beta.8'
 });
 }();
 /******/ 	return __webpack_exports__;