chenshuai2144 5 лет назад
Родитель
Сommit
2f67dd2e49
3 измененных файлов с 6 добавлено и 7 удалено
  1. 1 2
      package.json
  2. 3 3
      src/components/HeaderSearch/index.tsx
  3. 2 2
      src/components/NoticeIcon/index.tsx

+ 1 - 2
package.json

@@ -70,8 +70,7 @@
     "react-dom": "^17.0.0",
     "react-helmet-async": "^1.0.4",
     "umi": "^3.2.14",
-    "umi-request": "^1.0.8",
-    "use-merge-value": "^1.0.1"
+    "umi-request": "^1.0.8"
   },
   "devDependencies": {
     "@ant-design/pro-cli": "^1.0.18",

+ 3 - 3
src/components/HeaderSearch/index.tsx

@@ -1,6 +1,6 @@
 import { SearchOutlined } from '@ant-design/icons';
 import { AutoComplete, Input } from 'antd';
-import useMergeValue from 'use-merge-value';
+import useMergedState from 'rc-util/es/hooks/useMergedState';
 import type { AutoCompleteProps } from 'antd/es/auto-complete';
 import React, { useRef } from 'react';
 
@@ -33,12 +33,12 @@ const HeaderSearch: React.FC<HeaderSearchProps> = (props) => {
 
   const inputRef = useRef<Input | null>(null);
 
-  const [value, setValue] = useMergeValue<string | undefined>(defaultValue, {
+  const [value, setValue] = useMergedState<string | undefined>(defaultValue, {
     value: props.value,
     onChange: props.onChange,
   });
 
-  const [searchMode, setSearchMode] = useMergeValue(defaultOpen ?? false, {
+  const [searchMode, setSearchMode] = useMergedState(defaultOpen ?? false, {
     value: props.open,
     onChange: onVisibleChange,
   });

+ 2 - 2
src/components/NoticeIcon/index.tsx

@@ -1,6 +1,6 @@
 import { BellOutlined } from '@ant-design/icons';
 import { Badge, Spin, Tabs } from 'antd';
-import useMergeValue from 'use-merge-value';
+import useMergedState from 'rc-util/es/hooks/useMergedState';
 import React from 'react';
 import classNames from 'classnames';
 import type { NoticeIconTabProps } from './NoticeList';
@@ -101,7 +101,7 @@ const NoticeIcon: React.FC<NoticeIconProps> & {
 
   const { className, count, bell } = props;
 
-  const [visible, setVisible] = useMergeValue<boolean>(false, {
+  const [visible, setVisible] = useMergedState<boolean>(false, {
     value: props.popupVisible,
     onChange: props.onPopupVisibleChange,
   });