code review

.babelrc

@@ -1,3 +1,4 @@
 {
+  "plugins": ["transform-object-rest-spread"],
   "presets": ["es2015", "react"]
 }

package.json

@@ -9,7 +9,7 @@
     "deploy": "touch playground/.nojekyll && gh-pages -t -d playground -m \"Build for $(git log --pretty=format:%H -n1)\"",
     "lint": "eslint . --ext .js,.jsx",
     "start": "webpack-dev-server",
-    "test": "npm run lint && npm run build && npm run unit-test",
+    "test": "npm run lint && npm run build && npm run unit",
     "unit": "jest",
     "watch": "webpack --progress --colors --watch"
   },
@@ -44,15 +44,17 @@
     "gh-pages": "github:rschamp/gh-pages#publish-branch-to-subfolder",
     "html-webpack-plugin": "2.28.0",
     "jest": "^20.0.4",
+    "keymirror": "0.1.1",
+    "lodash.bindall": "4.4.0",
     "lodash.defaultsdeep": "4.6.0",
     "minilog": "3.1.0",
     "mkdirp": "^0.5.1",
-    "paper": "^0.11.4",
+    "paper": "0.11.4",
     "postcss-import": "^10.0.0",
     "postcss-loader": "^2.0.5",
     "postcss-simple-vars": "^4.0.0",
     "prop-types": "^15.5.10",
-    "react": "15.5.4",
+    "react": "15.6.1",
     "react-dom": "15.5.4",
     "react-intl": "2.3.0",
     "react-redux": "5.0.5",

src/components/paint-editor.jsx

@@ -1,6 +1,7 @@
 import PropTypes from 'prop-types';
 import React from 'react';
 import PaperCanvas from '../containers/paper-canvas.jsx';
+import ToolTypes from '../tools/tool-types.js';
 
 const PaintEditorComponent = props => (
     <PaperCanvas
@@ -9,9 +10,7 @@ const PaintEditorComponent = props => (
 );
 
 PaintEditorComponent.propTypes = {
-    tool: PropTypes.shape({
+    tool: PropTypes.oneOf(Object.keys(ToolTypes)).isRequired
-        name: PropTypes.string.isRequired
-    })
 };
 
 export default PaintEditorComponent;

src/containers/paint-editor.jsx

@@ -7,26 +7,25 @@ import {connect} from 'react-redux';
 
 class PaintEditor extends React.Component {
     componentDidMount () {
-        const onKeyPress = this.props.onKeyPress;
+        document.addEventListener('keydown', this.props.onKeyPress);
-        document.onkeydown = function (e) {
+    }
-            e = e || window.event;
+    componentWillUnmount () {
-            onKeyPress(e);
+        document.removeEventListener('keydown', this.props.onKeyPress);
-        };
     }
     render () {
+        const {
+            onKeyPress, // eslint-disable-line no-unused-vars
+            ...props
+        } = this.props;
         return (
-            <PaintEditorComponent
+            <PaintEditorComponent {...props} />
-                tool={this.props.tool}
-            />
         );
     }
 }
 
 PaintEditor.propTypes = {
     onKeyPress: PropTypes.func.isRequired,
-    tool: PropTypes.shape({
+    tool: PropTypes.oneOf(Object.keys(ToolTypes)).isRequired
-        name: PropTypes.string.isRequired
-    })
 };
 
 const mapStateToProps = state => ({

src/containers/paper-canvas.jsx

@@ -4,13 +4,8 @@ import paper from 'paper';
 import ToolTypes from '../tools/tool-types.js';
 
 class PaperCanvas extends React.Component {
-    constructor (props) {
-        super(props);
-        this.state = {
-        };
-    }
     componentDidMount () {
-        paper.setup('paper-canvas');
+        paper.setup(this.canvas);
         // Create a Paper.js Path to draw a line into it:
         const path = new paper.Path();
         // Give the stroke a color
@@ -25,23 +20,26 @@ class PaperCanvas extends React.Component {
         paper.view.draw();
     }
     componentWillReceiveProps (nextProps) {
-        if (nextProps.tool !== this.props.tool && nextProps.tool instanceof ToolTypes) {
+        if (nextProps.tool !== this.props.tool) {
             // TODO switch tool
         }
     }
     componentWillUnmount () {
+        paper.remove();
     }
     render () {
         return (
-            <canvas id="paper-canvas" />
+            <canvas
+                ref={canvas => {
+                    this.canvas = canvas;
+                }}
+            />
         );
     }
 }
 
 PaperCanvas.propTypes = {
-    tool: PropTypes.shape({
+    tool: PropTypes.oneOf(Object.keys(ToolTypes)).isRequired
-        name: PropTypes.string.isRequired
-    })
 };
 
 export default PaperCanvas;

src/log/log.js

@@ -1,4 +1,4 @@
 import minilog from 'minilog';
 minilog.enable();
 
-export default minilog('paint-editor');
+export default minilog('scratch-paint');

src/playground/playground.jsx

@@ -2,15 +2,12 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import PaintEditor from '..';
 import {Provider} from 'react-redux';
-import {createStore, applyMiddleware} from 'redux';
+import {createStore} from 'redux';
-import throttle from 'redux-throttle';
 import reducer from '../reducers/combine-reducers';
 
 const appTarget = document.createElement('div');
 document.body.appendChild(appTarget);
-const store = applyMiddleware(
+const store = createStore(
-    throttle(300, {leading: true, trailing: true})
-)(createStore)(
     reducer,
     window.__REDUX_DEVTOOLS_EXTENSION__ && window.__REDUX_DEVTOOLS_EXTENSION__()
 );

src/reducers/tools.js

@@ -8,10 +8,10 @@ const reducer = function (state, action) {
     if (typeof state === 'undefined') state = initialState;
     switch (action.type) {
     case CHANGE_TOOL:
-        if (action.tool instanceof ToolTypes) {
+        if (action.tool in ToolTypes) {
             return action.tool;
         }
-        log.warn(`Warning: Tool type does not exist: ${action.tool}`);
+        log.warn(`Tool type does not exist: ${action.tool}`);
         /* falls through */
     default:
         return state;
@@ -22,10 +22,7 @@ const reducer = function (state, action) {
 reducer.changeTool = function (tool) {
     return {
         type: CHANGE_TOOL,
-        tool: tool,
+        tool: tool
-        meta: {
-            throttle: 30
-        }
     };
 };
 

src/tools/tool-types.js

@@ -1,12 +1,8 @@
-class ToolTypes {
+import keyMirror from 'keymirror';
-    constructor (name) {
+
-        this.name = name;
+const ToolTypes = keyMirror({
-    }
+    BRUSH: null,
-    toString () {
+    ERASER: null
-        return `ToolTypes.${this.name}`;
+});
-    }
-}
-ToolTypes.BRUSH = new ToolTypes('BRUSH');
-ToolTypes.ERASER = new ToolTypes('ERASER');
 
 export default ToolTypes;

test/unit/tools-reducer.test.js

@@ -4,7 +4,7 @@ import reducer from '../../src/reducers/tools';
 
 test('initialState', () => {
     let defaultState;
-    expect(reducer(defaultState /* state */, {type: 'anything'} /* action */) instanceof ToolTypes).toBeTruthy();
+    expect(reducer(defaultState /* state */, {type: 'anything'} /* action */) in ToolTypes).toBeTruthy();
 });
 
 test('changeTool', () => {