fix(ui): 提示浮层 - 修复键盘触发并补真实交互回归
Original-Commit: ff42bb969a037f3271e3da59b752f513c3112b2d
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
import type { ReactNode } from "react";
|
||||
import { Fragment, isValidElement, type ComponentProps, type ReactNode } from "react";
|
||||
import { Focusable, Tooltip as RACTooltip, TooltipTrigger, type Placement } from "react-aria-components";
|
||||
|
||||
import { cn } from "@/lib/utils";
|
||||
@@ -10,7 +10,7 @@ import { cn } from "@/lib/utils";
|
||||
* - 浮层定位、进出场、焦点管理由 RAC 承担(ADR-0008:复杂浮层以 RAC 为无障碍地基)。
|
||||
* - 样式只吃语义 token:bg-surface-strong(light #fff / dark #2a2a2a)+ text-foreground +
|
||||
* border-border hairline,无裸色;motion 走 RAC 动画类 + motion-reduce 关停。
|
||||
* - trigger 包一层 inline-flex span:保证 RAC ref 定位可用(children 可为任意组件)。
|
||||
* - 启用的控件直接接收 RAC 事件、ref 和描述;非交互/禁用内容用 span 接收悬停。
|
||||
* - placement 映射 AntD → RAC(topLeft→top left …)。
|
||||
* 对标:AntD Tooltip;boardui base/tooltip。
|
||||
*/
|
||||
@@ -40,18 +40,29 @@ export interface TooltipProps {
|
||||
export function Tooltip({ title, placement = "top", delay = 350, className, children }: TooltipProps) {
|
||||
if (!title) return <>{children}</>;
|
||||
|
||||
const child = isValidElement<{ disabled?: boolean; loading?: boolean; tabIndex?: number }>(children) ? children : null;
|
||||
const directTrigger =
|
||||
child && child.type !== Fragment && !child.props.disabled && !child.props.loading && (typeof child.type !== "string" || ["button", "a", "input", "select", "textarea", "summary"].includes(child.type) || child.props.tabIndex !== undefined);
|
||||
|
||||
return (
|
||||
<TooltipTrigger delay={delay}>
|
||||
{/*
|
||||
* RAC 1.21 的 TooltipTrigger 通过 context 下发 hover/focus 处理与 triggerRef,
|
||||
* 只有消费该上下文的组件才会真正挂上(原生 <span>/<button> 不会读)。直接套
|
||||
* 普通 span 的写法因此既没有触发事件、也没有定位基准,鼠标悬停永远不弹。
|
||||
* Focusable 消费该上下文并把属性和 ref 合并到子元素:聚焦与悬停都可用,弹窗
|
||||
* 也有定位基准;外层不占 Tab 位,键盘焦点落在内层控件上后冒泡触发。
|
||||
* useFocus 只处理 target === currentTarget,不能依赖内层按钮焦点冒泡到 span。
|
||||
* 直接把事件和 aria-describedby 交给启用的控件,不增加额外 Tab 停靠点。
|
||||
* 自定义控件需透传 DOM props/ref;禁用或非交互内容仍由外壳接收悬停。
|
||||
*/}
|
||||
<Focusable excludeFromTabOrder>
|
||||
<span className="inline-flex">{children}</span>
|
||||
</Focusable>
|
||||
<span className="inline-flex">
|
||||
{directTrigger ? (
|
||||
<Focusable>{child as ComponentProps<typeof Focusable>["children"]}</Focusable>
|
||||
) : (
|
||||
<Focusable excludeFromTabOrder>
|
||||
<span className="inline-flex">{children}</span>
|
||||
</Focusable>
|
||||
)}
|
||||
</span>
|
||||
<RACTooltip placement={PLACEMENT_MAP[placement]} offset={6} className={cn("z-50 max-w-64 rounded-md border border-border bg-surface-strong px-2 py-1 text-xs leading-relaxed text-foreground shadow-md", "ra-pop-in", className)}>
|
||||
{title}
|
||||
</RACTooltip>
|
||||
|
||||
Reference in New Issue
Block a user