shineout 3.8.4-beta.7 → 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.7'
+  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.7');
+/* 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)) {
@@ -33528,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) {
@@ -33537,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,
@@ -73259,7 +73278,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.8.4-beta.7'
+  version: '3.8.4-beta.8'
 });
 }();
 /******/ 	return __webpack_exports__;