Skip to content

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

[Chore] Upgrade to eslint 8.53.0 and prettier 2.8.8, fix lint and type errors (#2607)

Shan Heaffc5b651453
diff --git a/.eslintrc b/.eslintrc
deleted file mode 100644
index a73b4ffaf..000000000
--- a/.eslintrc
+++ /dev/null
@@ -1,65 +0,0 @@
-{
- "extends": [
- "uber-jsx",
- "uber-es2015",
- "prettier",
- "plugin:prettier/recommended",
- "prettier/react",
- "plugin:react-hooks/recommended",
- "plugin:jest/recommended"
- ],
- "env": {
- "es6": true,
- "browser": true,
- "node": true,
- "jest/globals": true
- },
- "globals": {
- "page": true,
- "browser": true,
- "context": true,
- "jestPuppeteer": true
- },
- "parser": "@typescript-eslint/parser",
- "plugins": ["babel", "prettier", "react", "@typescript-eslint", "enzyme-deprecation", "jest"],
- "rules": {
- "valid-jsdoc": 0,
- "no-var": 0,
- "max-len": 0,
- "react/no-did-mount-set-state": 0,
- "react/no-multi-comp": 0,
- "react/sort-comp": 0,
- "no-use-before-define": "off",
- "prefer-spread": 1,
- "prefer-template": 1,
- "prettier/prettier": "error",
- "quote-props": 1,
- "spaced-comment": 1,
- "max-params": 0,
- "no-multiple-empty-lines": 1,
- "no-process-env": 0,
- "no-inline-comments": 0,
- "no-invalid-this": 0,
- "no-unused-expressions": 0,
- "no-undef": 0,
- "camelcase": 0,
- "consistent-return": 0,
- "comma-dangle": 1,
- "enzyme-deprecation/no-shallow": 2,
- "enzyme-deprecation/no-mount": 2
- },
- "overrides": [
- {
- "files": ["*.ts", "*.tsx"],
- "rules": {
- "no-undef": 0,
- "no-unused-vars": 0
- }
- }
- ],
- "settings": {
- "react": {
- "version": "detect"
- }
- }
-}
diff --git a/.eslintrc.js b/.eslintrc.js
new file mode 100644
index 000000000..cf3e6758e
--- /dev/null
+++ b/.eslintrc.js
@@ -0,0 +1,83 @@
+module.exports = {
+ env: {
+ es6: true,
+ browser: true,
+ node: true,
+ 'jest/globals': true
+ },
+ globals: {
+ page: true,
+ browser: true,
+ context: true,
+ jestPuppeteer: true
+ },
+ parser: '@typescript-eslint/parser',
+ extends: ['eslint:recommended', 'plugin:prettier/recommended', 'plugin:react-hooks/recommended'],
+ plugins: ['babel', 'prettier', 'react', 'enzyme-deprecation'],
+ rules: {
+ 'valid-jsdoc': 0,
+ 'no-var': 0,
+ 'max-len': 0,
+ 'react/no-did-mount-set-state': 0,
+ 'react/no-multi-comp': 0,
+ 'react/sort-comp': 0,
+ 'no-use-before-define': 'off',
+ 'prefer-spread': 1,
+ 'prefer-template': 1,
+ 'prettier/prettier': 'error',
+ 'quote-props': 0,
+ 'spaced-comment': 1,
+ 'max-params': 0,
+ 'no-multiple-empty-lines': 1,
+ 'no-process-env': 0,
+ 'no-inline-comments': 0,
+ 'no-invalid-this': 0,
+ 'no-unused-expressions': 0,
+ 'no-undef': 0,
+ camelcase: 0,
+ 'consistent-return': 0,
+ 'comma-dangle': 1,
+ 'enzyme-deprecation/no-shallow': 2,
+ 'enzyme-deprecation/no-mount': 2
+ },
+ overrides: [
+ {
+ files: ['*.ts', '*.tsx'],
+ parser: '@typescript-eslint/parser',
+ // Plugins like @typescript-eslint provide different ruleset configs that can be extended
+ plugins: ['@typescript-eslint'],
+ extends: [
+ 'plugin:@typescript-eslint/eslint-recommended',
+ 'plugin:@typescript-eslint/recommended',
+ // This doesn't enable extra rules, but rather just helps with TS settings
+ 'plugin:import/typescript'
+ ],
+ rules: {
+ // TODO: Replace any declarations and enable
+ '@typescript-eslint/no-explicit-any': 'off',
+ // TODO: Enable this rule and provide description or fix the errors
+ '@typescript-eslint/ban-ts-comment': 'off',
+ '@typescript-eslint/no-var-requires': 'off'
+ }
+ },
+ {
+ files: ['src/**/src/**/*.spec.js'],
+ plugins: ['jest'],
+ extends: ['plugin:jest/recommended'],
+ rules: {'jest/prefer-expect-assertions': 'off'}
+ }
+ ],
+ settings: {
+ react: {
+ version: 'detect'
+ },
+ // Settings related to eslint-plugin-import
+ 'import/resolver': {
+ // Settings for eslint-import-resolver-typescript which resolves
+ // typescript aliases based on tsconfig.json "paths"
+ typescript: {
+ project: './tsconfig.json'
+ }
+ }
+ }
+};
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 7b3a10d3b..c0177ee41 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -34,8 +34,8 @@ jobs:
- name: Install Dependecies
run: yarn global add "[email protected]" && yarn
- # - name: Lint
- # run: yarn lint
+ - name: Lint
+ run: yarn lint
- name: Test
run: xvfb-run --auto-servernum yarn cover
diff --git a/.prettierrc.js b/.prettierrc.js
index 9f5fa2b07..4a9647709 100644
--- a/.prettierrc.js
+++ b/.prettierrc.js
@@ -6,5 +6,6 @@ module.exports = {
printWidth: 100,
semi: true,
singleQuote: true,
- trailingComma: "none"
-}
+ trailingComma: 'none',
+ arrowParens: 'avoid'
+};
diff --git a/examples/custom-reducer/src/app-reducer.js b/examples/custom-reducer/src/app-reducer.js
index 4b37951da..6b256c5f0 100644
--- a/examples/custom-reducer/src/app-reducer.js
+++ b/examples/custom-reducer/src/app-reducer.js
@@ -18,7 +18,7 @@ const initialState = {
// REDUCER
const appReducer = handleActions(
{
- [INIT]: (state, action) => ({
+ [INIT]: state => ({
...state,
loaded: true
})
diff --git a/examples/custom-reducer/src/store.js b/examples/custom-reducer/src/store.js
index 3af19794e..36f027226 100644
--- a/examples/custom-reducer/src/store.js
+++ b/examples/custom-reducer/src/store.js
@@ -33,7 +33,7 @@ const customizedKeplerGlReducer = keplerGlReducer
})
// handle additional actions
.plugin({
- HIDE_AND_SHOW_SIDE_PANEL: (state, action) => ({
+ HIDE_AND_SHOW_SIDE_PANEL: state => ({
...state,
uiState: {
...state.uiState,
diff --git a/examples/custom-theme/src/app.js b/examples/custom-theme/src/app.js
index 386790cf5..05ca7fb0a 100644
--- a/examples/custom-theme/src/app.js
+++ b/examples/custom-theme/src/app.js
@@ -43,7 +43,7 @@ const StyleSwitch = styled.div`
border: 1px solid mediumseagreen;
`;
-function App(props) {
+function App() {
const [customTheme, setTheme] = useState(false);
const [windowDimension, setDimension] = useState({
width: window.innerWidth,
diff --git a/examples/demo-app/src/actions.js b/examples/demo-app/src/actions.js
index bfdeb8719..a883b699d 100644
--- a/examples/demo-app/src/actions.js
+++ b/examples/demo-app/src/actions.js
@@ -2,7 +2,7 @@
// Copyright contributors to the kepler.gl project
import {push} from 'react-router-redux';
-import {request, text as requestText, json as requestJson} from 'd3-request';
+import {request, json as requestJson} from 'd3-request';
import {loadFiles, toggleModal} from '@kepler.gl/actions';
import {load} from '@loaders.gl/core';
import {CSVLoader} from '@loaders.gl/csv';
@@ -72,7 +72,7 @@ export function setLoadingMapStatus(isMapLoading) {
*
* @param {*} param0
*/
-export function onExportFileSuccess({response = {}, provider, options}) {
+export function onExportFileSuccess({provider, options}) {
return dispatch => {
// if isPublic is true, use share Url
if (options.isPublic && provider.getShareUrl) {
@@ -271,11 +271,6 @@ function loadRemoteData(url) {
return Promise.resolve(null);
}
- let requestMethod = requestText;
- if (url.includes('.json') || url.includes('.geojson')) {
- requestMethod = requestJson;
- }
-
// Load data
return new Promise(resolve => {
const loaders = [CSVLoader, ArrowLoader, GeoJSONLoader];
diff --git a/examples/demo-app/src/app.js b/examples/demo-app/src/app.js
index cac16cf30..36c67222d 100644
--- a/examples/demo-app/src/app.js
+++ b/examples/demo-app/src/app.js
@@ -374,7 +374,7 @@ class App extends Component {
});
};
- _getMapboxRef = (mapbox, index) => {
+ _getMapboxRef = mapbox => {
if (!mapbox) {
// The ref has been unset.
// https://reactjs.org/docs/refs-and-the-dom.html#callback-refs
@@ -383,7 +383,7 @@ class App extends Component {
// We expect an Map created by KeplerGl's MapContainer.
// https://visgl.github.io/react-map-gl/docs/api-reference/map
const map = mapbox.getMap();
- map.on('zoomend', e => {
+ map.on('zoomend', () => {
// console.log(`Map ${index} zoom level: ${e.target.style.z}`);
});
}
diff --git a/examples/demo-app/src/cloud-providers/carto/carto-provider.js b/examples/demo-app/src/cloud-providers/carto/carto-provider.js
index a2e961745..9fbe86cc2 100644
--- a/examples/demo-app/src/cloud-providers/carto/carto-provider.js
+++ b/examples/demo-app/src/cloud-providers/carto/carto-provider.js
@@ -173,7 +173,7 @@ export default class CartoProvider extends Provider {
* The CARTO cloud provider polls the created window internally to parse the URL
* @param {*} location
*/
- getAccessTokenFromLocation(location) {
+ getAccessTokenFromLocation() {
return;
}
@@ -182,7 +182,7 @@ export default class CartoProvider extends Provider {
name: this.getUserName(),
abbreviated: '',
email: ''
- }
+ };
}
async downloadMap(queryParams) {
diff --git a/examples/demo-app/src/cloud-providers/dropbox/dropbox-provider.js b/examples/demo-app/src/cloud-providers/dropbox/dropbox-provider.js
index 6bcc54c3d..8db561165 100644
--- a/examples/demo-app/src/cloud-providers/dropbox/dropbox-provider.js
+++ b/examples/demo-app/src/cloud-providers/dropbox/dropbox-provider.js
@@ -88,7 +88,7 @@ export default class DropboxProvider extends Provider {
'dropbox',
JSON.stringify({
// dropbox token doesn't expire unless revoked by the user
- token: token,
+ token,
user,
timestamp: new Date()
})
diff --git a/examples/demo-app/src/cloud-providers/foursquare/foursquare-provider.js b/examples/demo-app/src/cloud-providers/foursquare/foursquare-provider.js
index 52917f891..46cfff931 100644
--- a/examples/demo-app/src/cloud-providers/foursquare/foursquare-provider.js
+++ b/examples/demo-app/src/cloud-providers/foursquare/foursquare-provider.js
@@ -51,7 +51,7 @@ export default class FoursquareProvider extends Provider {
this._auth0 = new Auth0Client({
domain: authDomain,
- clientId: clientId,
+ clientId,
scope: FOURSQUARE_AUTH_SCOPE,
authorizationParams: {
redirect_uri: window.location.origin,
diff --git a/examples/demo-app/src/components/load-data-modal/sample-data-viewer.js b/examples/demo-app/src/components/load-data-modal/sample-data-viewer.js
index 6adc6cb71..21eb4b3d2 100644
--- a/examples/demo-app/src/components/load-data-modal/sample-data-viewer.js
+++ b/examples/demo-app/src/components/load-data-modal/sample-data-viewer.js
@@ -72,7 +72,7 @@ const StyledError = styled.div`
margin-bottom: 16px;
`;
-const SampleMap = ({id, sample, onClick, locale}) => (
+const SampleMap = ({id, sample, onClick}) => (
<StyledSampleMap id={id} className="sample-map-gallery__item">
<div className="sample-map">
<div className="sample-map__image" onClick={onClick}>
diff --git a/examples/demo-app/src/components/load-data-modal/sample-maps-tab.js b/examples/demo-app/src/components/load-data-modal/sample-maps-tab.js
index c2c1bfdd9..25b6e0be2 100644
--- a/examples/demo-app/src/components/load-data-modal/sample-maps-tab.js
+++ b/examples/demo-app/src/components/load-data-modal/sample-maps-tab.js
@@ -10,7 +10,7 @@ import {FormattedMessage} from 'react-intl';
import {ASSETS_URL} from '../../constants/default-settings';
const StyledMapIcon = styled.div`
- background-image: url("${ASSETS_URL}icon-demo-map.jpg");
+ background-image: url('${ASSETS_URL}icon-demo-map.jpg');
background-repeat: no-repeat;
background-size: 64px 48px;
width: 64px;
diff --git a/examples/demo-app/src/data/sample-geojson-config.js b/examples/demo-app/src/data/sample-geojson-config.js
index c1a2510fd..b0dbcb020 100644
--- a/examples/demo-app/src/data/sample-geojson-config.js
+++ b/examples/demo-app/src/data/sample-geojson-config.js
@@ -199,8 +199,7 @@ const config = {
b9tnac: {
accessToken: null,
custom: true,
- icon:
- 'https://api.mapbox.com/styles/v1/heshan0131/cjg0ks54x300a2squ8fr9vhvq/static/-122.3391,37.7922,9,0,0/400x300?access_token=pk.eyJ1IjoidWJlcmRhdGEiLCJhIjoiY2pmc3hhd21uMzE3azJxczJhOWc4czBpYyJ9.HiDptGv2C0Bkcv_TGr_kJw&logo=false&attribution=false',
+ icon: 'https://api.mapbox.com/styles/v1/heshan0131/cjg0ks54x300a2squ8fr9vhvq/static/-122.3391,37.7922,9,0,0/400x300?access_token=pk.eyJ1IjoidWJlcmRhdGEiLCJhIjoiY2pmc3hhd21uMzE3azJxczJhOWc4czBpYyJ9.HiDptGv2C0Bkcv_TGr_kJw&logo=false&attribution=false',
id: 'b9tnac',
label: 'label maker',
url: 'mapbox://styles/heshan0131/cjg0ks54x300a2squ8fr9vhvq'
diff --git a/examples/demo-app/src/data/sample-trip-data.js b/examples/demo-app/src/data/sample-trip-data.js
index 7aecd5b41..449b50ae6 100644
--- a/examples/demo-app/src/data/sample-trip-data.js
+++ b/examples/demo-app/src/data/sample-trip-data.js
@@ -4086,8 +4086,7 @@ export const sampleTripDataConfig = {
'41fv96u': {
accessToken: null,
custom: true,
- icon:
- 'https://api.mapbox.com/styles/v1/MAPBOX_USER/cjg0ks54x300a2squ8fr9vhvq/static/-122.3391,37.7922,9,0,0/400x300?access_token=ACCESS_TOKEN&logo=false&attribution=false',
+ icon: 'https://api.mapbox.com/styles/v1/MAPBOX_USER/cjg0ks54x300a2squ8fr9vhvq/static/-122.3391,37.7922,9,0,0/400x300?access_token=ACCESS_TOKEN&logo=false&attribution=false',
id: '41fv96u',
label: 'Outdoors',
url: 'mapbox://styles/MAPBOX_USER/cjhnxdcfy4ug62sn6qdfjutob'
diff --git a/examples/demo-app/src/factories/map-control.js b/examples/demo-app/src/factories/map-control.js
index 1861ccfa4..ac6880499 100644
--- a/examples/demo-app/src/factories/map-control.js
+++ b/examples/demo-app/src/factories/map-control.js
@@ -44,7 +44,7 @@ const StyledMapControlOverlay = styled.div`
margin-top: ${props => (props.rightPanelVisible ? props.theme.rightPanelMarginTop : 0)}px;
margin-right: ${props => (props.rightPanelVisible ? props.theme.rightPanelMarginRight : 0)}px;
${props => (props.fullHeight ? 'height' : 'max-height')}: calc(100% - ${props =>
- props.theme.rightPanelMarginTop + props.theme.bottomWidgetPaddingBottom}px);
+ props.theme.rightPanelMarginTop + props.theme.bottomWidgetPaddingBottom}px);
.map-control {
${props => (props.rightPanelVisible ? 'padding-top: 0px;' : '')}
diff --git a/examples/demo-app/src/utils/strings.js b/examples/demo-app/src/utils/strings.js
index fac4b6038..1be2f23b1 100644
--- a/examples/demo-app/src/utils/strings.js
+++ b/examples/demo-app/src/utils/strings.js
@@ -7,7 +7,5 @@
* @returns {string} hash string
*/
export function generateHashId(count) {
- return Math.random()
- .toString(36)
- .substr(count);
+ return Math.random().toString(36).substr(count);
}
diff --git a/examples/demo-app/src/utils/url.js b/examples/demo-app/src/utils/url.js
index 97bdd289d..628bda297 100644
--- a/examples/demo-app/src/utils/url.js
+++ b/examples/demo-app/src/utils/url.js
@@ -45,8 +45,10 @@ parseUri.options = {
parser: /(?:^|&)([^&=]*)=?([^&]*)/g
},
parser: {
- strict: /^(?:([^:\/?#]+):)?(?:\/\/((?:(([^:@]*)(?::([^:@]*))?)?@)?([^:\/?#]*)(?::(\d*))?))?((((?:[^?#\/]*\/)*)([^?#]*))(?:\?([^#]*))?(?:#(.*))?)/,
- loose: /^(?:(?![^:@]+:[^:@\/]*@)([^:\/?#.]+):)?(?:\/\/)?((?:(([^:@]*)(?::([^:@]*))?)?@)?([^:\/?#]*)(?::(\d*))?)(((\/(?:[^?#](?![^?#\/]*\.[^?#\/.]+(?:[?#]|$)))*\/?)?([^?#\/]*))(?:\?([^#]*))?(?:#(.*))?)/
+ strict:
+ /^(?:([^:/?#]+):)?(?:\/\/((?:(([^:@]*)(?::([^:@]*))?)?@)?([^:/?#]*)(?::(\d*))?))?((((?:[^?#/]*\/)*)([^?#]*))(?:\?([^#]*))?(?:#(.*))?)/,
+ loose:
+ /^(?:(?![^:@]+:[^:@/]*@)([^:/?#.]+):)?(?:\/\/)?((?:(([^:@]*)(?::([^:@]*))?)?@)?([^:/?#]*)(?::(\d*))?)(((\/(?:[^?#](?![^?#/]*\.[^?#/.]+(?:[?#]|$)))*\/?)?([^?#/]*))(?:\?([^#]*))?(?:#(.*))?)/
}
};
@@ -55,5 +57,5 @@ parseUri.options = {
* @param str
*/
export function validateUrl(str) {
- return str?.match(/^(ftp|http|https?):\/\/+(www\.)?[a-z0-9\-\.]{3,}\.[a-z]{3}$/);
+ return str?.match(/^(ftp|http|https?):\/\/+(www\.)?[a-z0-9\-.]{3,}\.[a-z]{3}$/);
}
diff --git a/examples/demo-app/webpack.config.js b/examples/demo-app/webpack.config.js
index 622de2151..5936e1db6 100644
--- a/examples/demo-app/webpack.config.js
+++ b/examples/demo-app/webpack.config.js
@@ -9,8 +9,8 @@ const resolve = require('path').resolve;
const join = require('path').join;
const webpack = require('webpack');
-const WEBPACK_ENV_VARIABLES = require('../../webpack/shared-webpack-configuration')
- .WEBPACK_ENV_VARIABLES;
+const WEBPACK_ENV_VARIABLES =
+ require('../../webpack/shared-webpack-configuration').WEBPACK_ENV_VARIABLES;
const CONFIG = {
// bundle app.js and everything it imports, recursively.
@@ -37,20 +37,20 @@ const CONFIG = {
loader: 'babel-loader',
options: {
plugins: [
- "@babel/plugin-transform-class-properties",
- "@babel/plugin-transform-optional-chaining",
- "@babel/plugin-transform-logical-assignment-operators",
- "@babel/plugin-transform-nullish-coalescing-operator",
- "@babel/plugin-transform-export-namespace-from"
+ '@babel/plugin-transform-class-properties',
+ '@babel/plugin-transform-optional-chaining',
+ '@babel/plugin-transform-logical-assignment-operators',
+ '@babel/plugin-transform-nullish-coalescing-operator',
+ '@babel/plugin-transform-export-namespace-from'
],
include: [
- join(__dirname, 'src'),
- /node_modules\/@loaders\.gl/,
- /node_modules\/@probe\.gl/,
- /node_modules\/@math\.gl/,
- /node_modules\/@kepler\.gl/
+ join(__dirname, 'src'),
+ /node_modules\/@loaders\.gl/,
+ /node_modules\/@probe\.gl/,
+ /node_modules\/@math\.gl/,
+ /node_modules\/@kepler\.gl/
],
- exclude: [/node_modules\/(?!(@loaders\.gl|@probe\.gl|@kepler\.gl|@math\.gl)).*/],
+ exclude: [/node_modules\/(?!(@loaders\.gl|@probe\.gl|@kepler\.gl|@math\.gl)).*/]
}
}
},
diff --git a/examples/node-app/src/app-reducer.js b/examples/node-app/src/app-reducer.js
index 4b37951da..6b256c5f0 100644
--- a/examples/node-app/src/app-reducer.js
+++ b/examples/node-app/src/app-reducer.js
@@ -18,7 +18,7 @@ const initialState = {
// REDUCER
const appReducer = handleActions(
{
- [INIT]: (state, action) => ({
+ [INIT]: state => ({
...state,
loaded: true
})
diff --git a/examples/node-app/webpack.config.js b/examples/node-app/webpack.config.js
index 03e69a961..04113aac9 100644
--- a/examples/node-app/webpack.config.js
+++ b/examples/node-app/webpack.config.js
@@ -43,7 +43,7 @@ const CONFIG = {
// fix for arrow-related errors
test: /\.mjs$/,
include: /node_modules/,
- type: "javascript/auto"
+ type: 'javascript/auto'
}
]
},
diff --git a/examples/open-modal/src/app-reducer.js b/examples/open-modal/src/app-reducer.js
index 359e278d3..7348e7787 100644
--- a/examples/open-modal/src/app-reducer.js
+++ b/examples/open-modal/src/app-reducer.js
@@ -21,7 +21,7 @@ const initialState = {
// REDUCER
const appReducer = handleActions(
{
- [INIT]: (state, action) => ({
+ [INIT]: state => ({
...state,
loaded: true
}),
diff --git a/examples/replace-component/src/app-reducer.js b/examples/replace-component/src/app-reducer.js
index 03498490d..11d33f030 100644
--- a/examples/replace-component/src/app-reducer.js
+++ b/examples/replace-component/src/app-reducer.js
@@ -21,7 +21,7 @@ const initialState = {
// REDUCER
const appReducer = handleActions(
{
- [INIT]: (state, action) => ({
+ [INIT]: state => ({
...state,
loaded: true
}),
diff --git a/examples/webpack.config.local.js b/examples/webpack.config.local.js
index a996d0d4c..aa958d1c6 100644
--- a/examples/webpack.config.local.js
+++ b/examples/webpack.config.local.js
@@ -15,11 +15,7 @@ const webpack = require('webpack');
const fs = require('fs');
const KeplerPackage = require('../package');
const {logStep, logError} = require('../scripts/log');
-const {
- WEBPACK_ENV_VARIABLES,
- ENV_VARIABLES_WITH_INSTRUCTIONS,
- RESOLVE_ALIASES
-} = require('../webpack/shared-webpack-configuration');
+const {WEBPACK_ENV_VARIABLES, RESOLVE_ALIASES} = require('../webpack/shared-webpack-configuration');
const LIB_DIR = resolve(__dirname, '..');
const SRC_DIR = resolve(LIB_DIR, './src');
@@ -37,7 +33,7 @@ const EXTERNAL_LOADERS_SRC = resolve(__dirname, '../../loaders.gl');
const EXTERNAL_HUBBLE_SRC = resolve(__dirname, '../../hubble.gl');
// Support for hot reloading changes to the deck.gl library:
-function makeLocalDevConfig(env, EXAMPLE_DIR = LIB_DIR, externals = {}) {
+function makeLocalDevConfig(env, externals = {}) {
const resolveAlias = RESOLVE_ALIASES;
// Combine flags
@@ -221,8 +217,8 @@ function makeBabelRule(env, exampleDir) {
* @param {string} exampleDir
* @param {Object} externals
*/
-function addLocalDevSettings(env, exampleConfig, exampleDir, externals) {
- const localDevConfig = makeLocalDevConfig(env, exampleDir, externals);
+function addLocalDevSettings(env, exampleConfig, externals) {
+ const localDevConfig = makeLocalDevConfig(env, externals);
const config = {...exampleConfig, ...localDevConfig};
config.resolve = config.resolve || {};
@@ -260,7 +256,7 @@ module.exports = (exampleConfig, exampleDir) => env => {
const modules = ['@deck.gl', '@loaders.gl', '@luma.gl', '@probe.gl', '@hubble.gl'];
const loadAllDirs = modules.map(
dir =>
- new Promise(function readDir(success, reject) {
+ new Promise(function readDir(success) {
fs.readdir(join(NODE_MODULES_DIR, dir), function readDirItems(err, items) {
if (err) {
logError(`Cannot find ${dir} in node_modules, make sure it is installed.`, err);
@@ -280,7 +276,7 @@ module.exports = (exampleConfig, exampleDir) => env => {
'hubble.gl': results[4]
}))
.then(externals => {
- const config = addLocalDevSettings(env, exampleConfig, exampleDir, externals);
+ const config = addLocalDevSettings(env, exampleConfig, externals);
return addBabelSettings(env, config, exampleDir, externals);
});
};
diff --git a/package.json b/package.json
index 386288888..c46ba5b49 100644
--- a/package.json
+++ b/package.json
@@ -83,7 +83,7 @@
"typedoc": "typedoc --theme markdown --out typedoc --inputFiles ./src/reducers --inputFiles ./src/actions --excludeExternals --excludeNotExported --excludePrivate",
"example-version": "babel-node ./scripts/edit-version.js",
"prettier-all": "prettier --write '{src,examples,test}/**/*.{js,tsx,ts}'",
- "lint": "yarn typescript && eslint src test webpack examples website --fix --ignore-path .gitignore --ext .js,.ts,.tsx",
+ "lint": "yarn typescript && eslint src test webpack examples website --fix --ignore-path .gitignore",
"lint:css": "stylelint './src/**/*.js'",
"typescript": "tsc --noEmit",
"web": "(yarn && yarn install:web && yarn start:web)",
@@ -116,8 +116,6 @@
"@kepler.gl/components": "3.0.0",
"@loaders.gl/polyfills": "^4.1.0-alpha.4",
"@types/mapbox__geo-viewport": "^0.4.1",
- "@typescript-eslint/parser": "^5.27.0",
- "eslint-config-developit": "^1.2.0",
"html-webpack-plugin": "^4.3.0",
"typedoc": "^0.19.2"
},
@@ -129,10 +127,10 @@
"@babel/parser": "^7.12.1",
"@babel/plugin-transform-class-properties": "^7.12.1",
"@babel/plugin-transform-export-namespace-from": "^7.12.1",
- "@babel/plugin-transform-optional-chaining": "^7.12.1",
"@babel/plugin-transform-logical-assignment-operators": "^7.12.1",
- "@babel/plugin-transform-nullish-coalescing-operator": "^7.12.1",
"@babel/plugin-transform-modules-commonjs": "^7.12.1",
+ "@babel/plugin-transform-nullish-coalescing-operator": "^7.12.1",
+ "@babel/plugin-transform-optional-chaining": "^7.12.1",
"@babel/plugin-transform-runtime": "^7.12.1",
"@babel/plugin-transform-typescript": "^7.16.8",
"@babel/polyfill": "^7.12.1",
@@ -159,8 +157,8 @@
"@types/jsdom": "^21.1.1",
"@types/redux-actions": "^2.6.2",
"@types/supercluster": "^7.1.0",
- "@typescript-eslint/eslint-plugin": "^5.12.0",
- "babel-eslint": "^10.1.0",
+ "@typescript-eslint/eslint-plugin": "5.57.0",
+ "@typescript-eslint/parser": "^5.57.1",
"babel-loader": "^8.0.0",
"babel-plugin-istanbul": "^6.0.0",
"babel-plugin-module-resolver": "^4.0.0",
@@ -170,16 +168,17 @@
"documentation": "^9.1.1",
"dts-bundle-webpack": "^1.0.2",
"enzyme": "^3.11.0",
- "eslint": "^5.16.0",
- "eslint-config-prettier": "^6.3.0",
- "eslint-config-uber-es2015": "^3.1.2",
- "eslint-config-uber-jsx": "^3.3.3",
+ "eslint": "~8.53.0",
+ "eslint-config-developit": "^1.2.0",
+ "eslint-config-prettier": "8.5.0",
+ "eslint-import-resolver-typescript": "3.6.1",
"eslint-plugin-babel": "^5.3.0",
"eslint-plugin-enzyme-deprecation": "^0.7.7",
+ "eslint-plugin-import": "2.29.1",
"eslint-plugin-jest": "^27.2.1",
- "eslint-plugin-prettier": "^3.1.2",
- "eslint-plugin-react": "^7.32.2",
- "eslint-plugin-react-hooks": "^4.6.0",
+ "eslint-plugin-prettier": "4.2.1",
+ "eslint-plugin-react": "^7.35.0",
+ "eslint-plugin-react-hooks": "^4.6.2",
"gl": "^6.0.2",
"global": "^4.4.0",
"jest": "^29.5.0",
@@ -189,7 +188,7 @@
"maplibre-gl": "^3.6.2",
"minimist": "^1.2.6",
"nyc": "^15.1.0",
- "prettier": "1.19.1",
+ "prettier": "2.8.8",
"progress-bar-webpack-plugin": "^2.1.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
@@ -239,6 +238,7 @@
"caniuse-lite": "^1.0.30001517",
"d3-array": "^2.8.0",
"d3-scale": "^3.2.3",
+ "eslint-plugin-jest": "^27.2.1",
"dot-prop": "6.0.0",
"kind-of": "6.0.3",
"jpeg-js": "^0.4.3",
diff --git a/src/actions/src/action-wrapper.ts b/src/actions/src/action-wrapper.ts
index d17ffdda3..1a9f7a980 100644
--- a/src/actions/src/action-wrapper.ts
+++ b/src/actions/src/action-wrapper.ts
@@ -160,7 +160,7 @@ export const _updateProperty = (state, id, nextState) =>
* A set of helpers to forward dispatch actions to a specific instance reducer
* @public
*/
-/* eslint-disable no-unused-vars */
+/* eslint-disable @typescript-eslint/no-unused-vars */
// @ts-ignore
const forwardActions = null;
-/* eslint-enable no-unused-vars */
+/* eslint-enable @typescript-eslint/no-unused-vars */
diff --git a/src/actions/src/actions.ts b/src/actions/src/actions.ts
index 628ed55a7..ad4b7c8cb 100644
--- a/src/actions/src/actions.ts
+++ b/src/actions/src/actions.ts
@@ -105,9 +105,7 @@ export type ActionHandlers<T extends {[k: string]: Handler}> = {
* })
* );
*/
-export const addDataToMap: (
- data: AddDataToMapPayload
-) => {
+export const addDataToMap: (data: AddDataToMapPayload) => {
type: typeof ActionTypes.ADD_DATA_TO_MAP;
payload: AddDataToMapPayload;
} = createAction(ActionTypes.ADD_DATA_TO_MAP, (data: AddDataToMapPayload) => ({payload: data}));
@@ -187,9 +185,7 @@ export type KeplerGlInitPayload = {
* @public
*/
// @ts-expect-error
-export const keplerGlInit: (
- options?: KeplerGlInitPayload
-) => {
+export const keplerGlInit: (options?: KeplerGlInitPayload) => {
type: typeof ActionTypes.INIT;
payload: KeplerGlInitPayload;
} = createAction(ActionTypes.INIT, (payload: KeplerGlInitPayload) => ({payload}));
@@ -213,9 +209,7 @@ export type ReplaceDataInMapPayload = {
* @param payload.datasetToUse - mapboxApiUrl to be saved to mapStyle reducer.
* @public
*/
-export const replaceDataInMap: (
- payload: ReplaceDataInMapPayload
-) => {
+export const replaceDataInMap: (payload: ReplaceDataInMapPayload) => {
type: typeof ActionTypes.REPLACE_DATA_IN_MAP;
payload: ReplaceDataInMapPayload;
} = createAction(ActionTypes.REPLACE_DATA_IN_MAP, (payload: ReplaceDataInMapPayload) => ({
@@ -230,7 +224,7 @@ export const replaceDataInMap: (
* is listened by all subreducers,
* @public
*/
-/* eslint-disable no-unused-vars */
+/* eslint-disable @typescript-eslint/no-unused-vars */
// @ts-ignore
const main = null;
-/* eslint-enable no-unused-vars */
+/* eslint-enable @typescript-eslint/no-unused-vars */
diff --git a/src/actions/src/identity-actions.ts b/src/actions/src/identity-actions.ts
index c1daa0895..c08922d4c 100644
--- a/src/actions/src/identity-actions.ts
+++ b/src/actions/src/identity-actions.ts
@@ -31,9 +31,7 @@ export type RegisterEntryUpdaterAction = {
* @param payload.initialUiState - initial ui state
* @public
*/
-export const registerEntry: (
- entry: RegisterEntryUpdaterAction['payload']
-) => {
+export const registerEntry: (entry: RegisterEntryUpdaterAction['payload']) => {
type: typeof ActionTypes.REGISTER_ENTRY;
payload: RegisterEntryUpdaterAction['payload'];
} = createAction(ActionTypes.REGISTER_ENTRY, (payload: RegisterEntryUpdaterAction['payload']) => ({
@@ -49,9 +47,7 @@ export const registerEntry: (
* @param {string} id - the id of the instance to be deleted
* @public
*/
-export const deleteEntry: (
- id: string
-) => {
+export const deleteEntry: (id: string) => {
type: typeof ActionTypes.DELETE_ENTRY;
payload: string;
} = createAction(ActionTypes.DELETE_ENTRY, (id: string) => ({payload: id}));
@@ -93,7 +89,7 @@ export const renameEntry: (
*
* @public
*/
-/* eslint-disable no-unused-vars */
+/* eslint-disable @typescript-eslint/no-unused-vars */
// @ts-ignore
const rootActions = null;
-/* eslint-enable no-unused-vars */
+/* eslint-enable @typescript-eslint/no-unused-vars */
diff --git a/src/actions/src/map-state-actions.ts b/src/actions/src/map-state-actions.ts
index ac403ad8f..a79d25a37 100644
--- a/src/actions/src/map-state-actions.ts
+++ b/src/actions/src/map-state-actions.ts
@@ -5,7 +5,7 @@ import {createAction} from '@reduxjs/toolkit';
import {default as ActionTypes} from './action-types';
import {Bounds, Merge, Viewport} from '@kepler.gl/types';
-export type TogglePerspectiveUpdaterAction = {};
+export type TogglePerspectiveUpdaterAction = void;
/**
*
* Toggle between 3d and 2d map.
@@ -32,10 +32,10 @@ export type FitBoundsUpdaterAction = {payload: Bounds};
*/
export const fitBounds: (
payload: Bounds
-) => Merge<
- FitBoundsUpdaterAction,
- {type: typeof ActionTypes.FIT_BOUNDS}
-> = createAction(ActionTypes.FIT_BOUNDS, (bounds: Bounds) => ({payload: bounds}));
+) => Merge<FitBoundsUpdaterAction, {type: typeof ActionTypes.FIT_BOUNDS}> = createAction(
+ ActionTypes.FIT_BOUNDS,
+ (bounds: Bounds) => ({payload: bounds})
+);
export type UpdateMapUpdaterAction = {payload: {viewport: Viewport; mapIndex?: number}};
/**
@@ -84,10 +84,10 @@ export type ToggleSplitMapUpdaterAction = {
*/
export const toggleSplitMap: (
payload: number
-) => Merge<
- ToggleSplitMapUpdaterAction,
- {type: typeof ActionTypes.TOGGLE_SPLIT_MAP}
-> = createAction(ActionTypes.TOGGLE_SPLIT_MAP, (index: number) => ({payload: index}));
+) => Merge<ToggleSplitMapUpdaterAction, {type: typeof ActionTypes.TOGGLE_SPLIT_MAP}> = createAction(
+ ActionTypes.TOGGLE_SPLIT_MAP,
+ (index: number) => ({payload: index})
+);
export type ToggleSplitMapViewportUpdaterAction = {
payload: {
@@ -124,7 +124,7 @@ export const toggleSplitMapViewport: (payload: {
*
* @public
*/
-/* eslint-disable no-unused-vars */
+/* eslint-disable @typescript-eslint/no-unused-vars */
// @ts-ignore
const mapStateActions = null;
-/* eslint-enable no-unused-vars */
+/* eslint-enable @typescript-eslint/no-unused-vars */
diff --git a/src/actions/src/map-style-actions.ts b/src/actions/src/map-style-actions.ts
index 4e83cac83..cc5fa8a69 100644
--- a/src/actions/src/map-style-actions.ts
+++ b/src/actions/src/map-style-actions.ts
@@ -113,13 +113,11 @@ export type MapConfigChangeUpdaterAction = {
*/
export const mapConfigChange: (
mapStyle: MapConfigChangeUpdaterAction['payload']
-) => Merge<
- MapConfigChangeUpdaterAction,
- {type: typeof ActionTypes.MAP_CONFIG_CHANGE}
-> = createAction(
- ActionTypes.MAP_CONFIG_CHANGE,
- (mapStyle: MapConfigChangeUpdaterAction['payload']) => ({payload: mapStyle})
-);
+) => Merge<MapConfigChangeUpdaterAction, {type: typeof ActionTypes.MAP_CONFIG_CHANGE}> =
+ createAction(
+ ActionTypes.MAP_CONFIG_CHANGE,
+ (mapStyle: MapConfigChangeUpdaterAction['payload']) => ({payload: mapStyle})
+ );
type OnLoadMapStyleSuccessCallback = (payload: {styleType: string}) => any;
@@ -146,16 +144,14 @@ export type RequestMapStylesUpdaterAction = {
export const requestMapStyles: (
mapStyles: RequestMapStylesUpdaterAction['payload']['mapStyles'],
onSuccess?: RequestMapStylesUpdaterAction['payload']['onSuccess']
-) => Merge<
- RequestMapStylesUpdaterAction,
- {type: typeof ActionTypes.REQUEST_MAP_STYLES}
-> = createAction(
- ActionTypes.REQUEST_MAP_STYLES,
- (
- mapStyles: RequestMapStylesUpdaterAction['payload']['mapStyles'],
- onSuccess?: RequestMapStylesUpdaterAction['payload']['onSuccess']
- ) => ({payload: {mapStyles, onSuccess}})
-);
+) => Merge<RequestMapStylesUpdaterAction, {type: typeof ActionTypes.REQUEST_MAP_STYLES}> =
+ createAction(
+ ActionTypes.REQUEST_MAP_STYLES,
+ (
+ mapStyles: RequestMapStylesUpdaterAction['payload']['mapStyles'],
+ onSuccess?: RequestMapStylesUpdaterAction['payload']['onSuccess']
+ ) => ({payload: {mapStyles, onSuccess}})
+ );
/** LOAD_MAP_STYLES */
export type LoadMapStylesUpdaterAction = {
@@ -173,10 +169,7 @@ export type LoadMapStylesUpdaterAction = {
export const loadMapStyles: (
newStyles: LoadMapStylesUpdaterAction['payload']['newStyles'],
onSuccess?: LoadMapStylesUpdaterAction['payload']['onSuccess']
-) => Merge<
- LoadMapStylesUpdaterAction,
- {type: typeof ActionTypes.LOAD_MAP_STYLES}
-> = createAction(
+) => Merge<LoadMapStylesUpdaterAction, {type: typeof ActionTypes.LOAD_MAP_STYLES}> = createAction(
ActionTypes.LOAD_MAP_STYLES,
(
newStyles: LoadMapStylesUpdaterAction['payload']['newStyles'],
@@ -201,16 +194,14 @@ export type LoadMapStyleErrUpdaterAction = {
export const loadMapStyleErr: (
ids: LoadMapStyleErrUpdaterAction['payload']['ids'],
error: LoadMapStyleErrUpdaterAction['payload']['error']
-) => Merge<
- LoadMapStyleErrUpdaterAction,
- {type: typeof ActionTypes.LOAD_MAP_STYLE_ERR}
-> = createAction(
- ActionTypes.LOAD_MAP_STYLE_ERR,
- (
- ids: LoadMapStyleErrUpdaterAction['payload']['ids'],
- error: LoadMapStyleErrUpdaterAction['payload']['error']
- ) => ({payload: {ids, error}})
-);
+) => Merge<LoadMapStyleErrUpdaterAction, {type: typeof ActionTypes.LOAD_MAP_STYLE_ERR}> =
+ createAction(
+ ActionTypes.LOAD_MAP_STYLE_ERR,
+ (
+ ids: LoadMapStyleErrUpdaterAction['payload']['ids'],
+ error: LoadMapStyleErrUpdaterAction['payload']['error']
+ ) => ({payload: {ids, error}})
+ );
/** MAP_STYLE_CHANGE */
export type MapStyleChangeUpdaterAction = {
@@ -229,10 +220,7 @@ export type MapStyleChangeUpdaterAction = {
export const mapStyleChange: (
styleType: MapStyleChangeUpdaterAction['payload']['styleType'],
onSuccess?: MapStyleChangeUpdaterAction['payload']['onSuccess']
-) => Merge<
- MapStyleChangeUpdaterAction,
- {type: typeof ActionTypes.MAP_STYLE_CHANGE}
-> = createAction(
+) => Merge<MapStyleChangeUpdaterAction, {type: typeof ActionTypes.MAP_STYLE_CHANGE}> = createAction(
ActionTypes.MAP_STYLE_CHANGE,
(
styleType: MapStyleChangeUpdaterAction['payload']['styleType'],
@@ -245,7 +233,7 @@ export type LoadCustomMapStyleUpdaterAction = {
payload: {
icon?: string;
style?: object;
- error?: object;
+ error?: object | boolean;
};
};
/**
@@ -259,13 +247,11 @@ export type LoadCustomMapStyleUpdaterAction = {
*/
export const loadCustomMapStyle: (
customMapStyle: LoadCustomMapStyleUpdaterAction['payload']
-) => Merge<
- LoadCustomMapStyleUpdaterAction,
- {type: typeof ActionTypes.LOAD_CUSTOM_MAP_STYLE}
-> = createAction(
- ActionTypes.LOAD_CUSTOM_MAP_STYLE,
- (customMapStyle: LoadCustomMapStyleUpdaterAction['payload']) => ({payload: customMapStyle})
-);
+) => Merge<LoadCustomMapStyleUpdaterAction, {type: typeof ActionTypes.LOAD_CUSTOM_MAP_STYLE}> =
+ createAction(
+ ActionTypes.LOAD_CUSTOM_MAP_STYLE,
+ (customMapStyle: LoadCustomMapStyleUpdaterAction['payload']) => ({payload: customMapStyle})
+ );
/** SET_3D_BUILDING_COLOR */
export type Set3dBuildingColorUpdaterAction = {
@@ -280,13 +266,11 @@ export type Set3dBuildingColorUpdaterAction = {
*/
export const set3dBuildingColor: (
color: Set3dBuildingColorUpdaterAction['payload']
-) => Merge<
- Set3dBuildingColorUpdaterAction,
- {type: typeof ActionTypes.SET_3D_BUILDING_COLOR}
-> = createAction(
- ActionTypes.SET_3D_BUILDING_COLOR,
- (color: Set3dBuildingColorUpdaterAction['payload']) => ({payload: color})
-);
+) => Merge<Set3dBuildingColorUpdaterAction, {type: typeof ActionTypes.SET_3D_BUILDING_COLOR}> =
+ createAction(
+ ActionTypes.SET_3D_BUILDING_COLOR,
+ (color: Set3dBuildingColorUpdaterAction['payload']) => ({payload: color})
+ );
/** SET_BACKGROUND_COLOR */
export type SetBackgroundColorUpdaterAction = {
@@ -301,10 +285,8 @@ export type SetBackgroundColorUpdaterAction = {
*/
export const setBackgroundColor: (
color: SetBackgroundColorUpdaterAction['payload']
-) => Merge<
- SetBackgroundColorUpdaterAction,
- {type: typeof ActionTypes.SET_BACKGROUND_COLOR}
-> = createAction(ActionTypes.SET_BACKGROUND_COLOR, (color: RGBColor) => ({payload: color}));
+) => Merge<SetBackgroundColorUpdaterAction, {type: typeof ActionTypes.SET_BACKGROUND_COLOR}> =
+ createAction(ActionTypes.SET_BACKGROUND_COLOR, (color: RGBColor) => ({payload: color}));
/**
* Actions handled mostly by `mapStyle` reducer.
@@ -313,7 +295,7 @@ export const setBackgroundColor: (
*
* @public
*/
-/* eslint-disable no-unused-vars */
+/* eslint-disable @typescript-eslint/no-unused-vars */
// @ts-ignore
const mapStyleActions = null;
-/* eslint-enable no-unused-vars */
+/* eslint-enable @typescript-eslint/no-unused-vars */
diff --git a/src/actions/src/provider-actions.ts b/src/actions/src/provider-actions.ts
index 555f4556d..13b598b4b 100644
--- a/src/actions/src/provider-actions.ts
+++ b/src/actions/src/provider-actions.ts
@@ -3,7 +3,12 @@
import {createAction} from '@reduxjs/toolkit';
import {ACTION_PREFIX} from './action-types';
-import {ExportFileOptions, ExportFileToCloudPayload, OnErrorCallBack, OnSuccessCallBack} from '@kepler.gl/types';
+import {
+ ExportFileOptions,
+ ExportFileToCloudPayload,
+ OnErrorCallBack,
+ OnSuccessCallBack
+} from '@kepler.gl/types';
import {Provider} from '@kepler.gl/cloud-providers';
// eslint-disable-next-line prettier/prettier
@@ -16,7 +21,7 @@ export const ActionTypes = assignType({
POST_SAVE_LOAD_SUCCESS: `${ACTION_PREFIX}POST_SAVE_LOAD_SUCCESS`,
LOAD_CLOUD_MAP: `${ACTION_PREFIX}LOAD_CLOUD_MAP`,
LOAD_CLOUD_MAP_SUCCESS: `${ACTION_PREFIX}LOAD_CLOUD_MAP_SUCCESS`,
- LOAD_CLOUD_MAP_ERROR: `${ACTION_PREFIX}LOAD_CLOUD_MAP_ERROR`,
+ LOAD_CLOUD_MAP_ERROR: `${ACTION_PREFIX}LOAD_CLOUD_MAP_ERROR`
});
/**
@@ -28,12 +33,12 @@ export const ActionTypes = assignType({
* @param onError
* @param closeModal
*/
-export const exportFileToCloud: (
- p: ExportFileToCloudPayload
-) => {
+export const exportFileToCloud: (p: ExportFileToCloudPayload) => {
type: typeof ActionTypes.EXPORT_FILE_TO_CLOUD;
payload: ExportFileToCloudPayload;
-} = createAction(ActionTypes.EXPORT_FILE_TO_CLOUD, (payload: ExportFileToCloudPayload) => ({payload}));
+} = createAction(ActionTypes.EXPORT_FILE_TO_CLOUD, (payload: ExportFileToCloudPayload) => ({
+ payload
+}));
/** EXPORT_FILE_SUCCESS */
export type ExportFileSuccessPayload = {
@@ -44,12 +49,12 @@ export type ExportFileSuccessPayload = {
closeModal?: boolean;
};
-export const exportFileSuccess: (
- p: ExportFileSuccessPayload
-) => {
+export const exportFileSuccess: (p: ExportFileSuccessPayload) => {
type: typeof ActionTypes.EXPORT_FILE_SUCCESS;
payload: ExportFileSuccessPayload;
-} = createAction(ActionTypes.EXPORT_FILE_SUCCESS, (payload: ExportFileSuccessPayload) => ({payload}));
+} = createAction(ActionTypes.EXPORT_FILE_SUCCESS, (payload: ExportFileSuccessPayload) => ({
+ payload
+}));
/** EXPORT_FILE_ERROR */
export type ExportFileErrorPayload = {
@@ -59,24 +64,19 @@ export type ExportFileErrorPayload = {
onError?: OnErrorCallBack;
};
-export const exportFileError: (
- p: ExportFileErrorPayload
-) => {
+export const exportFileError: (p: ExportFileErrorPayload) => {
type: typeof ActionTypes.EXPORT_FILE_ERROR;
payload: ExportFileErrorPayload;
} = createAction(ActionTypes.EXPORT_FILE_ERROR, (payload: ExportFileErrorPayload) => ({payload}));
/** POST_SAVE_LOAD_SUCCESS */
export type PostSaveLoadSuccessPayload = string;
-export const postSaveLoadSuccess: (
- p: PostSaveLoadSuccessPayload
-) => {
+export const postSaveLoadSuccess: (p: PostSaveLoadSuccessPayload) => {
type: typeof ActionTypes.POST_SAVE_LOAD_SUCCESS;
payload: PostSaveLoadSuccessPayload;
-} = createAction(
- ActionTypes.POST_SAVE_LOAD_SUCCESS,
- (message: PostSaveLoadSuccessPayload) => ({payload : message})
-);
+} = createAction(ActionTypes.POST_SAVE_LOAD_SUCCESS, (message: PostSaveLoadSuccessPayload) => ({
+ payload: message
+}));
export const resetProviderStatus: () => {
type: typeof ActionTypes.RESET_PROVIDER_STATUS;
@@ -89,9 +89,7 @@ export type LoadCloudMapPayload = {
onSuccess?: any;
onError?: OnErrorCallBack;
};
-export const loadCloudMap: (
- p: LoadCloudMapPayload
-) => {
+export const loadCloudMap: (p: LoadCloudMapPayload) => {
type: typeof ActionTypes.LOAD_CLOUD_MAP;
payload: LoadCloudMapPayload;
} = createAction(ActionTypes.LOAD_CLOUD_MAP, payload => ({payload}));
@@ -105,15 +103,12 @@ export type LoadCloudMapSuccessPayload = {
onSuccess?: LoadCloudMapSuccessCallback;
onError?: OnErrorCallBack;
};
-export const loadCloudMapSuccess: (
- p: LoadCloudMapSuccessPayload
-) => {
+export const loadCloudMapSuccess: (p: LoadCloudMapSuccessPayload) => {
type: typeof ActionTypes.LOAD_CLOUD_MAP_SUCCESS;
payload: LoadCloudMapSuccessPayload;
-} = createAction(
- ActionTypes.LOAD_CLOUD_MAP_SUCCESS,
- (payload: LoadCloudMapSuccessPayload) => ({payload})
-);
+} = createAction(ActionTypes.LOAD_CLOUD_MAP_SUCCESS, (payload: LoadCloudMapSuccessPayload) => ({
+ payload
+}));
/** LOAD_CLOUD_MAP_ERROR */
export type LoadCloudMapErrorPayload = {
@@ -121,9 +116,9 @@ export type LoadCloudMapErrorPayload = {
provider: Provider;
onError?: OnErrorCallBack;
};
-export const loadCloudMapError: (
- p: LoadCloudMapErrorPayload
-) => {
+export const loadCloudMapError: (p: LoadCloudMapErrorPayload) => {
type: typeof ActionTypes.LOAD_CLOUD_MAP_ERROR;
payload: LoadCloudMapErrorPayload;
-} = createAction(ActionTypes.LOAD_CLOUD_MAP_ERROR, (payload: LoadCloudMapErrorPayload) => ({payload}));
+} = createAction(ActionTypes.LOAD_CLOUD_MAP_ERROR, (payload: LoadCloudMapErrorPayload) => ({
+ payload
+}));
diff --git a/src/actions/src/ui-state-actions.ts b/src/actions/src/ui-state-actions.ts
index b5c1045fd..4a7868541 100644
--- a/src/actions/src/ui-state-actions.ts
+++ b/src/actions/src/ui-state-actions.ts
@@ -18,10 +18,8 @@ export type ToggleSidePanelUpdaterAction = {
*/
export const toggleSidePanel: (
id: string | null
-) => Merge<
- ToggleSidePanelUpdaterAction,
- {type: typeof ActionTypes.TOGGLE_SIDE_PANEL}
-> = createAction(ActionTypes.TOGGLE_SIDE_PANEL, (id: string | null) => ({payload: id}));
+) => Merge<ToggleSidePanelUpdaterAction, {type: typeof ActionTypes.TOGGLE_SIDE_PANEL}> =
+ createAction(ActionTypes.TOGGLE_SIDE_PANEL, (id: string | null) => ({payload: id}));
/** TOGGLE_MODAL */
export type ToggleModalUpdaterAction = {
@@ -60,13 +58,11 @@ export type ShowExportDropdownUpdaterAction = {
*/
export const showExportDropdown: (
id: ShowExportDropdownUpdaterAction['payload']
-) => Merge<
- ShowExportDropdownUpdaterAction,
- {type: typeof ActionTypes.SHOW_EXPORT_DROPDOWN}
-> = createAction(
- ActionTypes.SHOW_EXPORT_DROPDOWN,
- (id: ShowExportDropdownUpdaterAction['payload']) => ({payload: id})
-);
+) => Merge<ShowExportDropdownUpdaterAction, {type: typeof ActionTypes.SHOW_EXPORT_DROPDOWN}> =
+ createAction(
+ ActionTypes.SHOW_EXPORT_DROPDOWN,
+ (id: ShowExportDropdownUpdaterAction['payload']) => ({payload: id})
+ );
/**
* Hide side panel header dropdown, activated by clicking the share link on top of the side panel
@@ -113,21 +109,19 @@ export type ToggleMapControlUpdaterAction = {
export const toggleMapControl: (
panelId: ToggleMapControlUpdaterAction['payload']['panelId'],
index: ToggleMapControlUpdaterAction['payload']['index']
-) => Merge<
- ToggleMapControlUpdaterAction,
- {type: typeof ActionTypes.TOGGLE_MAP_CONTROL}
-> = createAction(
- ActionTypes.TOGGLE_MAP_CONTROL,
- (
- panelId: ToggleMapControlUpdaterAction['payload']['panelId'],
- index: ToggleMapControlUpdaterAction['payload']['index']
- ) => ({
- payload: {
- panelId,
- index
- }
- })
-);
+) => Merge<ToggleMapControlUpdaterAction, {type: typeof ActionTypes.TOGGLE_MAP_CONTROL}> =
+ createAction(
+ ActionTypes.TOGGLE_MAP_CONTROL,
+ (
+ panelId: ToggleMapControlUpdaterAction['payload']['panelId'],
+ index: ToggleMapControlUpdaterAction['payload']['index']
+ ) => ({
+ payload: {
+ panelId,
+ index
+ }
+ })
+ );
/** SET_MAP_CONTROL_VISIBILITY */
export type setMapControlVisibilityUpdaterAction = {
@@ -173,13 +167,11 @@ export type OpenDeleteModalUpdaterAction = {
*/
export const openDeleteModal: (
datasetId: OpenDeleteModalUpdaterAction['payload']
-) => Merge<
- OpenDeleteModalUpdaterAction,
- {type: typeof ActionTypes.OPEN_DELETE_MODAL}
-> = createAction(
- ActionTypes.OPEN_DELETE_MODAL,
- (datasetId: OpenDeleteModalUpdaterAction['payload']) => ({payload: datasetId})
-);
+) => Merge<OpenDeleteModalUpdaterAction, {type: typeof ActionTypes.OPEN_DELETE_MODAL}> =
+ createAction(
+ ActionTypes.OPEN_DELETE_MODAL,
+ (datasetId: OpenDeleteModalUpdaterAction['payload']) => ({payload: datasetId})
+ );
/** ADD_NOTIFICATION */
export type AddNotificationUpdaterAction = {
@@ -192,9 +184,7 @@ export type AddNotificationUpdaterAction = {
* @param notification - The `notification` object to be added or updated
* @public
*/
-export const addNotification: (
- notification: AddNotificationUpdaterAction['payload']
-) => Merge<
+export const addNotification: (notification: AddNotificationUpdaterAction['payload']) => Merge<
AddNotificationUpdaterAction,
{
type: typeof ActionTypes.ADD_NOTIFICATION;
@@ -216,13 +206,11 @@ export type RemoveNotificationUpdaterAction = {
*/
export const removeNotification: (
id: RemoveNotificationUpdaterAction['payload']
-) => Merge<
- RemoveNotificationUpdaterAction,
- {type: typeof ActionTypes.REMOVE_NOTIFICATION}
-> = createAction(
- ActionTypes.REMOVE_NOTIFICATION,
- (id: RemoveNotificationUpdaterAction['payload']) => ({payload: id})
-);
+) => Merge<RemoveNotificationUpdaterAction, {type: typeof ActionTypes.REMOVE_NOTIFICATION}> =
+ createAction(
+ ActionTypes.REMOVE_NOTIFICATION,
+ (id: RemoveNotificationUpdaterAction['payload']) => ({payload: id})
+ );
/** SET_EXPORT_IMAGE_SETTING */
export type SetExportImageSettingUpdaterAction = {
@@ -254,10 +242,8 @@ export const startExportingImage: (options?: {
resolution?: string;
legend?: string;
center?: boolean;
-}) => Merge<
- SetExportImageSettingUpdaterAction,
- {type: typeof ActionTypes.START_EXPORTING_IMAGE}
-> = createAction(ActionTypes.START_EXPORTING_IMAGE, (payload: any) => ({payload}));
+}) => Merge<SetExportImageSettingUpdaterAction, {type: typeof ActionTypes.START_EXPORTING_IMAGE}> =
+ createAction(ActionTypes.START_EXPORTING_IMAGE, (payload: any) => ({payload}));
/** SET_EXPORT_IMAGE_DATA_URI */
export type SetExportImageDataUriUpdaterAction = {
@@ -290,13 +276,11 @@ export type SetExportImageErrorUpdaterAction = {
*/
export const setExportImageError: (
error: SetExportImageErrorUpdaterAction['payload']
-) => Merge<
- SetExportImageErrorUpdaterAction,
- {type: typeof ActionTypes.SET_EXPORT_IMAGE_ERROR}
-> = createAction(
- ActionTypes.SET_EXPORT_IMAGE_ERROR,
- (error: SetExportImageErrorUpdaterAction['payload']) => ({payload: error})
-);
+) => Merge<SetExportImageErrorUpdaterAction, {type: typeof ActionTypes.SET_EXPORT_IMAGE_ERROR}> =
+ createAction(
+ ActionTypes.SET_EXPORT_IMAGE_ERROR,
+ (error: SetExportImageErrorUpdaterAction['payload']) => ({payload: error})
+ );
/**
* Delete cached export image
@@ -339,13 +323,11 @@ export type SetExportDataTypeUpdaterAction = {
*/
export const setExportDataType: (
dataType: SetExportDataTypeUpdaterAction['payload']
-) => Merge<
- SetExportDataTypeUpdaterAction,
- {type: typeof ActionTypes.SET_EXPORT_DATA_TYPE}
-> = createAction(
- ActionTypes.SET_EXPORT_DATA_TYPE,
- (dataType: SetExportDataTypeUpdaterAction['payload']) => ({payload: dataType})
-);
+) => Merge<SetExportDataTypeUpdaterAction, {type: typeof ActionTypes.SET_EXPORT_DATA_TYPE}> =
+ createAction(
+ ActionTypes.SET_EXPORT_DATA_TYPE,
+ (dataType: SetExportDataTypeUpdaterAction['payload']) => ({payload: dataType})
+ );
/** SET_EXPORT_FILTERED */
export type SetExportFilteredUpdaterAction = {
@@ -359,13 +341,11 @@ export type SetExportFilteredUpdaterAction = {
*/
export const setExportFiltered: (
exportFiltered: SetExportFilteredUpdaterAction['payload']
-) => Merge<
- SetExportFilteredUpdaterAction,
- {type: typeof ActionTypes.SET_EXPORT_FILTERED}
-> = createAction(
- ActionTypes.SET_EXPORT_FILTERED,
- (payload: SetExportFilteredUpdaterAction['payload']) => ({payload})
-);
+) => Merge<SetExportFilteredUpdaterAction, {type: typeof ActionTypes.SET_EXPORT_FILTERED}> =
+ createAction(
+ ActionTypes.SET_EXPORT_FILTERED,
+ (payload: SetExportFilteredUpdaterAction['payload']) => ({payload})
+ );
/**
* Whether to including data in map config, toggle between `true` or `false`
@@ -408,13 +388,11 @@ export type SetExportMapFormatUpdaterAction = {
*/
export const setExportMapFormat: (
mapFormat: SetExportMapFormatUpdaterAction['payload']
-) => Merge<
- SetExportMapFormatUpdaterAction,
- {type: typeof ActionTypes.SET_EXPORT_MAP_FORMAT}
-> = createAction(
- ActionTypes.SET_EXPORT_MAP_FORMAT,
- (payload: SetExportMapFormatUpdaterAction['payload']) => ({payload})
-);
+) => Merge<SetExportMapFormatUpdaterAction, {type: typeof ActionTypes.SET_EXPORT_MAP_FORMAT}> =
+ createAction(
+ ActionTypes.SET_EXPORT_MAP_FORMAT,
+ (payload: SetExportMapFormatUpdaterAction['payload']) => ({payload})
+ );
/** SET_EXPORT_MAP_HTML_MODE */
export type SetExportHTMLMapModeUpdaterAction = {
@@ -427,13 +405,11 @@ export type SetExportHTMLMapModeUpdaterAction = {
*/
export const setExportHTMLMapMode: (
mode: SetExportHTMLMapModeUpdaterAction['payload']
-) => Merge<
- SetExportHTMLMapModeUpdaterAction,
- {type: typeof ActionTypes.SET_EXPORT_MAP_HTML_MODE}
-> = createAction(
- ActionTypes.SET_EXPORT_MAP_HTML_MODE,
- (payload: SetExportHTMLMapModeUpdaterAction['payload']) => ({payload})
-);
+) => Merge<SetExportHTMLMapModeUpdaterAction, {type: typeof ActionTypes.SET_EXPORT_MAP_HTML_MODE}> =
+ createAction(
+ ActionTypes.SET_EXPORT_MAP_HTML_MODE,
+ (payload: SetExportHTMLMapModeUpdaterAction['payload']) => ({payload})
+ );
/** SET_LOCALE */
export type SetLocaleUpdaterAction = {
@@ -474,13 +450,11 @@ export type TogglePanelListViewAction = {
*/
export const togglePanelListView: (
payload: TogglePanelListViewAction['payload']
-) => Merge<
- TogglePanelListViewAction,
- {type: typeof ActionTypes.TOGGLE_PANEL_LIST_VIEW}
-> = createAction(
- ActionTypes.TOGGLE_PANEL_LIST_VIEW,
- (payload: TogglePanelListViewAction['payload']) => ({payload})
-);
+) => Merge<TogglePanelListViewAction, {type: typeof ActionTypes.TOGGLE_PANEL_LIST_VIEW}> =
+ createAction(
+ ActionTypes.TOGGLE_PANEL_LIST_VIEW,
+ (payload: TogglePanelListViewAction['payload']) => ({payload})
+ );
/**
* This declaration is needed to group actions in docs
@@ -493,7 +467,7 @@ export const togglePanelListView: (
*
* @public
*/
-/* eslint-disable no-unused-vars */
+/* eslint-disable @typescript-eslint/no-unused-vars */
// @ts-ignore
const uiStateActions = null;
-/* eslint-enable no-unused-vars */
+/* eslint-enable @typescript-eslint/no-unused-vars */
diff --git a/src/actions/src/vis-state-actions.ts b/src/actions/src/vis-state-actions.ts
index 035afde34..c03a4e81b 100644
--- a/src/actions/src/vis-state-actions.ts
+++ b/src/actions/src/vis-state-actions.ts
@@ -932,7 +932,7 @@ export function updateLayerAnimationSpeed(
speed
};
}
-export type ToggleLayerAnimationUpdaterAction = {};
+export type ToggleLayerAnimationUpdaterAction = void;
/**
* start end end layer animation
* @memberof visStateActions
@@ -948,7 +948,7 @@ export function toggleLayerAnimation(): Merge<
};
}
-export type ToggleLayerAnimationControlUpdaterAction = {};
+export type ToggleLayerAnimationControlUpdaterAction = void;
/**
* hide and show layer animation control
* @memberof visStateActions
@@ -1047,7 +1047,7 @@ export function onLayerClick(
};
}
-export type OnMapClickUpdaterAction = {};
+export type OnMapClickUpdaterAction = void;
/**
* Trigger map click event, unselect clicked object
* @memberof visStateActions
@@ -1375,7 +1375,7 @@ export function applyCPUFilter(
};
}
-export type ToggleEditorVisibilityUpdaterAction = {};
+export type ToggleEditorVisibilityUpdaterAction = void;
/**
* Toggle editor layer visibility
* @memberof visStateActions
@@ -1503,7 +1503,7 @@ export function setFilterAnimationTimeConfig(
*
* @public
*/
-/* eslint-disable no-unused-vars */
+/* eslint-disable @typescript-eslint/no-unused-vars */
// @ts-ignore
const visStateActions = null;
-/* eslint-enable no-unused-vars */
+/* eslint-enable @typescript-eslint/no-unused-vars */
diff --git a/src/cloud-providers/src/base.tsx b/src/cloud-providers/src/base.tsx
index 71f121631..674fb04a9 100644
--- a/src/cloud-providers/src/base.tsx
+++ b/src/cloud-providers/src/base.tsx
@@ -8,7 +8,9 @@ const getStyleClassFromColor = (totalColor: number, colors: string[]) =>
.fill(1)
.reduce((accu, c, i) => `${accu}.cr${i + 1} {fill:${colors[i % colors.length]};}`, '');
-const nop = () => {};
+const nop = () => {
+ return;
+};
export type BaseProps = {
/** Set the height of the icon, ex. '16px' */
diff --git a/src/cloud-providers/src/provider.ts b/src/cloud-providers/src/provider.ts
index aac6f326a..f083a5d73 100644
--- a/src/cloud-providers/src/provider.ts
+++ b/src/cloud-providers/src/provider.ts
@@ -74,7 +74,7 @@ export default class Provider {
displayName: string;
icon: ComponentType<IconProps>;
thumbnail: Thumbnail;
- isNew: boolean = false;
+ isNew = false;
constructor(props: ProviderProps) {
this.name = props.name || NAME;
@@ -107,7 +107,8 @@ export default class Provider {
* @returns shareUrl
* @public
*/
- getShareUrl(fullUrl: boolean = false): string {
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
+ getShareUrl(fullUrl = false): string {
return '';
}
@@ -116,6 +117,7 @@ export default class Provider {
* @returns mapUrl
* @public
*/
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
getMapUrl(loadParams: MapItemLoadParams): string {
return '';
}
@@ -185,7 +187,9 @@ export default class Provider {
* @public
*/
async uploadMap({
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
mapData,
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
options = {}
}: {
mapData: MapData;
@@ -242,6 +246,7 @@ export default class Provider {
* return downloadMap;
* }
*/
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
async downloadMap(loadParams): Promise<{map: SavedMap; format: string}> {
return Promise.reject('You must implement downloadMap');
}
diff --git a/src/cloud-providers/webpack/umd.js b/src/cloud-providers/webpack/umd.js
index 655dc62f1..c7c03dd3c 100644
--- a/src/cloud-providers/webpack/umd.js
+++ b/src/cloud-providers/webpack/umd.js
@@ -10,7 +10,7 @@ const KeplerPackage = require('../package');
const SRC_DIR = resolve(__dirname, '../src');
const OUTPUT_DIR = resolve(__dirname, '../umd');
-const LIBRARY_BUNDLE_CONFIG = env => ({
+const LIBRARY_BUNDLE_CONFIG = () => ({
entry: {
KeplerGl: join(SRC_DIR, 'index.ts')
},
diff --git a/src/components/src/common/animation-control/animation-control.tsx b/src/components/src/common/animation-control/animation-control.tsx
index 8aadb0742..e72d55c05 100644
--- a/src/components/src/common/animation-control/animation-control.tsx
+++ b/src/components/src/common/animation-control/animation-control.tsx
@@ -100,8 +100,12 @@ function AnimationControlFactory(
isAnimatable,
isAnimating,
resetAnimation,
- toggleAnimation,
- updateAnimationSpeed,
+ toggleAnimation = () => {
+ return;
+ },
+ updateAnimationSpeed = () => {
+ return;
+ },
setTimelineValue,
setAnimationWindow,
timeline,
@@ -155,11 +159,6 @@ function AnimationControlFactory(
);
};
- AnimationControl.defaultProps = {
- toggleAnimation: () => {},
- updateAnimationSpeed: () => {}
- };
-
return AnimationControl;
}
diff --git a/src/components/src/common/animation-control/animation-controller.ts b/src/components/src/common/animation-control/animation-controller.ts
index eff9dc18f..f56fe8d4d 100644
--- a/src/components/src/common/animation-control/animation-controller.ts
+++ b/src/components/src/common/animation-control/animation-controller.ts
@@ -85,7 +85,7 @@ function AnimationControllerFactory(): typeof AnimationControllerType {
}
_timer = null;
- _startTime: number = 0;
+ _startTime = 0;
_startOrPauseAnimation() {
const {isAnimating, speed = 1} = this.props;
diff --git a/src/components/src/common/animation-control/animation-speed-slider.tsx b/src/components/src/common/animation-control/animation-speed-slider.tsx
index 4811ef405..b27892164 100644
--- a/src/components/src/common/animation-control/animation-speed-slider.tsx
+++ b/src/components/src/common/animation-control/animation-speed-slider.tsx
@@ -38,7 +38,7 @@ export default function AnimationSpeedSliderFactory(
RangeSlider: ReturnType<typeof RangeSliderFactory>
): ComponentType<AnimationSpeedSliderProps> {
class AnimationSpeedSlider extends Component<AnimationSpeedSliderProps> {
- handleClickOutside = e => {
+ handleClickOutside = () => {
this.props.onHide();
};
diff --git a/src/components/src/common/animation-control/playback-controls.tsx b/src/components/src/common/animation-control/playback-controls.tsx
index 60fb1186e..ab9f3bcd1 100644
--- a/src/components/src/common/animation-control/playback-controls.tsx
+++ b/src/components/src/common/animation-control/playback-controls.tsx
@@ -31,17 +31,19 @@ const StyledAnimationControls = styled.div<StyledAnimationControlsProps>`
const DEFAULT_ICONS = {
/* eslint-disable react/display-name */
- reset: _ => <Reset height="18px" />,
- play: _ => <Play height="18px" />,
- pause: _ => <Pause height="18px" />,
- export: _ => <Save height="18px" />,
+ reset: () => <Reset height="18px" />,
+ play: () => <Play height="18px" />,
+ pause: () => <Pause height="18px" />,
+ export: () => <Save height="18px" />,
/* eslint-enable react/display-name */
speed: Rocket,
animationFree: FreeWindow,
animationIncremental: AnchorWindow
};
-function nop() {}
+function nop() {
+ return;
+}
const DEFAULT_ANIMATE_ITEMS = {
[ANIMATION_WINDOW.free]: {
diff --git a/src/components/src/common/checkbox.tsx b/src/components/src/common/checkbox.tsx
index e290c172f..9ddb2f725 100644
--- a/src/components/src/common/checkbox.tsx
+++ b/src/components/src/common/checkbox.tsx
@@ -6,7 +6,9 @@ import styled from 'styled-components';
import pick from 'lodash.pick';
import classnames from 'classnames';
-function noop() {}
+function noop() {
+ return;
+}
interface StyledSwitchInputProps {
secondary?: boolean;
diff --git a/src/components/src/common/color-legend.tsx b/src/components/src/common/color-legend.tsx
index d7db527b1..31e53aba5 100644
--- a/src/components/src/common/color-legend.tsx
+++ b/src/components/src/common/color-legend.tsx
@@ -82,7 +82,7 @@ interface ColorLegendProps {
domain?: any[] | object;
fieldType?: string | null;
range?: RangeType;
- labelFormat?: Function;
+ labelFormat?: (n: number) => string;
displayLabel?: boolean;
}
@@ -125,9 +125,7 @@ export default class ColorLegend extends Component<ColorLegendProps> {
const scaleFunction = SCALE_FUNC[scaleType];
// color scale can only be quantize, quantile or ordinal
// @ts-ignore fix d3 scale
- const scale = scaleFunction()
- .domain(domain)
- .range(range.colors);
+ const scale = scaleFunction().domain(domain).range(range.colors);
if (scaleType === SCALE_TYPES.ordinal) {
return getOrdinalLegends(scale);
diff --git a/src/components/src/common/data-table/button.tsx b/src/components/src/common/data-table/button.tsx
index 929adb45e..467462de5 100644
--- a/src/components/src/common/data-table/button.tsx
+++ b/src/components/src/common/data-table/button.tsx
@@ -27,7 +27,9 @@ type ButtonProps = {
text?: string;
} & React.ButtonHTMLAttributes<HTMLButtonElement>;
-const noop = () => {};
+const noop = () => {
+ return;
+};
const Button = ({onClick = noop, disabled = false, text = '', children, ...props}: ButtonProps) => (
<StyledButton {...props} onClick={disabled ? undefined : onClick}>
{text || children}
diff --git a/src/components/src/common/data-table/cell-size.ts b/src/components/src/common/data-table/cell-size.ts
index d54312051..90b0faf0f 100644
--- a/src/components/src/common/data-table/cell-size.ts
+++ b/src/components/src/common/data-table/cell-size.ts
@@ -4,7 +4,7 @@
import document from 'global/document';
import {DataContainerInterface, parseFieldValue} from '@kepler.gl/utils';
-const MIN_GHOST_CELL_SIZE: number = 200;
+const MIN_GHOST_CELL_SIZE = 200;
const MIN_CELL_SIZE = 45;
// first column have padding on the left
const EDGE_COLUMN_PADDING = 10;
diff --git a/src/components/src/common/data-table/header-cell.tsx b/src/components/src/common/data-table/header-cell.tsx
index 63bd36521..72180f68d 100644
--- a/src/components/src/common/data-table/header-cell.tsx
+++ b/src/components/src/common/data-table/header-cell.tsx
@@ -120,10 +120,10 @@ const HeaderCellFactory = (FieldToken: React.FC<FieldTokenProps>) => {
const isFormatted = Boolean(colMeta[column]?.displayFormat);
const formatLabels = isFormatted ? getFieldFormatLabels(colMeta[column].type) : [];
const onSortTable = useCallback(() => sortTableColumn(column), [sortTableColumn, column]);
- const onToggleOptionMenu = useCallback(() => toggleMoreOptions(column), [
- toggleMoreOptions,
- column
- ]);
+ const onToggleOptionMenu = useCallback(
+ () => toggleMoreOptions(column),
+ [toggleMoreOptions, column]
+ );
const onPin = useCallback(() => pinTableColumn(column), [pinTableColumn, column]);
const onCopy = useCallback(() => copyTableColumn(column), [copyTableColumn, column]);
const onSetDisplayFormat = useCallback(
diff --git a/src/components/src/common/data-table/index.tsx b/src/components/src/common/data-table/index.tsx
index 790672b85..be0162da4 100644
--- a/src/components/src/common/data-table/index.tsx
+++ b/src/components/src/common/data-table/index.tsx
@@ -185,9 +185,13 @@ export type SortColumn = {
mode?: string;
};
-const columnWidthFunction = (columns, cellSizeCache, ghost?) => ({index}) => {
- return (columns[index] || {}).ghost ? ghost : cellSizeCache[columns[index]] || defaultColumnWidth;
-};
+const columnWidthFunction =
+ (columns, cellSizeCache, ghost?) =>
+ ({index}) => {
+ return (columns[index] || {}).ghost
+ ? ghost
+ : cellSizeCache[columns[index]] || defaultColumnWidth;
+ };
interface GetRowCellProps {
dataContainer: DataContainerInterface;
@@ -284,7 +288,7 @@ interface TableSectionProps {
rowCount: number;
} & Partial<GridProps>;
columnWidth?;
- setGridRef?: Function;
+ setGridRef?: (ref: HTMLDivElement | null) => void;
headerCellRender?;
dataCellRender?;
scrollLeft?: number;
@@ -416,8 +420,8 @@ function DataTableFactory(HeaderCell: ReturnType<typeof HeaderCellFactory>) {
hasCustomScrollBarStyle: true
};
- pinnedGrid = false;
- unpinnedGrid = false;
+ pinnedGrid: HTMLDivElement | null = null;
+ unpinnedGrid: HTMLDivElement | null = null;
state: DataTableState = {
cellSizeCache: {},
@@ -473,7 +477,7 @@ function DataTableFactory(HeaderCell: ReturnType<typeof HeaderCellFactory>) {
propsCache,
pinnedColumns,
unpinnedColumns
- ) as {cellSizeCache: {}; ghost: number | null | undefined};
+ ) as {cellSizeCache: CellSizeCache; ghost: number | null | undefined};
return {
cellSizeCache,
@@ -489,7 +493,7 @@ function DataTableFactory(HeaderCell: ReturnType<typeof HeaderCellFactory>) {
renderDataCell = (columns, isPinned, props: DataTableProps) => {
const getRowCell = this.props.getRowCell ?? defaultGetRowCell;
- return cellInfo => {
+ const DataCellRenderer = cellInfo => {
const {columnIndex, key, style, rowIndex} = cellInfo;
const {dataContainer, colMeta} = props;
const column = columns[columnIndex];
@@ -527,10 +531,11 @@ function DataTableFactory(HeaderCell: ReturnType<typeof HeaderCellFactory>) {
return cell;
};
+ return DataCellRenderer;
};
renderHeaderCell(columns, isPinned, props, toggleMoreOptions, moreOptionsColumn) {
- return cellInfo => (
+ const HeaderCellRenderer = cellInfo => (
<HeaderCell
cellInfo={cellInfo}
key={cellInfo.columnIndex}
@@ -542,6 +547,7 @@ function DataTableFactory(HeaderCell: ReturnType<typeof HeaderCellFactory>) {
moreOptionsColumn={moreOptionsColumn}
/>
);
+ return HeaderCellRenderer;
}
render() {
const {
diff --git a/src/components/src/common/data-table/option-dropdown.tsx b/src/components/src/common/data-table/option-dropdown.tsx
index 0b7d85027..0e24306c6 100644
--- a/src/components/src/common/data-table/option-dropdown.tsx
+++ b/src/components/src/common/data-table/option-dropdown.tsx
@@ -5,7 +5,13 @@ import React, {useCallback, useState} from 'react';
import styled from 'styled-components';
import Portaled from '../portaled';
import DropdownList from '../item-selector/dropdown-list';
-import {SORT_ORDER, TABLE_OPTION, TABLE_OPTION_LIST, TooltipFormat} from '@kepler.gl/constants';
+import {
+ SORT_ORDER,
+ TABLE_OPTION,
+ TABLE_OPTION_LIST,
+ TooltipFormat,
+ TableOption
+} from '@kepler.gl/constants';
import {getFieldFormatLabels} from '@kepler.gl/utils';
import {ColMeta} from '@kepler.gl/types';
import {ArrowDown, ArrowUp, Clipboard, Pin, Cancel, Hash} from '../icons';
@@ -84,7 +90,7 @@ export const FormatterDropdown: React.FC<FormatterDropdownProps> = (
const selectionIndex = formatLabels.findIndex(label => label.format === displayFormat);
const onSelectDisplayFormat = useCallback(
- (result, e) => {
+ result => {
setDisplayFormat(result);
onClose();
},
@@ -97,7 +103,7 @@ export const FormatterDropdown: React.FC<FormatterDropdownProps> = (
<DropdownList
options={formatLabels}
selectionIndex={selectionIndex}
- displayOption={({label}) => label}
+ displayOption={option => (option as TooltipFormat).label}
onOptionSelected={onSelectDisplayFormat}
light
/>
@@ -132,7 +138,7 @@ const OptionDropdown = (props: OptionDropdownProps) => {
setDisplayFormat
} = props;
const [showFormatter, setShowFormatter] = useState(false);
- const onOptionSelected = useCallback(
+ const onOptionSelected: (v: TableOption) => void = useCallback(
({value}) => {
switch (value) {
case TABLE_OPTION.SORT_ASC:
@@ -194,7 +200,7 @@ const OptionDropdown = (props: OptionDropdownProps) => {
<Portaled right={120} top={20} isOpened={isOpened} onClose={onClose}>
<StyledOptionsDropdown className="more-options">
<DropdownList
- displayOption={d => d.display}
+ displayOption={d => (d as TableOption).display}
options={options}
customListItemComponent={ListItem}
onOptionSelected={onOptionSelected}
diff --git a/src/components/src/common/field-selector.tsx b/src/components/src/common/field-selector.tsx
index c949015b9..8da962069 100644
--- a/src/components/src/common/field-selector.tsx
+++ b/src/components/src/common/field-selector.tsx
@@ -98,7 +98,9 @@ interface FieldSelectorFactoryProps {
size?: string;
reorderItems?: (newOrder: any) => void;
}
-
+function noop() {
+ return;
+}
function FieldSelectorFactory(
FieldListItemFactory: ReturnType<typeof FieldListItemFactoryFactory>
): ComponentType<FieldSelectorFactoryProps> {
@@ -107,8 +109,8 @@ function FieldSelectorFactory(
erasable: true,
error: false,
fields: [],
- onSelect: () => {},
- reorderItems: () => {},
+ onSelect: noop,
+ reorderItems: noop,
placement: 'bottom',
value: null,
multiSelect: false,
diff --git a/src/components/src/common/histogram-plot.tsx b/src/components/src/common/histogram-plot.tsx
index b8768e0bf..63fe51075 100644
--- a/src/components/src/common/histogram-plot.tsx
+++ b/src/components/src/common/histogram-plot.tsx
@@ -63,13 +63,7 @@ function HistogramPlotFactory() {
// use 1st for now
const getValue = useMemo(() => d => d[dataId], [dataId]);
- const x = useMemo(
- () =>
- scaleLinear()
- .domain(domain)
- .range([0, width]),
- [domain, width]
- );
+ const x = useMemo(() => scaleLinear().domain(domain).range([0, width]), [domain, width]);
const y = useMemo(
() =>
diff --git a/src/components/src/common/icons/base.tsx b/src/components/src/common/icons/base.tsx
index f0f1e1c89..188d7f8a5 100644
--- a/src/components/src/common/icons/base.tsx
+++ b/src/components/src/common/icons/base.tsx
@@ -8,7 +8,9 @@ const getStyleClassFromColor = (totalColor: number, colors: string[]) =>
.fill(1)
.reduce((accu, c, i) => `${accu}.cr${i + 1} {fill:${colors[i % colors.length]};}`, '');
-const nop = () => {};
+const nop = () => {
+ return;
+};
export type BaseProps = {
/** Set the height of the icon, ex. '16px' */
diff --git a/src/components/src/common/icons/index.tsx b/src/components/src/common/icons/index.tsx
index 3894ccddd..102fb29dc 100644
--- a/src/components/src/common/icons/index.tsx
+++ b/src/components/src/common/icons/index.tsx
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: MIT
// Copyright contributors to the kepler.gl project
-export {default as Base} from './base'
+export {default as Base} from './base';
// eslint-disable-next-line prettier/prettier
export type {BaseProps} from './base'
diff --git a/src/components/src/common/image-preview.tsx b/src/components/src/common/image-preview.tsx
index 42eb9cd27..fbd35cb28 100644
--- a/src/components/src/common/image-preview.tsx
+++ b/src/components/src/common/image-preview.tsx
@@ -64,8 +64,12 @@ interface ImagePreviewProps {
* @param {boolean} [props.showDimension]
*/
const ImagePreview = ({exportImage, width = 400, showDimension = false}: ImagePreviewProps) => {
- const {error, imageDataUri, processing, imageSize: {imageW = 0, imageH = 0} = {}} =
- exportImage || {};
+ const {
+ error,
+ imageDataUri,
+ processing,
+ imageSize: {imageW = 0, imageH = 0} = {}
+ } = exportImage || {};
const imageStyle = {
width: `${width}px`,
diff --git a/src/components/src/common/item-selector/chickleted-input.tsx b/src/components/src/common/item-selector/chickleted-input.tsx
index 08d2c65ff..5a03a8c12 100644
--- a/src/components/src/common/item-selector/chickleted-input.tsx
+++ b/src/components/src/common/item-selector/chickleted-input.tsx
@@ -11,15 +11,16 @@ import {restrictToParentElement} from '@dnd-kit/modifiers';
import Delete from '../icons/delete';
import {FormattedMessage} from '@kepler.gl/localization';
+type Item = string | number | boolean | object | undefined;
interface ChickletedInputProps {
// required properties
onClick: MouseEventHandler<HTMLDivElement>;
- removeItem: Function;
+ removeItem: (item: Item, e: React.MouseEvent<SVGSVGElement, MouseEvent>) => void;
// optional properties
selectedItems?: any[];
disabled?: boolean;
- displayOption?: Function;
+ displayOption?: (item: Item) => string;
focus?: boolean;
error?: boolean;
placeholder?: string;
@@ -91,7 +92,7 @@ const ChickletedInputContainer = styled.div<ChickletedInputContainerProps>`
: props.inputTheme === 'light'
? props.theme.chickletedInputLT
: props.theme.chickletedInput}
-
+
color: ${props =>
props.hasPlaceholder ? props.theme.selectColorPlaceHolder : props.theme.selectColor};
overflow: hidden;
@@ -128,10 +129,8 @@ const ChickletedItem = ({
item,
removeItem,
displayOption,
- CustomChickletComponent,
inputTheme,
disabled,
- itemId,
attributes,
listeners,
setNodeRef,
@@ -155,14 +154,14 @@ const ChickletedInput: React.FC<ChickletedInputProps> = ({
placeholder = '',
removeItem,
reorderItems = d => d,
- displayOption = d => d,
+ displayOption = d => String(d),
inputTheme,
CustomChickletComponent
}) => {
- const selectedItemIds = useMemo(() => selectedItems.map(item => displayOption(item)), [
- displayOption,
- selectedItems
- ]);
+ const selectedItemIds = useMemo(
+ () => selectedItems.map(item => displayOption(item)),
+ [displayOption, selectedItems]
+ );
const handleDragEnd = useCallback(
({active, over}) => {
if (!over) return;
@@ -172,7 +171,7 @@ const ChickletedInput: React.FC<ChickletedInputProps> = ({
reorderItems(arrayMove(selectedItems, oldIndex, newIndex));
}
},
- [selectedItems, displayOption, reorderItems]
+ [selectedItemIds, selectedItems, reorderItems]
);
return (
diff --git a/src/components/src/common/item-selector/dropdown-list.tsx b/src/components/src/common/item-selector/dropdown-list.tsx
index 463864f19..e685bc3de 100644
--- a/src/components/src/common/item-selector/dropdown-list.tsx
+++ b/src/components/src/common/item-selector/dropdown-list.tsx
@@ -18,6 +18,7 @@ export const classList = {
};
const defaultDisplay = d => d;
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
export const ListItem = ({value, displayOption = defaultDisplay, disabled, light}) => {
const displayValue = displayOption(value);
return (
@@ -44,20 +45,22 @@ const DropdownFooterWrapper = styled.div`
height: '0px';
`;
+type Option = string | number | boolean | object | any;
+// TODO: make Option a generic type
interface DropdownListProps {
- options?: any[];
+ options?: Option[];
allowCustomValues?: number;
customClasses?: {listHeader?: string; listItem?: string; results?: string};
customValues?: any[];
customListItemComponent?: ElementType;
customListHeaderComponent?: ElementType;
selectionIndex?: number;
- onOptionSelected?: Function;
- displayOption?: Function;
+ onOptionSelected?: (option: Option, event: React.MouseEvent) => void;
+ displayOption?: (option: Option) => string;
defaultClassNames?: boolean;
areResultsTruncated?: boolean;
resultsTruncatedMessage?: string;
- listItemComponent?: Function;
+ listItemComponent?: ElementType;
light?: boolean;
fixedOptions?: any[];
}
@@ -74,7 +77,9 @@ export default class DropdownList extends Component<DropdownListProps, DropdownL
allowCustomValues: 0,
customValues: [],
displayOption: defaultDisplay,
- onOptionSelected: () => {},
+ onOptionSelected: () => {
+ return;
+ },
defaultClassNames: true,
selectionIndex: null
};
@@ -111,7 +116,7 @@ export default class DropdownList extends Component<DropdownListProps, DropdownL
}
}
- getSnapshotBeforeUpdate(prevProps: DropdownListProps, prevState: DropdownListState) {
+ getSnapshotBeforeUpdate(prevProps: DropdownListProps) {
if (prevProps.options !== this.props.options) {
// check if user searching, reset state.options at the first time
const options = this._getOptions(0);
@@ -121,7 +126,9 @@ export default class DropdownList extends Component<DropdownListProps, DropdownL
}
// prevent console warning: getSnapshotBeforeUpdate() should be used with componentDidUpdate().
- componentDidUpdate(prevProps, prevState, snapshot) {}
+ componentDidUpdate() {
+ return;
+ }
componentWillUnmount() {
if (this.loadingRef.current) {
diff --git a/src/components/src/common/item-selector/item-selector.tsx b/src/components/src/common/item-selector/item-selector.tsx
index c06b3e82a..0d229f8c3 100644
--- a/src/components/src/common/item-selector/item-selector.tsx
+++ b/src/components/src/common/item-selector/item-selector.tsx
@@ -266,9 +266,8 @@ class ItemSelectorUnmemoized extends Component<ItemSelectorProps> {
const {placement = 'bottom'} = this.props;
const {dimensions} = this.state;
- const DropDownWrapperComponent = this.props.DropDownWrapperComponent as React.ComponentType<
- any
- >;
+ const DropDownWrapperComponent = this.props
+ .DropDownWrapperComponent as React.ComponentType<any>;
return (
<Portaled left={0} top={0} isOpened={this.state.showTypeahead} onClose={this._hideTypeahead}>
diff --git a/src/components/src/common/item-selector/typeahead.tsx b/src/components/src/common/item-selector/typeahead.tsx
index 23017cd9e..b1e2212da 100644
--- a/src/components/src/common/item-selector/typeahead.tsx
+++ b/src/components/src/common/item-selector/typeahead.tsx
@@ -111,12 +111,13 @@ function shouldSkipSearch(input, state, showOptionsWhenEmpty) {
return !(showOptionsWhenEmpty && isFocused) && emptyValue;
}
+type Option = string | number | boolean | object | undefined;
interface TypeaheadProps {
name?: string;
customClasses?: any;
resultsTruncatedMessage?: string;
- options?: ReadonlyArray<string | number | boolean | object | undefined>;
- fixedOptions?: ReadonlyArray<string | number | boolean | object> | null;
+ options?: ReadonlyArray<Option>;
+ fixedOptions?: ReadonlyArray<Option> | null;
allowCustomValues?: number;
initialValue?: string;
value?: string;
@@ -131,15 +132,15 @@ interface TypeaheadProps {
onKeyUp?: KeyboardEventHandler<HTMLDivElement>;
onFocus?: (event: React.FocusEvent<HTMLDivElement>) => void;
onBlur?: (event: React.FocusEvent<HTMLInputElement>) => void;
- filterOption?: string | Function;
- searchOptions?: Function;
- displayOption?: string | Function;
- inputDisplayOption?: string | Function;
- formInputOption?: string | Function;
+ filterOption?: string | ((o: Option, s: string) => boolean);
+ searchOptions?: (o: Option, s: string) => boolean;
+ displayOption?: string | ((o: Option) => string);
+ inputDisplayOption?: string | ((o: Option) => string);
+ formInputOption?: string | ((o: Option) => string);
defaultClassNames?: boolean;
customListComponent?: ElementType;
- customListItemComponent?: ElementType | Function;
- customListHeaderComponent?: ElementType | Function | null;
+ customListItemComponent?: ElementType;
+ customListHeaderComponent?: ElementType | null;
showOptionsWhenEmpty?: boolean;
searchable?: boolean;
light?: boolean;
@@ -167,6 +168,9 @@ interface TypeaheadState {
isFocused: boolean;
}
+function noop() {
+ return;
+}
class Typeahead extends Component<TypeaheadProps, TypeaheadState> {
static defaultProps = {
options: [],
@@ -178,13 +182,13 @@ class Typeahead extends Component<TypeaheadProps, TypeaheadState> {
disabled: false,
textarea: false,
inputProps: {},
- onOptionSelected(option) {},
- onChange(event) {},
- onKeyDown(event) {},
- onKeyPress(event) {},
- onKeyUp(event) {},
- onFocus(event) {},
- onBlur(event) {},
+ onOptionSelected: noop,
+ onChange: noop,
+ onKeyDown: noop,
+ onKeyPress: noop,
+ onKeyUp: noop,
+ onFocus: noop,
+ onBlur: noop,
filterOption: null,
searchOptions: null,
inputDisplayOption: null,
diff --git a/src/components/src/common/line-chart.tsx b/src/components/src/common/line-chart.tsx
index d8de7b093..a86f5f8e8 100644
--- a/src/components/src/common/line-chart.tsx
+++ b/src/components/src/common/line-chart.tsx
@@ -112,10 +112,10 @@ function LineChartFactory() {
? [{x: series[0].x, y: yDomain[1], customComponent: () => brushComponent}]
: [];
}, [series, yDomain, brushComponent]);
- const hintFormatter = useMemo(() => datetimeFormatter(timezone)(timeFormat), [
- timezone,
- timeFormat
- ]);
+ const hintFormatter = useMemo(
+ () => datetimeFormatter(timezone)(timeFormat),
+ [timezone, timeFormat]
+ );
return (
<LineChartWrapper style={{marginTop: `${margin.top}px`}}>
diff --git a/src/components/src/common/map-layer-selector.tsx b/src/components/src/common/map-layer-selector.tsx
index 6c8b8e199..e92a6d9b4 100644
--- a/src/components/src/common/map-layer-selector.tsx
+++ b/src/components/src/common/map-layer-selector.tsx
@@ -27,7 +27,7 @@ interface MapLayerSelectorProps {
/** @type {typeof import('./map-layer-selector').default} */
const MapLayerSelector = ({layers, onMapToggleLayer}: MapLayerSelectorProps) => (
<MapLayerSelect className="map-layer-selector">
- {layers.map((layer, index) => (
+ {layers.map(layer => (
<div key={layer.id} className="map-layer-selector__item">
<Checkbox
type="radio"
diff --git a/src/components/src/common/modal.tsx b/src/components/src/common/modal.tsx
index 140e7bd0c..a0cc0227d 100644
--- a/src/components/src/common/modal.tsx
+++ b/src/components/src/common/modal.tsx
@@ -134,6 +134,7 @@ type ModalFooterProps = {
*/
const processDisabledProperty = (props: ModalButtonProps): ModalButtonProps => {
if (!props.disabled) {
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
const {disabled, ...newProps} = props;
return newProps;
}
@@ -190,8 +191,12 @@ export class ModalDialog extends Component<ModalDialogProps> {
static defaultProps = {
footer: false,
close: true,
- onConfirm: (): void => {},
- onCancel: (): void => {},
+ onConfirm: () => {
+ return;
+ },
+ onCancel: () => {
+ return;
+ },
cancelButton: defaultCancelButton,
confirmButton: defaultConfirmButton,
cssStyle: []
diff --git a/src/components/src/common/portaled.tsx b/src/components/src/common/portaled.tsx
index ea2a1746b..05e5acb44 100644
--- a/src/components/src/common/portaled.tsx
+++ b/src/components/src/common/portaled.tsx
@@ -55,7 +55,7 @@ export const getChildPos = ({offsets, rect, childRect, pageOffset, padding}: Get
const pos = {
top: pageOffset.y + rect.top + (topOffset || 0),
...(anchorLeft
- ? {left: pageOffset.x + rect.left + leftOffset!}
+ ? {left: pageOffset.x + rect.left + (leftOffset || 0)}
: {right: window.innerWidth - rect.right - pageOffset.x + (rightOffset || 0)})
};
@@ -112,7 +112,9 @@ const defaultModalStyle = {
const WINDOW_PAD = 40;
-const noop = () => {};
+const noop = () => {
+ return;
+};
type PortaledProps = PropsWithChildren<{
component: ElementType;
@@ -163,7 +165,7 @@ class Portaled extends Component<PortaledProps, PortaledState> {
};
unsubscribe: (() => boolean) | undefined = undefined;
- _unmounted: boolean = false;
+ _unmounted = false;
componentDidMount() {
// relative
diff --git a/src/components/src/common/range-brush.tsx b/src/components/src/common/range-brush.tsx
index 5fe359013..5ee7174cc 100644
--- a/src/components/src/common/range-brush.tsx
+++ b/src/components/src/common/range-brush.tsx
@@ -38,8 +38,9 @@ const getHandlePath = (props: RangeBrushProps) => {
const h = 39;
const w = 4.5;
const y = (props.height - h) / 2;
- return `M${0.5 * x},${y}c${2.5 * x},0,${w * x},2,${w * x},${w}v${h - w * 2}c0,2.5,${-2 *
- x},${w},${-w * x},${w}V${y}z`;
+ return `M${0.5 * x},${y}c${2.5 * x},0,${w * x},2,${w * x},${w}v${h - w * 2}c0,2.5,${
+ -2 * x
+ },${w},${-w * x},${w}V${y}z`;
};
};
@@ -69,8 +70,8 @@ function RangeBrushFactory(): React.ComponentType<RangeBrushProps> {
rootContainer = createRef<SVGGElement>();
- brushing: boolean = false;
- moving: boolean = false;
+ brushing = false;
+ moving = false;
root = this.rootContainer.current ? select(this.rootContainer.current) : undefined;
brush: BrushBehavior<any> | undefined;
@@ -180,7 +181,7 @@ function RangeBrushFactory(): React.ComponentType<RangeBrushProps> {
this._brushed({sourceEvent: {}, selection});
}
- _move(val0: number = 0, val1: number = 0) {
+ _move(val0 = 0, val1 = 0) {
const {
range: [min, max],
width,
@@ -229,7 +230,7 @@ function RangeBrushFactory(): React.ComponentType<RangeBrushProps> {
else this._onBrush(right ? d1 : d0);
};
- _onBrush(val0: number = 0, val1: number = 0) {
+ _onBrush(val0 = 0, val1 = 0) {
const {
isRanged,
value: [currentVal0, currentVal1]
diff --git a/src/components/src/common/range-slider.tsx b/src/components/src/common/range-slider.tsx
index 92abe598d..28963ac93 100644
--- a/src/components/src/common/range-slider.tsx
+++ b/src/components/src/common/range-slider.tsx
@@ -17,7 +17,9 @@ interface SliderInputProps {
flush?: boolean;
inputSize?: string;
}
-
+const noop = () => {
+ return;
+};
const SliderInput = styled(Input)<SliderInputProps>`
width: ${props => props.theme.sliderInputWidth}px;
margin-left: ${props => (props.flush ? 0 : props.inputSize === 'tiny' ? 12 : 18)}px;
@@ -82,7 +84,7 @@ export default function RangeSliderFactory(
sliderHandleWidth: 12,
inputTheme: '',
inputSize: 'small',
- onChange: () => {}
+ onChange: noop
};
static getDerivedStateFromProps(props, state) {
@@ -140,7 +142,7 @@ export default function RangeSliderFactory(
};
_setRangeVal1 = val => {
- const {value0, range, onChange = () => {}} = this.props;
+ const {value0, range, onChange = noop} = this.props;
if (!range) return;
const val1 = Number(val);
onChange([value0, clamp([value0, range[1]], this._roundValToStep(val1))]);
@@ -148,7 +150,7 @@ export default function RangeSliderFactory(
};
_setRangeVal0 = val => {
- const {value1, range, onChange = () => {}} = this.props;
+ const {value1, range, onChange = noop} = this.props;
if (!range) return;
const val0 = Number(val);
onChange([clamp([range[0], value1], this._roundValToStep(val0)), value1]);
@@ -210,7 +212,7 @@ export default function RangeSliderFactory(
histogram,
lineChart,
range,
- onChange = () => {},
+ onChange = noop,
sliderHandleWidth,
step,
timezone,
diff --git a/src/components/src/common/slider/mouse-event.ts b/src/components/src/common/slider/mouse-event.ts
index b429e0099..1cc89a9c4 100644
--- a/src/components/src/common/slider/mouse-event.ts
+++ b/src/components/src/common/slider/mouse-event.ts
@@ -11,7 +11,9 @@ import {
} from 'react';
import {StyleRangeSliderType} from './slider';
-function nope(...args) {}
+function nope() {
+ return;
+}
type MouseEventHandlerProps = {
vertical: boolean;
diff --git a/src/components/src/common/slider/slider-bar-handle.tsx b/src/components/src/common/slider/slider-bar-handle.tsx
index 8b6d732d8..c05716061 100644
--- a/src/components/src/common/slider/slider-bar-handle.tsx
+++ b/src/components/src/common/slider/slider-bar-handle.tsx
@@ -23,7 +23,9 @@ const StyledSlider = styled.div<StyledSliderProps>`
}
`;
-function nope() {}
+function nope() {
+ return;
+}
type SliderBarHandleProps = {
width: number;
diff --git a/src/components/src/common/slider/slider-handle.tsx b/src/components/src/common/slider/slider-handle.tsx
index 15865e229..1a75ebd39 100644
--- a/src/components/src/common/slider/slider-handle.tsx
+++ b/src/components/src/common/slider/slider-handle.tsx
@@ -19,7 +19,7 @@ const StyledSliderHandle = styled.span.attrs(props => ({
position: absolute;
z-index: 10;
${props => (props.vertical ? 'margin-left' : 'margin-top')}: -${props =>
- (props.sliderHandleWidth - props.theme.sliderBarHeight) / 2}px;
+ (props.sliderHandleWidth - props.theme.sliderBarHeight) / 2}px;
height: ${props =>
Number.isFinite(props.sliderHandleWidth)
@@ -139,7 +139,9 @@ export default class SliderHandle extends Component {
left: '50%',
display: true,
vertical: false,
- valueListener: function valueListenerFn() {},
+ valueListener: function valueListenerFn() {
+ return;
+ },
showTooltip: false
};
diff --git a/src/components/src/common/slider/slider.tsx b/src/components/src/common/slider/slider.tsx
index 1b6522b83..cc9ee6694 100644
--- a/src/components/src/common/slider/slider.tsx
+++ b/src/components/src/common/slider/slider.tsx
@@ -9,7 +9,9 @@ import SliderHandle from './slider-handle';
import SliderBarHandle from './slider-bar-handle';
import {normalizeSliderValue, clamp} from '@kepler.gl/utils';
-function noop() {}
+function noop() {
+ return;
+}
interface StyledRangeSliderProps {
vertical?: boolean;
@@ -74,7 +76,7 @@ export default class Slider extends Component<SliderProps> {
showTooltip: false
};
- private anchor: number = 0;
+ private anchor = 0;
public ref: RefObject<typeof SliderWrapper & HTMLDivElement> = createRef<
typeof SliderWrapper & HTMLDivElement
diff --git a/src/components/src/common/time-slider-marker.tsx b/src/components/src/common/time-slider-marker.tsx
index 793c9f3e3..633769c44 100644
--- a/src/components/src/common/time-slider-marker.tsx
+++ b/src/components/src/common/time-slider-marker.tsx
@@ -3,7 +3,6 @@
import React, {useRef, useEffect, useMemo} from 'react';
import moment from 'moment-timezone';
-import PropTypes from 'prop-types';
import {NumberValue, scaleUtc} from 'd3-scale';
import {select} from 'd3-selection';
import {axisBottom} from 'd3-axis';
@@ -98,19 +97,14 @@ export function getXAxis(
if (!Array.isArray(domain) || !domain.every(Number.isFinite)) {
return null;
}
- const scale = scaleUtc()
- .domain(domain)
- .range([0, width]);
+ const scale = scaleUtc().domain(domain).range([0, width]);
if (!scale) {
return null;
}
const ticks = Math.floor(width / (isEnlarged ? MIN_TICK_WIDTH_LARGE : MIN_TICK_WIDTH_SMALL));
const tickFormat = timezone ? getTickFormat(timezone) : null;
- const xAxis = axisBottom(scale)
- .ticks(ticks)
- .tickSize(0)
- .tickPadding(12);
+ const xAxis = axisBottom(scale).ticks(ticks).tickSize(0).tickPadding(12);
if (tickFormat) {
xAxis.tickFormat(tickFormat);
}
@@ -143,12 +137,10 @@ function TimeSliderMarkerFactory() {
timezone
}: TimeSliderMarkerProps) => {
const xAxisRef = useRef(null);
- const xAxis = useMemo(() => getXAxis(domain, width, isEnlarged, timezone), [
- domain,
- width,
- isEnlarged,
- timezone
- ]);
+ const xAxis = useMemo(
+ () => getXAxis(domain, width, isEnlarged, timezone),
+ [domain, width, isEnlarged, timezone]
+ );
useEffect(() => {
updateAxis(xAxisRef, xAxis);
}, [xAxisRef, xAxis]);
@@ -159,11 +151,6 @@ function TimeSliderMarkerFactory() {
);
};
- TimeSliderMarker.propTypes = {
- domain: PropTypes.arrayOf(PropTypes.any).isRequired,
- width: PropTypes.number.isRequired
- };
-
return React.memo(TimeSliderMarker);
}
diff --git a/src/components/src/common/timeline-slider.tsx b/src/components/src/common/timeline-slider.tsx
index faa5ba1e2..958d0e77b 100644
--- a/src/components/src/common/timeline-slider.tsx
+++ b/src/components/src/common/timeline-slider.tsx
@@ -11,7 +11,9 @@ import {DEFAULT_TIME_FORMAT, ANIMATION_WINDOW} from '@kepler.gl/constants';
import {Timeline} from '@kepler.gl/types';
import Slider from './slider/slider';
-function noop() {}
+function noop() {
+ return;
+}
const SLIDER_MARGIN_PALM = 6;
@@ -70,15 +72,8 @@ function TimelineSliderFactory() {
}) => {
const onThrottleUpdate = useMemo(() => throttle(setTimelineValue, 20), [setTimelineValue]);
- const {
- step,
- domain,
- value,
- timeFormat,
- defaultTimeFormat,
- timezone,
- animationWindow
- } = timeline;
+ const {step, domain, value, timeFormat, defaultTimeFormat, timezone, animationWindow} =
+ timeline;
const isRanged = useMemo(
() =>
diff --git a/src/components/src/common/tippy-tooltip.tsx b/src/components/src/common/tippy-tooltip.tsx
index b224bb042..3206fcdba 100644
--- a/src/components/src/common/tippy-tooltip.tsx
+++ b/src/components/src/common/tippy-tooltip.tsx
@@ -18,6 +18,7 @@ const TippyArrow = styled.div`
}
`;
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
const TippyTooltipContent = styled(({children, arrow, isLightTheme, ...props}) => (
<div {...props}>
{children}
diff --git a/src/components/src/connect/keplergl-connect.ts b/src/components/src/connect/keplergl-connect.ts
index 47bcef613..db76bd6b7 100644
--- a/src/components/src/connect/keplergl-connect.ts
+++ b/src/components/src/connect/keplergl-connect.ts
@@ -5,27 +5,32 @@ import {JSXElementConstructor} from 'react';
import {connect as reduxConnect, GetProps, Matching} from 'react-redux';
import withLocalSelector from './with-local-selector';
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
const defaultMapStateToProps = (state, _, __) => state;
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
const defaultMapDispatchToProps = () => (dispatch, _, __) => ({dispatch});
-export const connect = <T extends JSXElementConstructor<Matching<any, GetProps<T>>>>(
- mapStateToProps = defaultMapStateToProps,
- makeMapDispatchToProps = defaultMapDispatchToProps,
- reduxMergeProps?,
- options?
-) => (BaseComponent: T) => {
- const mapDispatchToProps = makeMapDispatchToProps();
- const reduxMapState = (state, props) => mapStateToProps(props.selector(state), props, state);
+export const connect =
+ <T extends JSXElementConstructor<Matching<any, GetProps<T>>>>(
+ mapStateToProps = defaultMapStateToProps,
+ makeMapDispatchToProps = defaultMapDispatchToProps,
+ reduxMergeProps?,
+ options?
+ ) =>
+ (BaseComponent: T) => {
+ const mapDispatchToProps = makeMapDispatchToProps();
+ const reduxMapState = (state, props) => mapStateToProps(props.selector(state), props, state);
- const reduxMapDispatch = (dispatch, props) => mapDispatchToProps(props.dispatch, props, dispatch);
+ const reduxMapDispatch = (dispatch, props) =>
+ mapDispatchToProps(props.dispatch, props, dispatch);
- const ReduxComponent = reduxConnect(
- reduxMapState,
- reduxMapDispatch,
- reduxMergeProps,
- options
- )(BaseComponent);
+ const ReduxComponent = reduxConnect(
+ reduxMapState,
+ reduxMapDispatch,
+ reduxMergeProps,
+ options
+ )(BaseComponent);
- // save selector to context so it can be accessed by its children
- return withLocalSelector(ReduxComponent);
-};
+ // save selector to context so it can be accessed by its children
+ return withLocalSelector(ReduxComponent);
+ };
diff --git a/src/components/src/connect/with-local-selector.tsx b/src/components/src/connect/with-local-selector.tsx
index c79d01442..b190e7dae 100644
--- a/src/components/src/connect/with-local-selector.tsx
+++ b/src/components/src/connect/with-local-selector.tsx
@@ -17,15 +17,15 @@ const mergeSelectors = (parentSelector, childSelector) => state =>
// it will be stored in the context and passed down to child components,
// as well as prop to the given component
-const withLocalSelector = <P extends {}>(
+const withLocalSelector = <P extends object>(
ParentComponent: React.ComponentType<P>
): React.ComponentType<P & {selector: (...args: any[]) => KeplerGlState}> => {
class WithConnectSelector extends Component<P & {selector: (...args: any[]) => KeplerGlState}> {
static contextType = KeplerGlContext;
selectorFromContext = (_, ctx) => (ctx.selector ? ctx.selector : identity);
- selectorFromProps = (props, _) => (props.selector ? props.selector : identity);
- idFromProps = (props, _) => props.id;
+ selectorFromProps = props => (props.selector ? props.selector : identity);
+ idFromProps = props => props.id;
computedSelector = createSelector(
this.selectorFromContext,
this.selectorFromProps,
diff --git a/src/components/src/context.tsx b/src/components/src/context.tsx
index 4f4d993e4..f513ebc82 100644
--- a/src/components/src/context.tsx
+++ b/src/components/src/context.tsx
@@ -41,7 +41,9 @@ export const FeatureFlagsContextProvider = (
*/
export const CloudProviderContext = createContext<CloudProviderContextType>({
provider: null,
- setProvider: () => {},
+ setProvider: () => {
+ return;
+ },
cloudProviders: []
});
diff --git a/src/components/src/dnd-context.tsx b/src/components/src/dnd-context.tsx
index 9893a184e..59cae3cf4 100644
--- a/src/components/src/dnd-context.tsx
+++ b/src/components/src/dnd-context.tsx
@@ -70,10 +70,11 @@ function DndContextFactory(
const DndContext = ({children, visState}: DndContextProps) => {
const {datasets, layerOrder, layers, effects, effectOrder, splitMaps} = visState;
- const {activeLayer, onDragStart: onLayerDragStart, onDragEnd: onLayerDragEnd} = useDndLayers(
- layers,
- layerOrder
- );
+ const {
+ activeLayer,
+ onDragStart: onLayerDragStart,
+ onDragEnd: onLayerDragEnd
+ } = useDndLayers(layers, layerOrder);
const {onDragStart: onEffectDragStart, onDragEnd: onEffectDragEnd} = useDndEffects(
effects,
effectOrder
diff --git a/src/components/src/editor/editor.tsx b/src/components/src/editor/editor.tsx
index 340d671a4..e1a35b233 100644
--- a/src/components/src/editor/editor.tsx
+++ b/src/components/src/editor/editor.tsx
@@ -29,7 +29,7 @@ const StyledWrapper = styled.div`
position: relative;
`;
-const editorLayerFilter = (layer: Layer) => EDITOR_AVAILABLE_LAYERS.includes(layer.type!);
+const editorLayerFilter = (layer: Layer) => EDITOR_AVAILABLE_LAYERS.includes(layer.type || '');
EditorFactory.deps = [FeatureActionPanelFactory];
@@ -207,7 +207,7 @@ export default function EditorFactory(
}
}
- const Editor = (React.memo(EditorUnmemoized) as unknown) as typeof EditorUnmemoized;
+ const Editor = React.memo(EditorUnmemoized) as unknown as typeof EditorUnmemoized;
Editor.displayName = 'Editor';
return Editor;
}
diff --git a/src/components/src/effects/effect-configurator.tsx b/src/components/src/effects/effect-configurator.tsx
index 1881d9029..382865f49 100644
--- a/src/components/src/effects/effect-configurator.tsx
+++ b/src/components/src/effects/effect-configurator.tsx
@@ -160,238 +160,248 @@ export default function EffectConfiguratorFactory(
RangeSlider: ReturnType<typeof RangeSliderFactory>,
EffectTimeConfigurator: ReturnType<typeof EffectTimeConfiguratorFactory>
): React.FC<EffectConfiguratorProps> {
- const EffectConfigurator = ({
+ const ShadowEffectConfigurator: React.FC<EffectConfiguratorProps> = ({
effect,
updateEffectConfig
- }: EffectConfiguratorProps & {intl: IntlShape}) => {
- const renderShadowEffectConfigurator = useCallback(() => {
- const {parameters} = effect;
-
- const sliderProps = useMemo(() => {
- const propNames = ['shadowIntensity', 'ambientLightIntensity', 'sunLightIntensity'];
- return propNames.map(propName => {
- return {
- value1: parameters[propName],
- range: [0, 1],
- value0: 0,
- onChange: (value: number[], event?: Event | null) => {
- updateEffectConfig(event, effect.id, {parameters: {[propName]: value[1]}});
- }
- };
+ }) => {
+ const {parameters, id} = effect;
+
+ const sliderProps = useMemo(() => {
+ const propNames = ['shadowIntensity', 'ambientLightIntensity', 'sunLightIntensity'];
+ return propNames.map(propName => {
+ return {
+ value1: parameters[propName],
+ range: [0, 1],
+ value0: 0,
+ onChange: (value: number[], event?: Event | null) => {
+ updateEffectConfig(event, id, {parameters: {[propName]: value[1]}});
+ }
+ };
+ });
+ }, [id, parameters, updateEffectConfig]);
+
+ const onTimeParametersChanged = useCallback(
+ parameters => {
+ updateEffectConfig(null, id, {
+ parameters: {
+ ...(parameters.timestamp ? {timestamp: parameters.timestamp} : null),
+ ...(parameters.timezone ? {timezone: parameters.timezone} : null),
+ ...(parameters.timeMode ? {timeMode: parameters.timeMode} : null)
+ }
});
- }, [effect.id, parameters, updateEffectConfig]);
-
- const onTimeParametersChanged = useCallback(
- parameters => {
- updateEffectConfig(null, effect.id, {
- parameters: {
- ...(parameters.timestamp ? {timestamp: parameters.timestamp} : null),
- ...(parameters.timezone ? {timezone: parameters.timezone} : null),
- ...(parameters.timeMode ? {timeMode: parameters.timeMode} : null)
+ },
+ [id, updateEffectConfig]
+ );
+
+ const colorPickerProps = useMemo(() => {
+ const propNames = ['ambientLightColor', 'sunLightColor', 'shadowColor'];
+ return propNames.map(propName => {
+ return {
+ colorSets: [
+ {
+ selectedColor: parameters[propName],
+ setColor: v => updateEffectConfig(null, id, {parameters: {[propName]: v}})
}
- });
- },
- [effect.id, updateEffectConfig]
- );
-
- const colorPickerProps = useMemo(() => {
- const propNames = ['ambientLightColor', 'sunLightColor', 'shadowColor'];
- return propNames.map(propName => {
- return {
- colorSets: [
- {
- selectedColor: parameters[propName],
- setColor: v => updateEffectConfig(null, effect.id, {parameters: {[propName]: v}})
- }
- ]
- };
- });
- }, [effect.id, parameters, updateEffectConfig]);
-
- return (
- <StyledEffectConfigurator key={effect.id}>
- <PanelLabelWrapper>
- <SectionTitle>{'Date & Time'}</SectionTitle>
- </PanelLabelWrapper>
- <EffectTimeConfigurator
- timestamp={parameters.timestamp}
- timezone={parameters.timezone}
- timeMode={parameters.timeMode}
- onChange={onTimeParametersChanged}
+ ]
+ };
+ });
+ }, [id, parameters, updateEffectConfig]);
+
+ return (
+ <StyledEffectConfigurator key={effect.id}>
+ <PanelLabelWrapper>
+ <SectionTitle>{'Date & Time'}</SectionTitle>
+ </PanelLabelWrapper>
+ <EffectTimeConfigurator
+ timestamp={parameters.timestamp}
+ timezone={parameters.timezone}
+ timeMode={parameters.timeMode}
+ onChange={onTimeParametersChanged}
+ />
+
+ <StyledVerticalSeparator />
+
+ <StyledWrapper marginBottom={0}>
+ <SectionTitle>{'Shadow'}</SectionTitle>
+ </StyledWrapper>
+ <StyledWrapper marginBottom={16}>
+ <CompactColorPicker
+ label={'Color'}
+ color={colorPickerProps[2].colorSets[0].selectedColor}
+ onSetColor={colorPickerProps[2].colorSets[0].setColor}
+ Icon={ArrowDownSmall}
+ />
+ <StyledConfigSection>
+ <SectionSubTitle>Intensity</SectionSubTitle>
+ <StyleSliderWrapper>
+ <RangeSlider {...COMMON_SLIDER_PROPS} {...sliderProps[0]} />
+ </StyleSliderWrapper>
+ </StyledConfigSection>
+ </StyledWrapper>
+
+ <StyledWrapper marginBottom={0}>
+ <SectionTitle>{'Ambient light'}</SectionTitle>
+ </StyledWrapper>
+ <StyledWrapper marginBottom={16}>
+ <CompactColorPicker
+ label={'Color'}
+ color={colorPickerProps[0].colorSets[0].selectedColor}
+ onSetColor={colorPickerProps[0].colorSets[0].setColor}
+ Icon={ArrowDownSmall}
+ />
+ <StyledConfigSection>
+ <SectionSubTitle>Intensity</SectionSubTitle>
+ <StyleSliderWrapper>
+ <RangeSlider {...COMMON_SLIDER_PROPS} {...sliderProps[1]} />
+ </StyleSliderWrapper>
+ </StyledConfigSection>
+ </StyledWrapper>
+
+ <StyledWrapper marginBottom={0}>
+ <SectionTitle>{'Sun light'}</SectionTitle>
+ </StyledWrapper>
+ <StyledWrapper marginBottom={0}>
+ <CompactColorPicker
+ label={'Color'}
+ color={colorPickerProps[1].colorSets[0].selectedColor}
+ onSetColor={colorPickerProps[1].colorSets[0].setColor}
+ Icon={ArrowDownSmall}
/>
+ <StyledConfigSection>
+ <SectionSubTitle>Intensity</SectionSubTitle>
+ <StyleSliderWrapper>
+ <RangeSlider {...COMMON_SLIDER_PROPS} {...sliderProps[2]} />
+ </StyleSliderWrapper>
+ </StyledConfigSection>
+ </StyledWrapper>
+ </StyledEffectConfigurator>
+ );
+ };
+ const defaultUniforms = {};
- <StyledVerticalSeparator />
-
- <StyledWrapper marginBottom={0}>
- <SectionTitle>{'Shadow'}</SectionTitle>
- </StyledWrapper>
- <StyledWrapper marginBottom={16}>
- <CompactColorPicker
- label={'Color'}
- color={colorPickerProps[2].colorSets[0].selectedColor}
- onSetColor={colorPickerProps[2].colorSets[0].setColor}
- Icon={ArrowDownSmall}
- />
- <StyledConfigSection>
- <SectionSubTitle>Intensity</SectionSubTitle>
- <StyleSliderWrapper>
- <RangeSlider {...COMMON_SLIDER_PROPS} {...sliderProps[0]} />
- </StyleSliderWrapper>
- </StyledConfigSection>
- </StyledWrapper>
-
- <StyledWrapper marginBottom={0}>
- <SectionTitle>{'Ambient light'}</SectionTitle>
- </StyledWrapper>
- <StyledWrapper marginBottom={16}>
- <CompactColorPicker
- label={'Color'}
- color={colorPickerProps[0].colorSets[0].selectedColor}
- onSetColor={colorPickerProps[0].colorSets[0].setColor}
- Icon={ArrowDownSmall}
- />
- <StyledConfigSection>
- <SectionSubTitle>Intensity</SectionSubTitle>
- <StyleSliderWrapper>
- <RangeSlider {...COMMON_SLIDER_PROPS} {...sliderProps[1]} />
- </StyleSliderWrapper>
- </StyledConfigSection>
- </StyledWrapper>
-
- <StyledWrapper marginBottom={0}>
- <SectionTitle>{'Sun light'}</SectionTitle>
- </StyledWrapper>
- <StyledWrapper marginBottom={0}>
- <CompactColorPicker
- label={'Color'}
- color={colorPickerProps[1].colorSets[0].selectedColor}
- onSetColor={colorPickerProps[1].colorSets[0].setColor}
- Icon={ArrowDownSmall}
- />
- <StyledConfigSection>
- <SectionSubTitle>Intensity</SectionSubTitle>
- <StyleSliderWrapper>
- <RangeSlider {...COMMON_SLIDER_PROPS} {...sliderProps[2]} />
- </StyleSliderWrapper>
- </StyledConfigSection>
- </StyledWrapper>
- </StyledEffectConfigurator>
- );
- }, [effect, effect.parameters, updateEffectConfig]);
-
- const renderPostProcessingEffectConfigurator = useCallback(() => {
- const uniforms = effect.deckEffect?.module.uniforms || {};
- const parameterDescriptions = effect.getParameterDescriptions();
-
- const flatParameterDescriptions = useMemo(() => {
- return parameterDescriptions.reduce((acc, description) => {
- if (description.type === 'array') {
- // split arrays of controls into a separate controls for each component
- if (Array.isArray(description.defaultValue)) {
- description.defaultValue.forEach((_, index) => {
- acc.push({
- ...description,
- index,
- label: description.label?.[index]
- });
+ const PostProcessingEffectConfigurator: React.FC<EffectConfiguratorProps> = ({
+ effect,
+ updateEffectConfig
+ }) => {
+ const uniforms = effect.deckEffect?.module.uniforms || defaultUniforms;
+ const parameterDescriptions = effect.getParameterDescriptions();
+ const {parameters, id} = effect;
+ const flatParameterDescriptions = useMemo(() => {
+ return parameterDescriptions.reduce((acc, description) => {
+ if (description.type === 'array') {
+ // split arrays of controls into a separate controls for each component
+ if (Array.isArray(description.defaultValue)) {
+ description.defaultValue.forEach((_, index) => {
+ acc.push({
+ ...description,
+ index,
+ label: description.label?.[index]
});
- }
- } else {
- acc.push(description);
+ });
}
+ } else {
+ acc.push(description);
+ }
- return acc;
- }, [] as EffectParameterDescriptionFlattened[]);
- }, [parameterDescriptions]);
+ return acc;
+ }, [] as EffectParameterDescriptionFlattened[]);
+ }, [parameterDescriptions]);
- const controls = useMemo(() => {
- return flatParameterDescriptions.map(desc => {
- const paramName = desc.name;
+ const controls = useMemo(() => {
+ return flatParameterDescriptions.map(desc => {
+ const paramName = desc.name;
- const uniform = uniforms[desc.name];
- if ((!uniform && uniform !== 0) || uniform.private) {
- return null;
- }
+ const uniform = uniforms[desc.name];
+ if ((!uniform && uniform !== 0) || uniform.private) {
+ return null;
+ }
- const prevValue = effect.parameters[paramName];
-
- const label = desc.label === false ? false : desc.label || desc.name;
-
- // the uniform is [number, number] array
- if (uniform.length === 2) {
- return {
- label,
- value1: prevValue[desc.index || 0] || 0,
- range: [0, 1],
- value0: 0,
- onChange: (newValue: number[], event) => {
- updateEffectConfig(event, effect.id, {
- parameters: {
- [paramName]:
- desc.index === 0 ? [newValue[1], prevValue[1]] : [prevValue[0], newValue[1]]
- }
- });
- }
- };
- }
- // the uniform is a plain number without any description
- else if (isNumber(uniform)) {
- return {
- label,
- value1: prevValue ?? 0,
- range: [desc.min ?? 0, desc.max ?? 500],
- value0: desc.min ?? 0,
- onChange: (newValue: number[], event) => {
- updateEffectConfig(event, effect.id, {parameters: {[paramName]: newValue[1]}});
- }
- };
- }
- // the uniform description is {value: 0, min: 0, max: 1, ...}
- else if (isNumber(uniform.value)) {
- return {
- label,
- value1: prevValue || 0,
- range: [
- desc.min ?? uniform.min ?? uniform.softMin ?? 0,
- desc.max ?? uniform.max ?? uniform.softMax ?? 1
- ],
- value0: desc.min ?? uniform.min ?? uniform.softMin ?? 0,
- onChange: (newValue: number[], event) => {
- updateEffectConfig(event, effect.id, {parameters: {[paramName]: newValue[1]}});
- }
- };
- }
+ const prevValue = parameters[paramName];
- // ignore everything else for now
- return null;
- });
- }, [flatParameterDescriptions, effect, effect.parameters, updateEffectConfig]);
-
- return (
- <StyledEffectConfigurator key={effect.id}>
- {flatParameterDescriptions.map((desc, parameterIndex) => {
- const control = controls[parameterIndex];
- if (!control) {
- return null;
+ const label = desc.label === false ? false : desc.label || desc.name;
+
+ // the uniform is [number, number] array
+ if (uniform.length === 2) {
+ return {
+ label,
+ value1: prevValue[desc.index || 0] || 0,
+ range: [0, 1],
+ value0: 0,
+ onChange: (newValue: number[], event) => {
+ updateEffectConfig(event, id, {
+ parameters: {
+ [paramName]:
+ desc.index === 0 ? [newValue[1], prevValue[1]] : [prevValue[0], newValue[1]]
+ }
+ });
+ }
+ };
+ }
+ // the uniform is a plain number without any description
+ else if (isNumber(uniform)) {
+ return {
+ label,
+ value1: prevValue ?? 0,
+ range: [desc.min ?? 0, desc.max ?? 500],
+ value0: desc.min ?? 0,
+ onChange: (newValue: number[], event) => {
+ updateEffectConfig(event, id, {parameters: {[paramName]: newValue[1]}});
}
+ };
+ }
+ // the uniform description is {value: 0, min: 0, max: 1, ...}
+ else if (isNumber(uniform.value)) {
+ return {
+ label,
+ value1: prevValue || 0,
+ range: [
+ desc.min ?? uniform.min ?? uniform.softMin ?? 0,
+ desc.max ?? uniform.max ?? uniform.softMax ?? 1
+ ],
+ value0: desc.min ?? uniform.min ?? uniform.softMin ?? 0,
+ onChange: (newValue: number[], event) => {
+ updateEffectConfig(event, id, {parameters: {[paramName]: newValue[1]}});
+ }
+ };
+ }
+
+ // ignore everything else for now
+ return null;
+ });
+ }, [flatParameterDescriptions, id, parameters, updateEffectConfig, uniforms]);
+
+ return (
+ <StyledEffectConfigurator key={effect.id}>
+ {flatParameterDescriptions.map((desc, parameterIndex) => {
+ const control = controls[parameterIndex];
+ if (!control) {
+ return null;
+ }
- return (
- <RegularOuterWrapper key={`${effect.id}-${parameterIndex}`}>
- {control.label ? (
- <RegularSectionTitleWrapper>{control.label}</RegularSectionTitleWrapper>
- ) : null}
- <RegularSliderWrapper>
- <RangeSlider key={parameterIndex} {...COMMON_SLIDER_PROPS} {...control} />
- </RegularSliderWrapper>
- </RegularOuterWrapper>
- );
- })}
- </StyledEffectConfigurator>
- );
- }, [effect, effect.parameters, updateEffectConfig]);
-
- if (effect.type === LIGHT_AND_SHADOW_EFFECT.type) return renderShadowEffectConfigurator();
- return renderPostProcessingEffectConfigurator();
+ return (
+ <RegularOuterWrapper key={`${effect.id}-${parameterIndex}`}>
+ {control.label ? (
+ <RegularSectionTitleWrapper>{control.label}</RegularSectionTitleWrapper>
+ ) : null}
+ <RegularSliderWrapper>
+ <RangeSlider key={parameterIndex} {...COMMON_SLIDER_PROPS} {...control} />
+ </RegularSliderWrapper>
+ </RegularOuterWrapper>
+ );
+ })}
+ </StyledEffectConfigurator>
+ );
+ };
+
+ const EffectConfigurator = ({
+ effect,
+ updateEffectConfig
+ }: EffectConfiguratorProps & {intl: IntlShape}) => {
+ return effect.type === LIGHT_AND_SHADOW_EFFECT.type ? (
+ <ShadowEffectConfigurator effect={effect} updateEffectConfig={updateEffectConfig} />
+ ) : (
+ <PostProcessingEffectConfigurator effect={effect} updateEffectConfig={updateEffectConfig} />
+ );
};
return injectIntl(EffectConfigurator);
diff --git a/src/components/src/effects/effect-list.tsx b/src/components/src/effects/effect-list.tsx
index 57a397a9f..f935d4eec 100644
--- a/src/components/src/effects/effect-list.tsx
+++ b/src/components/src/effects/effect-list.tsx
@@ -9,15 +9,26 @@ import {useSortable, SortableContext, verticalListSortingStrategy} from '@dnd-ki
import {dataTestIds, SORTABLE_EFFECT_TYPE, SORTABLE_EFFECT_PANEL_TYPE} from '@kepler.gl/constants';
import {findById} from '@kepler.gl/utils';
-import {VisStateActions} from '@kepler.gl/actions';
import {Effect} from '@kepler.gl/types';
+import {
+ addEffect,
+ updateEffect,
+ removeEffect,
+ reorderEffect,
+ ActionHandler
+} from '@kepler.gl/actions';
import EffectPanelFactory from './effect-panel';
export type EffectListProps = {
effects: Effect[];
effectOrder: string[];
- visStateActions: typeof VisStateActions;
+ visStateActions: {
+ addEffect: ActionHandler<typeof addEffect>;
+ updateEffect: ActionHandler<typeof updateEffect>;
+ removeEffect: ActionHandler<typeof removeEffect>;
+ reorderEffect: ActionHandler<typeof reorderEffect>;
+ };
isSortable: boolean;
};
diff --git a/src/components/src/effects/effect-manager.tsx b/src/components/src/effects/effect-manager.tsx
index fd6a9a260..0f3822cb8 100644
--- a/src/components/src/effects/effect-manager.tsx
+++ b/src/components/src/effects/effect-manager.tsx
@@ -5,9 +5,14 @@ import React, {useMemo, useState, useCallback} from 'react';
import styled from 'styled-components';
import {injectIntl, IntlShape} from 'react-intl';
-import {addEffect, updateEffect, removeEffect, reorderEffect} from '@kepler.gl/actions';
+import {
+ addEffect,
+ updateEffect,
+ removeEffect,
+ reorderEffect,
+ ActionHandler
+} from '@kepler.gl/actions';
import {LIGHT_AND_SHADOW_EFFECT, EFFECT_DESCRIPTIONS} from '@kepler.gl/constants';
-import {VisStateActions} from '@kepler.gl/actions';
import {Effect} from '@kepler.gl/types';
import {withState} from '../injector';
@@ -16,12 +21,18 @@ import EffectListFactory from './effect-list';
import EffectTypeSelectorFactory from './effect-type-selector';
export type EffectManagerState = {
- visStateActions: typeof VisStateActions;
+ visStateActions: {
+ addEffect: ActionHandler<typeof addEffect>;
+ updateEffect: ActionHandler<typeof updateEffect>;
+ removeEffect: ActionHandler<typeof removeEffect>;
+ reorderEffect: ActionHandler<typeof reorderEffect>;
+ };
effects: Effect[];
effectOrder: string[];
children: React.ReactNode;
};
-export type EffectManagerProps = {};
+export type EffectManagerProps = EffectManagerWithIntlProp & EffectManagerState;
+
export type EffectManagerWithIntlProp = {intl: IntlShape};
const StyledEffectPanelContainer = styled.div`
@@ -75,7 +86,7 @@ function EffectManagerFactory(
): React.FC<EffectManagerProps> {
const EffectManager = (props: EffectManagerWithIntlProp & EffectManagerState) => {
const {intl, visStateActions, effects, effectOrder, children} = props;
-
+ const {addEffect: visStateAddEffect} = visStateActions;
const [typeSelectorOpened, setTypeSelectorOpened] = useState(false);
// Prevent shadow effect from being added multiple times
@@ -92,9 +103,12 @@ function EffectManagerFactory(
});
}, [effects]);
- const onAddEffect = useCallback(type => {
- visStateActions.addEffect({type});
- }, []);
+ const onAddEffect = useCallback(
+ type => {
+ visStateAddEffect({type});
+ },
+ [visStateAddEffect]
+ );
const onTypeSelectOpen = useCallback(() => {
setTypeSelectorOpened(true);
@@ -147,7 +161,7 @@ function EffectManagerFactory(
{
visStateActions: {addEffect, updateEffect, removeEffect, reorderEffect}
}
- )(injectIntl(EffectManager)) as React.FC<{}>;
+ )(injectIntl(EffectManager)) as React.FC<EffectManagerProps>;
}
export default EffectManagerFactory;
diff --git a/src/components/src/effects/effect-panel-header.tsx b/src/components/src/effects/effect-panel-header.tsx
index a48858ef3..2346e01b8 100644
--- a/src/components/src/effects/effect-panel-header.tsx
+++ b/src/components/src/effects/effect-panel-header.tsx
@@ -220,7 +220,15 @@ export function EffectPanelHeaderActionSectionFactory(
icon: actionIcons.enableConfig
}
],
- [actionItems, isEnabled, onRemoveEffect, onToggleEnabled, actionIcons]
+ [
+ actionItems,
+ actionIcons,
+ isEnabled,
+ isConfigActive,
+ onRemoveEffect,
+ onToggleEnabled,
+ onToggleEnableConfig
+ ]
);
return (
@@ -228,7 +236,7 @@ export function EffectPanelHeaderActionSectionFactory(
<StyledPanelHeaderHiddenActions isConfigActive={isConfigActive}>
{effectActionItems
.filter((item: ActionItem) => Boolean(item.isHidden))
- .map((item: ActionItem, i) => (
+ .map((item: ActionItem) => (
<PanelHeaderAction
key={item.key}
className={`effect__${item.key}`}
@@ -243,7 +251,7 @@ export function EffectPanelHeaderActionSectionFactory(
</StyledPanelHeaderHiddenActions>
{effectActionItems
.filter((item: ActionItem) => !item.isHidden)
- .map((item: ActionItem, i) => (
+ .map((item: ActionItem) => (
<PanelHeaderAction
key={item.key}
className={classnames(`effect__${item.key}`, item.classNames)}
diff --git a/src/components/src/effects/effect-time-configurator.tsx b/src/components/src/effects/effect-time-configurator.tsx
index a14172ff9..9091c2ee0 100644
--- a/src/components/src/effects/effect-time-configurator.tsx
+++ b/src/components/src/effects/effect-time-configurator.tsx
@@ -120,7 +120,7 @@ const StyledDatePicker = styled.div`
type WithIconWrapperProps = {width?: string};
const WithIconWrapper = styled.div<WithIconWrapperProps>`
position: relative;
- ${props => (props.width ? 'width: ' + props.width : '')}
+ ${props => (props.width ? `width: ${props.width}` : '')}
`;
const StyledExtraIcon = styled.div`
@@ -190,31 +190,26 @@ export default function EffectTimeConfiguratorFactory(
return moment.tz.names().includes(_timezone) ? _timezone : DEFAULT_TIMEZONE;
}, [_timezone]);
- const [
- datePickerDate,
- fullDate,
- formattedTime,
- formattedDate,
- dayTimeProgress
- ] = useMemo(() => {
- const currentMoment = moment.tz(timestamp, timezone);
-
- // Slider value from 0 to 1
- const dayProgress = getDayRatio(currentMoment);
-
- // Date picker always renders Date in local timezone
- const date = new Date();
- date.setFullYear(currentMoment.year(), currentMoment.month(), currentMoment.date());
- date.setHours(0, 0, 0, 0);
-
- return [
- date,
- currentMoment.toDate(),
- currentMoment.format('HH:mm'),
- currentMoment.format('YYYY-MM-DD'),
- dayProgress
- ];
- }, [timestamp, timezone]);
+ const [datePickerDate, fullDate, formattedTime, formattedDate, dayTimeProgress] =
+ useMemo(() => {
+ const currentMoment = moment.tz(timestamp, timezone);
+
+ // Slider value from 0 to 1
+ const dayProgress = getDayRatio(currentMoment);
+
+ // Date picker always renders Date in local timezone
+ const date = new Date();
+ date.setFullYear(currentMoment.year(), currentMoment.month(), currentMoment.date());
+ date.setHours(0, 0, 0, 0);
+
+ return [
+ date,
+ currentMoment.toDate(),
+ currentMoment.format('HH:mm'),
+ currentMoment.format('YYYY-MM-DD'),
+ dayProgress
+ ];
+ }, [timestamp, timezone]);
const timeSliderConfig = useMemo(() => {
const times = SunCalc.getTimes(fullDate, mapState.latitude, mapState.longitude);
@@ -235,8 +230,8 @@ export default function EffectTimeConfiguratorFactory(
const hours = clamp([0, 23], Math.floor(value[1] * 24));
const minutes = clamp([0, 59], Math.floor((value[1] * 24 - hours) * 60));
- const newFormattedTime = `${hours < 10 ? '0' + hours : hours}:${
- minutes < 10 ? '0' + minutes : minutes
+ const newFormattedTime = `${hours < 10 ? `0${hours}` : hours}:${
+ minutes < 10 ? `0${minutes}` : minutes
}`;
const newTimestamp = getTimestamp(formattedDate, newFormattedTime, timezone);
onTimeParametersChanged({timestamp: newTimestamp});
@@ -311,7 +306,7 @@ export default function EffectTimeConfiguratorFactory(
</SliderWrapper>
<StyledWrapper hidden={disableDateTimePick} marginBottom={2}>
- <TextBlock width="32px"></TextBlock>
+ <TextBlock width="32px" />
<TextBlock width="110px">
<FormattedMessage id={'effectManager.date'} />
</TextBlock>
diff --git a/src/components/src/effects/effect-time-slider.tsx b/src/components/src/effects/effect-time-slider.tsx
index 7cb76dee3..1a1c15bcd 100644
--- a/src/components/src/effects/effect-time-slider.tsx
+++ b/src/components/src/effects/effect-time-slider.tsx
@@ -151,7 +151,8 @@ const MODES = {
* Generate rendering blocks for each part of the day.
*/
export function getUIBlocks(config: EffectTimeSliderConfig): UIBlock[] {
- let {dawn, sunrise, sunset, dusk} = config;
+ const {dawn} = config;
+ let {sunrise, sunset, dusk} = config;
if (dawn > sunrise) sunrise += 1;
if (dawn > sunset) sunset += 1;
if (dawn > dusk) dusk += 1;
@@ -209,6 +210,7 @@ export function getUIBlocks(config: EffectTimeSliderConfig): UIBlock[] {
updatedBlocks.sort((a, b) => a.start - b.start);
const existingBottomBlocks = {};
+ // eslint-disable-next-line complexity
updatedBlocks.forEach(block => {
block.width = (block.end - block.start) * 100;
block.center = block.start * 100 + block.width / 2;
diff --git a/src/components/src/effects/effect-type-list-item.tsx b/src/components/src/effects/effect-type-list-item.tsx
index 535cc6669..8bf483e77 100644
--- a/src/components/src/effects/effect-type-list-item.tsx
+++ b/src/components/src/effects/effect-type-list-item.tsx
@@ -10,7 +10,7 @@ import {FormattedMessage} from '@kepler.gl/localization';
import {Add} from '../common/icons';
-export const DUMMY_ITEM_ID: string = 'dummy';
+export const DUMMY_ITEM_ID = 'dummy';
export type EffectTypeListItemProps = {
value: {type: string; name: string};
diff --git a/src/components/src/filter-animation-controller.tsx b/src/components/src/filter-animation-controller.tsx
index be6989a1a..9163dd238 100644
--- a/src/components/src/filter-animation-controller.tsx
+++ b/src/components/src/filter-animation-controller.tsx
@@ -34,20 +34,22 @@ function FilterAnimationControllerFactory(
}) => {
const intervalBins = useMemo(() => getIntervalBins(filter), [filter]);
- const steps = useMemo(() => (intervalBins ? intervalBins.map(x => x.x0) : null), [
- intervalBins
- ]);
+ const steps = useMemo(
+ () => (intervalBins ? intervalBins.map(x => x.x0) : null),
+ [intervalBins]
+ );
const updateAnimation = useCallback(
value => {
switch (filter.animationWindow) {
- case ANIMATION_WINDOW.interval:
+ case ANIMATION_WINDOW.interval: {
const idx = value[1];
setFilterAnimationTime(filterIdx, 'value', [
intervalBins[idx].x0,
intervalBins[idx].x1 - 1
]);
break;
+ }
default:
setFilterAnimationTime(filterIdx, 'value', value);
break;
diff --git a/src/components/src/filters/filter-panels/filter-panel-with-field-select.tsx b/src/components/src/filters/filter-panels/filter-panel-with-field-select.tsx
index c3d4b6628..8763bfda6 100644
--- a/src/components/src/filters/filter-panels/filter-panel-with-field-select.tsx
+++ b/src/components/src/filters/filter-panels/filter-panel-with-field-select.tsx
@@ -35,15 +35,15 @@ function FieldPanelWithFieldSelectFactory(
setFilter,
panelActions = []
}) => {
- const onFieldSelector = useCallback(field => setFilter(idx, 'name', field.name), [
- idx,
- setFilter
- ]);
+ const onFieldSelector = useCallback(
+ field => setFilter(idx, 'name', field.name),
+ [idx, setFilter]
+ );
- const onSourceDataSelector = useCallback(value => setFilter(idx, 'dataId', [value]), [
- idx,
- setFilter
- ]);
+ const onSourceDataSelector = useCallback(
+ value => setFilter(idx, 'dataId', [value]),
+ [idx, setFilter]
+ );
const fieldValue = useMemo(
() => (Array.isArray(filter.name) ? filter.name[0] : filter.name),
diff --git a/src/components/src/filters/filter-panels/new-filter-panel.tsx b/src/components/src/filters/filter-panels/new-filter-panel.tsx
index a65a70cf4..4ec5031e5 100644
--- a/src/components/src/filters/filter-panels/new-filter-panel.tsx
+++ b/src/components/src/filters/filter-panels/new-filter-panel.tsx
@@ -32,15 +32,15 @@ function NewFilterPanelFactory(
) {
const NewFilterPanel: FilterPanelComponent<FilterBase<LineChart>> = React.memo(
({idx, filter, datasets, allAvailableFields, setFilter, removeFilter}) => {
- const onFieldSelector = useCallback(field => setFilter(idx, 'name', field.name), [
- idx,
- setFilter
- ]);
+ const onFieldSelector = useCallback(
+ field => setFilter(idx, 'name', field.name),
+ [idx, setFilter]
+ );
- const onSourceDataSelector = useCallback(value => setFilter(idx, 'dataId', value), [
- idx,
- setFilter
- ]);
+ const onSourceDataSelector = useCallback(
+ value => setFilter(idx, 'dataId', value),
+ [idx, setFilter]
+ );
const dataset: KeplerTable = datasets[filter.dataId[0]];
const supportedFields = useMemo(
diff --git a/src/components/src/filters/filter-panels/polygon-filter-panel.tsx b/src/components/src/filters/filter-panels/polygon-filter-panel.tsx
index 7804e4416..7d7328b0f 100644
--- a/src/components/src/filters/filter-panels/polygon-filter-panel.tsx
+++ b/src/components/src/filters/filter-panels/polygon-filter-panel.tsx
@@ -27,10 +27,10 @@ function PolygonFilterPanelFactory(
) {
const PolygonFilterPanel: PolygonFilterPanelComponent = React.memo(
({idx, datasets, layers, filter, removeFilter, setFilter, toggleFilterFeature}) => {
- const filterDatasets: KeplerTable[] = useMemo(() => filter.dataId.map(d => datasets[d]), [
- filter,
- datasets
- ]);
+ const filterDatasets: KeplerTable[] = useMemo(
+ () => filter.dataId.map(d => datasets[d]),
+ [filter, datasets]
+ );
const onSetLayers = useCallback(value => setFilter(idx, 'layerId', value), [setFilter, idx]);
diff --git a/src/components/src/filters/filter-panels/types.ts b/src/components/src/filters/filter-panels/types.ts
index ff43ea56f..ac57b3f50 100644
--- a/src/components/src/filters/filter-panels/types.ts
+++ b/src/components/src/filters/filter-panels/types.ts
@@ -38,6 +38,5 @@ export interface FilterPanelWithFieldSelectProps extends FilterPanelProps {
export type FilterPanelComponent<F> = FunctionComponent<FilterPanelProps<F>>;
export type PolygonFilterPanelComponent = FunctionComponent<PolygonFilterPanelProps>;
export type TimeRangeFilterPanelComponent = FunctionComponent<TimeRangeFilterPanelProps>;
-export type FilterPanelWithFieldSelectComponent = FunctionComponent<
- FilterPanelWithFieldSelectProps
->;
+export type FilterPanelWithFieldSelectComponent =
+ FunctionComponent<FilterPanelWithFieldSelectProps>;
diff --git a/src/components/src/filters/polygon-filter.tsx b/src/components/src/filters/polygon-filter.tsx
index ca137ee11..956a1d1ef 100644
--- a/src/components/src/filters/polygon-filter.tsx
+++ b/src/components/src/filters/polygon-filter.tsx
@@ -21,10 +21,10 @@ function PolygonFilterFactory() {
[setLayers]
);
- const selectedLayers = useMemo(() => layers.filter(l => filter.layerId?.includes(l.id)), [
- filter,
- layers
- ]);
+ const selectedLayers = useMemo(
+ () => layers.filter(l => filter.layerId?.includes(l.id)),
+ [filter, layers]
+ );
const availableLayers = useMemo(() => {
// remove already added layers and filter out non point layers
diff --git a/src/components/src/filters/time-widget-top.tsx b/src/components/src/filters/time-widget-top.tsx
index 6f9c3be70..f65b3b127 100644
--- a/src/components/src/filters/time-widget-top.tsx
+++ b/src/components/src/filters/time-widget-top.tsx
@@ -101,10 +101,10 @@ function TimeWidgetTopFactory(FieldSelector: ReturnType<typeof FieldSelectorFact
),
[datasets, filter.dataId]
);
- const _setFilterPlotYAxis = useCallback(value => setFilterPlot(index, {yAxis: value}), [
- setFilterPlot,
- index
- ]);
+ const _setFilterPlotYAxis = useCallback(
+ value => setFilterPlot(index, {yAxis: value}),
+ [setFilterPlot, index]
+ );
return (
<TopSectionWrapper>
diff --git a/src/components/src/filters/time-widget.tsx b/src/components/src/filters/time-widget.tsx
index 8fc530817..d3d2360b5 100644
--- a/src/components/src/filters/time-widget.tsx
+++ b/src/components/src/filters/time-widget.tsx
@@ -39,10 +39,10 @@ function TimeWidgetFactory(
}: TimeWidgetProps) => {
const [isMinified, setMinified] = useState(false);
- const _updateAnimationSpeed = useCallback(speed => updateAnimationSpeed(index, speed), [
- updateAnimationSpeed,
- index
- ]);
+ const _updateAnimationSpeed = useCallback(
+ speed => updateAnimationSpeed(index, speed),
+ [updateAnimationSpeed, index]
+ );
const _toggleAnimation = useCallback(() => toggleAnimation(index), [toggleAnimation, index]);
@@ -53,10 +53,10 @@ function TimeWidgetFactory(
[setFilterAnimationWindow, filter.id]
);
- const timeSliderOnChange = useCallback(value => setFilterAnimationTime(index, 'value', value), [
- setFilterAnimationTime,
- index
- ]);
+ const timeSliderOnChange = useCallback(
+ value => setFilterAnimationTime(index, 'value', value),
+ [setFilterAnimationTime, index]
+ );
return (
<TimeBottomWidgetInner className="bottom-widget--inner">
diff --git a/src/components/src/geocoder-panel.tsx b/src/components/src/geocoder-panel.tsx
index dbba01115..4c6ea04c9 100644
--- a/src/components/src/geocoder-panel.tsx
+++ b/src/components/src/geocoder-panel.tsx
@@ -5,10 +5,8 @@ import React, {Component, ComponentType} from 'react';
import styled from 'styled-components';
import classnames from 'classnames';
import {processRowObject} from '@kepler.gl/processors';
-import {FlyToInterpolator} from '@deck.gl/core';
+import {FlyToInterpolator} from '@deck.gl/core/typed';
import {getCenterAndZoomFromBounds} from '@kepler.gl/utils';
-
-import Geocoder, {Result} from './geocoder/geocoder';
import {
GEOCODER_DATASET_NAME,
GEOCODER_LAYER_ID,
@@ -16,7 +14,11 @@ import {
GEOCODER_ICON_COLOR,
GEOCODER_ICON_SIZE
} from '@kepler.gl/constants';
-import {MapState, UiState, Viewport} from '@kepler.gl/types';
+import {AddDataToMapOptions, MapState, ProtoDataset, UiState, Viewport} from '@kepler.gl/types';
+import {ActionHandler, removeDataset, updateMap, updateVisData} from '@kepler.gl/actions';
+
+import Geocoder, {Result} from './geocoder/geocoder';
+import {MapViewState} from '@deck.gl/core/typed';
const ICON_LAYER = {
id: GEOCODER_LAYER_ID,
@@ -70,17 +72,21 @@ const StyledGeocoderPanel = styled.div<StyledGeocoderPanelProps>`
z-index: 100;
`;
-function generateGeocoderDataset(lat, lon, text) {
+function generateGeocoderDataset(lat: number, lon: number, text?: string): ProtoDataset | null {
+ const data = processRowObject([
+ {
+ lt: lat,
+ ln: lon,
+ icon: 'place',
+ text
+ }
+ ]);
+ if (!data) {
+ return null;
+ }
+
return {
- data: processRowObject([
- {
- lt: lat,
- ln: lon,
- icon: 'place',
- text
- }
- ]),
- id: GEOCODER_DATASET_NAME,
+ data,
info: {
hidden: true,
id: GEOCODER_DATASET_NAME,
@@ -93,9 +99,17 @@ function isValid(key) {
return /pk\..*\..*/.test(key);
}
-export function getUpdateVisDataPayload(lat, lon, text) {
+export function getUpdateVisDataPayload(
+ lat: number,
+ lon: number,
+ text?: string
+): [ProtoDataset[], AddDataToMapOptions] | null {
+ const dataset = generateGeocoderDataset(lat, lon, text);
+ if (!dataset) {
+ return null;
+ }
return [
- [generateGeocoderDataset(lat, lon, text)],
+ [dataset],
{
keepExistingConfig: true
}
@@ -107,14 +121,13 @@ interface GeocoderPanelProps {
mapState: MapState;
uiState: UiState;
mapboxApiAccessToken: string;
- updateVisData: Function;
- removeDataset: Function;
- updateMap: Function;
+ updateVisData: ActionHandler<typeof updateVisData>;
+ removeDataset: ActionHandler<typeof removeDataset>;
+ updateMap: ActionHandler<typeof updateMap>;
layerOrder: string[];
- transitionDuration?: number;
+ transitionDuration?: MapViewState['transitionDuration'];
width?: number;
- appWidth: number;
className?: string;
index: number;
unsyncedViewports: boolean;
@@ -130,6 +143,7 @@ export default function GeocoderPanelFactory(): ComponentType<GeocoderPanelProps
this.props.removeDataset(GEOCODER_DATASET_NAME);
}
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
onSelected = (viewport: Viewport | null = null, geoItem: Result) => {
const {
center: [lon, lat],
@@ -138,11 +152,12 @@ export default function GeocoderPanelFactory(): ComponentType<GeocoderPanelProps
} = geoItem;
const {layerOrder} = this.props;
- this.removeGeocoderDataset();
- this.props.updateVisData(
- ...getUpdateVisDataPayload(lat, lon, text),
- generateConfig(layerOrder)
- );
+ const updateVisDataPayload = getUpdateVisDataPayload(lat, lon, text);
+ if (updateVisDataPayload) {
+ this.removeGeocoderDataset();
+ this.props.updateVisData(...updateVisDataPayload, generateConfig(layerOrder));
+ }
+
const bounds = bbox || [
lon - GEOCODER_GEO_OFFSET,
lat - GEOCODER_GEO_OFFSET,
@@ -180,14 +195,8 @@ export default function GeocoderPanelFactory(): ComponentType<GeocoderPanelProps
};
render() {
- const {
- className,
- isGeocoderEnabled,
- mapboxApiAccessToken,
- width,
- index,
- unsyncedViewports
- } = this.props;
+ const {className, isGeocoderEnabled, mapboxApiAccessToken, width, index, unsyncedViewports} =
+ this.props;
return (
<StyledGeocoderPanel
className={classnames('geocoder-panel', className)}
diff --git a/src/components/src/geocoder/geocoder.tsx b/src/components/src/geocoder/geocoder.tsx
index eccd10fba..b2abc736f 100644
--- a/src/components/src/geocoder/geocoder.tsx
+++ b/src/components/src/geocoder/geocoder.tsx
@@ -144,9 +144,10 @@ const GeoCoder: React.FC<GeocoderProps & IntlProps> = ({
const [results, setResults] = useState(initialResults);
const [selectedIndex, setSelectedIndex] = useState(0);
- const client = useMemo(() => geocoderService({accessToken: mapboxApiAccessToken}), [
- mapboxApiAccessToken
- ]);
+ const client = useMemo(
+ () => geocoderService({accessToken: mapboxApiAccessToken}),
+ [mapboxApiAccessToken]
+ );
const onChange = useCallback(
event => {
@@ -154,6 +155,7 @@ const GeoCoder: React.FC<GeocoderProps & IntlProps> = ({
setInputValue(queryString);
const resultCoordinates = testForCoordinates(queryString);
if (resultCoordinates[0]) {
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
const [_, latitude, longitude] = resultCoordinates;
setResults([{center: [latitude, longitude], place_name: queryString}]);
} else {
diff --git a/src/components/src/hooks/use-cloud-list-provider.tsx b/src/components/src/hooks/use-cloud-list-provider.tsx
index e19adb04c..bec856a08 100644
--- a/src/components/src/hooks/use-cloud-list-provider.tsx
+++ b/src/components/src/hooks/use-cloud-list-provider.tsx
@@ -23,10 +23,10 @@ export const CloudListProvider: React.FC<CloudListProviderProps> = ({children, p
const value = useMemo(
() => ({
provider: currentCloudProvider,
- setProvider: setProvider,
+ setProvider,
cloudProviders: cloudProviders.current
}),
- [currentCloudProvider, setCurrentCloudProvider]
+ [currentCloudProvider, setProvider]
);
return <CloudProviderContext.Provider value={value}>{children}</CloudProviderContext.Provider>;
diff --git a/src/components/src/hooks/use-dnd-effects.tsx b/src/components/src/hooks/use-dnd-effects.tsx
index 5b6fbfecd..fff2c0897 100644
--- a/src/components/src/hooks/use-dnd-effects.tsx
+++ b/src/components/src/hooks/use-dnd-effects.tsx
@@ -21,7 +21,10 @@ const useDndEffects: (effects: Effect[], effectOrder: string[]) => DndEffectsHoo
effectOrder
) => {
const dispatch = useDispatch();
- const [activeEffect, setActiveEffect]: [activeEffect: Effect | undefined, setActiveEffect: (effect: Effect | undefined) => void] = useState();
+ const [activeEffect, setActiveEffect]: [
+ Effect | undefined,
+ (effect: Effect | undefined) => void
+ ] = useState();
const onEffectDragStart = useCallback(
event => {
const {active} = event;
diff --git a/src/components/src/hooks/use-dnd-layers.tsx b/src/components/src/hooks/use-dnd-layers.tsx
index dc06e154d..262a5c3be 100644
--- a/src/components/src/hooks/use-dnd-layers.tsx
+++ b/src/components/src/hooks/use-dnd-layers.tsx
@@ -19,10 +19,16 @@ type DndEffectsHook = {
onDragEnd: (event: DragEndEvent) => void;
};
-const useDndLayers: (layers: Layer[], layerOrder: string[]) => DndEffectsHook = (layers, layerOrder) => {
+const useDndLayers: (layers: Layer[], layerOrder: string[]) => DndEffectsHook = (
+ layers,
+ layerOrder
+) => {
const dispatch = useDispatch();
- const [activeLayer, setActiveLayer]: [activeEffect: Layer | undefined, setActiveEffect: (effect: Layer | undefined) => void] = useState();
+ const [activeLayer, setActiveLayer]: [
+ activeEffect: Layer | undefined,
+ setActiveEffect: (effect: Layer | undefined) => void
+ ] = useState();
const onDragStart = useCallback(
event => {
@@ -52,15 +58,17 @@ const useDndLayers: (layers: Layer[], layerOrder: string[]) => DndEffectsHook =
switch (overType) {
// moving layers into maps
- case DROPPABLE_MAP_CONTAINER_TYPE:
+ case DROPPABLE_MAP_CONTAINER_TYPE: {
const mapIndex = over.data.current?.index ?? 0;
dispatch(toggleLayerForMap(mapIndex, activeLayerId));
break;
+ }
// swaping layers
- case SORTABLE_LAYER_TYPE:
+ case SORTABLE_LAYER_TYPE: {
const newLayerOrder = reorderLayerOrder(layerOrder, activeLayerId, over.id);
dispatch(reorderLayer(newLayerOrder));
break;
+ }
// moving layers within side panel
case SORTABLE_SIDE_PANEL_TYPE:
// move layer to the end of the list
diff --git a/src/components/src/index.ts b/src/components/src/index.ts
index 87de9d30a..ea605d572 100644
--- a/src/components/src/index.ts
+++ b/src/components/src/index.ts
@@ -25,10 +25,23 @@ import {
import {appInjector} from './container';
// Components
-export {default as KeplerGl, default, injectComponents, ContainerFactory, ERROR_MSG} from './container';
+export {
+ default as KeplerGl,
+ default,
+ injectComponents,
+ ContainerFactory,
+ ERROR_MSG
+} from './container';
// factories
-export {default as KeplerGlFactory, DEFAULT_KEPLER_GL_PROPS, getVisibleDatasets, makeGetActionCreators, mapFieldsSelector, plotContainerSelector} from './kepler-gl';
+export {
+ default as KeplerGlFactory,
+ DEFAULT_KEPLER_GL_PROPS,
+ getVisibleDatasets,
+ makeGetActionCreators,
+ mapFieldsSelector,
+ plotContainerSelector
+} from './kepler-gl';
export {default as SidePanelFactory} from './side-panel';
export {default as PanelTitleFactory} from './side-panel/panel-title';
export {default as MapContainerFactory, Attribution} from './map-container';
@@ -58,14 +71,19 @@ export {default as LayerManagerFactory, LayerBlendingSelector} from './side-pane
export {ColorSelectorInput, ColorBlock} from './side-panel/layer-panel/color-selector';
export {default as CustomSelector} from './side-panel/layer-panel/color-selector';
export {default as ColorPalette} from './side-panel/layer-panel/color-palette';
-export {default as ColorRangeSelector, PaletteConfig, ColorPaletteGroup, ALL_TYPES} from './side-panel/layer-panel/color-range-selector';
+export {
+ default as ColorRangeSelector,
+ PaletteConfig,
+ ColorPaletteGroup,
+ ALL_TYPES
+} from './side-panel/layer-panel/color-range-selector';
export {default as LayerPanelFactory} from './side-panel/layer-panel/layer-panel';
export {default as SingleColorPalette} from './side-panel/layer-panel/single-color-palette';
export {
default as LayerConfiguratorFactory,
getLayerConfiguratorProps,
getLayerDataset,
- getVisConfiguratorProps,
+ getVisConfiguratorProps
} from './side-panel/layer-panel/layer-configurator';
export {default as TextLabelPanelFactory} from './side-panel/layer-panel/text-label-panel';
@@ -133,7 +151,11 @@ export {default as MapControlToolbarFactory} from './map/map-control-toolbar';
// // modal factories
export {default as ModalDialogFactory} from './modals/modal-dialog';
export {default as DeleteDatasetModalFactory} from './modals/delete-data-modal';
-export {default as DataTableModalFactory, DatasetTabs, DatasetModalTab} from './modals/data-table-modal';
+export {
+ default as DataTableModalFactory,
+ DatasetTabs,
+ DatasetModalTab
+} from './modals/data-table-modal';
export {default as LoadDataModalFactory} from './modals/load-data-modal';
export {default as SaveMapModalFactory} from './modals/save-map-modal';
export {default as StatusPanel} from './modals/status-panel';
@@ -166,7 +188,12 @@ export {default as ImagePreview} from './common/image-preview';
export {default as HistogramPlotFactory} from './common/histogram-plot';
export {default as LineChartFactory} from './common/line-chart';
export {default as RangeBrushFactory} from './common/range-brush';
-export {default as TimeSliderMarkerFactory, getTickFormat, getXAxis, updateAxis} from './common/time-slider-marker';
+export {
+ default as TimeSliderMarkerFactory,
+ getTickFormat,
+ getXAxis,
+ updateAxis
+} from './common/time-slider-marker';
export {default as TimeRangeSliderTimeTitleFactory} from './common/time-range-slider-time-title';
export {default as IconButton} from './common/icon-button';
// // Filters factory
@@ -183,14 +210,21 @@ export {default as RangeFilterFactory} from './filters/range-filter';
// // Editor Factory
export {default as EditorFactory} from './editor/editor';
-export {default as FeatureActionPanelFactory, PureFeatureActionPanelFactory} from './editor/feature-action-panel';
+export {
+ default as FeatureActionPanelFactory,
+ PureFeatureActionPanelFactory
+} from './editor/feature-action-panel';
// Injector
export {injector, provideRecipesToInjector, withState} from './injector';
// Common Components
export {default as CloudTile} from './modals/cloud-tile';
-export {default as FileUploadFactory, FileUpload, WarningMsg} from './common/file-uploader/file-upload';
+export {
+ default as FileUploadFactory,
+ FileUpload,
+ WarningMsg
+} from './common/file-uploader/file-upload';
export {default as FileDrop} from './common/file-uploader/file-drop';
export {default as UploadButton} from './common/file-uploader/upload-button';
export {default as DatasetLabel} from './common/dataset-label';
@@ -198,7 +232,11 @@ export {default as Accessor} from './common/item-selector/accessor';
export {default as ChickletedInput, ChickletButton} from './common/item-selector/chickleted-input';
export {default as ItemSelector} from './common/item-selector/item-selector';
export {default as Typeahead} from './common/item-selector/typeahead';
-export {default as DropdownList, ListItem, classList as dropdownListClassList} from './common/item-selector/dropdown-list';
+export {
+ default as DropdownList,
+ ListItem,
+ classList as dropdownListClassList
+} from './common/item-selector/dropdown-list';
export {default as FieldSelectorFactory} from './common/field-selector';
export {default as Modal, ModalFooter, ModalTitle} from './common/modal';
export {default as AppLogo} from './common/logo';
@@ -218,7 +256,10 @@ export {default as SliderHandle} from './common/slider/slider-handle';
export {default as SliderBarHandle} from './common/slider/slider-bar-handle';
export {default as ActionPanel, ActionPanelItem} from './common/action-panel';
export {default as HeaderCellFactory} from './common/data-table/header-cell';
-export {default as DataTableConfigFactory, NumberFormatConfig} from './common/data-table/display-format';
+export {
+ default as DataTableConfigFactory,
+ NumberFormatConfig
+} from './common/data-table/display-format';
export {default as DataTableFactory} from './common/data-table';
export {default as CanvasHack} from './common/data-table/canvas';
export {default as OptionDropdown, FormatterDropdown} from './common/data-table/option-dropdown';
@@ -231,7 +272,11 @@ export {default as TippyTooltip} from './common/tippy-tooltip';
// side pane components
export {default as LayerTypeSelectorFactory} from './side-panel/layer-panel/layer-type-selector';
export {default as LayerTypeDropdownListFactory} from './side-panel/layer-panel/layer-type-dropdown-list';
-export {ConfigGroupCollapsibleContent, StyledConfigGroupHeader, LayerConfigGroupLabelFactory} from './side-panel/layer-panel/layer-config-group';
+export {
+ ConfigGroupCollapsibleContent,
+ StyledConfigGroupHeader,
+ LayerConfigGroupLabelFactory
+} from './side-panel/layer-panel/layer-config-group';
export {default as ColumnSelectorFactory} from './side-panel/layer-panel/column-selector';
export {default as StyledDropdownSelect} from './common/item-selector/item-selector';
export {
@@ -269,19 +314,33 @@ export type {SourceDataCatalogProps} from './side-panel/common/source-data-catal
export type {DatasetInfoProps} from './side-panel/common/dataset-info';
export type {DatasetTagProps} from './side-panel/common/dataset-tag';
export type {CustomPanelsProps} from './side-panel/custom-panel';
-export type {LayerTypeListItemProps, LayerTypeListItemType} from './side-panel/layer-panel/layer-type-list-item';
+export type {
+ LayerTypeListItemProps,
+ LayerTypeListItemType
+} from './side-panel/layer-panel/layer-type-list-item';
export type {LayerGroupColorPickerProps} from './side-panel/map-style-panel/map-layer-group-color-picker';
export type {MapLegendPanelProps, MapLegendPanelFactoryDeps} from './map/map-legend-panel';
-export type {OptionDropdownProps, FormatterDropdownProps} from './common/data-table/option-dropdown';
+export type {
+ OptionDropdownProps,
+ FormatterDropdownProps
+} from './common/data-table/option-dropdown';
export type {LayerListProps, LayerListFactoryDeps} from './side-panel/layer-panel/layer-list';
export type {MapContainerProps} from './map-container';
export type {MapControlProps} from './map/map-control';
export type {MapDrawPanelProps} from './map/map-draw-panel';
export type {PanelHeaderProps} from './side-panel/panel-header';
-export type {LayerLabelEditorProps, LayerTitleSectionProps, LayerPanelHeaderProps, LayerPanelHeaderActionSectionProps} from './side-panel/layer-panel/layer-panel-header';
+export type {
+ LayerLabelEditorProps,
+ LayerTitleSectionProps,
+ LayerPanelHeaderProps,
+ LayerPanelHeaderActionSectionProps
+} from './side-panel/layer-panel/layer-panel-header';
export type {FilterPanelHeaderProps} from './side-panel/filter-panel/filter-panel-header';
export type {LayerTypeOption} from './side-panel/layer-panel/layer-type-dropdown-list';
-export type {LayerConfigGroupLabelProps, LayerConfigGroupProps} from './side-panel/layer-panel/layer-config-group';
+export type {
+ LayerConfigGroupLabelProps,
+ LayerConfigGroupProps
+} from './side-panel/layer-panel/layer-config-group';
export type {FilterManagerProps} from './side-panel/filter-manager';
export type {PanelMeta} from './side-panel/common/types';
export type {SideBarProps} from './side-panel/side-bar';
@@ -377,4 +436,3 @@ export {default as useFeatureFlags} from './hooks/use-feature-flags';
export {default as useDndLayers} from './hooks/use-dnd-layers';
export {default as useDndEffects} from './hooks/use-dnd-effects';
export {CloudListProvider, useCloudListProvider} from './hooks/use-cloud-list-provider';
-
diff --git a/src/components/src/injector.tsx b/src/components/src/injector.tsx
index 2caf845e0..1b0d2f73d 100644
--- a/src/components/src/injector.tsx
+++ b/src/components/src/injector.tsx
@@ -125,7 +125,7 @@ export function typeCheckRecipe(recipe) {
}
export interface WithState<RootState> {
- <TStateProps = {}, TDispatchProps = {}, TOwnProps = {}, State = RootState>(
+ <TStateProps = object, TDispatchProps = object, TOwnProps = object, State = RootState>(
lenses: any[],
mapStateToProps: MapStateToPropsParam<TStateProps, TOwnProps, State>,
mapDispatchToProps?: MapDispatchToPropsParam<TDispatchProps, TOwnProps>
diff --git a/src/components/src/kepler-gl.tsx b/src/components/src/kepler-gl.tsx
index 6fdd13a4c..e4f97b547 100644
--- a/src/components/src/kepler-gl.tsx
+++ b/src/components/src/kepler-gl.tsx
@@ -136,7 +136,7 @@ export const mapStateSelector = (props: any, index: number): any => {
props.mapState;
};
-export const mapFieldsSelector = (props: KeplerGLProps, index: number = 0) => ({
+export const mapFieldsSelector = (props: KeplerGLProps, index = 0) => ({
getMapboxRef: props.getMapboxRef,
mapboxApiAccessToken: props.mapboxApiAccessToken,
mapboxApiUrl: props.mapboxApiUrl ? props.mapboxApiUrl : DEFAULT_KEPLER_GL_PROPS.mapboxApiUrl,
@@ -169,7 +169,7 @@ export const mapFieldsSelector = (props: KeplerGLProps, index: number = 0) => ({
export function getVisibleDatasets(datasets) {
// We don't want Geocoder dataset to be present in SidePanel dataset list
- return filterObjectByPredicate(datasets, (key, value) => key !== GEOCODER_DATASET_NAME);
+ return filterObjectByPredicate(datasets, key => key !== GEOCODER_DATASET_NAME);
}
export const sidePanelSelector = (props: KeplerGLProps, availableProviders, filteredDatasets) => ({
@@ -595,7 +595,7 @@ export function mapStateToProps(state: KeplerGlState, props: KeplerGLProps) {
const defaultUserActions = {};
-const getDispatch = (dispatch, props) => dispatch;
+const getDispatch = dispatch => dispatch;
const getUserActions = (dispatch, props) => props.actions || defaultUserActions;
/** @type {() => import('reselect').OutputParametricSelector<any, any, any, any>} */
@@ -640,7 +640,10 @@ function makeMapDispatchToProps() {
function mergeActions(actions, userActions) {
const overrides = {};
for (const key in userActions) {
- if (userActions.hasOwnProperty(key) && actions.hasOwnProperty(key)) {
+ if (
+ Object.prototype.hasOwnProperty.call(userActions, key) &&
+ Object.prototype.hasOwnProperty.call(actions, key)
+ ) {
overrides[key] = userActions[key];
}
}
diff --git a/src/components/src/map-container.tsx b/src/components/src/map-container.tsx
index 8eff9cb51..2ed0abade 100644
--- a/src/components/src/map-container.tsx
+++ b/src/components/src/map-container.tsx
@@ -122,13 +122,15 @@ const StyledMap = styled(StyledMapContainer)<StyledMapContainerProps>(
const MAPBOXGL_STYLE_UPDATE = 'style.load';
const MAPBOXGL_RENDER = 'render';
-const nop = () => {};
+const nop = () => {
+ return;
+};
const MapLibreLogo = () => (
<div className="attrition-logo">
Basemap by:
<a
- style={{marginLeft: "5px"}}
+ style={{marginLeft: '5px'}}
className="maplibregl-ctrl-logo"
target="_blank"
rel="noopener noreferrer"
@@ -277,9 +279,8 @@ export interface MapContainerProps {
primary?: boolean; // primary one will be reporting its size to appState
readOnly?: boolean;
isExport?: boolean;
- onMapToggleLayer?: Function;
- onMapStyleLoaded?: Function;
- onMapRender?: Function;
+ onMapStyleLoaded?: (map: maplibregl.Map | null) => void;
+ onMapRender?: (map: maplibregl.Map | null) => void;
getMapboxRef?: (mapbox?: MapRef | null, index?: number) => void;
index?: number;
deleteMapLabels?: (containerId: string, layerId: string) => void;
@@ -837,7 +838,7 @@ export default function MapContainerFactory(
{...extraDeckParams}
onHover={
isInteractive
- ? (data, event) => {
+ ? data => {
const res = EditorLayerUtils.onHover(data, {
editorMenuActive,
editor,
@@ -845,7 +846,7 @@ export default function MapContainerFactory(
});
if (res) return;
- this._onLayerHoverDebounced(data, index, event);
+ this._onLayerHoverDebounced(data, index);
}
: null
}
@@ -923,7 +924,7 @@ export default function MapContainerFactory(
this._onViewportChangePropagateDebounced();
};
- _onLayerHoverDebounced = debounce((data, index, event) => {
+ _onLayerHoverDebounced = debounce((data, index) => {
this.props.visStateActions.onLayerHover(data, index);
}, DEBOUNCE_MOUSE_MOVE_PROPAGATE);
diff --git a/src/components/src/map-view-state-context.tsx b/src/components/src/map-view-state-context.tsx
index 9cd07bb56..77f95e431 100644
--- a/src/components/src/map-view-state-context.tsx
+++ b/src/components/src/map-view-state-context.tsx
@@ -11,12 +11,14 @@ import {MapState} from '@kepler.gl/types';
export type MapViewStateContextType = {
getInternalViewState: (index?: number) => MapViewState;
- setInternalViewState: (viewState: MapViewState, index?: number) => void;
+ setInternalViewState: (viewState?: MapViewState, index?: number) => void;
};
export const MapViewStateContext: React.Context<MapViewStateContextType> = createContext({
- getInternalViewState: (index = 0) => ({latitude: 0, longitude: 0, zoom: 0}),
- setInternalViewState: (viewState, index = 0) => {}
+ getInternalViewState: () => ({latitude: 0, longitude: 0, zoom: 0}),
+ setInternalViewState: () => {
+ return;
+ }
});
/**
@@ -49,10 +51,8 @@ export const MapViewStateContextProvider = ({
if (mapState.splitMapViewports?.some((s, i) => hasChanged(s, viewStates[i]))) {
setViewStates(mapState.splitMapViewports as MapState[]);
}
- } else {
- if (hasChanged(primaryState, mapState)) {
- setViewStates([pickViewportPropsFromMapState(mapState)] as MapState[]);
- }
+ } else if (hasChanged(primaryState, mapState)) {
+ setViewStates([pickViewportPropsFromMapState(mapState)] as MapState[]);
}
// Only update internalViewState when viewState changes
// eslint-disable-next-line react-hooks/exhaustive-deps
@@ -66,9 +66,8 @@ export const MapViewStateContextProvider = ({
const nextViewStates = [...prevViewStates];
nextViewStates[index] = newViewState as MapState;
return nextViewStates;
- } else {
- return [newViewState] as MapState[];
}
+ return [newViewState] as MapState[];
});
}
} as MapViewStateContextType;
diff --git a/src/components/src/map/layer-selector-panel.tsx b/src/components/src/map/layer-selector-panel.tsx
index 5cd98606c..e33852fb6 100644
--- a/src/components/src/map/layer-selector-panel.tsx
+++ b/src/components/src/map/layer-selector-panel.tsx
@@ -54,11 +54,10 @@ function LayerSelectorPanelFactory(
[layers, layersToRender]
);
- const isVisible = useMemo(() => isSplit && show && readOnly !== true, [
- isSplit,
- show,
- readOnly
- ]);
+ const isVisible = useMemo(
+ () => isSplit && show && readOnly !== true,
+ [isSplit, show, readOnly]
+ );
const onToggleMenuPanel = useCallback(
event => {
diff --git a/src/components/src/map/map-draw-panel.tsx b/src/components/src/map/map-draw-panel.tsx
index c79315848..d8fc415e4 100644
--- a/src/components/src/map/map-draw-panel.tsx
+++ b/src/components/src/map/map-draw-panel.tsx
@@ -46,9 +46,10 @@ function MapDrawPanelFactory(
actionIcons = defaultActionIcons
}) => {
const isActive = mapControls?.mapDraw?.active;
- const onToggleMenuPanel = useCallback(() => onToggleMapControl('mapDraw'), [
- onToggleMapControl
- ]);
+ const onToggleMenuPanel = useCallback(
+ () => onToggleMapControl('mapDraw'),
+ [onToggleMapControl]
+ );
if (!mapControls?.mapDraw?.show) {
return null;
}
diff --git a/src/components/src/map/map-legend-panel.tsx b/src/components/src/map/map-legend-panel.tsx
index dc4c840cb..85f1d3295 100644
--- a/src/components/src/map/map-legend-panel.tsx
+++ b/src/components/src/map/map-legend-panel.tsx
@@ -113,6 +113,7 @@ function MapLegendPanelFactory(MapControlTooltip, MapControlPanel, MapLegend) {
},
[tippyInstance, onToggleMapControl]
);
+ const rootContext = useContext(RootContext);
if (!mapLegend.show) {
return null;
@@ -143,7 +144,6 @@ function MapLegendPanelFactory(MapControlTooltip, MapControlPanel, MapLegend) {
</MapControlPanel>
);
- const rootContext = useContext(RootContext);
if (isPinned) {
// Pinned panel is not supported in export mode
if (isExport) {
diff --git a/src/components/src/map/map-popover.tsx b/src/components/src/map/map-popover.tsx
index f7156e4c4..c3090c5f2 100644
--- a/src/components/src/map/map-popover.tsx
+++ b/src/components/src/map/map-popover.tsx
@@ -150,7 +150,7 @@ function createVirtualReference(container, x, y, size = 0) {
};
}
-function getOffsetForPlacement({placement, reference, popper}, gap = 20) {
+function getOffsetForPlacement({placement}, gap = 20) {
switch (placement) {
case 'top-start':
case 'bottom-start':
diff --git a/src/components/src/modal-container.tsx b/src/components/src/modal-container.tsx
index 771528241..ac80c4e3b 100644
--- a/src/components/src/modal-container.tsx
+++ b/src/components/src/modal-container.tsx
@@ -274,7 +274,7 @@ export default function ModalContainerFactory(
modalProps = currentModal.modalProps;
} else {
switch (currentModal) {
- case DATA_TABLE_ID:
+ case DATA_TABLE_ID: {
const width = containerW * 0.9;
template = (
<DataTableModal
@@ -299,7 +299,8 @@ export default function ModalContainerFactory(
`};
`;
break;
- case DELETE_DATA_ID:
+ }
+ case DELETE_DATA_ID: {
// validate options
if (datasetKeyToRemove && datasets && datasets[datasetKeyToRemove]) {
template = (
@@ -319,6 +320,7 @@ export default function ModalContainerFactory(
};
}
break; // in case we add a new case after this one
+ }
case ADD_DATA_ID:
template = (
<LoadDataModal
@@ -387,7 +389,7 @@ export default function ModalContainerFactory(
}
};
break;
- case EXPORT_MAP_ID:
+ case EXPORT_MAP_ID: {
const keplerGlConfig = visState.schema.getConfigToSave({
mapStyle,
visState,
@@ -415,6 +417,7 @@ export default function ModalContainerFactory(
}
};
break;
+ }
case ADD_MAP_STYLE_ID:
template = (
<AddMapStyleModal
diff --git a/src/components/src/modals/add-map-style-modal.tsx b/src/components/src/modals/add-map-style-modal.tsx
index bc3e9123e..ea2d5d518 100644
--- a/src/components/src/modals/add-map-style-modal.tsx
+++ b/src/components/src/modals/add-map-style-modal.tsx
@@ -22,6 +22,7 @@ import {FormattedMessage} from '@kepler.gl/localization';
import {NO_BASEMAP_ICON} from '@kepler.gl/constants';
import maplibregl from 'maplibre-gl';
import {InputStyle, MapState} from '@kepler.gl/types';
+import {ActionHandler, inputMapStyle, loadCustomMapStyle} from '@kepler.gl/actions';
const MapH = 190;
const MapW = 264;
@@ -90,9 +91,9 @@ const InlineLink = styled.a`
`;
interface AddMapStyleModalProps {
- inputMapStyle: Function;
+ inputMapStyle: ActionHandler<typeof inputMapStyle>;
inputStyle: InputStyle;
- loadCustomMapStyle: Function;
+ loadCustomMapStyle: ActionHandler<typeof loadCustomMapStyle>;
mapboxApiAccessToken: string;
mapboxApiUrl?: string;
mapState: MapState;
@@ -131,7 +132,6 @@ function AddMapStyleModalFactory() {
componentDidUpdate() {
const map = this.mapRef && this.mapRef.getMap();
if (map && this._map !== map) {
-
this._map = map;
map.on('style.load', () => {
@@ -196,7 +196,11 @@ function AddMapStyleModalFactory() {
type="text"
value={inputStyle.url || ''}
onChange={({target: {value}}) =>
- this.props.inputMapStyle({url: value, id: 'Custom Style', icon: NO_BASEMAP_ICON})
+ this.props.inputMapStyle({
+ url: value,
+ id: 'Custom Style',
+ icon: NO_BASEMAP_ICON
+ })
}
placeholder="e.g. https://basemaps.cartocdn.com/gl/positron-gl-style/style.json"
/>
diff --git a/src/components/src/modals/cloud-components/cloud-item.spec.tsx b/src/components/src/modals/cloud-components/cloud-item.spec.tsx
index 15eb8208b..2eae09767 100644
--- a/src/components/src/modals/cloud-components/cloud-item.spec.tsx
+++ b/src/components/src/modals/cloud-components/cloud-item.spec.tsx
@@ -8,7 +8,9 @@ import {renderWithTheme} from '../../../../../test/helpers/component-jest-utils'
import {CloudItem} from './cloud-item';
import moment from 'moment';
-
+const nop = () => {
+ return;
+};
describe('CloudItem', () => {
const mockVis = {
title: 'Test Title',
@@ -19,38 +21,38 @@ describe('CloudItem', () => {
};
it('renders without crashing', () => {
- const {getByText} = renderWithTheme(<CloudItem vis={mockVis} onClick={() => {}} />);
+ const {getByText} = renderWithTheme(<CloudItem vis={mockVis} onClick={nop} />);
expect(getByText('Test Title')).toBeInTheDocument();
});
it('renders PrivacyBadge for private maps', () => {
const {getByText} = renderWithTheme(
- <CloudItem vis={{...mockVis, privateMap: true}} onClick={() => {}} />
+ <CloudItem vis={{...mockVis, privateMap: true}} onClick={nop} />
);
expect(getByText('Private')).toBeInTheDocument();
});
it('does not render PrivacyBadge for public maps', () => {
const {queryByText} = renderWithTheme(
- <CloudItem vis={{...mockVis, privateMap: false}} onClick={() => {}} />
+ <CloudItem vis={{...mockVis, privateMap: false}} onClick={nop} />
);
expect(queryByText('Private')).toBeNull();
});
it('displays correct thumbnail image', () => {
- const {getByRole} = renderWithTheme(<CloudItem vis={mockVis} onClick={() => {}} />);
+ const {getByRole} = renderWithTheme(<CloudItem vis={mockVis} onClick={nop} />);
expect(getByRole('thumbnail-wrapper').style.backgroundImage).toContain('test-thumbnail.jpg');
});
it('displays MapIcon when no thumbnail is provided', () => {
const {getByRole} = renderWithTheme(
- <CloudItem vis={{...mockVis, thumbnail: null}} onClick={() => {}} />
+ <CloudItem vis={{...mockVis, thumbnail: null}} onClick={nop} />
);
expect(getByRole('map-icon')).toBeInTheDocument();
});
it('displays title, description, and last modification date', () => {
- const {getByText} = renderWithTheme(<CloudItem vis={mockVis} onClick={() => {}} />);
+ const {getByText} = renderWithTheme(<CloudItem vis={mockVis} onClick={nop} />);
expect(getByText('Test Title')).toBeInTheDocument();
expect(getByText('Test Description')).toBeInTheDocument();
expect(
diff --git a/src/components/src/modals/cloud-components/cloud-item.tsx b/src/components/src/modals/cloud-components/cloud-item.tsx
index dc23e5b23..1a8d14935 100644
--- a/src/components/src/modals/cloud-components/cloud-item.tsx
+++ b/src/components/src/modals/cloud-components/cloud-item.tsx
@@ -112,11 +112,15 @@ export const CloudItem = ({vis, onClick}) => {
<StyledVisualizationItem onClick={onClick}>
{vis.thumbnail ? (
<div role="thumbnail-wrapper" className="vis_item-thumb" style={thumbnailStyle}>
- {vis.hasOwnProperty('privateMap') ? <PrivacyBadge privateMap={vis.privateMap} /> : null}
+ {Object.prototype.hasOwnProperty.call(vis, 'privateMap') ? (
+ <PrivacyBadge privateMap={vis.privateMap} />
+ ) : null}
</div>
) : (
<MapIcon role="map-icon" className="vis_item-icon">
- {vis.hasOwnProperty('privateMap') ? <PrivacyBadge privateMap={vis.privateMap} /> : null}
+ {Object.prototype.hasOwnProperty.call(vis, 'privateMap') ? (
+ <PrivacyBadge privateMap={vis.privateMap} />
+ ) : null}
</MapIcon>
)}
<span className="vis_item-title">{vis.title}</span>
diff --git a/src/components/src/modals/cloud-tile.tsx b/src/components/src/modals/cloud-tile.tsx
index 44a29c52b..2566deb4d 100644
--- a/src/components/src/modals/cloud-tile.tsx
+++ b/src/components/src/modals/cloud-tile.tsx
@@ -149,7 +149,7 @@ const CloudTile: React.FC<CloudTileProps> = ({provider, actionName}) => {
setError(error as Error);
}
setIsLoading(false);
- }, [provider]);
+ }, [provider, setProvider]);
const onSelect = useCallback(async () => {
if (isLoading) {
@@ -166,7 +166,7 @@ const CloudTile: React.FC<CloudTileProps> = ({provider, actionName}) => {
setError(err as Error);
setProvider(null);
}
- }, [setProvider, provider, user, isLoading]);
+ }, [setProvider, provider, user, isLoading, onLogin]);
const onLogout = useCallback(async () => {
setIsLoading(true);
@@ -178,14 +178,14 @@ const CloudTile: React.FC<CloudTileProps> = ({provider, actionName}) => {
setIsLoading(false);
setUser(null);
setProvider(null);
- }, [provider]);
+ }, [provider, setProvider]);
const {displayName, name} = provider;
return (
<StyledBox>
{provider.isNew ? <NewTag>New</NewTag> : null}
- <div></div>
+ <div />
<StyledTileWrapper onClick={onSelect} selected={isSelected}>
<StyledCloudName>{displayName || name}</StyledCloudName>
{provider.icon ? <provider.icon height="64px" /> : null}
diff --git a/src/components/src/modals/export-map-modal/export-html-map.tsx b/src/components/src/modals/export-map-modal/export-html-map.tsx
index 605135424..e5ba7da10 100644
--- a/src/components/src/modals/export-map-modal/export-html-map.tsx
+++ b/src/components/src/modals/export-map-modal/export-html-map.tsx
@@ -69,8 +69,12 @@ type IntlProps = {
function ExportHtmlMapFactory(): React.ComponentType<ExportHtmlMapProps> {
/** @type {typeof import('./export-html-map').ExportHtmlMap} */
const ExportHtmlMap: React.FC<ExportHtmlMapProps & IntlProps> = ({
- onChangeExportMapHTMLMode = mode => {},
- onEditUserMapboxAccessToken = token => {},
+ onChangeExportMapHTMLMode = () => {
+ return;
+ },
+ onEditUserMapboxAccessToken = () => {
+ return;
+ },
options = {},
intl
}) => (
diff --git a/src/components/src/modals/export-map-modal/export-map-modal.tsx b/src/components/src/modals/export-map-modal/export-map-modal.tsx
index 89842f558..61aa8eeed 100644
--- a/src/components/src/modals/export-map-modal/export-map-modal.tsx
+++ b/src/components/src/modals/export-map-modal/export-map-modal.tsx
@@ -23,7 +23,7 @@ interface ExportMapModalFactoryProps {
const style = {width: '100%'};
-const NO_OP = (...args: any[]) => ({} as any);
+const NO_OP = () => ({} as any);
ExportMapModalFactory.deps = [ExportHtmlMapFactory, ExportJsonMapFactory];
diff --git a/src/components/src/modals/load-data-modal.tsx b/src/components/src/modals/load-data-modal.tsx
index 3ceee8532..c3788854e 100644
--- a/src/components/src/modals/load-data-modal.tsx
+++ b/src/components/src/modals/load-data-modal.tsx
@@ -25,7 +25,9 @@ const StyledLoadDataModal = styled.div.attrs({
flex-direction: column;
`;
-const noop = () => {};
+const noop = () => {
+ return;
+};
const getDefaultMethod = <T,>(methods: T[] = []) =>
Array.isArray(methods) ? get(methods, [0]) : null;
export interface LoadingMethod {
diff --git a/src/components/src/modals/load-storage-map.tsx b/src/components/src/modals/load-storage-map.tsx
index 17f71379d..d4f7194c7 100644
--- a/src/components/src/modals/load-storage-map.tsx
+++ b/src/components/src/modals/load-storage-map.tsx
@@ -33,14 +33,17 @@ function LoadStorageMapFactory() {
useEffect(() => {
setProviderInfo(currentProvider);
- }, [currentProvider]);
+ }, [currentProvider, setProviderInfo]);
- const onSelectMap = useCallback((provider, map) => {
- onLoadCloudMap({
- loadParams: map.loadParams,
- provider
- });
- }, []);
+ const onSelectMap = useCallback(
+ (provider, map) => {
+ onLoadCloudMap({
+ loadParams: map.loadParams,
+ provider
+ });
+ },
+ [onLoadCloudMap]
+ );
return (
<FlexColContainer>
diff --git a/src/components/src/modals/modal-tabs.tsx b/src/components/src/modals/modal-tabs.tsx
index c66b33a06..1b29946fd 100644
--- a/src/components/src/modals/modal-tabs.tsx
+++ b/src/components/src/modals/modal-tabs.tsx
@@ -56,7 +56,9 @@ const StyledLoadDataModalTabItem = styled.div`
}
`;
-const noop = () => {};
+const noop = () => {
+ return;
+};
interface ModalTabItemProps {
currentMethod?: string;
diff --git a/src/components/src/modals/save-map-modal.tsx b/src/components/src/modals/save-map-modal.tsx
index 816700a4e..ea3e731ea 100644
--- a/src/components/src/modals/save-map-modal.tsx
+++ b/src/components/src/modals/save-map-modal.tsx
@@ -61,7 +61,9 @@ const StyledSaveMapModal = styled.div.attrs({
}
`;
-const nop = _ => {};
+const nop = () => {
+ return;
+};
const TEXT_AREA_LIGHT_STYLE = {resize: 'none'};
type CharacterLimits = {
@@ -194,7 +196,7 @@ function SaveMapModalFactory() {
if (provider) {
onConfirm(provider);
}
- }, [provider]);
+ }, [onConfirm, provider]);
return (
<ImageModalContainer
diff --git a/src/components/src/modals/share-map-modal.tsx b/src/components/src/modals/share-map-modal.tsx
index 197631ad7..d83eed3bb 100644
--- a/src/components/src/modals/share-map-modal.tsx
+++ b/src/components/src/modals/share-map-modal.tsx
@@ -64,7 +64,9 @@ export const SharingUrl: React.FC<SharingUrlProps> = ({url, message = ''}) => {
</StyleSharingUrl>
);
};
-const nop = () => {};
+const nop = () => {
+ return;
+};
const StyledShareMapModal = styled(StyledModalContent)`
padding: 24px 72px 40px 72px;
@@ -117,7 +119,7 @@ export default function ShareMapUrlModalFactory() {
if (provider) {
onExport(provider);
}
- }, [provider]);
+ }, [onExport, provider]);
return (
<ThemeProvider theme={themeLT}>
diff --git a/src/components/src/modals/storage-map-viewer.tsx b/src/components/src/modals/storage-map-viewer.tsx
index 1c95e14b2..1a6616e85 100644
--- a/src/components/src/modals/storage-map-viewer.tsx
+++ b/src/components/src/modals/storage-map-viewer.tsx
@@ -106,7 +106,7 @@ const StyledError = styled.div`
margin-bottom: 16px;
`;
-const getDuration = (last: number = 0) => moment.duration(new Date().valueOf() - last).humanize();
+const getDuration = (last = 0) => moment.duration(new Date().valueOf() - last).humanize();
interface Asset {
imageUrl?: string;
diff --git a/src/components/src/notification-panel.tsx b/src/components/src/notification-panel.tsx
index b7a91eed2..79b47c885 100644
--- a/src/components/src/notification-panel.tsx
+++ b/src/components/src/notification-panel.tsx
@@ -58,8 +58,8 @@ export default function NotificationPanelFactory(
}
}
- const NotificationPanel = (React.memo(
+ const NotificationPanel = React.memo(
NotificationPanelUnmemoized
- ) as unknown) as typeof NotificationPanelUnmemoized;
+ ) as unknown as typeof NotificationPanelUnmemoized;
return NotificationPanel;
}
diff --git a/src/components/src/plot-container.tsx b/src/components/src/plot-container.tsx
index 35305a42b..363a93bfa 100644
--- a/src/components/src/plot-container.tsx
+++ b/src/components/src/plot-container.tsx
@@ -22,6 +22,8 @@ import {MapViewStateContextProvider} from './map-view-state-context';
import {GEOCODER_LAYER_ID, ExportImage} from '@kepler.gl/constants';
import {SplitMap} from '@kepler.gl/types';
import {
+ ActionHandler,
+ addNotification,
setExportImageDataUri,
setExportImageError,
setExportImageSetting
@@ -69,7 +71,7 @@ interface PlotContainerProps {
width?: number;
height?: number;
exportImageSetting: ExportImage;
- addNotification: Function;
+ addNotification: ActionHandler<typeof addNotification>;
mapFields: ReturnType<typeof mapFieldsSelector>;
setExportImageSetting: typeof setExportImageSetting;
setExportImageDataUri: typeof setExportImageDataUri;
diff --git a/src/components/src/side-panel.tsx b/src/components/src/side-panel.tsx
index 1e9df3288..ee73d7d9c 100644
--- a/src/components/src/side-panel.tsx
+++ b/src/components/src/side-panel.tsx
@@ -128,10 +128,10 @@ export default function SidePanelFactory(
const isOpen = Boolean(activeSidePanel);
- const _onOpenOrClose = useCallback(() => toggleSidePanel(activeSidePanel ? '' : 'layer'), [
- activeSidePanel,
- toggleSidePanel
- ]);
+ const _onOpenOrClose = useCallback(
+ () => toggleSidePanel(activeSidePanel ? '' : 'layer'),
+ [activeSidePanel, toggleSidePanel]
+ );
const onClickExportImage = useCallback(() => toggleModal(EXPORT_IMAGE_ID), [toggleModal]);
const onClickExportData = useCallback(() => toggleModal(EXPORT_DATA_ID), [toggleModal]);
@@ -157,10 +157,10 @@ export default function SidePanelFactory(
const onShowAddMapStyleModal = useCallback(() => toggleModal(ADD_MAP_STYLE_ID), [toggleModal]);
const onRemoveDataset = useCallback(dataId => openDeleteModal(dataId), [openDeleteModal]);
- const currentPanel = useMemo(() => panels.find(({id}) => id === activeSidePanel) || null, [
- activeSidePanel,
- panels
- ]);
+ const currentPanel = useMemo(
+ () => panels.find(({id}) => id === activeSidePanel) || null,
+ [activeSidePanel, panels]
+ );
const customPanelProps = useMemo(() => getCustomPanelProps(props), [props]);
const PanelComponent = currentPanel?.component;
diff --git a/src/components/src/side-panel/common/dataset-tag.tsx b/src/components/src/side-panel/common/dataset-tag.tsx
index d4b9945a4..2cff4e722 100644
--- a/src/components/src/side-panel/common/dataset-tag.tsx
+++ b/src/components/src/side-panel/common/dataset-tag.tsx
@@ -9,7 +9,9 @@ import {UpdateTableColorTypes} from './types';
import {RGBColor} from '@kepler.gl/types';
import {VisStateActions, ActionHandler} from '@kepler.gl/actions';
-function nop(_) {}
+function nop() {
+ return;
+}
const DatasetTagWrapper = styled.div`
display: flex;
diff --git a/src/components/src/side-panel/custom-panel.tsx b/src/components/src/side-panel/custom-panel.tsx
index da7bcfefd..2c23007eb 100644
--- a/src/components/src/side-panel/custom-panel.tsx
+++ b/src/components/src/side-panel/custom-panel.tsx
@@ -11,7 +11,7 @@ export type CustomPanelsProps<P> = {
// This is a dummy component that can be replaced to inject more side panel sub panels into the side bar
function CustomPanelsFactory<P>() {
- const CustomPanels: React.FC<CustomPanelsProps<P>> = props => {
+ const CustomPanels: React.FC<CustomPanelsProps<P>> = () => {
return <div />;
};
@@ -30,6 +30,7 @@ function CustomPanelsFactory<P>() {
// }
],
// prop selector from side panel props
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
getProps: (sidePanelProps: SidePanelItem) => ({} as P)
};
diff --git a/src/components/src/side-panel/filter-manager.tsx b/src/components/src/side-panel/filter-manager.tsx
index b3e6b3987..1451a7965 100644
--- a/src/components/src/side-panel/filter-manager.tsx
+++ b/src/components/src/side-panel/filter-manager.tsx
@@ -74,13 +74,8 @@ function FilterManagerFactory(
isAnyFilterAnimating,
visStateActions
}: FilterListProps) => {
- const {
- removeFilter,
- setFilter,
- toggleFilterAnimation,
- toggleFilterFeature,
- setFilterView
- } = visStateActions;
+ const {removeFilter, setFilter, toggleFilterAnimation, toggleFilterFeature, setFilterView} =
+ visStateActions;
const filterPanelCallbacks = useMemo(() => {
return filtersByIndex.reduce(
diff --git a/src/components/src/side-panel/interaction-panel/interaction-panel.tsx b/src/components/src/side-panel/interaction-panel/interaction-panel.tsx
index 224808cd3..e869390eb 100644
--- a/src/components/src/side-panel/interaction-panel/interaction-panel.tsx
+++ b/src/components/src/side-panel/interaction-panel/interaction-panel.tsx
@@ -4,7 +4,6 @@
import React, {useState, ComponentType, ReactElement, useCallback} from 'react';
import styled from 'styled-components';
import Switch from '../../common/switch';
-import PanelTitleFactory from '../panel-title';
import BrushConfigFactory from './brush-config';
import TooltipConfigFactory from './tooltip-config';
import {Datasets} from '@kepler.gl/table';
@@ -38,7 +37,7 @@ const StyledInteractionPanel = styled.div`
padding-bottom: 6px;
`;
-InteractionPanelFactory.deps = [TooltipConfigFactory, BrushConfigFactory, PanelTitleFactory];
+InteractionPanelFactory.deps = [TooltipConfigFactory, BrushConfigFactory];
const INTERACTION_CONFIG_ICONS: {[key: string]: React.ElementType} = {
tooltip: Messages,
@@ -49,8 +48,7 @@ const INTERACTION_CONFIG_ICONS: {[key: string]: React.ElementType} = {
function InteractionPanelFactory(
TooltipConfig: ReturnType<typeof TooltipConfigFactory>,
- BrushConfig: ReturnType<typeof BrushConfigFactory>,
- PanelTitle: ReturnType<typeof PanelTitleFactory>
+ BrushConfig: ReturnType<typeof BrushConfigFactory>
): ComponentType<InteractionPanelProps> {
const InteractionPanel: React.FC<InteractionPanelProps> = ({
config,
diff --git a/src/components/src/side-panel/interaction-panel/tooltip-config.tsx b/src/components/src/side-panel/interaction-panel/tooltip-config.tsx
index 7249ed2b4..a88b25255 100644
--- a/src/components/src/side-panel/interaction-panel/tooltip-config.tsx
+++ b/src/components/src/side-panel/interaction-panel/tooltip-config.tsx
@@ -137,7 +137,7 @@ function TooltipConfigFactory(
};
onChange(newConfig);
},
- [config, dataId, onChange]
+ [config, dataId, onChange, findSelectedHelper]
);
const handleReorderItems = useCallback(
diff --git a/src/components/src/side-panel/interaction-panel/tooltip-config/tooltip-chicklet.tsx b/src/components/src/side-panel/interaction-panel/tooltip-config/tooltip-chicklet.tsx
index c1efa0338..37c62662d 100644
--- a/src/components/src/side-panel/interaction-panel/tooltip-config/tooltip-chicklet.tsx
+++ b/src/components/src/side-panel/interaction-panel/tooltip-config/tooltip-chicklet.tsx
@@ -14,11 +14,12 @@ import {TimeLabelFormat, TooltipFields} from '@kepler.gl/types';
import {getFormatValue, getFormatLabels} from '@kepler.gl/utils';
import onClickOutside from 'react-onclickoutside';
import TippyTooltip from '../../../common/tippy-tooltip';
+import {TooltipFormat} from '@kepler.gl/constants';
interface TooltipChickletProps {
disabled: boolean;
item: {name: string};
- displayOption: Function;
+ displayOption: (item: any) => string;
remove: any;
attributes: DraggableAttributes;
@@ -227,7 +228,7 @@ function TooltipChickletFactory(
<DropdownList
options={formatLabels}
selectionIndex={selectionIndex}
- displayOption={({label}) => label}
+ displayOption={option => (option as TooltipFormat).label}
onOptionSelected={(result, e) => {
e.stopPropagation();
this.setState({
diff --git a/src/components/src/side-panel/layer-manager.tsx b/src/components/src/side-panel/layer-manager.tsx
index 32e5a876f..aacf072a5 100644
--- a/src/components/src/side-panel/layer-manager.tsx
+++ b/src/components/src/side-panel/layer-manager.tsx
@@ -64,10 +64,10 @@ export const LayerBlendingSelector = React.memo(
{}
);
- const onChange = useCallback(blending => updateLayerBlending(labeledLayerBlendings[blending]), [
- updateLayerBlending,
- labeledLayerBlendings
- ]);
+ const onChange = useCallback(
+ blending => updateLayerBlending(labeledLayerBlendings[blending]),
+ [updateLayerBlending, labeledLayerBlendings]
+ );
return (
<SidePanelSection>
diff --git a/src/components/src/side-panel/layer-panel/color-range-selector.tsx b/src/components/src/side-panel/layer-panel/color-range-selector.tsx
index a1e47ac7f..65e2639c5 100644
--- a/src/components/src/side-panel/layer-panel/color-range-selector.tsx
+++ b/src/components/src/side-panel/layer-panel/color-range-selector.tsx
@@ -96,8 +96,12 @@ const CONFIG_SETTINGS = {
export default class ColorRangeSelector extends Component<ColorRangeSelectorProps> {
static defaultProps = {
- onSelectColorRange: () => {},
- setColorPaletteUI: () => {}
+ onSelectColorRange: () => {
+ return;
+ },
+ setColorPaletteUI: () => {
+ return;
+ }
};
configTypeSelector = (props: ColorRangeSelectorProps) =>
diff --git a/src/components/src/side-panel/layer-panel/color-selector.tsx b/src/components/src/side-panel/layer-panel/color-selector.tsx
index 58dfe6451..cbe0aa196 100644
--- a/src/components/src/side-panel/layer-panel/color-selector.tsx
+++ b/src/components/src/side-panel/layer-panel/color-selector.tsx
@@ -98,7 +98,7 @@ function ColorSelectorFactory(RangeSlider): ComponentType<ColorSelectorProps> {
node = createRef<HTMLDivElement>();
- handleClickOutside = e => {
+ handleClickOutside = () => {
if (this.props.colorUI && Number.isInteger(this.props.colorUI.showSketcher)) {
// if sketcher is open, let sketch to close itself first
return;
diff --git a/src/components/src/side-panel/layer-panel/custom-picker.tsx b/src/components/src/side-panel/layer-panel/custom-picker.tsx
index 524e051a1..82f3c70db 100644
--- a/src/components/src/side-panel/layer-panel/custom-picker.tsx
+++ b/src/components/src/side-panel/layer-panel/custom-picker.tsx
@@ -48,7 +48,7 @@ class CustomPicker extends Component<CustomPickerProps> {
}
}));
- handleClickOutside = (e: Event) => {
+ handleClickOutside = () => {
this.props.onSwatchClose();
};
diff --git a/src/components/src/side-panel/layer-panel/dataset-layer-section.tsx b/src/components/src/side-panel/layer-panel/dataset-layer-section.tsx
index 7d2024483..7100837c4 100644
--- a/src/components/src/side-panel/layer-panel/dataset-layer-section.tsx
+++ b/src/components/src/side-panel/layer-panel/dataset-layer-section.tsx
@@ -21,7 +21,7 @@ type DatasetLayerSectionProps = {
updateTableColor: ActionHandler<typeof VisStateActions.updateTableColor>;
removeDataset: ActionHandler<typeof UIStateActions.openDeleteModal>;
uiStateActions: typeof UIStateActions;
- visStateActions: typeof VisStateActions;
+ visStateActions: typeof VisStateActions;
mapStateActions: typeof MapStateActions;
};
diff --git a/src/components/src/side-panel/layer-panel/layer-color-selector.tsx b/src/components/src/side-panel/layer-panel/layer-color-selector.tsx
index 88c841b86..5b9e67ff4 100644
--- a/src/components/src/side-panel/layer-panel/layer-color-selector.tsx
+++ b/src/components/src/side-panel/layer-panel/layer-color-selector.tsx
@@ -42,10 +42,10 @@ export function LayerColorSelectorFactory(ColorSelector) {
property = 'color',
setColorUI
}: LayerColorSelectorProps) => {
- const onSetColorUI = useCallback(newConfig => setColorUI(property, newConfig), [
- setColorUI,
- property
- ]);
+ const onSetColorUI = useCallback(
+ newConfig => setColorUI(property, newConfig),
+ [setColorUI, property]
+ );
return (
<SidePanelSection>
@@ -73,10 +73,10 @@ export function LayerColorRangeSelectorFactory(ColorSelector) {
property = 'colorRange',
setColorUI
}: LayerColorRangeSelectorProps) => {
- const onSetColorUI = useCallback(newConfig => setColorUI(property, newConfig), [
- setColorUI,
- property
- ]);
+ const onSetColorUI = useCallback(
+ newConfig => setColorUI(property, newConfig),
+ [setColorUI, property]
+ );
return (
<SidePanelSection>
@@ -106,10 +106,10 @@ export function ArcLayerColorSelectorFactory(ColorSelector) {
property = 'color',
setColorUI
}: ArcLayerColorSelectorProps) => {
- const onSetColorUI = useCallback(newConfig => setColorUI(property, newConfig), [
- setColorUI,
- property
- ]);
+ const onSetColorUI = useCallback(
+ newConfig => setColorUI(property, newConfig),
+ [setColorUI, property]
+ );
return (
<SidePanelSection>
diff --git a/src/components/src/side-panel/layer-panel/layer-column-config.tsx b/src/components/src/side-panel/layer-panel/layer-column-config.tsx
index 63e880697..19f0837e7 100644
--- a/src/components/src/side-panel/layer-panel/layer-column-config.tsx
+++ b/src/components/src/side-panel/layer-panel/layer-column-config.tsx
@@ -48,13 +48,12 @@ function getValidFieldPairsSuggestionsForColumn(
const columnPair = columnPairs[columnKey];
const matchingFieldPairs = enhancedFieldPairs.filter(({pair}) => {
return toArray(columnPair.fieldPairKey).some(fieldPairKey =>
- pair.hasOwnProperty(fieldPairKey)
+ Object.prototype.hasOwnProperty.call(pair, fieldPairKey)
);
});
return matchingFieldPairs.length > 0 ? matchingFieldPairs : null;
- } else {
- return null;
}
+ return null;
}
LayerColumnConfigFactory.deps = [ColumnSelectorFactory];
diff --git a/src/components/src/side-panel/layer-panel/layer-config-group.tsx b/src/components/src/side-panel/layer-panel/layer-config-group.tsx
index a30515413..54fe40971 100644
--- a/src/components/src/side-panel/layer-panel/layer-config-group.tsx
+++ b/src/components/src/side-panel/layer-panel/layer-config-group.tsx
@@ -196,7 +196,9 @@ function LayerConfigGroupFactory(
LayerConfigGroup.defaultProps = {
collapsible: false,
expanded: false,
- onChange: () => {},
+ onChange: () => {
+ return;
+ },
description: '',
disabled: false
};
diff --git a/src/components/src/side-panel/layer-panel/layer-configurator.tsx b/src/components/src/side-panel/layer-panel/layer-configurator.tsx
index 2959c449f..f8dde00b3 100644
--- a/src/components/src/side-panel/layer-panel/layer-configurator.tsx
+++ b/src/components/src/side-panel/layer-panel/layer-configurator.tsx
@@ -309,12 +309,7 @@ export default function LayerConfiguratorFactory(
);
}
- _renderHeatmapLayerConfig({
- layer,
- visConfiguratorProps,
- layerConfiguratorProps,
- layerChannelConfigProps
- }) {
+ _renderHeatmapLayerConfig({layer, visConfiguratorProps, layerChannelConfigProps}) {
return (
<StyledLayerVisualConfigurator>
{/* Color */}
@@ -1112,15 +1107,8 @@ export function ChannelByValueSelectorFactory(
fields,
description
}: ChannelByValueSelectorProps) => {
- const {
- channelScaleType,
- field,
- key,
- property,
- scale,
- defaultMeasure,
- supportedFieldTypes
- } = channel;
+ const {channelScaleType, field, key, property, scale, defaultMeasure, supportedFieldTypes} =
+ channel;
const channelSupportedFieldTypes =
supportedFieldTypes || CHANNEL_SCALE_SUPPORTED_FIELDS[channelScaleType];
const supportedFields = fields.filter(({type}) => channelSupportedFieldTypes.includes(type));
diff --git a/src/components/src/side-panel/layer-panel/layer-panel-header.tsx b/src/components/src/side-panel/layer-panel/layer-panel-header.tsx
index e5e38d75f..721f84b38 100644
--- a/src/components/src/side-panel/layer-panel/layer-panel-header.tsx
+++ b/src/components/src/side-panel/layer-panel/layer-panel-header.tsx
@@ -374,8 +374,7 @@ const defaultActionIcons = {
enableConfig: ArrowDown,
duplicate: Copy,
resetIsValid: Reset,
- crosshairs:Crosshairs
- ,
+ crosshairs: Crosshairs
};
LayerPanelHeaderFactory.deps = [LayerTitleSectionFactory, LayerPanelHeaderActionSectionFactory];
diff --git a/src/components/src/side-panel/layer-panel/layer-type-selector.tsx b/src/components/src/side-panel/layer-panel/layer-type-selector.tsx
index d8750399e..d5c8221ba 100644
--- a/src/components/src/side-panel/layer-panel/layer-type-selector.tsx
+++ b/src/components/src/side-panel/layer-panel/layer-type-selector.tsx
@@ -55,10 +55,10 @@ function LayerTypeSelectorFactory(
onSelect,
disabled
}) => {
- const selectedItems = useMemo(() => options.find(op => op.id === selected), [
- options,
- selected
- ]);
+ const selectedItems = useMemo(
+ () => options.find(op => op.id === selected),
+ [options, selected]
+ );
return (
<SidePanelSection>
diff --git a/src/components/src/side-panel/layer-panel/single-color-palette.tsx b/src/components/src/side-panel/layer-panel/single-color-palette.tsx
index e95982d9e..1719112b2 100644
--- a/src/components/src/side-panel/layer-panel/single-color-palette.tsx
+++ b/src/components/src/side-panel/layer-panel/single-color-palette.tsx
@@ -45,9 +45,9 @@ const StyledColorBlock = styled.div<{selected: boolean}>`
const SingleColorPalette: React.FC<SingleColorPaletteProps> = ({selectedColor, onSelectColor}) => (
<StyledColorPalette className="single-color-palette">
- {Themes.map((theme, col) => (
+ {Themes.map(theme => (
<StyledColorColumn key={theme} className="single-color-palette__column">
- {range(1, ROWS + 1, 1).map((key, i) => (
+ {range(1, ROWS + 1, 1).map(key => (
<StyledColorBlock
className="single-color-palette__block"
style={{
diff --git a/src/components/src/side-panel/map-style-panel/map-layer-selector.tsx b/src/components/src/side-panel/map-style-panel/map-layer-selector.tsx
index 18ad761e5..871867f38 100644
--- a/src/components/src/side-panel/map-style-panel/map-layer-selector.tsx
+++ b/src/components/src/side-panel/map-style-panel/map-layer-selector.tsx
@@ -23,7 +23,9 @@ import {
} from '@kepler.gl/actions';
import {MapStyle} from '@kepler.gl/reducers';
-function noop() {}
+function noop() {
+ return;
+}
const StyledInteractionPanel = styled.div`
padding-bottom: 12px;
diff --git a/src/components/src/side-panel/panel-header.tsx b/src/components/src/side-panel/panel-header.tsx
index 98d3bffda..215f70e45 100644
--- a/src/components/src/side-panel/panel-header.tsx
+++ b/src/components/src/side-panel/panel-header.tsx
@@ -250,7 +250,7 @@ export const SaveExportDropdownFactory = (
label: 'toolbar.saveMap',
icon: Save2,
key: 'save',
- onClick: props => props.onSaveMap!
+ onClick: props => props.onSaveMap
},
{
label: 'toolbar.shareMapURL',
@@ -312,13 +312,17 @@ function PanelHeaderFactory(
id: 'storage',
iconComponent: Db,
tooltip: 'tooltip.cloudStorage',
- onClick: () => {},
+ onClick: () => {
+ return;
+ },
dropdownComponent: CloudStorageDropdown
},
{
id: 'save',
iconComponent: Save,
- onClick: () => {},
+ onClick: () => {
+ return;
+ },
label: 'Share',
dropdownComponent: SaveExportDropdown
}
diff --git a/src/components/src/side-panel/panel-view-list-toggle.tsx b/src/components/src/side-panel/panel-view-list-toggle.tsx
index 1275ab4cb..9de8e1994 100644
--- a/src/components/src/side-panel/panel-view-list-toggle.tsx
+++ b/src/components/src/side-panel/panel-view-list-toggle.tsx
@@ -13,7 +13,7 @@ import {PANEL_VIEW_TOGGLES} from '@kepler.gl/constants';
type ToggleOptionProps = {
isActive: boolean;
onClick: () => void;
- option: typeof TOGGLE_OPTIONS[0];
+ option: (typeof TOGGLE_OPTIONS)[0];
};
type PanelViewListToggleProps = {
diff --git a/src/components/src/side-panel/side-bar.tsx b/src/components/src/side-panel/side-bar.tsx
index f73306a8b..da960dc58 100644
--- a/src/components/src/side-panel/side-bar.tsx
+++ b/src/components/src/side-panel/side-bar.tsx
@@ -93,7 +93,9 @@ function SidebarFactory(CollapseButton: ReturnType<typeof CollapseButtonFactory>
width: 300,
minifiedWidth: 0,
isOpen: true,
- onOpenOrClose: function noop() {},
+ onOpenOrClose: function noop() {
+ return;
+ },
shouldShowCollapseButton: true
};
diff --git a/src/constants/src/default-settings.ts b/src/constants/src/default-settings.ts
index 977538281..913d4c23e 100644
--- a/src/constants/src/default-settings.ts
+++ b/src/constants/src/default-settings.ts
@@ -435,7 +435,13 @@ export const TABLE_OPTION = keyMirror({
FORMAT_COLUMN: null
});
-export const TABLE_OPTION_LIST = [
+export type TableOption = {
+ value: 'SORT_ASC' | 'SORT_DES' | 'UNSORT' | 'PIN' | 'UNPIN' | 'COPY' | 'FORMAT_COLUMN';
+ display: string;
+ icon: string;
+ condition?: (props: any) => boolean;
+};
+export const TABLE_OPTION_LIST: TableOption[] = [
{
value: TABLE_OPTION.SORT_ASC,
display: 'Sort Ascending',
@@ -742,7 +748,7 @@ export const FIELD_OPTS = {
...notSupportAggrOpts
},
format: {
- legend: d => '...',
+ legend: () => '...',
tooltip: []
}
},
@@ -753,7 +759,7 @@ export const FIELD_OPTS = {
...notSupportAggrOpts
},
format: {
- legend: d => '...',
+ legend: () => '...',
tooltip: []
}
},
@@ -761,7 +767,7 @@ export const FIELD_OPTS = {
type: 'numerical',
scale: {},
format: {
- legend: d => '...',
+ legend: () => '...',
tooltip: []
}
},
@@ -769,7 +775,7 @@ export const FIELD_OPTS = {
type: 'numerical',
scale: {},
format: {
- legend: d => '...',
+ legend: () => '...',
tooltip: []
}
}
@@ -891,7 +897,7 @@ export const CustomRatioOption: ImageRatioOption = {
export const FourByThreeRatioOption: ImageRatioOption = {
id: EXPORT_IMG_RATIOS.FOUR_BY_THREE,
label: 'modal.exportImage.ratio4_3',
- getSize: (screenW, screenH) => ({
+ getSize: screenW => ({
width: screenW,
height: Math.round(screenW * 0.75)
})
@@ -899,7 +905,7 @@ export const FourByThreeRatioOption: ImageRatioOption = {
export const SixteenByNineRatioOption: ImageRatioOption = {
id: EXPORT_IMG_RATIOS.SIXTEEN_BY_NINE,
label: 'modal.exportImage.ratio16_9',
- getSize: (screenW, screenH) => ({
+ getSize: screenW => ({
width: screenW,
height: Math.round(screenW * 0.5625)
})
@@ -1170,7 +1176,7 @@ export const dataTestIds: Record<string, string> = {
// Effects
export const DEFAULT_TIMEZONE = 'UTC';
-export const DEFAULT_POST_PROCESSING_EFFECT_TYPE: string = 'ink';
+export const DEFAULT_POST_PROCESSING_EFFECT_TYPE = 'ink';
export const DEFAULT_LIGHT_COLOR: [number, number, number] = [255, 255, 255];
export const DEFAULT_LIGHT_INTENSITY = 1;
@@ -1178,9 +1184,9 @@ export const DEFAULT_SHADOW_INTENSITY = 0.5;
export const DEFAULT_SHADOW_COLOR: [number, number, number] = [0, 0, 0];
export const LIGHT_AND_SHADOW_EFFECT_TIME_MODES = {
- pick: 'pick' as 'pick',
- current: 'current' as 'current',
- animation: 'animation' as 'animation'
+ pick: 'pick' as const,
+ current: 'current' as const,
+ animation: 'animation' as const
};
export type LightAndShadowEffectTimeMode = 'pick' | 'current' | 'animation';
export const DEFAULT_LIGHT_AND_SHADOW_PROPS: {
diff --git a/src/constants/webpack/umd.js b/src/constants/webpack/umd.js
index 655dc62f1..c7c03dd3c 100644
--- a/src/constants/webpack/umd.js
+++ b/src/constants/webpack/umd.js
@@ -10,7 +10,7 @@ const KeplerPackage = require('../package');
const SRC_DIR = resolve(__dirname, '../src');
const OUTPUT_DIR = resolve(__dirname, '../umd');
-const LIBRARY_BUNDLE_CONFIG = env => ({
+const LIBRARY_BUNDLE_CONFIG = () => ({
entry: {
KeplerGl: join(SRC_DIR, 'index.ts')
},
diff --git a/src/deckgl-layers/src/3d-building-layer/3d-building-utils.ts b/src/deckgl-layers/src/3d-building-layer/3d-building-utils.ts
index acf46b496..104a9c6d9 100644
--- a/src/deckgl-layers/src/3d-building-layer/3d-building-utils.ts
+++ b/src/deckgl-layers/src/3d-building-layer/3d-building-utils.ts
@@ -22,8 +22,9 @@ export function getTileData(
token: string,
{index: {x, y, z}}: {index: Coordinates}
): Promise<TileDataItem[]> {
- const mapSource = `${host ||
- MAPBOX_HOST}${MAP_SOURCE}/${z}/${x}/${y}.vector.pbf?access_token=${token}`;
+ const mapSource = `${
+ host || MAPBOX_HOST
+ }${MAP_SOURCE}/${z}/${x}/${y}.vector.pbf?access_token=${token}`;
return fetch(mapSource)
.then(response => response.arrayBuffer())
diff --git a/src/deckgl-layers/src/cluster-layer/cluster-layer.ts b/src/deckgl-layers/src/cluster-layer/cluster-layer.ts
index 667049b09..364b17e07 100644
--- a/src/deckgl-layers/src/cluster-layer/cluster-layer.ts
+++ b/src/deckgl-layers/src/cluster-layer/cluster-layer.ts
@@ -26,6 +26,7 @@ const defaultGetColorValue = points => points.length;
const defaultGetRadiusValue = cell =>
cell.filteredPoints ? cell.filteredPoints.length : cell.points.length;
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
function processGeoJSON(this: CPUAggregator, step, props, aggregation, {viewport}) {
const {data, getPosition, filterData} = props;
const geoJSON = getGeoJSON(data, getPosition, filterData);
@@ -34,6 +35,7 @@ function processGeoJSON(this: CPUAggregator, step, props, aggregation, {viewport
this.setState({geoJSON, clusterBuilder});
}
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
function getClusters(this: CPUAggregator, step, props, aggregation, {viewport}) {
const {geoJSON, clusterBuilder} = this.state;
const {clusterRadius, zoom, width, height} = props;
diff --git a/src/deckgl-layers/src/deckgl-extensions/filter-arrow-layer.ts b/src/deckgl-layers/src/deckgl-extensions/filter-arrow-layer.ts
index abec027ae..6b25a2649 100644
--- a/src/deckgl-layers/src/deckgl-extensions/filter-arrow-layer.ts
+++ b/src/deckgl-layers/src/deckgl-extensions/filter-arrow-layer.ts
@@ -2,7 +2,6 @@
// Copyright contributors to the kepler.gl project
import {Layer, LayerExtension} from '@deck.gl/core';
-import {LayerContext} from '@deck.gl/core/lib/layer';
import GL from '@luma.gl/constants';
import shaderModule from './filter-shader-module';
@@ -30,14 +29,14 @@ export default class FilterArrowExtension extends LayerExtension {
static defaultProps = defaultProps;
static extensionName = 'FilterArrowExtension';
- getShaders(extension: any) {
+ getShaders() {
return {
modules: [shaderModule],
defines: {}
};
}
- initializeState(this: Layer<FilterArrowExtensionProps>, context: LayerContext, extension: this) {
+ initializeState(this: Layer<FilterArrowExtensionProps>) {
const attributeManager = this.getAttributeManager();
if (attributeManager) {
attributeManager.add({
diff --git a/src/deckgl-layers/src/deckgl-extensions/filter-shader-module.ts b/src/deckgl-layers/src/deckgl-extensions/filter-shader-module.ts
index 38a34f2d7..757390cd1 100644
--- a/src/deckgl-layers/src/deckgl-extensions/filter-shader-module.ts
+++ b/src/deckgl-layers/src/deckgl-extensions/filter-shader-module.ts
@@ -35,8 +35,10 @@ const inject = {
export default {
name: 'filter-arrow',
dependencies: [project],
- vs: vs,
- fs: fs,
- inject: inject,
- getUniforms: () => {}
+ vs,
+ fs,
+ inject,
+ getUniforms: () => {
+ return;
+ }
};
diff --git a/src/deckgl-layers/src/layer-utils/cpu-aggregator.ts b/src/deckgl-layers/src/layer-utils/cpu-aggregator.ts
index fa30b9214..a48b642c3 100644
--- a/src/deckgl-layers/src/layer-utils/cpu-aggregator.ts
+++ b/src/deckgl-layers/src/layer-utils/cpu-aggregator.ts
@@ -84,7 +84,9 @@ export function getScaleFunctor(scaleType) {
return SCALE_FUNC[scaleType] || SCALE_FUNC.quantize;
}
-function nop() {}
+function nop() {
+ return;
+}
export function getGetValue(this: CPUAggregator, step, props, dimensionUpdater) {
const {key} = dimensionUpdater;
@@ -209,7 +211,7 @@ export const defaultAggregation: AggregationType = {
]
};
-function getSubLayerAccessor(dimensionState, dimension, layerProps) {
+function getSubLayerAccessor(dimensionState, dimension) {
return cell => {
const {sortedBins, scaleFunc} = dimensionState;
const bin = sortedBins.binMap[cell.index];
@@ -369,7 +371,12 @@ export const defaultElevationDimension: DimensionType<number> = {
export const defaultDimensions = [defaultColorDimension, defaultElevationDimension];
-export type CPUAggregatorState = {layerData: {data?}; dimensions: {}; geoJSON?; clusterBuilder?};
+export type CPUAggregatorState = {
+ layerData: {data?};
+ dimensions: object;
+ geoJSON?;
+ clusterBuilder?;
+};
export default class CPUAggregator {
static getDimensionScale: any;
@@ -571,10 +578,8 @@ export default class CPUAggregator {
const updateTriggers = {};
for (const key in this.dimensionUpdaters) {
- const {
- accessor,
- updateSteps
- }: {accessor; updateSteps: UpdateStepsType[]} = this.dimensionUpdaters[key];
+ const {accessor, updateSteps}: {accessor; updateSteps: UpdateStepsType[]} =
+ this.dimensionUpdaters[key];
// fold dimension triggers into each accessor
updateTriggers[accessor] = {};
@@ -633,7 +638,7 @@ export default class CPUAggregator {
}
getAccessor(dimensionKey, layerProps) {
- if (!this.dimensionUpdaters.hasOwnProperty(dimensionKey)) {
+ if (!Object.prototype.hasOwnProperty.call(this.dimensionUpdaters, dimensionKey)) {
return nop;
}
return this.dimensionUpdaters[dimensionKey].getSubLayerAccessor(
diff --git a/src/deckgl-layers/src/svg-icon-layer/svg-icon-layer.ts b/src/deckgl-layers/src/svg-icon-layer/svg-icon-layer.ts
index e0e3262dd..cdc066a79 100644
--- a/src/deckgl-layers/src/svg-icon-layer/svg-icon-layer.ts
+++ b/src/deckgl-layers/src/svg-icon-layer/svg-icon-layer.ts
@@ -11,7 +11,7 @@ import ScatterplotIconLayer from './scatterplot-icon-layer';
const DEFAULT_ICON_GEOMETRY = [1, 1, 0, 1, -1, 0, -1, -1, 0, -1, -1, 0, -1, 1, 0, 1, 1, 0];
const defaultProps = {
- getIconGeometry: (iconId: string) => DEFAULT_ICON_GEOMETRY,
+ getIconGeometry: () => DEFAULT_ICON_GEOMETRY,
getIcon: (d: {icon: string}) => d.icon
};
diff --git a/src/deckgl-layers/webpack/umd.js b/src/deckgl-layers/webpack/umd.js
index 655dc62f1..c7c03dd3c 100644
--- a/src/deckgl-layers/webpack/umd.js
+++ b/src/deckgl-layers/webpack/umd.js
@@ -10,7 +10,7 @@ const KeplerPackage = require('../package');
const SRC_DIR = resolve(__dirname, '../src');
const OUTPUT_DIR = resolve(__dirname, '../umd');
-const LIBRARY_BUNDLE_CONFIG = env => ({
+const LIBRARY_BUNDLE_CONFIG = () => ({
entry: {
KeplerGl: join(SRC_DIR, 'index.ts')
},
diff --git a/src/effects/src/custom-deck-lighting-effect.ts b/src/effects/src/custom-deck-lighting-effect.ts
index 5cff3e0a6..21a190089 100644
--- a/src/effects/src/custom-deck-lighting-effect.ts
+++ b/src/effects/src/custom-deck-lighting-effect.ts
@@ -49,7 +49,7 @@ CustomShadowModule.fs = insertBefore(
CustomShadowModule.getUniforms = (opts = {}, context = {}) => {
const u = shadow.getUniforms(opts, context);
if (opts.outputUniformShadow !== undefined) {
- u['u_outputUniformShadow'] = opts.outputUniformShadow;
+ u.u_outputUniformShadow = opts.outputUniformShadow;
}
return u;
};
diff --git a/src/effects/src/utils.ts b/src/effects/src/utils.ts
index 817bd4aee..68d365d3e 100644
--- a/src/effects/src/utils.ts
+++ b/src/effects/src/utils.ts
@@ -10,7 +10,6 @@ import PostProcessEffect from './post-processing-effect';
export function createEffect(params: EffectPropsPartial): EffectInterface {
if (params?.type === LIGHT_AND_SHADOW_EFFECT.type) {
return new LightingEffect(params);
- } else {
- return new PostProcessEffect(params);
}
+ return new PostProcessEffect(params);
}
diff --git a/src/effects/webpack/umd.js b/src/effects/webpack/umd.js
index 655dc62f1..c7c03dd3c 100644
--- a/src/effects/webpack/umd.js
+++ b/src/effects/webpack/umd.js
@@ -10,7 +10,7 @@ const KeplerPackage = require('../package');
const SRC_DIR = resolve(__dirname, '../src');
const OUTPUT_DIR = resolve(__dirname, '../umd');
-const LIBRARY_BUNDLE_CONFIG = env => ({
+const LIBRARY_BUNDLE_CONFIG = () => ({
entry: {
KeplerGl: join(SRC_DIR, 'index.ts')
},
diff --git a/src/layers/src/aggregation-layer.ts b/src/layers/src/aggregation-layer.ts
index a5c8c7ec6..0b580b419 100644
--- a/src/layers/src/aggregation-layer.ts
+++ b/src/layers/src/aggregation-layer.ts
@@ -31,10 +31,11 @@ export type AggregationLayerData = {
index: number;
};
-export const pointPosAccessor = ({lat, lng}: AggregationLayerColumns) => dc => d => [
- dc.valueAt(d.index, lng.fieldIdx),
- dc.valueAt(d.index, lat.fieldIdx)
-];
+export const pointPosAccessor =
+ ({lat, lng}: AggregationLayerColumns) =>
+ dc =>
+ d =>
+ [dc.valueAt(d.index, lng.fieldIdx), dc.valueAt(d.index, lat.fieldIdx)];
export const pointPosResolver = ({lat, lng}: AggregationLayerColumns) =>
`${lat.fieldIdx}-${lng.fieldIdx}`;
@@ -47,11 +48,10 @@ export const getValueAggrFunc = getPointData => (field, aggregation) => points =
)
: points.length;
-export const getFilterDataFunc = (
- filterRange: number[][],
- getFilterValue: (d: any) => number[]
-): ((d: any) => boolean) => pt =>
- getFilterValue(pt).every((val, i) => val >= filterRange[i][0] && val <= filterRange[i][1]);
+export const getFilterDataFunc =
+ (filterRange: number[][], getFilterValue: (d: any) => number[]): ((d: any) => boolean) =>
+ pt =>
+ getFilterValue(pt).every((val, i) => val >= filterRange[i][0] && val <= filterRange[i][1]);
const getLayerColorRange = (colorRange: ColorRange) => colorRange.colors.map(hexToRgb);
@@ -161,8 +161,9 @@ export default class AggregationLayer extends Layer {
label: typeof label === 'function' ? label(this.config) : label || '',
measure:
fieldConfig && aggregation
- ? `${this.config.visConfig[aggregation]} of ${fieldConfig.displayName ||
- fieldConfig.name}`
+ ? `${this.config.visConfig[aggregation]} of ${
+ fieldConfig.displayName || fieldConfig.name
+ }`
: defaultMeasure
};
}
@@ -175,6 +176,7 @@ export default class AggregationLayer extends Layer {
/**
* Aggregation layer handles visual channel aggregation inside deck.gl layer
*/
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
updateLayerVisualChannel({dataContainer}, channel) {
this.validateVisualChannel(channel);
}
@@ -247,7 +249,7 @@ export default class AggregationLayer extends Layer {
/**
* Aggregation layer handles visual channel aggregation inside deck.gl layer
*/
- updateLayerDomain(datasets, newFilter): AggregationLayer {
+ updateLayerDomain(): AggregationLayer {
return this;
}
@@ -258,7 +260,7 @@ export default class AggregationLayer extends Layer {
this.updateMeta({bounds});
}
- calculateDataAttribute({dataContainer, filteredIndex}: KeplerTable, getPosition) {
+ calculateDataAttribute({filteredIndex}: KeplerTable, getPosition) {
const data: AggregationLayerData[] = [];
for (let i = 0; i < filteredIndex.length; i++) {
diff --git a/src/layers/src/arc-layer/arc-layer.ts b/src/layers/src/arc-layer/arc-layer.ts
index 718e7c96b..0692df345 100644
--- a/src/layers/src/arc-layer/arc-layer.ts
+++ b/src/layers/src/arc-layer/arc-layer.ts
@@ -68,16 +68,18 @@ export type ArcLayerData = {
export type ArcLayerMeta = {
bounds: LayerBounds;
};
-export const arcPosAccessor = ({lat0, lng0, lat1, lng1}: ArcLayerColumnsConfig) => (
- dc: DataContainerInterface
-) => d => [
- dc.valueAt(d.index, lng0.fieldIdx),
- dc.valueAt(d.index, lat0.fieldIdx),
- 0,
- dc.valueAt(d.index, lng1.fieldIdx),
- dc.valueAt(d.index, lat1.fieldIdx),
- 0
-];
+export const arcPosAccessor =
+ ({lat0, lng0, lat1, lng1}: ArcLayerColumnsConfig) =>
+ (dc: DataContainerInterface) =>
+ d =>
+ [
+ dc.valueAt(d.index, lng0.fieldIdx),
+ dc.valueAt(d.index, lat0.fieldIdx),
+ 0,
+ dc.valueAt(d.index, lng1.fieldIdx),
+ dc.valueAt(d.index, lat1.fieldIdx),
+ 0
+ ];
export const arcRequiredColumns = ['lat0', 'lng0', 'lat1', 'lng1'];
export const arcColumnLabels = {
@@ -161,9 +163,9 @@ export default class ArcLayer extends Layer {
};
}
- static findDefaultLayerProps({
- fieldPairs = []
- }: KeplerTable): {props: {color?: RGBColor; columns: ArcLayerColumnsConfig; label: string}[]} {
+ static findDefaultLayerProps({fieldPairs = []}: KeplerTable): {
+ props: {color?: RGBColor; columns: ArcLayerColumnsConfig; label: string}[];
+ } {
if (fieldPairs.length < 2) {
return {props: []};
}
@@ -183,7 +185,7 @@ export default class ArcLayer extends Layer {
return {props: [props]};
}
- calculateDataAttribute({dataContainer, filteredIndex}, getPosition) {
+ calculateDataAttribute({filteredIndex}, getPosition) {
const data: ArcLayerData[] = [];
for (let i = 0; i < filteredIndex.length; i++) {
const index = filteredIndex[i];
diff --git a/src/layers/src/base-layer.ts b/src/layers/src/base-layer.ts
index 1befef1be..52a8a1c36 100644
--- a/src/layers/src/base-layer.ts
+++ b/src/layers/src/base-layer.ts
@@ -175,7 +175,7 @@ export type UpdateTriggers = {
[key: string]: UpdateTrigger;
};
export type UpdateTrigger = {
- [key: string]: {};
+ [key: string]: any;
};
export type LayerBounds = [number, number, number, number];
export type FindDefaultLayerPropsReturnValue = {props: any[]; foundLayers?: any[]};
@@ -188,6 +188,7 @@ const MAX_SAMPLE_SIZE = 5000;
const defaultDomain: [number, number] = [0, 1];
const dataFilterExtension = new DataFilterExtension({filterSize: MAX_GPU_FILTERS});
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
const defaultDataAccessor = dc => d => d;
const defaultGetFieldValue = (field, d) => field.valueAccessor(d);
@@ -536,14 +537,14 @@ class Layer {
return this.config.columns;
}
- const {pair: partnerKey, fieldPairKey} = this.columnPairs?.[key];
+ const {pair: partnerKey, fieldPairKey} = this.columnPairs?.[key] || {};
if (!pair[fieldPairKey]) {
// do not allow `key: undefined` to creep into the `updatedColumn` object
return this.config.columns;
}
- const {fieldPairKey: partnerFieldPairKey} = this.columnPairs?.[partnerKey];
+ const {fieldPairKey: partnerFieldPairKey} = this.columnPairs?.[partnerKey] || {};
return {
...this.config.columns,
@@ -576,14 +577,17 @@ class Layer {
: 1;
}
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
formatLayerData(datasets: Datasets, oldLayerData?: any) {
return {};
}
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
renderLayer(...args: any[]): any[] {
return [];
}
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
getHoverData(object, dataContainer: DataContainerInterface, fields: Field[]) {
if (!object) {
return null;
@@ -684,7 +688,7 @@ class Layer {
this.visConfigSettings[item] = LAYER_VIS_CONFIGS[configItem];
} else if (
typeof configItem === 'object' &&
- ['type', 'defaultValue'].every(p => configItem.hasOwnProperty(p))
+ ['type', 'defaultValue'].every(p => Object.prototype.hasOwnProperty.call(configItem, p))
) {
// if provided customized visConfig, and has type && defaultValue
// TODO: further check if customized visConfig is valid
@@ -815,7 +819,7 @@ class Layer {
newConfig.colorRangeConfig &&
['reversed', 'steps'].some(
key =>
- newConfig.colorRangeConfig.hasOwnProperty(key) &&
+ Object.prototype.hasOwnProperty.call(newConfig.colorRangeConfig, key) &&
newConfig.colorRangeConfig[key] !==
(previous[prop] || DEFAULT_COLOR_UI).colorRangeConfig[key]
);
@@ -826,7 +830,7 @@ class Layer {
const colorRange = visConfig[prop];
// find based on step or reversed
let update;
- if (newConfig.colorRangeConfig.hasOwnProperty('steps')) {
+ if (Object.prototype.hasOwnProperty.call(newConfig.colorRangeConfig, 'steps')) {
const group = getColorGroupByName(colorRange);
if (group) {
@@ -840,7 +844,7 @@ class Layer {
}
}
- if (newConfig.colorRangeConfig.hasOwnProperty('reversed')) {
+ if (Object.prototype.hasOwnProperty.call(newConfig.colorRangeConfig, 'reversed')) {
update = reverseColorRange(reversed, update || colorRange);
}
@@ -1398,15 +1402,18 @@ class Layer {
}, []);
}
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
calculateDataAttribute(keplerTable: KeplerTable, getPosition): any {
// implemented in subclasses
return [];
}
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
updateLayerMeta(dataContainer: DataContainerInterface, getPosition) {
// implemented in subclasses
}
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
getPositionAccessor(dataContainer?: DataContainerInterface): (...args: any[]) => any {
// implemented in subclasses
return () => null;
diff --git a/src/layers/src/base.tsx b/src/layers/src/base.tsx
index 71f121631..674fb04a9 100644
--- a/src/layers/src/base.tsx
+++ b/src/layers/src/base.tsx
@@ -8,7 +8,9 @@ const getStyleClassFromColor = (totalColor: number, colors: string[]) =>
.fill(1)
.reduce((accu, c, i) => `${accu}.cr${i + 1} {fill:${colors[i % colors.length]};}`, '');
-const nop = () => {};
+const nop = () => {
+ return;
+};
export type BaseProps = {
/** Set the height of the icon, ex. '16px' */
diff --git a/src/layers/src/editor-layer/editor-layer.ts b/src/layers/src/editor-layer/editor-layer.ts
index 9c6f34bb1..d9279c3ee 100644
--- a/src/layers/src/editor-layer/editor-layer.ts
+++ b/src/layers/src/editor-layer/editor-layer.ts
@@ -89,7 +89,7 @@ export function getEditorLayer({
onEdit: ({updatedData, editType}) => {
switch (editType) {
- case EDIT_TYPES.ADD_FEATURE:
+ case EDIT_TYPES.ADD_FEATURE: {
const {features: _features} = updatedData;
if (_features.length) {
const lastFeature = _features[_features.length - 1];
@@ -99,6 +99,7 @@ export function getEditorLayer({
setSelectedFeature(lastFeature);
}
break;
+ }
case EDIT_TYPES.ADD_POSITION:
case EDIT_TYPES.MOVE_POSITION:
case EDIT_TYPES.TRANSLATING:
@@ -133,7 +134,7 @@ export function getEditorLayer({
extensions: [new PathStyleExtension({dash: true})],
dashGapPickable: true,
- getDashArray: (feature, _isSelected) => {
+ getDashArray: feature => {
if (feature?.properties?.guideType === 'tentative') {
return LINE_STYLE.dashArray;
}
diff --git a/src/layers/src/editor-layer/feature-styles.ts b/src/layers/src/editor-layer/feature-styles.ts
index 56e4f1011..c80b177f5 100644
--- a/src/layers/src/editor-layer/feature-styles.ts
+++ b/src/layers/src/editor-layer/feature-styles.ts
@@ -42,14 +42,12 @@ export const FEATURE_STYLE = {
};
export const LINE_STYLE = {
- getColor: (feature: Feature, isSelected, mode: string): RGBAColor =>
+ getColor: (_feature: Feature, isSelected: boolean): RGBAColor =>
isSelected ? PRIMARY_COLOR : PRIMARY_COLOR,
- getWidth: (feature: Feature, isSelected, mode: string): number =>
+ getWidth: (_feature: Feature, isSelected: boolean): number =>
isSelected ? STROKE_WIDTH_SELECTED : STROKE_WIDTH_NOT_SELECTED,
- getTentativeLineColor: (feature: Feature, isSelected: boolean): RGBAColor =>
- TENTATIVE_FEATURE_COLOR,
- getTentativeLineWidth: (feature: Feature, isSelected: boolean): number =>
- STROKE_WIDTH_NOT_SELECTED,
+ getTentativeLineColor: (): RGBAColor => TENTATIVE_FEATURE_COLOR,
+ getTentativeLineWidth: (): number => STROKE_WIDTH_NOT_SELECTED,
getTentativeFillColor: TENTATIVE_FEATURE_COLOR_TRANSPARENT,
dashArray: STROKE_DASH_ARRAY,
solidArray: STROKE_SOLID_ARRAY,
diff --git a/src/layers/src/geojson-layer/geojson-layer.ts b/src/layers/src/geojson-layer/geojson-layer.ts
index 2b97b267e..b209f8baf 100644
--- a/src/layers/src/geojson-layer/geojson-layer.ts
+++ b/src/layers/src/geojson-layer/geojson-layer.ts
@@ -168,17 +168,21 @@ type ObjectInfo = {
id?: string;
};
-export const featureAccessor = ({geojson}: GeoJsonLayerColumnsConfig) => (
- dc: DataContainerInterface
-) => d => dc.valueAt(d.index, geojson.fieldIdx);
-
-const geoColumnAccessor = ({geojson}: GeoJsonLayerColumnsConfig) => (
- dc: DataContainerInterface
-): arrow.Vector | null => dc.getColumn?.(geojson.fieldIdx) as arrow.Vector;
-
-const geoFieldAccessor = ({geojson}: GeoJsonLayerColumnsConfig) => (
- dc: DataContainerInterface
-): Field | null => (dc.getField ? dc.getField(geojson.fieldIdx) : null);
+export const featureAccessor =
+ ({geojson}: GeoJsonLayerColumnsConfig) =>
+ (dc: DataContainerInterface) =>
+ d =>
+ dc.valueAt(d.index, geojson.fieldIdx);
+
+const geoColumnAccessor =
+ ({geojson}: GeoJsonLayerColumnsConfig) =>
+ (dc: DataContainerInterface): arrow.Vector | null =>
+ dc.getColumn?.(geojson.fieldIdx) as arrow.Vector;
+
+const geoFieldAccessor =
+ ({geojson}: GeoJsonLayerColumnsConfig) =>
+ (dc: DataContainerInterface): Field | null =>
+ dc.getField ? dc.getField(geojson.fieldIdx) : null;
// access feature properties from geojson sub layer
export const defaultElevation = 500;
@@ -346,7 +350,7 @@ export default class GeoJsonLayer extends Layer {
return null;
}
- calculateDataAttribute({dataContainer, filteredIndex}, getPosition) {
+ calculateDataAttribute({dataContainer, filteredIndex}) {
if (dataContainer instanceof ArrowDataContainer) {
// filter geojson/arrow table by values and make a partial copy of the raw table are expensive
// so we will use filteredIndex to create an attribute e.g. filteredIndex [0|1] for GPU filtering
@@ -386,7 +390,7 @@ export default class GeoJsonLayer extends Layer {
};
const indexAccessor = f => f.properties.index;
- const dataAccessor = dc => d => ({index: d.properties.index});
+ const dataAccessor = () => d => ({index: d.properties.index});
const accessors = this.getAttributeAccessors({dataAccessor, dataContainer});
const isFilteredAccessor = d => {
@@ -404,7 +408,7 @@ export default class GeoJsonLayer extends Layer {
};
}
- isInPolygon(data: DataContainerInterface, index: number, polygon: Feature<Polygon>): Boolean {
+ isInPolygon(data: DataContainerInterface, index: number, polygon: Feature<Polygon>): boolean {
if (this.centroids.length === 0 || !this.centroids[index]) {
return false;
}
@@ -414,7 +418,7 @@ export default class GeoJsonLayer extends Layer {
if (!point) return false;
// quick check if centroid is within the query rectangle
if (isReactangleSearchBox && polygon.properties?.bbox) {
- const [minX, minY, maxX, maxY] = polygon.properties?.bbox;
+ const [minX, minY, maxX, maxY] = polygon?.properties?.bbox || [];
return point[0] >= minX && point[0] <= maxX && point[1] >= minY && point[1] <= maxY;
}
// use turf.js to check if centroid is within query polygon
@@ -433,26 +437,25 @@ export default class GeoJsonLayer extends Layer {
if (this.dataToFeature.length < dataContainer.numChunks()) {
// for incrementally loading data, we only load and render the latest batch; otherwise, we will load and render all batches
const isIncrementalLoad = dataContainer.numChunks() - this.dataToFeature.length === 1;
- const {dataToFeature, bounds, fixedRadius, featureTypes, centroids} = getGeojsonLayerMetaFromArrow({
- dataContainer,
- getGeoColumn,
- getGeoField,
- ...(isIncrementalLoad ? {chunkIndex: this.dataToFeature.length} : null)
- });
+ const {dataToFeature, bounds, fixedRadius, featureTypes, centroids} =
+ getGeojsonLayerMetaFromArrow({
+ dataContainer,
+ getGeoColumn,
+ getGeoField,
+ ...(isIncrementalLoad ? {chunkIndex: this.dataToFeature.length} : null)
+ });
if (centroids) this.centroids = this.centroids.concat(centroids);
this.updateMeta({bounds, fixedRadius, featureTypes});
this.dataToFeature = [...this.dataToFeature, ...dataToFeature];
}
- } else {
- if (this.dataToFeature.length === 0) {
- const {dataToFeature, bounds, fixedRadius, featureTypes, centroids} = getGeojsonLayerMeta({
- dataContainer,
- getFeature
- });
- if (centroids) this.centroids = centroids;
- this.dataToFeature = dataToFeature;
- this.updateMeta({bounds, fixedRadius, featureTypes});
- }
+ } else if (this.dataToFeature.length === 0) {
+ const {dataToFeature, bounds, fixedRadius, featureTypes, centroids} = getGeojsonLayerMeta({
+ dataContainer,
+ getFeature
+ });
+ if (centroids) this.centroids = centroids;
+ this.dataToFeature = dataToFeature;
+ this.updateMeta({bounds, fixedRadius, featureTypes});
}
}
diff --git a/src/layers/src/geojson-layer/geojson-utils.ts b/src/layers/src/geojson-layer/geojson-utils.ts
index 42e6fbf1d..9aaf707c9 100644
--- a/src/layers/src/geojson-layer/geojson-utils.ts
+++ b/src/layers/src/geojson-layer/geojson-utils.ts
@@ -5,7 +5,7 @@ import {Feature, BBox} from 'geojson';
import normalize from '@mapbox/geojson-normalize';
import bbox from '@turf/bbox';
import center from '@turf/center';
-import {AllGeoJSON} from '@turf/helpers'
+import {AllGeoJSON} from '@turf/helpers';
import {parseSync} from '@loaders.gl/core';
import {WKBLoader, WKTLoader} from '@loaders.gl/wkt';
import {binaryToGeometry} from '@loaders.gl/gis';
@@ -70,7 +70,9 @@ export function getGeojsonLayerMeta({
// get bounds from features
const bounds = getGeojsonBounds(dataToFeature);
// if any of the feature has properties.radius set to be true
- const fixedRadius = Boolean(dataToFeature.find(d => d && 'properties' in d && d.properties?.radius));
+ const fixedRadius = Boolean(
+ dataToFeature.find(d => d && 'properties' in d && d.properties?.radius)
+ );
// keep a record of what type of geometry the collection has
const featureTypes = getGeojsonFeatureTypes(dataToFeature);
diff --git a/src/layers/src/h3-hexagon-layer/h3-hexagon-layer.ts b/src/layers/src/h3-hexagon-layer/h3-hexagon-layer.ts
index 8ae6f4f59..ef49b4a56 100644
--- a/src/layers/src/h3-hexagon-layer/h3-hexagon-layer.ts
+++ b/src/layers/src/h3-hexagon-layer/h3-hexagon-layer.ts
@@ -92,9 +92,11 @@ export type HexagonIdLayerData = {index: number; id; centroid: Centroid};
const DEFAULT_LINE_SCALE_VALUE = 8;
export const hexIdRequiredColumns: ['hex_id'] = ['hex_id'];
-export const hexIdAccessor = ({hex_id}: HexagonIdLayerColumnsConfig) => (
- dc: DataContainerInterface
-) => d => dc.valueAt(d.index, hex_id.fieldIdx);
+export const hexIdAccessor =
+ ({hex_id}: HexagonIdLayerColumnsConfig) =>
+ (dc: DataContainerInterface) =>
+ d =>
+ dc.valueAt(d.index, hex_id.fieldIdx);
export const defaultElevation = 500;
export const defaultCoverage = 1;
@@ -285,7 +287,7 @@ export default class HexagonIdLayer extends Layer {
};
}
- calculateDataAttribute({dataContainer, filteredIndex}: KeplerTable, getHexId) {
+ calculateDataAttribute({filteredIndex}: KeplerTable, getHexId) {
const data: HexagonIdLayerData[] = [];
for (let i = 0; i < filteredIndex.length; i++) {
@@ -306,7 +308,7 @@ export default class HexagonIdLayer extends Layer {
// TODO: fix complexity
/* eslint-disable complexity */
- formatLayerData(datasets, oldLayerData, opt = {}) {
+ formatLayerData(datasets, oldLayerData) {
if (this.config.dataId === null) {
return {};
}
diff --git a/src/layers/src/heatmap-layer/heatmap-layer.ts b/src/layers/src/heatmap-layer/heatmap-layer.ts
index f4368b7d4..3dae6678e 100644
--- a/src/layers/src/heatmap-layer/heatmap-layer.ts
+++ b/src/layers/src/heatmap-layer/heatmap-layer.ts
@@ -38,9 +38,11 @@ export type HeatmapLayerConfig = Merge<
export const MAX_ZOOM_LEVEL = 18;
-export const pointPosAccessor = ({lat, lng}: HeatmapLayerColumnsConfig) => (
- dc: DataContainerInterface
-) => d => [dc.valueAt(d.index, lng.fieldIdx), dc.valueAt(d.index, lat.fieldIdx)];
+export const pointPosAccessor =
+ ({lat, lng}: HeatmapLayerColumnsConfig) =>
+ (dc: DataContainerInterface) =>
+ d =>
+ [dc.valueAt(d.index, lng.fieldIdx), dc.valueAt(d.index, lat.fieldIdx)];
export const pointColResolver = ({lat, lng}: HeatmapLayerColumnsConfig) =>
`${lat.fieldIdx}-${lng.fieldIdx}`;
@@ -72,9 +74,7 @@ const heatmapDensity = (colorRange: ColorRange): (string | number)[] => {
const colors: HexColor[] = ['#000000', ...colorRange.colors];
- const scale = scaleFunction<HexColor>()
- .domain([0, 1])
- .range(colors);
+ const scale = scaleFunction<HexColor>().domain([0, 1]).range(colors);
const colorDensity = scale.range().reduce((bands: (string | number)[], level) => {
const invert = scale.invertExtent(level);
@@ -141,7 +141,8 @@ class HeatmapLayer extends MapboxGLLayer {
getDefaultLayerConfig(props: LayerBaseConfigPartial): HeatmapLayerConfig {
// mapbox heatmap layer color is always based on density
// no need to set colorField, colorDomain and colorScale
- // eslint-disable-next-line no-unused-vars
+
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
const {colorField, colorDomain, colorScale, ...layerConfig} = {
...super.getDefaultLayerConfig(props),
diff --git a/src/layers/src/icon-layer/icon-info-modal.tsx b/src/layers/src/icon-layer/icon-info-modal.tsx
index 84b3cd554..8f4fd0873 100644
--- a/src/layers/src/icon-layer/icon-info-modal.tsx
+++ b/src/layers/src/icon-layer/icon-info-modal.tsx
@@ -16,8 +16,8 @@ const lineFunction = line()
.x(d => d[0] * 10)
.y(d => d[1] * 10);
-const IconShape = ({mesh, className}) => (
- <svg width="20px" height="20px">
+const IconShape = ({mesh}) => (
+ <svg className="icon-table__item__shape" width="20px" height="20px">
<g transform="translate(10, 10)">
{mesh.cells.map((cell, i) => (
<path key={i} fill="#000000" d={lineFunction(cell.map(idx => mesh.positions[idx]))} />
@@ -50,7 +50,7 @@ const StyledTitle = styled.div`
const IconItem = ({icon: {id, mesh}}) => (
<StyledIconItem className="icon-table__item">
- <IconShape className="icon-table__item__shape" mesh={mesh} />
+ <IconShape mesh={mesh} />
<div className="icon-table_item__name">
<StyledCode>{id}</StyledCode>
</div>
diff --git a/src/layers/src/icon-layer/icon-layer.ts b/src/layers/src/icon-layer/icon-layer.ts
index 1649ac854..56dc080d3 100644
--- a/src/layers/src/icon-layer/icon-layer.ts
+++ b/src/layers/src/icon-layer/icon-layer.ts
@@ -30,7 +30,7 @@ export type IconLayerColumnsConfig = {
icon: LayerColumn;
};
-type IconGeometry = {} | null;
+type IconGeometry = object | null;
export type IconLayerVisConfigSettings = {
radius: VisConfigNumber;
@@ -59,16 +59,21 @@ const brushingExtension = new BrushingExtension();
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
-];
+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
+ ];
-export const iconAccessor = ({icon}: IconLayerColumnsConfig) => (dc: DataContainerInterface) => d =>
- dc.valueAt(d.index, icon.fieldIdx);
+export const iconAccessor =
+ ({icon}: IconLayerColumnsConfig) =>
+ (dc: DataContainerInterface) =>
+ d =>
+ dc.valueAt(d.index, icon.fieldIdx);
export const iconRequiredColumns: ['lat', 'lng', 'icon'] = ['lat', 'lng', 'icon'];
export const iconOptionalColumns: ['altitude'] = ['altitude'];
diff --git a/src/layers/src/index.ts b/src/layers/src/index.ts
index 9cabb9f49..022e83109 100644
--- a/src/layers/src/index.ts
+++ b/src/layers/src/index.ts
@@ -25,7 +25,13 @@ export {defaultElevation as h3DefaultElevation} from './h3-hexagon-layer/h3-hexa
import {default as ScenegraphLayer} from './scenegraph-layer/scenegraph-layer';
import {default as TripLayer} from './trip-layer/trip-layer';
export {defaultLineWidth as tripDefaultLineWidth} from './trip-layer/trip-layer';
-export {coordHasLength4, containValidTime, isTripGeoJsonField, parseTripGeoJsonTimestamp, getAnimationDomainFromTimestamps} from './trip-layer/trip-utils';
+export {
+ coordHasLength4,
+ containValidTime,
+ isTripGeoJsonField,
+ parseTripGeoJsonTimestamp,
+ getAnimationDomainFromTimestamps
+} from './trip-layer/trip-utils';
import {default as S2GeometryLayer} from './s2-geometry-layer/s2-geometry-layer';
export {defaultElevation as s2DefaultElevation} from './s2-geometry-layer/s2-geometry-layer';
export {getS2Center} from './s2-geometry-layer/s2-utils';
@@ -86,12 +92,25 @@ export {default as Table} from './table';
export {getEditorLayer} from './editor-layer/editor-layer';
-export {default as ScenegraphLayer, scenegraphVisConfigs} from './scenegraph-layer/scenegraph-layer';
+export {
+ default as ScenegraphLayer,
+ scenegraphVisConfigs
+} from './scenegraph-layer/scenegraph-layer';
export {default as ScenegraphLayerIcon} from './scenegraph-layer/scenegraph-layer-icon';
-import {isDrawingActive, onClick, onHover, getTooltip, getCursor} from './editor-layer/editor-layer-utils';
+import {
+ isDrawingActive,
+ onClick,
+ onHover,
+ getTooltip,
+ getCursor
+} from './editor-layer/editor-layer-utils';
export const EditorLayerUtils = {
- isDrawingActive, onClick, onHover, getTooltip, getCursor
+ isDrawingActive,
+ onClick,
+ onHover,
+ getTooltip,
+ getCursor
};
export {getFilterDataFunc} from './aggregation-layer';
diff --git a/src/layers/src/layer-text-label.ts b/src/layers/src/layer-text-label.ts
index 8c6f7130b..bfcfa005b 100644
--- a/src/layers/src/layer-text-label.ts
+++ b/src/layers/src/layer-text-label.ts
@@ -35,6 +35,7 @@ export function getTextOffsetByRadius(radiusScale, getRadius, mapState) {
};
}
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
export const textLabelAccessor = textLabel => dc => d => {
const val = textLabel.field.valueAccessor(d);
return notNullorUndefined(val) ? String(val) : '';
diff --git a/src/layers/src/line-layer/line-layer.ts b/src/layers/src/line-layer/line-layer.ts
index 1fdd53f90..fe6f6784d 100644
--- a/src/layers/src/line-layer/line-layer.ts
+++ b/src/layers/src/line-layer/line-layer.ts
@@ -51,16 +51,18 @@ export type LineLayerConfig = Merge<
{columns: LineLayerColumnsConfig; visConfig: LineLayerVisConfig}
>;
-export const linePosAccessor = ({lat0, lng0, lat1, lng1, alt0, alt1}: LineLayerColumnsConfig) => (
- dc: DataContainerInterface
-) => d => [
- dc.valueAt(d.index, lng0.fieldIdx),
- dc.valueAt(d.index, lat0.fieldIdx),
- alt0 && alt0.fieldIdx > -1 ? dc.valueAt(d.index, alt0.fieldIdx) : 0,
- dc.valueAt(d.index, lng1.fieldIdx),
- dc.valueAt(d.index, lat1.fieldIdx),
- alt1 && alt1?.fieldIdx > -1 ? dc.valueAt(d.index, alt1.fieldIdx) : 0
-];
+export const linePosAccessor =
+ ({lat0, lng0, lat1, lng1, alt0, alt1}: LineLayerColumnsConfig) =>
+ (dc: DataContainerInterface) =>
+ d =>
+ [
+ dc.valueAt(d.index, lng0.fieldIdx),
+ dc.valueAt(d.index, lat0.fieldIdx),
+ alt0 && alt0.fieldIdx > -1 ? dc.valueAt(d.index, alt0.fieldIdx) : 0,
+ dc.valueAt(d.index, lng1.fieldIdx),
+ dc.valueAt(d.index, lat1.fieldIdx),
+ alt1 && alt1?.fieldIdx > -1 ? dc.valueAt(d.index, alt1.fieldIdx) : 0
+ ];
export const lineRequiredColumns: ['lat0', 'lng0', 'lat1', 'lng1'] = [
'lat0',
diff --git a/src/layers/src/mapbox-utils.ts b/src/layers/src/mapbox-utils.ts
index 0751f6d79..45ad5c6b6 100644
--- a/src/layers/src/mapbox-utils.ts
+++ b/src/layers/src/mapbox-utils.ts
@@ -141,8 +141,8 @@ function updateSourceData(map, sourceId, data) {
*/
export function geoJsonFromData(
filteredIndex: number[] = [],
- getGeometry: {({index: number}): any},
- getProperties: {({index: number}): any} = d => {}
+ getGeometry: (arg: {index: number}) => any,
+ getProperties: (arg: {index: number}) => object
) {
const geojson: {type: string; features: Feature[]} = {
type: 'FeatureCollection',
diff --git a/src/layers/src/mapboxgl-layer.ts b/src/layers/src/mapboxgl-layer.ts
index 1f4f547a7..e9dc0b467 100644
--- a/src/layers/src/mapboxgl-layer.ts
+++ b/src/layers/src/mapboxgl-layer.ts
@@ -125,7 +125,7 @@ class MapboxLayerGL extends Layer {
}),
{}
)
- : d => ({});
+ : () => ({});
const {filterValueUpdateTriggers, filterValueAccessor} = gpuFilter;
@@ -144,7 +144,7 @@ class MapboxLayerGL extends Layer {
{}
) as any;
}
- : d => ({} as any);
+ : () => ({} as any);
const getProperties = d => ({
...getPropertyFromVisualChanel(d),
diff --git a/src/layers/src/point-layer/point-layer.ts b/src/layers/src/point-layer/point-layer.ts
index 9e5f908c7..068bf25c5 100644
--- a/src/layers/src/point-layer/point-layer.ts
+++ b/src/layers/src/point-layer/point-layer.ts
@@ -79,11 +79,15 @@ export type PointLayerData = {
index: number;
};
-export const pointPosAccessor = ({lat, lng, altitude}: PointLayerColumnsConfig) => dc => d => [
- dc.valueAt(d.index, lng.fieldIdx),
- dc.valueAt(d.index, lat.fieldIdx),
- altitude && altitude.fieldIdx > -1 ? dc.valueAt(d.index, altitude.fieldIdx) : 0
-];
+export const pointPosAccessor =
+ ({lat, lng, altitude}: PointLayerColumnsConfig) =>
+ dc =>
+ d =>
+ [
+ dc.valueAt(d.index, lng.fieldIdx),
+ dc.valueAt(d.index, lat.fieldIdx),
+ altitude && altitude.fieldIdx > -1 ? dc.valueAt(d.index, altitude.fieldIdx) : 0
+ ];
export const pointRequiredColumns: ['lat', 'lng'] = ['lat', 'lng'];
export const pointOptionalColumns: ['altitude'] = ['altitude'];
diff --git a/src/layers/src/s2-geometry-layer/s2-geometry-layer.ts b/src/layers/src/s2-geometry-layer/s2-geometry-layer.ts
index 67788836a..298939a19 100644
--- a/src/layers/src/s2-geometry-layer/s2-geometry-layer.ts
+++ b/src/layers/src/s2-geometry-layer/s2-geometry-layer.ts
@@ -91,9 +91,11 @@ export const S2_TOKEN_FIELDS: {
};
export const s2RequiredColumns: ['token'] = ['token'];
-export const S2TokenAccessor = ({token}: S2GeometryLayerColumnsConfig) => (
- dc: DataContainerInterface
-) => d => dc.valueAt(d.index, token.fieldIdx);
+export const S2TokenAccessor =
+ ({token}: S2GeometryLayerColumnsConfig) =>
+ (dc: DataContainerInterface) =>
+ d =>
+ dc.valueAt(d.index, token.fieldIdx);
export const defaultElevation = 500;
export const defaultLineWidth = 1;
@@ -252,7 +254,7 @@ export default class S2GeometryLayer extends Layer {
};
}
- calculateDataAttribute({dataContainer, filteredIndex}: KeplerTable, getS2Token) {
+ calculateDataAttribute({filteredIndex}: KeplerTable, getS2Token) {
const data: S2GeometryLayerData[] = [];
for (let i = 0; i < filteredIndex.length; i++) {
const index = filteredIndex[i];
@@ -291,7 +293,7 @@ export default class S2GeometryLayer extends Layer {
this.updateMeta({bounds});
}
- formatLayerData(datasets, oldLayerData, opt = {}) {
+ formatLayerData(datasets, oldLayerData) {
if (this.config.dataId === null) {
return {};
}
diff --git a/src/layers/src/scenegraph-layer/scenegraph-layer.ts b/src/layers/src/scenegraph-layer/scenegraph-layer.ts
index 69e2802da..73dcb57d1 100644
--- a/src/layers/src/scenegraph-layer/scenegraph-layer.ts
+++ b/src/layers/src/scenegraph-layer/scenegraph-layer.ts
@@ -56,13 +56,15 @@ function fetch(url, {propName, layer}: {propName?: string; layer?: any} = {}) {
return fetch(url).then(response => response.json());
}
-export const scenegraphPosAccessor = ({lat, lng, altitude}: ScenegraphLayerColumnsConfig) => (
- dc: DataContainerInterface
-) => d => [
- dc.valueAt(d.index, lng.fieldIdx),
- dc.valueAt(d.index, lat.fieldIdx),
- altitude && altitude.fieldIdx > -1 ? dc.valueAt(d.index, altitude.fieldIdx) : 0
-];
+export const scenegraphPosAccessor =
+ ({lat, lng, altitude}: ScenegraphLayerColumnsConfig) =>
+ (dc: DataContainerInterface) =>
+ d =>
+ [
+ dc.valueAt(d.index, lng.fieldIdx),
+ dc.valueAt(d.index, lat.fieldIdx),
+ altitude && altitude.fieldIdx > -1 ? dc.valueAt(d.index, altitude.fieldIdx) : 0
+ ];
export const scenegraphVisConfigs: {
opacity: 'opacity';
@@ -148,7 +150,7 @@ export default class ScenegraphLayer extends Layer {
};
}
- calculateDataAttribute({dataContainer, filteredIndex}: KeplerTable, getPosition) {
+ calculateDataAttribute({filteredIndex}: KeplerTable, getPosition) {
const data: ScenegraphLayerData[] = [];
for (let i = 0; i < filteredIndex.length; i++) {
diff --git a/src/layers/src/trip-layer/trip-info-modal.tsx b/src/layers/src/trip-layer/trip-info-modal.tsx
index 477926612..131468442 100644
--- a/src/layers/src/trip-layer/trip-info-modal.tsx
+++ b/src/layers/src/trip-layer/trip-info-modal.tsx
@@ -16,7 +16,7 @@ const StyledTitle = styled.div`
color: ${props => props.theme.titleColorLT};
`;
-const TripInfoModalFactory = (svgIcons = []) => {
+const TripInfoModalFactory = () => {
const TripInfoModal = () => (
<div className="trip-info-modal">
<div className="trip-info-modal__description">
diff --git a/src/layers/src/trip-layer/trip-layer.ts b/src/layers/src/trip-layer/trip-layer.ts
index 2f0930317..4bdb918f0 100644
--- a/src/layers/src/trip-layer/trip-layer.ts
+++ b/src/layers/src/trip-layer/trip-layer.ts
@@ -80,9 +80,11 @@ export const tripVisConfigs: {
};
export const geoJsonRequiredColumns: ['geojson'] = ['geojson'];
-export const featureAccessor = ({geojson}: TripLayerColumnsConfig) => (
- dc: DataContainerInterface
-) => d => dc.valueAt(d.index, geojson.fieldIdx);
+export const featureAccessor =
+ ({geojson}: TripLayerColumnsConfig) =>
+ (dc: DataContainerInterface) =>
+ d =>
+ dc.valueAt(d.index, geojson.fieldIdx);
export const featureResolver = ({geojson}: TripLayerColumnsConfig) => geojson.fieldIdx;
export default class TripLayer extends Layer {
@@ -91,7 +93,7 @@ export default class TripLayer extends Layer {
declare meta: TripLayerMeta;
dataToFeature: GeojsonDataMaps;
- dataToTimeStamp: {}[];
+ dataToTimeStamp: object[];
getFeature: (columns: TripLayerColumnsConfig) => (dataContainer: DataContainerInterface) => any;
_layerInfoModal: () => JSX.Element;
@@ -222,7 +224,7 @@ export default class TripLayer extends Layer {
return dataContainer.row(object.properties.index);
}
- calculateDataAttribute({dataContainer, filteredIndex}, getPosition) {
+ calculateDataAttribute({filteredIndex}) {
return filteredIndex
.map(i => this.dataToFeature[i])
.filter(d => d && d.geometry.type === 'LineString');
@@ -241,7 +243,7 @@ export default class TripLayer extends Layer {
};
const indexAccessor = f => f.properties.index;
- const dataAccessor = dc => d => ({index: d.properties.index});
+ const dataAccessor = () => d => ({index: d.properties.index});
const accessors = this.getAttributeAccessors({dataAccessor, dataContainer});
return {
diff --git a/src/localization/webpack/umd.js b/src/localization/webpack/umd.js
index 655dc62f1..c7c03dd3c 100644
--- a/src/localization/webpack/umd.js
+++ b/src/localization/webpack/umd.js
@@ -10,7 +10,7 @@ const KeplerPackage = require('../package');
const SRC_DIR = resolve(__dirname, '../src');
const OUTPUT_DIR = resolve(__dirname, '../umd');
-const LIBRARY_BUNDLE_CONFIG = env => ({
+const LIBRARY_BUNDLE_CONFIG = () => ({
entry: {
KeplerGl: join(SRC_DIR, 'index.ts')
},
diff --git a/src/processors/src/file-handler.ts b/src/processors/src/file-handler.ts
index ea9003cfd..7aa2d3a8e 100644
--- a/src/processors/src/file-handler.ts
+++ b/src/processors/src/file-handler.ts
@@ -6,18 +6,21 @@ import {parseInBatches} from '@loaders.gl/core';
import {JSONLoader, _JSONPath} from '@loaders.gl/json';
import {CSVLoader} from '@loaders.gl/csv';
import {ArrowLoader} from '@loaders.gl/arrow';
+import {Loader} from '@loaders.gl/loader-utils';
+import {generateHashId, isPlainObject, generateHashIdFromString} from '@kepler.gl/utils';
+import {DATASET_FORMATS} from '@kepler.gl/constants';
+import {LoadedMap, ProcessorResult} from '@kepler.gl/types';
+import {Feature, AddDataToMapPayload} from '@kepler.gl/types';
+import {FeatureCollection} from '@turf/helpers';
+
import {
processArrowBatches,
processGeojson,
processKeplerglJSON,
processRowObject
} from './data-processor';
-import {generateHashId, isPlainObject, generateHashIdFromString} from '@kepler.gl/utils';
-import {DATASET_FORMATS} from '@kepler.gl/constants';
-import {Loader} from '@loaders.gl/loader-utils';
+
import {FileCacheItem, ValidKeplerGlMap} from './types';
-import {Feature, AddDataToMapPayload} from '@kepler.gl/types';
-import {FeatureCollection} from '@turf/helpers';
const BATCH_TYPE = {
METADATA: 'metadata',
@@ -199,9 +202,9 @@ export function processFileData({
fileCache: FileCacheItem[];
}): Promise<FileCacheItem[]> {
return new Promise((resolve, reject) => {
- let {fileName, data} = content;
+ const {fileName, data} = content;
let format: string | undefined;
- let processor: Function | undefined;
+ let processor: ((data: any) => ProcessorResult | LoadedMap | null) | undefined;
// generate unique id with length of 4 using fileName string
const id = generateHashIdFromString(fileName);
diff --git a/src/processors/webpack/umd.js b/src/processors/webpack/umd.js
index 655dc62f1..c7c03dd3c 100644
--- a/src/processors/webpack/umd.js
+++ b/src/processors/webpack/umd.js
@@ -10,7 +10,7 @@ const KeplerPackage = require('../package');
const SRC_DIR = resolve(__dirname, '../src');
const OUTPUT_DIR = resolve(__dirname, '../umd');
-const LIBRARY_BUNDLE_CONFIG = env => ({
+const LIBRARY_BUNDLE_CONFIG = () => ({
entry: {
KeplerGl: join(SRC_DIR, 'index.ts')
},
diff --git a/src/reducers/src/combined-updaters.ts b/src/reducers/src/combined-updaters.ts
index 42c81919c..7ce54f149 100644
--- a/src/reducers/src/combined-updaters.ts
+++ b/src/reducers/src/combined-updaters.ts
@@ -92,10 +92,10 @@ export type KeplerGlState = {
* export default composedReducer;
*/
-/* eslint-disable no-unused-vars */
+/* eslint-disable @typescript-eslint/no-unused-vars */
// @ts-ignore
const combinedUpdaters = null;
-/* eslint-enable no-unused-vars */
+/* eslint-enable @typescript-eslint/no-unused-vars */
export const isValidConfig = config =>
isPlainObject(config) && isPlainObject(config.config) && config.version;
@@ -188,12 +188,7 @@ export const addDataToMapUpdater = (
})
),
- if_(
- Boolean(info),
- pick_('visState')(
- apply_<VisState, any>(setMapInfoUpdater, {info})
- )
- ),
+ if_(Boolean(info), pick_('visState')(apply_<VisState, any>(setMapInfoUpdater, {info}))),
with_(({visState}) =>
pick_('mapState')(
apply_(
@@ -209,7 +204,13 @@ export const addDataToMapUpdater = (
pick_('mapStyle')(apply_(styleMapConfigUpdater, payload_({config: parsedConfig, options}))),
pick_('uiState')(apply_(uiStateLoadFilesSuccessUpdater, payload_(null))),
pick_('uiState')(apply_(toggleModalUpdater, payload_(null))),
- pick_('uiState')(merge_(options.hasOwnProperty('readOnly') ? {readOnly: options.readOnly} : {}))
+ pick_('uiState')(
+ merge_(
+ Object.prototype.hasOwnProperty.call(options, 'readOnly')
+ ? {readOnly: options.readOnly}
+ : {}
+ )
+ )
])(state);
};
@@ -254,23 +255,22 @@ const updateOverlayBlending = overlayBlending => visState => {
* Helper which updates `darkBaseMapEnabled` in all the layers in visState which
* have this config setting (or in one specific layer if the `layerId` param is provided).
*/
-const updateDarkBaseMapLayers = (
- darkBaseMapEnabled: boolean,
- layerId: string | null = null
-) => visState => ({
- ...visState,
- layers: visState.layers.map(layer => {
- if (!layerId || layer.id === layerId) {
- if (layer.visConfigSettings.hasOwnProperty('darkBaseMapEnabled')) {
- const {visConfig} = layer.config;
- return layer.updateLayerConfig({
- visConfig: {...visConfig, darkBaseMapEnabled}
- });
+const updateDarkBaseMapLayers =
+ (darkBaseMapEnabled: boolean, layerId: string | null = null) =>
+ visState => ({
+ ...visState,
+ layers: visState.layers.map(layer => {
+ if (!layerId || layer.id === layerId) {
+ if (Object.prototype.hasOwnProperty.call(layer.visConfigSettings, 'darkBaseMapEnabled')) {
+ const {visConfig} = layer.config;
+ return layer.updateLayerConfig({
+ visConfig: {...visConfig, darkBaseMapEnabled}
+ });
+ }
}
- }
- return layer;
- })
-});
+ return layer;
+ })
+ });
/**
* Updater that changes the map style by calling mapStyleChangeUpdater on visState.
@@ -331,7 +331,7 @@ export const combinedLayerTypeChangeUpdater = (
const oldLayerIndex = visState.layers.findIndex(layer => layer === action.oldLayer);
visState = layerTypeChangeUpdater(visState, action);
const newLayer = visState.layers[oldLayerIndex];
- if (newLayer?.visConfigSettings.hasOwnProperty('darkBaseMapEnabled')) {
+ if (Object.prototype.hasOwnProperty.call(newLayer?.visConfigSettings, 'darkBaseMapEnabled')) {
const {mapStyle} = state;
const {colorMode} = mapStyle.mapStyles[mapStyle.styleType];
const {darkBaseMapEnabled} = newLayer.config.visConfig;
@@ -367,7 +367,7 @@ export const toggleSplitMapUpdater = (
...state,
visState: visStateToggleSplitMapUpdater(state.visState, action),
uiState: uiStateToggleSplitMapUpdater(state.uiState),
- mapState: mapStateToggleSplitMapUpdater(state.mapState, action)
+ mapState: mapStateToggleSplitMapUpdater(state.mapState)
};
const isSplit = newState.visState.splitMaps.length !== 0;
diff --git a/src/reducers/src/core.ts b/src/reducers/src/core.ts
index 883c0fdb8..979ffb356 100644
--- a/src/reducers/src/core.ts
+++ b/src/reducers/src/core.ts
@@ -38,15 +38,14 @@ const combined = (
});
};
-export const coreReducerFactory = (
- initialState: Partial<KeplerGlState> = {},
- extraReducers = {}
-) => (state, action) => {
- if (composers[action.type]) {
- return composers[action.type](state, action);
- }
- return combined(initialState, extraReducers)(state, action);
-};
+export const coreReducerFactory =
+ (initialState: Partial<KeplerGlState> = {}, extraReducers = {}) =>
+ (state, action) => {
+ if (composers[action.type]) {
+ return composers[action.type](state, action);
+ }
+ return combined(initialState, extraReducers)(state, action);
+ };
export default coreReducerFactory();
diff --git a/src/reducers/src/map-state-updaters.ts b/src/reducers/src/map-state-updaters.ts
index eae66823d..3e16ebbdc 100644
--- a/src/reducers/src/map-state-updaters.ts
+++ b/src/reducers/src/map-state-updaters.ts
@@ -47,11 +47,11 @@ import {MapState, Bounds, Viewport} from '@kepler.gl/types';
*
* export default composedReducer;
*/
-/* eslint-disable no-unused-vars */
+
+/* eslint-disable @typescript-eslint/no-unused-vars */
// @ts-ignore
const mapStateUpdaters = null;
-/* eslint-enable no-unused-vars */
-
+/* eslint-enable @typescript-eslint/no-unused-vars */
/**
* Default initial `mapState`
* @memberof mapStateUpdaters
@@ -199,10 +199,7 @@ export const fitBoundsUpdater = (
* @memberof mapStateUpdaters
* @public
*/
-export const togglePerspectiveUpdater = (
- state: MapState,
- action: MapStateActions.TogglePerspectiveUpdaterAction
-): MapState => {
+export const togglePerspectiveUpdater = (state: MapState): MapState => {
const newState = {
...state,
...{
@@ -287,10 +284,7 @@ export const receiveMapConfigUpdater = (
* @memberof mapStateUpdaters
* @public
*/
-export const toggleSplitMapUpdater = (
- state: MapState,
- action: MapStateActions.ToggleSplitMapUpdaterAction
-): MapState => ({
+export const toggleSplitMapUpdater = (state: MapState): MapState => ({
...state,
...getMapDimForSplitMap(!state.isSplit, state),
isSplit: !state.isSplit,
diff --git a/src/reducers/src/map-style-updaters.ts b/src/reducers/src/map-style-updaters.ts
index 20a3237fb..3850e3e09 100644
--- a/src/reducers/src/map-style-updaters.ts
+++ b/src/reducers/src/map-style-updaters.ts
@@ -136,10 +136,11 @@ const getDefaultState = (): MapStyle => {
*
* export default composedReducer;
*/
-/* eslint-disable no-unused-vars */
+
+/* eslint-disable @typescript-eslint/no-unused-vars */
// @ts-ignore
const mapStyleUpdaters = null;
-/* eslint-enable no-unused-vars */
+/* eslint-enable @typescript-eslint/no-unused-vars */
/**
* Default initial `mapStyle`
* @memberof mapStyleUpdaters
@@ -515,7 +516,7 @@ export const loadMapStylesUpdater = (
function createActionTask(action, payload) {
if (typeof action === 'function') {
- return ACTION_TASK().map(_ => action(payload));
+ return ACTION_TASK().map(() => action(payload));
}
return null;
@@ -697,7 +698,8 @@ export const inputMapStyleUpdater = (
// or an icon already available client-side as a data uri
const isUpdatedIconDataUri = updated.icon?.startsWith('data:image');
const isValid = Boolean(updated.uploadedFile);
- const isMapboxStyleUrl = updated.url?.startsWith('mapbox://') || updated.url?.includes('mapbox.com');
+ const isMapboxStyleUrl =
+ updated.url?.startsWith('mapbox://') || updated.url?.includes('mapbox.com');
const icon =
!isUpdatedIconDataUri && isMapboxStyleUrl
@@ -773,7 +775,7 @@ export const removeCustomMapStyleUpdater = (
): MapStyle => {
const {id} = action.payload;
- // eslint-disable-next-line no-unused-vars
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
const {[id]: _, ...restOfMapStyles} = state.mapStyles;
const newState = {
diff --git a/src/reducers/src/merger-handler.ts b/src/reducers/src/merger-handler.ts
index a0dd2396c..848242518 100644
--- a/src/reducers/src/merger-handler.ts
+++ b/src/reducers/src/merger-handler.ts
@@ -77,16 +77,16 @@ export function mergeStateFromMergers<State extends VisState>(
return {mergedState, allMerged: true};
}
-export function hasPropsToMerge<State extends {}>(
+export function hasPropsToMerge<State extends object>(
state: State,
mergerProps: string | string[]
): boolean {
return Array.isArray(mergerProps)
- ? Boolean(mergerProps.some(p => state.hasOwnProperty(p)))
- : typeof mergerProps === 'string' && state.hasOwnProperty(mergerProps);
+ ? Boolean(mergerProps.some(p => Object.prototype.hasOwnProperty.call(state, p)))
+ : typeof mergerProps === 'string' && Object.prototype.hasOwnProperty.call(state, mergerProps);
}
-export function getPropValueToMerger<State extends {}>(
+export function getPropValueToMerger<State extends object>(
state: State,
mergerProps: string | string[],
toMergeProps?: string | string[]
diff --git a/src/reducers/src/provider-state-updaters.ts b/src/reducers/src/provider-state-updaters.ts
index 3c4c0e008..a48e5257a 100644
--- a/src/reducers/src/provider-state-updaters.ts
+++ b/src/reducers/src/provider-state-updaters.ts
@@ -62,7 +62,7 @@ export const INITIAL_PROVIDER_STATE: ProviderState = {
function createActionTask(action, payload) {
if (typeof action === 'function') {
- return ACTION_TASK().map(_ => action(payload));
+ return ACTION_TASK().map(() => action(payload));
}
return null;
@@ -98,8 +98,8 @@ function createGlobalNotificationTasks({
topic: DEFAULT_NOTIFICATION_TOPICS.global,
message
};
- const task = ACTION_TASK().map(_ => addNotification(successNote));
- return delayClose ? [task, DELAY_TASK(3000).map(_ => removeNotification(id))] : [task];
+ const task = ACTION_TASK().map(() => addNotification(successNote));
+ return delayClose ? [task, DELAY_TASK(3000).map(() => removeNotification(id))] : [task];
}
/**
@@ -159,7 +159,7 @@ export const exportFileSuccessUpdater = (
const tasks = [
createActionTask(onSuccess, {response, provider, options}),
closeModal &&
- ACTION_TASK().map(_ => postSaveLoadSuccess(`Map saved to ${state.currentProvider}!`))
+ ACTION_TASK().map(() => postSaveLoadSuccess(`Map saved to ${state.currentProvider}!`))
].filter(d => d);
return tasks.length ? withTask(newState, tasks) : newState;
@@ -175,8 +175,8 @@ export const postSaveLoadSuccessUpdater = (
const message = action.payload || `Saved / Load to ${state.currentProvider} Success`;
const tasks = [
- ACTION_TASK().map(_ => toggleModal(null)),
- ACTION_TASK().map(_ => resetProviderStatus()),
+ ACTION_TASK().map(() => toggleModal(null)),
+ ACTION_TASK().map(() => resetProviderStatus()),
...createGlobalNotificationTasks({message})
];
@@ -196,7 +196,7 @@ export const exportFileErrorUpdater = (
if (isFileConflict(error)) {
newState.mapSaved = provider.name;
- return withTask(newState, [ACTION_TASK().map(_ => toggleModal(OVERWRITE_MAP_ID))]);
+ return withTask(newState, [ACTION_TASK().map(() => toggleModal(OVERWRITE_MAP_ID))]);
}
newState.providerError = getError(error);
@@ -279,7 +279,7 @@ function parseLoadMapResponse(response, loadParams, provider) {
const {map, format} = response;
const processorMethod = getDatasetHandler(format);
- const parsedDatasets = toArray(map.datasets).map((ds, i) => {
+ const parsedDatasets = toArray(map.datasets).map(ds => {
if (format === DATASET_FORMATS.keplergl) {
// no need to obtain id, directly pass them in
return processorMethod(ds);
@@ -326,9 +326,9 @@ export const loadCloudMapSuccessUpdater = (
const payload = parseLoadMapResponse(response, loadParams, provider);
const tasks = [
- ACTION_TASK().map(_ => addDataToMap(payload)),
+ ACTION_TASK().map(() => addDataToMap(payload)),
createActionTask(onSuccess, {response, loadParams, provider}),
- ACTION_TASK().map(_ => postSaveLoadSuccess(`Map from ${provider.name} loaded`))
+ ACTION_TASK().map(() => postSaveLoadSuccess(`Map from ${provider.name} loaded`))
].filter(d => d);
return tasks.length ? withTask(newState, tasks) : newState;
diff --git a/src/reducers/src/ui-state-updaters.ts b/src/reducers/src/ui-state-updaters.ts
index da8e639cb..cd2a03466 100644
--- a/src/reducers/src/ui-state-updaters.ts
+++ b/src/reducers/src/ui-state-updaters.ts
@@ -73,10 +73,10 @@ export const DEFAULT_MODAL = ADD_DATA_ID;
*
* export default composedReducer;
*/
-/* eslint-disable no-unused-vars */
+/* eslint-disable @typescript-eslint/no-unused-vars */
// @ts-ignore
const uiStateUpdaters = null;
-/* eslint-enable no-unused-vars */
+/* eslint-enable @typescript-eslint/no-unused-vars */
const DEFAULT_MAP_CONTROLS_FEATURES: MapControlItem = {
show: true,
@@ -98,9 +98,9 @@ const DEFAULT_MAP_CONTROLS_FEATURES: MapControlItem = {
* @property mapLocale Default: `{show: false, active: false}`
* @public
*/
-export const DEFAULT_MAP_CONTROLS: MapControls = (Object.keys(MAP_CONTROLS) as Array<
- keyof typeof MAP_CONTROLS
->).reduce(
+export const DEFAULT_MAP_CONTROLS: MapControls = (
+ Object.keys(MAP_CONTROLS) as Array<keyof typeof MAP_CONTROLS>
+).reduce(
(final, current) => ({
...final,
[current]: DEFAULT_MAP_CONTROLS_FEATURES
@@ -261,7 +261,7 @@ export const INITIAL_UI_STATE: UiState = {
export const initUiStateUpdater = (
state: UiState,
action: {
- type?: typeof ActionTypes['INIT'];
+ type?: (typeof ActionTypes)['INIT'];
payload: KeplerGlInitPayload;
}
): UiState => ({
diff --git a/src/reducers/src/vis-state-merger.ts b/src/reducers/src/vis-state-merger.ts
index 2bebe6272..e89b78a09 100644
--- a/src/reducers/src/vis-state-merger.ts
+++ b/src/reducers/src/vis-state-merger.ts
@@ -303,8 +303,7 @@ export function insertLayerAtRightOrder(
*/
export function mergeInteractions<S extends VisState>(
state: S,
- interactionToBeMerged: Partial<SavedInteractionConfig> | undefined,
- fromConfig?: boolean
+ interactionToBeMerged: Partial<SavedInteractionConfig> | undefined
): S {
const merged: Partial<SavedInteractionConfig> = {};
const unmerged: Partial<SavedInteractionConfig> = {};
@@ -415,8 +414,7 @@ function replaceInteractionDatasetIds(interactionConfig, dataId: string, dataIdT
*/
export function mergeSplitMaps<S extends VisState>(
state: S,
- splitMaps: NonNullable<ParsedConfig['visState']>['splitMaps'] = [],
- fromConfig?: boolean
+ splitMaps: NonNullable<ParsedConfig['visState']>['splitMaps'] = []
): S {
const merged = [...state.splitMaps];
const unmerged = [];
@@ -532,8 +530,7 @@ export function mergeInteractionTooltipConfig(
*/
export function mergeLayerBlending<S extends VisState>(
state: S,
- layerBlending: NonNullable<ParsedConfig['visState']>['layerBlending'],
- fromConfig?: boolean
+ layerBlending: NonNullable<ParsedConfig['visState']>['layerBlending']
): S {
if (layerBlending && LAYER_BLENDINGS[layerBlending]) {
return {
@@ -550,8 +547,7 @@ export function mergeLayerBlending<S extends VisState>(
*/
export function mergeOverlayBlending<S extends VisState>(
state: S,
- overlayBlending: NonNullable<ParsedConfig['visState']>['overlayBlending'],
- fromConfig?: boolean
+ overlayBlending: NonNullable<ParsedConfig['visState']>['overlayBlending']
): S {
if (overlayBlending && OVERLAY_BLENDINGS[overlayBlending]) {
return {
@@ -568,8 +564,7 @@ export function mergeOverlayBlending<S extends VisState>(
*/
export function mergeAnimationConfig<S extends VisState>(
state: S,
- animation: NonNullable<ParsedConfig['visState']>['animationConfig'],
- fromConfig?: boolean
+ animation: NonNullable<ParsedConfig['visState']>['animationConfig']
): S {
if (animation && animation.currentTime) {
return {
@@ -789,7 +784,7 @@ export function validateLayerWithData(
const {type} = savedLayer;
const {throwOnError} = options;
// layer doesnt have a valid type
- if (!type || !layerClasses.hasOwnProperty(type) || !savedLayer.config) {
+ if (!type || !Object.prototype.hasOwnProperty.call(layerClasses, type) || !savedLayer.config) {
if (throwOnError) {
throw new Error(`Layer has invalid type "${type}" or config is missing`);
}
diff --git a/src/reducers/src/vis-state-updaters.ts b/src/reducers/src/vis-state-updaters.ts
index b764cf0d8..b5d18856e 100644
--- a/src/reducers/src/vis-state-updaters.ts
+++ b/src/reducers/src/vis-state-updaters.ts
@@ -153,10 +153,10 @@ disableStackCapturing();
*
* export default composedReducer;
*/
-/* eslint-disable no-unused-vars */
+/* eslint-disable @typescript-eslint/no-unused-vars */
// @ts-ignore
const visStateUpdaters = null;
-/* eslint-enable no-unused-vars */
+/* eslint-enable @typescript-eslint/no-unused-vars */
export const defaultInteractionConfig: InteractionConfig = {
tooltip: {
@@ -333,7 +333,10 @@ function pickChangedProps<T>(prev: T, next: T): Partial<T> {
const changedProps: Partial<T> = {};
const pickPropsOf = obj => {
Object.keys(obj).forEach(key => {
- if (!changedProps.hasOwnProperty(key) && !isEqual(prev[key], next[key])) {
+ if (
+ !Object.prototype.hasOwnProperty.call(changedProps, key) &&
+ !isEqual(prev[key], next[key])
+ ) {
changedProps[key] = next[key];
}
});
@@ -559,7 +562,7 @@ function addOrRemoveTextLabels(newFields, textLabel, defaultTextLabel = DEFAULT_
}
function updateTextLabelPropAndValue(idx, prop, value, textLabel) {
- if (!textLabel[idx].hasOwnProperty(prop)) {
+ if (!Object.prototype.hasOwnProperty.call(textLabel[idx], prop)) {
return textLabel;
}
@@ -914,7 +917,7 @@ export function setFilterUpdater(
newFilter = updateFilterDataId(dataId);
break;
- case FILTER_UPDATER_PROPS.name:
+ case FILTER_UPDATER_PROPS.name: {
// we are supporting the current functionality
// TODO: Next PR for UI filter name will only update filter name but it won't have side effects
// we are gonna use pair of datasets and fieldIdx to update the filter
@@ -941,7 +944,8 @@ export function setFilterUpdater(
// only filter the current dataset
break;
- case FILTER_UPDATER_PROPS.layerId:
+ }
+ case FILTER_UPDATER_PROPS.layerId: {
// We need to update only datasetId/s if we have added/removed layers
// - check for layerId changes (XOR works because of string values)
// if no differences between layerIds, don't do any filtering
@@ -980,6 +984,7 @@ export function setFilterUpdater(
};
break;
+ }
default:
break;
}
@@ -1106,6 +1111,7 @@ export const toggleFilterAnimationUpdater = (
*/
export const toggleLayerAnimationUpdater = (
state: VisState,
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
action: VisStateActions.ToggleLayerAnimationUpdaterAction
): VisState => ({
...state,
@@ -1120,10 +1126,7 @@ export const toggleLayerAnimationUpdater = (
* @memberof visStateUpdaters
* @public
*/
-export const toggleLayerAnimationControlUpdater = (
- state: VisState,
- action: VisStateActions.ToggleLayerAnimationControlUpdaterAction
-): VisState => ({
+export const toggleLayerAnimationControlUpdater = (state: VisState): VisState => ({
...state,
animationConfig: {
...state.animationConfig,
@@ -1542,12 +1545,11 @@ export function removeDatasetUpdater<T extends VisState>(
return state;
}
- /* eslint-disable no-unused-vars */
const {
layers,
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
datasets: {[datasetKey]: dataset, ...newDatasets}
} = state;
- /* eslint-enable no-unused-vars */
const layersToRemove = layers.filter(l => l.config.dataId === datasetKey).map(l => l.id);
@@ -1570,9 +1572,8 @@ function removeDatasetFromInteractionConfig(state, {dataId}) {
const {tooltip} = interactionConfig;
if (tooltip) {
const {config} = tooltip;
- /* eslint-disable no-unused-vars */
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
const {[dataId]: fields, ...fieldsToShow} = config.fieldsToShow;
- /* eslint-enable no-unused-vars */
interactionConfig = {
...interactionConfig,
tooltip: {...tooltip, config: {...config, fieldsToShow}}
@@ -1771,6 +1772,7 @@ export const layerClickUpdater = (
*/
export const mapClickUpdater = (
state: VisState,
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
action: VisStateActions.OnMapClickUpdaterAction
): VisState => {
return {
@@ -2249,6 +2251,7 @@ export function processFileContentUpdater(
);
}
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
export function parseProgress(prevProgress = {}, progress) {
// This happens when receiving query metadata or other cases we don't
// have an update for the user.
@@ -2584,7 +2587,7 @@ export const setSelectedFeatureUpdater = (
{feature, selectionContext}: VisStateActions.SetSelectedFeatureUpdaterAction
): VisState => {
// add bbox for polygon filter to speed up filtering
- if (feature && feature.properties) feature.properties.bbox = bbox(feature);
+ if (feature && feature.properties) feature.properties.bbox = bbox(feature);
return {
...state,
editor: {
@@ -2809,6 +2812,7 @@ export function setColumnDisplayFormatUpdater(
*/
export function toggleEditorVisibilityUpdater(
state: VisState,
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
action: VisStateActions.ToggleEditorVisibilityUpdaterAction
): VisState {
return {
@@ -2902,7 +2906,7 @@ function defaultReplaceParentDatasetIds(value: any, dataId: string, dataIdToRepl
dataId: dataIdToReplace
}
};
- } else if (isObject(value) && value.hasOwnProperty(dataId)) {
+ } else if (isObject(value) && Object.prototype.hasOwnProperty.call(value, dataId)) {
// for value saved as {[dataId]: {...}}
return {[dataIdToReplace]: value[dataId]};
}
diff --git a/src/schemas/src/dataset-schema.ts b/src/schemas/src/dataset-schema.ts
index bf5ab5a11..b1725b5e8 100644
--- a/src/schemas/src/dataset-schema.ts
+++ b/src/schemas/src/dataset-schema.ts
@@ -115,7 +115,8 @@ export class DatasetSchema extends Schema {
// we need to add format to each field
const needCalculateMeta =
fields[0] &&
- (!fields[0].hasOwnProperty('format') || !fields[0].hasOwnProperty('analyzerType'));
+ (!Object.prototype.hasOwnProperty.call(fields[0], 'format') ||
+ !Object.prototype.hasOwnProperty.call(fields[0], 'analyzerType'));
if (needCalculateMeta) {
const fieldOrder = fields.map(f => f.name);
diff --git a/src/schemas/src/index.ts b/src/schemas/src/index.ts
index 93a96c750..790534b74 100644
--- a/src/schemas/src/index.ts
+++ b/src/schemas/src/index.ts
@@ -30,12 +30,7 @@ export {
layerPropsV0,
effectPropsV1
} from './vis-state-schema';
-export type {
- SavedField,
- ParsedField,
- SavedDatasetV1,
- ParsedDataset
-} from './dataset-schema';
+export type {SavedField, ParsedField, SavedDatasetV1, ParsedDataset} from './dataset-schema';
export {
default as datasetSchema,
DatasetSchema,
@@ -44,6 +39,10 @@ export {
} from './dataset-schema';
export * from './vis-state-schema';
/** NOTE: `MapStyleSchemaV1` is actually for `mapStyle.mapStyles` (original naming can be unclear) */
-export {default as mapStyleSchema, MapStyleSchemaV1, CustomMapStyleSchema} from './map-style-schema';
+export {
+ default as mapStyleSchema,
+ MapStyleSchemaV1,
+ CustomMapStyleSchema
+} from './map-style-schema';
export {default as mapStateSchema} from './map-state-schema';
export {default as Schema} from './schema';
diff --git a/src/schemas/src/schema-manager.ts b/src/schemas/src/schema-manager.ts
index e0b6240ce..4260a282f 100644
--- a/src/schemas/src/schema-manager.ts
+++ b/src/schemas/src/schema-manager.ts
@@ -149,21 +149,25 @@ export class KeplerGLSchema {
* @param savedConfig
*/
load(
- savedDatasets: SavedMap | SavedMap['datasets'] | any,
- savedConfig: SavedMap['config'] | any
+ ...args:
+ | [
+ savedDatasets: SavedMap | SavedMap['datasets'] | any,
+ savedConfig: SavedMap['config'] | any
+ ]
+ | [{datasets: SavedMap['datasets'] | any; config: SavedMap['config'] | any}]
): LoadedMap {
// if pass dataset and config in as a single object
if (
- arguments.length === 1 &&
- isPlainObject(arguments[0]) &&
- (Array.isArray(arguments[0].datasets) || isPlainObject(arguments[0].config))
+ args.length === 1 &&
+ isPlainObject(args[0]) &&
+ (Array.isArray(args[0].datasets) || isPlainObject(args[0].config))
) {
- return this.load(arguments[0].datasets, arguments[0].config);
+ return this.load(args[0].datasets, args[0].config);
}
return {
- ...(Array.isArray(savedDatasets) ? {datasets: this.parseSavedData(savedDatasets)} : {}),
- ...(savedConfig ? {config: this.parseSavedConfig(savedConfig)} : {})
+ ...(Array.isArray(args[0]) ? {datasets: this.parseSavedData(args[0])} : {}),
+ ...(args[1] ? {config: this.parseSavedConfig(args[1])} : {})
};
}
@@ -233,6 +237,7 @@ export class KeplerGLSchema {
/**
* Parse saved App config
*/
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
parseSavedConfig({version, config}, state = {}): ParsedConfig | null {
const validVersion = this.validateVersion(version);
if (!validVersion) {
@@ -274,9 +279,9 @@ export class KeplerGLSchema {
* @param state
* @returns - whether data has changed or not
*/
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
hasDataChanged(state: any): boolean {
return true;
- // return this._datasetLastSaved !== state.visState.datasets;
}
}
diff --git a/src/schemas/src/schema.ts b/src/schemas/src/schema.ts
index bc9a25dc1..d9b8e33e4 100644
--- a/src/schemas/src/schema.ts
+++ b/src/schemas/src/schema.ts
@@ -50,6 +50,7 @@ export default class Schema {
return this._getPropertyValueFromSchema('save', node, parents, accumulator);
}
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
_getPropertyValueFromSchema(operation, node: any, parents: object[] = [], accumulator) {
const internal = `_${operation}`;
return {
diff --git a/src/schemas/src/vis-state-schema.ts b/src/schemas/src/vis-state-schema.ts
index 47bafb75c..6133c7201 100644
--- a/src/schemas/src/vis-state-schema.ts
+++ b/src/schemas/src/vis-state-schema.ts
@@ -92,11 +92,11 @@ export type PostMergerPayload = {
options?: AddDataToMapOptions;
layerMergers?: Merger<any>[];
};
-export type MergerActionPayload<S extends {}> = {
+export type MergerActionPayload<S extends object> = {
mergers: Merger<S>[];
postMergerPayload: PostMergerPayload;
};
-export type MergerMergeFunc<S extends {}> = (
+export type MergerMergeFunc<S extends object> = (
state: S,
config: any,
fromConfig: boolean,
@@ -107,7 +107,7 @@ export type ReplaceParentDatasetIdsFunc<T> = (
dataId: string,
dataIdToReplace: string
) => T | null;
-export type Merger<S extends {}> = {
+export type Merger<S extends object> = {
merge: MergerMergeFunc<S>;
prop: string | string[];
toMergeProp?: string | string[];
@@ -118,7 +118,7 @@ export type Merger<S extends {}> = {
saveUnmerged?: (state: S, unmerged: any) => S;
getChildDatasetIds?: any;
};
-export type VisStateMergers<S extends {}> = Merger<S>[];
+export type VisStateMergers<S extends object> = Merger<S>[];
// in v0 geojson there is only sizeField
@@ -297,7 +297,7 @@ class LayerVisConfigSchemaV0 extends Schema {
class LayerConfigSchemaDeleteV0 extends Schema {
version = VERSIONS.v0;
- load(value) {
+ load() {
return {};
}
}
@@ -362,7 +362,7 @@ export const layerPropsV0 = {
* V1 Schema
*/
class ColumnSchemaV1 extends Schema {
- save(columns, state) {
+ save(columns) {
// starting from v1, only save column value
// fieldIdx will be calculated during merge
return {
@@ -398,9 +398,9 @@ class TextLabelSchemaV1 extends Schema {
}
const visualChannelModificationV1 = {
- geojson: (vc, parents, accumulator) => {
+ geojson: (vc, parents) => {
const [layer] = parents.slice(-1);
- const isOld = !vc.hasOwnProperty('strokeColorField');
+ const isOld = !Object.prototype.hasOwnProperty.call(vc, 'strokeColorField');
// make our best guess if this geojson layer contains point
const isPoint =
vc.radiusField || layer.config.visConfig.radius !== LAYER_VIS_CONFIGS.radius.defaultValue;
@@ -454,11 +454,13 @@ class VisualChannelSchemaV1 extends Schema {
}
}
const visConfigModificationV1 = {
- point: (visConfig, parents, accumulated) => {
+ point: (visConfig, parents) => {
const modified: modifiedType = {};
const [layer] = parents.slice(-2, -1);
const isOld =
- !visConfig.hasOwnProperty('filled') && !visConfig.strokeColor && !visConfig.strokeColorRange;
+ !Object.prototype.hasOwnProperty.call(visConfig, 'filled') &&
+ !visConfig.strokeColor &&
+ !visConfig.strokeColorRange;
if (isOld) {
// color color & color range to stroke color
modified.strokeColor = layer.config.color;
@@ -473,13 +475,13 @@ const visConfigModificationV1 = {
return modified;
},
- geojson: (visConfig, parents, accumulated) => {
+ geojson: (visConfig, parents) => {
// is points?
const modified: modifiedType = {};
const [layer] = parents.slice(-2, -1);
const isOld =
layer.visualChannels &&
- !layer.visualChannels.hasOwnProperty('strokeColorField') &&
+ !Object.prototype.hasOwnProperty.call(layer.visualChannels, 'strokeColorField') &&
!visConfig.strokeColor &&
!visConfig.strokeColorRange;
// make our best guess if this geojson layer contains point
@@ -570,9 +572,7 @@ export class LayerSchemaV0 extends Schema {
};
}
- load(
- layers: SavedLayer[] | MinSavedLayer[] | undefined
- ): {
+ load(layers: SavedLayer[] | MinSavedLayer[] | undefined): {
layers: ParsedLayer[] | undefined;
} {
return {
@@ -592,9 +592,9 @@ export class FilterSchemaV0 extends Schema {
.map(filter => this.savePropertiesOrApplySchema(filter).filters)
};
}
- load(
- filters: SavedFilter[] | MinSavedFilter[] | undefined
- ): {filters: ParsedFilter[] | undefined} {
+ load(filters: SavedFilter[] | MinSavedFilter[] | undefined): {
+ filters: ParsedFilter[] | undefined;
+ } {
return {
filters: filters
?.map(filter => this.loadPropertiesOrApplySchema(filter).filters)
@@ -660,13 +660,11 @@ const interactionPropsV1 = [...interactionPropsV0, 'geocoder', 'coordinate'];
export class InteractionSchemaV1 extends Schema {
key = 'interactionConfig';
- save(
- interactionConfig: InteractionConfig
- ):
+ save(interactionConfig: InteractionConfig):
| {
interactionConfig: SavedInteractionConfig;
}
- | {} {
+ | Record<string, any> {
// save config even if disabled,
return Array.isArray(this.properties)
? {
@@ -683,9 +681,7 @@ export class InteractionSchemaV1 extends Schema {
}
: {};
}
- load(
- interactionConfig: SavedInteractionConfig
- ): {
+ load(interactionConfig: SavedInteractionConfig): {
interactionConfig: Partial<SavedInteractionConfig>;
} {
const modifiedConfig = interactionConfig;
@@ -898,9 +894,7 @@ export class VisStateSchemaV1 extends Schema {
return this.savePropertiesOrApplySchema(node, parents, accumulator);
}
- load(
- node?: SavedVisState
- ): {
+ load(node?: SavedVisState): {
visState: ParsedVisState | undefined;
} {
// @ts-expect-error
diff --git a/src/schemas/webpack/umd.js b/src/schemas/webpack/umd.js
index 655dc62f1..c7c03dd3c 100644
--- a/src/schemas/webpack/umd.js
+++ b/src/schemas/webpack/umd.js
@@ -10,7 +10,7 @@ const KeplerPackage = require('../package');
const SRC_DIR = resolve(__dirname, '../src');
const OUTPUT_DIR = resolve(__dirname, '../umd');
-const LIBRARY_BUNDLE_CONFIG = env => ({
+const LIBRARY_BUNDLE_CONFIG = () => ({
entry: {
KeplerGl: join(SRC_DIR, 'index.ts')
},
diff --git a/src/styles/src/base.ts b/src/styles/src/base.ts
index 3d133d3a2..d50d1823c 100644
--- a/src/styles/src/base.ts
+++ b/src/styles/src/base.ts
@@ -834,7 +834,7 @@ const secondarySwitch = css<SwitchableProps>`
:before {
${props => props.theme.switchTrack} background: ${props =>
- props.checked ? props.theme.switchTrackBgdActive : props.theme.secondarySwitchTrackBgd};
+ props.checked ? props.theme.switchTrackBgdActive : props.theme.secondarySwitchTrackBgd};
}
:after {
diff --git a/src/styles/webpack/umd.js b/src/styles/webpack/umd.js
index 655dc62f1..c7c03dd3c 100644
--- a/src/styles/webpack/umd.js
+++ b/src/styles/webpack/umd.js
@@ -10,7 +10,7 @@ const KeplerPackage = require('../package');
const SRC_DIR = resolve(__dirname, '../src');
const OUTPUT_DIR = resolve(__dirname, '../umd');
-const LIBRARY_BUNDLE_CONFIG = env => ({
+const LIBRARY_BUNDLE_CONFIG = () => ({
entry: {
KeplerGl: join(SRC_DIR, 'index.ts')
},
diff --git a/src/table/src/gpu-filter-utils.ts b/src/table/src/gpu-filter-utils.ts
index a5dbaee1c..4352914ab 100644
--- a/src/table/src/gpu-filter-utils.ts
+++ b/src/table/src/gpu-filter-utils.ts
@@ -17,7 +17,7 @@ export function setFilterGpuMode(filter: Filter, filters: Filter[]) {
// if all of them has, we set gpu mode to true
// TODO: refactor filter so we don't keep an array of everything
- filter.dataId.forEach((dataId, datasetIdx) => {
+ filter.dataId.forEach(dataId => {
const gpuFilters = filters.filter(f => f.dataId.includes(dataId) && f.gpu);
if (filter.gpu && gpuFilters.length === MAX_GPU_FILTERS) {
@@ -103,7 +103,7 @@ export function assignGpuChannel(filter: Filter, filters: Filter[]) {
export function resetFilterGpuMode(filters: Filter[]): Filter[] {
const gpuPerDataset = {};
- return filters.map((f, i) => {
+ return filters.map(f => {
if (f.gpu) {
let gpu = true;
toArray(f.dataId).forEach(dataId => {
@@ -129,7 +129,7 @@ export function resetFilterGpuMode(filters: Filter[]): Filter[] {
* Initial filter uniform
*/
function getEmptyFilterRange() {
- return new Array(MAX_GPU_FILTERS).fill(0).map(d => [0, 0]);
+ return new Array(MAX_GPU_FILTERS).fill(0).map(() => [0, 0]);
}
/**
@@ -156,28 +156,28 @@ const defaultGetData = (dc: DataContainerInterface, d: any, fieldIndex: number)
* @param fields
* @return {Function} getFilterValue
*/
-const getFilterValueAccessor = (
- channels: (Filter | undefined)[],
- dataId: string,
- fields: any[]
-) => (dc: DataContainerInterface) => (getIndex = defaultGetIndex, getData = defaultGetData) => d =>
- // for empty channel, value is 0 and min max would be [0, 0]
- channels.map(filter => {
- if (!filter) {
- return 0;
- }
- const fieldIndex = getDatasetFieldIndexForFilter(dataId, filter);
- const field = fields[fieldIndex];
-
- const value =
- filter.type === FILTER_TYPES.timeRange
- ? field.filterProps && Array.isArray(field.filterProps.mappedValue)
- ? field.filterProps.mappedValue[getIndex(d)]
- : moment.utc(getData(dc, d, fieldIndex)).valueOf()
- : getData(dc, d, fieldIndex);
-
- return notNullorUndefined(value) ? value - filter.domain?.[0] : Number.MIN_SAFE_INTEGER;
- });
+const getFilterValueAccessor =
+ (channels: (Filter | undefined)[], dataId: string, fields: any[]) =>
+ (dc: DataContainerInterface) =>
+ (getIndex = defaultGetIndex, getData = defaultGetData) =>
+ d =>
+ // for empty channel, value is 0 and min max would be [0, 0]
+ channels.map(filter => {
+ if (!filter) {
+ return 0;
+ }
+ const fieldIndex = getDatasetFieldIndexForFilter(dataId, filter);
+ const field = fields[fieldIndex];
+
+ const value =
+ filter.type === FILTER_TYPES.timeRange
+ ? field.filterProps && Array.isArray(field.filterProps.mappedValue)
+ ? field.filterProps.mappedValue[getIndex(d)]
+ : moment.utc(getData(dc, d, fieldIndex)).valueOf()
+ : getData(dc, d, fieldIndex);
+
+ return notNullorUndefined(value) ? value - filter.domain?.[0] : Number.MIN_SAFE_INTEGER;
+ });
/**
* Get filter properties for gpu filtering
diff --git a/src/table/src/index.ts b/src/table/src/index.ts
index 132b111ef..1bd555697 100644
--- a/src/table/src/index.ts
+++ b/src/table/src/index.ts
@@ -2,16 +2,16 @@
// Copyright contributors to the kepler.gl project
export {
- default,
- default as KeplerTable,
- findPointFieldPairs,
- copyTableAndUpdate,
- pinTableColumns,
- sortDatasetByColumn,
- copyTable,
- maybeToDate
- } from './kepler-table';
- /* eslint-disable prettier/prettier */
+ default,
+ default as KeplerTable,
+ findPointFieldPairs,
+ copyTableAndUpdate,
+ pinTableColumns,
+ sortDatasetByColumn,
+ copyTable,
+ maybeToDate
+} from './kepler-table';
+/* eslint-disable prettier/prettier */
export type {GpuFilter, Datasets} from './kepler-table';
export * from './gpu-filter-utils';
export * from './dataset-utils';
diff --git a/src/table/src/kepler-table.ts b/src/table/src/kepler-table.ts
index fd5c4e0a6..aacc48ac5 100644
--- a/src/table/src/kepler-table.ts
+++ b/src/table/src/kepler-table.ts
@@ -266,7 +266,7 @@ class KeplerTable {
return null;
}
const field = this.fields[fieldIdx];
- if (field.hasOwnProperty('filterProps')) {
+ if (Object.prototype.hasOwnProperty.call(field, 'filterProps')) {
return field.filterProps;
}
diff --git a/src/tasks/src/index.ts b/src/tasks/src/index.ts
index 7ed246357..229ee3f65 100644
--- a/src/tasks/src/index.ts
+++ b/src/tasks/src/index.ts
@@ -11,11 +11,7 @@ export const LOAD_FILE_TASK = Task.fromPromise(
'LOAD_FILE_TASK'
);
-export const PROCESS_FILE_DATA = Task.fromPromise(
- processFileData,
-
- 'PROCESS_FILE_CONTENT'
-);
+export const PROCESS_FILE_DATA = Task.fromPromise(processFileData, 'PROCESS_FILE_CONTENT');
export const LOAD_MAP_STYLE_TASK = taskCreator(
({url, id}, success, error) =>
diff --git a/src/types/actions.d.ts b/src/types/actions.d.ts
index 3e0f6ef6f..add827c2a 100644
--- a/src/types/actions.d.ts
+++ b/src/types/actions.d.ts
@@ -38,6 +38,7 @@ export type ProtoDataset = {
format?: string;
color?: RGBColor;
type?: string;
+ hidden?: boolean;
};
data: {
fields: {
diff --git a/src/types/reducers.d.ts b/src/types/reducers.d.ts
index 97da5d7e9..cbd732da9 100644
--- a/src/types/reducers.d.ts
+++ b/src/types/reducers.d.ts
@@ -2,6 +2,7 @@
// Copyright contributors to the kepler.gl project
import {Field, Millisecond} from './types';
+import type {MapViewState} from '@deck.gl/core/typed';
export type MapState = {
pitch: number;
@@ -142,7 +143,7 @@ export type TimeRangeFilter = FilterBase<LineChart> &
fieldType: 'timestamp';
fixedDomain: true;
value: [number, number];
- bins?: Object;
+ bins?: object;
plotType: {
[key: string]: any;
};
@@ -310,7 +311,7 @@ export type BaseMapStyle = {
label: string;
url: string;
icon: string;
- style?: Object;
+ style?: object;
layerGroups: LayerGroup[];
accessToken?: string;
custom?: CustomStyleType;
@@ -442,6 +443,10 @@ export type Viewport = {
maxZoom?: number;
/** Maximum geographical bounds, pan/zoom operations are constrained within those bounds */
maxBounds?: Bounds;
+ /** viewport transition duration use by geocoder panel **/
+ transitionDuration?: MapViewState['transitionDuration'];
+ /** viewport transition duration use by geocoder panel **/
+ transitionInterpolator?: MapViewState['transitionInterpolator'];
};
export type MapStyles = {
@@ -512,7 +517,7 @@ export type TypedTimeRangeFilter = FilterBaseOmitRedudant &
fieldType: 'timestamp';
fixedDomain: true;
value: [number, number];
- bins?: Object;
+ bins?: object;
plotType: {
[key: string]: any;
};
diff --git a/src/types/schemas.d.ts b/src/types/schemas.d.ts
index 827de0474..13ed1689e 100644
--- a/src/types/schemas.d.ts
+++ b/src/types/schemas.d.ts
@@ -1,16 +1,9 @@
// SPDX-License-Identifier: MIT
// Copyright contributors to the kepler.gl project
-import {RGBColor, Merge, RGBAColor, RequireFrom} from './types';
-
-import {
- Filter,
- TooltipInfo,
- InteractionConfig,
- AnimationConfig,
- SplitMap,
- Feature
-} from './reducers';
+import {RGBColor, Merge, RequireFrom} from './types';
+
+import {Filter, TooltipInfo, AnimationConfig, SplitMap, Feature} from './reducers';
import {LayerTextLabel} from './layers';
diff --git a/src/utils/src/arrow-data-container.ts b/src/utils/src/arrow-data-container.ts
index c7a5d73a9..5b5330b00 100644
--- a/src/utils/src/arrow-data-container.ts
+++ b/src/utils/src/arrow-data-container.ts
@@ -226,10 +226,9 @@ export function arrowDataTypeToFieldType(arrowType: arrow.DataType): string {
arrow.DataType.isStruct(arrowType)
) {
return ALL_FIELD_TYPES.object;
- } else {
- globalConsole.warn(`Unsupported arrow type: ${arrowType}`);
- return ALL_FIELD_TYPES.string;
}
+ globalConsole.warn(`Unsupported arrow type: ${arrowType}`);
+ return ALL_FIELD_TYPES.string;
}
/**
@@ -263,8 +262,7 @@ export function arrowDataTypeToAnalyzerDataType(
arrow.DataType.isStruct(arrowType)
) {
return AnalyzerDATA_TYPES.OBJECT;
- } else {
- globalConsole.warn(`Unsupported arrow type: ${arrowType}`);
- return AnalyzerDATA_TYPES.STRING;
}
+ globalConsole.warn(`Unsupported arrow type: ${arrowType}`);
+ return AnalyzerDATA_TYPES.STRING;
}
diff --git a/src/utils/src/color-utils.ts b/src/utils/src/color-utils.ts
index db19acc0f..84c2d7a55 100644
--- a/src/utils/src/color-utils.ts
+++ b/src/utils/src/color-utils.ts
@@ -85,8 +85,9 @@ export function reverseColorRange(reversed: boolean, colorRange: ColorRange): Co
export function createLinearGradient(direction: string, colors: RGBColor[]) {
const step = parseFloat((100.0 / colors.length).toFixed(2));
const bands = colors.map((rgb, index) => {
- return `rgba(${rgb.join(',')}, 1) ${step * index}%, rgba(${rgb.join(',')}, 1) ${step *
- (index + 1)}%`;
+ return `rgba(${rgb.join(',')}, 1) ${step * index}%, rgba(${rgb.join(',')}, 1) ${
+ step * (index + 1)
+ }%`;
});
return `linear-gradient(to ${direction}, ${bands.join(',')})`;
diff --git a/src/utils/src/data-scale-utils.ts b/src/utils/src/data-scale-utils.ts
index 1f40c8517..bf37453d2 100644
--- a/src/utils/src/data-scale-utils.ts
+++ b/src/utils/src/data-scale-utils.ts
@@ -31,9 +31,7 @@ export function getOrdinalDomain(
): string[] {
const values = dataContainer.mapIndex(valueAccessor);
- return unique(values)
- .filter(notNullorUndefined)
- .sort();
+ return unique(values).filter(notNullorUndefined).sort();
}
/**
diff --git a/src/utils/src/data-utils.ts b/src/utils/src/data-utils.ts
index 1a5733a9e..54cb7dd50 100644
--- a/src/utils/src/data-utils.ts
+++ b/src/utils/src/data-utils.ts
@@ -54,7 +54,7 @@ export function getLatLngBounds(
return [Math.max(lats[0], limit[0]), Math.min(lats[lats.length - 1], limit[1])];
}
-export function clamp([min, max]: [number, number], val: number = 0): number {
+export function clamp([min, max]: [number, number], val = 0): number {
return val <= min ? min : val >= max ? max : val;
}
@@ -105,11 +105,11 @@ export function isNumber(d: any): boolean {
* @param {string} prop
* @returns {boolean} - yes or no
*/
-export function hasOwnProperty<X extends {}, Y extends PropertyKey>(
+export function hasOwnProperty<X extends object, Y extends PropertyKey>(
obj: X,
prop: Y
): obj is X & Record<Y, unknown> {
- return obj.hasOwnProperty(prop);
+ return Object.prototype.hasOwnProperty.call(obj, prop);
}
export function numberSort(a: number, b: number): number {
@@ -357,9 +357,9 @@ export function applyDefaultFormat(tooltipFormat: TooltipFormat): (v: any) => st
export function getBooleanFormatter(format: string): FieldFormatter {
switch (format) {
case '01':
- return (v: Boolean) => (v ? '1' : '0');
+ return (v: boolean) => (v ? '1' : '0');
case 'yn':
- return (v: Boolean) => (v ? 'yes' : 'no');
+ return (v: boolean) => (v ? 'yes' : 'no');
default:
return defaultFormatter;
}
@@ -421,11 +421,7 @@ export function datetimeFormatter(
timezone?: string | null
): (format?: string) => (ts: number) => string {
return timezone
- ? format => ts =>
- moment
- .utc(ts)
- .tz(timezone)
- .format(format)
+ ? format => ts => moment.utc(ts).tz(timezone).format(format)
: // return empty string instead of 'Invalid date' if ts is undefined/null
- format => ts => (ts ? moment.utc(ts).format(format) : '');
+ format => ts => ts ? moment.utc(ts).format(format) : '';
}
diff --git a/src/utils/src/dataset-utils.ts b/src/utils/src/dataset-utils.ts
index 551b74f1b..b93663b66 100644
--- a/src/utils/src/dataset-utils.ts
+++ b/src/utils/src/dataset-utils.ts
@@ -344,7 +344,7 @@ export function getSampleForTypeAnalyze({
}): RowData {
const total = Math.min(sampleCount, rows.length);
// const fieldOrder = fields.map(f => f.name);
- const sample = range(0, total, 1).map(d => ({}));
+ const sample = range(0, total, 1).map(() => ({}));
// collect sample data for each field
fields.forEach((field, fieldIdx) => {
@@ -487,9 +487,10 @@ export function getFieldsFromData(data: RowData, fieldOrder: string[]): Field[]
* @param fieldOrder
* @returns new field name by index
*/
-export function renameDuplicateFields(
- fieldOrder: string[]
-): {allNames: string[]; fieldByIndex: string[]} {
+export function renameDuplicateFields(fieldOrder: string[]): {
+ allNames: string[];
+ fieldByIndex: string[];
+} {
return fieldOrder.reduce<{allNames: string[]; fieldByIndex: string[]}>(
(accu, field, i) => {
const {allNames} = accu;
@@ -589,7 +590,7 @@ export function getFieldFormatLabels(fieldType?: string): TooltipFormat[] {
return addTimeLabel(formatLabels);
}
-export function getFormatLabels(fields: TooltipFields[], fieldName: string) {
+export function getFormatLabels(fields: TooltipFields[], fieldName: string): TooltipFormat[] {
const fieldType = fields.find(f => f.name === fieldName)?.type;
return getFieldFormatLabels(fieldType);
}
diff --git a/src/utils/src/dom-to-image.ts b/src/utils/src/dom-to-image.ts
index 7f4e3d6de..0c723331f 100644
--- a/src/utils/src/dom-to-image.ts
+++ b/src/utils/src/dom-to-image.ts
@@ -282,7 +282,7 @@ function newInliner() {
}
function urlAsRegex(url0) {
- return new RegExp(`(url\\([\'"]?)(${escape(url0)})([\'"]?\\))`, 'g');
+ return new RegExp(`(url\\(['"]?)(${escape(url0)})(['"]?\\))`, 'g');
}
function inline(string, url, baseUrl, get) {
diff --git a/src/utils/src/dom-utils.ts b/src/utils/src/dom-utils.ts
index cd5b486ec..1778282db 100644
--- a/src/utils/src/dom-utils.ts
+++ b/src/utils/src/dom-utils.ts
@@ -52,9 +52,7 @@ export function processClone(original, clone) {
};
const formatCssProperties = stl2 => {
- return `${asArray(stl2)
- .map(formatProperty)
- .join('; ')};`;
+ return `${asArray(stl2).map(formatProperty).join('; ')};`;
};
const selector = `.${cln}:${elm}`;
@@ -100,27 +98,30 @@ export function processClone(original, clone) {
});
}
- return Promise.resolve([original, clone])
- .then(([og, cln]) => {
- cloneStyle(og, cln);
- return [og, cln];
- })
- .then(([og, cln]) => {
- clonePseudoElements([og, cln]);
- return [og, cln];
- })
- .then(([og, cln]) => {
- copyUserInput([og, cln]);
- return [og, cln];
- })
- .then(([og, cln]) => {
- fixSvg(cln);
- return [og, cln];
- })
- .then(([og, cln]) => cln);
+ return (
+ Promise.resolve([original, clone])
+ .then(([og, cln]) => {
+ cloneStyle(og, cln);
+ return [og, cln];
+ })
+ .then(([og, cln]) => {
+ clonePseudoElements([og, cln]);
+ return [og, cln];
+ })
+ .then(([og, cln]) => {
+ copyUserInput([og, cln]);
+ return [og, cln];
+ })
+ .then(([og, cln]) => {
+ fixSvg(cln);
+ return [og, cln];
+ })
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
+ .then(([og, cln]) => cln)
+ );
}
-/****
+/** **
* UTILS
****/
export function asArray(arrayLike) {
@@ -162,7 +163,7 @@ export function isDataUrl(url) {
}
function parseExtension(url) {
- const match = /\.([^\.\/]*?)$/g.exec(url);
+ const match = /\.([^./]*?)$/g.exec(url);
if (match) {
return match[1];
}
@@ -201,7 +202,7 @@ export function dataAsUrl(content, type) {
}
export function escape(string) {
- return string.replace(/([.*+?^${}()|\[\]\/\\])/g, '\\$1');
+ return string.replace(/([.*+?^${}()|[\]/\\])/g, '\\$1');
}
export function delay(ms) {
diff --git a/src/utils/src/effect-utils.ts b/src/utils/src/effect-utils.ts
index 1104774a6..9cae8fe2c 100644
--- a/src/utils/src/effect-utils.ts
+++ b/src/utils/src/effect-utils.ts
@@ -81,7 +81,8 @@ function isDaytime(lat, lon, timestamp) {
*/
function updateEffect({visState, mapState, effect}) {
if (effect.type === LIGHT_AND_SHADOW_EFFECT.type) {
- let {timestamp, timeMode} = effect.parameters;
+ let {timestamp} = effect.parameters;
+ const {timeMode} = effect.parameters;
const sunLight = effect.deckEffect.directionalLights[0];
// set timestamp for shadow
@@ -130,7 +131,7 @@ export function validateEffectParameters(
effectDescription.forEach(description => {
const {defaultValue, name, type, min, max} = description;
- if (!result.hasOwnProperty(name)) return;
+ if (!Object.prototype.hasOwnProperty.call(result, name)) return;
const property = result[name];
if (type === 'color' || type === 'array') {
diff --git a/src/utils/src/export-utils.ts b/src/utils/src/export-utils.ts
index 129e0338b..c6e938656 100644
--- a/src/utils/src/export-utils.ts
+++ b/src/utils/src/export-utils.ts
@@ -92,10 +92,7 @@ export function dataURItoBlob(dataURI: string): Blob {
const binary = atob(dataURI.split(',')[1]);
// separate out the mime component
- const mimeString = dataURI
- .split(',')[0]
- .split(':')[1]
- .split(';')[0];
+ const mimeString = dataURI.split(',')[0].split(':')[1].split(';')[0];
// write the bytes of the string to an ArrayBuffer
const ab = new ArrayBuffer(binary.length);
diff --git a/src/utils/src/filter-utils.ts b/src/utils/src/filter-utils.ts
index 537f692b9..aa18509c9 100644
--- a/src/utils/src/filter-utils.ts
+++ b/src/utils/src/filter-utils.ts
@@ -302,7 +302,7 @@ export function validateFilterWithData<K extends KeplerTableModel<K, L>, L>(
filter: ParsedFilter,
layers: L[]
): {filter: Filter; dataset: K} {
- return filter.type && filterValidators.hasOwnProperty(filter.type)
+ return filter.type && Object.prototype.hasOwnProperty.call(filterValidators, filter.type)
? filterValidators[filter.type](dataset, filter, layers)
: validateFilter(dataset, filter);
}
@@ -469,8 +469,8 @@ export function getFilterFunction<L extends {config: {dataId: string | null}; id
dataContainer: DataContainerInterface
): filterFunction {
// field could be null in polygon filter
- const valueAccessor = field ? field.valueAccessor : data => null;
- const defaultFunc = d => true;
+ const valueAccessor = field ? field.valueAccessor : () => null;
+ const defaultFunc = () => true;
if (filter.enabled === false) {
return defaultFunc;
@@ -483,7 +483,7 @@ export function getFilterFunction<L extends {config: {dataId: string | null}; id
return data => filter.value.includes(valueAccessor(data));
case FILTER_TYPES.select:
return data => valueAccessor(data) === filter.value;
- case FILTER_TYPES.timeRange:
+ case FILTER_TYPES.timeRange: {
if (!field) {
return defaultFunc;
}
@@ -492,7 +492,8 @@ export function getFilterFunction<L extends {config: {dataId: string | null}; id
? data => mappedValue[data.index]
: data => timeToUnixMilli(valueAccessor(data), field.format);
return data => isInRange(accessor(data), filter.value);
- case FILTER_TYPES.polygon:
+ }
+ case FILTER_TYPES.polygon: {
if (!layers || !layers.length || !filter.layerId) {
return defaultFunc;
}
@@ -502,6 +503,7 @@ export function getFilterFunction<L extends {config: {dataId: string | null}; id
.map(layer => getPolygonFilterFunctor(layer, filter, dataContainer));
return data => layerFilterFunctions.every(filterFunc => filterFunc(data));
+ }
default:
return defaultFunc;
}
@@ -586,13 +588,13 @@ export function getFilterRecord(
*/
export function diffFilters(
filterRecord: FilterRecord,
- oldFilterRecord: FilterRecord | {} = {}
+ oldFilterRecord: FilterRecord | Record<string, never> = {}
): FilterChanged {
let filterChanged: Partial<FilterChanged> = {};
(Object.entries(filterRecord) as Entries<FilterRecord>).forEach(([record, items]) => {
items.forEach(filter => {
- const oldFilter: Filter = (oldFilterRecord[record] || []).find(
+ const oldFilter: Filter | undefined = (oldFilterRecord[record] || []).find(
(f: Filter) => f.id === filter.id
);
@@ -646,13 +648,13 @@ export function adjustValueToFilterDomain(value: Filter['value'], {domain, type}
return value.map((d, i) => (notNullorUndefined(d) && isInRange(d, domain) ? d : domain[i]));
- case FILTER_TYPES.multiSelect:
+ case FILTER_TYPES.multiSelect: {
if (!Array.isArray(value)) {
return [];
}
const filteredValue = value.filter(d => domain.includes(d));
return filteredValue.length ? filteredValue : [];
-
+ }
case FILTER_TYPES.select:
return domain.includes(value) ? value : true;
case FILTER_TYPES.polygon:
@@ -869,10 +871,10 @@ export function isValidFilterValue(type: string | null, value: any): boolean {
case FILTER_TYPES.input:
return Boolean(value.length);
- case FILTER_TYPES.polygon:
+ case FILTER_TYPES.polygon: {
const coordinates = get(value, ['geometry', 'coordinates']);
return Boolean(value && value.id && coordinates);
-
+ }
default:
return true;
}
@@ -881,7 +883,7 @@ export function isValidFilterValue(type: string | null, value: any): boolean {
export function getColumnFilterProps<K extends KeplerTableModel<K, L>, L>(
filter: Filter,
dataset: K
-): {lineChart: LineChart; yAxs: Field} | {} {
+): {lineChart: LineChart; yAxs: Field} | Record<string, any> {
if (filter.plotType === PLOT_TYPES.histogram || !filter.yAxis) {
// histogram should be calculated when create filter
return {};
@@ -892,7 +894,7 @@ export function getColumnFilterProps<K extends KeplerTableModel<K, L>, L>(
const fieldIdx = dataset.getColumnFieldIdx(yAxis.name);
if (fieldIdx < 0) {
Console.warn(`yAxis ${yAxis.name} does not exist in dataset`);
- return {lineChart: {}, yAxis};
+ return {};
}
// return lineChart
@@ -907,14 +909,14 @@ export function getColumnFilterProps<K extends KeplerTableModel<K, L>, L>(
.filter(({x, y}) => Number.isFinite(x) && Number.isFinite(y))
.sort((a, b) => ascending(a.x, b.x));
- const yDomain = extent(series, d => d.y);
- const xDomain = [series[0].x, series[series.length - 1].x];
+ const yDomain = extent(series, d => d.y) as [number, number];
+ const xDomain = [series[0].x, series[series.length - 1].x] as [number, number];
return {lineChart: {series, yDomain, xDomain}, yAxis};
}
export function getDefaultFilterPlotType(filter: Filter): string | null {
- const filterPlotTypes: typeof SupportedPlotType[keyof typeof SupportedPlotType] | null =
+ const filterPlotTypes: (typeof SupportedPlotType)[keyof typeof SupportedPlotType] | null =
filter.type && SupportedPlotType[filter.type];
if (!filterPlotTypes) {
return null;
@@ -976,7 +978,10 @@ export function applyFilterFieldName<K extends KeplerTableModel<K, L>, L>(
dataset: K;
} {
// using filterDatasetIndex we can filter only the specified dataset
- const mergeDomain = option && option.hasOwnProperty('mergeDomain') ? option.mergeDomain : false;
+ const mergeDomain =
+ option && Object.prototype.hasOwnProperty.call(option, 'mergeDomain')
+ ? option.mergeDomain
+ : false;
const fieldIndex = dataset.getColumnFieldIdx(fieldName);
// if no field with same name is found, move to the next datasets
@@ -1042,7 +1047,7 @@ export function mergeFilterDomainStep(
domain: unique(combinedDomain).sort()
};
- case ALL_FIELD_TYPES.timestamp:
+ case ALL_FIELD_TYPES.timestamp: {
const step =
(filter as TimeRangeFilter).step < (filterProps as TimeRangeFieldDomain).step
? (filter as TimeRangeFilter).step
@@ -1052,6 +1057,7 @@ export function mergeFilterDomainStep(
...newFilter,
step
};
+ }
case ALL_FIELD_TYPES.real:
case ALL_FIELD_TYPES.integer:
default:
@@ -1066,7 +1072,7 @@ export function mergeFilterDomainStep(
export const featureToFilterValue = (
feature: Feature,
filterId: string,
- properties?: {}
+ properties?: Record<string, any>
): FeatureValue => ({
...feature,
id: feature.id,
@@ -1154,7 +1160,11 @@ export function validateFiltersUpdateDatasets<
// we can merge a filter only if all datasets in filter.dataId are loaded
if (datasetIds.every(d => datasets[d] && !state.isMergingDatasets[d])) {
// all datasetIds in filter must be present the state datasets
- const {filter: validatedFilter, applyToDatasets, augmentedDatasets} = datasetIds.reduce<{
+ const {
+ filter: validatedFilter,
+ applyToDatasets,
+ augmentedDatasets
+ } = datasetIds.reduce<{
filter: Filter | null;
applyToDatasets: string[];
augmentedDatasets: {[datasetId: string]: any};
@@ -1218,7 +1228,7 @@ export function validateFiltersUpdateDatasets<
export function getFilterPlot<K extends KeplerTableModel<K, L>, L>(
filter: Filter,
dataset: K
-): {lineChart: LineChart; yAxs: Field} | {} {
+): {lineChart: LineChart; yAxs: Field} | Record<string, any> {
if (filter.plotType === PLOT_TYPES.histogram || !filter.yAxis) {
// histogram should be calculated when create filter
return {};
diff --git a/src/utils/src/index.ts b/src/utils/src/index.ts
index 349f65812..0ed457150 100644
--- a/src/utils/src/index.ts
+++ b/src/utils/src/index.ts
@@ -24,7 +24,12 @@ export {getFrequency, getMode, aggregate} from './aggregate-utils';
// eslint-disable-next-line prettier/prettier
export type {FieldFormatter} from './data-utils';
export * from './data-utils';
-export {getTimelineFromAnimationConfig, getTimelineFromFilter, SAMPLE_TIMELINE, TIMELINE_MODES} from './time';
+export {
+ getTimelineFromAnimationConfig,
+ getTimelineFromFilter,
+ SAMPLE_TIMELINE,
+ TIMELINE_MODES
+} from './time';
export {
datasetColorMaker,
@@ -80,7 +85,12 @@ export * from './utils';
export * from './split-map-utils';
export {snapToMarks} from './plot';
-export {computeDeckEffects, fixEffectOrder, reorderEffectOrder, validateEffectParameters} from './effect-utils';
+export {
+ computeDeckEffects,
+ fixEffectOrder,
+ reorderEffectOrder,
+ validateEffectParameters
+} from './effect-utils';
// Mapbox
export {transformRequest, isStyleUsingMapboxTiles} from './map-style-utils/mapbox-utils';
@@ -88,18 +98,27 @@ export {transformRequest, isStyleUsingMapboxTiles} from './map-style-utils/mapbo
// Map
export * from './map-utils';
-export {createDataContainer, createIndexedDataContainer, getSampleData as getSampleContainerData, DataForm} from './data-container-utils';
-export type { DataContainerInterface } from './data-container-interface';
-export {ArrowDataContainer, arrowDataTypeToFieldType, arrowDataTypeToAnalyzerDataType} from './arrow-data-container';
-export type {FilterResult, FilterChanged, dataValueAccessor} from './filter-utils'
-export * from "./filter-utils";
+export {
+ createDataContainer,
+ createIndexedDataContainer,
+ getSampleData as getSampleContainerData,
+ DataForm
+} from './data-container-utils';
+export type {DataContainerInterface} from './data-container-interface';
+export {
+ ArrowDataContainer,
+ arrowDataTypeToFieldType,
+ arrowDataTypeToAnalyzerDataType
+} from './arrow-data-container';
+export type {FilterResult, FilterChanged, dataValueAccessor} from './filter-utils';
+export * from './filter-utils';
export {
getQuantileDomain,
getOrdinalDomain,
getLinearDomain,
getLogDomain
-} from "./data-scale-utils";
+} from './data-scale-utils';
export {DataRow} from './data-row';
diff --git a/src/utils/src/map-style-utils/mapbox-gl-style-editor.ts b/src/utils/src/map-style-utils/mapbox-gl-style-editor.ts
index 4fb7dface..d4d12d2f3 100644
--- a/src/utils/src/map-style-utils/mapbox-gl-style-editor.ts
+++ b/src/utils/src/map-style-utils/mapbox-gl-style-editor.ts
@@ -23,7 +23,6 @@ export function getDefaultLayerGroupVisibility({layerGroups = []}: {layerGroups:
const resolver = ({
id,
- mapStyle,
visibleLayerGroups = {}
}: {
id?: string;
@@ -44,7 +43,6 @@ const resolver = ({
*/
export const editTopMapStyle = memoize(
({
- id,
mapStyle,
visibleLayerGroups
}: {
@@ -109,8 +107,9 @@ export function getStyleDownloadUrl(styleUrl, accessToken, mapboxApiUrl) {
const styleId = styleUrl.replace('mapbox://styles/', '');
// https://api.mapbox.com/styles/v1/heshan0131/cjg1bfumo1cwm2rlrjxkinfgw?pluginName=Keplergl&access_token=<token>
- return `${mapboxApiUrl ||
- DEFAULT_MAPBOX_API_URL}/styles/v1/${styleId}?pluginName=Keplergl&access_token=${accessToken}`;
+ return `${
+ mapboxApiUrl || DEFAULT_MAPBOX_API_URL
+ }/styles/v1/${styleId}?pluginName=Keplergl&access_token=${accessToken}`;
}
// style url not recognized
@@ -204,7 +203,9 @@ export function mergeLayerGroupVisibility(defaultLayerGroup, currentLayerGroup)
return Object.keys(defaultLayerGroup).reduce(
(accu, key) => ({
...accu,
- ...(currentLayerGroup.hasOwnProperty(key) ? {[key]: currentLayerGroup[key]} : {})
+ ...(Object.prototype.hasOwnProperty.call(currentLayerGroup, key)
+ ? {[key]: currentLayerGroup[key]}
+ : {})
}),
defaultLayerGroup
);
diff --git a/src/utils/src/map-utils.ts b/src/utils/src/map-utils.ts
index 7bd7a83bf..7c72a0c56 100644
--- a/src/utils/src/map-utils.ts
+++ b/src/utils/src/map-utils.ts
@@ -10,8 +10,8 @@ export const onViewPortChange = (
viewState: Viewport,
onUpdateMap: (next: any, mapIndex: number) => any,
onViewStateChange?: (next: any) => void | null,
- primary: boolean = false,
- mapIndex: number = 0
+ primary = false,
+ mapIndex = 0
): void => {
const {width = 0, height = 0, ...restViewState} = viewState;
// react-map-gl sends 0,0 dimensions during initialization
diff --git a/src/utils/src/noop.ts b/src/utils/src/noop.ts
index 801c1c740..11afed2fa 100644
--- a/src/utils/src/noop.ts
+++ b/src/utils/src/noop.ts
@@ -1,4 +1,6 @@
// SPDX-License-Identifier: MIT
// Copyright contributors to the kepler.gl project
-export default function noop() {}
+export default function noop() {
+ return;
+}
diff --git a/src/utils/src/observe-dimensions.ts b/src/utils/src/observe-dimensions.ts
index 7d0e3cfe9..b0a603a9d 100644
--- a/src/utils/src/observe-dimensions.ts
+++ b/src/utils/src/observe-dimensions.ts
@@ -81,12 +81,12 @@ export default function useDimensions<T extends Element>(
nodeRef?: RefObject<T>,
throttleDelay = DEFAULT_THROTTLE_DELAY
): [RefObject<T>, Dimensions | null] {
- const ref = nodeRef ?? useRef<T>(null);
+ const ref = useRef<T>(null);
const [size, setSize] = useState(null);
useEffect(() => {
- const {current} = ref;
- if (!current) {
+ const {current} = ref || {};
+ if (!current || !nodeRef) {
return;
}
diff --git a/src/utils/src/projection-utils.ts b/src/utils/src/projection-utils.ts
index dd5440e08..83d28c74e 100644
--- a/src/utils/src/projection-utils.ts
+++ b/src/utils/src/projection-utils.ts
@@ -64,13 +64,13 @@ export function getCenterAndZoomFromBounds(bounds, {width, height}) {
* https://visgl.github.io/react-map-gl/docs/api-reference/types#maplayermouseevent
*/
export function normalizeEvent(event: any, viewport: WebMercatorViewport) {
- var bounds = event.target?.getBoundingClientRect();
+ const bounds = event.target?.getBoundingClientRect();
if (!bounds) {
return event;
}
- var x = event.clientX - bounds.left;
- var y = event.clientY - bounds.top;
+ const x = event.clientX - bounds.left;
+ const y = event.clientY - bounds.top;
if (!Number.isFinite(x) || !Number.isFinite(y)) {
return event;
}
diff --git a/src/utils/src/searcher-utils.ts b/src/utils/src/searcher-utils.ts
index 4c55219d5..9486f7aa5 100644
--- a/src/utils/src/searcher-utils.ts
+++ b/src/utils/src/searcher-utils.ts
@@ -3,10 +3,10 @@
/* eslint-disable callback-return */
export function simpleSearcher(autofillValues, page, query, cb) {
- var regex = new RegExp(query, 'i');
- var foundQuery = false;
- var matches = (autofillValues || []).filter(function _filter(item) {
- var tag = item.name;
+ const regex = new RegExp(query, 'i');
+ let foundQuery = false;
+ const matches = (autofillValues || []).filter(function _filter(item) {
+ const tag = item.name;
foundQuery = foundQuery || tag === query;
return tag && regex.test(tag);
});
diff --git a/src/utils/src/split-map-utils.ts b/src/utils/src/split-map-utils.ts
index e64ca5299..d6dde0150 100644
--- a/src/utils/src/split-map-utils.ts
+++ b/src/utils/src/split-map-utils.ts
@@ -48,7 +48,7 @@ export function removeLayerFromSplitMaps(splitMaps, layer) {
return splitMaps;
}
return splitMaps.map(settings => {
- // eslint-disable-next-line no-unused-vars
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
const {[layer.id]: _, ...newLayers} = settings.layers;
return {
...settings,
diff --git a/src/utils/src/utils.ts b/src/utils/src/utils.ts
index 057797e34..9223dc4a8 100644
--- a/src/utils/src/utils.ts
+++ b/src/utils/src/utils.ts
@@ -8,10 +8,8 @@ import window from 'global/window';
* @param {number} count
* @returns {string} hash string
*/
-export function generateHashId(count: number = 6): string {
- return Math.random()
- .toString(36)
- .substr(count);
+export function generateHashId(count = 6): string {
+ return Math.random().toString(36).substr(count);
}
/**
@@ -148,7 +146,11 @@ const setPath = <T extends any[] | object>(
}
// @ts-ignore
- return insertValue(obj, key, setPath(next, value, obj.hasOwnProperty(key) ? obj[key] : {}));
+ return insertValue(
+ obj,
+ key,
+ setPath(next, value, Object.prototype.hasOwnProperty.call(obj, key) ? obj[key] : {})
+ );
};
/**
diff --git a/test/browser-headless.js b/test/browser-headless.js
index c0528fe48..78ddaa928 100644
--- a/test/browser-headless.js
+++ b/test/browser-headless.js
@@ -17,7 +17,7 @@ test.onFinish(window.browserTestDriver_finish || (() => {}));
// tap-browser-color alternative
enableDOMLogging({
- getStyle: message => ({background: failed ? '#F28E82' : '#8ECA6C'})
+ getStyle: () => ({background: failed ? '#F28E82' : '#8ECA6C'})
});
test('Browser tests', t => {
diff --git a/test/browser-headless/component/map-container-test.js b/test/browser-headless/component/map-container-test.js
index b9a1e30dc..4fdceaf6a 100644
--- a/test/browser-headless/component/map-container-test.js
+++ b/test/browser-headless/component/map-container-test.js
@@ -144,7 +144,7 @@ test('MapContainerFactory - _renderDeckOverlay', t => {
events: [{type: 'mousemove', x: 200, y: 200}, {wait: 50}],
onBeforeEvents,
// eslint-disable-next-line max-statements
- onAfterEvents: ({deck, layers}) => {
+ onAfterEvents: ({layers}) => {
assert.is(hoverEvents.length, 1, 'onHover is called');
assert.is(hoverEvents[0].info.index, 15, 'object is picked');
assert.is(hoverEvents[0].info.picked, true, 'object is picked');
@@ -204,10 +204,7 @@ test('MapContainerFactory - _renderDeckOverlay', t => {
}, 'render map container with map popover should not fail');
t.equal(wrapper.find(MapPopover).length, 1, 'should render 1 MapPopover');
- const mapPopoverProps = wrapper
- .find(MapPopover)
- .at(0)
- .props();
+ const mapPopoverProps = wrapper.find(MapPopover).at(0).props();
// test MapPopoverProp
testMapPopoverProp(t, mapPopoverProps);
@@ -218,10 +215,7 @@ test('MapContainerFactory - _renderDeckOverlay', t => {
const table = wrapper.find('table').at(0);
const rows = table.find('.layer-hover-info__row');
t.equal(rows.length, 5, 'should render 5 rows');
- const tippyProps = wrapper
- .find(Tippy)
- .at(1)
- .props();
+ const tippyProps = wrapper.find(Tippy).at(1).props();
const expectedClientRect = {
bottom: 200,
@@ -253,18 +247,12 @@ test('MapContainerFactory - _renderDeckOverlay', t => {
for (let i = 0; i < 5; i++) {
t.equal(
- rows
- .at(i)
- .find('.row__name')
- .text(),
+ rows.at(i).find('.row__name').text(),
expectedTooltips[i][0],
'row name should be correct'
);
t.equal(
- rows
- .at(i)
- .find('.row__value')
- .text(),
+ rows.at(i).find('.row__value').text(),
expectedTooltips[i][1],
'row value should be correct'
);
diff --git a/test/browser/components/common/animation-control-test.js b/test/browser/components/common/animation-control-test.js
index 15e2373f6..f44a1e5f5 100644
--- a/test/browser/components/common/animation-control-test.js
+++ b/test/browser/components/common/animation-control-test.js
@@ -61,10 +61,7 @@ test('Components -> AnimationControl -> render with props', t => {
t.ok(wrapper.find(PlaybackControls), 'should render PlaybackControls');
t.ok(wrapper.find(FloatingTimeDisplay), 'should render FloatingTimeDisplay');
- wrapper
- .find(IconButton)
- .at(0)
- .simulate('click');
+ wrapper.find(IconButton).at(0).simulate('click');
t.ok(toggleAnimation.calledOnce, 'should call toggleAnimation');
t.end();
});
@@ -100,18 +97,12 @@ test('Components -> AnimationControl -> time display', t => {
t.equal(timeDomainEnd.length, 1, 'should render timeDomainEnd');
t.equal(
- timeDomainStart
- .find('span')
- .at(0)
- .text(),
+ timeDomainStart.find('span').at(0).text(),
'08/12/2019 2:34:21 AM',
'should render current domain start'
);
t.equal(
- timeDomainEnd
- .find('span')
- .at(0)
- .text(),
+ timeDomainEnd.find('span').at(0).text(),
'08/12/2019 3:00:36 AM',
'should render current domain end'
);
@@ -122,11 +113,7 @@ test('Components -> AnimationControl -> time display', t => {
'should render 1 top row time'
);
t.equal(
- timeDisplay
- .find('.animation-control__time-display__top')
- .at(0)
- .find('.time-value')
- .text(),
+ timeDisplay.find('.animation-control__time-display__top').at(0).find('.time-value').text(),
'08/12/2019',
'should render correct date'
);
@@ -137,11 +124,7 @@ test('Components -> AnimationControl -> time display', t => {
'should render 1 top row time'
);
t.equal(
- timeDisplay
- .find('.animation-control__time-display__bottom')
- .at(0)
- .find('.time-value')
- .text(),
+ timeDisplay.find('.animation-control__time-display__bottom').at(0).find('.time-value').text(),
'2:34:21 AM',
'should render correct time'
);
@@ -185,18 +168,12 @@ test('Components -> AnimationControl -> time display -> custom timezone and time
t.equal(timeDomainEnd.length, 1, 'should render timeDomainEnd');
t.equal(
- timeDomainStart
- .find('span')
- .at(0)
- .text(),
+ timeDomainStart.find('span').at(0).text(),
'2019 Aug 11 10:34',
'should render current domain start'
);
t.equal(
- timeDomainEnd
- .find('span')
- .at(0)
- .text(),
+ timeDomainEnd.find('span').at(0).text(),
'2019 Aug 11 11:00',
'should render current domain end'
);
@@ -207,11 +184,7 @@ test('Components -> AnimationControl -> time display -> custom timezone and time
'should render 1 bottom row time'
);
t.equal(
- timeDisplay
- .find('.animation-control__time-display__bottom')
- .at(0)
- .find('.time-value')
- .text(),
+ timeDisplay.find('.animation-control__time-display__bottom').at(0).find('.time-value').text(),
'2019 Aug 11 10:34',
'should render correct date'
);
diff --git a/test/browser/components/common/color-legend-test.js b/test/browser/components/common/color-legend-test.js
index 458e56e61..e967ca62e 100644
--- a/test/browser/components/common/color-legend-test.js
+++ b/test/browser/components/common/color-legend-test.js
@@ -32,12 +32,7 @@ test('Components -> ColorLegend.render', t => {
let wrapper = mountWithTheme(<ColorLegend {...props} />);
t.equal(wrapper.find(LegendRow).length, 6, 'Should render 6 legends');
- const row1 = wrapper
- .find(LegendRow)
- .at(0)
- .find('rect')
- .at(0)
- .html();
+ const row1 = wrapper.find(LegendRow).at(0).find('rect').at(0).html();
t.ok(row1.indexOf('fill: #5A1846'), 'should render color rect');
@@ -53,12 +48,7 @@ test('Components -> ColorLegend.render', t => {
props.scaleType = 'quantile';
wrapper = mountWithTheme(<ColorLegend {...props} />);
- const row1Txt = wrapper
- .find(LegendRow)
- .at(0)
- .find('text')
- .at(0)
- .text();
+ const row1Txt = wrapper.find(LegendRow).at(0).find('text').at(0).text();
t.equal(row1Txt, '', 'should not render text');
t.end();
@@ -88,12 +78,7 @@ test('Components -> ColorLegend.render', t => {
let wrapper = mountWithTheme(<ColorLegend {...props} />);
t.equal(wrapper.find(LegendRow).length, 5, 'Should render 5 legends');
- let row1 = wrapper
- .find(LegendRow)
- .at(0)
- .find('rect')
- .at(0)
- .html();
+ let row1 = wrapper.find(LegendRow).at(0).find('rect').at(0).html();
t.ok(row1.indexOf('fill: #C1C9CC'), 'should render color rect based on colorMap');
t.ok(row1.indexOf('apple'), 'should render color text based on colorMap');
@@ -110,12 +95,7 @@ test('Components -> ColorLegend.render', t => {
wrapper = mountWithTheme(<ColorLegend {...props} />);
t.equal(wrapper.find(LegendRow).length, 5, 'Should render 5 legends');
- row1 = wrapper
- .find(LegendRow)
- .at(0)
- .find('rect')
- .at(0)
- .html();
+ row1 = wrapper.find(LegendRow).at(0).find('rect').at(0).html();
t.ok(row1.indexOf('fill: #DFB02F'), 'should render color rect based on colorMap');
t.ok(row1.indexOf('Apple'), 'should render color text based on colorMap');
diff --git a/test/browser/components/common/file-uploader-test.js b/test/browser/components/common/file-uploader-test.js
index f75624390..e3fc448ba 100644
--- a/test/browser/components/common/file-uploader-test.js
+++ b/test/browser/components/common/file-uploader-test.js
@@ -53,11 +53,7 @@ test('Components -> FileUpload.onDrop', t => {
t.ok(onFileUpload.called, 'onFileUpload should get called');
t.ok(stopPropagation.called, 'stopPropagation should get called');
- const files = wrapper
- .find(FileUpload)
- .children()
- .first()
- .state().files;
+ const files = wrapper.find(FileUpload).children().first().state().files;
t.deepEqual(files, mockFiles, 'should set files to state');
@@ -102,10 +98,7 @@ test('Components -> FileUpload.onDrop -> render loading msg', t => {
t.ok(onFileUpload.called, 'onFileUpload should get called');
- const uploadMsg = wrapper
- .find('.file-upload-progress__message')
- .at(0)
- .html();
+ const uploadMsg = wrapper.find('.file-upload-progress__message').at(0).html();
t.comment(uploadMsg);
t.ok(uploadMsg.includes('tst-file.csv', 'should render upload file msg'));
@@ -139,11 +132,7 @@ test('Components -> FileUpload.onDrop -> render error msg', t => {
t.ok(onFileUpload.notCalled, 'onFileUpload should not get called');
t.ok(wrapper.find(WarningMsg), 'should render WarningMsg');
- const errorFiles = wrapper
- .find(FileUpload)
- .children()
- .first()
- .state().errorFiles;
+ const errorFiles = wrapper.find(FileUpload).children().first().state().errorFiles;
t.deepEqual(errorFiles, ['tst-file.png'], 'should save files to errorFiles');
t.end();
@@ -172,11 +161,7 @@ test('Components -> FileUpload.dragOver', t => {
};
FileDropDiv.simulate('dragover', mockEvent);
- const dragOver = wrapper
- .find(FileUpload)
- .children()
- .first()
- .state().dragOver;
+ const dragOver = wrapper.find(FileUpload).children().first().state().dragOver;
t.ok(dragOver, 'dragOver should be set to true');
t.end();
});
@@ -204,11 +189,7 @@ test('Components -> FileUpload.dragLeave', t => {
};
FileDropDiv.simulate('dragleave', mockEvent);
- const dragOver = wrapper
- .find(FileUpload)
- .children()
- .first()
- .state().dragOver;
+ const dragOver = wrapper.find(FileUpload).children().first().state().dragOver;
t.notOk(dragOver, 'dragOver should be set to false');
t.end();
});
@@ -243,11 +224,7 @@ test('Components -> UploadButton fileInput', t => {
input.simulate('change', mockEvent);
t.ok(onFileUpload.called, 'onFileUpload should get called');
- const files = wrapper
- .find(FileUpload)
- .children()
- .first()
- .state().files;
+ const files = wrapper.find(FileUpload).children().first().state().files;
t.deepEqual(files, mockFiles, 'should set files to state');
diff --git a/test/browser/components/common/item-selector-test.js b/test/browser/components/common/item-selector-test.js
index e63e6e4ce..d5e1ba9d7 100644
--- a/test/browser/components/common/item-selector-test.js
+++ b/test/browser/components/common/item-selector-test.js
@@ -30,49 +30,25 @@ test('Components -> ItemSelector.render', t => {
t.equal(wrapper.find('.item-selector__dropdown').length, 1, 'should render DropdownSelect');
t.equal(wrapper.find(Typeahead).length, 0, 'should not render Typeahead');
t.equal(
- wrapper
- .find('.item-selector__dropdown')
- .at(0)
- .find('.list__item__anchor')
- .text(),
+ wrapper.find('.item-selector__dropdown').at(0).find('.list__item__anchor').text(),
'normal',
'should render selected value'
);
// click dropdown select
- wrapper
- .find('.item-selector__dropdown')
- .at(0)
- .simulate('click');
+ wrapper.find('.item-selector__dropdown').at(0).simulate('click');
t.equal(wrapper.find(Typeahead).length, 1, 'should render Typeahead');
t.equal(wrapper.find(DropdownList).length, 1, 'should render 1 Typeahead');
- t.equal(
- wrapper
- .find(DropdownList)
- .at(0)
- .find(ListItem).length,
- 3,
- 'should render 3 ListItem'
- );
+ t.equal(wrapper.find(DropdownList).at(0).find(ListItem).length, 3, 'should render 3 ListItem');
t.equal(
- wrapper
- .find(DropdownList)
- .at(0)
- .find('.list__item__anchor')
- .at(0)
- .text(),
+ wrapper.find(DropdownList).at(0).find('.list__item__anchor').at(0).text(),
'additive',
'should render additive'
);
- wrapper
- .find(DropdownList)
- .at(0)
- .find('.list__item')
- .at(0)
- .simulate('click');
+ wrapper.find(DropdownList).at(0).find('.list__item').at(0).simulate('click');
t.deepEqual(onChange.args[0], ['additive'], 'should call additive');
t.end();
@@ -81,11 +57,7 @@ test('Components -> ItemSelector.render', t => {
test('Components -> ItemSelector.render over 100 options', t => {
let wrapper;
const onChange = sinon.spy();
- const randomOptions = Array.from({length: 120}, () =>
- Math.random()
- .toString(16)
- .substr(2, 8)
- );
+ const randomOptions = Array.from({length: 120}, () => Math.random().toString(16).substr(2, 8));
const props = {
selectedItems: '',
@@ -106,28 +78,18 @@ test('Components -> ItemSelector.render over 100 options', t => {
t.equal(wrapper.find('.item-selector__dropdown').length, 1, 'should render DropdownSelect');
t.equal(wrapper.find(Typeahead).length, 0, 'should not render Typeahead');
t.equal(
- wrapper
- .find('.item-selector__dropdown')
- .at(0)
- .find('.list__item__anchor')
- .text(),
+ wrapper.find('.item-selector__dropdown').at(0).find('.list__item__anchor').text(),
'',
'should render no select value'
);
// click dropdown select
- wrapper
- .find('.item-selector__dropdown')
- .at(0)
- .simulate('click');
+ wrapper.find('.item-selector__dropdown').at(0).simulate('click');
t.equal(wrapper.find(Typeahead).length, 1, 'should render Typeahead');
t.equal(wrapper.find(DropdownList).length, 1, 'should render 1 Typeahead');
t.equal(
- wrapper
- .find(DropdownList)
- .at(0)
- .find(ListItem).length,
+ wrapper.find(DropdownList).at(0).find(ListItem).length,
100,
'should render first 100 ListItem'
);
@@ -157,10 +119,7 @@ test('Components -> ItemSelector.render over 100 options', t => {
wrapper.update();
t.equal(
- wrapper
- .find(DropdownList)
- .at(0)
- .find(ListItem).length,
+ wrapper.find(DropdownList).at(0).find(ListItem).length,
120,
'should render all 120 ListItem'
);
@@ -173,10 +132,7 @@ test('Components -> ItemSelector.render over 100 options', t => {
wrapper.update();
t.equal(
- wrapper
- .find(DropdownList)
- .at(0)
- .find(ListItem).length,
+ wrapper.find(DropdownList).at(0).find(ListItem).length,
120,
'should still render all 120 ListItem'
);
diff --git a/test/browser/components/editor/feature-action-panel-test.js b/test/browser/components/editor/feature-action-panel-test.js
index 9712665cf..43c5681bb 100644
--- a/test/browser/components/editor/feature-action-panel-test.js
+++ b/test/browser/components/editor/feature-action-panel-test.js
@@ -54,11 +54,7 @@ test('FeatureActionPanel -> display layers', t => {
t.equal(wrapper.find('Checkbox').length, 2, 'We should display only 2 layer checkbox');
for (let i = 0; i < wrapper.find('Checkbox').length; i++) {
t.equal(
- wrapper
- .find('Checkbox')
- .at(i)
- .find('label')
- .text(),
+ wrapper.find('Checkbox').at(i).find('label').text(),
`layer ${i + 1}`,
'should render correct layer label'
);
diff --git a/test/browser/components/effects/effect-configurator-test.js b/test/browser/components/effects/effect-configurator-test.js
index a99e64831..3caf8c991 100644
--- a/test/browser/components/effects/effect-configurator-test.js
+++ b/test/browser/components/effects/effect-configurator-test.js
@@ -60,7 +60,7 @@ const ititialState = {mapState: {latitude: 0, longitude: 0}};
test('Components -> EffectConfigurator -> render -> light & shadow effect', t => {
const store = mockStore(ititialState);
- let nextState = visStateReducer(
+ const nextState = visStateReducer(
InitialState.visState,
VisStateActions.addEffect({
type: 'lightAndShadow'
diff --git a/test/browser/components/effects/effect-manager-test.js b/test/browser/components/effects/effect-manager-test.js
index 5ec8ba671..da0754234 100644
--- a/test/browser/components/effects/effect-manager-test.js
+++ b/test/browser/components/effects/effect-manager-test.js
@@ -38,7 +38,7 @@ const initialState = {
};
test('Components -> EffectManager -> render', t => {
- let store = mockStore(initialState);
+ const store = mockStore(initialState);
// mount
let wrapper;
diff --git a/test/browser/components/effects/effect-time-configurator-test.js b/test/browser/components/effects/effect-time-configurator-test.js
index e5540e84b..359e83524 100644
--- a/test/browser/components/effects/effect-time-configurator-test.js
+++ b/test/browser/components/effects/effect-time-configurator-test.js
@@ -67,28 +67,19 @@ test('Components -> EffectTimeConfigurator -> time type', t => {
);
}, `EffectTimeConfigurator should not fail`);
- wrapper
- .find('Checkbox')
- .at(0)
- .invoke('onChange')();
+ wrapper.find('Checkbox').at(0).invoke('onChange')();
t.ok(
onTimeModeChange.calledWith({timeMode: LIGHT_AND_SHADOW_EFFECT_TIME_MODES.pick}),
`Should set ${LIGHT_AND_SHADOW_EFFECT_TIME_MODES.pick} mode`
);
- wrapper
- .find('Checkbox')
- .at(1)
- .invoke('onChange')();
+ wrapper.find('Checkbox').at(1).invoke('onChange')();
t.ok(
onTimeModeChange.calledWith({timeMode: LIGHT_AND_SHADOW_EFFECT_TIME_MODES.current}),
`Should set ${LIGHT_AND_SHADOW_EFFECT_TIME_MODES.current} mode`
);
- wrapper
- .find('Checkbox')
- .at(2)
- .invoke('onChange')();
+ wrapper.find('Checkbox').at(2).invoke('onChange')();
t.ok(
onTimeModeChange.calledWith({timeMode: LIGHT_AND_SHADOW_EFFECT_TIME_MODES.animation}),
`Should set ${LIGHT_AND_SHADOW_EFFECT_TIME_MODES.animation} mode`
@@ -163,10 +154,7 @@ test('Components -> EffectTimeConfigurator -> pick time', t => {
);
// pick current time button
- wrapper
- .find('Button')
- .at(0)
- .simulate('click');
+ wrapper.find('Button').at(0).simulate('click');
t.ok(
Math.abs(onDateTimeChange.getCall(7).args[0].timestamp - Date.now()) < 1000,
`Should pick current date & time`
@@ -177,30 +165,12 @@ test('Components -> EffectTimeConfigurator -> pick time', t => {
const getDisplayedDateTimeValues = wrapper => {
return {
- year: wrapper
- .find('.react-date-picker__inputGroup__year')
- .at(0)
- .props().value,
- month: wrapper
- .find('.react-date-picker__inputGroup__month')
- .at(0)
- .props().value,
- day: wrapper
- .find('.react-date-picker__inputGroup__day')
- .at(0)
- .props().value,
- hour: wrapper
- .find('.react-time-picker__inputGroup__hour')
- .at(0)
- .props().value,
- minute: wrapper
- .find('.react-time-picker__inputGroup__minute')
- .at(0)
- .props().value,
- amPm: wrapper
- .find('.react-time-picker__inputGroup__amPm')
- .at(0)
- .props().value
+ year: wrapper.find('.react-date-picker__inputGroup__year').at(0).props().value,
+ month: wrapper.find('.react-date-picker__inputGroup__month').at(0).props().value,
+ day: wrapper.find('.react-date-picker__inputGroup__day').at(0).props().value,
+ hour: wrapper.find('.react-time-picker__inputGroup__hour').at(0).props().value,
+ minute: wrapper.find('.react-time-picker__inputGroup__minute').at(0).props().value,
+ amPm: wrapper.find('.react-time-picker__inputGroup__amPm').at(0).props().value
};
};
@@ -239,14 +209,8 @@ test('Components -> EffectTimeConfigurator -> time zone update', t => {
t.equal(values.amPm, 'pm', `AM/PM should be correctly set`);
// Change time zone
- wrapper
- .find('.item-selector__dropdown')
- .at(1)
- .simulate('click');
- wrapper
- .find({children: 'America/Barbados'})
- .at(0)
- .simulate('click');
+ wrapper.find('.item-selector__dropdown').at(1).simulate('click');
+ wrapper.find({children: 'America/Barbados'}).at(0).simulate('click');
t.deepEqual(
onDateTimeChange.getCall(0).args[0],
diff --git a/test/browser/components/filters/time-widget-test.js b/test/browser/components/filters/time-widget-test.js
index ced4a0a70..6bc740bce 100644
--- a/test/browser/components/filters/time-widget-test.js
+++ b/test/browser/components/filters/time-widget-test.js
@@ -86,10 +86,7 @@ test('Components -> TimeWidget.mount -> with time filter', t => {
t.equal(wrapper.find(PlaybackControls).length, 1, 'should render PlaybackControls');
// check yAxisFields
- const yAxisFields = wrapper
- .find(FieldSelector)
- .at(0)
- .props().fields;
+ const yAxisFields = wrapper.find(FieldSelector).at(0).props().fields;
t.deepEqual(
yAxisFields.map(f => f.name),
['gps_data.lat', 'gps_data.lng', 'uid'],
@@ -145,24 +142,15 @@ test('Components -> TimeWidget.mount -> test actions', t => {
);
// hit play
- wrapper
- .find(Icons.Play)
- .at(0)
- .simulate('click');
+ wrapper.find(Icons.Play).at(0).simulate('click');
t.deepEqual(toggleAnimation.args[0], [0], 'should call toggle animation');
// hit speed icon
- wrapper
- .find(Icons.Rocket)
- .at(0)
- .simulate('click');
+ wrapper.find(Icons.Rocket).at(0).simulate('click');
t.equal(wrapper.find(AnimationSpeedSlider).length, 1, 'should render AnimationSpeedSlider');
t.equal(
- wrapper
- .find(AnimationSpeedSlider)
- .at(0)
- .find('.kg-range-slider__handle').length,
+ wrapper.find(AnimationSpeedSlider).at(0).find('.kg-range-slider__handle').length,
2,
'should render 2 speed slider handle'
);
@@ -182,31 +170,20 @@ test('Components -> TimeWidget.mount -> test actions', t => {
t.deepEqual(updateAnimationSpeed.args[0], [0, 2], 'should call updateAnimationSpeed with speed');
// hit animation window
- wrapper
- .find(Icons.FreeWindow)
- .at(0)
- .simulate('click');
+ wrapper.find(Icons.FreeWindow).at(0).simulate('click');
t.equal(
wrapper.find('.animation-window-control').length,
1,
'should render AnimationWindowControl initially'
);
t.equal(
- wrapper
- .find('.animation-window-control')
- .at(0)
- .find(IconButton).length,
+ wrapper.find('.animation-window-control').at(0).find(IconButton).length,
1,
'should render 1 animate window options'
);
// select an animation option
- wrapper
- .find('.animation-window-control')
- .at(0)
- .find(IconButton)
- .at(0)
- .simulate('click');
+ wrapper.find('.animation-window-control').at(0).find(IconButton).at(0).simulate('click');
t.deepEqual(
setFilterAnimationWindow.args[0],
@@ -215,17 +192,10 @@ test('Components -> TimeWidget.mount -> test actions', t => {
);
// click yaxis select
- wrapper
- .find('.item-selector__dropdown')
- .at(0)
- .simulate('click');
+ wrapper.find('.item-selector__dropdown').at(0).simulate('click');
t.equal(wrapper.find(Typeahead).length, 1, 'should render dropdown select');
- wrapper
- .find(Typeahead)
- .find('.field-selector_list-item')
- .at(0)
- .simulate('click');
+ wrapper.find(Typeahead).find('.field-selector_list-item').at(0).simulate('click');
t.equal(setFilterPlot.args[0][0], 0, 'should pass filteridx to setFilterPlot');
t.equal(
setFilterPlot.args[0][1].yAxis.name,
@@ -234,10 +204,7 @@ test('Components -> TimeWidget.mount -> test actions', t => {
);
// hit close
- wrapper
- .find(Icons.Close)
- .at(0)
- .simulate('click');
+ wrapper.find(Icons.Close).at(0).simulate('click');
t.deepEqual(onClose.calledOnce, true, 'should call enlarged filter to close');
@@ -309,41 +276,24 @@ test('Components -> TimeWidget.mount -> test floating time display', t => {
const timeDisplay = wrapper.find(FloatingTimeDisplay);
t.equal(timeDisplay.find(topSelector).length, 1, 'should render 1 top row');
t.equal(
- timeDisplay
- .find(topSelector)
- .at(0)
- .find('.time-value')
- .text(),
+ timeDisplay.find(topSelector).at(0).find('.time-value').text(),
'09/23/2016',
'should render correct date'
);
t.equal(timeDisplay.find(bottomSelector).length, 1, 'should render 1 bottom row');
t.equal(
- timeDisplay
- .find(bottomSelector)
- .at(0)
- .find('.time-value').length,
+ timeDisplay.find(bottomSelector).at(0).find('.time-value').length,
2,
'should render 2 time value'
);
t.equal(
- timeDisplay
- .find(bottomSelector)
- .at(0)
- .find('.time-value')
- .at(0)
- .text(),
+ timeDisplay.find(bottomSelector).at(0).find('.time-value').at(0).text(),
'5:00:00 AM',
'should render correct time'
);
t.equal(
- timeDisplay
- .find(bottomSelector)
- .at(0)
- .find('.time-value')
- .at(1)
- .text(),
+ timeDisplay.find(bottomSelector).at(0).find('.time-value').at(1).text(),
'8:00:00 AM',
'should render correct time'
);
@@ -357,23 +307,13 @@ test('Components -> TimeWidget.mount -> test floating time display', t => {
// check time display again
const timeDisplay2 = wrapper.find(FloatingTimeDisplay);
t.equal(
- timeDisplay2
- .find(bottomSelector)
- .at(0)
- .find('.time-value')
- .at(0)
- .text(),
+ timeDisplay2.find(bottomSelector).at(0).find('.time-value').at(0).text(),
'2016 Sep 23 01:00 am',
'should render correct time format and timezone'
);
t.equal(
- timeDisplay2
- .find(bottomSelector)
- .at(0)
- .find('.time-value')
- .at(1)
- .text(),
+ timeDisplay2.find(bottomSelector).at(0).find('.time-value').at(1).text(),
'2016 Sep 23 04:00 am',
'should render correct time format and timezone'
);
@@ -394,11 +334,7 @@ test('Components -> TimeWidget.mount -> TimeSliderMarker', t => {
}, 'mount TimeWidget should not fail');
t.equal(wrapper.find(TimeSliderMarker).length, 1, 'should render TimeSliderMarker');
- let d3Html = wrapper
- .find(TimeSliderMarker)
- .at(0)
- .find('.x.axis')
- .html();
+ let d3Html = wrapper.find(TimeSliderMarker).at(0).find('.x.axis').html();
// moment.utc(1474588800000) -> "2016-09-23 00:00"
// moment.utc(1474617600000) -> "2016-09-23 08:00"
@@ -426,11 +362,7 @@ test('Components -> TimeWidget.mount -> TimeSliderMarker', t => {
children: <TimeWidget {...defaultProps} filter={nextState.filters[0]} />
});
- d3Html = wrapper
- .find(TimeSliderMarker)
- .at(0)
- .find('.x.axis')
- .html();
+ d3Html = wrapper.find(TimeSliderMarker).at(0).find('.x.axis').html();
// moment.utc(1474588800000).tz('America/New_York') -> "2016-09-22 20:00"
// moment.utc(1474617600000).tz('America/New_York') -> "2016-09-23 04:00"
diff --git a/test/browser/components/geocoder-panel-test.js b/test/browser/components/geocoder-panel-test.js
index 3daabfe75..5bcb64e5d 100644
--- a/test/browser/components/geocoder-panel-test.js
+++ b/test/browser/components/geocoder-panel-test.js
@@ -88,7 +88,6 @@ test('GeocoderPanel - render', t => {
],
rows: [[55, 1, 'place', 'mock']]
},
- id: 'geocoder_dataset',
info: {
hidden: true,
id: 'geocoder_dataset',
@@ -168,7 +167,7 @@ test('GeocoderPanel - render', t => {
const actualDatasets = updateVisData.args[0][0];
const mockDatasets = mockPayload[0];
- mockDatasets.forEach((mockDataset, index) => {
+ mockDatasets.forEach(mockDataset => {
const {data: mockDatasetData, ...restMockDataset} = mockDataset;
const {data: actualDatasetData, ...restActualDataset} = actualDatasets[0];
cmpDatasetData(t, mockDatasetData, actualDatasetData, mockDataset.id);
diff --git a/test/browser/components/hooks/use-dnd-effects.spec.js b/test/browser/components/hooks/use-dnd-effects.spec.js
index 506ef29e5..743ad03f0 100644
--- a/test/browser/components/hooks/use-dnd-effects.spec.js
+++ b/test/browser/components/hooks/use-dnd-effects.spec.js
@@ -1,7 +1,6 @@
// SPDX-License-Identifier: MIT
// Copyright contributors to the kepler.gl project
-import React from 'react';
import {renderHook, act} from '@testing-library/react';
import {useDispatch} from 'react-redux';
import {useDndEffects} from '@kepler.gl/components';
diff --git a/test/browser/components/hooks/use-dnd-layers.spec.js b/test/browser/components/hooks/use-dnd-layers.spec.js
index ca4c090d5..83cb549a4 100644
--- a/test/browser/components/hooks/use-dnd-layers.spec.js
+++ b/test/browser/components/hooks/use-dnd-layers.spec.js
@@ -1,7 +1,6 @@
// SPDX-License-Identifier: MIT
// Copyright contributors to the kepler.gl project
-import React from 'react';
import {renderHook, act} from '@testing-library/react';
import {useDispatch} from 'react-redux';
import {useDndLayers} from '@kepler.gl/components';
diff --git a/test/browser/components/injector-test.js b/test/browser/components/injector-test.js
index 57830bf61..1ac7a9a8d 100644
--- a/test/browser/components/injector-test.js
+++ b/test/browser/components/injector-test.js
@@ -53,12 +53,13 @@ test('Components -> injector -> missing deps', t => {
// eslint-disable-next-line react/display-name
const myCustomNameFactory = () => () => <div className="my-test-header-name">name</div>;
// eslint-disable-next-line react/display-name
- const myCustomHeaderFactory = Name => () => (
- <div className="my-test-header-1">
- <Name />
- smoothie
- </div>
- );
+ const myCustomHeaderFactory = Name => () =>
+ (
+ <div className="my-test-header-1">
+ <Name />
+ smoothie
+ </div>
+ );
myCustomHeaderFactory.deps = [myCustomNameFactory];
const KeplerGl = injectComponents([[PanelHeaderFactory, myCustomHeaderFactory]]);
@@ -87,12 +88,13 @@ test('Components -> injector -> missing deps', t => {
test('Components -> injector -> wrong factory type', t => {
const spy = sinon.spy(Console, 'error');
// eslint-disable-next-line react/display-name
- const myCustomHeaderFactory = Name => () => (
- <div className="my-test-header-2">
- <Name />
- smoothie
- </div>
- );
+ const myCustomHeaderFactory = Name => () =>
+ (
+ <div className="my-test-header-2">
+ <Name />
+ smoothie
+ </div>
+ );
const KeplerGl = injectComponents([[undefined, myCustomHeaderFactory]]);
@@ -194,7 +196,7 @@ test('Components -> injector -> replace and render existing', t => {
});
test('Components -> injector -> withState.lens', t => {
- const CustomHeader = ({visState}) => <div className="my-test-header-3">smoothie</div>;
+ const CustomHeader = () => <div className="my-test-header-3">smoothie</div>;
const myCustomHeaderFactory = () =>
withState([visStateLens, mapStateLens, uiStateLens, mapStyleLens])(CustomHeader);
@@ -227,7 +229,7 @@ test('Components -> injector -> withState.lens', t => {
});
test('Components -> injector -> withState.mapStateToProps', t => {
- const CustomHeader = ({visState}) => <div className="my-test-header-3">smoothie</div>;
+ const CustomHeader = () => <div clssName="my-test-header-3">smoothie</div>;
const myCustomHeaderFactory = () =>
withState([], state => ({ids: Object.keys(state)}))(CustomHeader);
diff --git a/test/browser/components/map/map-control-test.js b/test/browser/components/map/map-control-test.js
index 76e9c2e9a..5d4bd5021 100644
--- a/test/browser/components/map/map-control-test.js
+++ b/test/browser/components/map/map-control-test.js
@@ -178,33 +178,21 @@ test('MapControlFactory - click options', t => {
t.equal(wrapper.find(Delete).length, 1, 'Should show 1 delete split map button');
// click split Map
- wrapper
- .find('.map-control-button.split-map')
- .at(0)
- .simulate('click');
+ wrapper.find('.map-control-button.split-map').at(0).simulate('click');
t.ok(onToggleSplitMap.calledOnce, 'should call onToggleSplitMap');
t.deepEqual(onToggleSplitMap.args[0], [0], 'should call onToggleSplitMap with mapindex');
// click toggle3d
- wrapper
- .find('.map-control-button.toggle-3d')
- .at(0)
- .simulate('click');
+ wrapper.find('.map-control-button.toggle-3d').at(0).simulate('click');
t.ok(onTogglePerspective.calledOnce, 'should call onTogglePerspective');
// click map legend
- wrapper
- .find('.map-control-button.show-legend')
- .at(0)
- .simulate('click');
+ wrapper.find('.map-control-button.show-legend').at(0).simulate('click');
t.equal(wrapper.find(MapLegend).length, 1, 'should render MapLegend');
// click map draw
- wrapper
- .find('.map-control-button.map-draw')
- .at(0)
- .simulate('click');
+ wrapper.find('.map-control-button.map-draw').at(0).simulate('click');
t.equal(wrapper.find(MapLegend).length, 1, 'should render MapLegend');
@@ -216,10 +204,7 @@ test('MapControlFactory - click options', t => {
);
// click locale
- wrapper
- .find('.map-control-button.locale-panel')
- .at(0)
- .simulate('click');
+ wrapper.find('.map-control-button.locale-panel').at(0).simulate('click');
t.ok(onToggleMapControl.calledTwice, 'should call onToggleMapControl');
t.deepEqual(
onToggleMapControl.args[1],
@@ -228,10 +213,7 @@ test('MapControlFactory - click options', t => {
);
// click layer selector
- wrapper
- .find('.map-control-button.toggle-layer')
- .at(0)
- .simulate('click');
+ wrapper.find('.map-control-button.toggle-layer').at(0).simulate('click');
t.ok(onToggleMapControl.calledThrice, 'should call onToggleMapControl');
t.deepEqual(
onToggleMapControl.args[2],
@@ -287,10 +269,7 @@ test('MapControlFactory - show panels', t => {
'MapLayerSelector should render correct number of layers'
);
- wrapper
- .find('input')
- .at(0)
- .simulate('change');
+ wrapper.find('input').at(0).simulate('change');
t.ok(toggleLayerForMap.calledOnce, 'should call toggleLayerForMap');
t.deepEqual(
toggleLayerForMap.args[0],
@@ -310,10 +289,7 @@ test('MapControlFactory - show panels', t => {
t.equal(wrapper.find(MapControlToolbar).length, 1, 'should render 1 MapControlToolbar');
t.equal(
- wrapper
- .find(MapControlToolbar)
- .at(0)
- .find(ToolbarItem).length,
+ wrapper.find(MapControlToolbar).at(0).find(ToolbarItem).length,
3,
'should render 3 ToolbarItem'
);
@@ -331,10 +307,7 @@ test('MapControlFactory - show panels', t => {
t.equal(wrapper.find(MapControlToolbar).length, 1, 'should render 1 MapControlToolbar');
t.equal(
- wrapper
- .find(MapControlToolbar)
- .at(0)
- .find(ToolbarItem).length,
+ wrapper.find(MapControlToolbar).at(0).find(ToolbarItem).length,
Object.keys(LOCALE_CODES).length,
`should render ${Object.keys(LOCALE_CODES).length} LOCALE_CODES`
);
diff --git a/test/browser/components/map/map-legend-test.js b/test/browser/components/map/map-legend-test.js
index cfa9a758b..41c66623d 100644
--- a/test/browser/components/map/map-legend-test.js
+++ b/test/browser/components/map/map-legend-test.js
@@ -66,10 +66,7 @@ test('Components -> MapLegend.render -> with layers', t => {
function testGeojsonLegend(t, geojsonLegend) {
t.equal(
- geojsonLegend
- .find('.legend--layer_name')
- .at(0)
- .text(),
+ geojsonLegend.find('.legend--layer_name').at(0).text(),
geojsonLayer.config.label,
'geojson layer legend should render label'
);
@@ -92,10 +89,7 @@ function testGeojsonLegend(t, geojsonLegend) {
'geojson fill color should render SingleColorLegend'
);
t.deepEqual(
- fillColorLegend
- .find(SingleColorLegend)
- .at(0)
- .props().color,
+ fillColorLegend.find(SingleColorLegend).at(0).props().color,
geojsonLayer.config.color,
'geojson color legend should be correct color'
);
@@ -106,10 +100,7 @@ function testGeojsonLegend(t, geojsonLegend) {
'geojson stroke color should render SingleColorLegend'
);
t.deepEqual(
- strokeColorLegend
- .find(SingleColorLegend)
- .at(0)
- .props().color,
+ strokeColorLegend.find(SingleColorLegend).at(0).props().color,
geojsonLayer.config.visConfig.strokeColor,
'geojson color legend should be correct color'
);
@@ -120,10 +111,7 @@ function testPointLayerLegend(t, pointLegend) {
// color by: gps_data.types
// point layer has 2 color channels, only fill is enabled
t.equal(
- pointLegend
- .find('.legend--layer_name')
- .at(0)
- .text(),
+ pointLegend.find('.legend--layer_name').at(0).text(),
pointLayer.config.label,
'point layer legend should render point label'
);
@@ -159,10 +147,7 @@ function testPointLayerLegend(t, pointLegend) {
function testHexagonLayerLegend(t, hexagonLegend) {
t.equal(
- hexagonLegend
- .find('.legend--layer_name')
- .at(0)
- .text(),
+ hexagonLegend.find('.legend--layer_name').at(0).text(),
hexagonLayer.config.label,
'hexagon layer legend should render label'
);
diff --git a/test/browser/components/map/map-popover-test.js b/test/browser/components/map/map-popover-test.js
index dd819045a..8e8aedffe 100644
--- a/test/browser/components/map/map-popover-test.js
+++ b/test/browser/components/map/map-popover-test.js
@@ -62,10 +62,7 @@ test('Map Popover - render', t => {
);
// click pin
- wrapper
- .find('.popover-pin')
- .at(0)
- .simulate('click');
+ wrapper.find('.popover-pin').at(0).simulate('click');
t.ok(onClose.called, 'should call onClose when click pin');
// render coordinate
wrapper.setProps({
@@ -74,30 +71,9 @@ test('Map Popover - render', t => {
)
});
t.equal(wrapper.find('CoordinateInfo').length, 1, 'Should render CoordinateInfo');
- t.equal(
- wrapper
- .find('.row__value')
- .at(0)
- .text(),
- '-31.123457,',
- 'should render lat'
- );
- t.equal(
- wrapper
- .find('.row__value')
- .at(1)
- .text(),
- '127.123457,',
- 'should render longitude'
- );
- t.equal(
- wrapper
- .find('.row__value')
- .at(2)
- .text(),
- '12.1z',
- 'should render zoom'
- );
+ t.equal(wrapper.find('.row__value').at(0).text(), '-31.123457,', 'should render lat');
+ t.equal(wrapper.find('.row__value').at(1).text(), '127.123457,', 'should render longitude');
+ t.equal(wrapper.find('.row__value').at(2).text(), '12.1z', 'should render zoom');
t.end();
});
@@ -125,18 +101,12 @@ test('Map Popover - render with layerHoverProp', t => {
];
for (let i = 0; i < 5; i++) {
t.equal(
- rows
- .at(i)
- .find('.row__name')
- .text(),
+ rows.at(i).find('.row__name').text(),
expectedTooltips[i][0],
'row name should be correct'
);
t.equal(
- rows
- .at(i)
- .find('.row__value')
- .text(),
+ rows.at(i).find('.row__value').text(),
expectedTooltips[i][1],
'row value should be correct'
);
@@ -172,10 +142,7 @@ test('Map Popover - render with geojsonLayerHoverProp', t => {
t.equal(wrapper.find('.primary-label').length, 1, 'Should display 1 primary label');
// click select geometry
- wrapper
- .find('.select-geometry')
- .at(0)
- .simulate('click');
+ wrapper.find('.select-geometry').at(0).simulate('click');
t.ok(setSelectedFeature.called, 'should call setSelectedFeature when click select geometry');
t.ok(onSetFeatures.called, 'should call onSetFeatures when click select geometry');
diff --git a/test/browser/components/modals/data-table-modal-test.js b/test/browser/components/modals/data-table-modal-test.js
index 868b2939d..e48338c30 100644
--- a/test/browser/components/modals/data-table-modal-test.js
+++ b/test/browser/components/modals/data-table-modal-test.js
@@ -153,10 +153,7 @@ test('Components -> DataTableConfig', t => {
const numberFormatConfigInput = wrapper.find(NumberFormatConfig);
t.equal(numberFormatConfigInput.length, 5, 'should render 5 NumberFormatConfig');
- numberFormatConfigInput
- .at(0)
- .find(InputLight)
- .simulate('click');
+ numberFormatConfigInput.at(0).find(InputLight).simulate('click');
const formatDropdown = wrapper.find(DropdownList);
t.equal(formatDropdown.length, 1, 'should render 1 format dropdown');
@@ -169,27 +166,15 @@ test('Components -> DataTableConfig', t => {
'should render integer type formats'
);
- numberFormatConfigInput
- .at(1)
- .find(InputLight)
- .simulate('click');
+ numberFormatConfigInput.at(1).find(InputLight).simulate('click');
- const floatDisplayOptions = wrapper
- .find(DropdownList)
- .at(1)
- .props().options;
+ const floatDisplayOptions = wrapper.find(DropdownList).at(1).props().options;
t.deepEqual(floatDisplayOptions, getFieldFormatLabels('real'), 'should render real type formats');
- numberFormatConfigInput
- .at(2)
- .find(InputLight)
- .simulate('click');
+ numberFormatConfigInput.at(2).find(InputLight).simulate('click');
- const timeDisplayOptions = wrapper
- .find(DropdownList)
- .at(2)
- .props().options;
+ const timeDisplayOptions = wrapper.find(DropdownList).at(2).props().options;
t.deepEqual(
timeDisplayOptions,
@@ -197,15 +182,9 @@ test('Components -> DataTableConfig', t => {
'should render time type formats'
);
- numberFormatConfigInput
- .at(3)
- .find(InputLight)
- .simulate('click');
+ numberFormatConfigInput.at(3).find(InputLight).simulate('click');
- const dateDisplayOptions = wrapper
- .find(DropdownList)
- .at(3)
- .props().options;
+ const dateDisplayOptions = wrapper.find(DropdownList).at(3).props().options;
t.deepEqual(dateDisplayOptions, getFieldFormatLabels('date'), 'should render date type formats');
@@ -227,10 +206,7 @@ test('Components -> DataTableModal.render: csv 1', t => {
t.equal(wrapper.find(DatasetModalTab).length, 2, 'should render 1 DatasetModalTab');
t.equal(wrapper.find(DataTable).length, 1, 'should render 1 DataTable');
- const props = wrapper
- .find(DataTable)
- .at(0)
- .props();
+ const props = wrapper.find(DataTable).at(0).props();
const expectedColumns = [
'gps_data.utc_timestamp',
'gps_data.lat',
@@ -299,45 +275,24 @@ test('Components -> DataTableModal -> click tab', t => {
);
t.equal(wrapper.find(DatasetModalTab).length, 2, 'should render 2 DatasetModalTab');
+ t.equal(wrapper.find(DatasetModalTab).at(0).prop('active'), true, 'prop 0 active should be true');
t.equal(
- wrapper
- .find(DatasetModalTab)
- .at(0)
- .prop('active'),
- true,
- 'prop 0 active should be true'
- );
- t.equal(
- wrapper
- .find(DatasetModalTab)
- .at(0)
- .find('.dataset-name')
- .text(),
+ wrapper.find(DatasetModalTab).at(0).find('.dataset-name').text(),
'hello.csv',
'dataset name should be correct'
);
t.equal(
- wrapper
- .find(DatasetModalTab)
- .at(1)
- .prop('active'),
+ wrapper.find(DatasetModalTab).at(1).prop('active'),
false,
'prop 1 active should be true'
);
t.equal(
- wrapper
- .find(DatasetModalTab)
- .at(1)
- .find('.dataset-name')
- .text(),
+ wrapper.find(DatasetModalTab).at(1).find('.dataset-name').text(),
'zip.geojson',
'dataset name should be correct'
);
- wrapper
- .find(DatasetModalTab)
- .at(1)
- .simulate('click');
+ wrapper.find(DatasetModalTab).at(1).simulate('click');
t.ok(showDatasetTable.calledWith(testGeoJsonDataId));
t.end();
@@ -349,10 +304,7 @@ test('Components -> DataTableModal -> render DataTable: csv 1', t => {
);
t.equal(wrapper.find(DataTable).length, 1, 'should render 1 DataTable');
- const props = wrapper
- .find(DataTable)
- .at(0)
- .props();
+ const props = wrapper.find(DataTable).at(0).props();
// mock cellSizeCache, width and height
const enriched = {
@@ -486,10 +438,7 @@ test('Components -> DataTableModal -> render DataTable: sort, pin and display fo
<DataTableModal datasets={nextState2.datasets} dataId={testCsvDataId} />
);
- const props = wrapper
- .find(DataTable)
- .at(0)
- .props();
+ const props = wrapper.find(DataTable).at(0).props();
// mock cellSizeCache, width and height
const enriched = {
@@ -531,18 +480,12 @@ test('Components -> DataTableModal -> render DataTable: sort, pin and display fo
);
t.ok(
- wrapper2
- .find('.header-cell')
- .at(0)
- .hasClass('pinned-header-cell'),
+ wrapper2.find('.header-cell').at(0).hasClass('pinned-header-cell'),
'should assign pinned-header-cell class'
);
t.ok(
- wrapper2
- .find('.header-cell')
- .at(0)
- .hasClass('first-cell'),
+ wrapper2.find('.header-cell').at(0).hasClass('first-cell'),
'should assign first-cell class'
);
@@ -649,10 +592,7 @@ test('Components -> cellSize -> renderedSize', t => {
/>
);
- const props = wrapper
- .find(DataTable)
- .at(0)
- .props();
+ const props = wrapper.find(DataTable).at(0).props();
const expected = {
_geojson: {row: 500, header: 186},
@@ -691,10 +631,7 @@ test('Components -> DataTableModal.render: csv 2', t => {
dataId="smoothie"
/>
);
- const props = wrapper
- .find(DataTable)
- .at(0)
- .props();
+ const props = wrapper.find(DataTable).at(0).props();
const cellSizeCache = {
_geojson: {row: 400, header: 91},
fillColor: {row: 75, header: 90},
diff --git a/test/browser/components/notifications/notification-item.spec.js b/test/browser/components/notifications/notification-item.spec.js
index 4ddf1895c..eef28b62e 100644
--- a/test/browser/components/notifications/notification-item.spec.js
+++ b/test/browser/components/notifications/notification-item.spec.js
@@ -13,7 +13,6 @@ import {renderWithTheme} from '../../../helpers/component-jest-utils';
const NotificationItem = appInjector.get(NotificationItemFactory);
describe('Notification tests', () => {
-
it('display SUCCESS notification', () => {
const successNotification = createNotification({message: 'success', type: 'success'});
// render the component
@@ -29,5 +28,4 @@ describe('Notification tests', () => {
const heading = screen.getByTestId(dataTestIds.errorIcon);
expect(heading).toBeInTheDocument();
});
-
});
diff --git a/test/browser/components/side-panel/color-selector-test.js b/test/browser/components/side-panel/color-selector-test.js
index 73c8f4631..ad5558693 100644
--- a/test/browser/components/side-panel/color-selector-test.js
+++ b/test/browser/components/side-panel/color-selector-test.js
@@ -160,10 +160,7 @@ test('Components -> LayerColorSelector.render -> render single color click', t =
t.ok(wrapper.find('.single-color-palette__block'), 'should render color blocks');
// click color block
- wrapper
- .find('.single-color-palette__block')
- .at(0)
- .simulate('click');
+ wrapper.find('.single-color-palette__block').at(0).simulate('click');
t.ok(updateLayerConfig.calledOnce, 'should call updateLayerConfig');
t.ok(updateLayerConfig.calledWith({color: [255, 254, 230]}));
@@ -298,10 +295,7 @@ test('Components -> ArcLayerColorSelector.render -> render single color click',
t.ok(wrapper.find('.single-color-palette__block'), 'should render color blocks');
// click color block
- wrapper
- .find('.single-color-palette__block')
- .at(0)
- .simulate('click');
+ wrapper.find('.single-color-palette__block').at(0).simulate('click');
t.ok(updateLayerVisConfig.calledOnce, 'should call updateLayerVisConfig');
t.ok(updateLayerVisConfig.calledWith({targetColor: [255, 254, 230]}));
@@ -343,10 +337,7 @@ test('Components -> LayerColorRangeSelector.render -> ColorSelector', t => {
t.equal(cblks.length, 8, 'should render 8 ColorBlocks');
const expectedColor = `rgb(${hexToRgb('#7F1941').join(', ')})`;
- const firstColor = cblks
- .at(0)
- .getDOMNode()
- .style.getPropertyValue('background-color');
+ const firstColor = cblks.at(0).getDOMNode().style.getPropertyValue('background-color');
t.equal(firstColor, expectedColor, 'should render correct background color');
@@ -428,10 +419,7 @@ test('Components -> LayerColorRangeSelector.render -> ColorSelector -> ColorRang
'should render item selector dropdown input'
);
- typeSelect
- .find('.item-selector__dropdown')
- .at(0)
- .simulate('click');
+ typeSelect.find('.item-selector__dropdown').at(0).simulate('click');
wrapper.update();
@@ -439,13 +427,7 @@ test('Components -> LayerColorRangeSelector.render -> ColorSelector -> ColorRang
t.equal(listItem.length, 6, 'should render item selector typeahead');
t.deepEqual(
- listItem.map(nd =>
- nd
- .at(0)
- .find('.list__item__anchor')
- .at(0)
- .text()
- ),
+ listItem.map(nd => nd.at(0).find('.list__item__anchor').at(0).text()),
ALL_TYPES,
'should render all types'
);
@@ -503,10 +485,7 @@ test('Components -> LayerColorRangeSelector.render -> ColorSelector -> ColorRang
'should render custom switch'
);
- customSwitch
- .find('input')
- .at(0)
- .simulate('change');
+ customSwitch.find('input').at(0).simulate('change');
t.ok(
updateLayerColorUI.callCount === 3,
@@ -630,9 +609,7 @@ test('Components -> LayerColorRangeSelector.render -> ColorSelector -> ColorRang
t.equal(cp.find(Button).length, 3, 'should render 3 buttons');
// click add step
- cp.find(Button)
- .at(0)
- .simulate('click');
+ cp.find(Button).at(0).simulate('click');
t.deepEqual(
updateLayerColorUI.args[0],
@@ -658,9 +635,7 @@ test('Components -> LayerColorRangeSelector.render -> ColorSelector -> ColorRang
);
// click cancel
- cp.find(Button)
- .at(1)
- .simulate('click');
+ cp.find(Button).at(1).simulate('click');
t.deepEqual(
updateLayerColorUI.args[1],
@@ -675,9 +650,7 @@ test('Components -> LayerColorRangeSelector.render -> ColorSelector -> ColorRang
);
// click apply
- cp.find(Button)
- .at(2)
- .simulate('click');
+ cp.find(Button).at(2).simulate('click');
t.deepEqual(
updateLayerColorUI.args[2],
@@ -716,10 +689,7 @@ test('Components -> LayerColorRangeSelector.render -> ColorSelector -> ColorRang
);
// click swatch
- wrapper
- .find('.custom-palette__swatch')
- .at(3)
- .simulate('click');
+ wrapper.find('.custom-palette__swatch').at(3).simulate('click');
t.ok(
updateLayerColorUI.calledWith('colorRange', {
@@ -788,7 +758,7 @@ test('Components -> ColorSelector.opacity', t => {
colorSets: [
{
selectedColor: [128, 64, 32, 100],
- setColor: setColor
+ setColor
}
],
useOpacity: true
@@ -804,24 +774,18 @@ test('Components -> ColorSelector.opacity', t => {
}, 'Mount should not fail');
// show palette
- wrapper
- .find('.color-selector__selector')
- .at(0)
- .invoke('onMouseDown')({preventDefault() {}, stopPropagation() {}});
+ wrapper.find('.color-selector__selector').at(0).invoke('onMouseDown')({
+ preventDefault() {},
+ stopPropagation() {}
+ });
// select color
- wrapper
- .find('.single-color-palette__block')
- .at(100)
- .simulate('click');
+ wrapper.find('.single-color-palette__block').at(100).simulate('click');
t.ok(setColor.calledOnce, 'should call setColor once');
t.ok(setColor.calledWith([228, 155, 0, 100]), 'setColor called with correct color and opacity');
// change opacity via slider
- wrapper
- .find('RangeSlider')
- .at(0)
- .invoke('onChange')([0.5, 0.5]);
+ wrapper.find('RangeSlider').at(0).invoke('onChange')([0.5, 0.5]);
t.ok(setColor.calledTwice, 'should call setColor twice');
t.ok(setColor.calledWith([128, 64, 32, 128]), 'setColor called with correct color and opacity');
diff --git a/test/browser/components/side-panel/filter-manager-test.js b/test/browser/components/side-panel/filter-manager-test.js
index da067001e..2870d02d5 100644
--- a/test/browser/components/side-panel/filter-manager-test.js
+++ b/test/browser/components/side-panel/filter-manager-test.js
@@ -113,10 +113,7 @@ test('Components -> FilterManager.mount -> with prop', t => {
t.ok(wrapper.find(FilterPanel).length === 2, 'should render 2 FilterPanel');
// stateless component don't have a instance()
- const filter1Props = wrapper
- .find(FilterPanel)
- .at(0)
- .props();
+ const filter1Props = wrapper.find(FilterPanel).at(0).props();
t.equal(filter1Props.filter, filterManagerProps.filters[1], 'should render last filter first');
t.equal(filter1Props.isAnyFilterAnimating, false, 'isAnyFilterAnimating is false');
@@ -218,10 +215,7 @@ test('Components -> FilterManager.mount -> with supportedFilterTypes', t => {
t.ok(wrapper.find(FieldSelector).length === 1, 'should render FieldSelector');
// check field options
- const fieldOptions = wrapper
- .find(FieldSelector)
- .at(0)
- .props().fields;
+ const fieldOptions = wrapper.find(FieldSelector).at(0).props().fields;
t.deepEqual(
fieldOptions.map(f => f.name),
diff --git a/test/browser/components/side-panel/layer-configurator-test.js b/test/browser/components/side-panel/layer-configurator-test.js
index 76922db7d..a984a89f0 100644
--- a/test/browser/components/side-panel/layer-configurator-test.js
+++ b/test/browser/components/side-panel/layer-configurator-test.js
@@ -153,10 +153,7 @@ test('Components -> LayerConfigurator.mount -> defaut prop 2', t => {
t.equal(baseConfigGroup.find(LayerColumnConfig).length, 1, 'should render 1 LayerColumnConfig');
t.equal(
- baseConfigGroup
- .find(LayerColumnConfig)
- .at(0)
- .find(ColumnSelector).length,
+ baseConfigGroup.find(LayerColumnConfig).at(0).find(ColumnSelector).length,
3,
'Should render 3 ColumnSelector'
);
@@ -246,7 +243,7 @@ test('Components -> LayerConfigurator.mount -> defaut prop 2', t => {
// }
// ],
// 'should update single column'
- //);
+ // );
t.end();
});
@@ -268,10 +265,7 @@ test('Components -> LayerConfigurator.mount -> collapsed / expand config group '
const component = wrapper.find(LayerConfigurator).instance();
t.equal(
- wrapper
- .find(LayerConfigGroup)
- .at(0)
- .find('.layer-config-group.collapsed').length,
+ wrapper.find(LayerConfigGroup).at(0).find('.layer-config-group.collapsed').length,
3,
'LayerConfigGroup should be collapsed'
);
@@ -289,16 +283,10 @@ test('Components -> LayerConfigurator.mount -> collapsed / expand config group '
t.ok(spy2.calledOnce, 'should call _renderTripLayerConfig');
// click layer config group header
- wrapper
- .find('.layer-config-group__header')
- .at(0)
- .simulate('click');
+ wrapper.find('.layer-config-group__header').at(0).simulate('click');
t.equal(
- wrapper
- .find(LayerConfigGroup)
- .at(0)
- .find('.layer-config-group.collapsed').length,
+ wrapper.find(LayerConfigGroup).at(0).find('.layer-config-group.collapsed').length,
0,
'LayerConfigGroup should be expanded'
);
diff --git a/test/browser/components/side-panel/layer-list.spec.js b/test/browser/components/side-panel/layer-list.spec.js
index 3d424a10e..b06fe30da 100644
--- a/test/browser/components/side-panel/layer-list.spec.js
+++ b/test/browser/components/side-panel/layer-list.spec.js
@@ -7,7 +7,13 @@ import cloneDeep from 'lodash.clonedeep';
import {fireEvent, screen} from '@testing-library/react';
import {dataTestIds} from '@kepler.gl/constants';
import {appInjector, LayerListFactory} from '@kepler.gl/components';
-import {VisStateActions, UIStateActions,MapStateActions, addDataToMap, keplerGlInit} from '@kepler.gl/actions';
+import {
+ VisStateActions,
+ UIStateActions,
+ MapStateActions,
+ addDataToMap,
+ keplerGlInit
+} from '@kepler.gl/actions';
import {processCsvData} from '@kepler.gl/processors';
import {keplerGlReducerCore as keplerGlReducer} from '@kepler.gl/reducers';
@@ -144,6 +150,6 @@ describe('Components -> SidePanel -> LayerPanel -> LayerList', () => {
const removeLayerButton = screen.getByTestId(dataTestIds.removeLayerAction);
fireEvent.click(removeLayerButton);
- expect(removeLayer).toBeCalled();
+ expect(removeLayer).toHaveBeenCalled();
});
});
diff --git a/test/browser/components/side-panel/layer-panel-header-test.js b/test/browser/components/side-panel/layer-panel-header-test.js
index 824e64c0f..23b5073df 100644
--- a/test/browser/components/side-panel/layer-panel-header-test.js
+++ b/test/browser/components/side-panel/layer-panel-header-test.js
@@ -20,7 +20,7 @@ const defaultProps = {
onUpdateLayerLabel: nop,
onToggleEnableConfig: nop,
onRemoveLayer: nop,
- onZoomToLayer: nop,
+ onZoomToLayer: nop
};
test('Components -> LayerPanelHeader.mount -> no prop', t => {
diff --git a/test/browser/components/side-panel/save-export-dropdown-test.js b/test/browser/components/side-panel/save-export-dropdown-test.js
index 5c5fd19e3..6998d7030 100644
--- a/test/browser/components/side-panel/save-export-dropdown-test.js
+++ b/test/browser/components/side-panel/save-export-dropdown-test.js
@@ -40,28 +40,16 @@ test('SaveExportDropdown', t => {
t.equal(wrapper.find(PanelHeaderDropdown).length, 1, 'We should display 1 PanelHeaderDropdown');
t.equal(wrapper.find(ToolbarItem).length, 4, 'We should display 4 ToolbarItems');
- wrapper
- .find('.toolbar-item')
- .at(0)
- .simulate('click');
+ wrapper.find('.toolbar-item').at(0).simulate('click');
t.equal(onExportImage.called, true, 'Should have called export image callback');
- wrapper
- .find('.toolbar-item')
- .at(1)
- .simulate('click');
+ wrapper.find('.toolbar-item').at(1).simulate('click');
t.equal(onExportData.called, true, 'Should have called export data callback');
- wrapper
- .find('.toolbar-item')
- .at(2)
- .simulate('click');
+ wrapper.find('.toolbar-item').at(2).simulate('click');
t.equal(onExportMap.called, true, 'Should have called export map callback');
- wrapper
- .find('.toolbar-item')
- .at(3)
- .simulate('click');
+ wrapper.find('.toolbar-item').at(3).simulate('click');
t.equal(onSaveMap.called, true, 'Should have called save map callback');
t.end();
diff --git a/test/browser/components/side-panel/side-panel-test.js b/test/browser/components/side-panel/side-panel-test.js
index 56413b67b..4f411426c 100644
--- a/test/browser/components/side-panel/side-panel-test.js
+++ b/test/browser/components/side-panel/side-panel-test.js
@@ -20,7 +20,12 @@ import {
appInjector
} from '@kepler.gl/components';
-import {VisStateActions, MapStyleActions, UIStateActions, MapStateActions} from '@kepler.gl/actions';
+import {
+ VisStateActions,
+ MapStyleActions,
+ UIStateActions,
+ MapStateActions
+} from '@kepler.gl/actions';
import {IntlWrapper, mountWithTheme} from 'test/helpers/component-utils';
@@ -41,7 +46,6 @@ import {InitialState} from 'test/helpers/mock-state';
// Constants
import {EXPORT_DATA_ID, EXPORT_MAP_ID, EXPORT_IMAGE_ID} from '@kepler.gl/constants';
-import {debug} from 'webpack';
// default props from initial state
const defaultProps = {
@@ -312,19 +316,12 @@ test('Components -> SidePanel -> PanelHeader', t => {
// Share
t.equal(
- header
- .find('.side-panel__panel-header__action')
- .at(0)
- .find('p')
- .text(),
+ header.find('.side-panel__panel-header__action').at(0).find('p').text(),
'Share',
'should only render Save action'
);
- header
- .find('.side-panel__panel-header__action')
- .at(0)
- .simulate('click');
+ header.find('.side-panel__panel-header__action').at(0).simulate('click');
t.ok(showExportDropdown.calledWith('save'), 'should call toggleSidePanel with share');
@@ -374,54 +371,30 @@ test('Components -> SidePanel -> PanelHeader -> ExportDropDown', t => {
// export image
t.equal(
- wrapper
- .find(ToolbarItem)
- .at(0)
- .find('.toolbar-item__title')
- .text(),
+ wrapper.find(ToolbarItem).at(0).find('.toolbar-item__title').text(),
'Export Image',
'Should render Export Image'
);
- wrapper
- .find(ToolbarItem)
- .at(0)
- .find('.toolbar-item')
- .simulate('click');
+ wrapper.find(ToolbarItem).at(0).find('.toolbar-item').simulate('click');
t.ok(toggleModal.calledWith(EXPORT_IMAGE_ID), 'Should call toggleModal with EXPORT_IMAGE_ID');
// export data
t.equal(
- wrapper
- .find(ToolbarItem)
- .at(1)
- .find('.toolbar-item__title')
- .text(),
+ wrapper.find(ToolbarItem).at(1).find('.toolbar-item__title').text(),
'Export Data',
'Should render Export Data'
);
- wrapper
- .find(ToolbarItem)
- .at(1)
- .find('.toolbar-item')
- .simulate('click');
+ wrapper.find(ToolbarItem).at(1).find('.toolbar-item').simulate('click');
t.ok(toggleModal.calledWith(EXPORT_DATA_ID), 'Should call toggleModal with EXPORT_DATA_ID');
// export map
t.equal(
- wrapper
- .find(ToolbarItem)
- .at(2)
- .find('.toolbar-item__title')
- .text(),
+ wrapper.find(ToolbarItem).at(2).find('.toolbar-item__title').text(),
'Export Map',
'Should render Export Map'
);
- wrapper
- .find(ToolbarItem)
- .at(2)
- .find('.toolbar-item')
- .simulate('click');
+ wrapper.find(ToolbarItem).at(2).find('.toolbar-item').simulate('click');
t.ok(toggleModal.calledWith(EXPORT_MAP_ID), 'Should call toggleModal with EXPORT_MAP_ID');
t.end();
diff --git a/test/browser/components/tooltip-config-test.js b/test/browser/components/tooltip-config-test.js
index 1a7766e73..f0bc37c77 100644
--- a/test/browser/components/tooltip-config-test.js
+++ b/test/browser/components/tooltip-config-test.js
@@ -68,20 +68,10 @@ test('TooltipConfig - render', t => {
t.equal(wrapper.find(ChickletedInput).length, 2, 'Should render 2 ChickletedInput');
// tooltip chicklets
- const tooltipButtons = wrapper
- .find(ChickletedInput)
- .at(0)
- .find(ChickletButton);
+ const tooltipButtons = wrapper.find(ChickletedInput).at(0).find(ChickletButton);
t.equal(tooltipButtons.length, 5, 'should render 6 tooltip buttons');
- t.equal(
- tooltipButtons
- .at(0)
- .find('span')
- .at(0)
- .text(),
- 'gps_data.utc_timestamp'
- );
+ t.equal(tooltipButtons.at(0).find('span').at(0).text(), 'gps_data.utc_timestamp');
t.end();
});
@@ -104,10 +94,7 @@ test('TooltipConfig - render -> onSelect', t => {
t.equal(wrapper.find(ChickletedInput).length, 2, 'Should render 2 ChickletedInput');
// click chicklet input to open dropdown
- wrapper
- .find(ChickletedInput)
- .at(0)
- .simulate('click');
+ wrapper.find(ChickletedInput).at(0).simulate('click');
const dropdownSelect = wrapper.find(Typeahead);
t.equal(dropdownSelect.length, 1, 'should render 1 Typeahead');
@@ -137,15 +124,9 @@ test('TooltipConfig - render -> onSelect', t => {
t.deepEqual(onChange.args[0], [expectedArgs0], 'should call onchange with new tooltip appended');
// delete 1 item
- const tooltipButtons = wrapper
- .find(ChickletedInput)
- .at(0)
- .find(ChickletButton);
-
- tooltipButtons
- .at(0)
- .find(Delete)
- .simulate('click');
+ const tooltipButtons = wrapper.find(ChickletedInput).at(0).find(ChickletButton);
+
+ tooltipButtons.at(0).find(Delete).simulate('click');
const expectedArgs1 = {
...tooltipConfig,
fieldsToShow: {
@@ -162,10 +143,7 @@ test('TooltipConfig - render -> onSelect', t => {
t.equal(wrapper.find('.button.clear-all').length, 2, 'should render 2 clea all buttons');
// click to clear all
- wrapper
- .find('.button.clear-all')
- .at(0)
- .simulate('click');
+ wrapper.find('.button.clear-all').at(0).simulate('click');
const expectedArgs2 = {
...tooltipConfig,
fieldsToShow: {
@@ -200,16 +178,10 @@ test('TooltipConfig - render -> tooltip format', t => {
);
}, 'Should render');
- const tooltipButtons = wrapper
- .find(ChickletedInput)
- .at(0)
- .find(ChickletButton);
+ const tooltipButtons = wrapper.find(ChickletedInput).at(0).find(ChickletButton);
// click on hash
- tooltipButtons
- .at(0)
- .find(Hash)
- .simulate('click');
+ tooltipButtons.at(0).find(Hash).simulate('click');
const formatDropdown = wrapper.find(DropdownList);
t.equal(formatDropdown.length, 1, 'should render 1 format dropdown');
@@ -225,10 +197,7 @@ test('TooltipConfig - render -> tooltip format', t => {
const option1 = options[1].format;
// click option1
- formatDropdown
- .find('.list__item')
- .at(1)
- .simulate('click');
+ formatDropdown.find('.list__item').at(1).simulate('click');
const expectedArgs0 = {
...tooltipConfig,
fieldsToShow: {
diff --git a/test/browser/layer-tests/arc-layer-specs.js b/test/browser/layer-tests/arc-layer-specs.js
index 872cb9883..cd14ea920 100644
--- a/test/browser/layer-tests/arc-layer-specs.js
+++ b/test/browser/layer-tests/arc-layer-specs.js
@@ -356,7 +356,7 @@ test('#ArcLayer -> renderLayer', t => {
}
}
},
- assert: (deckLayers, layer) => {
+ assert: deckLayers => {
t.equal(deckLayers.length, 1, 'Should create 1 deck.gl layer');
const {props} = deckLayers[0];
// test instancePositions
diff --git a/test/browser/layer-tests/grid-layer-specs.js b/test/browser/layer-tests/grid-layer-specs.js
index a98ccf5a4..de61036b2 100644
--- a/test/browser/layer-tests/grid-layer-specs.js
+++ b/test/browser/layer-tests/grid-layer-specs.js
@@ -272,7 +272,7 @@ test('#GridLayer -> renderLayer', t => {
onSetLayerDomain: spyLayerCallbacks
}
},
- assert: (deckLayers, layer, result) => {
+ assert: (deckLayers, layer) => {
t.deepEqual(
deckLayers.map(l => l.id),
['test_layer_1', 'test_layer_1-grid-cell'],
@@ -351,18 +351,8 @@ test('#GridLayer -> renderLayer', t => {
instancePositions.value.slice(0, 12),
// position of each bin
[
- -122.59661271087748,
- 37.743177277521255,
- 0,
- -122.14283099317691,
- 37.38384344551697,
- 0,
- -122.3697218520272,
- 37.743177277521255,
- 0,
- 0,
- 0,
- 0
+ -122.59661271087748, 37.743177277521255, 0, -122.14283099317691, 37.38384344551697, 0,
+ -122.3697218520272, 37.743177277521255, 0, 0, 0, 0
],
'should create correct attribute.instanceFillColors'
);
@@ -417,7 +407,7 @@ test('#GridLayer -> renderLayer', t => {
onSetLayerDomain: spyLayerCallbacks
}
},
- assert: (deckLayers, layer, result) => {
+ assert: deckLayers => {
t.deepEqual(
deckLayers.map(l => l.id),
['test_layer_2', 'test_layer_2-grid-cell'],
diff --git a/test/browser/layer-tests/hexagon-layer-specs.js b/test/browser/layer-tests/hexagon-layer-specs.js
index 87b1ef2af..3394463b9 100644
--- a/test/browser/layer-tests/hexagon-layer-specs.js
+++ b/test/browser/layer-tests/hexagon-layer-specs.js
@@ -391,7 +391,7 @@ test('#HexagonLayer -> renderLayer', t => {
onSetLayerDomain: spyLayerCallbacks
}
},
- assert: (deckLayers, layer) => {
+ assert: deckLayers => {
t.deepEqual(
deckLayers.map(l => l.id),
['test_layer_1', 'test_layer_1-hexagon-cell'],
@@ -521,7 +521,7 @@ test('#HexagonLayer -> renderHover', t => {
renderArgs: {
objectHovered: testObjectHovered
},
- assert: (deckLayers, layer) => {
+ assert: deckLayers => {
t.deepEqual(
deckLayers.map(l => l.id),
[
diff --git a/test/browser/layer-tests/icon-layer-specs.js b/test/browser/layer-tests/icon-layer-specs.js
index 5645c057f..00335778d 100644
--- a/test/browser/layer-tests/icon-layer-specs.js
+++ b/test/browser/layer-tests/icon-layer-specs.js
@@ -428,13 +428,8 @@ test('#IconLayer -> renderLayer', t => {
'Should create 5 deck.gl layers'
);
// test test_layer_1-label-types
- const {
- getPosition,
- getColor,
- getSize,
- getPixelOffset,
- getFilterValue
- } = deckLayers[4].props;
+ const {getPosition, getColor, getSize, getPixelOffset, getFilterValue} =
+ deckLayers[4].props;
const {getPixelOffset: getPixelOffset1} = deckLayers[6].props;
const distanceScale = getDistanceScales(INITIAL_MAP_STATE);
@@ -498,11 +493,7 @@ test('#IconLayer -> svg icons as constructor props -> renderIconModal', t => {
t.equal(wrapper.find('.icon-table__item').length, 3, 'should render 1 icon');
t.equal(
- wrapper
- .find('.icon-table_item__name')
- .at(0)
- .find('code')
- .text(),
+ wrapper.find('.icon-table_item__name').at(0).find('code').text(),
'alert',
'should render alert icon'
);
diff --git a/test/browser/layer-tests/line-layer-specs.js b/test/browser/layer-tests/line-layer-specs.js
index 07cd50075..ab61876eb 100644
--- a/test/browser/layer-tests/line-layer-specs.js
+++ b/test/browser/layer-tests/line-layer-specs.js
@@ -343,7 +343,7 @@ test('#LineLayer -> renderLayer', t => {
}
}
},
- assert: (deckLayers, layer) => {
+ assert: deckLayers => {
t.equal(deckLayers.length, 1, 'Should create 1 deck.gl layer');
const {props} = deckLayers[0];
// test instancePositions
diff --git a/test/browser/layer-tests/point-layer-specs.js b/test/browser/layer-tests/point-layer-specs.js
index e4186cf4f..c49bd0731 100644
--- a/test/browser/layer-tests/point-layer-specs.js
+++ b/test/browser/layer-tests/point-layer-specs.js
@@ -532,13 +532,8 @@ test('#PointLayer -> renderLayer', t => {
'Should create 5 deck.gl layers'
);
// test test_layer_1-label-types-characters
- const {
- getPosition,
- getColor,
- getSize,
- getPixelOffset,
- getFilterValue
- } = deckLayers[2].props;
+ const {getPosition, getColor, getSize, getPixelOffset, getFilterValue} =
+ deckLayers[2].props;
const {getPixelOffset: getPixelOffset1} = deckLayers[4].props;
const distanceScale = getDistanceScales(INITIAL_MAP_STATE);
diff --git a/test/browser/layer-tests/trip-layer-specs.js b/test/browser/layer-tests/trip-layer-specs.js
index 325250ec2..1b4ab9d42 100644
--- a/test/browser/layer-tests/trip-layer-specs.js
+++ b/test/browser/layer-tests/trip-layer-specs.js
@@ -273,7 +273,7 @@ test('#TripLayer -> renderLayer', t => {
renderArgs: {
animationConfig
},
- assert: (deckLayers, layer) => {
+ assert: deckLayers => {
const ids = ['test_trip_layer_1'];
t.deepEqual(
deckLayers.map(l => l.id),
@@ -394,9 +394,8 @@ test('#TripLayer -> parseTripGeoJsonTimestamp', t => {
dataToFeature1[3].geometry.coordinates[0][3] = undefined;
dataToFeature1[4].geometry.coordinates[0][3] = 'a';
- dataToFeature1[0].geometry.coordinates[
- dataToFeature1[0].geometry.coordinates.length - 1
- ][3] = NaN;
+ dataToFeature1[0].geometry.coordinates[dataToFeature1[0].geometry.coordinates.length - 1][3] =
+ NaN;
const result = parseTripGeoJsonTimestamp(dataToFeature1);
diff --git a/test/fixtures/geojson.js b/test/fixtures/geojson.js
index 04475c337..5c9c9baa5 100644
--- a/test/fixtures/geojson.js
+++ b/test/fixtures/geojson.js
@@ -454,10 +454,7 @@ export const mergedRateFilter = {
};
export const geoBounds = [
- -122.40115971858505,
- 37.78202426695214,
- -122.39166672864975,
- 37.79427854456892
+ -122.40115971858505, 37.78202426695214, -122.39166672864975, 37.79427854456892
];
export const expectedDataToFeature = [
diff --git a/test/fixtures/state-saved-v0.js b/test/fixtures/state-saved-v0.js
index 8c99438aa..b1d418c67 100644
--- a/test/fixtures/state-saved-v0.js
+++ b/test/fixtures/state-saved-v0.js
@@ -907,15 +907,8 @@ export const mergedFilters = [
step: 1000,
speed: 1,
mappedValue: [
- 1453770810000,
- 1453770279000,
- 1453770358000,
- 1453770124000,
- 1453770131000,
- 1453770395000,
- 1453770173000,
- 1453770394000,
- 1453770540000
+ 1453770810000, 1453770279000, 1453770358000, 1453770124000, 1453770131000, 1453770395000,
+ 1453770173000, 1453770394000, 1453770540000
],
fieldType: 'timestamp',
fixedDomain: true,
diff --git a/test/fixtures/test-csv-data.js b/test/fixtures/test-csv-data.js
index ec4bd30f6..985c754f9 100644
--- a/test/fixtures/test-csv-data.js
+++ b/test/fixtures/test-csv-data.js
@@ -615,30 +615,10 @@ export const timeMappedValue = [
];
export const epochMappedValue = [
- 1472688000000,
- 1472688000000,
- 1472688000000,
- 1472688000000,
- 1472688000000,
- 1472688000000,
- 1472688000000,
- 1472688000000,
- 1472708000000,
- 1472708000000,
- 1472708000000,
- 1472708000000,
- 1472754400000,
- 1472754400000,
- 1472754400000,
- 1472754400000,
- 1472774400000,
- 1472774400000,
- 1472774400000,
- 1472774400000,
- 1472774400000,
- 1472774400000,
- 1472774400000,
- 1472774400000
+ 1472688000000, 1472688000000, 1472688000000, 1472688000000, 1472688000000, 1472688000000,
+ 1472688000000, 1472688000000, 1472708000000, 1472708000000, 1472708000000, 1472708000000,
+ 1472754400000, 1472754400000, 1472754400000, 1472754400000, 1472774400000, 1472774400000,
+ 1472774400000, 1472774400000, 1472774400000, 1472774400000, 1472774400000, 1472774400000
];
export const timeHistogram = [
diff --git a/test/fixtures/trip-geojson.js b/test/fixtures/trip-geojson.js
index f01f63feb..9b57a0d99 100644
--- a/test/fixtures/trip-geojson.js
+++ b/test/fixtures/trip-geojson.js
@@ -219,111 +219,41 @@ export const dataToFeature = [
export const dataToTimeStamp = [
[
- 1565578338000,
- 1565578346000,
- 1565578356000,
- 1565578364000,
- 1565578365000,
- 1565578367000,
- 1565578368000,
- 1565578371000,
- 1565578373000,
- 1565578375000
+ 1565578338000, 1565578346000, 1565578356000, 1565578364000, 1565578365000, 1565578367000,
+ 1565578368000, 1565578371000, 1565578373000, 1565578375000
],
[
- 1565578213000,
- 1565578217000,
- 1565578243000,
- 1565578256000,
- 1565578278000,
- 1565578288000,
- 1565578382000,
- 1565578417000,
- 1565578504000
+ 1565578213000, 1565578217000, 1565578243000, 1565578256000, 1565578278000, 1565578288000,
+ 1565578382000, 1565578417000, 1565578504000
],
[
- 1565578095000,
- 1565578123000,
- 1565578125000,
- 1565578156000,
- 1565578181000,
- 1565578214000,
- 1565578237000,
- 1565578250000
+ 1565578095000, 1565578123000, 1565578125000, 1565578156000, 1565578181000, 1565578214000,
+ 1565578237000, 1565578250000
],
[
- 1565577961000,
- 1565577967000,
- 1565577973000,
- 1565577976000,
- 1565577991000,
- 1565578000000,
- 1565578008000,
- 1565578014000,
- 1565578018000
+ 1565577961000, 1565577967000, 1565577973000, 1565577976000, 1565577991000, 1565578000000,
+ 1565578008000, 1565578014000, 1565578018000
],
[
- 1565578666000,
- 1565578694000,
- 1565578712000,
- 1565578732000,
- 1565578756000,
- 1565578778000,
+ 1565578666000, 1565578694000, 1565578712000, 1565578732000, 1565578756000, 1565578778000,
1565578836000
],
[
- 1565578252000,
- 1565578322000,
- 1565578354000,
- 1565578376000,
- 1565578399000,
- 1565578465000,
- 1565578511000,
- 1565578513000,
- 1565578524000,
- 1565578528000,
- 1565578531000
+ 1565578252000, 1565578322000, 1565578354000, 1565578376000, 1565578399000, 1565578465000,
+ 1565578511000, 1565578513000, 1565578524000, 1565578528000, 1565578531000
],
[
- 1565577697000,
- 1565577720000,
- 1565577726000,
- 1565577732000,
- 1565577737000,
- 1565577743000,
- 1565577747000,
- 1565577749000,
- 1565577751000,
- 1565577753000
+ 1565577697000, 1565577720000, 1565577726000, 1565577732000, 1565577737000, 1565577743000,
+ 1565577747000, 1565577749000, 1565577751000, 1565577753000
],
[
- 1565577773000,
- 1565577786000,
- 1565577814000,
- 1565577872000,
- 1565577904000,
- 1565577907000,
- 1565577938000,
- 1565577957000,
- 1565577974000,
- 1565577993000,
- 1565577999000,
- 1565578017000,
+ 1565577773000, 1565577786000, 1565577814000, 1565577872000, 1565577904000, 1565577907000,
+ 1565577938000, 1565577957000, 1565577974000, 1565577993000, 1565577999000, 1565578017000,
1565578020000
],
[
- 1565577261000,
- 1565577277000,
- 1565577315000,
- 1565577685000,
- 1565577728000,
- 1565577750000,
- 1565577771000,
- 1565577796000,
- 1565577799000,
- 1565577802000,
- 1565577805000,
- 1565577807000,
+ 1565577261000, 1565577277000, 1565577315000, 1565577685000, 1565577728000, 1565577750000,
+ 1565577771000, 1565577796000, 1565577799000, 1565577802000, 1565577805000, 1565577807000,
1565577809000
]
];
diff --git a/test/helpers/comparison-utils.js b/test/helpers/comparison-utils.js
index 157fc7d6e..6bc364915 100644
--- a/test/helpers/comparison-utils.js
+++ b/test/helpers/comparison-utils.js
@@ -84,7 +84,7 @@ export function cmpLayers(t, expectedLayer, actualLayer, opt = {}) {
// also skip functions
switch (key) {
// list of fields
- case 'textLabel':
+ case 'textLabel': {
cmpObjectKeys(
t,
expectedLayer.config[key],
@@ -112,6 +112,7 @@ export function cmpLayers(t, expectedLayer, actualLayer, opt = {}) {
);
});
break;
+ }
// colorField is a field
case 'colorField':
case 'sizeField':
diff --git a/test/helpers/component-utils.js b/test/helpers/component-utils.js
index 972b8b263..3036ef926 100644
--- a/test/helpers/component-utils.js
+++ b/test/helpers/component-utils.js
@@ -35,19 +35,11 @@ export function mockHTMLElementClientSize(prop, value) {
}
export function clickItemSelector(itemSelector) {
- itemSelector
- .find('.item-selector__dropdown')
- .at(0)
- .simulate('click');
+ itemSelector.find('.item-selector__dropdown').at(0).simulate('click');
}
export function clickItemSelectList(itemSelector, itemIndex) {
- itemSelector
- .find(Typeahead)
- .at(0)
- .find('.list__item')
- .at(itemIndex)
- .simulate('click');
+ itemSelector.find(Typeahead).at(0).find('.list__item').at(itemIndex).simulate('click');
}
export function getItemSelectorListText(itemSelector, itemIndex) {
diff --git a/test/helpers/mock-provider.js b/test/helpers/mock-provider.js
index a22f59f31..6c686f7d1 100644
--- a/test/helpers/mock-provider.js
+++ b/test/helpers/mock-provider.js
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
-// Copyright contributors to the kepler.gl project
+// Copyriht contributors to the kepler.gl project
import React from 'react';
@@ -30,8 +30,8 @@ export default class MockProvider {
getAccessToken() {
return true;
}
- async uploadMap(args) {
- const promise = new Promise((resolve, reject) => {
+ async uploadMap() {
+ const promise = new Promise(resolve => {
() => resolve('done!')();
});
await promise;
diff --git a/test/helpers/mock-state.js b/test/helpers/mock-state.js
index 7087d744f..dd29484a6 100644
--- a/test/helpers/mock-state.js
+++ b/test/helpers/mock-state.js
@@ -234,7 +234,7 @@ function mockStateWithMultiFilters() {
function mockStateWithEffects() {
const initialState = cloneDeep(InitialState);
- let prepareState = applyActions(keplerGlReducer, initialState, [
+ const prepareState = applyActions(keplerGlReducer, initialState, [
{
action: VisStateActions.addEffect,
payload: [{id: 'e_1'}]
@@ -452,8 +452,7 @@ function mockStateWithCustomMapStyle(customType = 'LOCAL') {
name: 'Smoothie the Cat'
},
url: 'mapbox://styles/shanhe/smoothie.the.cat',
- icon:
- 'https://api.mapbox.com/styles/v1/shanhe/smoothie.the.cat/static/-122.3391,37.7922,9,0,0/400x300?access_token=secret_token&logo=false&attribution=false',
+ icon: 'https://api.mapbox.com/styles/v1/shanhe/smoothie.the.cat/static/-122.3391,37.7922,9,0,0/400x300?access_token=secret_token&logo=false&attribution=false',
custom: customType
};
diff --git a/test/node/reducers/map-style-test.js b/test/node/reducers/map-style-test.js
index 672a1d212..44ac82514 100644
--- a/test/node/reducers/map-style-test.js
+++ b/test/node/reducers/map-style-test.js
@@ -211,8 +211,7 @@ test("#mapStyleReducer -> RECEIVE_MAP_CONFIG (custom: 'LOCAL')", t => {
smoothie_the_cat: {
accessToken: 'secret_token',
custom: 'LOCAL',
- icon:
- 'https://api.mapbox.com/styles/v1/shanhe/smoothie.the.cat/static/-122.3391,37.7922,9,0,0/400x300?access_token=secret_token&logo=false&attribution=false',
+ icon: 'https://api.mapbox.com/styles/v1/shanhe/smoothie.the.cat/static/-122.3391,37.7922,9,0,0/400x300?access_token=secret_token&logo=false&attribution=false',
id: 'smoothie_the_cat',
label: 'Smoothie the Cat',
url: 'mapbox://styles/shanhe/smoothie.the.cat'
@@ -249,8 +248,7 @@ test("#mapStyleReducer -> RECEIVE_MAP_CONFIG (custom: 'LOCAL')", t => {
payload: [
{
id: 'smoothie_the_cat',
- url:
- 'https://api.mapbox.com/styles/v1/shanhe/smoothie.the.cat?pluginName=Keplergl&access_token=secret_token'
+ url: 'https://api.mapbox.com/styles/v1/shanhe/smoothie.the.cat?pluginName=Keplergl&access_token=secret_token'
}
]
};
@@ -268,8 +266,7 @@ test("#mapStyleReducer -> RECEIVE_MAP_CONFIG (custom: 'LOCAL')", t => {
smoothie_the_cat: {
accessToken: 'secret_token',
custom: 'LOCAL',
- icon:
- 'https://api.mapbox.com/styles/v1/shanhe/smoothie.the.cat/static/-122.3391,37.7922,9,0,0/400x300?access_token=secret_token&logo=false&attribution=false',
+ icon: 'https://api.mapbox.com/styles/v1/shanhe/smoothie.the.cat/static/-122.3391,37.7922,9,0,0/400x300?access_token=secret_token&logo=false&attribution=false',
id: 'smoothie_the_cat',
label: 'Smoothie the Cat',
url: 'mapbox://styles/shanhe/smoothie.the.cat',
@@ -328,8 +325,7 @@ test("#mapStyleReducer -> RECEIVE_MAP_CONFIG (custom: 'LOCAL')", t => {
smoothie_the_cat: {
accessToken: 'secret_token',
custom: 'LOCAL',
- icon:
- 'https://api.mapbox.com/styles/v1/shanhe/smoothie.the.cat/static/-122.3391,37.7922,9,0,0/400x300?access_token=secret_token&logo=false&attribution=false',
+ icon: 'https://api.mapbox.com/styles/v1/shanhe/smoothie.the.cat/static/-122.3391,37.7922,9,0,0/400x300?access_token=secret_token&logo=false&attribution=false',
id: 'smoothie_the_cat',
label: 'Smoothie the Cat',
url: 'mapbox://styles/shanhe/smoothie.the.cat'
@@ -385,8 +381,7 @@ test("#mapStyleReducer -> RECEIVE_MAP_CONFIG (custom: 'MANAGED')", t => {
smoothie_the_cat: {
accessToken: 'secret_token',
custom: 'MANAGED',
- icon:
- 'https://api.mapbox.com/styles/v1/shanhe/smoothie.the.cat/static/-122.3391,37.7922,9,0,0/400x300?access_token=secret_token&logo=false&attribution=false',
+ icon: 'https://api.mapbox.com/styles/v1/shanhe/smoothie.the.cat/static/-122.3391,37.7922,9,0,0/400x300?access_token=secret_token&logo=false&attribution=false',
id: 'smoothie_the_cat',
label: 'Smoothie the Cat',
url: 'mapbox://styles/shanhe/smoothie.the.cat'
@@ -431,8 +426,7 @@ test("#mapStyleReducer -> RECEIVE_MAP_CONFIG (custom: 'MANAGED')", t => {
smoothie_the_cat: {
accessToken: 'secret_token',
custom: 'MANAGED',
- icon:
- 'https://api.mapbox.com/styles/v1/shanhe/smoothie.the.cat/static/-122.3391,37.7922,9,0,0/400x300?access_token=secret_token&logo=false&attribution=false',
+ icon: 'https://api.mapbox.com/styles/v1/shanhe/smoothie.the.cat/static/-122.3391,37.7922,9,0,0/400x300?access_token=secret_token&logo=false&attribution=false',
id: 'smoothie_the_cat',
label: 'Smoothie the Cat',
url: 'mapbox://styles/shanhe/smoothie.the.cat'
@@ -488,8 +482,7 @@ test('#mapStyleReducer -> RECEIVE_MAP_CONFIG (custom: true (legacy backwards sup
smoothie_the_cat: {
accessToken: 'secret_token',
custom: true,
- icon:
- 'https://api.mapbox.com/styles/v1/shanhe/smoothie.the.cat/static/-122.3391,37.7922,9,0,0/400x300?access_token=secret_token&logo=false&attribution=false',
+ icon: 'https://api.mapbox.com/styles/v1/shanhe/smoothie.the.cat/static/-122.3391,37.7922,9,0,0/400x300?access_token=secret_token&logo=false&attribution=false',
id: 'smoothie_the_cat',
label: 'Smoothie the Cat',
url: 'mapbox://styles/shanhe/smoothie.the.cat'
@@ -527,8 +520,7 @@ test('#mapStyleReducer -> RECEIVE_MAP_CONFIG (custom: true (legacy backwards sup
payload: [
{
id: 'smoothie_the_cat',
- url:
- 'https://api.mapbox.com/styles/v1/shanhe/smoothie.the.cat?pluginName=Keplergl&access_token=secret_token'
+ url: 'https://api.mapbox.com/styles/v1/shanhe/smoothie.the.cat?pluginName=Keplergl&access_token=secret_token'
}
]
};
@@ -546,8 +538,7 @@ test('#mapStyleReducer -> RECEIVE_MAP_CONFIG (custom: true (legacy backwards sup
smoothie_the_cat: {
accessToken: 'secret_token',
custom: true,
- icon:
- 'https://api.mapbox.com/styles/v1/shanhe/smoothie.the.cat/static/-122.3391,37.7922,9,0,0/400x300?access_token=secret_token&logo=false&attribution=false',
+ icon: 'https://api.mapbox.com/styles/v1/shanhe/smoothie.the.cat/static/-122.3391,37.7922,9,0,0/400x300?access_token=secret_token&logo=false&attribution=false',
id: 'smoothie_the_cat',
label: 'Smoothie the Cat',
url: 'mapbox://styles/shanhe/smoothie.the.cat',
@@ -606,8 +597,7 @@ test('#mapStyleReducer -> RECEIVE_MAP_CONFIG (custom: true (legacy backwards sup
smoothie_the_cat: {
accessToken: 'secret_token',
custom: true,
- icon:
- 'https://api.mapbox.com/styles/v1/shanhe/smoothie.the.cat/static/-122.3391,37.7922,9,0,0/400x300?access_token=secret_token&logo=false&attribution=false',
+ icon: 'https://api.mapbox.com/styles/v1/shanhe/smoothie.the.cat/static/-122.3391,37.7922,9,0,0/400x300?access_token=secret_token&logo=false&attribution=false',
id: 'smoothie_the_cat',
label: 'Smoothie the Cat',
url: 'mapbox://styles/shanhe/smoothie.the.cat'
diff --git a/test/node/reducers/provider-state-test.js b/test/node/reducers/provider-state-test.js
index 987c18590..fbb8db484 100644
--- a/test/node/reducers/provider-state-test.js
+++ b/test/node/reducers/provider-state-test.js
@@ -6,12 +6,7 @@ import {drainTasksForTesting, succeedTaskInTest, errorTaskInTest} from 'react-pa
import sinon from 'sinon';
import {default as Console} from 'global/console';
-import {
- ActionTypes,
- exportFileToCloud,
- resetProviderStatus,
- setCloudProvider
-} from '@kepler.gl/actions';
+import {ActionTypes, exportFileToCloud, resetProviderStatus} from '@kepler.gl/actions';
import {
providerReducer as reducer,
providerStateReducerFactory,
@@ -169,7 +164,7 @@ test('#providerStateReducer -> EXPORT_FILE_TO_CLOUD -> onSuccess : onError', t =
...state,
notification: action.payload
}),
- [ActionTypes.REMOVE_NOTIFICATION]: (state, action) => ({
+ [ActionTypes.REMOVE_NOTIFICATION]: state => ({
...state,
remove: true
})
diff --git a/test/node/reducers/root-test.js b/test/node/reducers/root-test.js
index d5685a572..1e70a5e54 100644
--- a/test/node/reducers/root-test.js
+++ b/test/node/reducers/root-test.js
@@ -302,7 +302,7 @@ test('keplerGlReducer.plugin override', t => {
// 1. as reducer map
.plugin(
{
- [ActionTypes.LAYER_TYPE_CHANGE]: (state, action) => {
+ [ActionTypes.LAYER_TYPE_CHANGE]: state => {
return {
...state,
visState: {
diff --git a/test/node/reducers/vis-state-merger-test.js b/test/node/reducers/vis-state-merger-test.js
index d533ca566..e2e28afb2 100644
--- a/test/node/reducers/vis-state-merger-test.js
+++ b/test/node/reducers/vis-state-merger-test.js
@@ -8,7 +8,6 @@ import Task, {withTask, drainTasksForTesting, succeedTaskInTest} from 'react-pal
import keplerGlReducer, {
mergeFilters,
mergeLayers,
- mergeEffects,
mergeInteractions,
mergeLayerBlending,
mergeSplitMaps,
@@ -1603,30 +1602,7 @@ test('VisStateMerger.v1 -> mergeFilters -> multiFilters', t => {
fields: tFields0,
dataContainer: dc0,
allIndexes: [
- 0,
- 1,
- 2,
- 3,
- 4,
- 5,
- 6,
- 7,
- 8,
- 9,
- 10,
- 11,
- 12,
- 13,
- 14,
- 15,
- 16,
- 17,
- 18,
- 19,
- 20,
- 21,
- 22,
- 23
+ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23
],
id: testCsvDataId,
label: 'hello.csv',
diff --git a/test/node/reducers/vis-state-test.js b/test/node/reducers/vis-state-test.js
index e76410f78..3b7484efe 100644
--- a/test/node/reducers/vis-state-test.js
+++ b/test/node/reducers/vis-state-test.js
@@ -2518,30 +2518,10 @@ test('#visStateReducer -> setFilter.fixedDomain & DynamicDomain & gpu & cpu', t
interval: null,
speed: 1,
mappedValue: [
- 1474070995000,
- 1474071056000,
- 1474071116000,
- 1474071178000,
- 1474071240000,
- 1474071301000,
- 1474071363000,
- 1474071425000,
- 1474071489000,
- 1474071552000,
- 1474071567000,
- 1474071614000,
- 1474071677000,
- 1474071740000,
- 1474071802000,
- 1474071864000,
- 1474071928000,
- 1474071989000,
- 1474072051000,
- 1474072115000,
- 1474072180000,
- 1474072203000,
- 1474072203000,
- 1474072208000
+ 1474070995000, 1474071056000, 1474071116000, 1474071178000, 1474071240000, 1474071301000,
+ 1474071363000, 1474071425000, 1474071489000, 1474071552000, 1474071567000, 1474071614000,
+ 1474071677000, 1474071740000, 1474071802000, 1474071864000, 1474071928000, 1474071989000,
+ 1474072051000, 1474072115000, 1474072180000, 1474072203000, 1474072203000, 1474072208000
],
histogram: [],
enlargedHistogram: [],
@@ -2770,30 +2750,10 @@ test('#visStateReducer -> SET_FILTER_PLOT', t => {
},
speed: 1,
mappedValue: [
- 1474070995000,
- 1474071056000,
- 1474071116000,
- 1474071178000,
- 1474071240000,
- 1474071301000,
- 1474071363000,
- 1474071425000,
- 1474071489000,
- 1474071552000,
- 1474071567000,
- 1474071614000,
- 1474071677000,
- 1474071740000,
- 1474071802000,
- 1474071864000,
- 1474071928000,
- 1474071989000,
- 1474072051000,
- 1474072115000,
- 1474072180000,
- 1474072203000,
- 1474072203000,
- 1474072208000
+ 1474070995000, 1474071056000, 1474071116000, 1474071178000, 1474071240000, 1474071301000,
+ 1474071363000, 1474071425000, 1474071489000, 1474071552000, 1474071567000, 1474071614000,
+ 1474071677000, 1474071740000, 1474071802000, 1474071864000, 1474071928000, 1474071989000,
+ 1474072051000, 1474072115000, 1474072180000, 1474072203000, 1474072203000, 1474072208000
],
histogram: [],
enlargedHistogram: [],
@@ -4722,30 +4682,7 @@ test('#visStateReducer -> SORT_TABLE_COLUMN', t => {
t.ok(nextState2.datasets[testCsvDataId].sortOrder, 'should create sortOrder');
const expectedOrder = [
- 3,
- 0,
- 2,
- 4,
- 1,
- 5,
- 6,
- 7,
- 8,
- 9,
- 10,
- 11,
- 12,
- 13,
- 14,
- 15,
- 16,
- 17,
- 20,
- 19,
- 18,
- 23,
- 22,
- 21
+ 3, 0, 2, 4, 1, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 20, 19, 18, 23, 22, 21
];
t.deepEqual(nextState2.datasets[testCsvDataId].sortOrder, expectedOrder, 'should sort correctly');
t.deepEqual(
@@ -5571,7 +5508,7 @@ test('#VisStateUpdater -> updateEffect', t => {
test('#VisStateUpdater -> addEffect: invalid effect parameters', t => {
const initialState = InitialState.visState;
- let nextState = reducer(
+ const nextState = reducer(
initialState,
VisStateActions.addEffect({
id: 'e_1',
diff --git a/test/node/schemas/map-style-schema-test.js b/test/node/schemas/map-style-schema-test.js
index e01463e3b..4c90bda03 100644
--- a/test/node/schemas/map-style-schema-test.js
+++ b/test/node/schemas/map-style-schema-test.js
@@ -76,8 +76,7 @@ test('#mapStyleSchema -> v1 -> save load mapStyle with custom local style', t =>
id: 'smoothie_the_cat',
accessToken: 'secret_token',
label: 'Smoothie the Cat',
- icon:
- 'https://api.mapbox.com/styles/v1/shanhe/smoothie.the.cat/static/-122.3391,37.7922,9,0,0/400x300?access_token=secret_token&logo=false&attribution=false',
+ icon: 'https://api.mapbox.com/styles/v1/shanhe/smoothie.the.cat/static/-122.3391,37.7922,9,0,0/400x300?access_token=secret_token&logo=false&attribution=false',
custom: 'LOCAL',
url: 'mapbox://styles/shanhe/smoothie.the.cat'
}
@@ -111,8 +110,7 @@ test('#mapStyleSchema -> v1 -> save load mapStyle with custom managed style', t
id: 'smoothie_the_cat',
accessToken: 'secret_token',
label: 'Smoothie the Cat',
- icon:
- 'https://api.mapbox.com/styles/v1/shanhe/smoothie.the.cat/static/-122.3391,37.7922,9,0,0/400x300?access_token=secret_token&logo=false&attribution=false',
+ icon: 'https://api.mapbox.com/styles/v1/shanhe/smoothie.the.cat/static/-122.3391,37.7922,9,0,0/400x300?access_token=secret_token&logo=false&attribution=false',
custom: 'MANAGED',
url: 'mapbox://styles/shanhe/smoothie.the.cat'
}
@@ -146,8 +144,7 @@ test('#mapStyleSchema -> v1 -> save load mapStyle with custom local style (custo
id: 'smoothie_the_cat',
accessToken: 'secret_token',
label: 'Smoothie the Cat',
- icon:
- 'https://api.mapbox.com/styles/v1/shanhe/smoothie.the.cat/static/-122.3391,37.7922,9,0,0/400x300?access_token=secret_token&logo=false&attribution=false',
+ icon: 'https://api.mapbox.com/styles/v1/shanhe/smoothie.the.cat/static/-122.3391,37.7922,9,0,0/400x300?access_token=secret_token&logo=false&attribution=false',
custom: true,
url: 'mapbox://styles/shanhe/smoothie.the.cat'
}
diff --git a/test/node/utils/data-container-test.js b/test/node/utils/data-container-test.js
index db0fe2540..200be5c68 100644
--- a/test/node/utils/data-container-test.js
+++ b/test/node/utils/data-container-test.js
@@ -36,7 +36,7 @@ test('RowDataContainer', t => {
);
t.deepEqual(
- dc.map((row, rowIndex) => row.valueAt(1)),
+ dc.map(row => row.valueAt(1)),
[20, 40, 60, 90, 110, 130],
`RowDataContainer.map should return expected array`
);
@@ -48,7 +48,7 @@ test('RowDataContainer', t => {
);
t.deepEqual(
- dc.find((row, rowIndex) => {
+ dc.find(row => {
return row.valueAt(1) === 60;
}),
dc.row(2),
@@ -56,7 +56,7 @@ test('RowDataContainer', t => {
);
t.deepEqual(
- dc.reduce((acc, row, index) => {
+ dc.reduce((acc, row) => {
return acc + row.valueAt(1);
}, 10),
460,
@@ -91,7 +91,7 @@ test('IndexedDataContainer', t => {
);
t.deepEqual(
- dc.map((row, rowIndex) => row.valueAt(1)),
+ dc.map(row => row.valueAt(1)),
[40, 90, 130],
`IndexedDataContainer.map should return expected array`
);
@@ -103,7 +103,7 @@ test('IndexedDataContainer', t => {
);
t.deepEqual(
- dc.find((row, rowIndex) => {
+ dc.find(row => {
return row.valueAt(1) === 90;
}),
dc.row(1),
@@ -111,7 +111,7 @@ test('IndexedDataContainer', t => {
);
t.deepEqual(
- dc.reduce((acc, row, index) => {
+ dc.reduce((acc, row) => {
return acc + row.valueAt(1);
}, 10),
270,
diff --git a/test/node/utils/data-processor-test.js b/test/node/utils/data-processor-test.js
index 1766f37f4..e59cb368b 100644
--- a/test/node/utils/data-processor-test.js
+++ b/test/node/utils/data-processor-test.js
@@ -73,8 +73,7 @@ test('Processor -> getFieldsFromData', t => {
geojson:
'{"type":"Polygon","coordinates":[[[-122.4194155,37.7749295],[-122.4194155,37.7749295],[-122.4194155,37.7749295]]]}',
wkt: 'POLYGON ((-122.4194155 37.7749295, -122.4194155 37.7749295, -122.4194155 37.7749295))',
- wkb:
- '0103000020E61000000100000005000000E17A14AE47D25EC0F6F3F6F2F7F940400000000E17A14AE47D25EC0F6F3F6F2F7F940400000000E17A14AE47D25EC0F6F3F6F2F7F94040'
+ wkb: '0103000020E61000000100000005000000E17A14AE47D25EC0F6F3F6F2F7F940400000000E17A14AE47D25EC0F6F3F6F2F7F940400000000E17A14AE47D25EC0F6F3F6F2F7F94040'
},
{
time: null,
@@ -88,8 +87,7 @@ test('Processor -> getFieldsFromData', t => {
geojson:
'{"type":"LineString","coordinates":[[-122.4194155,37.7749295],[-122.4194155,37.7749295]]}',
wkt: 'LINESTRING (-122.4194155 37.7749295, -122.4194155 37.7749295)',
- wkb:
- '0102000020E610000002000000E17A14AE47D25EC0F6F3F6F2F7F94040E17A14AE47D25EC0F6F3F6F2F7F94040'
+ wkb: '0102000020E610000002000000E17A14AE47D25EC0F6F3F6F2F7F94040E17A14AE47D25EC0F6F3F6F2F7F94040'
},
{
time: null,
@@ -103,8 +101,7 @@ test('Processor -> getFieldsFromData', t => {
geojson:
'{"type":"MultiPoint","coordinates":[[-122.4194155,37.7749295],[-122.4194155,37.7749295]]}',
wkt: 'MULTIPOINT (-122.4194155 37.7749295, -122.4194155 37.7749295)',
- wkb:
- '0104000020E6100000020000000101000000E17A14AE47D25EC0F6F3F6F2F7F94040101000000E17A14AE47D25EC0F6F3F6F2F7F94040'
+ wkb: '0104000020E6100000020000000101000000E17A14AE47D25EC0F6F3F6F2F7F94040101000000E17A14AE47D25EC0F6F3F6F2F7F94040'
}
];
diff --git a/test/setup-browser-env.js b/test/setup-browser-env.js
index 7aa4866ca..aea735741 100644
--- a/test/setup-browser-env.js
+++ b/test/setup-browser-env.js
@@ -21,7 +21,7 @@ mockCanvas(window);
// // issue: https://github.com/chromaui/chromatic-cli/issues/14
Object.defineProperty(window, 'fetch', {
value: () =>
- new Promise((res, rej) => {
+ new Promise(() => {
// we just let this never resolve
}),
writable: true
diff --git a/test/webpack.config.js b/test/webpack.config.js
index 73d91dc5c..a0782ece7 100644
--- a/test/webpack.config.js
+++ b/test/webpack.config.js
@@ -42,19 +42,18 @@ const COMMON_CONFIG = {
presets: ['@babel/preset-env', '@babel/preset-react', '@babel/preset-typescript'],
plugins: [
['@babel/plugin-transform-typescript', {isTSX: true, allowDeclareFields: true}],
- "@babel/plugin-transform-class-properties",
- "@babel/plugin-transform-optional-chaining",
- "@babel/plugin-transform-logical-assignment-operators",
- "@babel/plugin-transform-nullish-coalescing-operator",
- "@babel/plugin-transform-export-namespace-from"
- [
- 'module-resolver',
+ '@babel/plugin-transform-class-properties',
+ '@babel/plugin-transform-optional-chaining',
+ '@babel/plugin-transform-logical-assignment-operators',
+ '@babel/plugin-transform-nullish-coalescing-operator',
+ '@babel/plugin-transform-export-namespace-from'[
+ ('module-resolver',
{
root: [SRC_DIR],
alias: {
test: TEST_DIR
}
- }
+ })
]
]
}
@@ -69,6 +68,6 @@ const COMMON_CONFIG = {
plugins: [new HtmlWebpackPlugin()]
};
-module.exports = (env = {}, opts = {}) => {
+module.exports = () => {
return COMMON_CONFIG;
};
diff --git a/webpack/build_types.js b/webpack/build_types.js
index ed168eee1..771b9944f 100644
--- a/webpack/build_types.js
+++ b/webpack/build_types.js
@@ -7,7 +7,7 @@ const DtsBundleWebpack = require('dts-bundle-webpack');
const SRC_DIR = resolve(__dirname, '../src');
const OUTPUT_DIR = resolve(__dirname, '../dist');
-const LIBRARY_BUNDLE_CONFIG = env => ({
+const LIBRARY_BUNDLE_CONFIG = () => ({
// Silence warnings about big bundles
stats: {
warnings: false
diff --git a/webpack/bundle.js b/webpack/bundle.js
index f6a14396f..841912221 100644
--- a/webpack/bundle.js
+++ b/webpack/bundle.js
@@ -9,7 +9,7 @@ const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPl
const SRC_DIR = resolve(__dirname, '../src');
const OUTPUT_DIR = resolve(__dirname, '../build');
-const LIBRARY_BUNDLE_CONFIG = env => ({
+const LIBRARY_BUNDLE_CONFIG = () => ({
entry: {
KeplerGl: join(SRC_DIR, 'index.js')
},
diff --git a/webpack/shared-webpack-configuration.js b/webpack/shared-webpack-configuration.js
index 146ab6619..f69d6b011 100644
--- a/webpack/shared-webpack-configuration.js
+++ b/webpack/shared-webpack-configuration.js
@@ -36,16 +36,19 @@ const ENV_VARIABLES_WITH_INSTRUCTIONS = {
FoursquareClientId: 'You can get the token at https://location.foursquare.com/developer',
FoursquareDomain: 'You can get the token at https://location.foursquare.com/developer',
FoursquareAPIURL: 'You can get the token at https://location.foursquare.com/developer',
- FoursquareUserMapsURL: 'You can get the token at https://location.foursquare.com/developer',
+ FoursquareUserMapsURL: 'You can get the token at https://location.foursquare.com/developer'
};
-const WEBPACK_ENV_VARIABLES = Object.keys(ENV_VARIABLES_WITH_INSTRUCTIONS).reduce((acc, key) => ({
- ...acc,
- [key]: null
-}), {});
+const WEBPACK_ENV_VARIABLES = Object.keys(ENV_VARIABLES_WITH_INSTRUCTIONS).reduce(
+ (acc, key) => ({
+ ...acc,
+ [key]: null
+ }),
+ {}
+);
module.exports = {
ENV_VARIABLES_WITH_INSTRUCTIONS,
WEBPACK_ENV_VARIABLES,
RESOLVE_ALIASES: resolveAlias
-}
+};
diff --git a/webpack/umd.js b/webpack/umd.js
index 264854641..a4e9c5731 100644
--- a/webpack/umd.js
+++ b/webpack/umd.js
@@ -11,7 +11,7 @@ const SRC_DIR = resolve(__dirname, '../src');
const NODE_MODULES_DIR = resolve(__dirname, '../node_modules');
const OUTPUT_DIR = resolve(__dirname, '../umd');
-const LIBRARY_BUNDLE_CONFIG = env => ({
+const LIBRARY_BUNDLE_CONFIG = () => ({
entry: {
KeplerGl: join(SRC_DIR, 'index.js')
},
diff --git a/website/src/components/common/card.js b/website/src/components/common/card.js
index 26bd58918..6878a5d2f 100644
--- a/website/src/components/common/card.js
+++ b/website/src/components/common/card.js
@@ -77,7 +77,7 @@ const Link = styled.div`
color: black;
`;
-export const VerticalCard = ({title, description, image, linkText, linkUrl}) => (
+export const VerticalCard = ({title, description, image, linkText}) => (
<VerticalContainer>
<VerticalCardImage src={image} />
<Content>
@@ -88,7 +88,7 @@ export const VerticalCard = ({title, description, image, linkText, linkUrl}) =>
</VerticalContainer>
);
-export const HorizontalCard = ({title, description, image, linkText, linkUrl}) => (
+export const HorizontalCard = ({title, description, image, linkText}) => (
<HorizontalContainer>
<HorizontalCardImage src={image} />
<Content>
diff --git a/website/src/components/common/styles.js b/website/src/components/common/styles.js
index 848576818..f5bf3b287 100644
--- a/website/src/components/common/styles.js
+++ b/website/src/components/common/styles.js
@@ -104,7 +104,7 @@ export const HeroImage = React.forwardRef((props, ref) => (
<BackgroundImage {...props} ref={ref} src={cdnUrl('hero/kepler.gl-background.png')} />
));
-export const LogoImage = React.forwardRef((props, ref) => (
+export const LogoImage = React.forwardRef(props => (
<Logo {...props} src={cdnUrl('icons/kepler.gl-logo.png')} />
));
/* eslint-enable react/display-name */
diff --git a/website/src/reducers/app.js b/website/src/reducers/app.js
index 81946b266..c508a52b7 100644
--- a/website/src/reducers/app.js
+++ b/website/src/reducers/app.js
@@ -7,7 +7,7 @@ const DEFAULT_APP_STATE = {};
export default handleActions(
{
- INIT: (state, action) => ({...state, ready: true})
+ INIT: state => ({...state, ready: true})
},
DEFAULT_APP_STATE
);
diff --git a/website/webpack.config.js b/website/webpack.config.js
index f82be5973..972561364 100644
--- a/website/webpack.config.js
+++ b/website/webpack.config.js
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: MIT
// Copyright contributors to the kepler.gl project
-const {resolve, join} = require('path');
+const {resolve} = require('path');
const webpack = require('webpack');
const KeplerPackage = require('../package');
@@ -20,10 +20,10 @@ const BABEL_CONFIG = {
presets: ['@babel/preset-env', '@babel/preset-react', '@babel/preset-typescript'],
plugins: [
['@babel/plugin-transform-typescript', {isTSX: true, allowDeclareFields: true}],
- "@babel/plugin-transform-class-properties",
- "@babel/plugin-transform-optional-chaining",
- "@babel/plugin-transform-logical-assignment-operators",
- "@babel/plugin-transform-nullish-coalescing-operator",
+ '@babel/plugin-transform-class-properties',
+ '@babel/plugin-transform-optional-chaining',
+ '@babel/plugin-transform-logical-assignment-operators',
+ '@babel/plugin-transform-nullish-coalescing-operator',
[
'search-and-replace',
{
diff --git a/yarn.lock b/yarn.lock
index e84fe605b..a6781f13e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1510,11 +1510,31 @@
dependencies:
eslint-visitor-keys "^3.3.0"
-"@eslint-community/regexpp@^4.4.0":
+"@eslint-community/regexpp@^4.4.0", "@eslint-community/regexpp@^4.6.1":
version "4.11.0"
resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.11.0.tgz#b0ffd0312b4a3fd2d6f77237e7248a5ad3a680ae"
integrity sha512-G/M/tIiMrTAxEWRfLfQJMmGNX28IxBg4PBz8XqQhqUHLFI6TL2htpIB1iQCj144V5ee/JaKyT9/WZ0MGZWfA7A==
+"@eslint/eslintrc@^2.1.3":
+ version "2.1.4"
+ resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.4.tgz#388a269f0f25c1b6adc317b5a2c55714894c70ad"
+ integrity sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==
+ dependencies:
+ ajv "^6.12.4"
+ debug "^4.3.2"
+ espree "^9.6.0"
+ globals "^13.19.0"
+ ignore "^5.2.0"
+ import-fresh "^3.2.1"
+ js-yaml "^4.1.0"
+ minimatch "^3.1.2"
+ strip-json-comments "^3.1.1"
+
+"@eslint/[email protected]":
+ version "8.53.0"
+ resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.53.0.tgz#bea56f2ed2b5baea164348ff4d5a879f6f81f20d"
+ integrity sha512-Kn7K8dx/5U6+cT1yEhpX1w4PCSg0M+XyRILPgvwcEBjerFWCwQj5sbr3/VmxqV0JGHCBCzyd6LxypEuehypY1w==
+
"@floating-ui/core@^1.6.0":
version "1.6.5"
resolved "https://registry.yarnpkg.com/@floating-ui/core/-/core-1.6.5.tgz#102335cac0d22035b04d70ca5ff092d2d1a26f2b"
@@ -1695,6 +1715,25 @@
react-onclickoutside "^6.9.0"
reselect "^3.0.0"
+"@humanwhocodes/config-array@^0.11.13":
+ version "0.11.14"
+ resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.14.tgz#d78e481a039f7566ecc9660b4ea7fe6b1fec442b"
+ integrity sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==
+ dependencies:
+ "@humanwhocodes/object-schema" "^2.0.2"
+ debug "^4.3.1"
+ minimatch "^3.0.5"
+
+"@humanwhocodes/module-importer@^1.0.1":
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c"
+ integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==
+
+"@humanwhocodes/object-schema@^2.0.2":
+ version "2.0.3"
+ resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz#4a2868d75d6d6963e423bcf90b7fd1be343409d3"
+ integrity sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==
+
"@icons/material@^0.2.4":
version "0.2.4"
resolved "https://registry.yarnpkg.com/@icons/material/-/material-0.2.4.tgz#e90c9f71768b3736e76d7dd6783fc6c2afa88bc8"
@@ -2609,7 +2648,7 @@
resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b"
integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==
-"@nodelib/fs.walk@^1.2.3":
+"@nodelib/fs.walk@^1.2.3", "@nodelib/fs.walk@^1.2.8":
version "1.2.8"
resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a"
integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==
@@ -3526,11 +3565,16 @@
"@types/tough-cookie" "*"
parse5 "^7.0.0"
-"@types/json-schema@^7.0.3", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
+"@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
version "7.0.15"
resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841"
integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==
+"@types/json5@^0.0.29":
+ version "0.0.29"
+ resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
+ integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==
+
"@types/keymirror@^0.1.1":
version "0.1.4"
resolved "https://registry.yarnpkg.com/@types/keymirror/-/keymirror-0.1.4.tgz#fc1b34b5e6e7410526a58099a2f69536dceed264"
@@ -3936,33 +3980,23 @@
dependencies:
"@types/node" "*"
-"@typescript-eslint/eslint-plugin@^5.12.0":
- version "5.62.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.62.0.tgz#aeef0328d172b9e37d9bab6dbc13b87ed88977db"
- integrity sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag==
+"@typescript-eslint/[email protected]":
+ version "5.57.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.57.0.tgz#52c8a7a4512f10e7249ca1e2e61f81c62c34365c"
+ integrity sha512-itag0qpN6q2UMM6Xgk6xoHa0D0/P+M17THnr4SVgqn9Rgam5k/He33MA7/D7QoJcdMxHFyX7U9imaBonAX/6qA==
dependencies:
"@eslint-community/regexpp" "^4.4.0"
- "@typescript-eslint/scope-manager" "5.62.0"
- "@typescript-eslint/type-utils" "5.62.0"
- "@typescript-eslint/utils" "5.62.0"
+ "@typescript-eslint/scope-manager" "5.57.0"
+ "@typescript-eslint/type-utils" "5.57.0"
+ "@typescript-eslint/utils" "5.57.0"
debug "^4.3.4"
- graphemer "^1.4.0"
+ grapheme-splitter "^1.0.4"
ignore "^5.2.0"
natural-compare-lite "^1.4.0"
semver "^7.3.7"
tsutils "^3.21.0"
-"@typescript-eslint/experimental-utils@^2.5.0":
- version "2.34.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.34.0.tgz#d3524b644cdb40eebceca67f8cf3e4cc9c8f980f"
- integrity sha512-eS6FTkq+wuMJ+sgtuNTtcqavWXqsflWcfBnlYhg/nS4aZ1leewkXGbvBhaapn1q6qf4M71bsR1tez5JTRMuqwA==
- dependencies:
- "@types/json-schema" "^7.0.3"
- "@typescript-eslint/typescript-estree" "2.34.0"
- eslint-scope "^5.0.0"
- eslint-utils "^2.0.0"
-
-"@typescript-eslint/parser@^5.27.0":
+"@typescript-eslint/parser@^5.57.1":
version "5.62.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.62.0.tgz#1b63d082d849a2fcae8a569248fbe2ee1b8a56c7"
integrity sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA==
@@ -3972,6 +4006,14 @@
"@typescript-eslint/typescript-estree" "5.62.0"
debug "^4.3.4"
+"@typescript-eslint/[email protected]":
+ version "5.57.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.57.0.tgz#79ccd3fa7bde0758059172d44239e871e087ea36"
+ integrity sha512-NANBNOQvllPlizl9LatX8+MHi7bx7WGIWYjPHDmQe5Si/0YEYfxSljJpoTyTWFTgRy3X8gLYSE4xQ2U+aCozSw==
+ dependencies:
+ "@typescript-eslint/types" "5.57.0"
+ "@typescript-eslint/visitor-keys" "5.57.0"
+
"@typescript-eslint/[email protected]":
version "5.62.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz#d9457ccc6a0b8d6b37d0eb252a23022478c5460c"
@@ -3980,33 +4022,38 @@
"@typescript-eslint/types" "5.62.0"
"@typescript-eslint/visitor-keys" "5.62.0"
-"@typescript-eslint/[email protected]":
- version "5.62.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.62.0.tgz#286f0389c41681376cdad96b309cedd17d70346a"
- integrity sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew==
+"@typescript-eslint/[email protected]":
+ version "5.57.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.57.0.tgz#98e7531c4e927855d45bd362de922a619b4319f2"
+ integrity sha512-kxXoq9zOTbvqzLbdNKy1yFrxLC6GDJFE2Yuo3KqSwTmDOFjUGeWSakgoXT864WcK5/NAJkkONCiKb1ddsqhLXQ==
dependencies:
- "@typescript-eslint/typescript-estree" "5.62.0"
- "@typescript-eslint/utils" "5.62.0"
+ "@typescript-eslint/typescript-estree" "5.57.0"
+ "@typescript-eslint/utils" "5.57.0"
debug "^4.3.4"
tsutils "^3.21.0"
+"@typescript-eslint/[email protected]":
+ version "5.57.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.57.0.tgz#727bfa2b64c73a4376264379cf1f447998eaa132"
+ integrity sha512-mxsod+aZRSyLT+jiqHw1KK6xrANm19/+VFALVFP5qa/aiJnlP38qpyaTd0fEKhWvQk6YeNZ5LGwI1pDpBRBhtQ==
+
"@typescript-eslint/[email protected]":
version "5.62.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.62.0.tgz#258607e60effa309f067608931c3df6fed41fd2f"
integrity sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==
-"@typescript-eslint/[email protected]":
- version "2.34.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.34.0.tgz#14aeb6353b39ef0732cc7f1b8285294937cf37d5"
- integrity sha512-OMAr+nJWKdlVM9LOqCqh3pQQPwxHAN7Du8DR6dmwCrAmxtiXQnhHJ6tBNtf+cggqfo51SG/FCwnKhXCIM7hnVg==
+"@typescript-eslint/[email protected]":
+ version "5.57.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.57.0.tgz#ebcd0ee3e1d6230e888d88cddf654252d41e2e40"
+ integrity sha512-LTzQ23TV82KpO8HPnWuxM2V7ieXW8O142I7hQTxWIHDcCEIjtkat6H96PFkYBQqGFLW/G/eVVOB9Z8rcvdY/Vw==
dependencies:
- debug "^4.1.1"
- eslint-visitor-keys "^1.1.0"
- glob "^7.1.6"
- is-glob "^4.0.1"
- lodash "^4.17.15"
- semver "^7.3.2"
- tsutils "^3.17.1"
+ "@typescript-eslint/types" "5.57.0"
+ "@typescript-eslint/visitor-keys" "5.57.0"
+ debug "^4.3.4"
+ globby "^11.1.0"
+ is-glob "^4.0.3"
+ semver "^7.3.7"
+ tsutils "^3.21.0"
"@typescript-eslint/[email protected]":
version "5.62.0"
@@ -4021,7 +4068,21 @@
semver "^7.3.7"
tsutils "^3.21.0"
-"@typescript-eslint/[email protected]", "@typescript-eslint/utils@^5.10.0":
+"@typescript-eslint/[email protected]":
+ version "5.57.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.57.0.tgz#eab8f6563a2ac31f60f3e7024b91bf75f43ecef6"
+ integrity sha512-ps/4WohXV7C+LTSgAL5CApxvxbMkl9B9AUZRtnEFonpIxZDIT7wC1xfvuJONMidrkB9scs4zhtRyIwHh4+18kw==
+ dependencies:
+ "@eslint-community/eslint-utils" "^4.2.0"
+ "@types/json-schema" "^7.0.9"
+ "@types/semver" "^7.3.12"
+ "@typescript-eslint/scope-manager" "5.57.0"
+ "@typescript-eslint/types" "5.57.0"
+ "@typescript-eslint/typescript-estree" "5.57.0"
+ eslint-scope "^5.1.1"
+ semver "^7.3.7"
+
+"@typescript-eslint/utils@^5.10.0":
version "5.62.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.62.0.tgz#141e809c71636e4a75daa39faed2fb5f4b10df86"
integrity sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==
@@ -4035,6 +4096,14 @@
eslint-scope "^5.1.1"
semver "^7.3.7"
+"@typescript-eslint/[email protected]":
+ version "5.57.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.57.0.tgz#e2b2f4174aff1d15eef887ce3d019ecc2d7a8ac1"
+ integrity sha512-ery2g3k0hv5BLiKpPuwYt9KBkAp2ugT6VvyShXdLOkax895EC55sP0Tx5L0fZaQueiK3fBLvHVvEl3jFS5ia+g==
+ dependencies:
+ "@typescript-eslint/types" "5.57.0"
+ eslint-visitor-keys "^3.3.0"
+
"@typescript-eslint/[email protected]":
version "5.62.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz#2174011917ce582875954ffe2f6912d5931e353e"
@@ -4043,6 +4112,11 @@
"@typescript-eslint/types" "5.62.0"
eslint-visitor-keys "^3.3.0"
+"@ungap/structured-clone@^1.2.0":
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406"
+ integrity sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==
+
"@webassemblyjs/[email protected]":
version "1.9.0"
resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.9.0.tgz#bd850604b4042459a5a41cd7d338cbed695ed964"
@@ -4237,7 +4311,7 @@ acorn-globals@^7.0.0:
acorn "^8.1.0"
acorn-walk "^8.0.2"
-acorn-jsx@^5.0.0:
+acorn-jsx@^5.3.2:
version "5.3.2"
resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
@@ -4268,7 +4342,7 @@ acorn@^5.2.1:
resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.4.tgz#3e8d8a9947d0599a1796d10225d7432f4a4acf5e"
integrity sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==
-acorn@^6.0.7, acorn@^6.4.1:
+acorn@^6.4.1:
version "6.4.2"
resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6"
integrity sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==
@@ -4278,7 +4352,7 @@ acorn@^7.0.0, acorn@^7.1.1:
resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
-acorn@^8.1.0, acorn@^8.11.0, acorn@^8.8.1:
+acorn@^8.1.0, acorn@^8.11.0, acorn@^8.8.1, acorn@^8.9.0:
version "8.12.1"
resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.12.1.tgz#71616bdccbe25e27a54439e0046e89ca76df2248"
integrity sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==
@@ -4322,7 +4396,7 @@ ajv-keywords@^3.1.0, ajv-keywords@^3.4.1, ajv-keywords@^3.5.2:
resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
-ajv@^6.1.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5, ajv@^6.9.1:
+ajv@^6.1.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5:
version "6.12.6"
resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
@@ -4347,11 +4421,6 @@ ansi-colors@^3.0.0:
resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz#e3a3da4bfbae6c86a9c285625de124a234026fbf"
integrity sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==
-ansi-escapes@^3.2.0:
- version "3.2.0"
- resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"
- integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==
-
ansi-escapes@^4.2.1:
version "4.3.2"
resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e"
@@ -4566,7 +4635,7 @@ array-flatten@^2.1.0:
resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099"
integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==
-array-includes@^3.1.6, array-includes@^3.1.8:
+array-includes@^3.1.6, array-includes@^3.1.7, array-includes@^3.1.8:
version "3.1.8"
resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.8.tgz#5e370cbe172fdd5dd6530c1d4aadda25281ba97d"
integrity sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==
@@ -4612,21 +4681,22 @@ array.prototype.filter@^1.0.0:
es-object-atoms "^1.0.0"
is-string "^1.0.7"
-array.prototype.find@^2.0.1:
- version "2.2.3"
- resolved "https://registry.yarnpkg.com/array.prototype.find/-/array.prototype.find-2.2.3.tgz#675a233dbcd9b65ecf1fb3f915741aebc45461e6"
- integrity sha512-fO/ORdOELvjbbeIfZfzrXFMhYHGofRGqd+am9zm3tZ4GlJINj/pA2eITyfd65Vg6+ZbHd/Cys7stpoRSWtQFdA==
+array.prototype.findlast@^1.2.5:
+ version "1.2.5"
+ resolved "https://registry.yarnpkg.com/array.prototype.findlast/-/array.prototype.findlast-1.2.5.tgz#3e4fbcb30a15a7f5bf64cf2faae22d139c2e4904"
+ integrity sha512-CVvd6FHg1Z3POpBLxO6E6zr+rSKEQ9L6rZHAaY7lLfhKsWYUBBOuMs0e9o24oopj6H+geRCX0YJ+TJLBK2eHyQ==
dependencies:
call-bind "^1.0.7"
define-properties "^1.2.1"
es-abstract "^1.23.2"
+ es-errors "^1.3.0"
es-object-atoms "^1.0.0"
es-shim-unscopables "^1.0.2"
-array.prototype.findlast@^1.2.5:
+array.prototype.findlastindex@^1.2.3:
version "1.2.5"
- resolved "https://registry.yarnpkg.com/array.prototype.findlast/-/array.prototype.findlast-1.2.5.tgz#3e4fbcb30a15a7f5bf64cf2faae22d139c2e4904"
- integrity sha512-CVvd6FHg1Z3POpBLxO6E6zr+rSKEQ9L6rZHAaY7lLfhKsWYUBBOuMs0e9o24oopj6H+geRCX0YJ+TJLBK2eHyQ==
+ resolved "https://registry.yarnpkg.com/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.5.tgz#8c35a755c72908719453f87145ca011e39334d0d"
+ integrity sha512-zfETvRFA8o7EiNn++N5f/kaCw221hrpGsDmcpndVupkPzEc1Wuf3VgC0qby1BbHs7f5DVYjgtEU2LLh5bqeGfQ==
dependencies:
call-bind "^1.0.7"
define-properties "^1.2.1"
@@ -4635,7 +4705,7 @@ array.prototype.findlast@^1.2.5:
es-object-atoms "^1.0.0"
es-shim-unscopables "^1.0.2"
-array.prototype.flat@^1.2.3, array.prototype.flat@^1.3.1:
+array.prototype.flat@^1.2.3, array.prototype.flat@^1.3.1, array.prototype.flat@^1.3.2:
version "1.3.2"
resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz#1476217df8cff17d72ee8f3ba06738db5b387d18"
integrity sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==
@@ -4763,11 +4833,6 @@ ast-utils@^1.0.0:
dependencies:
lodash.get "^4.4.2"
-astral-regex@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"
- integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==
-
astral-regex@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31"
@@ -5724,7 +5789,7 @@ chalk@^1.0.0, chalk@^1.1.3:
strip-ansi "^3.0.0"
supports-color "^2.0.0"
-chalk@^2.1.0, chalk@^2.3.0, chalk@^2.4.1, chalk@^2.4.2:
+chalk@^2.3.0, chalk@^2.4.1, chalk@^2.4.2:
version "2.4.2"
resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -5774,11 +5839,6 @@ character-reference-invalid@^1.0.0:
resolved "https://registry.yarnpkg.com/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz#083329cda0eae272ab3dbbf37e9a382c13af1560"
integrity sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg==
-chardet@^0.7.0:
- version "0.7.0"
- resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
- integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
-
check-types@^8.0.3:
version "8.0.3"
resolved "https://registry.yarnpkg.com/check-types/-/check-types-8.0.3.tgz#3356cca19c889544f2d7a95ed49ce508a0ecf552"
@@ -5912,18 +5972,6 @@ clean-stack@^2.0.0:
resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==
-cli-cursor@^2.1.0:
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
- integrity sha512-8lgKz8LmCRYZZQDpRyT2m5rKJ08TnU4tR9FFFW2rxpxR1FzWi4PQ/NfyODchAatHaUgnSPVcx/R5w6NuTBzFiw==
- dependencies:
- restore-cursor "^2.0.0"
-
-cli-width@^2.0.0:
- version "2.2.1"
- resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.1.tgz#b0433d0b4e9c847ef18868a4ef16fd5fc8271c48"
- integrity sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw==
-
cliui@^4.0.0:
version "4.1.0"
resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.1.0.tgz#348422dbe82d800b3022eef4f6ac10bf2e4d1b49"
@@ -6409,7 +6457,7 @@ cross-spawn@^6.0.0, cross-spawn@^6.0.5:
shebang-command "^1.2.0"
which "^1.2.9"
-cross-spawn@^7.0.0, cross-spawn@^7.0.3:
+cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
version "7.0.3"
resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
@@ -6831,7 +6879,7 @@ [email protected], debug@^2.2.0, debug@^2.3.3, debug@^2.6.8:
dependencies:
ms "2.0.0"
-debug@4, debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.3, debug@^4.3.4, debug@^4.3.5:
+debug@4, debug@^4.0.0, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.3, debug@^4.3.4, debug@^4.3.5:
version "4.3.5"
resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.5.tgz#e83444eceb9fedd4a1da56d671ae2446a01a6e1e"
integrity sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==
@@ -6845,6 +6893,13 @@ debug@^3.1.0, debug@^3.2.7:
dependencies:
ms "^2.1.1"
+debug@^4.3.2:
+ version "4.3.6"
+ resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.6.tgz#2ab2c38fbaffebf8aa95fdfe6d88438c7a13c52b"
+ integrity sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==
+ dependencies:
+ ms "2.1.2"
+
decamelize-keys@^1.1.0:
version "1.1.1"
resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.1.tgz#04a2d523b2f18d80d0158a43b895d56dff8d19d8"
@@ -6921,7 +6976,7 @@ deep-extend@^0.6.0:
resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
-deep-is@~0.1.3:
+deep-is@^0.1.3:
version "0.1.4"
resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
@@ -7206,14 +7261,6 @@ [email protected]:
dependencies:
esutils "^2.0.2"
-doctrine@^1.2.2:
- version "1.5.0"
- resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa"
- integrity sha512-lsGyRuYr4/PIB0txi+Fy2xOMI2dGaTguCaotzFGkVZuKR5usKfcRWIFKNM3QNrU7hh/+w2bwTW+ZeXPK5l8uVg==
- dependencies:
- esutils "^2.0.2"
- isarray "^1.0.0"
-
doctrine@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
@@ -7588,6 +7635,14 @@ enhanced-resolve@^4.1.1, enhanced-resolve@^4.5.0:
memory-fs "^0.5.0"
tapable "^1.0.0"
+enhanced-resolve@^5.12.0:
+ version "5.17.1"
+ resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz#67bfbbcc2f81d511be77d686a90267ef7f898a15"
+ integrity sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==
+ dependencies:
+ graceful-fs "^4.2.4"
+ tapable "^2.2.0"
+
entities@^1.1.1:
version "1.1.2"
resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
@@ -7831,6 +7886,11 @@ escape-string-regexp@^2.0.0:
resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344"
integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==
+escape-string-regexp@^4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
+ integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
+
escodegen@^2.0.0, escodegen@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.1.0.tgz#ba93bbb7a43986d29d6041f99f5262da773e2e17"
@@ -7853,32 +7913,39 @@ eslint-config-developit@^1.2.0:
eslint-plugin-mocha "^6.3.0"
eslint-plugin-react "^7.0.0"
-eslint-config-prettier@^6.3.0:
- version "6.15.0"
- resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.15.0.tgz#7f93f6cb7d45a92f1537a70ecc06366e1ac6fed9"
- integrity sha512-a1+kOYLR8wMGustcgAjdydMsQ2A/2ipRPwRKUmfYaSxc9ZPcrku080Ctl6zrZzZNs/U82MjSv+qKREkoq3bJaw==
- dependencies:
- get-stdin "^6.0.0"
+ version "8.5.0"
+ resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz#5a81680ec934beca02c7b1a61cf8ca34b66feab1"
+ integrity sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q==
-eslint-config-uber-es2015@^3.1.2:
- version "3.1.2"
- resolved "https://registry.yarnpkg.com/eslint-config-uber-es2015/-/eslint-config-uber-es2015-3.1.2.tgz#77acd8800141f75dde997a87bb451e3490b07e54"
- integrity sha512-+SIBwodWemj41yBwDM64sDie6D8O1pepmUKDoemVdc4qxP+d8TIhX1QLYLEEVpP3yTcYH+TgLSUHri6/IGW5sw==
+eslint-import-resolver-node@^0.3.9:
+ version "0.3.9"
+ resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz#d4eaac52b8a2e7c3cd1903eb00f7e053356118ac"
+ integrity sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==
dependencies:
- eslint-config-uber-es5 "^2.0.3"
+ debug "^3.2.7"
+ is-core-module "^2.13.0"
+ resolve "^1.22.4"
-eslint-config-uber-es5@^2.0.3:
- version "2.0.3"
- resolved "https://registry.yarnpkg.com/eslint-config-uber-es5/-/eslint-config-uber-es5-2.0.3.tgz#4991bc80103a7f5a39dc77a7eb13dbd860568fe5"
- integrity sha512-lHdjmCumgT72R6t4ZAvjErmOB1l9d6fg1IoX+MZ11F/7CFLMinmsMQW/r9aFWKPMdTkP+rR5NBpSTDnRE20oEw==
+ version "3.6.1"
+ resolved "https://registry.yarnpkg.com/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-3.6.1.tgz#7b983680edd3f1c5bce1a5829ae0bc2d57fe9efa"
+ integrity sha512-xgdptdoi5W3niYeuQxKmzVDTATvLYqhpwmykwsh7f6HIOStGWEIL9iqZgQDF9u9OEzrRwR8no5q2VT+bjAujTg==
+ dependencies:
+ debug "^4.3.4"
+ enhanced-resolve "^5.12.0"
+ eslint-module-utils "^2.7.4"
+ fast-glob "^3.3.1"
+ get-tsconfig "^4.5.0"
+ is-core-module "^2.11.0"
+ is-glob "^4.0.3"
-eslint-config-uber-jsx@^3.3.3:
- version "3.3.3"
- resolved "https://registry.yarnpkg.com/eslint-config-uber-jsx/-/eslint-config-uber-jsx-3.3.3.tgz#982db8e7bc3d004517c0df298f37ca90d02bd132"
- integrity sha512-5HEcjsC7CBr+8aNjw49Rhehc9dJxmkihhqQjIv0WuuVRFTF33aVTaBO+zrMhJYXh34ZxOjhItU3R0smy6YYT+w==
+eslint-module-utils@^2.7.4, eslint-module-utils@^2.8.0:
+ version "2.8.1"
+ resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.8.1.tgz#52f2404300c3bd33deece9d7372fb337cc1d7c34"
+ integrity sha512-rXDXR3h7cs7dy9RNpUlQf80nX31XWJEyGq1tRMo+6GsO5VmTe4UTwtmonAD4ZkAsrfMVDA2wlGJ3790Ys+D49Q==
dependencies:
- eslint-config-uber-es5 "^2.0.3"
- eslint-plugin-react "^6.7.1"
+ debug "^3.2.7"
eslint-plugin-babel@^5.3.0:
version "5.3.1"
@@ -7911,14 +7978,30 @@ eslint-plugin-enzyme-deprecation@^0.7.7:
chalk "^4.0.0"
figlet "^1.5.2"
-eslint-plugin-jest@^23.8.2:
- version "23.20.0"
- resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-23.20.0.tgz#e1d69c75f639e99d836642453c4e75ed22da4099"
- integrity sha512-+6BGQt85OREevBDWCvhqj1yYA4+BFK4XnRZSGJionuEYmcglMZYLNNBBemwzbqUAckURaHdJSBcjHPyrtypZOw==
+ version "2.29.1"
+ resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.29.1.tgz#d45b37b5ef5901d639c15270d74d46d161150643"
+ integrity sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw==
dependencies:
- "@typescript-eslint/experimental-utils" "^2.5.0"
+ array-includes "^3.1.7"
+ array.prototype.findlastindex "^1.2.3"
+ array.prototype.flat "^1.3.2"
+ array.prototype.flatmap "^1.3.2"
+ debug "^3.2.7"
+ doctrine "^2.1.0"
+ eslint-import-resolver-node "^0.3.9"
+ eslint-module-utils "^2.8.0"
+ hasown "^2.0.0"
+ is-core-module "^2.13.1"
+ is-glob "^4.0.3"
+ minimatch "^3.1.2"
+ object.fromentries "^2.0.7"
+ object.groupby "^1.0.1"
+ object.values "^1.1.7"
+ semver "^6.3.1"
+ tsconfig-paths "^3.15.0"
-eslint-plugin-jest@^27.2.1:
+eslint-plugin-jest@^23.8.2, eslint-plugin-jest@^27.2.1:
version "27.9.0"
resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-27.9.0.tgz#7c98a33605e1d8b8442ace092b60e9919730000b"
integrity sha512-QIT7FH7fNmd9n4se7FFKHbsLKGQiw885Ds6Y/sxKgCZ6natwCsXdgPOADnYVxN2QrRweF0FZWbJ6S7Rsn7llug==
@@ -7933,30 +8016,19 @@ eslint-plugin-mocha@^6.3.0:
eslint-utils "^2.0.0"
ramda "^0.27.0"
-eslint-plugin-prettier@^3.1.2:
- version "3.4.1"
- resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.4.1.tgz#e9ddb200efb6f3d05ffe83b1665a716af4a387e5"
- integrity sha512-htg25EUYUeIhKHXjOinK4BgCcDwtLHjqaxCDsMy5nbnUMkKFvIhMVCp+5GFUXQ4Nr8lBsPqtGAqBenbpFqAA2g==
+ version "4.2.1"
+ resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-4.2.1.tgz#651cbb88b1dab98bfd42f017a12fa6b2d993f94b"
+ integrity sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ==
dependencies:
prettier-linter-helpers "^1.0.0"
-eslint-plugin-react-hooks@^4.6.0:
+eslint-plugin-react-hooks@^4.6.2:
version "4.6.2"
resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.2.tgz#c829eb06c0e6f484b3fbb85a97e57784f328c596"
integrity sha512-QzliNJq4GinDBcD8gPB5v0wh6g8q3SUi6EFF0x8N/BL9PoVs0atuGc47ozMRyOWAKdwaZ5OnbOEa3WR+dSGKuQ==
-eslint-plugin-react@^6.7.1:
- version "6.10.3"
- resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-6.10.3.tgz#c5435beb06774e12c7db2f6abaddcbf900cd3f78"
- integrity sha512-vFfMSxJynKlgOhIVjhlZyibVUg442Aiv3482XPkgdYV90T8nD2QvxGXILZGwZHYMQ/l+A/De14O9D0qjDelSrg==
- dependencies:
- array.prototype.find "^2.0.1"
- doctrine "^1.2.2"
- has "^1.0.1"
- jsx-ast-utils "^1.3.4"
- object.assign "^4.0.4"
-
-eslint-plugin-react@^7.0.0, eslint-plugin-react@^7.32.2:
+eslint-plugin-react@^7.0.0, eslint-plugin-react@^7.35.0:
version "7.35.0"
resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.35.0.tgz#00b1e4559896710e58af6358898f2ff917ea4c41"
integrity sha512-v501SSMOWv8gerHkk+IIQBkcGRGrO2nfybfj5pLxuJNFTPxxA3PSryhXTK+9pNbtkggheDdsC0E9Q8CuPk6JKA==
@@ -7985,7 +8057,7 @@ eslint-rule-composer@^0.3.0:
resolved "https://registry.yarnpkg.com/eslint-rule-composer/-/eslint-rule-composer-0.3.0.tgz#79320c927b0c5c0d3d3d2b76c8b4a488f25bbaf9"
integrity sha512-bt+Sh8CtDmn2OajxvNO+BX7Wn4CIWMpTRm3MaiKPCQcnnlm0CS2mhui6QaoeQugs+3Kj2ESKEEGJUdVafwhiCg==
[email protected], eslint-scope@^5.0.0, eslint-scope@^5.1.1:
[email protected], eslint-scope@^5.1.1:
version "5.1.1"
resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
@@ -8001,12 +8073,13 @@ eslint-scope@^4.0.3:
esrecurse "^4.1.0"
estraverse "^4.1.1"
-eslint-utils@^1.3.1:
- version "1.4.3"
- resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.3.tgz#74fec7c54d0776b6f67e0251040b5806564e981f"
- integrity sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==
+eslint-scope@^7.2.2:
+ version "7.2.2"
+ resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.2.tgz#deb4f92563390f32006894af62a22dba1c46423f"
+ integrity sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==
dependencies:
- eslint-visitor-keys "^1.1.0"
+ esrecurse "^4.3.0"
+ estraverse "^5.2.0"
eslint-utils@^2.0.0:
version "2.1.0"
@@ -8025,68 +8098,70 @@ eslint-visitor-keys@^2.1.0:
resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"
integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==
-eslint-visitor-keys@^3.3.0:
+eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4.3:
version "3.4.3"
resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800"
integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==
-eslint@^5.16.0:
- version "5.16.0"
- resolved "https://registry.yarnpkg.com/eslint/-/eslint-5.16.0.tgz#a1e3ac1aae4a3fbd8296fcf8f7ab7314cbb6abea"
- integrity sha512-S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg==
+eslint@~8.53.0:
+ version "8.53.0"
+ resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.53.0.tgz#14f2c8244298fcae1f46945459577413ba2697ce"
+ integrity sha512-N4VuiPjXDUa4xVeV/GC/RV3hQW9Nw+Y463lkWaKKXKYMvmRiRDAtfpuPFLN+E1/6ZhyR8J2ig+eVREnYgUsiag==
dependencies:
- "@babel/code-frame" "^7.0.0"
- ajv "^6.9.1"
- chalk "^2.1.0"
- cross-spawn "^6.0.5"
- debug "^4.0.1"
+ "@eslint-community/eslint-utils" "^4.2.0"
+ "@eslint-community/regexpp" "^4.6.1"
+ "@eslint/eslintrc" "^2.1.3"
+ "@eslint/js" "8.53.0"
+ "@humanwhocodes/config-array" "^0.11.13"
+ "@humanwhocodes/module-importer" "^1.0.1"
+ "@nodelib/fs.walk" "^1.2.8"
+ "@ungap/structured-clone" "^1.2.0"
+ ajv "^6.12.4"
+ chalk "^4.0.0"
+ cross-spawn "^7.0.2"
+ debug "^4.3.2"
doctrine "^3.0.0"
- eslint-scope "^4.0.3"
- eslint-utils "^1.3.1"
- eslint-visitor-keys "^1.0.0"
- espree "^5.0.1"
- esquery "^1.0.1"
+ escape-string-regexp "^4.0.0"
+ eslint-scope "^7.2.2"
+ eslint-visitor-keys "^3.4.3"
+ espree "^9.6.1"
+ esquery "^1.4.2"
esutils "^2.0.2"
- file-entry-cache "^5.0.1"
- functional-red-black-tree "^1.0.1"
- glob "^7.1.2"
- globals "^11.7.0"
- ignore "^4.0.6"
- import-fresh "^3.0.0"
+ fast-deep-equal "^3.1.3"
+ file-entry-cache "^6.0.1"
+ find-up "^5.0.0"
+ glob-parent "^6.0.2"
+ globals "^13.19.0"
+ graphemer "^1.4.0"
+ ignore "^5.2.0"
imurmurhash "^0.1.4"
- inquirer "^6.2.2"
- js-yaml "^3.13.0"
+ is-glob "^4.0.0"
+ is-path-inside "^3.0.3"
+ js-yaml "^4.1.0"
json-stable-stringify-without-jsonify "^1.0.1"
- levn "^0.3.0"
- lodash "^4.17.11"
- minimatch "^3.0.4"
- mkdirp "^0.5.1"
+ levn "^0.4.1"
+ lodash.merge "^4.6.2"
+ minimatch "^3.1.2"
natural-compare "^1.4.0"
- optionator "^0.8.2"
- path-is-inside "^1.0.2"
- progress "^2.0.0"
- regexpp "^2.0.1"
- semver "^5.5.1"
- strip-ansi "^4.0.0"
- strip-json-comments "^2.0.1"
- table "^5.2.3"
+ optionator "^0.9.3"
+ strip-ansi "^6.0.1"
text-table "^0.2.0"
-espree@^5.0.1:
- version "5.0.1"
- resolved "https://registry.yarnpkg.com/espree/-/espree-5.0.1.tgz#5d6526fa4fc7f0788a5cf75b15f30323e2f81f7a"
- integrity sha512-qWAZcWh4XE/RwzLJejfcofscgMc9CamR6Tn1+XRXNzrvUSSbiAjGOI/fggztjIi7y9VLPqnICMIPiGyr8JaZ0A==
+espree@^9.6.0, espree@^9.6.1:
+ version "9.6.1"
+ resolved "https://registry.yarnpkg.com/espree/-/espree-9.6.1.tgz#a2a17b8e434690a5432f2f8018ce71d331a48c6f"
+ integrity sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==
dependencies:
- acorn "^6.0.7"
- acorn-jsx "^5.0.0"
- eslint-visitor-keys "^1.0.0"
+ acorn "^8.9.0"
+ acorn-jsx "^5.3.2"
+ eslint-visitor-keys "^3.4.1"
esprima@^4.0.0, esprima@^4.0.1:
version "4.0.1"
resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
-esquery@^1.0.1:
+esquery@^1.4.2:
version "1.6.0"
resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.6.0.tgz#91419234f804d852a82dceec3e16cdc22cf9dae7"
integrity sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==
@@ -8296,15 +8371,6 @@ extend@^3.0.0, extend@~3.0.2:
resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
-external-editor@^3.0.3:
- version "3.1.0"
- resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495"
- integrity sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==
- dependencies:
- chardet "^0.7.0"
- iconv-lite "^0.4.24"
- tmp "^0.0.33"
-
extglob@^2.0.4:
version "2.0.4"
resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
@@ -8355,7 +8421,7 @@ fast-fifo@^1.2.0, fast-fifo@^1.3.2:
resolved "https://registry.yarnpkg.com/fast-fifo/-/fast-fifo-1.3.2.tgz#286e31de96eb96d38a97899815740ba2a4f3640c"
integrity sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==
-fast-glob@^3.2.5, fast-glob@^3.2.9:
+fast-glob@^3.2.5, fast-glob@^3.2.9, fast-glob@^3.3.1:
version "3.3.2"
resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.2.tgz#a904501e57cfdd2ffcded45e99a54fef55e46129"
integrity sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==
@@ -8371,7 +8437,7 @@ fast-json-stable-stringify@^2.0.0, fast-json-stable-stringify@^2.1.0:
resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
-fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6:
+fast-levenshtein@^2.0.6:
version "2.0.6"
resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==
@@ -8464,20 +8530,6 @@ figures@^1.4.0:
escape-string-regexp "^1.0.5"
object-assign "^4.1.0"
-figures@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
- integrity sha512-Oa2M9atig69ZkfwiApY8F2Yy+tzMbazyvqv21R0NsSC8floSOC09BbT1ITWAdoMGQvJ/aZnR1KMwdx9tvHnTNA==
- dependencies:
- escape-string-regexp "^1.0.5"
-
-file-entry-cache@^5.0.1:
- version "5.0.1"
- resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz#ca0f6efa6dd3d561333fb14515065c2fafdf439c"
- integrity sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==
- dependencies:
- flat-cache "^2.0.1"
-
file-entry-cache@^6.0.1:
version "6.0.1"
resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027"
@@ -8591,15 +8643,6 @@ findup-sync@^3.0.0:
micromatch "^3.0.4"
resolve-dir "^1.0.1"
-flat-cache@^2.0.1:
- version "2.0.1"
- resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz#5d296d6f04bda44a4630a301413bdbc2ec085ec0"
- integrity sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==
- dependencies:
- flatted "^2.0.0"
- rimraf "2.6.3"
- write "1.0.3"
-
flat-cache@^3.0.4:
version "3.2.0"
resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.2.0.tgz#2c0c2d5040c99b1632771a9d105725c0115363ee"
@@ -8619,11 +8662,6 @@ flatbuffers@^24.3.25:
resolved "https://registry.yarnpkg.com/flatbuffers/-/flatbuffers-24.3.25.tgz#e2f92259ba8aa53acd0af7844afb7c7eb95e7089"
integrity sha512-3HDgPbgiwWMI9zVB7VYBHaMrbOO7Gm0v+yD2FV/sCKj+9NDeVL7BOBYUuhWAQGKWOzBo8S9WdMvV0eixO233XQ==
-flatted@^2.0.0:
- version "2.0.2"
- resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz#4575b21e2bcee7434aa9be662f4b7b5f9c2b5138"
- integrity sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==
-
flatted@^3.2.9:
version "3.3.1"
resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.3.1.tgz#21db470729a6734d4997002f439cb308987f567a"
@@ -8834,11 +8872,6 @@ function.prototype.name@^1.1.0, function.prototype.name@^1.1.2, function.prototy
es-abstract "^1.22.1"
functions-have-names "^1.2.3"
-functional-red-black-tree@^1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
- integrity sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==
-
functions-have-names@^1.2.3:
version "1.2.3"
resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"
@@ -8941,11 +8974,6 @@ get-stdin@^0.1.0:
resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-0.1.0.tgz#5998af24aafc802d15c82c685657eeb8b10d4a91"
integrity sha512-/WBu3IaQZxE3bs3BhBmR10ipDY4pjN+U4EZgXULa1eqKA0B/Lka/MVoAqhTVYBkkRlCrEGDOU9itrzIgm9Ksng==
-get-stdin@^6.0.0:
- version "6.0.0"
- resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-6.0.0.tgz#9e09bf712b360ab9225e812048f71fde9c89657b"
- integrity sha512-jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g==
-
get-stdin@^8.0.0:
version "8.0.0"
resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-8.0.0.tgz#cbad6a73feb75f6eeb22ba9e01f89aa28aa97a53"
@@ -8979,6 +9007,13 @@ get-symbol-description@^1.0.2:
es-errors "^1.3.0"
get-intrinsic "^1.2.4"
+get-tsconfig@^4.5.0:
+ version "4.7.6"
+ resolved "https://registry.yarnpkg.com/get-tsconfig/-/get-tsconfig-4.7.6.tgz#118fd5b7b9bae234cc7705a00cd771d7eb65d62a"
+ integrity sha512-ZAqrLlu18NbDdRaHq+AKXzAmqIUPswPWKUchfytdAjiRFnCe5ojG2bstg6mRiZabkKfCoL/e98pbBELIV/YCeA==
+ dependencies:
+ resolve-pkg-maps "^1.0.0"
+
get-uri@^6.0.1:
version "6.0.3"
resolved "https://registry.yarnpkg.com/get-uri/-/get-uri-6.0.3.tgz#0d26697bc13cf91092e519aa63aa60ee5b6f385a"
@@ -9085,6 +9120,13 @@ glob-parent@^5.1.2, glob-parent@~5.1.2:
dependencies:
is-glob "^4.0.1"
+glob-parent@^6.0.2:
+ version "6.0.2"
+ resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3"
+ integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==
+ dependencies:
+ is-glob "^4.0.3"
+
glob-stream@^6.1.0:
version "6.1.0"
resolved "https://registry.yarnpkg.com/glob-stream/-/glob-stream-6.1.0.tgz#7045c99413b3eb94888d83ab46d0b404cc7bdde4"
@@ -9192,11 +9234,18 @@ globals-docs@^2.4.0:
resolved "https://registry.yarnpkg.com/globals-docs/-/globals-docs-2.4.1.tgz#d16887709f4a15eb22d97e96343591f87a2ee3db"
integrity sha512-qpPnUKkWnz8NESjrCvnlGklsgiQzlq+rcCxoG5uNQ+dNA7cFMCmn231slLAwS2N/PlkzZ3COL8CcS10jXmLHqg==
-globals@^11.1.0, globals@^11.7.0:
+globals@^11.1.0:
version "11.12.0"
resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
+globals@^13.19.0:
+ version "13.24.0"
+ resolved "https://registry.yarnpkg.com/globals/-/globals-13.24.0.tgz#8432a19d78ce0c1e833949c36adb345400bb1171"
+ integrity sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==
+ dependencies:
+ type-fest "^0.20.2"
+
globals@^9.18.0:
version "9.18.0"
resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
@@ -9276,11 +9325,16 @@ got@^11.8.5:
p-cancelable "^2.0.0"
responselike "^2.0.0"
-graceful-fs@^4.0.0, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.6, graceful-fs@^4.2.9:
+graceful-fs@^4.0.0, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9:
version "4.2.11"
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
+grapheme-splitter@^1.0.4:
+ version "1.0.4"
+ resolved "https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz#9cf3a665c6247479896834af35cf1dbb4400767e"
+ integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==
+
graphemer@^1.4.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/graphemer/-/graphemer-1.4.0.tgz#fb2f1d55e0e3a1849aeffc90c4fa0dd53a0e66c6"
@@ -9426,7 +9480,7 @@ has-values@^1.0.0:
is-number "^3.0.0"
kind-of "^4.0.0"
-has@^1.0.0, has@^1.0.1, has@^1.0.3, has@~1.0.3:
+has@^1.0.0, has@^1.0.3, has@~1.0.3:
version "1.0.4"
resolved "https://registry.yarnpkg.com/has/-/has-1.0.4.tgz#2eb2860e000011dae4f1406a86fe80e530fb2ec6"
integrity sha512-qdSAmqLF6209RFj4VVItywPMbm3vWylknmB3nvNiUIs72xAimcM8nVYxYr7ncvZq5qzk9MKIZR8ijqD/1QuYjQ==
@@ -9832,7 +9886,7 @@ humanize-ms@^1.2.1:
dependencies:
ms "^2.0.0"
version "0.4.24"
resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
@@ -9856,11 +9910,6 @@ iferr@^0.1.5:
resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
integrity sha512-DUNFN5j7Tln0D+TxzloUjKB+CtVu6myn0JEFak6dG18mNt9YkQ6lzGCdafwofISZ1lLF3xRHJ98VKy9ynkcFaA==
-ignore@^4.0.6:
- version "4.0.6"
- resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
- integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
-
ignore@^5.1.8, ignore@^5.2.0:
version "5.3.1"
resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.1.tgz#5073e554cd42c5b33b394375f538b8593e34d4ef"
@@ -9876,7 +9925,7 @@ immer@^9.0.21:
resolved "https://registry.yarnpkg.com/immer/-/immer-9.0.21.tgz#1e025ea31a40f24fb064f1fef23e931496330176"
integrity sha512-bc4NBHqOqSfRW7POMkHd51LvClaeMXpm8dx0e8oE2GORbq5aRK7Bxl4FyzVLdGtLmvLKL7BTDBG5ACQm4HWjTA==
-import-fresh@^3.0.0, import-fresh@^3.2.1, import-fresh@^3.3.0:
+import-fresh@^3.2.1, import-fresh@^3.3.0:
version "3.3.0"
resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"
integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==
@@ -9958,25 +10007,6 @@ inline-source-map@~0.6.0:
dependencies:
source-map "~0.5.3"
-inquirer@^6.2.2:
- version "6.5.2"
- resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.5.2.tgz#ad50942375d036d327ff528c08bd5fab089928ca"
- integrity sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==
- dependencies:
- ansi-escapes "^3.2.0"
- chalk "^2.4.2"
- cli-cursor "^2.1.0"
- cli-width "^2.0.0"
- external-editor "^3.0.3"
- figures "^2.0.0"
- lodash "^4.17.12"
- mute-stream "0.0.7"
- run-async "^2.2.0"
- rxjs "^6.4.0"
- string-width "^2.1.0"
- strip-ansi "^5.1.0"
- through "^2.3.6"
-
insert-module-globals@^7.0.0:
version "7.2.1"
resolved "https://registry.yarnpkg.com/insert-module-globals/-/insert-module-globals-7.2.1.tgz#d5e33185181a4e1f33b15f7bf100ee91890d5cb3"
@@ -10200,7 +10230,7 @@ is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.1.5, is-callable@^1.2.7:
resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055"
integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==
-is-core-module@^2.13.0, is-core-module@^2.5.0:
+is-core-module@^2.11.0, is-core-module@^2.13.0, is-core-module@^2.13.1, is-core-module@^2.5.0:
version "2.15.0"
resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.15.0.tgz#71c72ec5442ace7e76b306e9d48db361f22699ea"
integrity sha512-Dd+Lb2/zvk9SKy1TGCt1wFJFo/MWBPMX5x7KcvLajWTGuomczdQX61PvY5yK6SVACwpoexWo81IfFyoKY2QnTA==
@@ -10394,6 +10424,11 @@ is-path-inside@^2.1.0:
dependencies:
path-is-inside "^1.0.2"
+is-path-inside@^3.0.3:
+ version "3.0.3"
+ resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
+ integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==
+
is-plain-obj@^1.0.0, is-plain-obj@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
@@ -11088,7 +11123,7 @@ js-tokens@^3.0.2:
resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
integrity sha512-RjTcuD4xjtthQkaWH7dFlH85L+QaVtSoOyGdZ3g6HFhS9dFNDfLyqgm2NFe2X6cQpeFmt0452FJjFG5UameExg==
-js-yaml@^3.10.0, js-yaml@^3.13.0, js-yaml@^3.13.1:
+js-yaml@^3.10.0, js-yaml@^3.13.1:
version "3.14.1"
resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
@@ -11297,11 +11332,6 @@ [email protected]:
resolved "https://registry.yarnpkg.com/jsts/-/jsts-2.7.1.tgz#a921c0cc9eefeef588bd53e952e0a7782d812d52"
integrity sha512-x2wSZHEBK20CY+Wy+BPE7MrFQHW6sIsdaGUMEqmGAio+3gFzQaBYPwLRonUfQf9Ak8pBieqj9tUofX1+WtAEIg==
-jsx-ast-utils@^1.3.4:
- version "1.4.1"
- resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-1.4.1.tgz#3867213e8dd79bf1e8f2300c0cfc1efb182c0df1"
- integrity sha512-0LwSmMlQjjUdXsdlyYhEfBJCn2Chm0zgUBmfmf1++KUULh+JOdlzrZfiwe2zmlVJx44UF+KX/B/odBoeK9hxmw==
-
"jsx-ast-utils@^2.4.1 || ^3.0.0":
version "3.3.5"
resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz#4766bd05a8e2a11af222becd19e15575e52a853a"
@@ -11403,13 +11433,13 @@ leven@^3.1.0:
resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2"
integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==
-levn@^0.3.0, levn@~0.3.0:
- version "0.3.0"
- resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
- integrity sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==
+levn@^0.4.1:
+ version "0.4.1"
+ resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade"
+ integrity sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==
dependencies:
- prelude-ls "~1.1.2"
- type-check "~0.3.2"
+ prelude-ls "^1.2.1"
+ type-check "~0.4.0"
lines-and-columns@^1.1.6:
version "1.2.4"
@@ -11541,6 +11571,11 @@ lodash.memoize@~3.0.3:
resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-3.0.4.tgz#2dcbd2c287cbc0a55cc42328bd0c736150d53e3f"
integrity sha512-eDn9kqrAmVUC1wmZvlQ6Uhde44n+tXpqPrN8olQJbttgh0oKclk+SF54P47VEGE9CEiMeRwAP8BaM7UHvBkz2A==
+lodash.merge@^4.6.2:
+ version "4.6.2"
+ resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
+ integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
+
lodash.pick@^4.4.0:
version "4.4.0"
resolved "https://registry.yarnpkg.com/lodash.pick/-/lodash.pick-4.4.0.tgz#52f05610fff9ded422611441ed1fc123a03001b3"
@@ -11571,7 +11606,7 @@ lodash.xor@^4.5.0:
resolved "https://registry.yarnpkg.com/lodash.xor/-/lodash.xor-4.5.0.tgz#4d48ed7e98095b0632582ba714d3ff8ae8fb1db6"
integrity sha512-sVN2zimthq7aZ5sPGXnSz32rZPuqcparVW50chJQe+mzTYV+IsxSsl/2gnkWWE2Of7K3myBQBqtLKOUEHJKRsQ==
[email protected], lodash@^4.0.1, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4:
[email protected], lodash@^4.0.1, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4:
version "4.17.19"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b"
integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==
@@ -12127,11 +12162,6 @@ mime@^2.2.0, mime@^2.4.4:
resolved "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz#a2a682a95cd4d0cb1d6257e28f83da7e35800367"
integrity sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==
-mimic-fn@^1.0.0:
- version "1.2.0"
- resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
- integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==
-
mimic-fn@^2.0.0, mimic-fn@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
@@ -12179,7 +12209,7 @@ minimalistic-crypto-utils@^1.0.1:
resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
integrity sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==
-"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.4, minimatch@^3.1.1, minimatch@^3.1.2:
+"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
version "3.1.2"
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
@@ -12435,11 +12465,6 @@ murmurhash-js@^1.0.0:
resolved "https://registry.yarnpkg.com/murmurhash-js/-/murmurhash-js-1.0.0.tgz#b06278e21fc6c37fa5313732b0412bcb6ae15f51"
integrity sha512-TvmkNhkv8yct0SVBSy+o8wYzXjE4Zz3PCesbfs8HiCXXdcTuocApFv11UWlNFWKYsP2okqrhb7JNlSm9InBhIw==
- version "0.0.7"
- resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
- integrity sha512-r65nCZhrbXXb6dXOACihYApHw2Q6pV0M3V0PSxd74N0+D8nzAdEAITq2oAjA1jVnKI+tGvEBUpqiMh0+rW6zDQ==
-
nan@^2.12.1, nan@^2.17.0:
version "2.20.0"
resolved "https://registry.yarnpkg.com/nan/-/nan-2.20.0.tgz#08c5ea813dd54ed16e5bd6505bf42af4f7838ca3"
@@ -12854,7 +12879,7 @@ object.entries@^1.1.1, object.entries@^1.1.8:
define-properties "^1.2.1"
es-object-atoms "^1.0.0"
-object.fromentries@^2.0.8:
+object.fromentries@^2.0.7, object.fromentries@^2.0.8:
version "2.0.8"
resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.8.tgz#f7195d8a9b97bd95cbc1999ea939ecd1a2b00c65"
integrity sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==
@@ -12877,6 +12902,15 @@ object.getownpropertydescriptors@^2.0.3:
gopd "^1.0.1"
safe-array-concat "^1.1.2"
+object.groupby@^1.0.1:
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/object.groupby/-/object.groupby-1.0.3.tgz#9b125c36238129f6f7b61954a1e7176148d5002e"
+ integrity sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==
+ dependencies:
+ call-bind "^1.0.7"
+ define-properties "^1.2.1"
+ es-abstract "^1.23.2"
+
object.pick@^1.3.0:
version "1.3.0"
resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
@@ -12884,7 +12918,7 @@ object.pick@^1.3.0:
dependencies:
isobject "^3.0.1"
-object.values@^1.1.1, object.values@^1.1.6, object.values@^1.2.0:
+object.values@^1.1.1, object.values@^1.1.6, object.values@^1.1.7, object.values@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.2.0.tgz#65405a9d92cee68ac2d303002e0b8470a4d9ab1b"
integrity sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ==
@@ -12922,13 +12956,6 @@ once@^1.3.0, once@^1.3.1, once@^1.3.2, once@^1.4.0:
dependencies:
wrappy "1"
-onetime@^2.0.0:
- version "2.0.1"
- resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
- integrity sha512-oyyPpiMaKARvvcgip+JV+7zci5L8D1W9RZIz2l1o08AM3pfspitVWnPt3mzHcBPp12oYMTy0pqrFs/C+m3EwsQ==
- dependencies:
- mimic-fn "^1.0.0"
-
onetime@^5.1.2:
version "5.1.2"
resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e"
@@ -12948,17 +12975,17 @@ opn@^5.5.0:
dependencies:
is-wsl "^1.1.0"
-optionator@^0.8.2:
- version "0.8.3"
- resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
- integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==
+optionator@^0.9.3:
+ version "0.9.4"
+ resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.4.tgz#7ea1c1a5d91d764fb282139c88fe11e182a3a734"
+ integrity sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==
dependencies:
- deep-is "~0.1.3"
- fast-levenshtein "~2.0.6"
- levn "~0.3.0"
- prelude-ls "~1.1.2"
- type-check "~0.3.2"
- word-wrap "~1.2.3"
+ deep-is "^0.1.3"
+ fast-levenshtein "^2.0.6"
+ levn "^0.4.1"
+ prelude-ls "^1.2.1"
+ type-check "^0.4.0"
+ word-wrap "^1.2.5"
ordered-read-streams@^1.0.0:
version "1.0.1"
@@ -12981,11 +13008,6 @@ os-locale@^3.0.0:
lcid "^2.0.0"
mem "^4.0.0"
-os-tmpdir@~1.0.2:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
- integrity sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==
-
outpipe@^1.1.0:
version "1.1.1"
resolved "https://registry.yarnpkg.com/outpipe/-/outpipe-1.1.1.tgz#50cf8616365e87e031e29a5ec9339a3da4725fa2"
@@ -13652,10 +13674,10 @@ prebuild-install@^7.1.1:
tar-fs "^2.0.0"
tunnel-agent "^0.6.0"
-prelude-ls@~1.1.2:
- version "1.1.2"
- resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
- integrity sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==
+prelude-ls@^1.2.1:
+ version "1.2.1"
+ resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
+ integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
prepend-http@^1.0.0:
version "1.0.4"
@@ -13669,10 +13691,10 @@ prettier-linter-helpers@^1.0.0:
dependencies:
fast-diff "^1.1.2"
- version "1.19.1"
- resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb"
- integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==
+ version "2.8.8"
+ resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da"
+ integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==
pretty-error@^2.1.1:
version "2.1.2"
@@ -13744,7 +13766,7 @@ progress-bar-webpack-plugin@^2.1.0:
chalk "^3.0.0"
progress "^2.0.3"
-progress@^2.0.0, progress@^2.0.3:
+progress@^2.0.3:
version "2.0.3"
resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
@@ -14672,11 +14694,6 @@ regexp.prototype.flags@^1.5.1, regexp.prototype.flags@^1.5.2:
es-errors "^1.3.0"
set-function-name "^2.0.1"
-regexpp@^2.0.1:
- version "2.0.1"
- resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f"
- integrity sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==
-
regexpu-core@^5.3.1:
version "5.3.2"
resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.3.2.tgz#11a2b06884f3527aec3e93dbbf4a3b958a95546b"
@@ -14990,6 +15007,11 @@ resolve-options@^1.1.0:
dependencies:
value-or-function "^3.0.0"
+resolve-pkg-maps@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz#616b3dc2c57056b5588c31cdf4b3d64db133720f"
+ integrity sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==
+
resolve-protobuf-schema@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/resolve-protobuf-schema/-/resolve-protobuf-schema-2.1.0.tgz#9ca9a9e69cf192bbdaf1006ec1973948aa4a3758"
@@ -15012,7 +15034,7 @@ [email protected]:
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
integrity sha512-9znBF0vBcaSN3W2j7wKvdERPwqTxSpCq+if5C0WoTCyV9n24rua28jeuQ2pL/HOf+yUe/Mef+H/5p60K0Id3bg==
-resolve@^1.1.3, resolve@^1.1.4, resolve@^1.1.6, resolve@^1.10.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.20.0, resolve@^1.4.0, resolve@^1.8.1, resolve@~1.22.6:
+resolve@^1.1.3, resolve@^1.1.4, resolve@^1.1.6, resolve@^1.10.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.20.0, resolve@^1.22.4, resolve@^1.4.0, resolve@^1.8.1, resolve@~1.22.6:
version "1.22.8"
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d"
integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==
@@ -15037,14 +15059,6 @@ responselike@^2.0.0:
dependencies:
lowercase-keys "^2.0.0"
-restore-cursor@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
- integrity sha512-6IzJLuGi4+R14vwagDHX+JrXmPVtPpn4mffDJ1UdR7/Edm87fl6yi8mMBIVvFtJaNTUvjughmW4hwLhRG7gC1Q==
- dependencies:
- onetime "^2.0.0"
- signal-exit "^3.0.2"
-
ret@~0.1.10:
version "0.1.15"
resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
@@ -15060,13 +15074,6 @@ reusify@^1.0.4:
resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
- version "2.6.3"
- resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
- integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==
- dependencies:
- glob "^7.1.3"
-
rimraf@^2.5.4, rimraf@^2.6.3:
version "2.7.1"
resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
@@ -15112,11 +15119,6 @@ rst-selector-parser@^2.2.3:
lodash.flattendeep "^4.4.0"
nearley "^2.7.10"
-run-async@^2.2.0:
- version "2.4.1"
- resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455"
- integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==
-
run-parallel@^1.1.9:
version "1.2.0"
resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee"
@@ -15136,13 +15138,6 @@ rw@1, rw@^1.3.3:
resolved "https://registry.yarnpkg.com/rw/-/rw-1.3.3.tgz#3f862dfa91ab766b14885ef4d01124bfda074fb4"
integrity sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ==
-rxjs@^6.4.0:
- version "6.6.7"
- resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9"
- integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==
- dependencies:
- tslib "^1.9.0"
-
s2-geometry@^1.2.10:
version "1.2.10"
resolved "https://registry.yarnpkg.com/s2-geometry/-/s2-geometry-1.2.10.tgz#c6ff22f3eccafd0eea491b60b44c141b9887acab"
@@ -15275,7 +15270,7 @@ selfsigned@^1.10.8:
dependencies:
node-forge "^0.10.0"
-"semver@2 || 3 || 4 || 5", semver@^5.5.0, semver@^5.5.1, semver@^5.6.0, semver@^5.7.0:
+"semver@2 || 3 || 4 || 5", semver@^5.5.0, semver@^5.6.0, semver@^5.7.0:
version "5.7.2"
resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
@@ -15539,15 +15534,6 @@ slash@^3.0.0:
resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
-slice-ansi@^2.1.0:
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636"
- integrity sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==
- dependencies:
- ansi-styles "^3.2.0"
- astral-regex "^1.0.0"
- is-fullwidth-code-point "^2.0.0"
-
slice-ansi@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz#500e8dd0fd55b05815086255b3195adf2a45fe6b"
@@ -16019,7 +16005,7 @@ string-width@^1.0.1:
is-fullwidth-code-point "^3.0.0"
strip-ansi "^6.0.1"
-string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1:
+string-width@^2.0.0, string-width@^2.1.1:
version "2.1.1"
resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
@@ -16445,16 +16431,6 @@ table-layout@^4.1.0:
array-back "^6.2.2"
wordwrapjs "^5.1.0"
-table@^5.2.3:
- version "5.4.6"
- resolved "https://registry.yarnpkg.com/table/-/table-5.4.6.tgz#1292d19500ce3f86053b05f0e8e7e4a3bb21079e"
- integrity sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==
- dependencies:
- ajv "^6.10.2"
- lodash "^4.17.14"
- slice-ansi "^2.1.0"
- string-width "^3.0.0"
-
table@^6.6.0:
version "6.8.2"
resolved "https://registry.yarnpkg.com/table/-/table-6.8.2.tgz#c5504ccf201213fa227248bdc8c5569716ac6c58"
@@ -16495,6 +16471,11 @@ tapable@^1.0.0, tapable@^1.1.3:
resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
+tapable@^2.2.0:
+ version "2.2.1"
+ resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0"
+ integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==
+
tape-catch@^1.0.6:
version "1.0.6"
resolved "https://registry.yarnpkg.com/tape-catch/-/tape-catch-1.0.6.tgz#12931d5ea60a03a97d9bd19d0d7d8cfc3f6cecf1"
@@ -16665,7 +16646,7 @@ through2@^4.0.2:
dependencies:
readable-stream "3"
-through@2, "through@>=2.2.7 <3", through@^2.3.4, through@^2.3.6, through@^2.3.8:
+through@2, "through@>=2.2.7 <3", through@^2.3.4, through@^2.3.8:
version "2.3.8"
resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==
@@ -16723,13 +16704,6 @@ tippy.js@^6.3.1:
dependencies:
"@popperjs/core" "^2.9.0"
-tmp@^0.0.33:
- version "0.0.33"
- resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
- integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==
- dependencies:
- os-tmpdir "~1.0.2"
-
version "1.0.5"
resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc"
@@ -16879,7 +16853,17 @@ tryer@^1.0.1:
resolved "https://registry.yarnpkg.com/tryer/-/tryer-1.0.1.tgz#f2c85406800b9b0f74c9f7465b81eaad241252f8"
integrity sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA==
-tslib@^1.10.0, tslib@^1.8.1, tslib@^1.9.0:
+tsconfig-paths@^3.15.0:
+ version "3.15.0"
+ resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz#5299ec605e55b1abb23ec939ef15edaf483070d4"
+ integrity sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==
+ dependencies:
+ "@types/json5" "^0.0.29"
+ json5 "^1.0.2"
+ minimist "^1.2.6"
+ strip-bom "^3.0.0"
+
+tslib@^1.10.0, tslib@^1.8.1:
version "1.14.1"
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
@@ -16889,7 +16873,7 @@ tslib@^2.0.0, tslib@^2.0.1, tslib@^2.0.3, tslib@^2.4.0, tslib@^2.5.3, tslib@^2.6
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.3.tgz#0438f810ad7a9edcde7a241c3d80db693c8cbfe0"
integrity sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==
-tsutils@^3.17.1, tsutils@^3.21.0:
+tsutils@^3.21.0:
version "3.21.0"
resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623"
integrity sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==
@@ -16923,12 +16907,12 @@ [email protected]:
resolved "https://registry.yarnpkg.com/type-analyzer/-/type-analyzer-0.4.0.tgz#56621f23b832468d358080466a2d41e142c8078a"
integrity sha512-vLj0uKCCZYqtkFoQwf7mIvRQopDc2R4mdADLuX1uhtOm5MjtksHMiatI1TW+n0r7vDZLAMgW5VKGKlVTwbcAhg==
-type-check@~0.3.2:
- version "0.3.2"
- resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
- integrity sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==
+type-check@^0.4.0, type-check@~0.4.0:
+ version "0.4.0"
+ resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
+ integrity sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==
dependencies:
- prelude-ls "~1.1.2"
+ prelude-ls "^1.2.1"
version "4.0.8"
@@ -16945,6 +16929,11 @@ type-fest@^0.18.0:
resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.18.1.tgz#db4bc151a4a2cf4eebf9add5db75508db6cc841f"
integrity sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==
+type-fest@^0.20.2:
+ version "0.20.2"
+ resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
+ integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==
+
type-fest@^0.21.3:
version "0.21.3"
resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37"
@@ -18055,7 +18044,7 @@ wide-align@^1.1.5:
dependencies:
string-width "^1.0.2 || 2 || 3 || 4"
-word-wrap@~1.2.3:
+word-wrap@^1.2.5:
version "1.2.5"
resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34"
integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==
@@ -18135,13 +18124,6 @@ write-file-atomic@^4.0.2:
imurmurhash "^0.1.4"
signal-exit "^3.0.7"
- version "1.0.3"
- resolved "https://registry.yarnpkg.com/write/-/write-1.0.3.tgz#0800e14523b923a387e415123c865616aae0f5c3"
- integrity sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==
- dependencies:
- mkdirp "^0.5.1"
-
ws@^6.0.0, ws@^6.2.1:
version "6.2.3"
resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.3.tgz#ccc96e4add5fd6fedbc491903075c85c5a11d9ee"