From d82b32d9a29c5c320fb02e4fe301ec054e1da2df Mon Sep 17 00:00:00 2001 From: wangyi <724003548@qq.com> Date: Thu, 5 Mar 2020 09:29:10 +0800 Subject: [PATCH] fix: ant design version regression to 3.24.0 --- .../@rcpress/theme-default/assets/index.less | 2 +- .../components/content/EditButton.tsx | 5 +- .../theme-default/components/menu/index.tsx | 5 +- .../components/prevAndNext/index.tsx | 6 +- .../components/search-box/index.tsx | 64 +- .../@rcpress/theme-default/layout/header.tsx | 7 +- packages/@rcpress/theme-default/package.json | 2 +- yarn.lock | 5634 +++++++++++------ 8 files changed, 3816 insertions(+), 1909 deletions(-) diff --git a/packages/@rcpress/theme-default/assets/index.less b/packages/@rcpress/theme-default/assets/index.less index 4a6c013..496f087 100644 --- a/packages/@rcpress/theme-default/assets/index.less +++ b/packages/@rcpress/theme-default/assets/index.less @@ -1,4 +1,4 @@ -// @import '~antd/lib/style/v2-compatible-reset.less'; +@import '~antd/lib/style/v2-compatible-reset.less'; @import '~antd/dist/antd.less'; @import '~antd/lib/style/themes/default.less'; @import './common'; diff --git a/packages/@rcpress/theme-default/components/content/EditButton.tsx b/packages/@rcpress/theme-default/components/content/EditButton.tsx index 8c28604..704ea97 100644 --- a/packages/@rcpress/theme-default/components/content/EditButton.tsx +++ b/packages/@rcpress/theme-default/components/content/EditButton.tsx @@ -1,6 +1,5 @@ import React from 'react'; -import { Tooltip } from 'antd'; -import { EditOutlined } from '@ant-design/icons'; +import { Tooltip, Icon } from 'antd'; const EditButton: React.SFC<{ title: React.ReactNode; @@ -9,7 +8,7 @@ const EditButton: React.SFC<{ return ( - + ); diff --git a/packages/@rcpress/theme-default/components/menu/index.tsx b/packages/@rcpress/theme-default/components/menu/index.tsx index 8c0e4cd..4bb3bef 100644 --- a/packages/@rcpress/theme-default/components/menu/index.tsx +++ b/packages/@rcpress/theme-default/components/menu/index.tsx @@ -1,7 +1,6 @@ import React from 'react'; import MobileMenu from 'rc-drawer'; -import { Badge, Col, Menu, Affix, Divider } from 'antd'; -import { ExportOutlined } from '@ant-design/icons'; +import { Badge, Col, Menu, Icon, Affix, Divider } from 'antd'; import Link from '../MyLink'; import Toc from '../Toc'; @@ -133,7 +132,7 @@ export default class LeftMenu extends React.PureComponent { > {before} - {text} + {text} {after} diff --git a/packages/@rcpress/theme-default/components/prevAndNext/index.tsx b/packages/@rcpress/theme-default/components/prevAndNext/index.tsx index bee72e1..85a3fdd 100644 --- a/packages/@rcpress/theme-default/components/prevAndNext/index.tsx +++ b/packages/@rcpress/theme-default/components/prevAndNext/index.tsx @@ -1,19 +1,19 @@ import React from 'react'; -import { LeftCircleOutlined, RightOutlined } from '@ant-design/icons'; +import { Icon } from 'antd'; export default ({ prev, next }: { prev: React.Component | null; next: React.Component | null }) => { return (
{prev ? (
- + {prev.props.children}
) : null} {next ? (
{next.props.children} - +
) : null}
diff --git a/packages/@rcpress/theme-default/components/search-box/index.tsx b/packages/@rcpress/theme-default/components/search-box/index.tsx index a3afff2..41a3d71 100644 --- a/packages/@rcpress/theme-default/components/search-box/index.tsx +++ b/packages/@rcpress/theme-default/components/search-box/index.tsx @@ -1,7 +1,6 @@ import React from 'react'; -import { List, Input, Breadcrumb } from 'antd'; +import { List, Input, Icon, Breadcrumb } from 'antd'; import { PageInfo } from '../utils'; -import { SearchOutlined } from '@ant-design/icons'; import Link from '../MyLink'; type filterDatas = { @@ -35,12 +34,17 @@ function flattenToc(items: any[]): any[] { ? items.reduce((pre, cur) => { return pre .concat(cur as any) - .concat((cur.items && cur.items.length ? flattenToc(cur.items) : []) as any); + .concat((cur.items && cur.items.length + ? flattenToc(cur.items) + : []) as any); }, []) : []; } -export default class Search extends React.Component { +export default class Search extends React.Component< + SearchProps, + SearchState +> { searchInput: Input | null | undefined; isClickLink: boolean = false; @@ -108,9 +112,17 @@ export default class Search extends React.Component { important: currentItem.important } ]); - } else if (currentItem.toc && currentItem.toc.items && currentItem.toc.items.length) { + } else if ( + currentItem.toc && + currentItem.toc.items && + currentItem.toc.items.length + ) { let tocs = flattenToc(currentItem.toc.items); - for (let i = 0; i < tocs.length && results.length < max; i++) { + for ( + let i = 0; + i < tocs.length && results.length < max; + i++ + ) { let t = tocs[i]; if (match(t.title, query)) { results.push([ @@ -128,12 +140,23 @@ export default class Search extends React.Component { } } - for (let i = 0; i < datas.length && results.length < max; i++) { + for ( + let i = 0; + i < datas.length && results.length < max; + i++ + ) { const currentItem = datas[i]; if (currentItem.path) { resolveOnePageItem(currentItem); - } else if (currentItem.children && currentItem.children.length) { - for (let j = 0; j < currentItem.children.length; j++) { + } else if ( + currentItem.children && + currentItem.children.length + ) { + for ( + let j = 0; + j < currentItem.children.length; + j++ + ) { resolveOnePageItem(currentItem.children[j]); } } @@ -152,7 +175,10 @@ export default class Search extends React.Component {