test/ant-design
1
0
Fork 0
mirror of https://gitee.com/ant-design/ant-design.git synced 2024-12-03 20:49:14 +08:00
Code Issues Actions 100 Packages Projects Releases Wiki Activity

Merge pull request #18088 from ant-design/fix-noStyle

Browse Source 
fix: `noStyle` throws react warning
This commit is contained in:
偏右 2019-08-05 16:59:42 +08:00 committed by GitHub
commit adc1879048
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/_util/transButton.tsx
View File

@ -54,14 +54,14 @@ class TransButton extends React.Component<TransButtonProps> {
} }
render() { render() {
const { style, noStyle } = this.props; const { style, noStyle, ...restProps } = this.props;
return ( return (
<div <div
role="button" role="button"
tabIndex={0} tabIndex={0}
ref={this.setRef} ref={this.setRef}
{...this.props} {...restProps}
onKeyDown={this.onKeyDown} onKeyDown={this.onKeyDown}
onKeyUp={this.onKeyUp} onKeyUp={this.onKeyUp}
style={{ ...(!noStyle ? inlineStyle : null), ...style }} style={{ ...(!noStyle ? inlineStyle : null), ...style }}