diff --git a/package.json b/package.json index daa3389..68a50ec 100644 --- a/package.json +++ b/package.json @@ -42,11 +42,11 @@ "dependencies": { "@rc-component/portal": "^2.2.0", "@rc-component/trigger": "^3.0.0", - "@rc-component/util": "^1.7.0", + "@rc-component/util": "^1.11.1", "clsx": "^2.1.1" }, "devDependencies": { - "@rc-component/father-plugin": "^2.0.3", + "@rc-component/father-plugin": "^2.2.0", "@rc-component/np": "^1.0.3", "@testing-library/jest-dom": "^5.16.4", "@testing-library/react": "^15.0.0", diff --git a/src/Mask.tsx b/src/Mask.tsx index 637f987..0cda275 100644 --- a/src/Mask.tsx +++ b/src/Mask.tsx @@ -2,7 +2,7 @@ import React from 'react'; import { clsx } from 'clsx'; import Portal from '@rc-component/portal'; import type { PosInfo } from './hooks/useTarget'; -import useId from '@rc-component/util/lib/hooks/useId'; +import { useId } from '@rc-component/util'; import type { SemanticName, TourProps } from './interface'; const COVER_PROPS: React.SVGAttributes = { diff --git a/src/Tour.tsx b/src/Tour.tsx index ab7dd1a..8d2ef78 100644 --- a/src/Tour.tsx +++ b/src/Tour.tsx @@ -3,10 +3,12 @@ import * as React from 'react'; import type { TriggerRef } from '@rc-component/trigger'; import Trigger from '@rc-component/trigger'; import { clsx } from 'clsx'; -import useLayoutEffect from '@rc-component/util/lib/hooks/useLayoutEffect'; -import useEvent from '@rc-component/util/lib/hooks/useEvent'; -import KeyCode from '@rc-component/util/lib/KeyCode'; -import useControlledState from '@rc-component/util/lib/hooks/useControlledState'; +import { + KeyCode, + useControlledState, + useEvent, + useLayoutEffect, +} from '@rc-component/util'; import { useMemo } from 'react'; import { useClosable } from './hooks/useClosable'; import useTarget from './hooks/useTarget'; diff --git a/src/TourStep/DefaultPanel.tsx b/src/TourStep/DefaultPanel.tsx index 3590408..ffe7255 100644 --- a/src/TourStep/DefaultPanel.tsx +++ b/src/TourStep/DefaultPanel.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import type { TourStepProps } from '../interface'; import { clsx } from 'clsx'; -import pickAttrs from '@rc-component/util/lib/pickAttrs'; +import { pickAttrs } from '@rc-component/util'; export type DefaultPanelProps = Exclude & { closable: Exclude; diff --git a/src/hooks/useTarget.ts b/src/hooks/useTarget.ts index 682a596..1cb8fd2 100644 --- a/src/hooks/useTarget.ts +++ b/src/hooks/useTarget.ts @@ -1,5 +1,4 @@ -import useEvent from '@rc-component/util/lib/hooks/useEvent'; -import useLayoutEffect from '@rc-component/util/lib/hooks/useLayoutEffect'; +import { useEvent, useLayoutEffect } from '@rc-component/util'; import { useMemo, useState } from 'react'; import type { TourStepInfo } from '..'; import { isInViewPort } from '../util'; diff --git a/tests/index.test.tsx b/tests/index.test.tsx index 89f6b22..998b867 100644 --- a/tests/index.test.tsx +++ b/tests/index.test.tsx @@ -1,5 +1,5 @@ import { fireEvent, render, screen } from '@testing-library/react'; -import { spyElementPrototypes } from '@rc-component/util/lib/test/domHook'; +import { spyElementPrototypes } from '@rc-component/util'; import type { ReactNode } from 'react'; import React, { StrictMode, useRef, useState } from 'react'; import { act } from 'react-dom/test-utils';