From 17c334b447f341cad8cb8dc03a4cd426fc6c65fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E8=89=B3=E5=85=B5?= Date: Fri, 22 May 2026 09:36:13 +0800 Subject: [PATCH 1/3] fix: avoid rc package deep imports --- docs/examples/simple.tsx | 5 +++-- package.json | 4 ++-- src/Tooltip.tsx | 34 +++++++++++++++++++--------------- 3 files changed, 24 insertions(+), 19 deletions(-) diff --git a/docs/examples/simple.tsx b/docs/examples/simple.tsx index 15244dc..4885ee9 100644 --- a/docs/examples/simple.tsx +++ b/docs/examples/simple.tsx @@ -1,11 +1,12 @@ -import type { ActionType } from '@rc-component/trigger'; -import type { OffsetType } from '@rc-component/trigger/lib/interface'; +import type { ActionType, AlignType } from '@rc-component/trigger'; import Tooltip from 'rc-tooltip'; import type { CSSProperties } from 'react'; import React, { Component } from 'react'; import '../../assets/bootstrap.less'; import { placements } from '../../src/placements'; +type OffsetType = NonNullable[number]; + interface TestState { destroyOnHidden: boolean; destroyTooltipOptions: { name: string; value: number }[]; diff --git a/package.json b/package.json index f43052b..7789adf 100644 --- a/package.json +++ b/package.json @@ -42,11 +42,11 @@ }, "dependencies": { "@rc-component/trigger": "^3.7.1", - "@rc-component/util": "^1.3.0", + "@rc-component/util": "^1.11.1", "clsx": "^2.1.1" }, "devDependencies": { - "@rc-component/father-plugin": "^2.0.1", + "@rc-component/father-plugin": "^2.2.0", "@rc-component/np": "^1.0.3", "@testing-library/jest-dom": "^6.9.1", "@testing-library/react": "^16.3.0", diff --git a/src/Tooltip.tsx b/src/Tooltip.tsx index 9f90bb4..17e8d7a 100644 --- a/src/Tooltip.tsx +++ b/src/Tooltip.tsx @@ -1,7 +1,12 @@ -import type { ArrowType, TriggerProps, TriggerRef } from '@rc-component/trigger'; +import type { + ActionType, + AlignType, + ArrowType, + TriggerProps, + TriggerRef, +} from '@rc-component/trigger'; import Trigger from '@rc-component/trigger'; -import type { ActionType, AlignType } from '@rc-component/trigger/lib/interface'; -import useId from '@rc-component/util/lib/hooks/useId'; +import { useId } from '@rc-component/util'; import { clsx } from 'clsx'; import * as React from 'react'; import { useImperativeHandle, useRef } from 'react'; @@ -10,18 +15,17 @@ import Popup from './Popup'; export type SemanticName = 'root' | 'arrow' | 'container' | 'uniqueContainer'; -export interface TooltipProps - extends Pick< - TriggerProps, - | 'onPopupAlign' - | 'builtinPlacements' - | 'fresh' - | 'mouseLeaveDelay' - | 'mouseEnterDelay' - | 'prefixCls' - | 'forceRender' - | 'popupVisible' - > { +export interface TooltipProps extends Pick< + TriggerProps, + | 'onPopupAlign' + | 'builtinPlacements' + | 'fresh' + | 'mouseLeaveDelay' + | 'mouseEnterDelay' + | 'prefixCls' + | 'forceRender' + | 'popupVisible' +> { children: React.ReactElement; // Style classNames?: Partial>; From 640fd82e5d3c938b3fdb2000901085b9d567a8f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E8=89=B3=E5=85=B5?= Date: Fri, 22 May 2026 11:06:40 +0800 Subject: [PATCH 2/3] chore: simplify offset type --- docs/examples/simple.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/examples/simple.tsx b/docs/examples/simple.tsx index 4885ee9..cef651c 100644 --- a/docs/examples/simple.tsx +++ b/docs/examples/simple.tsx @@ -1,11 +1,11 @@ -import type { ActionType, AlignType } from '@rc-component/trigger'; +import type { ActionType } from '@rc-component/trigger'; import Tooltip from 'rc-tooltip'; import type { CSSProperties } from 'react'; import React, { Component } from 'react'; import '../../assets/bootstrap.less'; import { placements } from '../../src/placements'; -type OffsetType = NonNullable[number]; +type OffsetType = string | number; interface TestState { destroyOnHidden: boolean; From a7e116d3cff51da1a633203dd696e0de0e8703c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E8=89=B3=E5=85=B5?= Date: Fri, 22 May 2026 14:10:03 +0800 Subject: [PATCH 3/3] fix: expose tooltip props and placements --- src/index.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/index.tsx b/src/index.tsx index 6da28f5..cdeb92b 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -1,7 +1,8 @@ import Popup from './Popup'; import Tooltip from './Tooltip'; -export type { TooltipRef } from './Tooltip'; +export type { TooltipProps, TooltipRef } from './Tooltip'; +export { placements } from './placements'; export { Popup }; export default Tooltip;