feat: replace getTargetElement import

pansyjs · Aug 28, 2022 · 1e32a33 · 1e32a33
1 parent cb5b5e0
commit 1e32a33
Show file tree

Hide file tree

Showing 28 changed files with 64 additions and 70 deletions.
diff --git a/hooks/useClickAway/package.json b/hooks/useClickAway/package.json
@@ -15,6 +15,7 @@
     "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
   },
   "dependencies": {
+    "@pansy/shared": "^1.2.0",
     "@pansy/hook-utils": "0.3.0",
     "@pansy/use-latest": "0.2.4"
   },

diff --git a/hooks/useClickAway/src/index.ts b/hooks/useClickAway/src/index.ts
@@ -1,9 +1,9 @@
 import { useLatest } from '@pansy/use-latest';
-import { getTargetElement } from '@pansy/hook-utils';
+import { getTargetElement } from '@pansy/shared/react';
 // eslint-disable-next-line @typescript-eslint/no-duplicate-imports
 import { useEffectWithTarget } from '@pansy/hook-utils';
 
-import type { BasicTarget } from '@pansy/hook-utils';
+import type { BasicTarget } from '@pansy/shared/react';
 
 /**
  * 监听目标元素外的点击事件

diff --git a/hooks/useEventListener/package.json b/hooks/useEventListener/package.json
@@ -15,6 +15,7 @@
     "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
   },
   "dependencies": {
+    "@pansy/shared": "^1.2.0",
     "@pansy/hook-utils": "0.3.0",
     "@pansy/use-latest": "0.2.4"
   },

diff --git a/hooks/useEventListener/src/index.ts b/hooks/useEventListener/src/index.ts
@@ -1,10 +1,10 @@
 /* eslint-disable no-undef */
 import { useLatest } from '@pansy/use-latest';
-import { getTargetElement } from '@pansy/hook-utils';
+import { getTargetElement } from '@pansy/shared/react';
 // eslint-disable-next-line @typescript-eslint/no-duplicate-imports
 import { useEffectWithTarget } from '@pansy/hook-utils';
 
-import type { BasicTarget } from '@pansy/hook-utils';
+import type { BasicTarget } from '@pansy/shared/react';
 
 type noop = (...p: any) => void;
 

diff --git a/hooks/useHover/package.json b/hooks/useHover/package.json
@@ -15,7 +15,7 @@
     "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
   },
   "dependencies": {
-    "@pansy/hook-utils": "0.3.0",
+    "@pansy/shared": "^1.2.0",
     "@pansy/use-boolean": "0.2.5",
     "@pansy/use-event-listener": "0.2.8"
   },

diff --git a/hooks/useHover/src/index.ts b/hooks/useHover/src/index.ts
@@ -1,6 +1,7 @@
 import { useBoolean } from '@pansy/use-boolean';
 import { useEventListener } from '@pansy/use-event-listener';
-import type { BasicTarget } from '@pansy/hook-utils';
+
+import type { BasicTarget } from '@pansy/shared/react';
 
 export interface Options {
   onEnter?: () => void;

diff --git a/hooks/useInViewport/package.json b/hooks/useInViewport/package.json
@@ -15,6 +15,7 @@
     "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
   },
   "dependencies": {
+    "@pansy/shared": "^1.2.0",
     "@pansy/hook-utils": "0.3.0",
     "intersection-observer": "^0.12.0"
   },

diff --git a/hooks/useInViewport/src/index.ts b/hooks/useInViewport/src/index.ts
@@ -1,8 +1,9 @@
 import 'intersection-observer';
 import { useState } from 'react';
-import { getTargetElement, useEffectWithTarget } from '@pansy/hook-utils';
+import { getTargetElement } from '@pansy/shared/react';
+import { useEffectWithTarget } from '@pansy/hook-utils';
 
-import type { BasicTarget } from '@pansy/hook-utils';
+import type { BasicTarget } from '@pansy/shared/react';
 
 export interface Options {
   rootMargin?: string;

diff --git a/hooks/useKeyPress/package.json b/hooks/useKeyPress/package.json
@@ -16,6 +16,7 @@
     "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
   },
   "dependencies": {
+    "@pansy/shared": "^1.2.0",
     "@pansy/hook-utils": "0.3.0",
     "@pansy/use-latest": "0.2.4"
   },

diff --git a/hooks/useKeyPress/src/index.ts b/hooks/useKeyPress/src/index.ts
@@ -1,5 +1,6 @@
 import { useLatest } from '@pansy/use-latest';
-import { useDeepCompareEffectWithTarget, getTargetElement } from '@pansy/hook-utils';
+import { getTargetElement } from '@pansy/shared/react';
+import { useDeepCompareEffectWithTarget } from '@pansy/hook-utils';
 
 import { genKeyFormater } from './utils';
 

diff --git a/hooks/useKeyPress/src/types.ts b/hooks/useKeyPress/src/types.ts
@@ -1,4 +1,4 @@
-import type { BasicTarget } from '@pansy/hook-utils';
+import type { BasicTarget } from '@pansy/shared/react';
 
 export type KeyType = number | string;
 

diff --git a/hooks/useMouse/package.json b/hooks/useMouse/package.json
@@ -16,7 +16,7 @@
     "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
   },
   "dependencies": {
-    "@pansy/hook-utils": "0.3.0",
+    "@pansy/shared": "^1.2.0",
     "@pansy/use-event-listener": "0.2.8",
     "@pansy/use-raf-state": "0.2.5"
   },

diff --git a/hooks/useMouse/src/index.ts b/hooks/useMouse/src/index.ts
@@ -1,8 +1,8 @@
 import { useRafState } from '@pansy/use-raf-state';
 import { useEventListener } from '@pansy/use-event-listener';
-import { getTargetElement } from '@pansy/hook-utils';
+import { getTargetElement } from '@pansy/shared/react';
 
-import type { BasicTarget } from '@pansy/hook-utils';
+import type { BasicTarget } from '@pansy/shared/react';
 import type { CursorState } from './types';
 
 const initState: CursorState = {

diff --git a/hooks/useScroll/package.json b/hooks/useScroll/package.json
@@ -16,6 +16,7 @@
   },
   "dependencies": {
     "@pansy/hook-utils": "0.3.0",
+    "@pansy/shared": "^1.2.0",
     "@pansy/use-latest": "0.2.4",
     "@pansy/use-raf-state": "0.2.5"
   },

diff --git a/hooks/useScroll/src/index.ts b/hooks/useScroll/src/index.ts
@@ -1,6 +1,7 @@
 import { useLatest } from '@pansy/use-latest';
 import { useRafState } from '@pansy/use-raf-state';
-import { getTargetElement, useEffectWithTarget } from '@pansy/hook-utils';
+import { getTargetElement } from '@pansy/shared/react';
+import { useEffectWithTarget } from '@pansy/hook-utils';
 
 import type { Position, ScrollListenController, Target } from './types';
 

diff --git a/hooks/useScroll/src/types.ts b/hooks/useScroll/src/types.ts
@@ -1,4 +1,4 @@
-import type { BasicTarget } from '@pansy/hook-utils';
+import type { BasicTarget } from '@pansy/shared/react';
 
 export interface Position {
   left: number;

diff --git a/hooks/useScrollLock/package.json b/hooks/useScrollLock/package.json
@@ -16,8 +16,9 @@
     "react": "^16.8.6 || ^17.0"
   },
   "dependencies": {
-    "@pansy/hook-utils": "^0.3.0",
-    "@pansy/shared": "^1.1.0"
+    "@pansy/use-get-state": "^0.2.5",
+    "@pansy/use-event-listener": "^0.2.8",
+    "@pansy/shared": "^1.2.0"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org",

diff --git a/hooks/useScrollLock/src/index.ts b/hooks/useScrollLock/src/index.ts
@@ -1,11 +1,11 @@
 import { useMemo, useEffect } from 'react';
-import { getTargetElement } from '@pansy/hook-utils';
+import { isIOS } from '@pansy/shared';
+import { getTargetElement } from '@pansy/shared/react';
 import { useGetState } from '@pansy/use-get-state';
 import { useEventListener } from '@pansy/use-event-listener';
-import { isIOS } from '@pansy/shared';
 
 import type { CSSProperties } from 'react';
-import type { BasicTarget } from '@pansy/hook-utils';
+import type { BasicTarget } from '@pansy/shared/react';
 
 export function useScrollLock(
   target: BasicTarget,

diff --git a/hooks/useSize/package.json b/hooks/useSize/package.json
@@ -16,6 +16,7 @@
   },
   "dependencies": {
     "@juggle/resize-observer": "^3.3.1",
+    "@pansy/shared": "^1.2.0",
     "@pansy/hook-utils": "0.3.0",
     "@pansy/use-raf-state": "0.2.5"
   },

diff --git a/hooks/useSize/src/index.ts b/hooks/useSize/src/index.ts
@@ -1,8 +1,9 @@
 import { ResizeObserver } from '@juggle/resize-observer';
 import { useRafState } from '@pansy/use-raf-state';
-import { getTargetElement, useIsomorphicLayoutEffectWithTarget } from '@pansy/hook-utils';
+import { getTargetElement } from '@pansy/shared/react';
+import { useIsomorphicLayoutEffectWithTarget } from '@pansy/hook-utils';
 
-import type { BasicTarget } from '@pansy/hook-utils';
+import type { BasicTarget } from '@pansy/shared/react';
 
 export interface Size {
   width: number;

diff --git a/hooks/useWatermark/package.json b/hooks/useWatermark/package.json
@@ -15,10 +15,11 @@
     "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
   },
   "dependencies": {
+    "@pansy/shared": "^1.2.0",
     "@pansy/hook-utils": "0.3.0",
     "@pansy/use-memoized-fn": "0.2.5",
     "@pansy/use-unmount": "0.2.5",
-    "@pansy/watermark": "^2.0.10"
+    "@pansy/watermark": "^2.2.1"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org",

diff --git a/hooks/useWatermark/src/index.ts b/hooks/useWatermark/src/index.ts
@@ -1,10 +1,11 @@
 import { useRef } from 'react';
 import { Watermark, WatermarkOptions } from '@pansy/watermark'
-import { getTargetElement, useEffectWithTarget } from '@pansy/hook-utils';
+import { getTargetElement } from '@pansy/shared/react';
+import { useEffectWithTarget } from '@pansy/hook-utils';
 import { useUnmount } from '@pansy/use-unmount';
 import { useMemoizedFn } from '@pansy/use-memoized-fn';
 
-import type { BasicTarget } from '@pansy/hook-utils';
+import type { BasicTarget } from '@pansy/shared/react';
 
 export type BaseWatermarkOptions = Omit<WatermarkOptions, 'container'>
 

diff --git a/hooks/utils/package.json b/hooks/utils/package.json
@@ -15,6 +15,7 @@
     "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
   },
   "dependencies": {
+    "@pansy/shared": "^1.2.0",
     "@pansy/use-memoized-fn": "0.2.5",
     "@pansy/use-unmount": "0.2.5",
     "@pansy/use-update-effect": "0.2.4",

diff --git a/hooks/utils/src/index.ts b/hooks/utils/src/index.ts
@@ -1,7 +1,6 @@
 export { createUpdateEffect } from '@pansy/use-update-effect';
 export { createUseStorageState } from './utils/createUseStorageState';
 export { depsAreSame } from './utils/depsAreSame';
-export { getTargetElement } from './utils/domTarget';
 export { isBrowser } from './utils/isBrowser';
 export {
   createEffectWithTarget,
@@ -15,6 +14,5 @@ export { isFunction } from './utils/isFunction';
 
 export { createDeepCompareEffect } from './createDeepCompareEffect';
 
-export type { BasicTarget } from './utils/domTarget';
 export type { OptionsWithDefaultValue, Options } from './utils/createUseStorageState';
 export type { Noop } from './types';
diff --git a/hooks/utils/src/utils/domTarget.ts b/hooks/utils/src/utils/domTarget.ts
diff --git a/hooks/utils/src/utils/useDeepCompareWithTarget.ts b/hooks/utils/src/utils/useDeepCompareWithTarget.ts
@@ -3,7 +3,7 @@ import isEqual from 'lodash/isEqual';
 import { useEffectWithTarget } from './useEffectWithTarget';
 
 import type { DependencyList, EffectCallback } from 'react';
-import type { BasicTarget } from './domTarget';
+import type { BasicTarget } from '@pansy/shared/react';
 
 const depsEqual = (aDeps: DependencyList, bDeps: DependencyList = []) => {
   return isEqual(aDeps, bDeps);

diff --git a/hooks/utils/src/utils/useEffectWithTarget.ts b/hooks/utils/src/utils/useEffectWithTarget.ts
@@ -1,10 +1,10 @@
 import { useEffect, useLayoutEffect, useRef } from 'react';
 import { useUnmount } from '@pansy/use-unmount';
 import { depsAreSame } from './depsAreSame';
-import { getTargetElement } from './domTarget';
+import { getTargetElement } from '@pansy/shared/react';
 
 import type { DependencyList, EffectCallback } from 'react';
-import type { BasicTarget } from './domTarget';
+import type { BasicTarget } from '@pansy/shared/react';
 
 export const createEffectWithTarget = (
   useEffectType: typeof useEffect | typeof useLayoutEffect