test/ant-design
1
0
Fork 0
mirror of https://gitee.com/ant-design/ant-design.git synced 2024-11-30 11:08:45 +08:00
Code Issues Actions 68 Packages Projects Releases Wiki Activity

should passing all props to icon, close #12005

Browse Source
This commit is contained in:
afc163 2018-09-03 11:24:31 +08:00
parent ff44129e6e
commit c4b6dafb64
1 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
components/icon/index.tsx
View File

@ -43,10 +43,7 @@ export interface IconProps {
const Icon: React.SFC<IconProps> = (props) => {
const {
// affect outter <i>...</i>
title,
className,
onClick,
style,
// affect inner <svg>...</svg>
type,
@ -60,6 +57,8 @@ const Icon: React.SFC<IconProps> = (props) => {
// other
theme, // default to outlined
twoToneColor,
...restProps
} = props;
warning(
@ -76,6 +75,8 @@ const Icon: React.SFC<IconProps> = (props) => {
[`anticon-spin`]: !!spin || type === 'loading',
});
let innerNode;
// component > children > type
if (Component) {
const innerSvgProps: CustomIconComponentProps = {
@ -87,12 +88,10 @@ const Icon: React.SFC<IconProps> = (props) => {
delete innerSvgProps.viewBox;
}
return (
<i className={classString} title={title} style={style} onClick={onClick}>
<Component {...innerSvgProps} >
{children}
</Component>
</i>
innerNode = (
<Component {...innerSvgProps} >
{children}
</Component>
);
}
@ -106,12 +105,10 @@ const Icon: React.SFC<IconProps> = (props) => {
...svgBaseProps,
className: svgClassString,
};
return (
<i className={classString} title={title} style={style} onClick={onClick}>
<svg {...innerSvgProps} viewBox={viewBox}>
{children}
</svg>
</i>
innerNode = (
<svg {...innerSvgProps} viewBox={viewBox}>
{children}
</svg>
);
}
@ -127,19 +124,19 @@ const Icon: React.SFC<IconProps> = (props) => {
removeTypeTheme(type),
theme || 'outlined',
);
return (
<i className={classString} title={title} style={style} onClick={onClick}>
<ReactIcon
className={svgClassString}
type={computedType}
primaryColor={twoToneColor}
/>
</i>
innerNode = (
<ReactIcon
className={svgClassString}
type={computedType}
primaryColor={twoToneColor}
/>
);
}
return (
<i className={classString} title={title} style={style} onClick={onClick} />
<i {...restProps} className={classString}>
{innerNode}
</i>
);
};