Kepler.gl is a powerful open source geospatial analysis tool for large-scale data sets.
Fixes for using in a vite app (#2898)
Ilya Boyandinb1bddd5fb18b
diff --git a/bindings/kepler.gl-jupyter/js/lib/keplergl/main.js b/bindings/kepler.gl-jupyter/js/lib/keplergl/main.jsindex de3e3393e..48abea307 100644--- a/bindings/kepler.gl-jupyter/js/lib/keplergl/main.js+++ b/bindings/kepler.gl-jupyter/js/lib/keplergl/main.js@@ -5,7 +5,7 @@import createAppStore from './store';import renderRoot from './components/root';import document from 'global/document';-import window from 'global/window';+import Window from 'global/window';import {addDataConfigToKeplerGl} from './kepler.gl';const map = (function initKeplerGl() {@@ -13,10 +13,7 @@ const map = (function initKeplerGl() {const store = createAppStore();const divElmt = document.createElement('div');- divElmt.setAttribute(- 'style',- 'width: 100vw; height: 100vh; position: absolute'- );+ divElmt.setAttribute('style', 'width: 100vw; height: 100vh; position: absolute');document.body.appendChild(divElmt);return {@@ -30,6 +27,6 @@ const map = (function initKeplerGl() {map.render();(function loadDataConfig(keplerGlMap) {- const {data, config, options} = window.__keplerglDataConfig || {};+ const {data, config, options} = Window.__keplerglDataConfig || {};addDataConfigToKeplerGl({data, config, options, store: keplerGlMap.store});})(map);diff --git a/examples/custom-reducer/src/store.js b/examples/custom-reducer/src/store.jsindex 36f027226..b83e5d811 100644--- a/examples/custom-reducer/src/store.js+++ b/examples/custom-reducer/src/store.js@@ -4,7 +4,7 @@import {createStore, combineReducers, applyMiddleware, compose} from 'redux';import keplerGlReducer, {uiStateUpdaters, enhanceReduxMiddleware} from '@kepler.gl/reducers';import appReducer from './app-reducer';-import window from 'global/window';+import Window from 'global/window';const customizedKeplerGlReducer = keplerGlReducer.initialState({@@ -53,6 +53,6 @@ const enhancers = [applyMiddleware(...middlewares)];const initialState = {};// add redux devtools-const composeEnhancers = window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || compose;+const composeEnhancers = Window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || compose;export default createStore(reducers, initialState, composeEnhancers(...enhancers));diff --git a/examples/custom-theme/src/app.js b/examples/custom-theme/src/app.jsindex 05ca7fb0a..758905e2d 100644--- a/examples/custom-theme/src/app.js+++ b/examples/custom-theme/src/app.js@@ -3,7 +3,7 @@import React, {useEffect, useState} from 'react';import styled from 'styled-components';-import window from 'global/window';+import Window from 'global/window';import {connect} from 'react-redux';import KeplerGl from '@kepler.gl/components';@@ -46,16 +46,16 @@ const StyleSwitch = styled.div`function App() {const [customTheme, setTheme] = useState(false);const [windowDimension, setDimension] = useState({- width: window.innerWidth,- height: window.innerHeight+ width: Window.innerWidth,+ height: Window.innerHeight});useEffect(() => {const handleResize = () => {- setDimension({width: window.innerWidth, height: window.innerHeight});+ setDimension({width: Window.innerWidth, height: Window.innerHeight});};- window.addEventListener('resize', handleResize);- return () => window.removeEventListener('resize', handleResize);+ Window.addEventListener('resize', handleResize);+ return () => Window.removeEventListener('resize', handleResize);}, []);return (diff --git a/examples/custom-theme/src/store.js b/examples/custom-theme/src/store.jsindex 3498011c9..119cfd3a1 100644--- a/examples/custom-theme/src/store.js+++ b/examples/custom-theme/src/store.js@@ -1,7 +1,7 @@// SPDX-License-Identifier: MIT// Copyright contributors to the kepler.gl project-import window from 'global/window';+import Window from 'global/window';import {combineReducers, createStore, applyMiddleware, compose} from 'redux';import {enhanceReduxMiddleware} from '@kepler.gl/reducers';@@ -18,6 +18,6 @@ export const enhancers = [applyMiddleware(...middlewares)];const initialState = {};// add redux devtools-const composeEnhancers = window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || compose;+const composeEnhancers = Window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || compose;export default createStore(reducers, initialState, composeEnhancers(...enhancers));diff --git a/examples/demo-app/src/app.tsx b/examples/demo-app/src/app.tsxindex c90914e56..d65c29dcb 100644--- a/examples/demo-app/src/app.tsx+++ b/examples/demo-app/src/app.tsx@@ -4,7 +4,7 @@import React, {useCallback, useEffect, useRef, useMemo, useState} from 'react';import AutoSizer from 'react-virtualized/dist/commonjs/AutoSizer';import styled, {ThemeProvider, StyleSheetManager} from 'styled-components';-import window from 'global/window';+import Window from 'global/window';import {connect, useDispatch} from 'react-redux';import cloneDeep from 'lodash.clonedeep';import isEqual from 'lodash.isequal';@@ -191,7 +191,7 @@ const App = props => {const _disableBanner = useCallback(() => {hideBanner();- window.localStorage.setItem(BannerKey, 'true');+ Window.localStorage.setItem(BannerKey, 'true');}, [hideBanner]);const _loadRowData = useCallback(() => {@@ -456,7 +456,7 @@ const App = props => {features: sampleGeojsonPoints.features.slice(0, 5)});_loadGeojsonData();- window.setTimeout(() => {+ Window.setTimeout(() => {dispatch(replaceDataInMap({datasetToReplaceId: 'bart-stops-geo',diff --git a/examples/demo-app/src/cloud-providers/dropbox/dropbox-provider.js b/examples/demo-app/src/cloud-providers/dropbox/dropbox-provider.jsindex 8db561165..78ed68b7d 100644--- a/examples/demo-app/src/cloud-providers/dropbox/dropbox-provider.js+++ b/examples/demo-app/src/cloud-providers/dropbox/dropbox-provider.js@@ -3,7 +3,7 @@// DROPBOXimport {Dropbox} from 'dropbox';-import window from 'global/window';+import Window from 'global/window';import DropboxIcon from './dropbox-icon';import {MAP_URI} from '../../constants/default-settings';import {KEPLER_FORMAT, Provider} from '@kepler.gl/cloud-providers';@@ -59,7 +59,7 @@ export default class DropboxProvider extends Provider {return new Promise((resolve, reject) => {const link = this._authLink();- const authWindow = window.open(link, '_blank', 'width=1024,height=716');+ const authWindow = Window.open(link, '_blank', 'width=1024,height=716');const handleToken = async event => {// if user has dev tools this will skip all the react-devtools events@@ -69,7 +69,7 @@ export default class DropboxProvider extends Provider {if (authWindow) {authWindow.close();- window.removeEventListener('message', handleToken);+ Window.removeEventListener('message', handleToken);}const {token} = event.data;@@ -83,8 +83,8 @@ export default class DropboxProvider extends Provider {// save user nameconst user = await this.getUser();- if (window.localStorage) {- window.localStorage.setItem(+ if (Window.localStorage) {+ Window.localStorage.setItem('dropbox',JSON.stringify({// dropbox token doesn't expire unless revoked by the user@@ -98,7 +98,7 @@ export default class DropboxProvider extends Provider {resolve(user);};- window.addEventListener('message', handleToken);+ Window.addEventListener('message', handleToken);});}@@ -204,8 +204,8 @@ export default class DropboxProvider extends Provider {getUserName() {// load user from- if (window.localStorage) {- const jsonString = window.localStorage.getItem('dropbox');+ if (Window.localStorage) {+ const jsonString = Window.localStorage.getItem('dropbox');return jsonString && JSON.parse(jsonString).user;}return null;@@ -213,8 +213,8 @@ export default class DropboxProvider extends Provider {async logout() {await this._dropbox.authTokenRevoke();- if (window.localStorage) {- window.localStorage.removeItem('dropbox');+ if (Window.localStorage) {+ Window.localStorage.removeItem('dropbox');}// re instantiate dropboxthis._initializeDropbox();@@ -238,7 +238,7 @@ export default class DropboxProvider extends Provider {*/getShareUrl(fullUrl = true) {return fullUrl- ? `${window.location.protocol}//${window.location.host}/${MAP_URI}${this._shareUrl}`+ ? `${Window.location.protocol}//${Window.location.host}/${MAP_URI}${this._shareUrl}`: `/${MAP_URI}${this._shareUrl}`;}@@ -260,8 +260,8 @@ export default class DropboxProvider extends Provider {*/getAccessToken() {let token = this._dropbox.getAccessToken();- if (!token && window.localStorage) {- const jsonString = window.localStorage.getItem('dropbox');+ if (!token && Window.localStorage) {+ const jsonString = Window.localStorage.getItem('dropbox');token = jsonString && JSON.parse(jsonString).token;if (token) {this._dropbox.setAccessToken(token);@@ -280,13 +280,13 @@ export default class DropboxProvider extends Provider {return null;}// dropbox token usually start with # therefore we want to remove the '#'- const query = window.location.hash.substring(1);+ const query = Window.location.hash.substring(1);return parseQueryString(query).access_token;}// PRIVATE_initializeDropbox() {- this._dropbox = new Dropbox({fetch: window.fetch});+ this._dropbox = new Dropbox({fetch: Window.fetch});this._dropbox.setClientId(this.clientId);}@@ -323,7 +323,7 @@ export default class DropboxProvider extends Provider {// append url after map sharing_getMapPermalink(mapLink, fullUrl = true) {return fullUrl- ? `${window.location.protocol}//${window.location.host}/${MAP_URI}${mapLink}`+ ? `${Window.location.protocol}//${Window.location.host}/${MAP_URI}${mapLink}`: `/${MAP_URI}${mapLink}`;}@@ -332,7 +332,7 @@ export default class DropboxProvider extends Provider {_getMapPermalinkFromParams({path}, fullURL = true) {const mapLink = `demo/map/dropbox?path=${path}`;return fullURL- ? `${window.location.protocol}//${window.location.host}/${mapLink}`+ ? `${Window.location.protocol}//${Window.location.host}/${mapLink}`: `/${mapLink}`;}/**@@ -373,8 +373,8 @@ export default class DropboxProvider extends Provider {*/_authLink(path = 'auth') {return this._dropbox.getAuthenticationUrl(- `${window.location.origin}/${path}`,- btoa(JSON.stringify({handler: 'dropbox', origin: window.location.origin}))+ `${Window.location.origin}/${path}`,+ btoa(JSON.stringify({handler: 'dropbox', origin: Window.location.origin})));}diff --git a/examples/demo-app/src/store.js b/examples/demo-app/src/store.jsindex 03fc788fd..64b74da50 100644--- a/examples/demo-app/src/store.js+++ b/examples/demo-app/src/store.js@@ -8,7 +8,7 @@ import {enhanceReduxMiddleware} from '@kepler.gl/reducers';import {createLogger} from 'redux-logger';import thunk from 'redux-thunk';// eslint-disable-next-line no-unused-vars-import window from 'global/window';+import Window from 'global/window';import demoReducer from './reducers/index';@@ -39,8 +39,8 @@ let composeEnhancers = compose;* comment out code below to enable Redux Devtools*/-if (window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__) {- composeEnhancers = window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__({+if (Window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__) {+ composeEnhancers = Window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__({actionsBlacklist: ['@@kepler.gl/MOUSE_MOVE','@@kepler.gl/UPDATE_MAP',diff --git a/examples/open-modal/src/store.js b/examples/open-modal/src/store.jsindex 00ba0a28b..a2724860a 100644--- a/examples/open-modal/src/store.js+++ b/examples/open-modal/src/store.js@@ -5,7 +5,7 @@ import {createStore, combineReducers, applyMiddleware, compose} from 'redux';import keplerGlReducer, {enhanceReduxMiddleware} from '@kepler.gl/reducers';import appReducer from './app-reducer';-import window from 'global/window';+import Window from 'global/window';const reducers = combineReducers({keplerGl: keplerGlReducer,@@ -18,6 +18,6 @@ const enhancers = [applyMiddleware(...middlewares)];const initialState = {};// add redux devtools-const composeEnhancers = window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || compose;+const composeEnhancers = Window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || compose;export default createStore(reducers, initialState, composeEnhancers(...enhancers));diff --git a/src/components/src/common/file-uploader/file-drop.tsx b/src/components/src/common/file-uploader/file-drop.tsxindex 7dd8950c0..e2e83df13 100644--- a/src/components/src/common/file-uploader/file-drop.tsx+++ b/src/components/src/common/file-uploader/file-drop.tsx@@ -6,11 +6,11 @@* For React 16.8 compatibility*/import React, {ReactNode} from 'react';-import window from 'global/window';+import Window from 'global/window';export type FileDropProps = {dropEffect?: 'copy' | 'move' | 'link' | 'none';- frame?: typeof document | typeof window | HTMLElement;+ frame?: typeof document | typeof Window | HTMLElement;className?: string;targetClassName?: string;draggingOverFrameClassName?: string;@@ -29,10 +29,10 @@ export type FileDropProps = {/** @augments React.PureComponent<FileDropProps> */class FileDrop extends React.PureComponent<FileDropProps> {static isIE = () =>- window &&- window.navigator &&- ((window.navigator.userAgent || []).includes('MSIE') ||- (window.navigator.appVersion || []).includes('Trident/'));+ Window &&+ Window.navigator &&+ ((Window.navigator.userAgent || []).includes('MSIE') ||+ (Window.navigator.appVersion || []).includes('Trident/'));static eventHasFiles = event => {// In most browsers this is an array, but in IE11 it's an Object :(@@ -52,7 +52,7 @@ class FileDrop extends React.PureComponent<FileDropProps> {static defaultProps = {dropEffect: 'copy',- frame: window ? window.document : undefined,+ frame: Window ? Window.document : undefined,className: 'file-drop',targetClassName: 'file-drop-target',draggingOverFrameClassName: 'file-drop-dragging-over-frame',@@ -65,8 +65,8 @@ class FileDrop extends React.PureComponent<FileDropProps> {componentDidMount() {this.startFrameListeners(this.props.frame);this.resetDragging();- window.addEventListener('dragover', this.handleWindowDragOverOrDrop);- window.addEventListener('drop', this.handleWindowDragOverOrDrop);+ Window.addEventListener('dragover', this.handleWindowDragOverOrDrop);+ Window.addEventListener('drop', this.handleWindowDragOverOrDrop);}componentDidUpdate(prevProps) {@@ -79,8 +79,8 @@ class FileDrop extends React.PureComponent<FileDropProps> {componentWillUnmount() {this.stopFrameListeners(this.props.frame);- window.removeEventListener('dragover', this.handleWindowDragOverOrDrop);- window.removeEventListener('drop', this.handleWindowDragOverOrDrop);+ Window.removeEventListener('dragover', this.handleWindowDragOverOrDrop);+ Window.removeEventListener('drop', this.handleWindowDragOverOrDrop);}resetDragging = () => {diff --git a/src/components/src/common/portaled.tsx b/src/components/src/common/portaled.tsxindex 39e02d706..6d00febf2 100644--- a/src/components/src/common/portaled.tsx+++ b/src/components/src/common/portaled.tsx@@ -9,7 +9,7 @@ import {canUseDOM} from 'exenv';import {withTheme} from 'styled-components';import {RootContext} from '../context';import Modal from 'react-modal';-import window from 'global/window';+import Window from 'global/window';import {theme} from '@kepler.gl/styles';const listeners = {};@@ -18,19 +18,19 @@ const startListening = () => Object.keys(listeners).forEach(key => listeners[keyconst getPageOffset = () => ({x:- window.pageXOffset !== undefined- ? window.pageXOffset+ Window.pageXOffset !== undefined+ ? Window.pageXOffset: (document.documentElement || document.body.parentNode || document.body).scrollLeft,y:- window.pageYOffset !== undefined- ? window.pageYOffset+ Window.pageYOffset !== undefined+ ? Window.pageYOffset: (document.documentElement || document.body.parentNode || document.body).scrollTop});const addEventListeners = () => {if (document && document.body)document.body.addEventListener('mousewheel', debounce(startListening, 100, {leading: true}));- window.addEventListener('resize', debounce(startListening, 50, {leading: true}));+ Window.addEventListener('resize', debounce(startListening, 50, {leading: true}));};interface GetChildPosProps {@@ -56,21 +56,21 @@ export const getChildPos = ({offsets, rect, childRect, pageOffset, padding}: Gettop: pageOffset.y + rect.top + (topOffset || 0),...(anchorLeft? {left: pageOffset.x + rect.left + (leftOffset || 0)}- : {right: window.innerWidth - rect.right - pageOffset.x + (rightOffset || 0)})+ : {right: Window.innerWidth - rect.right - pageOffset.x + (rightOffset || 0)})};const leftOrRight = anchorLeft ? 'left' : 'right';if (pos[leftOrRight] && pos[leftOrRight] < 0) {pos[leftOrRight] = padding;- } else if (pos[leftOrRight] && pos[leftOrRight] + childRect.width > window.innerWidth) {- pos[leftOrRight] = window.innerWidth - childRect.width - padding;+ } else if (pos[leftOrRight] && pos[leftOrRight] + childRect.width > Window.innerWidth) {+ pos[leftOrRight] = Window.innerWidth - childRect.width - padding;}if (pos.top < 0) {pos.top = padding;- } else if (pos.top + childRect.height > window.innerHeight) {- pos.top = window.innerHeight - childRect.height - padding;+ } else if (pos.top + childRect.height > Window.innerHeight) {+ pos.top = Window.innerHeight - childRect.height - padding;}return pos;@@ -183,7 +183,7 @@ class Portaled extends Component<PortaledProps, PortaledState> {const didOpen = this.props.isOpened && !prevProps.isOpened;const didClose = !this.props.isOpened && prevProps.isOpened;if (didOpen || didClose) {- window.requestAnimationFrame(() => {+ Window.requestAnimationFrame(() => {if (this._unmounted) return;this.setState({isVisible: Boolean(didOpen)});});diff --git a/src/components/src/editor/editor.tsx b/src/components/src/editor/editor.tsxindex e1a35b233..cfb7ce2ec 100644--- a/src/components/src/editor/editor.tsx+++ b/src/components/src/editor/editor.tsx@@ -4,7 +4,7 @@import React, {Component, CSSProperties, KeyboardEvent} from 'react';import {createPortal} from 'react-dom';import styled from 'styled-components';-import window from 'global/window';+import Window from 'global/window';import classnames from 'classnames';import get from 'lodash.get';import {createSelector} from 'reselect';@@ -102,11 +102,11 @@ export default function EditorFactory(state = {};componentDidMount() {- window.addEventListener('keydown', this._onKeyPressed);+ Window.addEventListener('keydown', this._onKeyPressed);}componentWillUnmount() {- window.removeEventListener('keydown', this._onKeyPressed);+ Window.removeEventListener('keydown', this._onKeyPressed);}layerSelector = (props: EditorProps) => props.layers;diff --git a/src/components/src/kepler-gl.tsx b/src/components/src/kepler-gl.tsxindex 0cb5c1905..b44d3cc89 100644--- a/src/components/src/kepler-gl.tsx+++ b/src/components/src/kepler-gl.tsx@@ -65,7 +65,8 @@ import {mergeMessages,observeDimensions,unobserveDimensions,- hasPortableWidth+ hasPortableWidth,+ getApplicationConfig} from '@kepler.gl/utils';import {theme as basicTheme, themeLT, themeBS, breakPointValues} from '@kepler.gl/styles';@@ -445,7 +446,9 @@ function KeplerGlFactory(};componentDidMount() {- this._validateMapboxToken();+ if (getApplicationConfig().baseMapLibraryConfig?.['mapbox']?.mapLibName === 'Mapbox') {+ this._validateMapboxToken();+ }this._loadMapStyle();if (typeof this.props.onKeplerGlInitialized === 'function') {this.props.onKeplerGlInitialized();diff --git a/src/constants/src/keyevent.ts b/src/constants/src/keyevent.tsindex 4a63154a8..cfcf04e56 100644--- a/src/constants/src/keyevent.ts+++ b/src/constants/src/keyevent.ts@@ -1,9 +1,9 @@// SPDX-License-Identifier: MIT// Copyright contributors to the kepler.gl project-import window from 'global/window';+import Window from 'global/window';/* eslint-disable no-use-before-define */-const KeyEvent = Object.assign({}, window.KeyEvent);+const KeyEvent = Object.assign({}, Window.KeyEvent);/* eslint-enable no-use-before-define */// event event.keyCode is deprecated, should use event.key in the futurediff --git a/src/layers/src/icon-layer/icon-layer.ts b/src/layers/src/icon-layer/icon-layer.tsindex 13dad74b8..1e6163415 100644--- a/src/layers/src/icon-layer/icon-layer.ts+++ b/src/layers/src/icon-layer/icon-layer.ts@@ -1,7 +1,7 @@// SPDX-License-Identifier: MIT// Copyright contributors to the kepler.gl project-import window from 'global/window';+import Window from 'global/window';import {BrushingExtension} from '@deck.gl/extensions';import GL from '@luma.gl/constants';@@ -65,12 +65,11 @@ export const SVG_ICON_URL = `${KEPLER_UNFOLDED_BUCKET}/icons/svg-icons.json`;export const iconPosAccessor =({lat, lng, altitude}: IconLayerColumnsConfig) =>(dc: DataContainerInterface) =>- d =>- [- dc.valueAt(d.index, lng.fieldIdx),- dc.valueAt(d.index, lat.fieldIdx),- altitude?.fieldIdx > -1 ? dc.valueAt(d.index, altitude.fieldIdx) : 0- ];+ d => [+ dc.valueAt(d.index, lng.fieldIdx),+ dc.valueAt(d.index, lat.fieldIdx),+ altitude?.fieldIdx > -1 ? dc.valueAt(d.index, altitude.fieldIdx) : 0+ ];export const iconAccessor =({icon}: IconLayerColumnsConfig) =>@@ -205,9 +204,8 @@ export default class IconLayer extends Layer {cache: 'no-cache'};- if (window.fetch && this.svgIconUrl) {- window- .fetch(this.svgIconUrl, fetchConfig)+ if (Window.fetch && this.svgIconUrl) {+ Window.fetch(this.svgIconUrl, fetchConfig).then(response => response.json()).then((parsed: {svgIcons?: any[]} = {}) => {this.setSvgIcons(parsed.svgIcons);diff --git a/src/utils/src/dataset-utils.ts b/src/utils/src/dataset-utils.tsindex 033f90d44..1d4032780 100644--- a/src/utils/src/dataset-utils.ts+++ b/src/utils/src/dataset-utils.ts@@ -300,7 +300,7 @@ export function validateInputData(data: ProtoDataset['data']): ProcessorResult {analyzerType: meta[i].analyzerType}));- return {fields: updatedFields, rows};+ return {fields: updatedFields, rows, ...(cols ? {cols} : {})};}function findNonEmptyRowsAtField(rows: unknown[][], fieldIdx: number, total: number): any[] {diff --git a/src/utils/src/dom-to-image.ts b/src/utils/src/dom-to-image.tsindex 0c723331f..96c4e817b 100644--- a/src/utils/src/dom-to-image.ts+++ b/src/utils/src/dom-to-image.ts@@ -6,7 +6,7 @@* Modified by heshan0131 to allow loading external stylesheets and inline webfonts*/-import window from 'global/window';+import Window from 'global/window';import document from 'global/document';import Console from 'global/console';import svgToMiniDataURI from 'mini-svg-data-uri';@@ -194,7 +194,7 @@ function cloneNode(node, filter, root) {.then(clone => processClone(node, clone));function makeNodeCopy(nd) {- if (nd instanceof window.HTMLCanvasElement) {+ if (nd instanceof Window.HTMLCanvasElement) {return makeImage(nd.toDataURL());}return nd.cloneNode(false);@@ -240,7 +240,7 @@ function inlineImages(node) {function makeSvgDataUri(node, width, height, escapeXhtmlForWebpack = true) {return Promise.resolve(node).then(nd => {nd.setAttribute('xmlns', 'http://www.w3.org/1999/xhtml');- const serializedString = new window.XMLSerializer().serializeToString(nd);+ const serializedString = new Window.XMLSerializer().serializeToString(nd);const xhtml = escapeXhtmlForWebpack ? escapeXhtml(serializedString) : serializedString;const foreignObject = `<foreignObject x="0" y="0" width="100%" height="100%">${xhtml}</foreignObject>`;@@ -332,7 +332,7 @@ function newFontFaces() {function selectWebFontRules(cssRules) {return cssRules- .filter(rule => rule.type === window.CSSRule.FONT_FACE_RULE)+ .filter(rule => rule.type === Window.CSSRule.FONT_FACE_RULE).filter(rule => inliner.shouldProcess(rule.style.getPropertyValue('src')));}@@ -343,8 +343,7 @@ function newFontFaces() {// cloudfont doesn't have allow origin header properly set// error response will remain in cacheconst cache = sheet.href.includes('uber-fonts') ? 'no-cache' : 'default';- return window- .fetch(sheet.href, {credentials: 'omit', cache})+ return Window.fetch(sheet.href, {credentials: 'omit', cache}).then(response => response.text()).then(text => {const result = setStyleSheetBaseHref(text, sheet.href);diff --git a/src/utils/src/dom-utils.ts b/src/utils/src/dom-utils.tsindex 1778282db..f090a8dd6 100644--- a/src/utils/src/dom-utils.ts+++ b/src/utils/src/dom-utils.ts@@ -2,12 +2,12 @@// Copyright contributors to the kepler.gl projectimport Console from 'global/console';-import window from 'global/window';+import Window from 'global/window';import document from 'global/document';import {IMAGE_EXPORT_ERRORS} from '@kepler.gl/constants';export function processClone(original, clone) {- if (!(clone instanceof window.Element)) {+ if (!(clone instanceof Window.Element)) {return clone;}@@ -35,7 +35,7 @@ export function processClone(original, clone) {}function cloneStyle(og, cln) {- const originalStyle = window.getComputedStyle(og);+ const originalStyle = Window.getComputedStyle(og);copyStyle(originalStyle, cln.style);}@@ -62,7 +62,7 @@ export function processClone(original, clone) {}function clonePseudoElement(org, cln, element) {- const style = window.getComputedStyle(org, element);+ const style = Window.getComputedStyle(org, element);const content = style.getPropertyValue('content');if (content === '' || content === 'none') {@@ -81,15 +81,15 @@ export function processClone(original, clone) {}function copyUserInput([og, cln]) {- if (og instanceof window.HTMLTextAreaElement) cln.innerHTML = og.value;- if (og instanceof window.HTMLInputElement) cln.setAttribute('value', og.value);+ if (og instanceof Window.HTMLTextAreaElement) cln.innerHTML = og.value;+ if (og instanceof Window.HTMLInputElement) cln.setAttribute('value', og.value);}function fixSvg(cln) {- if (!(cln instanceof window.SVGElement)) return;+ if (!(cln instanceof Window.SVGElement)) return;cln.setAttribute('xmlns', 'http://www.w3.org/2000/svg');- if (!(cln instanceof window.SVGRectElement)) return;+ if (!(cln instanceof Window.SVGRectElement)) return;['width', 'height'].forEach(attribute => {const value = cln.getAttribute(attribute);if (!value) return;@@ -143,7 +143,7 @@ export function uid() {export function makeImage(uri) {return new Promise((resolve, reject) => {- const image = new window.Image();+ const image = new Window.Image();image.onload = () => {resolve(image);};@@ -208,7 +208,7 @@ export function escape(string) {export function delay(ms) {return arg => {return new Promise(resolve => {- window.setTimeout(() => {+ Window.setTimeout(() => {resolve(arg);}, ms);});@@ -222,13 +222,13 @@ export function isSrcAsDataUrl(text) {function cvToBlob(canvas) {return new Promise(resolve => {- const binaryString = window.atob(canvas.toDataURL().split(',')[1]);+ const binaryString = Window.atob(canvas.toDataURL().split(',')[1]);const length = binaryString.length;const binaryArray = new Uint8Array(length);for (let i = 0; i < length; i++) binaryArray[i] = binaryString.charCodeAt(i);- resolve(new window.Blob([binaryArray], {type: 'image/png'}));+ resolve(new Window.Blob([binaryArray], {type: 'image/png'}));});}@@ -258,7 +258,7 @@ export function getHeight(node) {}function px(node, styleProperty) {- const value = window.getComputedStyle(node).getPropertyValue(styleProperty);+ const value = Window.getComputedStyle(node).getPropertyValue(styleProperty);return parseFloat(value.replace('px', ''));}@@ -282,7 +282,7 @@ export function getAndEncode(url, options) {}return new Promise(resolve => {- const request = new window.XMLHttpRequest();+ const request = new Window.XMLHttpRequest();request.onreadystatechange = done;request.ontimeout = timeout;@@ -312,7 +312,7 @@ export function getAndEncode(url, options) {return;}- const encoder = new window.FileReader();+ const encoder = new Window.FileReader();encoder.onloadend = () => {const content = encoder.result.split(/,/)[1];resolve(content);diff --git a/src/utils/src/observe-dimensions.ts b/src/utils/src/observe-dimensions.tsindex b0a603a9d..be92250f5 100644--- a/src/utils/src/observe-dimensions.ts+++ b/src/utils/src/observe-dimensions.ts@@ -77,16 +77,19 @@ function getSize(node, entry): Dimensions | null {* @param throttleDelay* @returns*/-export default function useDimensions<T extends Element>(+export function useDimensions<T extends Element>(nodeRef?: RefObject<T>,throttleDelay = DEFAULT_THROTTLE_DELAY): [RefObject<T>, Dimensions | null] {- const ref = useRef<T>(null);+ let ref = useRef<T>(null);+ if (nodeRef) {+ ref = nodeRef;+ }const [size, setSize] = useState(null);useEffect(() => {const {current} = ref || {};- if (!current || !nodeRef) {+ if (!current) {return;}@@ -110,5 +113,7 @@ export default function useDimensions<T extends Element>(// eslint-disable-next-line react-hooks/exhaustive-deps}, [throttleDelay, ref?.current]);- return [ref, size];+ return [ref as RefObject<T>, size];}++export default useDimensions;diff --git a/src/utils/src/utils.ts b/src/utils/src/utils.tsindex f68ab0961..3afc3ecd7 100644--- a/src/utils/src/utils.ts+++ b/src/utils/src/utils.ts@@ -1,7 +1,7 @@// SPDX-License-Identifier: MIT// Copyright contributors to the kepler.gl project-import window from 'global/window';+import Window from 'global/window';import {capitalizeFirstLetter} from './strings';/**@@ -32,7 +32,7 @@ export function generateHashIdFromString(str: string): string {*/export function isChrome(): boolean {// Chrome 1+- return window.chrome && window.chrome.webstore;+ return Window.chrome && Window.chrome.webstore;}/**@@ -160,10 +160,10 @@ export function getError(return Object.prototype.hasOwnProperty.call(err, 'message')? getError(err.message): Object.prototype.hasOwnProperty.call(err, 'error')- ? getError(err.error)- : Object.prototype.hasOwnProperty.call(err, 'err')- ? getError(err.err)- : JSON.stringify(err);+ ? getError(err.error)+ : Object.prototype.hasOwnProperty.call(err, 'err')+ ? getError(err.err)+ : JSON.stringify(err);}return defaultMessage;@@ -195,12 +195,12 @@ export const arrayMove = <T>(array: T[], from: number, to: number): T[] => {};export function hasMobileWidth(breakPointValues: {palm: number; desk: number}): boolean {- const mobileWidth = window.matchMedia(`(max-width: ${breakPointValues.palm}px)`);+ const mobileWidth = Window.matchMedia(`(max-width: ${breakPointValues.palm}px)`);return mobileWidth.matches;}export function hasPortableWidth(breakPointValues: {palm: number; desk: number}): boolean {- const mobileWidth = window.matchMedia(`(max-width: ${breakPointValues.desk}px)`);+ const mobileWidth = Window.matchMedia(`(max-width: ${breakPointValues.desk}px)`);return mobileWidth.matches;}diff --git a/website-gatsby/src/components/home.js b/website-gatsby/src/components/home.jsindex dcf759b28..892a5cbeb 100644--- a/website-gatsby/src/components/home.js+++ b/website-gatsby/src/components/home.js@@ -3,7 +3,7 @@import React, {PureComponent} from 'react';import {ThemeProvider} from 'styled-components';-import window from 'global/window';+import Window from 'global/window';import {theme} from '../styles';import {SECTIONS} from '../content';@@ -53,7 +53,7 @@ export default class Home extends PureComponent {_disableBanner = () => {this._hideBanner();- window.localStorage.setItem(BannerKey, 'true');+ Window.localStorage.setItem(BannerKey, 'true');};render() {@@ -66,27 +66,25 @@ export default class Home extends PureComponent {bgColor={BACKGROUND_COLOR}onClose={this._hideBanner}>- <Announcement onDisable={this._disableBanner}/>+ <Announcement onDisable={this._disableBanner} /></Banner>- <Header/>+ <Header /><Hero />- {SECTIONS.map(- ({id, title, description, icon, isDark, background}, i) => {- const SectionContent = SECTION_CONTENT[id];- return (- <Section- key={`section-${i}`}- title={title}- description={description}- icon={icon}- isDark={isDark}- background={background}- >- <SectionContent />- </Section>- );- }- )}+ {SECTIONS.map(({id, title, description, icon, isDark, background}, i) => {+ const SectionContent = SECTION_CONTENT[id];+ return (+ <Section+ key={`section-${i}`}+ title={title}+ description={description}+ icon={icon}+ isDark={isDark}+ background={background}+ >+ <SectionContent />+ </Section>+ );+ })}<Footer /></div></ThemeProvider>diff --git a/website-gatsby/src/state/analytics.js b/website-gatsby/src/state/analytics.jsindex 5dfe0005b..9fa12da7a 100644--- a/website-gatsby/src/state/analytics.js+++ b/website-gatsby/src/state/analytics.js@@ -5,11 +5,11 @@import {ActionTypes} from 'kepler.gl/actions';import {LOCATION_CHANGE} from 'react-router-redux';-import window from 'global/window';+import Window from 'global/window';import {ALL_FIELD_TYPES} from 'kepler.gl/constants';import get from 'lodash.get';-const getPayload = action => action ? action.payload : null;+const getPayload = action => (action ? action.payload : null);// Hack, because we don't have a way to access next stateconst getFilterType = (store, idx, value) => {@@ -70,7 +70,7 @@ const trackingInformation = {[LOCATION_CHANGE]: x => x,// demo app actions- ['PUSHING_FILE']: (payload) => {+ ['PUSHING_FILE']: payload => {const size = get(payload, ['metadata', 'metadata', 'size']);return {isLoading: payload.isLoading,@@ -85,16 +85,14 @@ const trackingInformation = {const EXCLUDED_ACTIONS = [ActionTypes.LAYER_HOVER, ActionTypes.UPDATE_MAP];const analyticsMiddleware = store => next => action => {- if (window.gtag && !EXCLUDED_ACTIONS.includes(action.type)) {+ if (Window.gtag && !EXCLUDED_ACTIONS.includes(action.type)) {const payload = action.payload || action;// eslint-disable-next-line no-undef- window.gtag('event', 'action', {+ Window.gtag('event', 'action', {event_category: action.type,event_label: trackingInformation[action.type]- ? JSON.stringify(- trackingInformation[action.type](payload, store)- )+ ? JSON.stringify(trackingInformation[action.type](payload, store)): null});}diff --git a/website/src/components/home.js b/website/src/components/home.jsindex 4659388fa..a19b84c25 100644--- a/website/src/components/home.js+++ b/website/src/components/home.js@@ -3,7 +3,7 @@import React, {PureComponent} from 'react';import {ThemeProvider} from 'styled-components';-import window from 'global/window';+import Window from 'global/window';import {theme} from '../styles';import {SECTIONS} from '../content';@@ -57,7 +57,7 @@ export default class Home extends PureComponent {_disableBanner = () => {this._hideBanner();- window.localStorage.setItem(BannerKey, 'true');+ Window.localStorage.setItem(BannerKey, 'true');};render() {diff --git a/website/src/reducers/analytics.js b/website/src/reducers/analytics.jsindex 65f413497..621eeb0a5 100644--- a/website/src/reducers/analytics.js+++ b/website/src/reducers/analytics.js@@ -5,7 +5,7 @@import {ActionTypes} from '@kepler.gl/actions';import {LOCATION_CHANGE} from 'react-router-redux';-import window from 'global/window';+import Window from 'global/window';import {ALL_FIELD_TYPES} from '@kepler.gl/constants';import get from 'lodash.get';@@ -85,11 +85,11 @@ const trackingInformation = {const EXCLUDED_ACTIONS = [ActionTypes.LAYER_HOVER, ActionTypes.UPDATE_MAP];const analyticsMiddleware = store => next => action => {- if (window.gtag && !EXCLUDED_ACTIONS.includes(action.type)) {+ if (Window.gtag && !EXCLUDED_ACTIONS.includes(action.type)) {const payload = action.payload || action;// eslint-disable-next-line no-undef- window.gtag('event', 'action', {+ Window.gtag('event', 'action', {event_category: action.type,event_label: trackingInformation[action.type]? JSON.stringify(trackingInformation[action.type](payload, store))diff --git a/website/src/routes.js b/website/src/routes.jsindex 73f91dd43..47e0f766c 100644--- a/website/src/routes.js+++ b/website/src/routes.js@@ -4,7 +4,7 @@import React from 'react';import {Router, Route, IndexRoute, browserHistory} from 'react-router';import {syncHistoryWithStore} from 'react-router-redux';-import window from 'global/window';+import Window from 'global/window';import store from './reducers';import Home from './components/home';import App from './components/app';@@ -20,7 +20,7 @@ const trackPageChange = location => {if (links.length === 3) {const sampleId = links[2];- window.gtag('event', 'load_sample', {+ Window.gtag('event', 'load_sample', {event_label: sampleId,value: sampleId});