From bb1e7c40ca62464f3e37f9da7e6026dec3599c48 Mon Sep 17 00:00:00 2001 From: unix Date: Fri, 8 May 2020 16:48:38 +0800 Subject: [PATCH 1/5] feat(link): hide icon of link component by default --- components/image/image-browser.tsx | 2 +- components/link/__tests__/index.test.tsx | 2 +- components/link/icon.tsx | 8 ++------ components/link/link.tsx | 13 +++++++++++-- components/user/user-link.tsx | 2 +- 5 files changed, 16 insertions(+), 11 deletions(-) diff --git a/components/image/image-browser.tsx b/components/image/image-browser.tsx index 48ad2ba..14f5e1a 100644 --- a/components/image/image-browser.tsx +++ b/components/image/image-browser.tsx @@ -47,7 +47,7 @@ const getAddressInput = (url: string, showFullLink: boolean, colors: BrowserColo - + {showFullLink ? url : getHostFromUrl(url)} diff --git a/components/link/link.tsx b/components/link/link.tsx index 947e068..39cb172 100644 --- a/components/link/link.tsx +++ b/components/link/link.tsx @@ -1,12 +1,14 @@ import React from 'react' import withDefaults from '../utils/with-defaults' import useTheme from '../styles/use-theme' +import useWarning from '../utils/use-warning' import LinkIcon from './icon' interface Props { href?: string color?: boolean pure?: boolean + icon?: boolean underline?: boolean block?: boolean className?: string @@ -16,6 +18,7 @@ const defaultProps = { href: '', color: false, pure: false, + icon: false, underline: false, block: false, className: '', @@ -26,18 +29,22 @@ export type LinkProps = Props & typeof defaultProps & NativeAttrs const Link = React.forwardRef>( ( - { href, color, underline, pure, children, className, block, ...props }, + { href, color, underline, pure, children, className, block, icon, ...props }, ref: React.Ref, ) => { const theme = useTheme() const linkColor = color || block ? theme.palette.link : 'inherit' + const hoverColor = color || block ? theme.palette.successLight : 'inherit' const padding = block ? theme.layout.gapQuarter : '0' const decoration = underline ? 'underline' : 'none' + if (pure) { + useWarning('Props "pure" is deprecated, now the default Link is pure.') + } return ( {children} - {!pure && } + {icon && } diff --git a/components/user/user-link.tsx b/components/user/user-link.tsx index 3d636e9..7cd4b71 100644 --- a/components/user/user-link.tsx +++ b/components/user/user-link.tsx @@ -18,7 +18,7 @@ const UserLink = React.forwardRef) => { return (
- + {children} linklinklinklinklinklinklink
" `; From d05cf102420cdfc8a8e7a84d9412c37605ef4f91 Mon Sep 17 00:00:00 2001 From: unix Date: Fri, 8 May 2020 17:14:12 +0800 Subject: [PATCH 5/5] docs: remove warning about spacer module --- pages/en-us/components/use-click-away.mdx | 2 +- pages/en-us/components/use-clipboard.mdx | 2 +- pages/en-us/components/use-current-state.mdx | 2 +- pages/zh-cn/components/use-click-away.mdx | 2 +- pages/zh-cn/components/use-clipboard.mdx | 2 +- pages/zh-cn/components/use-current-state.mdx | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pages/en-us/components/use-click-away.mdx b/pages/en-us/components/use-click-away.mdx index 39efb15..345a645 100644 --- a/pages/en-us/components/use-click-away.mdx +++ b/pages/en-us/components/use-click-away.mdx @@ -1,5 +1,5 @@ import { Layout, Playground, Attributes } from 'lib/components' -import { Utils, Link, Card } from 'components' +import { Utils, Link, Card, Spacer } from 'components' export const meta = { title: 'use-click-away', diff --git a/pages/en-us/components/use-clipboard.mdx b/pages/en-us/components/use-clipboard.mdx index da4460a..b6ad386 100644 --- a/pages/en-us/components/use-clipboard.mdx +++ b/pages/en-us/components/use-clipboard.mdx @@ -1,5 +1,5 @@ import { Layout, Playground, Attributes } from 'lib/components' -import { Utils, Link, Button, useToasts } from 'components' +import { Utils, Link, Button, useToasts, Spacer } from 'components' export const meta = { title: 'use-clipboard', diff --git a/pages/en-us/components/use-current-state.mdx b/pages/en-us/components/use-current-state.mdx index 6716fb3..98aad58 100644 --- a/pages/en-us/components/use-current-state.mdx +++ b/pages/en-us/components/use-current-state.mdx @@ -1,5 +1,5 @@ import { Layout, Playground, Attributes } from 'lib/components' -import { Utils, Link, Button } from 'components' +import { Utils, Link, Button, Spacer } from 'components' export const meta = { title: 'use-current-state', diff --git a/pages/zh-cn/components/use-click-away.mdx b/pages/zh-cn/components/use-click-away.mdx index 0a446e2..0143b65 100644 --- a/pages/zh-cn/components/use-click-away.mdx +++ b/pages/zh-cn/components/use-click-away.mdx @@ -1,5 +1,5 @@ import { Layout, Playground, Attributes } from 'lib/components' -import { Utils, Link, Card } from 'components' +import { Utils, Link, Card, Spacer } from 'components' export const meta = { title: '点击他处 useClickAway', diff --git a/pages/zh-cn/components/use-clipboard.mdx b/pages/zh-cn/components/use-clipboard.mdx index 9c2aef2..31ed20d 100644 --- a/pages/zh-cn/components/use-clipboard.mdx +++ b/pages/zh-cn/components/use-clipboard.mdx @@ -1,5 +1,5 @@ import { Layout, Playground, Attributes } from 'lib/components' -import { Utils, Link, Button, useToasts } from 'components' +import { Utils, Link, Button, useToasts, Spacer } from 'components' export const meta = { title: '剪切板 useClipboard', diff --git a/pages/zh-cn/components/use-current-state.mdx b/pages/zh-cn/components/use-current-state.mdx index 1fb8f00..ac9cab7 100644 --- a/pages/zh-cn/components/use-current-state.mdx +++ b/pages/zh-cn/components/use-current-state.mdx @@ -1,5 +1,5 @@ import { Layout, Playground, Attributes } from 'lib/components' -import { Utils, Link, Button } from 'components' +import { Utils, Link, Button, Spacer } from 'components' export const meta = { title: ' 当前值 useCurrentState',