Skip to content

Commit

Permalink
Merge pull request #105 from zhaozhiming/master
Browse files Browse the repository at this point in the history
修复Button组件activeStyle属性为对象时不起作用的问题
  • Loading branch information
BANG88 authored Oct 20, 2018
2 parents 0b09e4e + f86611b commit 1955fec
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion components/button/index.native.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ export default class Button extends React.Component<ButtonProps, any> {
];

const underlayColor = (StyleSheet.flatten(
_styles[activeStyle ? `${type}Highlight` : `${type}Raw`],
activeStyle ? activeStyle : _styles[`${type}Highlight`],
) as any).backgroundColor;

const indicatorColor = (StyleSheet.flatten(
Expand Down

0 comments on commit 1955fec

Please sign in to comment.