From 2f67dd2e49c821dd9df2885c654665807a85e79e Mon Sep 17 00:00:00 2001 From: chenshuai2144 Date: Mon, 28 Dec 2020 17:44:38 +0800 Subject: [PATCH] chore: reducing dependency --- package.json | 3 +-- src/components/HeaderSearch/index.tsx | 6 +++--- src/components/NoticeIcon/index.tsx | 4 ++-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 7cbaf09e..3a62e664 100644 --- a/package.json +++ b/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", diff --git a/src/components/HeaderSearch/index.tsx b/src/components/HeaderSearch/index.tsx index 55be2c60..d3b11270 100644 --- a/src/components/HeaderSearch/index.tsx +++ b/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 = (props) => { const inputRef = useRef(null); - const [value, setValue] = useMergeValue(defaultValue, { + const [value, setValue] = useMergedState(defaultValue, { value: props.value, onChange: props.onChange, }); - const [searchMode, setSearchMode] = useMergeValue(defaultOpen ?? false, { + const [searchMode, setSearchMode] = useMergedState(defaultOpen ?? false, { value: props.open, onChange: onVisibleChange, }); diff --git a/src/components/NoticeIcon/index.tsx b/src/components/NoticeIcon/index.tsx index 9b099d65..8609b2d5 100644 --- a/src/components/NoticeIcon/index.tsx +++ b/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 & { const { className, count, bell } = props; - const [visible, setVisible] = useMergeValue(false, { + const [visible, setVisible] = useMergedState(false, { value: props.popupVisible, onChange: props.onPopupVisibleChange, });