From 795f6e5b307bcd7321b5f990fcef55ea97efe328 Mon Sep 17 00:00:00 2001 From: qiutingkawayile Date: Wed, 11 May 2016 14:39:24 +0800 Subject: [PATCH 1/2] Allows custom background colors --- src/Bars.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/Bars.js b/src/Bars.js index 7bc1b32..ed90f74 100644 --- a/src/Bars.js +++ b/src/Bars.js @@ -7,13 +7,15 @@ export default class Bubbles extends Component { static propTypes = { size: PropTypes.number, color: PropTypes.string, - spaceBetween: PropTypes.number + spaceBetween: PropTypes.number, + bgColor:PropTypes.string }; static defaultProps = { spaceBetween: 4, size: 20, - color: '#000' + color: '#000', + bgColor:'transparent' }; state = { @@ -76,11 +78,11 @@ export default class Bubbles extends Component { } render() { - const { size, spaceBetween } = this.props; + const { size, spaceBetween, bgColor } = this.props; const width = size / 3 * 5 + spaceBetween * 4; const height = size * 3; - return ( + return ( {this.renderBar(0)} {this.renderBar(1)} {this.renderBar(2)} From 9aa553d358657f4d6d9ca1f286971a4958923dbb Mon Sep 17 00:00:00 2001 From: chengduxulei Date: Wed, 11 May 2016 14:58:18 +0800 Subject: [PATCH 2/2] Customize background color --- src/Bars.js | 10 ++++++---- src/Bubbles.js | 10 ++++++---- src/DoubleBounce.js | 10 ++++++---- src/Pulse.js | 10 ++++++---- 4 files changed, 24 insertions(+), 16 deletions(-) diff --git a/src/Bars.js b/src/Bars.js index 7bc1b32..ed90f74 100644 --- a/src/Bars.js +++ b/src/Bars.js @@ -7,13 +7,15 @@ export default class Bubbles extends Component { static propTypes = { size: PropTypes.number, color: PropTypes.string, - spaceBetween: PropTypes.number + spaceBetween: PropTypes.number, + bgColor:PropTypes.string }; static defaultProps = { spaceBetween: 4, size: 20, - color: '#000' + color: '#000', + bgColor:'transparent' }; state = { @@ -76,11 +78,11 @@ export default class Bubbles extends Component { } render() { - const { size, spaceBetween } = this.props; + const { size, spaceBetween, bgColor } = this.props; const width = size / 3 * 5 + spaceBetween * 4; const height = size * 3; - return ( + return ( {this.renderBar(0)} {this.renderBar(1)} {this.renderBar(2)} diff --git a/src/Bubbles.js b/src/Bubbles.js index 5167ec1..c4739f5 100644 --- a/src/Bubbles.js +++ b/src/Bubbles.js @@ -7,13 +7,15 @@ export default class Bubbles extends Component { static propTypes = { size: PropTypes.number, color: PropTypes.string, - spaceBetween: PropTypes.number + spaceBetween: PropTypes.number, + bgColor:PropTypes.string }; static defaultProps = { spaceBetween: 6, size: 11, - color: '#000' + color: '#000', + bgColor:'transparent' }; state = { @@ -77,11 +79,11 @@ export default class Bubbles extends Component { } render() { - const { size, spaceBetween } = this.props; + const { size, spaceBetween, bgColor } = this.props; const width = size * 6 + spaceBetween * 2; const height = size * 2; - return ( + return ( {this.renderBubble(0)} {this.renderBubble(1)} {this.renderBubble(2)} diff --git a/src/DoubleBounce.js b/src/DoubleBounce.js index 4e069bd..86f0c15 100644 --- a/src/DoubleBounce.js +++ b/src/DoubleBounce.js @@ -6,12 +6,14 @@ import Circle from './animated/Circle'; export default class Pulse extends Component { static propTypes = { size: PropTypes.number, - color: PropTypes.string + color: PropTypes.string, + bgColor:PropTypes.string }; static defaultProps = { size: 14, - color: '#000' + color: '#000', + bgColor:'transparent' }; state = { @@ -50,12 +52,12 @@ export default class Pulse extends Component { } render() { - const { size, color } = this.props; + const { size, color, bgColor} = this.props; const { bounces: [scale1, scale2] } = this.state; const width = size * 2; const height = size * 2; - return ( + return ( + return (