Fix menu typos

src/components/SiderMenu/BaseMeun.js → src/components/SiderMenu/BaseMenu.js

@@ -21,13 +21,13 @@ const getIcon = icon => {
   return icon;
 };
 
-export const getMeunMatcheys = (flatMenuKeys, path) => {
+export const getMenuMatches = (flatMenuKeys, path) => {
   return flatMenuKeys.filter(item => {
     return pathToRegexp(item).test(path);
   });
 };
 
-export default class BaseMeun extends PureComponent {
+export default class BaseMenu extends PureComponent {
   constructor(props) {
     super(props);
     this.menus = props.menuData;
@@ -68,7 +68,7 @@ export default class BaseMeun extends PureComponent {
   // Get the currently selected menu
   getSelectedMenuKeys = () => {
     const { location: { pathname } } = this.props;
-    return urlToList(pathname).map(itemPath => getMeunMatcheys(this.flatMenuKeys, itemPath).pop());
+    return urlToList(pathname).map(itemPath => getMenuMatches(this.flatMenuKeys, itemPath).pop());
   };
   /**
    * get SubMenu or Item

src/components/SiderMenu/SiderMenu.js

@@ -2,7 +2,7 @@ import React, { PureComponent } from 'react';
 import { Layout, Menu, Icon } from 'antd';
 import { Link } from 'dva/router';
 import styles from './index.less';
-import BaseMeun, { getMeunMatcheys } from './BaseMeun';
+import BaseMenu, { getMenuMatches } from './BaseMenu';
 import { urlToList } from '../_utils/pathTools';
 
 const { Sider } = Layout;
@@ -131,7 +131,7 @@ export default class SiderMenu extends PureComponent {
     const { location: { pathname } } = props || this.props;
     return urlToList(pathname)
       .map(item => {
-        return getMeunMatcheys(this.flatMenuKeys, item)[0];
+        return getMenuMatches(this.flatMenuKeys, item)[0];
       })
       .filter(item => item);
   }
@@ -165,7 +165,7 @@ export default class SiderMenu extends PureComponent {
             <h1>Ant Design Pro</h1>
           </Link>
         </div>
-        <BaseMeun
+        <BaseMenu
           {...this.props}
           key="Menu"
           mode="inline"

src/components/SiderMenu/SiderMenu.test.js

@@ -0,0 +1,24 @@
+import { getMenuMatches } from './BaseMenu';
+
+const menu = ['/dashboard', '/userinfo', '/dashboard/name', '/userinfo/:id', '/userinfo/:id/info'];
+
+describe('test menu match', () => {
+  it('simple path', () => {
+    expect(getMenuMatches(menu, '/dashboard')).toEqual(['/dashboard']);
+  });
+  it('error path', () => {
+    expect(getMenuMatches(menu, '/dashboardname')).toEqual([]);
+  });
+
+  it('Secondary path', () => {
+    expect(getMenuMatches(menu, '/dashboard/name')).toEqual(['/dashboard/name']);
+  });
+
+  it('Parameter path', () => {
+    expect(getMenuMatches(menu, '/userinfo/2144')).toEqual(['/userinfo/:id']);
+  });
+
+  it('three parameter path', () => {
+    expect(getMenuMatches(menu, '/userinfo/2144/info')).toEqual(['/userinfo/:id/info']);
+  });
+});

src/components/SiderMenu/SilderMenu.test.js

@@ -1,24 +0,0 @@
-import { getMeunMatcheys } from './BaseMeun';
-
-const meun = ['/dashboard', '/userinfo', '/dashboard/name', '/userinfo/:id', '/userinfo/:id/info'];
-
-describe('test meun match', () => {
-  it('simple path', () => {
-    expect(getMeunMatcheys(meun, '/dashboard')).toEqual(['/dashboard']);
-  });
-  it('error path', () => {
-    expect(getMeunMatcheys(meun, '/dashboardname')).toEqual([]);
-  });
-
-  it('Secondary path', () => {
-    expect(getMeunMatcheys(meun, '/dashboard/name')).toEqual(['/dashboard/name']);
-  });
-
-  it('Parameter path', () => {
-    expect(getMeunMatcheys(meun, '/userinfo/2144')).toEqual(['/userinfo/:id']);
-  });
-
-  it('three parameter path', () => {
-    expect(getMeunMatcheys(meun, '/userinfo/2144/info')).toEqual(['/userinfo/:id/info']);
-  });
-});

src/components/TopNavHeader/index.js

@@ -1,7 +1,7 @@
 import React, { PureComponent } from 'react';
 import { Link } from 'dva/router';
 import RightContent from '../GlobalHeader/RightContent';
-import BaseMeun from '../SiderMenu/BaseMeun';
+import BaseMenu from '../SiderMenu/BaseMenu';
 import styles from './index.less';
 
 export default class TopNavHeader extends PureComponent {
@@ -24,7 +24,7 @@ export default class TopNavHeader extends PureComponent {
                 <h1>Ant Design Pro</h1>
               </Link>
             </div>
-            <BaseMeun
+            <BaseMenu
               {...this.props}
               style={{ padding: '9px 0', border: 'none' }}
             />