From e665e48458de2ad51daa2d35aef378e1dda76318 Mon Sep 17 00:00:00 2001 From: Victor Powell Date: Mon, 16 Nov 2015 22:40:01 -0800 Subject: [PATCH] Fix DraggablePointsOverlay propTypes definition. Clean up whitespace. --- example/examples/geodata-creator.react.js | 6 +++--- src/overlays/canvas.react.js | 1 + src/overlays/draggable-points.react.js | 10 +++++----- src/overlays/html.react.js | 3 +++ src/overlays/scatterplot.react.js | 2 ++ src/overlays/svg.react.js | 3 +++ 6 files changed, 17 insertions(+), 8 deletions(-) diff --git a/example/examples/geodata-creator.react.js b/example/examples/geodata-creator.react.js index afb3ddb4..52275299 100644 --- a/example/examples/geodata-creator.react.js +++ b/example/examples/geodata-creator.react.js @@ -47,9 +47,9 @@ var initialPoints = [ var ids = initialPoints[initialPoints.length - 1].id; -var DemoGeodataCreator = React.createClass({ +var GeodataCreator = React.createClass({ - displayName: 'DemoGeodataCreator', + displayName: 'GeodataCreatorExample', PropTypes: { width: React.PropTypes.number.isRequired, @@ -146,4 +146,4 @@ var DemoGeodataCreator = React.createClass({ } }); -module.exports = DemoGeodataCreator; +module.exports = GeodataCreator; diff --git a/src/overlays/canvas.react.js b/src/overlays/canvas.react.js index c6f57c36..e879e206 100644 --- a/src/overlays/canvas.react.js +++ b/src/overlays/canvas.react.js @@ -28,6 +28,7 @@ function devicePixelRatio() { } var CanvasOverlay = React.createClass({ + displayName: 'CanvasOverlay', propTypes: { diff --git a/src/overlays/draggable-points.react.js b/src/overlays/draggable-points.react.js index 5fc36437..d389e1cb 100644 --- a/src/overlays/draggable-points.react.js +++ b/src/overlays/draggable-points.react.js @@ -33,12 +33,12 @@ var DraggablePointsOverlay = React.createClass({ displayName: 'DraggablePointsOverlay', - PropTypes: { - width: React.PropTypes.number.isRequired, - height: React.PropTypes.number.isRequired, + propTypes: { + width: React.PropTypes.number, + height: React.PropTypes.number, points: React.PropTypes.instanceOf(Immutable.List), - project: React.PropTypes.func.isRequired, - unproject: React.PropTypes.func.isRequired, + project: React.PropTypes.func, + unproject: React.PropTypes.func, isDragging: React.PropTypes.bool, keyAccessor: React.PropTypes.func, locationAccessor: React.PropTypes.func, diff --git a/src/overlays/html.react.js b/src/overlays/html.react.js index acf70648..3efece5e 100644 --- a/src/overlays/html.react.js +++ b/src/overlays/html.react.js @@ -24,7 +24,9 @@ var r = require('r-dom'); var assign = require('object-assign'); var HTMLOverlay = React.createClass({ + displayName: 'HTMLOverlay', + propTypes: { width: React.PropTypes.number, height: React.PropTypes.number, @@ -32,6 +34,7 @@ var HTMLOverlay = React.createClass({ project: React.PropTypes.func, isDragging: React.PropTypes.bool }, + render: function render() { var style = assign({}, { position: 'absolute', diff --git a/src/overlays/scatterplot.react.js b/src/overlays/scatterplot.react.js index 53a349c5..790e31be 100644 --- a/src/overlays/scatterplot.react.js +++ b/src/overlays/scatterplot.react.js @@ -27,6 +27,7 @@ var Immutable = require('immutable'); var COMPOSITE_TYPES = require('canvas-composite-types'); var ScatterplotOverlay = React.createClass({ + displayName: 'ScatterplotOverlay', propTypes: { @@ -97,6 +98,7 @@ var ScatterplotOverlay = React.createClass({ } ctx.restore(); }, + render: function render() { var pixelRatio = window.devicePixelRatio; return r.canvas({ diff --git a/src/overlays/svg.react.js b/src/overlays/svg.react.js index 90e9f692..bc54f874 100644 --- a/src/overlays/svg.react.js +++ b/src/overlays/svg.react.js @@ -24,7 +24,9 @@ var r = require('r-dom'); var assign = require('object-assign'); var SVGOverlay = React.createClass({ + displayName: 'SVGOverlay', + propTypes: { width: React.PropTypes.number, height: React.PropTypes.number, @@ -32,6 +34,7 @@ var SVGOverlay = React.createClass({ project: React.PropTypes.func, isDragging: React.PropTypes.bool }, + render: function render() { var style = assign({}, { pointerEvents: 'none',