kylefang/react
1
0
Fork 0
mirror of https://github.com/zhigang1992/react.git synced 2026-04-26 13:25:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #28 from ofekashery/fix-avatar

Browse Source 
fix(avatar): Fix HTML Attributes
This commit is contained in:
witt
2020-03-28 07:07:22 +08:00
committed by GitHub
parent e1c7891779 dda6853c9c
commit 643ec5e99f
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
components/avatar/avatar.tsx
View File

@@ -21,7 +21,8 @@ const defaultProps = {
className: '',
}
export type AvatarProps = Props & typeof defaultProps & React.ImgHTMLAttributes<any>
type NativeAttrs = React.ImgHTMLAttributes<any> | React.HTMLAttributes<any>
export type AvatarProps = Props & typeof defaultProps & NativeAttrs
const getAvatarSize = (size: NormalSizes | number): string => {
if (typeof size === 'number') return `${size}px`
@@ -45,7 +46,7 @@ const Avatar: React.FC<AvatarProps> = React.memo(({
return (
<span className={`avatar ${className}`}>
{!showText && <img className="avatar-img" src={src} {...props} />}
{showText && <span className="avatar-text">{safeText(text)}</span>}
{showText && <span className="avatar-text" {...props}>{safeText(text)}</span>}
<style jsx>{`
.avatar {
@@ -88,4 +89,4 @@ const Avatar: React.FC<AvatarProps> = React.memo(({
})
export default withDefaults<Props, typeof defaultProps>(Avatar, defaultProps)
export default withDefaults(Avatar, defaultProps)