chore: remove ahooks@2

orca-team · Dec 26, 2023 · c49dd8f · c49dd8f · vercel · Dec 26, 2023
1 parent 1a3b687
commit c49dd8f
Show file tree

Hide file tree

Showing 15 changed files with 61 additions and 81 deletions.
diff --git a/packages/antd-plus/CHANGELOG.md b/packages/antd-plus/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @orca-fe/painter
 
+## 0.3.16
+
+### Patch Changes
+
+- Updated dependencies
+  - @orca-fe/pocket@3.4.1
+
 ## 0.3.15
 
 ### Patch Changes

diff --git a/packages/antd-plus/package.json b/packages/antd-plus/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@orca-fe/antd-plus",
-  "version": "0.3.15",
+  "version": "0.3.16",
   "description": "Transformer Container",
   "keywords": [
     "react",
@@ -38,7 +38,7 @@
   "dependencies": {
     "@orca-fe/hooks": "^1.11.0",
     "@orca-fe/jss-plugin-auto-prefix": "^0.0.1",
-    "@orca-fe/pocket": "^3.4.0",
+    "@orca-fe/pocket": "^3.4.1",
     "@orca-fe/simple-jss": "^0.0.3",
     "@orca-fe/tools": "^0.10.0",
     "ahooks": "^3.7.8",

diff --git a/packages/painter/CHANGELOG.md b/packages/painter/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @orca-fe/painter
 
+## 1.4.51
+
+### Patch Changes
+
+- Updated dependencies
+  - @orca-fe/pocket@3.4.1
+
 ## 1.4.50
 
 ### Patch Changes

diff --git a/packages/painter/package.json b/packages/painter/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@orca-fe/painter",
-  "version": "1.4.50",
+  "version": "1.4.51",
   "description": "Konva Painter",
   "keywords": [
     "react",
@@ -39,7 +39,7 @@
   "dependencies": {
     "@orca-fe/hooks": "^1.11.0",
     "@orca-fe/jss-plugin-auto-prefix": "^0.0.1",
-    "@orca-fe/pocket": "^3.4.0",
+    "@orca-fe/pocket": "^3.4.1",
     "@orca-fe/simple-jss": "^0.0.3",
     "@orca-fe/tools": "^0.10.0",
     "ahooks": "^3.7.8",

diff --git a/packages/pdf-viewer/CHANGELOG.md b/packages/pdf-viewer/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @orca-fe/pdf-viewer
 
+## 1.21.4
+
+### Patch Changes
+
+- Updated dependencies
+  - @orca-fe/pocket@3.4.1
+  - @orca-fe/painter@1.4.51
+
 ## 1.21.3
 
 ### Patch Changes

diff --git a/packages/pdf-viewer/package.json b/packages/pdf-viewer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@orca-fe/pdf-viewer",
-  "version": "1.21.3",
+  "version": "1.21.4",
   "description": "PDF Viewer",
   "keywords": [
     "react",
@@ -40,9 +40,9 @@
   "dependencies": {
     "@orca-fe/hooks": "^1.11.0",
     "@orca-fe/jss-plugin-auto-prefix": "^0.0.1",
-    "@orca-fe/painter": "^1.4.50",
+    "@orca-fe/painter": "^1.4.51",
     "@orca-fe/pdfjs-dist-browserify": "^3.8.24",
-    "@orca-fe/pocket": "^3.4.0",
+    "@orca-fe/pocket": "^3.4.1",
     "@orca-fe/simple-jss": "^0.0.3",
     "@orca-fe/tools": "^0.10.0",
     "ahooks": "^3.7.8",

diff --git a/packages/pocket/CHANGELOG.md b/packages/pocket/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @orca-fe/pocket
 
+## 3.4.1
+
+### Patch Changes
+
+- chore: remove ahooks@2
+
 ## 3.4.0
 
 ### Minor Changes

diff --git a/packages/pocket/package.json b/packages/pocket/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@orca-fe/pocket",
-  "version": "3.4.0",
+  "version": "3.4.1",
   "description": "UI components by orca-team",
   "keywords": [
     "react",
@@ -45,7 +45,6 @@
     "@rc-component/trigger": "^1.13.3",
     "@types/react-window": "^1.8.5",
     "ahooks": "^3.7.8",
-    "ahooks-v2": "^2.10.15",
     "classnames": "^2.3.2",
     "copy-to-clipboard": "^3.3.3",
     "events": "^3.3.0",

diff --git a/packages/pocket/src/context-menu/ContextMenu.tsx b/packages/pocket/src/context-menu/ContextMenu.tsx
@@ -1,7 +1,7 @@
 import type { ForwardedRef, ReactNode } from 'react';
 import React, { forwardRef, useEffect, useMemo, useRef, useState } from 'react';
 import { Transition } from 'react-transition-group';
-import { useBoolean, useClickAway, useEventListener } from 'ahooks-v2';
+import { useBoolean, useClickAway, useEventListener } from 'ahooks';
 import ReactDOM from 'react-dom';
 import cn from 'classnames';
 import { useMergedRefs } from '@orca-fe/hooks';

diff --git a/packages/pocket/src/eq-ratio-box/EqRatioBox.tsx b/packages/pocket/src/eq-ratio-box/EqRatioBox.tsx
@@ -1,6 +1,6 @@
 import type { CSSProperties } from 'react';
 import React, { useEffect, useMemo, useRef } from 'react';
-import { useSize } from 'ahooks-v2';
+import { useSize } from 'ahooks';
 import useStyles from './EqRatioBox.style';
 import EqRatioBoxContext, { useRatio } from './EqRatioBoxContext';
 
@@ -33,7 +33,7 @@ const EqRatioBox = (props: EqRatioBoxProps) => {
   } = props;
   const styles = useStyles();
   const rootRef = useRef<HTMLDivElement>(null);
-  const { width: containerWidth, height: containerHeight } = useSize(rootRef);
+  const { width: containerWidth, height: containerHeight } = useSize(rootRef) || {};
 
   const hasSize = containerWidth != null && containerHeight != null;
 

diff --git a/packages/pocket/src/menu-layout/useUniqArray.ts b/packages/pocket/src/menu-layout/useUniqArray.ts
@@ -1,5 +1,5 @@
+import { useMemoizedFn } from 'ahooks';
 import { useState } from 'react';
-import { usePersistFn } from 'ahooks-v2';
 
 type UseUniqArrayResult<T> = [
   T[],
@@ -10,20 +10,18 @@ type UseUniqArrayResult<T> = [
   },
 ];
 
-export default function useUniqArray<T>(
-  defaultArr: T[] = [],
-): UseUniqArrayResult<T> {
+export default function useUniqArray<T>(defaultArr: T[] = []): UseUniqArrayResult<T> {
   const [arr, setArr] = useState<T[]>(defaultArr);
 
-  const add = usePersistFn((item: T) => {
-    const has = arr.findIndex((i) => i === item) >= 0;
+  const add = useMemoizedFn((item: T) => {
+    const has = arr.findIndex(i => i === item) >= 0;
     if (!has) {
       setArr([...arr, item]);
     }
   });
 
-  const remove = usePersistFn((item: T) => {
-    const index = arr.findIndex((i) => i === item);
+  const remove = useMemoizedFn((item: T) => {
+    const index = arr.findIndex(i => i === item);
     if (index >= 0) {
       const newArr = [...arr];
       newArr.splice(index, 1);

diff --git a/packages/pocket/src/open-box/OpenBox.tsx b/packages/pocket/src/open-box/OpenBox.tsx
@@ -1,4 +1,4 @@
-import { useMount, usePersistFn, useUpdateEffect } from 'ahooks-v2';
+import { useMount, useMemoizedFn, useUpdateEffect } from 'ahooks';
 import React, { useImperativeHandle, useRef } from 'react';
 import useStyles from './OpenBox.style';
 
@@ -59,7 +59,7 @@ const OpenBox: React.FC<OpenBoxProps> = React.forwardRef((props, pRef) => {
     }
   }, [open]);
 
-  const handleTransitionEnd = usePersistFn(() => {
+  const handleTransitionEnd = useMemoizedFn(() => {
     if (ref.current) ref.current.style.height = open ? '' : `${height}px`;
   });
   return (

diff --git a/packages/pocket/src/react-script/ReactScript.tsx b/packages/pocket/src/react-script/ReactScript.tsx
@@ -1,4 +1,4 @@
-import { usePrevious } from 'ahooks-v2';
+import { usePrevious } from 'ahooks';
 import { eq } from 'lodash-es';
 import type React from 'react';
 import { useEffect, useState } from 'react';
@@ -29,9 +29,7 @@ const ReactScript = (props: ReactScriptProps) => {
   useEffect(() => {
     if (!eq(src, prevSrc)) {
       const srcList = Array.isArray(src) ? src : [src];
-      Promise.all(
-        srcList.map((src) => loadScript(src).catch(handleError)),
-      ).then(handleLoad);
+      Promise.all(srcList.map(src => loadScript(src).catch(handleError))).then(handleLoad);
     }
   }, [src]);
   return (loaded && children) as React.ReactElement;

diff --git a/packages/pocket/src/should-update/demo/Demo1.tsx b/packages/pocket/src/should-update/demo/Demo1.tsx
@@ -1,6 +1,6 @@
 import React, { useState } from 'react';
 import { shouldUpdate } from '@orca-fe/pocket';
-import { useInterval } from 'ahooks-v2';
+import { useInterval } from 'ahooks';
 
 const MyComponent = (props: { num: number }) => {
   const { num = 1 } = props;
@@ -13,10 +13,7 @@ const MyComponent = (props: { num: number }) => {
 };
 
 // 包裹生成一个新组件，仅在 num 属性发生变化是才重新渲染
-const NotUpdateMyComponent = shouldUpdate(
-  MyComponent,
-  (props, prevProps) => props.num !== prevProps.num,
-);
+const NotUpdateMyComponent = shouldUpdate(MyComponent, (props, prevProps) => props.num !== prevProps.num);
 
 const Demo = () => {
   const [{ num }, setNum] = useState({ num: 0 });

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml