✅ test: 修正测试

arvinxx · Nov 28, 2021 · 74e0652 · 74e0652 · vercel · Nov 28, 2021
1 parent 50b6e7e
commit 74e0652
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 17 deletions.
diff --git a/packages/layout-kit/src/layout-toolkit.md → packages/layout-kit/src/layout-kit.md b/packages/layout-kit/src/layout-toolkit.md → packages/layout-kit/src/layout-kit.md
diff --git a/packages/user-panel/demos/LoginWithFooter.tsx b/packages/user-panel/demos/LoginWithFooter.tsx
@@ -21,8 +21,8 @@ const LoginWithFooter = () => {
         onWechatLoginClick={() => {
           message.info('微信登录实现方法');
         }}
-        onRegisterClick={(history) => {
-          history.push('/components/biz/user-panel#显示底部');
+        onRegisterClick={(navigate) => {
+          navigate('/components/biz/user-panel#显示底部');
         }}
       />
     </div>

diff --git a/packages/user-panel/demos/LoginWithForgotUrl.tsx b/packages/user-panel/demos/LoginWithForgotUrl.tsx
@@ -16,8 +16,8 @@ const LoginWithLogo = () => {
       }}
     >
       <UserPanel.Login
-        onForgotClick={(history) => {
-          history.push('/components/biz/user-panel');
+        onForgotClick={(navigate) => {
+          navigate('/components/biz/user-panel');
         }}
       />
     </div>

diff --git a/packages/user-panel/package.json b/packages/user-panel/package.json
@@ -29,7 +29,7 @@
   "dependencies": {
     "@arvinxu/i18n": "1.0.1",
     "classnames": "^2.3.1",
-    "react-router": "*"
+    "react-router": "^6.0.2"
   },
   "peerDependencies": {
     "@ant-design/icons": "^4.x",

diff --git a/packages/user-panel/src/components/Footer/index.tsx b/packages/user-panel/src/components/Footer/index.tsx
@@ -1,7 +1,8 @@
 import React from 'react';
 import type { FC } from 'react';
-import type * as H from 'history';
-import { useHistory } from 'react-router';
+import type { NavigateFunction } from 'react-router';
+import { useNavigate } from 'react-router';
+
 import { Typography, Divider } from 'antd';
 
 import WechatLogin from '../WechatLogin';
@@ -26,7 +27,7 @@ export interface FooterProps {
   /**
    * @title 注册页面 Url
    */
-  onRegisterClick?: (history: H.History) => void;
+  onRegisterClick?: (navigate: NavigateFunction) => void;
 }
 
 export const Footer: FC<FooterProps> = ({
@@ -36,12 +37,12 @@ export const Footer: FC<FooterProps> = ({
 }) => {
   const f = useFormatMessage();
 
-  const history = useHistory();
+  const navigate = useNavigate();
 
   const onClick = () => {
     switch (type) {
       case 'login':
-        onRegisterClick?.(history);
+        onRegisterClick?.(navigate);
         break;
       case 'register':
         break;

diff --git a/packages/user-panel/src/login/index.tsx b/packages/user-panel/src/login/index.tsx
@@ -11,13 +11,14 @@ import ProForm, {
   ProFormCheckbox,
   ProFormText,
 } from '@ant-design/pro-form';
+import type { NavigateFunction } from 'react-router';
+import { useNavigate } from 'react-router';
+
 import LoginErrorMessage from './LoginErrorMessage';
 
-import './index.less';
-import { useFormatMessage } from '../components';
 import type { IUserLogin } from '../types';
-import * as H from 'history';
-import { useHistory } from 'react-router';
+import { useFormatMessage } from '../components';
+import './index.less';
 
 export interface LoginProps {
   /**
@@ -35,7 +36,7 @@ export interface LoginProps {
   /**
    * 忘记密码 url
    */
-  onForgotClick?: (history: H.History) => void;
+  onForgotClick?: (navigate: NavigateFunction) => void;
 }
 
 const Login: React.FC<LoginProps> = (props) => {
@@ -48,7 +49,7 @@ const Login: React.FC<LoginProps> = (props) => {
   const { status, type: loginType } = loginStatus;
 
   const f = useFormatMessage();
-  const history = useHistory();
+  const navigate = useNavigate();
 
   return (
     <div className="avx-user-panel-login-container">
@@ -207,7 +208,7 @@ const Login: React.FC<LoginProps> = (props) => {
                 float: 'right',
               }}
               onClick={() => {
-                onForgotClick(history);
+                onForgotClick(navigate);
               }}
             >
               {f('login.forgotPassword')}