From 71065f9d4e09f2f52ca06b288b075d166f911573 Mon Sep 17 00:00:00 2001 From: Krist Wongsuphasawat Date: Wed, 5 Sep 2018 11:29:12 -0700 Subject: [PATCH] fix linting and remove css --- .../assets/src/visualizations/MapBox/MapBox.css | 13 ------------- .../assets/src/visualizations/MapBox/MapBox.jsx | 2 +- .../MapBox/ScatterPlotGlowOverlay.jsx | 14 ++++++++++++-- 3 files changed, 13 insertions(+), 16 deletions(-) diff --git a/superset/assets/src/visualizations/MapBox/MapBox.css b/superset/assets/src/visualizations/MapBox/MapBox.css index 477d09a906232..3ec640dac6e99 100644 --- a/superset/assets/src/visualizations/MapBox/MapBox.css +++ b/superset/assets/src/visualizations/MapBox/MapBox.css @@ -1,16 +1,3 @@ -.mapbox div.widget .slice_container { - cursor: grab; - cursor: -moz-grab; - cursor: -webkit-grab; - overflow: hidden; -} - -.mapbox div.widget .slice_container:active { - cursor: grabbing; - cursor: -moz-grabbing; - cursor: -webkit-grabbing; -} - .mapbox .slice_container div { padding-top: 0px; } diff --git a/superset/assets/src/visualizations/MapBox/MapBox.jsx b/superset/assets/src/visualizations/MapBox/MapBox.jsx index 23d734628d50f..81f41f074b1d2 100644 --- a/superset/assets/src/visualizations/MapBox/MapBox.jsx +++ b/superset/assets/src/visualizations/MapBox/MapBox.jsx @@ -122,7 +122,7 @@ class MapBox extends React.Component { compositeOperation={'screen'} renderWhileDragging={renderWhileDragging} aggregatorName={aggregatorName} - lngLatAccessor={location => { + lngLatAccessor={(location) => { const coordinates = location.get('geometry').get('coordinates'); return [coordinates.get(0), coordinates.get(1)]; }} diff --git a/superset/assets/src/visualizations/MapBox/ScatterPlotGlowOverlay.jsx b/superset/assets/src/visualizations/MapBox/ScatterPlotGlowOverlay.jsx index ec6b09773bda8..ea4e115de3b00 100644 --- a/superset/assets/src/visualizations/MapBox/ScatterPlotGlowOverlay.jsx +++ b/superset/assets/src/visualizations/MapBox/ScatterPlotGlowOverlay.jsx @@ -36,6 +36,11 @@ const contextTypes = { }; class ScatterPlotGlowOverlay extends React.Component { + constructor(props) { + super(props); + this.setCanvasRef = this.setCanvasRef.bind(this); + } + componentDidMount() { this.redraw(); } @@ -43,6 +48,11 @@ class ScatterPlotGlowOverlay extends React.Component { componentDidUpdate() { this.redraw(); } + + setCanvasRef(element) { + this.canvas = element; + } + drawText(ctx, pixel, options = {}) { const IS_DARK_THRESHOLD = 110; const { fontHeight = 0, label = '', radius = 0, rgb = [0, 0, 0], shadow = false } = options; @@ -197,9 +207,9 @@ class ScatterPlotGlowOverlay extends React.Component { } }, this); } - ctx.restore(); } + render() { let width = 0; let height = 0; @@ -211,7 +221,7 @@ class ScatterPlotGlowOverlay extends React.Component { const pixelRatio = window.devicePixelRatio || 1; return ( { this.canvas = c; }} + ref={this.setCanvasRef} width={width * pixelRatio} height={height * pixelRatio} style={{