fix(Tooltip)：修复被禁用时任然可能触发弹层问题 #772 (#773)

uiwjs · Apr 15, 2022 · 85881fc · 85881fc
1 parent 305541d
commit 85881fc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/packages/react-overlay-trigger/src/index.tsx b/packages/react-overlay-trigger/src/index.tsx
@@ -198,14 +198,14 @@ export default React.forwardRef<OverlayTriggerRef, OverlayTriggerProps>((props,
     hoverStateRef.current = 'show';
 
     const delay = normalizeDelay(props.delay);
-
-    if (!delay.show) {
+    if (!delay.show && !(props.children as JSX.Element)?.props.disabled) {
       show();
       return;
     }
     const handle = window.setTimeout(() => {
       if (hoverStateRef.current === 'show') show();
     }, delay.show);
+    clearTimeout(handle);
     timeoutRef.current.push(handle);
   }
 

diff --git a/packages/react-tooltip/README.md b/packages/react-tooltip/README.md
@@ -36,6 +36,9 @@ const Demo = () => (
     <Tooltip placement="bottom" content="下边文字提示">
       <Button>下边文字提示(bottom)</Button>
     </Tooltip>
+    <Tooltip placement="top" content="已被禁用">
+      <Button disabled={true}>禁用</Button>
+    </Tooltip>
   </div>
 )
 ReactDOM.render(<Demo />, _mount_);