[improvement] functional inherit context (#2716)

This commit is contained in:
neverland
2019-02-11 20:46:46 +08:00
committed by GitHub
parent 9947ab00e8
commit 0bf4a9e799
9 changed files with 104 additions and 85 deletions

View File

@@ -1,4 +1,5 @@
import { use } from '../utils';
import { inheritContext } from '../utils/functional';
import Loading from '../loading';
const [sfc, bem] = use('button');
@@ -30,7 +31,7 @@ export default sfc({
}
},
render(h, context, inherit) {
render(h, context) {
const { props, listeners } = context;
const { type, disabled, loading } = props;
@@ -58,7 +59,7 @@ export default sfc({
}
])}
onClick={onClick}
{...inherit}
{...inheritContext(context)}
>
{loading ? (
<Loading size="20px" color={type === 'default' ? undefined : ''} />