Skip to content

Kepler.gl is a powerful open source geospatial analysis tool for large-scale data sets.

[Bug] Fix image export component failed to render (#418)

Shan He8ac7cb278aad
diff --git a/examples/demo-app/index.html b/examples/demo-app/index.html
index a098a0b35..e4e6227d7 100644
--- a/examples/demo-app/index.html
+++ b/examples/demo-app/index.html
@@ -3,7 +3,7 @@
<head>
<meta charset='UTF-8' />
<title>kepler.gl demo</title>
- <link href="//d1a3f4spazzrp4.cloudfront.net/uber-fonts/4.0.0/superfine.css" rel="stylesheet">
+ <link rel="stylesheet" href="//d1a3f4spazzrp4.cloudfront.net/kepler.gl/uber-fonts/4.0.0/superfine.css">
<link href="//api.tiles.mapbox.com/mapbox-gl-js/v0.42.0/mapbox-gl.css" rel="stylesheet">
<style type="text/css">
body {margin: 0; padding: 0; overflow: hidden;}
diff --git a/examples/demo-app/package.json b/examples/demo-app/package.json
index 4333045cb..69e556a5a 100644
--- a/examples/demo-app/package.json
+++ b/examples/demo-app/package.json
@@ -1,6 +1,7 @@
{
"scripts": {
"start": "webpack-dev-server --progress --hot --open",
+ "start-prod": "webpack-dev-server -p --env.prod --progress --hot --open",
"start-local": "webpack-dev-server --mode development --env.es6 --progress --hot --open",
"start-local-es5": "webpack-dev-server --env.local --progress --hot --open"
},
diff --git a/examples/demo-app/src/components/load-data-modal/load-data-modal.js b/examples/demo-app/src/components/load-data-modal/load-data-modal.js
index 7deeae58a..582b2f1bb 100644
--- a/examples/demo-app/src/components/load-data-modal/load-data-modal.js
+++ b/examples/demo-app/src/components/load-data-modal/load-data-modal.js
@@ -22,10 +22,8 @@ import React, {Component} from 'react';
import classnames from 'classnames';
import styled, {ThemeProvider} from 'styled-components';
import PropTypes from 'prop-types';
-import {FileUpload} from 'kepler.gl/components';
-import {LoadingSpinner} from 'kepler.gl/components';
+import {FileUpload, LoadingSpinner, Icons} from 'kepler.gl/components';
import {themeLT} from 'kepler.gl/styles';
-import {Icons} from 'kepler.gl/components/';
import {LOADING_METHODS, ASSETS_URL, LOADING_METHODS_NAMES} from '../../constants/default-settings';
@@ -116,7 +114,7 @@ const StyledTrySampleData = styled.div`
:hover {
font-weight: 500;
}
-
+
span {
white-space: nowrap;
}
diff --git a/examples/open-modal/index.html b/examples/open-modal/index.html
index f3daab553..929edd5a0 100644
--- a/examples/open-modal/index.html
+++ b/examples/open-modal/index.html
@@ -3,7 +3,7 @@
<head>
<meta charset='UTF-8' />
<title>kepler.gl demo</title>
- <link href="//d1a3f4spazzrp4.cloudfront.net/uber-fonts/4.0.0/superfine.css" rel="stylesheet">
+ <link rel="stylesheet" href="//d1a3f4spazzrp4.cloudfront.net/kepler.gl/uber-fonts/4.0.0/superfine.css">
<link href="//api.tiles.mapbox.com/mapbox-gl-js/v0.42.0/mapbox-gl.css" rel="stylesheet">
<style type="text/css">
body {margin: 0; padding: 0; overflow: hidden;}
diff --git a/examples/umd-client/index.html b/examples/umd-client/index.html
index 86d471b2b..b93488b50 100644
--- a/examples/umd-client/index.html
+++ b/examples/umd-client/index.html
@@ -4,6 +4,12 @@
<meta charset="UTF-8"/>
<title>Kepler.gl embedded map</title>
+ <!--Uber Font-->
+ <link rel="stylesheet" href="//d1a3f4spazzrp4.cloudfront.net/kepler.gl/uber-fonts/4.0.0/superfine.css">
+
+ <!--MapBox css-->
+ <link href="//api.tiles.mapbox.com/mapbox-gl-js/v0.42.0/mapbox-gl.css" rel="stylesheet">
+
<!-- Load React/Redux -->
<script src="https://unpkg.com/[email protected]/dist/react.min.js" crossorigin></script>
<script src="https://unpkg.com/[email protected]/dist/react-dom.min.js" crossorigin></script>
@@ -15,6 +21,10 @@
<!-- You can also specify a specific versions by doing the following -->
<!--<script src="https://unpkg.com/[email protected]/umd/keplergl.min.js"></script>-->
+ <style type="text/css">
+ body {margin: 0; padding: 0; overflow: hidden;}
+ </style>
+
<!--MapBox token-->
<script>
/**
diff --git a/package.json b/package.json
index 9787cac22..5159c7819 100644
--- a/package.json
+++ b/package.json
@@ -44,8 +44,8 @@
"docs": "babel-node ./scripts/documentation.js",
"lint": "eslint src webpack.*.js examples/*.js examples/**/src examples/**/*.js website/*.js website/src",
"web": "(yarn && yarn install:web && yarn start:web)",
- "deploy": "yarn clean && yarn && yarn install:web && (cd website && yarn build && git checkout gh-pages && cp dist/* .. && git add .. && git commit -m 'Update website' && git push origin gh-pages && git checkout master)",
- "deploy:test": "yarn clean && yarn && yarn install:web && (cd website && yarn build && git checkout -B gh-pages-test gh-pages && cp dist/* .. && git add .. && git commit -m 'Update website' && git push -f test gh-pages-test:master)",
+ "deploy": "yarn clean && yarn --ignore-engines && yarn install:web && (cd website && yarn build && git checkout gh-pages && cp dist/* .. && git add .. && git commit -m 'Update website' && git push origin gh-pages && git checkout master)",
+ "deploy:test": "yarn clean && yarn --ignore-engines && yarn install:web && (cd website && yarn build && git checkout -B gh-pages-test gh-pages && cp dist/* .. && git add .. && git commit -m 'Update website' && git push -f test gh-pages-test:master && git checkout master)",
"clean": "rm -rf node_modules examples/**/node_modules website/node_modules"
},
"files": [
diff --git a/src/components/common/styled-components.js b/src/components/common/styled-components.js
index a9da41cea..e5b4c6c70 100644
--- a/src/components/common/styled-components.js
+++ b/src/components/common/styled-components.js
@@ -303,6 +303,21 @@ export const DatasetSquare = styled.div`
margin-right: 12px
`;
+export const SelectionButton = styled.div`
+ border-radius: 2px;
+ border: 1px solid ${props => props.selected ? props.theme.primaryBtnBgd : props.theme.selectBorderColorLT};
+ color: ${props => props.selected ? props.theme.primaryBtnBgd : props.theme.selectBorderColorLT};
+ cursor: pointer;
+ font-weight: 500;
+ margin-right: 6px;
+ padding: 6px 10px;
+
+ :hover {
+ color: ${props => props.available && props.theme.primaryBtnBgd};
+ border: 1px solid ${props => props.available && props.theme.primaryBtnBgd};
+ }
+`;
+
export const Table = styled.table`
width: 100%;
border-spacing: 0;
diff --git a/src/components/modals/export-image-modal.js b/src/components/modals/export-image-modal.js
index fbe6e4efb..9fbc87607 100644
--- a/src/components/modals/export-image-modal.js
+++ b/src/components/modals/export-image-modal.js
@@ -28,9 +28,10 @@ import {
RATIOS,
RESOLUTION_OPTIONS
} from 'constants/default-settings';
-import LoadingSpinner from 'components/common/loading-spinner';
-import {StyledModalContent} from 'components/common/styled-components';
+
+import {StyledModalContent, SelectionButton} from 'components/common/styled-components';
import Switch from 'components/common/switch';
+import LoadingSpinner from 'components/common/loading-spinner';
const ImageOptionList = styled.div`
display: flex;
@@ -95,20 +96,6 @@ const PreviewImageSection = styled.div`
}
`;
-const Button = styled.div`
- border-radius: 2px;
- border: 1px solid ${props => props.selected ? props.theme.primaryBtnBgd : props.theme.selectBorderColorLT};
- color: ${props => props.selected ? props.theme.primaryBtnBgd : props.theme.selectBorderColorLT};
- cursor: pointer;
- font-weight: 500;
- margin-right: 6px;
- padding: 6px 10px;
-
- :hover {
- color: ${props => props.available && props.theme.primaryBtnBgd};
- border: 1px solid ${props => props.available && props.theme.primaryBtnBgd};
- }
-`;
class ExportImageModal extends Component {
@@ -150,16 +137,16 @@ class ExportImageModal extends Component {
<ImageOptionList>
<div className="image-option-section">
<div className="image-option-section-title">Ratio</div>
- Choose the ratio for various usages.
+ Choose the ratio for various usages.
<div className="button-list">
{RATIO_OPTIONS.map(op =>
- <Button
+ <SelectionButton
key={op.id}
selected={ratio === op.id}
onClick={() => onChangeRatio({ratio: op.id})}
>
{op.label}
- </Button>
+ </SelectionButton>
)}
</div>
</div>
@@ -167,15 +154,16 @@ class ExportImageModal extends Component {
<div className="image-option-section-title">Resolution</div>
High resolution is better for prints.
<div className="button-list">
- {RESOLUTION_OPTIONS.map(op =>
- <Button
- key={op.id}
- selected={resolution === op.id}
- onClick={() => op.available && onChangeResolution({resolution: op.id})}
- >
- {op.label}
- </Button>
- )}
+ {
+ RESOLUTION_OPTIONS.map(op =>
+ <SelectionButton
+ key={op.id}
+ selected={resolution === op.id}
+ onClick={() => op.available && onChangeResolution({resolution: op.id})}>
+ {op.label}
+ </SelectionButton>
+ )
+ }
</div>
</div>
<div className="image-option-section">
@@ -191,7 +179,9 @@ class ExportImageModal extends Component {
<div className="dimension">{`${exportImageSize.width} x ${exportImageSize.height}`}</div>
<div className="preview-image">
{exporting ?
- <div className="preview-image-spinner"><LoadingSpinner /></div> :
+ <div className="preview-image-spinner">
+ <LoadingSpinner />
+ </div> :
<img className="preview-image-placeholder" src={imageDataUri} />
}
</div>
diff --git a/src/utils/dom-to-image.js b/src/utils/dom-to-image.js
index ae37f87ca..460d49f3d 100644
--- a/src/utils/dom-to-image.js
+++ b/src/utils/dom-to-image.js
@@ -763,7 +763,7 @@ function newFontFaces() {
try {
rules = sheet.rules || sheet.cssRules;
} catch (e) {
- console.error(`'Can't read the css rules of: ${sheet.href}`, e);
+ console.log(`'Can't read the css rules of: ${sheet.href}`, e);
return;
}
@@ -773,11 +773,11 @@ function newFontFaces() {
.asArray(rules || [])
.forEach(cssRules.push.bind(cssRules));
} catch (e) {
- console.error(`Error while reading CSS rules from ${sheet.href}`, e);
+ console.log(`Error while reading CSS rules from ${sheet.href}`, e);
return;
}
} else {
- console.error('getCssRules can not find cssRules');
+ console.log('getCssRules can not find cssRules');
return;
}
});
diff --git a/website/package.json b/website/package.json
index 0958428b6..dc20c9791 100644
--- a/website/package.json
+++ b/website/package.json
@@ -11,7 +11,8 @@
"yarn": ">=0.27.5"
},
"scripts": {
- "start": "webpack-dev-server --mode development --env.local --content-base ./src/static --progress --open",
+ "start": "webpack-dev-server --mode development --env.prod --content-base ./src/static --progress --open",
+ "start-prod": "webpack-dev-server -p --env.prod --content-base ./src/static --progress --open",
"build-clean": "rm -rf ./dist && mkdir dist",
"build-static": "cp -r ./src/static/* dist && cd `git rev-parse --show-toplevel`",
"build-script": "webpack -p --env.prod",
diff --git a/website/src/static/index.html b/website/src/static/index.html
index 90809f5f3..04b0badc4 100644
--- a/website/src/static/index.html
+++ b/website/src/static/index.html
@@ -6,7 +6,8 @@
<meta name="description" content="Kepler.gl is a data agnostic, WebGL empowered, high-performance web application for geospatial analytic visualizations.">
<title>kepler.gl</title>
<link rel="shortcut icon" href="/favicon.png">
- <link rel="stylesheet" id="font-link" href="//d1a3f4spazzrp4.cloudfront.net/uber-fonts/3.1.0/refresh.css">
+ <link rel="stylesheet" href="//d1a3f4spazzrp4.cloudfront.net/kepler.gl/uber-fonts/4.0.0/superfine.css">
+
<link href="//api.tiles.mapbox.com/mapbox-gl-js/v0.42.0/mapbox-gl.css" rel="stylesheet">
<!-— facebook open graph tags -->