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

fix(button): fix line-height error when children contains other components

Browse Source
This commit is contained in:
unix
2020-03-23 01:02:14 +08:00
parent 6bf8e9774e
commit b7f767e816
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/button/button.tsx
View File

@@ -80,7 +80,7 @@ const Button: React.FC<React.PropsWithChildren<ButtonProps>> = React.memo(({
return (
<button ref={buttonRef} className={`btn ${className}`} disabled={disabled} onClick={clickHandler} {...props}>
{loading ? <ButtonLoading /> : <span className="text">{children}</span>}
{loading ? <ButtonLoading /> : <div className="text">{children}</div>}
{dripShow && <ButtonDrip
x={dripX} y={dripY}
color={theme.palette.accents_2}
@@ -135,6 +135,10 @@ const Button: React.FC<React.PropsWithChildren<ButtonProps>> = React.memo(({
line-height: inherit;
top: -1px;
}
.text :global(p), .text :global(pre), .text :global(div) {
margin: 0;
}
`}</style>
</button>
)