Merge branch 'master' into gh-pages

Author: pughpugh

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 1.0.10 - Dev 23, 2016
+  * Reduce the ammount of canvas drawing
+  * Allow colour to be updated without resetting the timer
+
+## 1.0.9 - Aug 31, 2016
+  * Fix invalid react proptype for showMilliseconds. Thanks @sabazusi.
+
 ## 1.0.8 - Aug 8, 2016
 
   * Updated React version in peerDependencies

build/react-countdown-clock.js

@@ -20,7 +20,8 @@ module.exports = React.createClass
     alpha: React.PropTypes.number
     timeFormat: React.PropTypes.string
     onComplete: React.PropTypes.func
-    showMilliseconds: React.PropTypes.boolean
+    onClick: React.PropTypes.func
+    showMilliseconds: React.PropTypes.bool
 
   getDefaultProps: ->
     seconds: 60
@@ -32,9 +33,15 @@ module.exports = React.createClass
     font: 'Arial'
     showMilliseconds: true
 
-  componentWillReceiveProps: (props) ->
-    @_seconds = props.seconds
-    @_setupTimer()
+  componentDidUpdate: (props) ->
+    if props.seconds != @props.seconds
+      @_seconds = props.seconds
+      @_setupTimer()
+
+    if props.color != @props.color
+      @_clearBackground()
+      @_drawBackground()
+      @_updateCanvas()
 
   componentDidMount: ->
     @_seconds = @props.seconds
@@ -45,7 +52,8 @@ module.exports = React.createClass
 
   _setupTimer: ->
     @_setScale()
-    @_setupCanvas()
+    @_setupCanvases()
+    @_drawBackground()
     @_drawTimer()
     @_startTimer()
 
@@ -70,11 +78,13 @@ module.exports = React.createClass
     tick = @_seconds * tickScale
     if tick > 1000 then 1000 else tick
 
-  _setupCanvas: ->
-    @_canvas  = @refs.canvas
-    @_context = @_canvas.getContext '2d'
-    @_context.textAlign = 'center'
-    @_context.textBaseline = 'middle'
+  _setupCanvases: ->
+    @_background = @refs.background.getContext '2d'
+    @_timer = @refs.timer.getContext '2d'
+    @_timer.textAlign = 'center'
+    @_timer.textBaseline = 'middle'
+    if @props.onClick?
+      @refs.component.addEventListener 'click', @props.onClick
 
   _startTimer: ->
     # Give it a moment to collect it's thoughts for smoother render
@@ -84,6 +94,9 @@ module.exports = React.createClass
     for timeout in @_timeoutIds
       clearTimeout timeout
 
+    if @props.onClick?
+      @refs.component.removeEventListener 'click', @props.onClick
+
   _tick: ->
     start = Date.now()
     @_timeoutIds.push(setTimeout ( =>
@@ -103,16 +116,20 @@ module.exports = React.createClass
     if @props.onComplete
       @props.onComplete()
 
+  _clearBackground: ->
+    @_background.clearRect 0, 0, @refs.timer.width, @refs.timer.height
+
   _clearTimer: ->
-    @_context.clearRect 0, 0, @_canvas.width, @_canvas.height
-    @_drawBackground()
+    @_timer.clearRect 0, 0, @refs.timer.width, @refs.timer.height
 
   _drawBackground: ->
-    @_context.beginPath()
-    @_context.globalAlpha = @props.alpha / 3
-    @_context.arc @_radius, @_radius,      @_radius,           0, Math.PI * 2, false
-    @_context.arc @_radius, @_radius, @_innerRadius, Math.PI * 2,           0, true
-    @_context.fill()
+    @_background.beginPath()
+    @_background.globalAlpha = @props.alpha / 3
+    @_background.fillStyle = @props.color
+    @_background.arc @_radius, @_radius,      @_radius,           0, Math.PI * 2, false
+    @_background.arc @_radius, @_radius, @_innerRadius, Math.PI * 2,           0, true
+    @_background.closePath()
+    @_background.fill()
 
   _formattedTime: ->
     decimals = (@_seconds <= 9.9 && @props.showMilliseconds) ? 1 : 0
@@ -149,14 +166,20 @@ module.exports = React.createClass
   _drawTimer: ->
     percent = @_fraction * @_seconds + 1.5
     formattedTime = @_formattedTime()
-    @_context.globalAlpha = @props.alpha
-    @_context.fillStyle = @props.color
-    @_context.font = "bold #{@_fontSize(formattedTime)} #{@props.font}"
-    @_context.fillText formattedTime, @_radius, @_radius
-    @_context.beginPath()
-    @_context.arc @_radius, @_radius,      @_radius,     Math.PI * 1.5, Math.PI * percent, false
-    @_context.arc @_radius, @_radius, @_innerRadius, Math.PI * percent,     Math.PI * 1.5, true
-    @_context.fill()
+
+    # Timer
+    @_timer.globalAlpha = @props.alpha
+    @_timer.fillStyle = @props.color
+    @_timer.font = "bold #{@_fontSize(formattedTime)} #{@props.font}"
+    @_timer.fillText formattedTime, @_radius, @_radius
+    @_timer.beginPath()
+    @_timer.arc @_radius, @_radius,      @_radius,     Math.PI * 1.5, Math.PI * percent, false
+    @_timer.arc @_radius, @_radius, @_innerRadius, Math.PI * percent,     Math.PI * 1.5, true
+    @_timer.closePath()
+    @_timer.fill()
 
   render: ->
-    <canvas ref='canvas' className="react-countdown-clock" width={@props.size} height={@props.size}></canvas>
+    <div ref='component' className="react-countdown-clock">
+      <canvas ref='background' style={ position: 'absolute' } width={@props.size} height={@props.size}></canvas>
+      <canvas ref='timer' style={ position: 'absolute' } width={@props.size} height={@props.size}></canvas>
+    </div>

build/react-countdown-clock.js.map

@@ -48,13 +48,20 @@
       handleOnComplete: function(){
         this.setState(this.getState());
       },
+      handleOnClick: function(){
+        console.log("CLICK")
+        this.setState({
+          color: randomColor()
+        });
+      },
       render: function(){
         return (
           React.createElement(ReactCountdownClock, {
             seconds: this.state.seconds,
             color: this.state.color,
             alpha: 0.9,
-            onComplete: this.handleOnComplete 
+            onComplete: this.handleOnComplete,
+            onClick: this.handleOnClick
           })
         )
       }

coffee/react-countdown-clock.coffee

@@ -1,6 +1,6 @@
 {
   "name": "react-countdown-clock",
-  "version": "1.0.8",
+  "version": "1.0.10",
   "description": "HTML5 canvas countdown clock React component",
   "main": "build/react-countdown-clock.js",
   "repository": {