diff --git a/package.json b/package.json index 1964be51ed..15978ce35b 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,8 @@ "./src/processors", "./src/tasks", "./src/actions", - "./src/reducers" + "./src/reducers", + "./src/components" ], "repository": { "type": "git", diff --git a/src/actions/src/provider-actions.ts b/src/actions/src/provider-actions.ts index 3271fd120f..c2dc77bb73 100644 --- a/src/actions/src/provider-actions.ts +++ b/src/actions/src/provider-actions.ts @@ -21,7 +21,7 @@ import {createAction} from '@reduxjs/toolkit'; import {ACTION_PREFIX} from './action-types'; import {ExportFileOptions, ExportFileToCloudPayload, OnErrorCallBack, OnSuccessCallBack} from '@kepler.gl/types'; -import {MapListItem, Provider} from 'cloud-providers'; +import {MapListItem, Provider} from '@kepler.gl/cloud-providers'; // eslint-disable-next-line prettier/prettier const assignType = (obj: T): { [K in keyof T]: `${typeof ACTION_PREFIX}${string & K}`; } => obj as any diff --git a/src/actions/tsconfig.production.json b/src/actions/tsconfig.production.json index 177b417006..9edef1c338 100644 --- a/src/actions/tsconfig.production.json +++ b/src/actions/tsconfig.production.json @@ -22,9 +22,9 @@ "strict": true, "resolveJsonModule": true, "isolatedModules": true, - "baseUrl": "../../src", //TODO change once all dependencies are isolated + "baseUrl": "./src", "paths": { - "@kepler.gl/actions": ["actions/src"] //TODO change once all dependencies are isolated + "*": ["*"] } }, "include": [ diff --git a/src/cloud-providers/package.json b/src/cloud-providers/package.json index d3d26509e1..1dda33c58b 100644 --- a/src/cloud-providers/package.json +++ b/src/cloud-providers/package.json @@ -5,7 +5,7 @@ "description": "kepler.gl constants used by kepler.gl components, actions and reducers", "license": "MIT", "main": "dist/index.js", - "types": "dist/cloud-providers/src/index.d.ts", + "types": "dist/index.d.ts", "keywords": [ "babel", "es6", diff --git a/src/cloud-providers/src/base.tsx b/src/cloud-providers/src/base.tsx new file mode 100644 index 0000000000..5229190661 --- /dev/null +++ b/src/cloud-providers/src/base.tsx @@ -0,0 +1,95 @@ +// Copyright (c) 2022 Uber Technologies, Inc. +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. + +import React, {Component, CSSProperties} from 'react'; + +const getStyleClassFromColor = (totalColor: number, colors: string[]) => + new Array(totalColor) + .fill(1) + .reduce((accu, c, i) => `${accu}.cr${i + 1} {fill:${colors[i % colors.length]};}`, ''); + +const nop = () => {}; + +export type BaseProps = { + /** Set the height of the icon, ex. '16px' */ + height?: string; + /** Set the width of the icon, ex. '16px' */ + width?: string; + /** Set the viewbox of the svg */ + viewBox?: string; + /** Path element */ + + predefinedClassName?: string; + className?: string; + style?: CSSProperties; + colors?: string[]; + totalColor?: number; +} & React.SVGAttributes & + React.DOMAttributes; + +export class Base extends Component { + static displayName = 'Base Icon'; + + static defaultProps = { + height: null, + width: null, + viewBox: '0 0 64 64', + predefinedClassName: '', + className: '', + style: { + fill: 'currentColor' + } + }; + + render() { + const { + height, + width, + viewBox, + style, + children, + predefinedClassName, + className, + colors, + totalColor, + ...props + } = this.props; + const svgHeight = height; + const svgWidth = width || svgHeight; + + const fillStyle = + Array.isArray(colors) && totalColor && getStyleClassFromColor(totalColor, colors); + + return ( + + {fillStyle ? : null} + {children} + + ); + } +} diff --git a/src/cloud-providers/src/index.ts b/src/cloud-providers/src/index.ts index 8dc0e64394..7ce74f8873 100644 --- a/src/cloud-providers/src/index.ts +++ b/src/cloud-providers/src/index.ts @@ -21,3 +21,4 @@ export {default as Provider, FILE_CONFLICT_MSG} from './provider'; // eslint-disable-next-line prettier/prettier export type {MapListItem, Millisecond, Thumbnail, ProviderProps, IconProps} from './provider'; +export {default as Upload} from './upload'; diff --git a/src/cloud-providers/src/provider.ts b/src/cloud-providers/src/provider.ts index add52ccbd5..52ad26ed10 100644 --- a/src/cloud-providers/src/provider.ts +++ b/src/cloud-providers/src/provider.ts @@ -18,7 +18,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -import {Upload} from 'components/common/icons'; +import Upload from './upload'; import {MapData, ExportFileOptions} from '@kepler.gl/types'; import {ComponentType} from 'react'; diff --git a/src/components/common/icons/upload.tsx b/src/cloud-providers/src/upload.tsx similarity index 97% rename from src/components/common/icons/upload.tsx rename to src/cloud-providers/src/upload.tsx index 4b1a0586c2..ffa28a703a 100644 --- a/src/components/common/icons/upload.tsx +++ b/src/cloud-providers/src/upload.tsx @@ -19,7 +19,7 @@ // THE SOFTWARE. import React, {Component} from 'react'; -import Base, {BaseProps} from './base'; +import {Base, BaseProps} from './base'; export default class Upload extends Component> { static defaultProps = { diff --git a/src/cloud-providers/tsconfig.production.json b/src/cloud-providers/tsconfig.production.json index 0a985eaef0..3852e6a4d8 100644 --- a/src/cloud-providers/tsconfig.production.json +++ b/src/cloud-providers/tsconfig.production.json @@ -22,9 +22,9 @@ "strict": true, "resolveJsonModule": true, "isolatedModules": true, - "baseUrl": "../../src", //TODO change once all dependencies are isolated + "baseUrl": "./src", "paths": { - "@kepler.gl/cloud-providers": ["cloud-providers/src"] //TODO change once all dependencies are isolated + "*": ["*"] } }, "include": [ diff --git a/src/components/babel.config.js b/src/components/babel.config.js new file mode 100644 index 0000000000..88f5904f15 --- /dev/null +++ b/src/components/babel.config.js @@ -0,0 +1,65 @@ +// Copyright (c) 2022 Uber Technologies, Inc. +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. + +const KeplerPackage = require('./package'); + +const PRESETS = ['@babel/preset-env', '@babel/preset-react', '@babel/preset-typescript']; +const PLUGINS = [ + ['@babel/plugin-transform-typescript', {isTSX: true, allowDeclareFields: true}], + '@babel/plugin-transform-modules-commonjs', + '@babel/plugin-proposal-class-properties', + '@babel/plugin-proposal-optional-chaining', + [ + '@babel/transform-runtime', + { + regenerator: true + } + ], + [ + 'search-and-replace', + { + rules: [ + { + search: '__PACKAGE_VERSION__', + replace: KeplerPackage.version + } + ] + } + ] +]; +const ENV = { + test: { + plugins: ['istanbul'] + }, + debug: { + sourceMaps: 'inline', + retainLines: true + } +}; + +module.exports = function babel(api) { + api.cache(true); + + return { + presets: PRESETS, + plugins: PLUGINS, + env: ENV + }; +}; diff --git a/src/components/common/index.ts b/src/components/common/index.ts deleted file mode 100644 index 4fbed5a8df..0000000000 --- a/src/components/common/index.ts +++ /dev/null @@ -1,3 +0,0 @@ -/* eslint-disable prettier/prettier */ -export * as Icons from './icons'; -export * from './styled-components'; diff --git a/src/components/package.json b/src/components/package.json new file mode 100644 index 0000000000..bd1b0454ff --- /dev/null +++ b/src/components/package.json @@ -0,0 +1,47 @@ +{ + "name": "@kepler.gl/components", + "author": "Shan He ", + "version": "2.5.5", + "description": "kepler.gl constants used by kepler.gl components, actions and reducers", + "license": "MIT", + "main": "dist/index.js", + "types": "dist/index.d.ts", + "keywords": [ + "babel", + "es6", + "react", + "webgl", + "visualization", + "deck.gl" + ], + "repository": { + "type": "git", + "url": "https://github.com/keplergl/kepler.gl.git" + }, + "scripts": { + "build": "rm -fr dist && babel src --out-dir dist --source-maps inline --extensions '.ts,.tsx,.js,.jsx' --ignore '**/*.d.ts'", + "build:umd": "webpack --config ./webpack/umd.js --progress --env.prod", + "build:types": "tsc --project ./tsconfig.production.json", + "prepublish": "uber-licence && yarn build && yarn build:types", + "stab": "mkdir -p dist && touch dist/index.js" + }, + "files": [ + "dist", + "umd" + ], + "nyc": { + "sourceMap": false, + "instrument": false + }, + "engines": { + "node": ">=12.0.0" + }, + "maintainers": [ + "Shan He ", + "Giuseppe Macri " + ], + "volta": { + "node": "12.22.0", + "yarn": "1.22.17" + } +} diff --git a/src/components/bottom-widget.tsx b/src/components/src/bottom-widget.tsx similarity index 100% rename from src/components/bottom-widget.tsx rename to src/components/src/bottom-widget.tsx diff --git a/src/components/common/action-panel.tsx b/src/components/src/common/action-panel.tsx similarity index 98% rename from src/components/common/action-panel.tsx rename to src/components/src/common/action-panel.tsx index 1d75e87421..3047d57a7c 100644 --- a/src/components/common/action-panel.tsx +++ b/src/components/src/common/action-panel.tsx @@ -21,8 +21,8 @@ import React, {useCallback, PropsWithChildren, ElementType, CSSProperties, ReactNode} from 'react'; import styled from 'styled-components'; import classnames from 'classnames'; -import {ArrowRight} from 'components/common/icons'; -import Checkbox from 'components/common/switch'; +import {ArrowRight} from './icons'; +import Checkbox from './switch'; export type ActionPanelProps = PropsWithChildren<{ color?: string; diff --git a/src/components/common/animation-control/animation-control.tsx b/src/components/src/common/animation-control/animation-control.tsx similarity index 97% rename from src/components/common/animation-control/animation-control.tsx rename to src/components/src/common/animation-control/animation-control.tsx index d9abc87eb9..4528a7f919 100644 --- a/src/components/common/animation-control/animation-control.tsx +++ b/src/components/src/common/animation-control/animation-control.tsx @@ -22,8 +22,8 @@ import React, {useCallback, useMemo} from 'react'; import styled from 'styled-components'; import classnames from 'classnames'; -import Slider from 'components/common/slider/slider'; -import {BottomWidgetInner} from 'components/common/styled-components'; +import Slider from '../slider/slider'; +import {BottomWidgetInner} from '../styled-components'; import PlaybackControlsFactory from './playback-controls'; import FloatingTimeDisplayFactory from './floating-time-display'; import {datetimeFormatter, snapToMarks} from '@kepler.gl/utils'; diff --git a/src/components/common/animation-control/animation-controller.ts b/src/components/src/common/animation-control/animation-controller.ts similarity index 100% rename from src/components/common/animation-control/animation-controller.ts rename to src/components/src/common/animation-control/animation-controller.ts diff --git a/src/components/common/animation-control/animation-speed-slider.tsx b/src/components/src/common/animation-control/animation-speed-slider.tsx similarity index 97% rename from src/components/common/animation-control/animation-speed-slider.tsx rename to src/components/src/common/animation-control/animation-speed-slider.tsx index d71965103e..9892246e5d 100644 --- a/src/components/common/animation-control/animation-speed-slider.tsx +++ b/src/components/src/common/animation-control/animation-speed-slider.tsx @@ -20,7 +20,7 @@ import React, {Component, ComponentType} from 'react'; import styled from 'styled-components'; -import RangeSliderFactory from 'components/common/range-slider'; +import RangeSliderFactory from '../range-slider'; import onClickOutside from 'react-onclickoutside'; import {SPEED_CONTROL_RANGE, SPEED_CONTROL_STEP} from '@kepler.gl/constants'; diff --git a/src/components/common/animation-control/animation-window-control.tsx b/src/components/src/common/animation-control/animation-window-control.tsx similarity index 94% rename from src/components/common/animation-control/animation-window-control.tsx rename to src/components/src/common/animation-control/animation-window-control.tsx index 0f8fbdd0cb..1c9e66e8b2 100644 --- a/src/components/common/animation-control/animation-window-control.tsx +++ b/src/components/src/common/animation-control/animation-window-control.tsx @@ -1,8 +1,8 @@ import React, {useCallback} from 'react'; -import {FormattedMessage} from 'localization'; +import {FormattedMessage} from '@kepler.gl/localization'; import {ReactComponentLike} from 'prop-types'; import IconButton from '../icon-button'; -import {Tooltip} from 'components/common/styled-components'; +import {Tooltip} from '../styled-components'; export interface AnimationItem { id: string; diff --git a/src/components/common/animation-control/floating-time-display.tsx b/src/components/src/common/animation-control/floating-time-display.tsx similarity index 98% rename from src/components/common/animation-control/floating-time-display.tsx rename to src/components/src/common/animation-control/floating-time-display.tsx index c3582ffc17..1ae985ffbd 100644 --- a/src/components/common/animation-control/floating-time-display.tsx +++ b/src/components/src/common/animation-control/floating-time-display.tsx @@ -21,9 +21,9 @@ import React, {useMemo} from 'react'; import styled from 'styled-components'; import classnames from 'classnames'; -import {Minus} from 'components/common/icons'; +import {Minus} from '../icons'; import {DEFAULT_TIME_FORMAT} from '@kepler.gl/constants'; -import {CenterFlexbox} from 'components/common/styled-components'; +import {CenterFlexbox} from '../../common/styled-components'; import {datetimeFormatter} from '@kepler.gl/utils'; const StyledTimeDisplayWrapper = styled.div.attrs({ diff --git a/src/components/common/animation-control/play-control.tsx b/src/components/src/common/animation-control/play-control.tsx similarity index 91% rename from src/components/common/animation-control/play-control.tsx rename to src/components/src/common/animation-control/play-control.tsx index 0772a273d0..80f8fcdf64 100644 --- a/src/components/common/animation-control/play-control.tsx +++ b/src/components/src/common/animation-control/play-control.tsx @@ -1,7 +1,7 @@ import React from 'react'; import classnames from 'classnames'; -import {FormattedMessage} from 'localization'; -import {Tooltip} from 'components/common/styled-components'; +import {FormattedMessage} from '@kepler.gl/localization'; +import {Tooltip} from '../styled-components'; import IconButton from '../icon-button'; const DELAY_SHOW = 500; diff --git a/src/components/common/animation-control/playback-controls.tsx b/src/components/src/common/animation-control/playback-controls.tsx similarity index 99% rename from src/components/common/animation-control/playback-controls.tsx rename to src/components/src/common/animation-control/playback-controls.tsx index c22a56f2d4..e99c156a79 100644 --- a/src/components/common/animation-control/playback-controls.tsx +++ b/src/components/src/common/animation-control/playback-controls.tsx @@ -21,7 +21,7 @@ import React, {useState, useCallback} from 'react'; import styled from 'styled-components'; import classnames from 'classnames'; -import {Reset, Play, Pause, Save, Rocket, AnchorWindow, FreeWindow} from 'components/common/icons'; +import {Reset, Play, Pause, Save, Rocket, AnchorWindow, FreeWindow} from '../icons'; import {ANIMATION_WINDOW} from '@kepler.gl/constants'; import AnimationSpeedSliderFactory from './animation-speed-slider'; import WindowActionControlFactory from './window-action-control'; diff --git a/src/components/common/animation-control/reset-control.tsx b/src/components/src/common/animation-control/reset-control.tsx similarity index 88% rename from src/components/common/animation-control/reset-control.tsx rename to src/components/src/common/animation-control/reset-control.tsx index a19254e62b..f310790ed8 100644 --- a/src/components/common/animation-control/reset-control.tsx +++ b/src/components/src/common/animation-control/reset-control.tsx @@ -1,6 +1,6 @@ import React from 'react'; -import {FormattedMessage} from 'localization'; -import {Tooltip} from 'components/common/styled-components'; +import {FormattedMessage} from '@kepler.gl/localization'; +import {Tooltip} from '../styled-components'; import IconButton from '../icon-button'; const DELAY_SHOW = 500; diff --git a/src/components/common/animation-control/speed-control.tsx b/src/components/src/common/animation-control/speed-control.tsx similarity index 97% rename from src/components/common/animation-control/speed-control.tsx rename to src/components/src/common/animation-control/speed-control.tsx index 0b212403f1..8abd3b258c 100644 --- a/src/components/common/animation-control/speed-control.tsx +++ b/src/components/src/common/animation-control/speed-control.tsx @@ -20,7 +20,7 @@ import React from 'react'; import styled from 'styled-components'; -import {Tooltip} from 'components/common/styled-components'; +import {Tooltip} from '../styled-components'; import IconButton from '../icon-button'; import {media} from '@kepler.gl/styles'; import {preciseRound} from '@kepler.gl/utils'; diff --git a/src/components/common/animation-control/window-action-control.tsx b/src/components/src/common/animation-control/window-action-control.tsx similarity index 92% rename from src/components/common/animation-control/window-action-control.tsx rename to src/components/src/common/animation-control/window-action-control.tsx index eb934996e7..225193e89f 100644 --- a/src/components/common/animation-control/window-action-control.tsx +++ b/src/components/src/common/animation-control/window-action-control.tsx @@ -1,7 +1,7 @@ import React, {useMemo} from 'react'; import classnames from 'classnames'; -import {FormattedMessage} from 'localization'; -import {Tooltip} from 'components/common/styled-components'; +import {FormattedMessage} from '@kepler.gl/localization'; +import {Tooltip} from '../styled-components'; import IconButton from '../icon-button'; const DELAY_SHOW = 500; diff --git a/src/components/common/checkbox.tsx b/src/components/src/common/checkbox.tsx similarity index 100% rename from src/components/common/checkbox.tsx rename to src/components/src/common/checkbox.tsx diff --git a/src/components/common/color-legend.tsx b/src/components/src/common/color-legend.tsx similarity index 100% rename from src/components/common/color-legend.tsx rename to src/components/src/common/color-legend.tsx diff --git a/src/components/common/data-table/button.tsx b/src/components/src/common/data-table/button.tsx similarity index 100% rename from src/components/common/data-table/button.tsx rename to src/components/src/common/data-table/button.tsx diff --git a/src/components/common/data-table/canvas.tsx b/src/components/src/common/data-table/canvas.tsx similarity index 100% rename from src/components/common/data-table/canvas.tsx rename to src/components/src/common/data-table/canvas.tsx diff --git a/src/components/common/data-table/cell-size.ts b/src/components/src/common/data-table/cell-size.ts similarity index 100% rename from src/components/common/data-table/cell-size.ts rename to src/components/src/common/data-table/cell-size.ts diff --git a/src/components/common/data-table/grid.tsx b/src/components/src/common/data-table/grid.tsx similarity index 100% rename from src/components/common/data-table/grid.tsx rename to src/components/src/common/data-table/grid.tsx diff --git a/src/components/common/data-table/index.tsx b/src/components/src/common/data-table/index.tsx similarity index 99% rename from src/components/common/data-table/index.tsx rename to src/components/src/common/data-table/index.tsx index b6d4154c9d..938dcb7157 100644 --- a/src/components/common/data-table/index.tsx +++ b/src/components/src/common/data-table/index.tsx @@ -31,13 +31,13 @@ import {CellSizeCache} from './cell-size'; import Grid from './grid'; import Button from './button'; -import {ArrowUp, ArrowDown, VertThreeDots} from 'components/common/icons'; +import {ArrowUp, ArrowDown, VertThreeDots} from '../icons'; import {parseFieldValue} from '@kepler.gl/utils'; import {adjustCellsToContainer} from './cell-size'; import {ALL_FIELD_TYPES, SORT_ORDER} from '@kepler.gl/constants'; -import FieldTokenFactory from 'components/common/field-token'; +import FieldTokenFactory from '../field-token'; import {DataContainerInterface} from '@kepler.gl/table'; const defaultHeaderRowHeight = 55; diff --git a/src/components/common/data-table/option-dropdown.tsx b/src/components/src/common/data-table/option-dropdown.tsx similarity index 94% rename from src/components/common/data-table/option-dropdown.tsx rename to src/components/src/common/data-table/option-dropdown.tsx index 3a0ec65583..217edc2366 100644 --- a/src/components/common/data-table/option-dropdown.tsx +++ b/src/components/src/common/data-table/option-dropdown.tsx @@ -20,10 +20,10 @@ import React, {useCallback} from 'react'; import styled from 'styled-components'; -import Portaled from 'components/common/portaled'; -import DropdownList from 'components/common/item-selector/dropdown-list'; +import Portaled from '../portaled'; +import DropdownList from '../item-selector/dropdown-list'; import {SORT_ORDER, TABLE_OPTION, TABLE_OPTION_LIST} from '@kepler.gl/constants'; -import {Pin, ArrowDown, ArrowUp, Clipboard, Cancel} from 'components/common/icons'; +import {ArrowDown, ArrowUp, Clipboard, Pin, Cancel} from '../icons'; const ListItem = ({value}) => (
diff --git a/src/components/common/dataset-label.tsx b/src/components/src/common/dataset-label.tsx similarity index 95% rename from src/components/common/dataset-label.tsx rename to src/components/src/common/dataset-label.tsx index 3b254715a7..5f70365173 100644 --- a/src/components/common/dataset-label.tsx +++ b/src/components/src/common/dataset-label.tsx @@ -20,7 +20,7 @@ import React from 'react'; import styled from 'styled-components'; -import {CenterFlexbox, DatasetSquare} from 'components/common/styled-components'; +import {CenterFlexbox, DatasetSquare} from './styled-components'; import {RGBColor} from '@kepler.gl/types'; const DatasetName = styled.div.attrs({ diff --git a/src/components/common/error-boundary.tsx b/src/components/src/common/error-boundary.tsx similarity index 100% rename from src/components/common/error-boundary.tsx rename to src/components/src/common/error-boundary.tsx diff --git a/src/components/common/field-selector.tsx b/src/components/src/common/field-selector.tsx similarity index 100% rename from src/components/common/field-selector.tsx rename to src/components/src/common/field-selector.tsx diff --git a/src/components/common/field-token.tsx b/src/components/src/common/field-token.tsx similarity index 100% rename from src/components/common/field-token.tsx rename to src/components/src/common/field-token.tsx diff --git a/src/components/common/file-uploader/file-drop.tsx b/src/components/src/common/file-uploader/file-drop.tsx similarity index 100% rename from src/components/common/file-uploader/file-drop.tsx rename to src/components/src/common/file-uploader/file-drop.tsx diff --git a/src/components/common/file-uploader/file-upload-progress.tsx b/src/components/src/common/file-uploader/file-upload-progress.tsx similarity index 98% rename from src/components/common/file-uploader/file-upload-progress.tsx rename to src/components/src/common/file-uploader/file-upload-progress.tsx index 53d2223b6b..02800d933a 100644 --- a/src/components/common/file-uploader/file-upload-progress.tsx +++ b/src/components/src/common/file-uploader/file-upload-progress.tsx @@ -22,7 +22,7 @@ import React from 'react'; import styled, {withTheme} from 'styled-components'; import classnames from 'classnames'; import ProgressBar from '../progress-bar'; -import {TruncatedTitleText} from 'components/common/styled-components'; +import {TruncatedTitleText} from '../styled-components'; import {getError} from '@kepler.gl/utils'; import {FileLoadingProgress} from '@kepler.gl/types'; diff --git a/src/components/common/file-uploader/file-upload.tsx b/src/components/src/common/file-uploader/file-upload.tsx similarity index 98% rename from src/components/common/file-uploader/file-upload.tsx rename to src/components/src/common/file-uploader/file-upload.tsx index 61c7fa88ad..f4f9c25abf 100644 --- a/src/components/common/file-uploader/file-upload.tsx +++ b/src/components/src/common/file-uploader/file-upload.tsx @@ -22,8 +22,8 @@ import React, {Component, createRef} from 'react'; import styled from 'styled-components'; import {injectIntl, WrappedComponentProps} from 'react-intl'; import UploadButton from './upload-button'; -import {DragNDrop, FileType} from 'components/common/icons'; -import FileUploadProgress from 'components/common/file-uploader/file-upload-progress'; +import {DragNDrop, FileType} from '../icons'; +import FileUploadProgress from './file-upload-progress'; import FileDrop from './file-drop'; import {FileLoading, FileLoadingProgress} from '@kepler.gl/types'; diff --git a/src/components/common/file-uploader/upload-button.tsx b/src/components/src/common/file-uploader/upload-button.tsx similarity index 100% rename from src/components/common/file-uploader/upload-button.tsx rename to src/components/src/common/file-uploader/upload-button.tsx diff --git a/src/components/common/histogram-plot.tsx b/src/components/src/common/histogram-plot.tsx similarity index 100% rename from src/components/common/histogram-plot.tsx rename to src/components/src/common/histogram-plot.tsx diff --git a/src/components/common/icon-button.tsx b/src/components/src/common/icon-button.tsx similarity index 100% rename from src/components/common/icon-button.tsx rename to src/components/src/common/icon-button.tsx diff --git a/src/components/common/icons/add.tsx b/src/components/src/common/icons/add.tsx similarity index 100% rename from src/components/common/icons/add.tsx rename to src/components/src/common/icons/add.tsx diff --git a/src/components/common/icons/anchor_window.tsx b/src/components/src/common/icons/anchor_window.tsx similarity index 100% rename from src/components/common/icons/anchor_window.tsx rename to src/components/src/common/icons/anchor_window.tsx diff --git a/src/components/common/icons/arrow-down-alt.tsx b/src/components/src/common/icons/arrow-down-alt.tsx similarity index 100% rename from src/components/common/icons/arrow-down-alt.tsx rename to src/components/src/common/icons/arrow-down-alt.tsx diff --git a/src/components/common/icons/arrow-down-solid.tsx b/src/components/src/common/icons/arrow-down-solid.tsx similarity index 100% rename from src/components/common/icons/arrow-down-solid.tsx rename to src/components/src/common/icons/arrow-down-solid.tsx diff --git a/src/components/common/icons/arrow-down.tsx b/src/components/src/common/icons/arrow-down.tsx similarity index 100% rename from src/components/common/icons/arrow-down.tsx rename to src/components/src/common/icons/arrow-down.tsx diff --git a/src/components/common/icons/arrow-left.tsx b/src/components/src/common/icons/arrow-left.tsx similarity index 100% rename from src/components/common/icons/arrow-left.tsx rename to src/components/src/common/icons/arrow-left.tsx diff --git a/src/components/common/icons/arrow-right.tsx b/src/components/src/common/icons/arrow-right.tsx similarity index 100% rename from src/components/common/icons/arrow-right.tsx rename to src/components/src/common/icons/arrow-right.tsx diff --git a/src/components/common/icons/arrow-up-alt.tsx b/src/components/src/common/icons/arrow-up-alt.tsx similarity index 100% rename from src/components/common/icons/arrow-up-alt.tsx rename to src/components/src/common/icons/arrow-up-alt.tsx diff --git a/src/components/common/icons/arrow-up-solid.tsx b/src/components/src/common/icons/arrow-up-solid.tsx similarity index 100% rename from src/components/common/icons/arrow-up-solid.tsx rename to src/components/src/common/icons/arrow-up-solid.tsx diff --git a/src/components/common/icons/arrow-up.tsx b/src/components/src/common/icons/arrow-up.tsx similarity index 100% rename from src/components/common/icons/arrow-up.tsx rename to src/components/src/common/icons/arrow-up.tsx diff --git a/src/components/common/icons/base.tsx b/src/components/src/common/icons/base.tsx similarity index 100% rename from src/components/common/icons/base.tsx rename to src/components/src/common/icons/base.tsx diff --git a/src/components/common/icons/bug.tsx b/src/components/src/common/icons/bug.tsx similarity index 100% rename from src/components/common/icons/bug.tsx rename to src/components/src/common/icons/bug.tsx diff --git a/src/components/common/icons/cancel.tsx b/src/components/src/common/icons/cancel.tsx similarity index 100% rename from src/components/common/icons/cancel.tsx rename to src/components/src/common/icons/cancel.tsx diff --git a/src/components/common/icons/checkmark.tsx b/src/components/src/common/icons/checkmark.tsx similarity index 100% rename from src/components/common/icons/checkmark.tsx rename to src/components/src/common/icons/checkmark.tsx diff --git a/src/components/common/icons/clipboard.tsx b/src/components/src/common/icons/clipboard.tsx similarity index 100% rename from src/components/common/icons/clipboard.tsx rename to src/components/src/common/icons/clipboard.tsx diff --git a/src/components/common/icons/clock.tsx b/src/components/src/common/icons/clock.tsx similarity index 100% rename from src/components/common/icons/clock.tsx rename to src/components/src/common/icons/clock.tsx diff --git a/src/components/common/icons/close.tsx b/src/components/src/common/icons/close.tsx similarity index 100% rename from src/components/common/icons/close.tsx rename to src/components/src/common/icons/close.tsx diff --git a/src/components/common/icons/code-alt.tsx b/src/components/src/common/icons/code-alt.tsx similarity index 100% rename from src/components/common/icons/code-alt.tsx rename to src/components/src/common/icons/code-alt.tsx diff --git a/src/components/common/icons/copy.tsx b/src/components/src/common/icons/copy.tsx similarity index 100% rename from src/components/common/icons/copy.tsx rename to src/components/src/common/icons/copy.tsx diff --git a/src/components/common/icons/crosshairs.tsx b/src/components/src/common/icons/crosshairs.tsx similarity index 100% rename from src/components/common/icons/crosshairs.tsx rename to src/components/src/common/icons/crosshairs.tsx diff --git a/src/components/common/icons/cube-3d.tsx b/src/components/src/common/icons/cube-3d.tsx similarity index 100% rename from src/components/common/icons/cube-3d.tsx rename to src/components/src/common/icons/cube-3d.tsx diff --git a/src/components/common/icons/cursor-click.tsx b/src/components/src/common/icons/cursor-click.tsx similarity index 100% rename from src/components/common/icons/cursor-click.tsx rename to src/components/src/common/icons/cursor-click.tsx diff --git a/src/components/common/icons/data-table.tsx b/src/components/src/common/icons/data-table.tsx similarity index 100% rename from src/components/common/icons/data-table.tsx rename to src/components/src/common/icons/data-table.tsx diff --git a/src/components/common/icons/db.tsx b/src/components/src/common/icons/db.tsx similarity index 100% rename from src/components/common/icons/db.tsx rename to src/components/src/common/icons/db.tsx diff --git a/src/components/common/icons/delete.tsx b/src/components/src/common/icons/delete.tsx similarity index 100% rename from src/components/common/icons/delete.tsx rename to src/components/src/common/icons/delete.tsx diff --git a/src/components/common/icons/docs.tsx b/src/components/src/common/icons/docs.tsx similarity index 100% rename from src/components/common/icons/docs.tsx rename to src/components/src/common/icons/docs.tsx diff --git a/src/components/common/icons/drag-n-drop.tsx b/src/components/src/common/icons/drag-n-drop.tsx similarity index 100% rename from src/components/common/icons/drag-n-drop.tsx rename to src/components/src/common/icons/drag-n-drop.tsx diff --git a/src/components/common/icons/draw-polygon.tsx b/src/components/src/common/icons/draw-polygon.tsx similarity index 100% rename from src/components/common/icons/draw-polygon.tsx rename to src/components/src/common/icons/draw-polygon.tsx diff --git a/src/components/common/icons/email.tsx b/src/components/src/common/icons/email.tsx similarity index 100% rename from src/components/common/icons/email.tsx rename to src/components/src/common/icons/email.tsx diff --git a/src/components/common/icons/expand.tsx b/src/components/src/common/icons/expand.tsx similarity index 100% rename from src/components/common/icons/expand.tsx rename to src/components/src/common/icons/expand.tsx diff --git a/src/components/common/icons/eye-seen.tsx b/src/components/src/common/icons/eye-seen.tsx similarity index 100% rename from src/components/common/icons/eye-seen.tsx rename to src/components/src/common/icons/eye-seen.tsx diff --git a/src/components/common/icons/eye-unseen.tsx b/src/components/src/common/icons/eye-unseen.tsx similarity index 100% rename from src/components/common/icons/eye-unseen.tsx rename to src/components/src/common/icons/eye-unseen.tsx diff --git a/src/components/common/icons/file-type.tsx b/src/components/src/common/icons/file-type.tsx similarity index 97% rename from src/components/common/icons/file-type.tsx rename to src/components/src/common/icons/file-type.tsx index 934b76a13d..5252a9a48a 100644 --- a/src/components/common/icons/file-type.tsx +++ b/src/components/src/common/icons/file-type.tsx @@ -21,7 +21,7 @@ import React, {ReactNode} from 'react'; import styled from 'styled-components'; -import {File} from 'components/common/icons'; +import {File} from './'; interface FileNameTagProps { fontSize: string; diff --git a/src/components/common/icons/file.tsx b/src/components/src/common/icons/file.tsx similarity index 100% rename from src/components/common/icons/file.tsx rename to src/components/src/common/icons/file.tsx diff --git a/src/components/common/icons/files.tsx b/src/components/src/common/icons/files.tsx similarity index 100% rename from src/components/common/icons/files.tsx rename to src/components/src/common/icons/files.tsx diff --git a/src/components/common/icons/filter-funnel.tsx b/src/components/src/common/icons/filter-funnel.tsx similarity index 100% rename from src/components/common/icons/filter-funnel.tsx rename to src/components/src/common/icons/filter-funnel.tsx diff --git a/src/components/common/icons/free-window.tsx b/src/components/src/common/icons/free-window.tsx similarity index 100% rename from src/components/common/icons/free-window.tsx rename to src/components/src/common/icons/free-window.tsx diff --git a/src/components/common/icons/gear.tsx b/src/components/src/common/icons/gear.tsx similarity index 100% rename from src/components/common/icons/gear.tsx rename to src/components/src/common/icons/gear.tsx diff --git a/src/components/common/icons/hash.tsx b/src/components/src/common/icons/hash.tsx similarity index 100% rename from src/components/common/icons/hash.tsx rename to src/components/src/common/icons/hash.tsx diff --git a/src/components/common/icons/histogram.tsx b/src/components/src/common/icons/histogram.tsx similarity index 100% rename from src/components/common/icons/histogram.tsx rename to src/components/src/common/icons/histogram.tsx diff --git a/src/components/common/icons/index.tsx b/src/components/src/common/icons/index.tsx similarity index 95% rename from src/components/common/icons/index.tsx rename to src/components/src/common/icons/index.tsx index e70a2e7399..566702fad0 100644 --- a/src/components/common/icons/index.tsx +++ b/src/components/src/common/icons/index.tsx @@ -17,6 +17,10 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. +export {default as Base} from './base' + +// eslint-disable-next-line prettier/prettier +export type {BaseProps} from './base' export {default as Add} from './add'; export {default as AnchorWindow} from './anchor_window'; @@ -28,7 +32,6 @@ export {default as ArrowRight} from './arrow-right'; export {default as ArrowUpSolid} from './arrow-up-solid'; export {default as ArrowUpAlt} from './arrow-up-alt'; export {default as ArrowUp} from './arrow-up'; -export {default as Base} from './base'; export {default as Bug} from './bug'; export {default as Cancel} from './cancel'; export {default as Checkmark} from './checkmark'; @@ -36,9 +39,7 @@ export {default as Clipboard} from './clipboard'; export {default as Clock} from './clock'; export {default as Close} from './close'; export {default as Copy} from './copy'; -export {default as Crosshairs} from './crosshairs'; export {default as Cube3d} from './cube-3d'; -export {default as CursorClick} from './cursor-click'; export {default as DataTable} from './data-table'; export {default as Db} from './db'; export {default as Delete} from './delete'; @@ -66,10 +67,8 @@ export {default as Login} from './login'; export {default as Map} from './map'; export {default as MapIcon} from './map-icon'; export {default as Minus} from './minus'; -export {default as Messages} from './messages'; export {default as Pause} from './pause'; export {default as Picture} from './picture'; -export {default as Pin} from './pin'; export {default as Play} from './play'; export {default as Reduce} from './reduce'; export {default as Reset} from './reset'; @@ -81,12 +80,9 @@ export {default as SquareSelect} from './square-select'; export {default as Settings} from './settings'; export {default as Search} from './search'; export {default as Split} from './split'; -export {default as Table} from './table'; export {default as Trash} from './trash'; -export {default as Upload} from './upload'; export {default as VertDots} from './vert-dots'; export {default as VertThreeDots} from './vert-three-dots'; -export {default as IconWrapper} from './base'; export {default as CodeAlt} from './code-alt'; export {default as Warning} from './warning'; export {default as WarningSign} from './warning-sign'; @@ -95,3 +91,7 @@ export {default as Polygon} from './polygon'; export {default as Rectangle} from './rectangle'; export {default as OrderByList} from './order-by-list'; export {default as OrderByDataset} from './order-by-dataset'; +export {default as Messages} from './messages'; +export {default as Crosshairs} from './crosshairs'; +export {default as CursorClick} from './cursor-click'; +export {default as Pin} from './pin'; \ No newline at end of file diff --git a/src/components/common/icons/info.tsx b/src/components/src/common/icons/info.tsx similarity index 100% rename from src/components/common/icons/info.tsx rename to src/components/src/common/icons/info.tsx diff --git a/src/components/common/icons/layers.tsx b/src/components/src/common/icons/layers.tsx similarity index 100% rename from src/components/common/icons/layers.tsx rename to src/components/src/common/icons/layers.tsx diff --git a/src/components/common/icons/left-arrow.tsx b/src/components/src/common/icons/left-arrow.tsx similarity index 100% rename from src/components/common/icons/left-arrow.tsx rename to src/components/src/common/icons/left-arrow.tsx diff --git a/src/components/common/icons/legend.tsx b/src/components/src/common/icons/legend.tsx similarity index 100% rename from src/components/common/icons/legend.tsx rename to src/components/src/common/icons/legend.tsx diff --git a/src/components/common/icons/line-chart.tsx b/src/components/src/common/icons/line-chart.tsx similarity index 100% rename from src/components/common/icons/line-chart.tsx rename to src/components/src/common/icons/line-chart.tsx diff --git a/src/components/common/icons/login.tsx b/src/components/src/common/icons/login.tsx similarity index 100% rename from src/components/common/icons/login.tsx rename to src/components/src/common/icons/login.tsx diff --git a/src/components/common/icons/logout.tsx b/src/components/src/common/icons/logout.tsx similarity index 100% rename from src/components/common/icons/logout.tsx rename to src/components/src/common/icons/logout.tsx diff --git a/src/components/common/icons/map-icon.tsx b/src/components/src/common/icons/map-icon.tsx similarity index 100% rename from src/components/common/icons/map-icon.tsx rename to src/components/src/common/icons/map-icon.tsx diff --git a/src/components/common/icons/map.tsx b/src/components/src/common/icons/map.tsx similarity index 100% rename from src/components/common/icons/map.tsx rename to src/components/src/common/icons/map.tsx diff --git a/src/components/common/icons/messages.tsx b/src/components/src/common/icons/messages.tsx similarity index 100% rename from src/components/common/icons/messages.tsx rename to src/components/src/common/icons/messages.tsx diff --git a/src/components/common/icons/minus.tsx b/src/components/src/common/icons/minus.tsx similarity index 100% rename from src/components/common/icons/minus.tsx rename to src/components/src/common/icons/minus.tsx diff --git a/src/components/common/icons/order-by-dataset.tsx b/src/components/src/common/icons/order-by-dataset.tsx similarity index 100% rename from src/components/common/icons/order-by-dataset.tsx rename to src/components/src/common/icons/order-by-dataset.tsx diff --git a/src/components/common/icons/order-by-list.tsx b/src/components/src/common/icons/order-by-list.tsx similarity index 100% rename from src/components/common/icons/order-by-list.tsx rename to src/components/src/common/icons/order-by-list.tsx diff --git a/src/components/common/icons/pause.tsx b/src/components/src/common/icons/pause.tsx similarity index 100% rename from src/components/common/icons/pause.tsx rename to src/components/src/common/icons/pause.tsx diff --git a/src/components/common/icons/picture.tsx b/src/components/src/common/icons/picture.tsx similarity index 100% rename from src/components/common/icons/picture.tsx rename to src/components/src/common/icons/picture.tsx diff --git a/src/components/common/icons/pin.tsx b/src/components/src/common/icons/pin.tsx similarity index 100% rename from src/components/common/icons/pin.tsx rename to src/components/src/common/icons/pin.tsx diff --git a/src/components/common/icons/play.tsx b/src/components/src/common/icons/play.tsx similarity index 100% rename from src/components/common/icons/play.tsx rename to src/components/src/common/icons/play.tsx diff --git a/src/components/common/icons/polygon.tsx b/src/components/src/common/icons/polygon.tsx similarity index 100% rename from src/components/common/icons/polygon.tsx rename to src/components/src/common/icons/polygon.tsx diff --git a/src/components/common/icons/rectangle.tsx b/src/components/src/common/icons/rectangle.tsx similarity index 100% rename from src/components/common/icons/rectangle.tsx rename to src/components/src/common/icons/rectangle.tsx diff --git a/src/components/common/icons/reduce.tsx b/src/components/src/common/icons/reduce.tsx similarity index 100% rename from src/components/common/icons/reduce.tsx rename to src/components/src/common/icons/reduce.tsx diff --git a/src/components/common/icons/reset.tsx b/src/components/src/common/icons/reset.tsx similarity index 100% rename from src/components/common/icons/reset.tsx rename to src/components/src/common/icons/reset.tsx diff --git a/src/components/common/icons/rocket.tsx b/src/components/src/common/icons/rocket.tsx similarity index 100% rename from src/components/common/icons/rocket.tsx rename to src/components/src/common/icons/rocket.tsx diff --git a/src/components/common/icons/save.tsx b/src/components/src/common/icons/save.tsx similarity index 100% rename from src/components/common/icons/save.tsx rename to src/components/src/common/icons/save.tsx diff --git a/src/components/common/icons/save2.tsx b/src/components/src/common/icons/save2.tsx similarity index 100% rename from src/components/common/icons/save2.tsx rename to src/components/src/common/icons/save2.tsx diff --git a/src/components/common/icons/search.tsx b/src/components/src/common/icons/search.tsx similarity index 100% rename from src/components/common/icons/search.tsx rename to src/components/src/common/icons/search.tsx diff --git a/src/components/common/icons/settings.tsx b/src/components/src/common/icons/settings.tsx similarity index 100% rename from src/components/common/icons/settings.tsx rename to src/components/src/common/icons/settings.tsx diff --git a/src/components/common/icons/share.tsx b/src/components/src/common/icons/share.tsx similarity index 100% rename from src/components/common/icons/share.tsx rename to src/components/src/common/icons/share.tsx diff --git a/src/components/common/icons/split.tsx b/src/components/src/common/icons/split.tsx similarity index 100% rename from src/components/common/icons/split.tsx rename to src/components/src/common/icons/split.tsx diff --git a/src/components/common/icons/square-select.tsx b/src/components/src/common/icons/square-select.tsx similarity index 100% rename from src/components/common/icons/square-select.tsx rename to src/components/src/common/icons/square-select.tsx diff --git a/src/components/common/icons/trash.tsx b/src/components/src/common/icons/trash.tsx similarity index 100% rename from src/components/common/icons/trash.tsx rename to src/components/src/common/icons/trash.tsx diff --git a/src/components/common/icons/vert-dots.tsx b/src/components/src/common/icons/vert-dots.tsx similarity index 100% rename from src/components/common/icons/vert-dots.tsx rename to src/components/src/common/icons/vert-dots.tsx diff --git a/src/components/common/icons/vert-three-dots.tsx b/src/components/src/common/icons/vert-three-dots.tsx similarity index 100% rename from src/components/common/icons/vert-three-dots.tsx rename to src/components/src/common/icons/vert-three-dots.tsx diff --git a/src/components/common/icons/warning-sign.tsx b/src/components/src/common/icons/warning-sign.tsx similarity index 100% rename from src/components/common/icons/warning-sign.tsx rename to src/components/src/common/icons/warning-sign.tsx diff --git a/src/components/common/icons/warning.tsx b/src/components/src/common/icons/warning.tsx similarity index 100% rename from src/components/common/icons/warning.tsx rename to src/components/src/common/icons/warning.tsx diff --git a/src/components/common/image-preview.tsx b/src/components/src/common/image-preview.tsx similarity index 98% rename from src/components/common/image-preview.tsx rename to src/components/src/common/image-preview.tsx index 00367fd178..5a53eb0476 100644 --- a/src/components/common/image-preview.tsx +++ b/src/components/src/common/image-preview.tsx @@ -20,7 +20,7 @@ import React from 'react'; import styled from 'styled-components'; -import LoadingSpinner from 'components/common/loading-spinner'; +import LoadingSpinner from './loading-spinner'; import {ExportImage} from '@kepler.gl/constants'; const StyledImagePreview = styled.div.attrs({ diff --git a/src/components/src/common/index.ts b/src/components/src/common/index.ts new file mode 100644 index 0000000000..ac567f86ad --- /dev/null +++ b/src/components/src/common/index.ts @@ -0,0 +1,51 @@ +/* eslint-disable prettier/prettier */ +export * as Icons from './icons'; +export type { + ButtonProps, + StyledPanelHeaderProps, + StyledExportSectionProps +} from './styled-components'; +export { + SelectText, + SelectTextBold, + IconRoundSmall, + CenterVerticalFlexbox, + SpaceBetweenFlexbox, + SBFlexboxItem, + SBFlexboxNoMargin, + PanelLabel, + PanelLabelWrapper, + PanelLabelBold, + PanelHeaderTitle, + PanelHeaderContent, + PanelContent, + SidePanelSection, + SidePanelDivider, + Tooltip, + Button, + Input, + InputLight, + TextArea, + TextAreaLight, + InlineInput, + StyledPanelHeader, + StyledPanelDropdown, + ButtonGroup, + DatasetSquare, + SelectionButton, + StyledModalContent, + StyledModalVerticalPanel, + StyledModalSection, + StyledModalInputFootnote, + StyledMapContainer, + StyledAttrbution, + StyledExportSection, + StyledFilteredOption, + StyledType, + WidgetContainer, + BottomWidgetInner, + MapControlButton, + StyledFilterContent, + TruncatedTitleText, + CheckMark +} from "./styled-components"; diff --git a/src/components/common/info-helper.tsx b/src/components/src/common/info-helper.tsx similarity index 98% rename from src/components/common/info-helper.tsx rename to src/components/src/common/info-helper.tsx index de4d58947c..c3aab644fd 100644 --- a/src/components/common/info-helper.tsx +++ b/src/components/src/common/info-helper.tsx @@ -22,7 +22,7 @@ import React from 'react'; import {useIntl} from 'react-intl'; import {FormattedMessage} from '@kepler.gl/localization'; import {Tooltip} from './styled-components'; -import {Docs} from 'components/common/icons'; +import {Docs} from './icons'; import styled from 'styled-components'; import {camelize} from '@kepler.gl/utils'; diff --git a/src/components/common/item-selector/accessor.ts b/src/components/src/common/item-selector/accessor.ts similarity index 100% rename from src/components/common/item-selector/accessor.ts rename to src/components/src/common/item-selector/accessor.ts diff --git a/src/components/common/item-selector/chickleted-input.tsx b/src/components/src/common/item-selector/chickleted-input.tsx similarity index 100% rename from src/components/common/item-selector/chickleted-input.tsx rename to src/components/src/common/item-selector/chickleted-input.tsx diff --git a/src/components/common/item-selector/dropdown-list.tsx b/src/components/src/common/item-selector/dropdown-list.tsx similarity index 100% rename from src/components/common/item-selector/dropdown-list.tsx rename to src/components/src/common/item-selector/dropdown-list.tsx diff --git a/src/components/common/item-selector/item-selector.tsx b/src/components/src/common/item-selector/item-selector.tsx similarity index 99% rename from src/components/common/item-selector/item-selector.tsx rename to src/components/src/common/item-selector/item-selector.tsx index eaafa88308..7736d3ce80 100644 --- a/src/components/common/item-selector/item-selector.tsx +++ b/src/components/src/common/item-selector/item-selector.tsx @@ -26,9 +26,9 @@ import styled from 'styled-components'; import Accessor from './accessor'; import ChickletedInput from './chickleted-input'; import Typeahead from './typeahead'; -import {Delete, ArrowDown} from 'components/common/icons'; +import {Delete, ArrowDown} from '../icons'; import DropdownList, {ListItem} from './dropdown-list'; -import Portaled from 'components/common/portaled'; +import Portaled from '../../common/portaled'; import {toArray} from '@kepler.gl/utils'; import {observeDimensions, unobserveDimensions} from '@kepler.gl/utils'; import {injectIntl, IntlShape} from 'react-intl'; diff --git a/src/components/common/item-selector/typeahead.tsx b/src/components/src/common/item-selector/typeahead.tsx similarity index 99% rename from src/components/common/item-selector/typeahead.tsx rename to src/components/src/common/item-selector/typeahead.tsx index d530efb560..abd79b9964 100644 --- a/src/components/common/item-selector/typeahead.tsx +++ b/src/components/src/common/item-selector/typeahead.tsx @@ -27,7 +27,7 @@ import {console as Console} from 'global/window'; import Accessor from './accessor'; import DropdownList, {ListItem} from './dropdown-list'; -import {Search} from 'components/common/icons'; +import {Search} from '../icons'; import {KeyEvent} from '@kepler.gl/constants'; const DEFAULT_CLASS = 'typeahead'; diff --git a/src/components/common/line-chart.tsx b/src/components/src/common/line-chart.tsx similarity index 100% rename from src/components/common/line-chart.tsx rename to src/components/src/common/line-chart.tsx diff --git a/src/components/common/loading-spinner.tsx b/src/components/src/common/loading-spinner.tsx similarity index 100% rename from src/components/common/loading-spinner.tsx rename to src/components/src/common/loading-spinner.tsx diff --git a/src/components/common/logo.tsx b/src/components/src/common/logo.tsx similarity index 100% rename from src/components/common/logo.tsx rename to src/components/src/common/logo.tsx diff --git a/src/components/common/map-layer-selector.tsx b/src/components/src/common/map-layer-selector.tsx similarity index 97% rename from src/components/common/map-layer-selector.tsx rename to src/components/src/common/map-layer-selector.tsx index 7fd7940832..cd75ecdaab 100644 --- a/src/components/common/map-layer-selector.tsx +++ b/src/components/src/common/map-layer-selector.tsx @@ -20,7 +20,7 @@ import React from 'react'; import styled from 'styled-components'; -import Checkbox from 'components/common/checkbox'; +import Checkbox from './checkbox'; import {generateHashId} from '@kepler.gl/utils'; const MapLayerSelect = styled.div` diff --git a/src/components/common/modal.tsx b/src/components/src/common/modal.tsx similarity index 98% rename from src/components/common/modal.tsx rename to src/components/src/common/modal.tsx index 49475ab9b9..df271f6f49 100644 --- a/src/components/common/modal.tsx +++ b/src/components/src/common/modal.tsx @@ -23,8 +23,8 @@ import {FormattedMessage} from '@kepler.gl/localization'; import styled, {FlattenSimpleInterpolation} from 'styled-components'; import Modal from 'react-modal'; -import {Delete} from 'components/common/icons'; -import {Button} from 'components/common/styled-components'; +import {Delete} from './icons'; +import {Button} from './styled-components'; import {media} from '@kepler.gl/styles'; interface ModalContentWrapperProps { diff --git a/src/components/common/portaled.tsx b/src/components/src/common/portaled.tsx similarity index 99% rename from src/components/common/portaled.tsx rename to src/components/src/common/portaled.tsx index cab86c3cbf..0afb5ed203 100644 --- a/src/components/common/portaled.tsx +++ b/src/components/src/common/portaled.tsx @@ -24,7 +24,7 @@ import isEqual from 'lodash.isequal'; import {canUseDOM} from 'exenv'; import {withTheme} from 'styled-components'; -import {RootContext} from 'components/context'; +import {RootContext} from '../context'; import Modal from 'react-modal'; import window from 'global/window'; import {theme} from '@kepler.gl/styles'; diff --git a/src/components/common/progress-bar.tsx b/src/components/src/common/progress-bar.tsx similarity index 100% rename from src/components/common/progress-bar.tsx rename to src/components/src/common/progress-bar.tsx diff --git a/src/components/common/range-brush.tsx b/src/components/src/common/range-brush.tsx similarity index 100% rename from src/components/common/range-brush.tsx rename to src/components/src/common/range-brush.tsx diff --git a/src/components/common/range-plot.tsx b/src/components/src/common/range-plot.tsx similarity index 100% rename from src/components/common/range-plot.tsx rename to src/components/src/common/range-plot.tsx diff --git a/src/components/common/range-slider.tsx b/src/components/src/common/range-slider.tsx similarity index 98% rename from src/components/common/range-slider.tsx rename to src/components/src/common/range-slider.tsx index 865f2fed0e..e8f418262f 100644 --- a/src/components/common/range-slider.tsx +++ b/src/components/src/common/range-slider.tsx @@ -23,8 +23,8 @@ import {polyfill} from 'react-lifecycles-compat'; import {createSelector} from 'reselect'; import styled from 'styled-components'; import RangePlotFactory from './range-plot'; -import Slider from 'components/common/slider/slider'; -import {Input} from 'components/common/styled-components'; +import Slider from './slider/slider'; +import {Input} from './styled-components'; import {observeDimensions, unobserveDimensions, roundValToStep, clamp} from '@kepler.gl/utils'; import {LineChart} from '@kepler.gl/types'; diff --git a/src/components/common/slider/mouse-event.ts b/src/components/src/common/slider/mouse-event.ts similarity index 100% rename from src/components/common/slider/mouse-event.ts rename to src/components/src/common/slider/mouse-event.ts diff --git a/src/components/common/slider/slider-bar-handle.tsx b/src/components/src/common/slider/slider-bar-handle.tsx similarity index 100% rename from src/components/common/slider/slider-bar-handle.tsx rename to src/components/src/common/slider/slider-bar-handle.tsx diff --git a/src/components/common/slider/slider-handle.tsx b/src/components/src/common/slider/slider-handle.tsx similarity index 100% rename from src/components/common/slider/slider-handle.tsx rename to src/components/src/common/slider/slider-handle.tsx diff --git a/src/components/common/slider/slider.tsx b/src/components/src/common/slider/slider.tsx similarity index 100% rename from src/components/common/slider/slider.tsx rename to src/components/src/common/slider/slider.tsx diff --git a/src/components/common/styled-components.tsx b/src/components/src/common/styled-components.tsx similarity index 100% rename from src/components/common/styled-components.tsx rename to src/components/src/common/styled-components.tsx diff --git a/src/components/common/switch.tsx b/src/components/src/common/switch.tsx similarity index 100% rename from src/components/common/switch.tsx rename to src/components/src/common/switch.tsx diff --git a/src/components/common/time-range-slider-time-title.tsx b/src/components/src/common/time-range-slider-time-title.tsx similarity index 98% rename from src/components/common/time-range-slider-time-title.tsx rename to src/components/src/common/time-range-slider-time-title.tsx index 25746245fd..d929a44cdd 100644 --- a/src/components/common/time-range-slider-time-title.tsx +++ b/src/components/src/common/time-range-slider-time-title.tsx @@ -20,7 +20,7 @@ import React from 'react'; import styled from 'styled-components'; -import {Minus} from 'components/common/icons'; +import {Minus} from './icons'; import {datetimeFormatter} from '@kepler.gl/utils'; interface TimeValueWrapperProps { diff --git a/src/components/common/time-range-slider.tsx b/src/components/src/common/time-range-slider.tsx similarity index 94% rename from src/components/common/time-range-slider.tsx rename to src/components/src/common/time-range-slider.tsx index c70e0800aa..480e64e51a 100644 --- a/src/components/common/time-range-slider.tsx +++ b/src/components/src/common/time-range-slider.tsx @@ -22,10 +22,10 @@ import React, {useMemo} from 'react'; import throttle from 'lodash.throttle'; import styled from 'styled-components'; -import RangeSliderFactory from 'components/common/range-slider'; -import TimeSliderMarkerFactory from 'components/common/time-slider-marker'; -import PlaybackControlsFactory from 'components/common/animation-control/playback-controls'; -import TimeRangeSliderTimeTitleFactory from 'components/common/time-range-slider-time-title'; +import RangeSliderFactory from './range-slider'; +import TimeSliderMarkerFactory from './time-slider-marker'; +import PlaybackControlsFactory from './animation-control/playback-controls'; +import TimeRangeSliderTimeTitleFactory from './time-range-slider-time-title'; import {HistogramBin, LineChart} from '@kepler.gl/types'; const animationControlWidth = 176; diff --git a/src/components/common/time-slider-marker.tsx b/src/components/src/common/time-slider-marker.tsx similarity index 100% rename from src/components/common/time-slider-marker.tsx rename to src/components/src/common/time-slider-marker.tsx diff --git a/src/components/common/tippy-tooltip.tsx b/src/components/src/common/tippy-tooltip.tsx similarity index 98% rename from src/components/common/tippy-tooltip.tsx rename to src/components/src/common/tippy-tooltip.tsx index 869445b822..0535a97621 100644 --- a/src/components/common/tippy-tooltip.tsx +++ b/src/components/src/common/tippy-tooltip.tsx @@ -20,7 +20,7 @@ import styled from 'styled-components'; import React, {useState} from 'react'; -import {RootContext} from 'components'; +import {RootContext} from '../'; import Tippy, {TippyProps} from '@tippyjs/react'; const TippyArrow = styled.div` diff --git a/src/components/common/toolbar-item.tsx b/src/components/src/common/toolbar-item.tsx similarity index 100% rename from src/components/common/toolbar-item.tsx rename to src/components/src/common/toolbar-item.tsx diff --git a/src/components/common/toolbar.tsx b/src/components/src/common/toolbar.tsx similarity index 100% rename from src/components/common/toolbar.tsx rename to src/components/src/common/toolbar.tsx diff --git a/src/components/common/vertical-toolbar.tsx b/src/components/src/common/vertical-toolbar.tsx similarity index 100% rename from src/components/common/vertical-toolbar.tsx rename to src/components/src/common/vertical-toolbar.tsx diff --git a/src/connect/keplergl-connect.ts b/src/components/src/connect/keplergl-connect.ts similarity index 100% rename from src/connect/keplergl-connect.ts rename to src/components/src/connect/keplergl-connect.ts diff --git a/src/connect/with-local-selector.tsx b/src/components/src/connect/with-local-selector.tsx similarity index 98% rename from src/connect/with-local-selector.tsx rename to src/components/src/connect/with-local-selector.tsx index 85edc3be91..da66b05d91 100644 --- a/src/connect/with-local-selector.tsx +++ b/src/components/src/connect/with-local-selector.tsx @@ -20,7 +20,7 @@ import React, {Component} from 'react'; import {createSelector} from 'reselect'; -import KeplerGlContext from 'components/context'; +import KeplerGlContext from '../context'; import {KeplerGlState} from '@kepler.gl/reducers'; const identity = state => state; diff --git a/src/components/container.tsx b/src/components/src/container.tsx similarity index 100% rename from src/components/container.tsx rename to src/components/src/container.tsx diff --git a/src/components/context.tsx b/src/components/src/context.tsx similarity index 100% rename from src/components/context.tsx rename to src/components/src/context.tsx diff --git a/src/components/editor/constants.ts b/src/components/src/editor/constants.ts similarity index 100% rename from src/components/editor/constants.ts rename to src/components/src/editor/constants.ts diff --git a/src/components/editor/editor.tsx b/src/components/src/editor/editor.tsx similarity index 100% rename from src/components/editor/editor.tsx rename to src/components/src/editor/editor.tsx diff --git a/src/components/editor/feature-action-panel.tsx b/src/components/src/editor/feature-action-panel.tsx similarity index 97% rename from src/components/editor/feature-action-panel.tsx rename to src/components/src/editor/feature-action-panel.tsx index 6d7460d8fc..0619d1673f 100644 --- a/src/components/editor/feature-action-panel.tsx +++ b/src/components/src/editor/feature-action-panel.tsx @@ -21,11 +21,11 @@ import React, {useCallback, useState} from 'react'; import {useIntl} from 'react-intl'; -import ActionPanel, {ActionPanelItem} from 'components/common/action-panel'; +import ActionPanel, {ActionPanelItem} from '../common/action-panel'; import styled from 'styled-components'; import onClickOutside from 'react-onclickoutside'; import classnames from 'classnames'; -import {Trash, Layers, Copy, Checkmark} from 'components/common/icons'; +import {Trash, Layers, Copy, Checkmark} from '../common/icons'; import copy from 'copy-to-clipboard'; import {Layer} from '@kepler.gl/layers'; import {Filter} from '@kepler.gl/types'; diff --git a/src/components/editor/feature-styles.ts b/src/components/src/editor/feature-styles.ts similarity index 100% rename from src/components/editor/feature-styles.ts rename to src/components/src/editor/feature-styles.ts diff --git a/src/components/editor/handle-style.ts b/src/components/src/editor/handle-style.ts similarity index 100% rename from src/components/editor/handle-style.ts rename to src/components/src/editor/handle-style.ts diff --git a/src/components/filters/components.ts b/src/components/src/filters/components.ts similarity index 95% rename from src/components/filters/components.ts rename to src/components/src/filters/components.ts index bf533663e6..37af7a5fdd 100644 --- a/src/components/filters/components.ts +++ b/src/components/src/filters/components.ts @@ -19,7 +19,7 @@ // THE SOFTWARE. import styled from 'styled-components'; -import {PanelLabel} from 'components/common/styled-components'; +import {PanelLabel} from '../common/styled-components'; export const StyledFilterPanel = styled(PanelLabel)` font-weight: 500; diff --git a/src/components/filters/filter-panels/filter-panel-with-field-select.tsx b/src/components/src/filters/filter-panels/filter-panel-with-field-select.tsx similarity index 92% rename from src/components/filters/filter-panels/filter-panel-with-field-select.tsx rename to src/components/src/filters/filter-panels/filter-panel-with-field-select.tsx index 9e38e5f6e2..7c0287daa0 100644 --- a/src/components/filters/filter-panels/filter-panel-with-field-select.tsx +++ b/src/components/src/filters/filter-panels/filter-panel-with-field-select.tsx @@ -19,10 +19,10 @@ // THE SOFTWARE. import React, {useCallback, useMemo} from 'react'; -import {StyledFilterContent} from 'components/common/styled-components'; -import FilterPanelHeaderFactory from 'components/side-panel/filter-panel/filter-panel-header'; -import PanelHeaderActionFactory from 'components/side-panel/panel-header-action'; -import SourceDataSelectorFactory from 'components/side-panel/common/source-data-selector'; +import {StyledFilterContent} from '../../common/styled-components'; +import FilterPanelHeaderFactory from '../../side-panel/filter-panel/filter-panel-header'; +import PanelHeaderActionFactory from '../../side-panel/panel-header-action'; +import SourceDataSelectorFactory from '../../side-panel/common/source-data-selector'; import FieldSelectorFactory from '../../common/field-selector'; import {getSupportedFilterFields} from './new-filter-panel'; import {FilterPanelWithFieldSelectComponent} from './types'; diff --git a/src/components/filters/filter-panels/multi-select-filter-panel.tsx b/src/components/src/filters/filter-panels/multi-select-filter-panel.tsx similarity index 93% rename from src/components/filters/filter-panels/multi-select-filter-panel.tsx rename to src/components/src/filters/filter-panels/multi-select-filter-panel.tsx index 1cc50cf399..cbfe1bf625 100644 --- a/src/components/filters/filter-panels/multi-select-filter-panel.tsx +++ b/src/components/src/filters/filter-panels/multi-select-filter-panel.tsx @@ -19,9 +19,9 @@ // THE SOFTWARE. import React, {useCallback} from 'react'; -import MultiSelectFilterFactory from 'components/filters/multi-select-filter'; +import MultiSelectFilterFactory from '../multi-select-filter'; import {MultiSelectFilter} from '@kepler.gl/types'; -import FieldPanelWithFieldSelectFactory from 'components/filters/filter-panels/filter-panel-with-field-select'; +import FieldPanelWithFieldSelectFactory from './filter-panel-with-field-select'; import {FilterPanelComponent} from './types'; MultiSelectFilterPanelFactory.deps = [FieldPanelWithFieldSelectFactory, MultiSelectFilterFactory]; diff --git a/src/components/filters/filter-panels/new-filter-panel.tsx b/src/components/src/filters/filter-panels/new-filter-panel.tsx similarity index 93% rename from src/components/filters/filter-panels/new-filter-panel.tsx rename to src/components/src/filters/filter-panels/new-filter-panel.tsx index 8a69ba49b6..938b6ceea4 100644 --- a/src/components/filters/filter-panels/new-filter-panel.tsx +++ b/src/components/src/filters/filter-panels/new-filter-panel.tsx @@ -19,9 +19,9 @@ // THE SOFTWARE. import React, {useCallback, useMemo} from 'react'; -import {StyledFilterContent} from 'components/common/styled-components'; -import FilterPanelHeaderFactory from 'components/side-panel/filter-panel/filter-panel-header'; -import SourceDataSelectorFactory from 'components/side-panel/common/source-data-selector'; +import {StyledFilterContent} from '../../common/styled-components'; +import FilterPanelHeaderFactory from '../../side-panel/filter-panel/filter-panel-header'; +import SourceDataSelectorFactory from '../../side-panel/common/source-data-selector'; import FieldSelectorFactory from '../../common/field-selector'; import {FilterPanelComponent} from './types'; import {KeplerTable} from '@kepler.gl/table'; diff --git a/src/components/filters/filter-panels/polygon-filter-panel.tsx b/src/components/src/filters/filter-panels/polygon-filter-panel.tsx similarity index 89% rename from src/components/filters/filter-panels/polygon-filter-panel.tsx rename to src/components/src/filters/filter-panels/polygon-filter-panel.tsx index 12e175f47f..101d3ce696 100644 --- a/src/components/filters/filter-panels/polygon-filter-panel.tsx +++ b/src/components/src/filters/filter-panels/polygon-filter-panel.tsx @@ -19,12 +19,12 @@ // THE SOFTWARE. import React, {useMemo, useCallback} from 'react'; -import {StyledFilterContent} from 'components/common/styled-components'; -import PolygonFilterFactory from 'components/filters/polygon-filter'; -import PanelHeaderActionFactory from 'components/side-panel/panel-header-action'; -import {EyeSeen, EyeUnseen} from 'components/common/icons'; +import {StyledFilterContent} from '../../common/styled-components'; +import PolygonFilterFactory from '../polygon-filter'; +import PanelHeaderActionFactory from '../../side-panel/panel-header-action'; +import {EyeSeen, EyeUnseen} from '../../common/icons'; -import FilterPanelHeaderFactory from 'components/side-panel/filter-panel/filter-panel-header'; +import FilterPanelHeaderFactory from '../../side-panel/filter-panel/filter-panel-header'; import {StyledFilterPanel} from '../components'; import get from 'lodash.get'; diff --git a/src/components/filters/filter-panels/range-filter-panel.tsx b/src/components/src/filters/filter-panels/range-filter-panel.tsx similarity index 93% rename from src/components/filters/filter-panels/range-filter-panel.tsx rename to src/components/src/filters/filter-panels/range-filter-panel.tsx index fb5ec8769b..107d0a97ff 100644 --- a/src/components/filters/filter-panels/range-filter-panel.tsx +++ b/src/components/src/filters/filter-panels/range-filter-panel.tsx @@ -19,9 +19,9 @@ // THE SOFTWARE. import React, {useCallback} from 'react'; -import RangeFilterFactory from 'components/filters/range-filter'; +import RangeFilterFactory from '../range-filter'; import {RangeFilter} from '@kepler.gl/types'; -import FieldPanelWithFieldSelectFactory from 'components/filters/filter-panels/filter-panel-with-field-select'; +import FieldPanelWithFieldSelectFactory from './filter-panel-with-field-select'; import {FilterPanelComponent} from './types'; RangeFilterPanelFactory.deps = [FieldPanelWithFieldSelectFactory, RangeFilterFactory]; diff --git a/src/components/filters/filter-panels/single-select-filter-panel.tsx b/src/components/src/filters/filter-panels/single-select-filter-panel.tsx similarity index 93% rename from src/components/filters/filter-panels/single-select-filter-panel.tsx rename to src/components/src/filters/filter-panels/single-select-filter-panel.tsx index 2b857a1009..2ed72e38e5 100644 --- a/src/components/filters/filter-panels/single-select-filter-panel.tsx +++ b/src/components/src/filters/filter-panels/single-select-filter-panel.tsx @@ -19,9 +19,9 @@ // THE SOFTWARE. import React, {useCallback} from 'react'; -import SingleSelectFilterFactory from 'components/filters/single-select-filter'; +import SingleSelectFilterFactory from '../single-select-filter'; import {SelectFilter} from '@kepler.gl/types'; -import FieldPanelWithFieldSelectFactory from 'components/filters/filter-panels/filter-panel-with-field-select'; +import FieldPanelWithFieldSelectFactory from './filter-panel-with-field-select'; import {FilterPanelComponent} from './types'; SingleSelectFilterPanelFactory.deps = [FieldPanelWithFieldSelectFactory, SingleSelectFilterFactory]; diff --git a/src/components/filters/filter-panels/time-range-filter-panel.tsx b/src/components/src/filters/filter-panels/time-range-filter-panel.tsx similarity index 92% rename from src/components/filters/filter-panels/time-range-filter-panel.tsx rename to src/components/src/filters/filter-panels/time-range-filter-panel.tsx index 245454a451..44b96af410 100644 --- a/src/components/filters/filter-panels/time-range-filter-panel.tsx +++ b/src/components/src/filters/filter-panels/time-range-filter-panel.tsx @@ -19,9 +19,9 @@ // THE SOFTWARE. import React, {useCallback, useMemo} from 'react'; -import TimeRangeFilterFactory from 'components/filters/time-range-filter'; -import {Clock} from 'components/common/icons'; -import FieldPanelWithFieldSelectFactory from 'components/filters/filter-panels/filter-panel-with-field-select'; +import TimeRangeFilterFactory from '../time-range-filter'; +import {Clock} from '../../common/icons'; +import FieldPanelWithFieldSelectFactory from './filter-panel-with-field-select'; import {TimeRangeFilterPanelComponent} from './types'; TimeRangeFilterPanelFactory.deps = [FieldPanelWithFieldSelectFactory, TimeRangeFilterFactory]; diff --git a/src/components/filters/filter-panels/types.ts b/src/components/src/filters/filter-panels/types.ts similarity index 100% rename from src/components/filters/filter-panels/types.ts rename to src/components/src/filters/filter-panels/types.ts diff --git a/src/components/filters/index.ts b/src/components/src/filters/index.ts similarity index 100% rename from src/components/filters/index.ts rename to src/components/src/filters/index.ts diff --git a/src/components/filters/multi-select-filter.tsx b/src/components/src/filters/multi-select-filter.tsx similarity index 100% rename from src/components/filters/multi-select-filter.tsx rename to src/components/src/filters/multi-select-filter.tsx diff --git a/src/components/filters/polygon-filter.tsx b/src/components/src/filters/polygon-filter.tsx similarity index 97% rename from src/components/filters/polygon-filter.tsx rename to src/components/src/filters/polygon-filter.tsx index 0beedb8d73..4e47fa32c7 100644 --- a/src/components/filters/polygon-filter.tsx +++ b/src/components/src/filters/polygon-filter.tsx @@ -19,7 +19,7 @@ // THE SOFTWARE. import React, {useMemo, useCallback} from 'react'; -import ItemSelector from 'components/common/item-selector/item-selector'; +import ItemSelector from '../common/item-selector/item-selector'; import {Layer, LAYER_TYPES} from '@kepler.gl/layers'; import {PolygonFilterProps} from './types'; import {StyledFilterPanel} from './components'; diff --git a/src/components/filters/range-filter.tsx b/src/components/src/filters/range-filter.tsx similarity index 96% rename from src/components/filters/range-filter.tsx rename to src/components/src/filters/range-filter.tsx index 69d6a96269..e16132346e 100644 --- a/src/components/filters/range-filter.tsx +++ b/src/components/src/filters/range-filter.tsx @@ -19,7 +19,7 @@ // THE SOFTWARE. import React from 'react'; -import RangeSliderFactory from 'components/common/range-slider'; +import RangeSliderFactory from '../common/range-slider'; import {RangeFilterProps} from './types'; RangeFilterFactory.deps = [RangeSliderFactory]; diff --git a/src/components/filters/single-select-filter.tsx b/src/components/src/filters/single-select-filter.tsx similarity index 100% rename from src/components/filters/single-select-filter.tsx rename to src/components/src/filters/single-select-filter.tsx diff --git a/src/components/filters/time-range-filter.tsx b/src/components/src/filters/time-range-filter.tsx similarity index 97% rename from src/components/filters/time-range-filter.tsx rename to src/components/src/filters/time-range-filter.tsx index 253ccf2a3c..6f4009972e 100644 --- a/src/components/filters/time-range-filter.tsx +++ b/src/components/src/filters/time-range-filter.tsx @@ -19,7 +19,7 @@ // THE SOFTWARE. import React from 'react'; -import TimeRangeSliderFactory from 'components/common/time-range-slider'; +import TimeRangeSliderFactory from '../common/time-range-slider'; import {DEFAULT_TIME_FORMAT} from '@kepler.gl/constants'; import {TimeRangeFilter} from '@kepler.gl/types'; import {TimeRangeFilterProps} from './types'; diff --git a/src/components/filters/time-widget.tsx b/src/components/src/filters/time-widget.tsx similarity index 95% rename from src/components/filters/time-widget.tsx rename to src/components/src/filters/time-widget.tsx index 98af92b048..02b4d91b38 100644 --- a/src/components/filters/time-widget.tsx +++ b/src/components/src/filters/time-widget.tsx @@ -21,15 +21,15 @@ import React, {useCallback, useMemo} from 'react'; import styled from 'styled-components'; import { + CenterFlexbox, SelectTextBold, IconRoundSmall, - CenterFlexbox, BottomWidgetInner -} from 'components/common/styled-components'; -import {Close, Clock, LineChart} from 'components/common/icons'; -import TimeRangeSliderFactory from 'components/common/time-range-slider'; -import FieldSelectorFactory from 'components/common/field-selector'; -import FloatingTimeDisplayFactory from 'components/common/animation-control/floating-time-display'; +} from '../common/styled-components'; +import {Close, Clock, LineChart} from '../common/icons'; +import TimeRangeSliderFactory from '../common/time-range-slider'; +import FieldSelectorFactory from '../common/field-selector'; +import FloatingTimeDisplayFactory from '../common/animation-control/floating-time-display'; import {Field} from '@kepler.gl/types'; import {timeRangeSliderFieldsSelector} from './time-range-filter'; import {TimeWidgetProps, TimeWidgetTopProps, TopSectionWrapperProps} from './types'; diff --git a/src/components/filters/types.ts b/src/components/src/filters/types.ts similarity index 100% rename from src/components/filters/types.ts rename to src/components/src/filters/types.ts diff --git a/src/components/geocoder-panel.tsx b/src/components/src/geocoder-panel.tsx similarity index 100% rename from src/components/geocoder-panel.tsx rename to src/components/src/geocoder-panel.tsx diff --git a/src/components/geocoder/geocoder.tsx b/src/components/src/geocoder/geocoder.tsx similarity index 98% rename from src/components/geocoder/geocoder.tsx rename to src/components/src/geocoder/geocoder.tsx index 75ec5db82d..4a35bc7d4d 100644 --- a/src/components/geocoder/geocoder.tsx +++ b/src/components/src/geocoder/geocoder.tsx @@ -25,8 +25,8 @@ import MapboxClient from 'mapbox'; import {injectIntl, IntlShape} from 'react-intl'; import {WebMercatorViewport} from 'viewport-mercator-project'; import {KeyEvent} from '@kepler.gl/constants'; -import {Input} from 'components/common/styled-components'; -import {Search, Delete} from 'components/common/icons'; +import {Input} from '../common/styled-components'; +import {Search, Delete} from '../common/icons'; import {Viewport} from '@kepler.gl/types'; type StyledContainerProps = { diff --git a/src/components/hooks/useFeatureFlags.ts b/src/components/src/hooks/useFeatureFlags.ts similarity index 100% rename from src/components/hooks/useFeatureFlags.ts rename to src/components/src/hooks/useFeatureFlags.ts diff --git a/src/components/index.ts b/src/components/src/index.ts similarity index 76% rename from src/components/index.ts rename to src/components/src/index.ts index f0ccb4add8..9d75afa791 100644 --- a/src/components/index.ts +++ b/src/components/src/index.ts @@ -18,6 +18,9 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. +// Context +export {default as KeplerGlContext, RootContext} from './context'; + import TimeRangeSliderFactory from './common/time-range-slider'; import RangeSliderFactory from './common/range-slider'; import VisConfigSliderFactory from './side-panel/layer-panel/vis-config-slider'; @@ -27,14 +30,14 @@ import {ChannelByValueSelectorFactory} from './side-panel/layer-panel/layer-conf import FieldSelectorFactory, {FieldListItemFactoryFactory} from './common/field-selector'; import FieldTokenFactory from './common/field-token'; import PanelHeaderActionFactory from './side-panel/panel-header-action'; -import InfoHelperFactory from 'components/common/info-helper'; +import InfoHelperFactory from './common/info-helper'; import {appInjector} from './container'; // Components -export {default as KeplerGl, default, injectComponents, ContainerFactory} from './container'; +export {default as KeplerGl, default, injectComponents, ContainerFactory, ERROR_MSG} from './container'; // factories -export {default as KeplerGlFactory, DEFAULT_KEPLER_GL_PROPS} from './kepler-gl'; +export {default as KeplerGlFactory, DEFAULT_KEPLER_GL_PROPS, getVisibleDatasets, 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'; @@ -46,7 +49,8 @@ export { } from './bottom-widget'; export {default as ModalContainerFactory} from './modal-container'; export {default as PlotContainerFactory} from './plot-container'; -export {default as GeocoderPanelFactory} from './geocoder-panel'; +export {default as GeocoderPanelFactory, getUpdateVisDataPayload} from './geocoder-panel'; +export {testForCoordinates} from './geocoder/geocoder'; // // side panel factories export { @@ -60,9 +64,21 @@ export {default as PanelToggleFactory} from './side-panel/panel-toggle'; export {default as PanelTabFactory} from './side-panel/panel-tab'; export {default as LayerManagerFactory} from './side-panel/layer-manager'; +export {default as ColorSelector, 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 LayerPanelFactory} from './side-panel/layer-panel/layer-panel'; -export {default as LayerPanelHeaderFactory} from './side-panel/layer-panel/layer-panel-header'; -export {default as LayerConfiguratorFactory} from './side-panel/layer-panel/layer-configurator'; +export {default as SingleColorPalette} from './side-panel/layer-panel/single-color-palette'; +export {default as LayerPanelHeaderFactory, DragHandle} from './side-panel/layer-panel/layer-panel-header'; +export { + default as LayerConfiguratorFactory, + LayerColorRangeSelector, + getLayerConfiguratorProps, + getVisConfiguratorProps, + ArcLayerColorSelector, + LayerColorSelector +} from './side-panel/layer-panel/layer-configurator'; export {default as TextLabelPanelFactory} from './side-panel/layer-panel/text-label-panel'; export {LayerConfigGroupLabelFactory} from './side-panel/layer-panel/layer-config-group'; export { @@ -74,6 +90,8 @@ export {default as DatasetLayerGroupFactory} from './side-panel/layer-panel/data export {default as PanelViewListToggleFactory} from './side-panel/layer-panel/panel-view-list-toggle'; export {default as AddLayerButtonFactory} from './side-panel/layer-panel/add-layer-button'; export {default as LayerListFactory} from './side-panel/layer-panel/layer-list'; +export {default as CustomPicker} from './side-panel/layer-panel/custom-picker'; +export {default as CustomPalette} from './side-panel/layer-panel/custom-palette'; export {default as SourceDataCatalogFactory} from './side-panel/common/source-data-catalog'; export {default as SourceDataSelectorFactory} from './side-panel/common/source-data-selector'; @@ -104,7 +122,12 @@ export {default as MapControlTooltipFactory} from './map/map-control-tooltip'; export { default as MapLegendFactory, LayerLegendHeaderFactory, - LayerLegendContentFactory + LayerLegendContentFactory, + StyledMapControlLegend, + LayerColorLegend, + VisualChannelMetric, + LayerSizeLegend, + SingleColorLegend } from './map/map-legend'; export {default as MapDrawPanelFactory} from './map/map-draw-panel'; export {default as SplitMapButtonFactory} from './map/split-map-button'; @@ -115,18 +138,21 @@ 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} 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'; export {default as ExportImageModalFactory} from './modals/export-image-modal'; export {default as ExportDataModalFactory} from './modals/export-data-modal'; export {default as AddMapStyleModalFactory} from './modals/add-map-style-modal'; export {default as ExportMapModalFactory} from './modals/export-map-modal/export-map-modal'; -export {default as ModalTabsFactory} from './modals/modal-tabs'; +export {default as ModalTabsFactory, ModalTabItem} from './modals/modal-tabs'; export {default as LoadStorageMapFactory} from './modals/load-storage-map'; export {default as ExportJsonMapFactory} from './modals/export-map-modal/export-json-map'; export {default as ExportHtmlMapFactory} from './modals/export-map-modal/export-html-map'; // // notification panel +export {default as NotificationPanelFactory} from './notification-panel'; export {default as NotificationItemFactory} from './notification-panel/notification-item'; // // common factory @@ -141,6 +167,7 @@ export {default as AnimationWindowControlFactory} from './common/animation-contr export {default as FloatingTimeDisplayFactory} from './common/animation-control/floating-time-display'; export {default as AnimationSpeedSliderFactory} from './common/animation-control/animation-speed-slider'; export {default as RangePlotFactory} from './common/range-plot'; +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'; @@ -151,6 +178,7 @@ export {default as IconButton} from './common/icon-button'; export {default as TimeWidgetFactory, TimeWidgetTopFactory} from './filters/time-widget'; export {default as SingleSelectFilterFactory} from './filters/single-select-filter'; export {default as MultiSelectFilterFactory} from './filters/multi-select-filter'; +export {default as NewFilterPanelFactory} from './filters/filter-panels/new-filter-panel'; export { timeRangeSliderFieldsSelector, default as TimeRangeFilterFactory @@ -159,25 +187,28 @@ export {default as RangeFilterFactory} from './filters/range-filter'; // // Editor Factory export {default as EditorFactory} from './editor/editor'; -export {default as FeatureActionPanelFactory} from './editor/feature-action-panel'; +export {getStyle} from './editor/feature-styles'; +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} 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'; +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} from './common/item-selector/dropdown-list'; +export {default as DropdownList, ListItem} 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'; export {default as Switch} from './common/switch'; export {default as Checkbox} from './common/checkbox'; +export {default as ColorLegend, LegendRow} from './common/color-legend'; export {default as LoadingSpinner} from './common/loading-spinner'; export {default as LoadingDialog} from './modals/loading-dialog'; export {default as FieldTokenFactory} from './common/field-token'; @@ -185,14 +216,16 @@ export {default as Portaled} from './common/portaled'; export {default as ProgressBar} from './common/progress-bar'; export {default as FileUploadProgress} from './common/file-uploader/file-upload-progress'; export {default as Slider} from './common/slider/slider'; -export {DatasetSquare} from './common/styled-components'; +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 DataTableFactory} from './common/data-table'; export {default as CanvasHack} from './common/data-table/canvas'; +export {default as OptionDropdown} from './common/data-table/option-dropdown'; export {default as MapLayerSelector} from './common/map-layer-selector'; export {default as VerticalToolbar} from './common/vertical-toolbar'; export {default as ToolbarItem} from './common/toolbar-item'; -export {SharingUrl} from './modals/share-map-modal'; +export {default as ShareMapUrlModalFactory, SharingUrl} from './modals/share-map-modal'; export {default as TippyTooltip} from './common/tippy-tooltip'; // side pane components @@ -209,13 +242,58 @@ export { } from './side-panel/layer-panel/layer-panel-header'; export {default as HowToButton} from './side-panel/layer-panel/how-to-button'; +// eslint-disable-next-line prettier/prettier +export type { + ButtonProps, + StyledPanelHeaderProps, + StyledExportSectionProps +} from './common'; export { - LayerColorRangeSelector, - LayerColorSelector -} from './side-panel/layer-panel/layer-configurator'; - -export * from './common'; + Icons, + SelectText, + SelectTextBold, + IconRoundSmall, + CenterVerticalFlexbox, + SpaceBetweenFlexbox, + SBFlexboxItem, + SBFlexboxNoMargin, + PanelLabel, + PanelLabelWrapper, + PanelLabelBold, + PanelHeaderTitle, + PanelHeaderContent, + PanelContent, + SidePanelSection, + SidePanelDivider, + Tooltip, + Button, + Input, + InputLight, + TextArea, + TextAreaLight, + InlineInput, + StyledPanelHeader, + StyledPanelDropdown, + ButtonGroup, + DatasetSquare, + SelectionButton, + StyledModalContent, + StyledModalVerticalPanel, + StyledModalSection, + StyledModalInputFootnote, + StyledMapContainer, + StyledAttrbution, + StyledExportSection, + StyledFilteredOption, + StyledType, + WidgetContainer, + BottomWidgetInner, + MapControlButton, + StyledFilterContent, + TruncatedTitleText, + CheckMark +} from './common'; // Individual Component from Dependency Tree export const TimeRangeSlider = appInjector.get(TimeRangeSliderFactory); @@ -241,6 +319,3 @@ export { FieldListItemFactoryFactory, InfoHelperFactory }; - -// Context -export {default as KeplerGlContext, RootContext} from 'components/context'; diff --git a/src/components/injector.tsx b/src/components/src/injector.tsx similarity index 99% rename from src/components/injector.tsx rename to src/components/src/injector.tsx index 12234bcb8e..f1d907bdc0 100644 --- a/src/components/injector.tsx +++ b/src/components/src/injector.tsx @@ -27,7 +27,7 @@ import { InferableComponentEnhancerWithProps } from 'react-redux'; import {console as Console} from 'global/window'; -import KeplerGlContext from 'components/context'; +import KeplerGlContext from './context'; export type FactoryElement = (...args) => React.ComponentType; export type Factory = FactoryElement & { diff --git a/src/components/kepler-gl.tsx b/src/components/src/kepler-gl.tsx similarity index 99% rename from src/components/kepler-gl.tsx rename to src/components/src/kepler-gl.tsx index 91a7b43383..559a6870e9 100644 --- a/src/components/kepler-gl.tsx +++ b/src/components/src/kepler-gl.tsx @@ -23,10 +23,10 @@ import Console from 'global/console'; import {bindActionCreators} from 'redux'; import styled, {ThemeProvider, withTheme} from 'styled-components'; import {createSelector} from 'reselect'; -import {connect as keplerGlConnect} from 'connect/keplergl-connect'; +import {connect as keplerGlConnect} from './connect/keplergl-connect'; import {IntlProvider} from 'react-intl'; import {messages} from '@kepler.gl/localization'; -import {RootContext, FeatureFlagsContextProvider, FeatureFlags} from 'components/context'; +import {RootContext, FeatureFlagsContextProvider, FeatureFlags} from './context'; import {OnErrorCallBack, OnSuccessCallBack} from '@kepler.gl/types'; import { @@ -75,7 +75,7 @@ import { import {theme as basicTheme, themeLT, themeBS} from '@kepler.gl/styles'; import {KeplerGlState} from '@kepler.gl/reducers'; -import {Provider} from 'cloud-providers'; +import {Provider} from '@kepler.gl/cloud-providers'; // Maybe we should think about exporting this or creating a variable // as part of the base.js theme diff --git a/src/components/map-container.tsx b/src/components/src/map-container.tsx similarity index 98% rename from src/components/map-container.tsx rename to src/components/src/map-container.tsx index 1e3585ca96..0d4e38cc0e 100644 --- a/src/components/map-container.tsx +++ b/src/components/src/map-container.tsx @@ -29,9 +29,9 @@ import mapboxgl from 'mapbox-gl'; import {VisStateActions, MapStateActions, UIStateActions} from '@kepler.gl/actions'; // components -import MapPopoverFactory from 'components/map/map-popover'; -import MapControlFactory from 'components/map/map-control'; -import {StyledMapContainer, StyledAttrbution} from 'components/common/styled-components'; +import MapPopoverFactory from './map/map-popover'; +import MapControlFactory from './map/map-control'; +import {StyledMapContainer, StyledAttrbution} from './common/styled-components'; import EditorFactory from './editor/editor'; @@ -54,7 +54,7 @@ import { // default-settings import {FILTER_TYPES, GEOCODER_LAYER_ID, THROTTLE_NOTIFICATION_TIME} from '@kepler.gl/constants'; -import ErrorBoundary from 'components/common/error-boundary'; +import ErrorBoundary from './common/error-boundary'; import {LOCALE_CODES} from '@kepler.gl/localization'; import {getMapLayersFromSplitMaps, onViewPortChange} from '@kepler.gl/utils'; import {MapView} from '@deck.gl/core'; diff --git a/src/components/map/coordinate-info.tsx b/src/components/src/map/coordinate-info.tsx similarity index 97% rename from src/components/map/coordinate-info.tsx rename to src/components/src/map/coordinate-info.tsx index a9450e9d6a..24745c4fa2 100644 --- a/src/components/map/coordinate-info.tsx +++ b/src/components/src/map/coordinate-info.tsx @@ -20,7 +20,7 @@ import React from 'react'; import {preciseRound} from '@kepler.gl/utils'; -import {CursorClick} from 'components/common/icons'; +import {CursorClick} from '../common/icons'; import {StyledLayerName} from './layer-hover-info'; // 6th decimal is worth up to 0.11 m diff --git a/src/components/map/layer-hover-info.tsx b/src/components/src/map/layer-hover-info.tsx similarity index 98% rename from src/components/map/layer-hover-info.tsx rename to src/components/src/map/layer-hover-info.tsx index a185fafcfd..e8535dfb57 100644 --- a/src/components/map/layer-hover-info.tsx +++ b/src/components/src/map/layer-hover-info.tsx @@ -21,8 +21,8 @@ import React, {useMemo} from 'react'; import styled from 'styled-components'; import {TooltipField} from '@kepler.gl/types'; -import {CenterFlexbox} from 'components/common/styled-components'; -import {Layers} from 'components/common/icons'; +import {CenterFlexbox} from '../common/styled-components'; +import {Layers} from '../common/icons'; import PropTypes from 'prop-types'; import {notNullorUndefined} from '@kepler.gl/utils'; import {Layer} from '@kepler.gl/layers'; diff --git a/src/components/map/layer-selector-panel.tsx b/src/components/src/map/layer-selector-panel.tsx similarity index 98% rename from src/components/map/layer-selector-panel.tsx rename to src/components/src/map/layer-selector-panel.tsx index b3e58d576f..c35b059136 100644 --- a/src/components/map/layer-selector-panel.tsx +++ b/src/components/src/map/layer-selector-panel.tsx @@ -21,7 +21,7 @@ import React, {useCallback, useMemo} from 'react'; import classnames from 'classnames'; -import {MapControlButton} from 'components/common/styled-components'; +import {MapControlButton} from '../common/styled-components'; import {Layers} from '../common/icons'; import MapLayerSelector from '../common/map-layer-selector'; import MapControlTooltipFactory from './map-control-tooltip'; diff --git a/src/components/map/lazy-tippy.tsx b/src/components/src/map/lazy-tippy.tsx similarity index 100% rename from src/components/map/lazy-tippy.tsx rename to src/components/src/map/lazy-tippy.tsx diff --git a/src/components/map/locale-panel.tsx b/src/components/src/map/locale-panel.tsx similarity index 96% rename from src/components/map/locale-panel.tsx rename to src/components/src/map/locale-panel.tsx index 71ddc61b48..5e6bb2b3b6 100644 --- a/src/components/map/locale-panel.tsx +++ b/src/components/src/map/locale-panel.tsx @@ -21,8 +21,8 @@ import React, {useCallback} from 'react'; import classnames from 'classnames'; -import ToolbarItem from 'components/common/toolbar-item'; -import {MapControlButton} from 'components/common/styled-components'; +import ToolbarItem from '../common/toolbar-item'; +import {MapControlButton} from '../common/styled-components'; import MapControlTooltipFactory from './map-control-tooltip'; import MapControlToolbarFactory from './map-control-toolbar'; import {MapControls} from '@kepler.gl/types'; diff --git a/src/components/map/map-control-panel.tsx b/src/components/src/map/map-control-panel.tsx similarity index 97% rename from src/components/map/map-control-panel.tsx rename to src/components/src/map/map-control-panel.tsx index 05c2fff096..98bded733e 100644 --- a/src/components/map/map-control-panel.tsx +++ b/src/components/src/map/map-control-panel.tsx @@ -21,8 +21,8 @@ import React from 'react'; import styled from 'styled-components'; import {FormattedMessage} from '@kepler.gl/localization'; -import {IconRoundSmall} from 'components/common/styled-components'; -import {Close, Pin} from 'components/common/icons'; +import {IconRoundSmall} from '../common/styled-components'; +import {Close, Pin} from '../common/icons'; const StyledMapControlPanel = styled.div` background-color: ${props => props.theme.mapPanelBackgroundColor}; diff --git a/src/components/map/map-control-toolbar.tsx b/src/components/src/map/map-control-toolbar.tsx similarity index 100% rename from src/components/map/map-control-toolbar.tsx rename to src/components/src/map/map-control-toolbar.tsx diff --git a/src/components/map/map-control-tooltip.tsx b/src/components/src/map/map-control-tooltip.tsx similarity index 100% rename from src/components/map/map-control-tooltip.tsx rename to src/components/src/map/map-control-tooltip.tsx diff --git a/src/components/map/map-control.tsx b/src/components/src/map/map-control.tsx similarity index 98% rename from src/components/map/map-control.tsx rename to src/components/src/map/map-control.tsx index c03f83e665..249ff4bccb 100644 --- a/src/components/map/map-control.tsx +++ b/src/components/src/map/map-control.tsx @@ -20,7 +20,7 @@ import React from 'react'; import styled from 'styled-components'; -import KeplerGlLogo from 'components/common/logo'; +import KeplerGlLogo from '../common/logo'; // factories import SplitMapButtonFactory from './split-map-button'; diff --git a/src/components/map/map-draw-panel.tsx b/src/components/src/map/map-draw-panel.tsx similarity index 93% rename from src/components/map/map-draw-panel.tsx rename to src/components/src/map/map-draw-panel.tsx index 3d25afb277..e3fa66be0c 100644 --- a/src/components/map/map-draw-panel.tsx +++ b/src/components/src/map/map-draw-panel.tsx @@ -22,20 +22,13 @@ import React, {useCallback} from 'react'; import classnames from 'classnames'; import {EDITOR_MODES} from '@kepler.gl/constants'; -import { - CursorClick, - DrawPolygon, - EyeSeen, - EyeUnseen, - Polygon, - Rectangle -} from 'components/common/icons'; -import {MapControlButton} from 'components/common/styled-components'; -import ToolbarItem from 'components/common/toolbar-item'; +import {CursorClick, DrawPolygon, EyeSeen, EyeUnseen, Polygon, Rectangle} from '../common/icons'; +import {MapControlButton} from '../common/styled-components'; +import ToolbarItem from '../common/toolbar-item'; import MapControlTooltipFactory from './map-control-tooltip'; import MapControlToolbarFactory from './map-control-toolbar'; import {Editor, MapControls} from '@kepler.gl/types'; -import {BaseProps} from 'components/common/icons/base'; +import {BaseProps} from '../common/icons'; MapDrawPanelFactory.deps = [MapControlTooltipFactory, MapControlToolbarFactory]; diff --git a/src/components/map/map-legend-panel.tsx b/src/components/src/map/map-legend-panel.tsx similarity index 97% rename from src/components/map/map-legend-panel.tsx rename to src/components/src/map/map-legend-panel.tsx index 4e2b021383..654057d893 100644 --- a/src/components/map/map-legend-panel.tsx +++ b/src/components/src/map/map-legend-panel.tsx @@ -21,8 +21,8 @@ import React, {ComponentType, useState} from 'react'; import styled from 'styled-components'; -import {Legend} from 'components/common/icons'; -import {MapControlButton} from 'components/common/styled-components'; +import {Legend} from '../common/icons'; +import {MapControlButton} from '../common/styled-components'; import MapControlTooltipFactory from './map-control-tooltip'; import MapControlPanelFactory from './map-control-panel'; import MapLegendFactory from './map-legend'; diff --git a/src/components/map/map-legend.tsx b/src/components/src/map/map-legend.tsx similarity index 99% rename from src/components/map/map-legend.tsx rename to src/components/src/map/map-legend.tsx index 189058e943..d7e33fdf8d 100644 --- a/src/components/map/map-legend.tsx +++ b/src/components/src/map/map-legend.tsx @@ -21,7 +21,7 @@ import React from 'react'; import styled from 'styled-components'; import {rgb} from 'd3-color'; -import ColorLegend from 'components/common/color-legend'; +import ColorLegend from '../common/color-legend'; import {CHANNEL_SCALES, DIMENSIONS} from '@kepler.gl/constants'; import {FormattedMessage} from '@kepler.gl/localization'; import {Layer, LayerBaseConfig, VisualChannel, VisualChannelDescription} from '@kepler.gl/layers'; diff --git a/src/components/map/map-popover.tsx b/src/components/src/map/map-popover.tsx similarity index 98% rename from src/components/map/map-popover.tsx rename to src/components/src/map/map-popover.tsx index a886c7f3c8..d41a913034 100644 --- a/src/components/map/map-popover.tsx +++ b/src/components/src/map/map-popover.tsx @@ -22,11 +22,11 @@ import React, {useState} from 'react'; import styled from 'styled-components'; import LayerHoverInfoFactory from './layer-hover-info'; import CoordinateInfoFactory from './coordinate-info'; -import {ArrowLeft, ArrowRight, Pin} from 'components/common/icons'; +import {Pin, ArrowLeft, ArrowRight} from '../common/icons'; import {injectIntl, IntlShape} from 'react-intl'; import {FormattedMessage} from '@kepler.gl/localization'; import Tippy from '@tippyjs/react/headless'; -import {RootContext} from 'components'; +import {RootContext} from '../'; import {LayerHoverProp} from '@kepler.gl/reducers'; const MAX_WIDTH = 500; diff --git a/src/components/map/split-map-button.tsx b/src/components/src/map/split-map-button.tsx similarity index 96% rename from src/components/map/split-map-button.tsx rename to src/components/src/map/split-map-button.tsx index 3e1d86ccfd..9cddfd90a8 100644 --- a/src/components/map/split-map-button.tsx +++ b/src/components/src/map/split-map-button.tsx @@ -20,8 +20,8 @@ import React, {ComponentType, useCallback, useMemo} from 'react'; import classnames from 'classnames'; -import {MapControlButton} from 'components/common/styled-components'; -import {Delete, Split} from 'components/common/icons'; +import {MapControlButton} from '../common/styled-components'; +import {Delete, Split} from '../common/icons'; import MapControlTooltipFactory from './map-control-tooltip'; import {MapControl, MapControls} from '@kepler.gl/types'; diff --git a/src/components/map/toggle-3d-button.tsx b/src/components/src/map/toggle-3d-button.tsx similarity index 95% rename from src/components/map/toggle-3d-button.tsx rename to src/components/src/map/toggle-3d-button.tsx index c8fe63b4bb..f8faf83437 100644 --- a/src/components/map/toggle-3d-button.tsx +++ b/src/components/src/map/toggle-3d-button.tsx @@ -20,8 +20,8 @@ import React, {ComponentType, useCallback, useMemo} from 'react'; import classnames from 'classnames'; -import {Cube3d} from 'components/common/icons'; -import {MapControlButton} from 'components/common/styled-components'; +import {Cube3d} from '../common/icons'; +import {MapControlButton} from '../common/styled-components'; import MapControlTooltipFactory from './map-control-tooltip'; import {MapControls} from '@kepler.gl/types'; diff --git a/src/components/maps-layout.tsx b/src/components/src/maps-layout.tsx similarity index 100% rename from src/components/maps-layout.tsx rename to src/components/src/maps-layout.tsx diff --git a/src/components/modal-container.tsx b/src/components/src/modal-container.tsx similarity index 99% rename from src/components/modal-container.tsx rename to src/components/src/modal-container.tsx index e569f59bef..f6c5b37947 100644 --- a/src/components/modal-container.tsx +++ b/src/components/src/modal-container.tsx @@ -74,9 +74,9 @@ import { ProviderActions } from '@kepler.gl/actions'; import {ModalDialogProps} from './common/modal'; -import {Provider} from 'cloud-providers'; +import {Provider} from '@kepler.gl/cloud-providers'; import {findDOMNode} from 'react-dom'; -import {VisState} from 'schemas'; +import {VisState} from '@kepler.gl/schemas'; const DataTableModalStyle = css` top: 80px; diff --git a/src/components/modals/add-map-style-modal.tsx b/src/components/src/modals/add-map-style-modal.tsx similarity index 99% rename from src/components/modals/add-map-style-modal.tsx rename to src/components/src/modals/add-map-style-modal.tsx index 9cc2501072..578580d57e 100644 --- a/src/components/modals/add-map-style-modal.tsx +++ b/src/components/src/modals/add-map-style-modal.tsx @@ -29,7 +29,7 @@ import { StyledMapContainer, StyledModalVerticalPanel, StyledModalSection -} from 'components/common/styled-components'; +} from '../common/styled-components'; import {media} from '@kepler.gl/styles'; // Utils diff --git a/src/components/modals/cloud-tile.tsx b/src/components/src/modals/cloud-tile.tsx similarity index 96% rename from src/components/modals/cloud-tile.tsx rename to src/components/src/modals/cloud-tile.tsx index 8404b8872e..209c731bcf 100644 --- a/src/components/modals/cloud-tile.tsx +++ b/src/components/src/modals/cloud-tile.tsx @@ -20,9 +20,9 @@ import React, {ReactNode} from 'react'; import styled from 'styled-components'; -import {Logout, Login} from 'components/common/icons'; -import {CenterVerticalFlexbox, Button, CheckMark} from 'components/common/styled-components'; -import LoadingSpinner from 'components/common/loading-spinner'; +import {Logout, Login} from '../common/icons'; +import {CenterVerticalFlexbox, Button, CheckMark} from '../common/styled-components'; +import LoadingSpinner from '../common/loading-spinner'; import {Provider} from '@kepler.gl/cloud-providers'; interface StyledTileWrapperProps { diff --git a/src/components/modals/data-table-modal.tsx b/src/components/src/modals/data-table-modal.tsx similarity index 96% rename from src/components/modals/data-table-modal.tsx rename to src/components/src/modals/data-table-modal.tsx index 32cf50f06b..683a286198 100644 --- a/src/components/modals/data-table-modal.tsx +++ b/src/components/src/modals/data-table-modal.tsx @@ -20,11 +20,11 @@ import React from 'react'; import styled, {withTheme} from 'styled-components'; -import DatasetLabel from 'components/common/dataset-label'; -import DataTableFactory from 'components/common/data-table'; +import DatasetLabel from '../common/dataset-label'; +import DataTableFactory from '../common/data-table'; import {createSelector} from 'reselect'; -import {renderedSize} from 'components/common/data-table/cell-size'; -import CanvasHack from 'components/common/data-table/canvas'; +import {renderedSize} from '../common/data-table/cell-size'; +import CanvasHack from '../common/data-table/canvas'; import KeplerTable, {Datasets} from '@kepler.gl/table'; const dgSettings = { diff --git a/src/components/modals/delete-data-modal.tsx b/src/components/src/modals/delete-data-modal.tsx similarity index 97% rename from src/components/modals/delete-data-modal.tsx rename to src/components/src/modals/delete-data-modal.tsx index 9ea55ff461..df1d6c04a2 100644 --- a/src/components/modals/delete-data-modal.tsx +++ b/src/components/src/modals/delete-data-modal.tsx @@ -20,7 +20,7 @@ import React from 'react'; import styled from 'styled-components'; -import DatasetLabel from 'components/common/dataset-label'; +import DatasetLabel from '../common/dataset-label'; import {FormattedMessage} from '@kepler.gl/localization'; import {Layer} from '@kepler.gl/layers'; import {KeplerTable} from '@kepler.gl/table'; diff --git a/src/components/modals/error-display.tsx b/src/components/src/modals/error-display.tsx similarity index 91% rename from src/components/modals/error-display.tsx rename to src/components/src/modals/error-display.tsx index 7bb5f4e7a3..bae80a3b32 100644 --- a/src/components/modals/error-display.tsx +++ b/src/components/src/modals/error-display.tsx @@ -19,8 +19,8 @@ // THE SOFTWARE. import React from 'react'; -import ErrorBoundary from 'components/common/error-boundary'; -import NotificationItemFactory from 'components/notification-panel/notification-item'; +import ErrorBoundary from '../common/error-boundary'; +import NotificationItemFactory from '../notification-panel/notification-item'; const NotificationItem = NotificationItemFactory(); interface ErrorDisplayProps { diff --git a/src/components/modals/export-data-modal.tsx b/src/components/src/modals/export-data-modal.tsx similarity index 98% rename from src/components/modals/export-data-modal.tsx rename to src/components/src/modals/export-data-modal.tsx index e833296427..b1625ae3ed 100644 --- a/src/components/modals/export-data-modal.tsx +++ b/src/components/src/modals/export-data-modal.tsx @@ -21,14 +21,14 @@ import React, {Component} from 'react'; import {EXPORT_DATA_TYPE_OPTIONS} from '@kepler.gl/constants'; -import {FileType} from 'components/common/icons'; +import {FileType} from '../common/icons'; import { StyledExportSection, StyledFilteredOption, StyledModalContent, StyledType, CheckMark -} from 'components/common/styled-components'; +} from '../common/styled-components'; import {injectIntl, IntlShape} from 'react-intl'; import {FormattedMessage} from '@kepler.gl/localization'; import {Datasets} from '@kepler.gl/table'; diff --git a/src/components/modals/export-image-modal.tsx b/src/components/src/modals/export-image-modal.tsx similarity index 95% rename from src/components/modals/export-image-modal.tsx rename to src/components/src/modals/export-image-modal.tsx index d21bcc1134..709bea605a 100644 --- a/src/components/modals/export-image-modal.tsx +++ b/src/components/src/modals/export-image-modal.tsx @@ -20,8 +20,8 @@ import React, {useEffect} from 'react'; import styled from 'styled-components'; -import ImagePreview from 'components/common/image-preview'; -import {SetExportImageSettingUpdaterAction} from '../../actions'; +import ImagePreview from '../common/image-preview'; +import {SetExportImageSettingUpdaterAction} from '@kepler.gl/actions'; import { EXPORT_IMG_RATIO_OPTIONS, @@ -29,8 +29,8 @@ import { ExportImage } from '@kepler.gl/constants'; -import {StyledModalContent, SelectionButton, CheckMark} from 'components/common/styled-components'; -import Switch from 'components/common/switch'; +import {StyledModalContent, SelectionButton, CheckMark} from '../common/styled-components'; +import Switch from '../common/switch'; import {injectIntl, IntlShape} from 'react-intl'; import {FormattedMessage} from '@kepler.gl/localization'; diff --git a/src/components/modals/export-map-modal/components.tsx b/src/components/src/modals/export-map-modal/components.tsx similarity index 95% rename from src/components/modals/export-map-modal/components.tsx rename to src/components/src/modals/export-map-modal/components.tsx index 532da056d8..90423383f7 100644 --- a/src/components/modals/export-map-modal/components.tsx +++ b/src/components/src/modals/export-map-modal/components.tsx @@ -20,7 +20,7 @@ import React from 'react'; import styled from 'styled-components'; -import {StyledExportSection} from 'components/common/styled-components'; +import {StyledExportSection} from '../../common/styled-components'; export const StyledExportMapSection = styled(StyledExportSection)` margin-top: ${props => props.theme.exportIntraSectionMargin}px; diff --git a/src/components/modals/export-map-modal/export-html-map.tsx b/src/components/src/modals/export-map-modal/export-html-map.tsx similarity index 98% rename from src/components/modals/export-map-modal/export-html-map.tsx rename to src/components/src/modals/export-map-modal/export-html-map.tsx index 59a88954e0..c715cf6df6 100644 --- a/src/components/modals/export-map-modal/export-html-map.tsx +++ b/src/components/src/modals/export-map-modal/export-html-map.tsx @@ -19,7 +19,7 @@ // THE SOFTWARE. import React from 'react'; -import {StyledExportSection, StyledType, CheckMark} from 'components/common/styled-components'; +import {StyledExportSection, StyledType, CheckMark} from '../../common/styled-components'; import {StyledExportMapSection, StyledWarning, ExportMapLink} from './components'; import { EXPORT_HTML_MAP_MODE_OPTIONS, diff --git a/src/components/modals/export-map-modal/export-json-map.tsx b/src/components/src/modals/export-map-modal/export-json-map.tsx similarity index 97% rename from src/components/modals/export-map-modal/export-json-map.tsx rename to src/components/src/modals/export-map-modal/export-json-map.tsx index a31e5302d5..a2352b5995 100644 --- a/src/components/modals/export-map-modal/export-json-map.tsx +++ b/src/components/src/modals/export-map-modal/export-json-map.tsx @@ -22,7 +22,7 @@ import React, {useState} from 'react'; import JSONPretty from 'react-json-pretty'; import {ADD_DATA_TO_MAP_DOC} from '@kepler.gl/constants'; import styled from 'styled-components'; -import {StyledExportSection, Button} from 'components/common/styled-components'; +import {StyledExportSection, Button} from '../../common/styled-components'; import {StyledExportMapSection, StyledWarning, ExportMapLink} from './components'; import {FormattedMessage} from '@kepler.gl/localization'; import {CopyToClipboard} from 'react-copy-to-clipboard'; diff --git a/src/components/modals/export-map-modal/export-map-modal.tsx b/src/components/src/modals/export-map-modal/export-map-modal.tsx similarity index 96% rename from src/components/modals/export-map-modal/export-map-modal.tsx rename to src/components/src/modals/export-map-modal/export-map-modal.tsx index 447dd5f484..c3d10f19e3 100644 --- a/src/components/modals/export-map-modal/export-map-modal.tsx +++ b/src/components/src/modals/export-map-modal/export-map-modal.tsx @@ -20,8 +20,8 @@ import React from 'react'; -import {FileType} from 'components/common/icons'; -import {StyledModalContent, StyledType, CheckMark} from 'components/common/styled-components'; +import {FileType} from '../../common/icons'; +import {StyledModalContent, StyledType, CheckMark} from '../../common/styled-components'; import {EXPORT_MAP_FORMATS, EXPORT_MAP_FORMAT_OPTIONS} from '@kepler.gl/constants'; import {StyledExportMapSection} from './components'; import ExportHtmlMapFactory from './export-html-map'; diff --git a/src/components/modals/image-modal-container.tsx b/src/components/src/modals/image-modal-container.tsx similarity index 100% rename from src/components/modals/image-modal-container.tsx rename to src/components/src/modals/image-modal-container.tsx diff --git a/src/components/modals/load-data-modal.tsx b/src/components/src/modals/load-data-modal.tsx similarity index 97% rename from src/components/modals/load-data-modal.tsx rename to src/components/src/modals/load-data-modal.tsx index 104901d037..648168b4be 100644 --- a/src/components/modals/load-data-modal.tsx +++ b/src/components/src/modals/load-data-modal.tsx @@ -23,14 +23,14 @@ import styled from 'styled-components'; import get from 'lodash.get'; import {IntlShape, useIntl} from 'react-intl'; -import FileUploadFactory from 'components/common/file-uploader/file-upload'; +import FileUploadFactory from '../common/file-uploader/file-upload'; import LoadStorageMapFactory from './load-storage-map'; import ModalTabsFactory from './modal-tabs'; import LoadingDialog from './loading-dialog'; import {LOADING_METHODS} from '@kepler.gl/constants'; import {FileLoading, FileLoadingProgress, LoadFiles} from '@kepler.gl/types'; -import {Provider} from 'cloud-providers'; +import {Provider} from '@kepler.gl/cloud-providers'; import {SetCloudProviderPayload, ProviderActions, ActionHandler} from '@kepler.gl/actions'; /** @typedef {import('./load-data-modal').LoadDataModalProps} LoadDataModalProps */ diff --git a/src/components/modals/load-storage-map.tsx b/src/components/src/modals/load-storage-map.tsx similarity index 98% rename from src/components/modals/load-storage-map.tsx rename to src/components/src/modals/load-storage-map.tsx index f220b3d39b..b26689276f 100644 --- a/src/components/modals/load-storage-map.tsx +++ b/src/components/src/modals/load-storage-map.tsx @@ -23,12 +23,13 @@ import styled from 'styled-components'; import moment from 'moment'; import LoadingDialog from './loading-dialog'; -import {Button} from 'components/common/styled-components'; +import {Button} from '../common/styled-components'; import CloudTile from './cloud-tile'; -import {Base, ArrowLeft} from 'components/common/icons'; +import {Base} from '../common/icons'; +import {ArrowLeft} from '../common/icons'; import ProviderModalContainer from './provider-modal-container'; import {FormattedMessage} from '@kepler.gl/localization'; -import {MapListItem, Provider} from 'cloud-providers'; +import {MapListItem, Provider} from '@kepler.gl/cloud-providers'; const StyledProviderSection = styled.div.attrs({ className: 'provider-selection' diff --git a/src/components/modals/loading-dialog.tsx b/src/components/src/modals/loading-dialog.tsx similarity index 97% rename from src/components/modals/loading-dialog.tsx rename to src/components/src/modals/loading-dialog.tsx index d3067a6e0c..d23380f7f8 100644 --- a/src/components/modals/loading-dialog.tsx +++ b/src/components/src/modals/loading-dialog.tsx @@ -20,7 +20,7 @@ import React from 'react'; import styled from 'styled-components'; -import LoadingSpinner from 'components/common/loading-spinner'; +import LoadingSpinner from '../common/loading-spinner'; import {FormattedMessage} from '@kepler.gl/localization'; const StyledSpinner = styled.div` diff --git a/src/components/modals/modal-dialog.tsx b/src/components/src/modals/modal-dialog.tsx similarity index 96% rename from src/components/modals/modal-dialog.tsx rename to src/components/src/modals/modal-dialog.tsx index 5403f6f524..ce364e0e33 100644 --- a/src/components/modals/modal-dialog.tsx +++ b/src/components/src/modals/modal-dialog.tsx @@ -18,7 +18,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -import Modal from 'components/common/modal'; +import Modal from '../common/modal'; const ModalDialogFactory = () => Modal; diff --git a/src/components/modals/modal-tabs.tsx b/src/components/src/modals/modal-tabs.tsx similarity index 98% rename from src/components/modals/modal-tabs.tsx rename to src/components/src/modals/modal-tabs.tsx index bafe3f4fee..5a4ab5204d 100644 --- a/src/components/modals/modal-tabs.tsx +++ b/src/components/src/modals/modal-tabs.tsx @@ -22,7 +22,7 @@ import React, {useCallback} from 'react'; import classnames from 'classnames'; import styled from 'styled-components'; import PropTypes from 'prop-types'; -import {media} from 'styles'; +import {media} from '@kepler.gl/styles'; import {FormattedMessage, useIntl} from 'react-intl'; import {LoadingMethod} from './load-data-modal'; diff --git a/src/components/modals/overwrite-map-modal.tsx b/src/components/src/modals/overwrite-map-modal.tsx similarity index 96% rename from src/components/modals/overwrite-map-modal.tsx rename to src/components/src/modals/overwrite-map-modal.tsx index 8ca9bf7002..8362e8ec10 100644 --- a/src/components/modals/overwrite-map-modal.tsx +++ b/src/components/src/modals/overwrite-map-modal.tsx @@ -20,12 +20,12 @@ import React from 'react'; import styled from 'styled-components'; -import {CenterVerticalFlexbox} from 'components/common/styled-components'; +import {CenterVerticalFlexbox} from '../common/styled-components'; import {UploadAnimation} from './status-panel'; import {FormattedMessage} from '@kepler.gl/localization'; import ImageModalContainer, {ImageModalContainerProps} from './image-modal-container'; import {Provider} from '@kepler.gl/cloud-providers'; -import {cleanupExportImage as cleanupExportImageAction} from 'actions'; +import {cleanupExportImage as cleanupExportImageAction} from '@kepler.gl/actions'; /** @typedef {import('./overwrite-map-modal').OverwriteMapModalProps} OverwriteMapModalProps */ diff --git a/src/components/modals/provider-modal-container.tsx b/src/components/src/modals/provider-modal-container.tsx similarity index 97% rename from src/components/modals/provider-modal-container.tsx rename to src/components/src/modals/provider-modal-container.tsx index 0a2ef12fe3..bde9041d00 100644 --- a/src/components/modals/provider-modal-container.tsx +++ b/src/components/src/modals/provider-modal-container.tsx @@ -19,7 +19,7 @@ // THE SOFTWARE. import React, {Component} from 'react'; -import {Provider} from 'cloud-providers'; +import {Provider} from '@kepler.gl/cloud-providers'; import {SetCloudProviderPayload} from '@kepler.gl/actions'; export type ProviderModalContainerProps = { diff --git a/src/components/modals/save-map-modal.tsx b/src/components/src/modals/save-map-modal.tsx similarity index 98% rename from src/components/modals/save-map-modal.tsx rename to src/components/src/modals/save-map-modal.tsx index 37c1909dad..5eacec4e6d 100644 --- a/src/components/modals/save-map-modal.tsx +++ b/src/components/src/modals/save-map-modal.tsx @@ -34,12 +34,12 @@ import { StyledExportSection, StyledModalSection, StyledModalInputFootnote -} from 'components/common/styled-components'; -import ImagePreview from 'components/common/image-preview'; +} from '../common/styled-components'; +import ImagePreview from '../common/image-preview'; import {FormattedMessage} from '@kepler.gl/localization'; import {MapInfo} from '@kepler.gl/types'; -import {Provider} from 'cloud-providers'; -import {setMapInfo, cleanupExportImage as cleanupExportImageAction} from 'actions'; +import {Provider} from '@kepler.gl/cloud-providers'; +import {setMapInfo, cleanupExportImage as cleanupExportImageAction} from '@kepler.gl/actions'; /** @typedef {import('./save-map-modal').SaveMapModalProps} SaveMapModalProps */ diff --git a/src/components/modals/share-map-modal.tsx b/src/components/src/modals/share-map-modal.tsx similarity index 97% rename from src/components/modals/share-map-modal.tsx rename to src/components/src/modals/share-map-modal.tsx index d63f071617..fc5019f74f 100644 --- a/src/components/modals/share-map-modal.tsx +++ b/src/components/src/modals/share-map-modal.tsx @@ -30,12 +30,15 @@ import { StyledExportSection, InputLight, Button -} from 'components/common/styled-components'; +} from '../common/styled-components'; import CloudTile from './cloud-tile'; import StatusPanel from './status-panel'; import {FormattedMessage} from '@kepler.gl/localization'; -import {Provider} from 'cloud-providers'; -import {cleanupExportImage as cleanupExportImageAction, SetCloudProviderPayload} from 'actions'; +import {Provider} from '@kepler.gl/cloud-providers'; +import { + cleanupExportImage as cleanupExportImageAction, + SetCloudProviderPayload +} from '@kepler.gl/actions'; export const StyledInputLabel = styled.label` font-size: 12px; diff --git a/src/components/modals/status-panel.tsx b/src/components/src/modals/status-panel.tsx similarity index 96% rename from src/components/modals/status-panel.tsx rename to src/components/src/modals/status-panel.tsx index c5d3382566..93589a3a94 100644 --- a/src/components/modals/status-panel.tsx +++ b/src/components/src/modals/status-panel.tsx @@ -20,8 +20,8 @@ import React, {ComponentType} from 'react'; import styled from 'styled-components'; -import {MapIcon} from 'components/common/icons'; -import {StyledExportSection} from 'components/common/styled-components'; +import {MapIcon} from '../common/icons'; +import {StyledExportSection} from '../common/styled-components'; import ErrorDisplay from './error-display'; import {FormattedMessage} from '@kepler.gl/localization'; import {IconProps} from '@kepler.gl/cloud-providers'; diff --git a/src/components/modals/storage-map-viewer.tsx b/src/components/src/modals/storage-map-viewer.tsx similarity index 98% rename from src/components/modals/storage-map-viewer.tsx rename to src/components/src/modals/storage-map-viewer.tsx index 3347277026..b52319950c 100644 --- a/src/components/modals/storage-map-viewer.tsx +++ b/src/components/src/modals/storage-map-viewer.tsx @@ -21,7 +21,7 @@ import React from 'react'; import styled from 'styled-components'; import moment from 'moment'; -import {LeftArrow} from 'components/common/icons'; +import {LeftArrow} from '../common/icons'; import {FormattedMessage} from '@kepler.gl/localization'; const imageH = 108; diff --git a/src/components/notification-panel.tsx b/src/components/src/notification-panel.tsx similarity index 100% rename from src/components/notification-panel.tsx rename to src/components/src/notification-panel.tsx diff --git a/src/components/notification-panel/notification-item.tsx b/src/components/src/notification-panel/notification-item.tsx similarity index 98% rename from src/components/notification-panel/notification-item.tsx rename to src/components/src/notification-panel/notification-item.tsx index 96445ad6d4..b6ea2994dd 100644 --- a/src/components/notification-panel/notification-item.tsx +++ b/src/components/src/notification-panel/notification-item.tsx @@ -20,7 +20,7 @@ import React, {Component} from 'react'; import styled from 'styled-components'; -import {Delete, Info, Warning, Checkmark} from 'components/common/icons'; +import {Delete, Info, Warning, Checkmark} from '../common/icons'; import ReactMarkdown from 'react-markdown'; import {ActionHandler, removeNotification as removeNotificationActions} from '@kepler.gl/actions'; diff --git a/src/components/plot-container.tsx b/src/components/src/plot-container.tsx similarity index 100% rename from src/components/plot-container.tsx rename to src/components/src/plot-container.tsx diff --git a/src/components/side-panel.tsx b/src/components/src/side-panel.tsx similarity index 99% rename from src/components/side-panel.tsx rename to src/components/src/side-panel.tsx index aca568814f..c01c117b24 100644 --- a/src/components/side-panel.tsx +++ b/src/components/src/side-panel.tsx @@ -33,7 +33,7 @@ import { ADD_MAP_STYLE_ID } from '@kepler.gl/constants'; -import {Layers, FilterFunnel, Settings, CursorClick} from 'components/common/icons'; +import {CursorClick, Layers, FilterFunnel, Settings} from './common/icons'; import SidebarFactory from './side-panel/side-bar'; import PanelHeaderFactory from './side-panel/panel-header'; diff --git a/src/components/side-panel/cloud-storage-dropdown.tsx b/src/components/src/side-panel/cloud-storage-dropdown.tsx similarity index 96% rename from src/components/side-panel/cloud-storage-dropdown.tsx rename to src/components/src/side-panel/cloud-storage-dropdown.tsx index 7432e67a6d..d71c38e9b9 100644 --- a/src/components/side-panel/cloud-storage-dropdown.tsx +++ b/src/components/src/side-panel/cloud-storage-dropdown.tsx @@ -19,7 +19,7 @@ // THE SOFTWARE. import React from 'react'; -import {PanelHeaderDropdownFactory, Icons} from 'components'; +import {PanelHeaderDropdownFactory, Icons} from '../'; const CloudStorageItems = [ { diff --git a/src/components/side-panel/common/dataset-info.tsx b/src/components/src/side-panel/common/dataset-info.tsx similarity index 100% rename from src/components/side-panel/common/dataset-info.tsx rename to src/components/src/side-panel/common/dataset-info.tsx diff --git a/src/components/side-panel/common/dataset-tag.tsx b/src/components/src/side-panel/common/dataset-tag.tsx similarity index 98% rename from src/components/side-panel/common/dataset-tag.tsx rename to src/components/src/side-panel/common/dataset-tag.tsx index 46953a3974..ccf34aa8bd 100644 --- a/src/components/side-panel/common/dataset-tag.tsx +++ b/src/components/src/side-panel/common/dataset-tag.tsx @@ -21,7 +21,7 @@ import React from 'react'; import {FormattedMessage} from '@kepler.gl/localization'; import styled from 'styled-components'; -import {DatasetSquare, Tooltip} from 'components'; +import {DatasetSquare, Tooltip} from '../..'; import {DatasetTagProps, UpdateTableColorTypes} from './types'; const DatasetTagWrapper = styled.div` diff --git a/src/components/side-panel/common/dataset-title.tsx b/src/components/src/side-panel/common/dataset-title.tsx similarity index 95% rename from src/components/side-panel/common/dataset-title.tsx rename to src/components/src/side-panel/common/dataset-title.tsx index 38770835df..9d11eb5bfb 100644 --- a/src/components/side-panel/common/dataset-title.tsx +++ b/src/components/src/side-panel/common/dataset-title.tsx @@ -22,11 +22,12 @@ import React, {createRef, MouseEvent, PureComponent} from 'react'; import styled from 'styled-components'; import {FormattedMessage} from '@kepler.gl/localization'; -import {CenterFlexbox, Tooltip} from 'components/common/styled-components'; -import {ArrowRight, Table, Trash} from 'components/common/icons'; -import DatasetTagFactory from 'components/side-panel/common/dataset-tag'; +import {Table} from '@kepler.gl/layers'; +import {CenterFlexbox, Tooltip} from '../../common/styled-components'; +import {ArrowRight, Trash} from '../../common/icons'; +import DatasetTagFactory from './dataset-tag'; import CustomPicker from '../layer-panel/custom-picker'; -import {Portaled} from 'components'; +import {Portaled} from '../..'; import {rgbToHex} from '@kepler.gl/utils'; import { StyledDatasetTitleProps, diff --git a/src/components/side-panel/common/source-data-catalog.tsx b/src/components/src/side-panel/common/source-data-catalog.tsx similarity index 91% rename from src/components/side-panel/common/source-data-catalog.tsx rename to src/components/src/side-panel/common/source-data-catalog.tsx index 06ef4c2906..9be42b0ad4 100644 --- a/src/components/side-panel/common/source-data-catalog.tsx +++ b/src/components/src/side-panel/common/source-data-catalog.tsx @@ -21,9 +21,9 @@ import React from 'react'; import styled from 'styled-components'; -import {SidePanelSection} from 'components/common/styled-components'; -import DatasetTitleFactory from 'components/side-panel/common/dataset-title'; -import DatasetInfoFactory from 'components/side-panel/common/dataset-info'; +import {SidePanelSection} from '../../common/styled-components'; +import DatasetTitleFactory from './dataset-title'; +import DatasetInfoFactory from './dataset-info'; import {SourceDataCatalogProps} from './types'; const SourceDataCatalogWrapper = styled.div` diff --git a/src/components/side-panel/common/source-data-selector.tsx b/src/components/src/side-panel/common/source-data-selector.tsx similarity index 92% rename from src/components/side-panel/common/source-data-selector.tsx rename to src/components/src/side-panel/common/source-data-selector.tsx index c7e86b065c..9dd21792b2 100644 --- a/src/components/side-panel/common/source-data-selector.tsx +++ b/src/components/src/side-panel/common/source-data-selector.tsx @@ -19,9 +19,9 @@ // THE SOFTWARE. import React, {useMemo} from 'react'; -import {PanelLabel, SidePanelSection} from 'components/common/styled-components'; -import ItemSelector from 'components/common/item-selector/item-selector'; -import DatasetTagFactory from 'components/side-panel/common/dataset-tag'; +import {PanelLabel, SidePanelSection} from '../../common/styled-components'; +import ItemSelector from '../../common/item-selector/item-selector'; +import DatasetTagFactory from './dataset-tag'; import {FormattedMessage} from '@kepler.gl/localization'; import {DatasetItemProps, SourceDataSelectorProps} from './types'; diff --git a/src/components/side-panel/common/types.ts b/src/components/src/side-panel/common/types.ts similarity index 100% rename from src/components/side-panel/common/types.ts rename to src/components/src/side-panel/common/types.ts diff --git a/src/components/side-panel/custom-panel.tsx b/src/components/src/side-panel/custom-panel.tsx similarity index 100% rename from src/components/side-panel/custom-panel.tsx rename to src/components/src/side-panel/custom-panel.tsx diff --git a/src/components/side-panel/filter-manager.tsx b/src/components/src/side-panel/filter-manager.tsx similarity index 96% rename from src/components/side-panel/filter-manager.tsx rename to src/components/src/side-panel/filter-manager.tsx index d8e0435171..1c1573a893 100644 --- a/src/components/side-panel/filter-manager.tsx +++ b/src/components/src/side-panel/filter-manager.tsx @@ -20,8 +20,8 @@ import React, {useCallback, useMemo} from 'react'; import {FormattedMessage} from '@kepler.gl/localization'; -import {Button, SidePanelDivider, SidePanelSection} from 'components/common/styled-components'; -import {Add} from 'components/common/icons'; +import {Button, SidePanelDivider, SidePanelSection} from '../common/styled-components'; +import {Add} from '../common/icons'; import SourceDataCatalogFactory from './common/source-data-catalog'; import FilterPanelFactory from './filter-panel/filter-panel'; import {Filter} from '@kepler.gl/types'; diff --git a/src/components/side-panel/filter-panel/filter-panel-header.tsx b/src/components/src/side-panel/filter-panel/filter-panel-header.tsx similarity index 93% rename from src/components/side-panel/filter-panel/filter-panel-header.tsx rename to src/components/src/side-panel/filter-panel/filter-panel-header.tsx index 2960cfb0b3..3024b67124 100644 --- a/src/components/side-panel/filter-panel/filter-panel-header.tsx +++ b/src/components/src/side-panel/filter-panel/filter-panel-header.tsx @@ -20,10 +20,10 @@ import React, {ComponentType} from 'react'; import styled from 'styled-components'; -import PanelHeaderActionFactory from 'components/side-panel/panel-header-action'; -import {Trash} from 'components/common/icons'; +import PanelHeaderActionFactory from '../../side-panel/panel-header-action'; +import {Trash} from '../../common/icons'; import {createLinearGradient} from '@kepler.gl/utils'; -import {StyledPanelHeader, StyledPanelHeaderProps} from 'components/common/styled-components'; +import {StyledPanelHeader, StyledPanelHeaderProps} from '../../common/styled-components'; import {RGBColor, Filter} from '@kepler.gl/types'; import {KeplerTable} from '@kepler.gl/table'; diff --git a/src/components/side-panel/filter-panel/filter-panel.tsx b/src/components/src/side-panel/filter-panel/filter-panel.tsx similarity index 87% rename from src/components/side-panel/filter-panel/filter-panel.tsx rename to src/components/src/side-panel/filter-panel/filter-panel.tsx index 723853eaf5..5c1f1d1e0d 100644 --- a/src/components/side-panel/filter-panel/filter-panel.tsx +++ b/src/components/src/side-panel/filter-panel/filter-panel.tsx @@ -24,14 +24,14 @@ import styled from 'styled-components'; import get from 'lodash.get'; import {ALL_FIELD_TYPES, FILTER_TYPES} from '@kepler.gl/constants'; -import NewFilterPanelFactory from 'components/filters/filter-panels/new-filter-panel'; -import TimeRangeFilterPanelFactory from 'components/filters/filter-panels/time-range-filter-panel'; -import SingleSelectFilterPanelFactory from 'components/filters/filter-panels/single-select-filter-panel'; -import MultiSelectFilterPanelFactory from 'components/filters/filter-panels/multi-select-filter-panel'; -import RangeFilterPanelFactory from 'components/filters/filter-panels/range-filter-panel'; -import PolygonFilterPanelFactory from 'components/filters/filter-panels/polygon-filter-panel'; +import NewFilterPanelFactory from '../../filters/filter-panels/new-filter-panel'; +import TimeRangeFilterPanelFactory from '../../filters/filter-panels/time-range-filter-panel'; +import SingleSelectFilterPanelFactory from '../../filters/filter-panels/single-select-filter-panel'; +import MultiSelectFilterPanelFactory from '../../filters/filter-panels/multi-select-filter-panel'; +import RangeFilterPanelFactory from '../../filters/filter-panels/range-filter-panel'; +import PolygonFilterPanelFactory from '../../filters/filter-panels/polygon-filter-panel'; import {Field, Filter} from '@kepler.gl/types'; -import {FilterPanelProps} from 'components/filters/filter-panels/types'; +import {FilterPanelProps} from '../../filters/filter-panels/types'; import {Layer} from '@kepler.gl/layers'; const StyledFilterPanel = styled.div` diff --git a/src/components/side-panel/interaction-manager.tsx b/src/components/src/side-panel/interaction-manager.tsx similarity index 100% rename from src/components/side-panel/interaction-manager.tsx rename to src/components/src/side-panel/interaction-manager.tsx diff --git a/src/components/side-panel/interaction-panel/brush-config.tsx b/src/components/src/side-panel/interaction-panel/brush-config.tsx similarity index 93% rename from src/components/side-panel/interaction-panel/brush-config.tsx rename to src/components/src/side-panel/interaction-panel/brush-config.tsx index 757a44e5ea..94a1d4c936 100644 --- a/src/components/side-panel/interaction-panel/brush-config.tsx +++ b/src/components/src/side-panel/interaction-panel/brush-config.tsx @@ -19,9 +19,9 @@ // THE SOFTWARE. import React from 'react'; -import RangeSliderFactory from 'components/common/range-slider'; +import RangeSliderFactory from '../../common/range-slider'; -import {PanelLabel, SidePanelSection} from 'components/common/styled-components'; +import {PanelLabel, SidePanelSection} from '../../common/styled-components'; import {BRUSH_CONFIG} from '@kepler.gl/reducers'; import {FormattedMessage} from '@kepler.gl/localization'; diff --git a/src/components/side-panel/interaction-panel/interaction-panel.tsx b/src/components/src/side-panel/interaction-panel/interaction-panel.tsx similarity index 92% rename from src/components/side-panel/interaction-panel/interaction-panel.tsx rename to src/components/src/side-panel/interaction-panel/interaction-panel.tsx index e14fab25a7..04b2c3a3d6 100644 --- a/src/components/side-panel/interaction-panel/interaction-panel.tsx +++ b/src/components/src/side-panel/interaction-panel/interaction-panel.tsx @@ -20,30 +20,30 @@ import React, {useState, ComponentType, ReactElement, useCallback} from 'react'; import styled from 'styled-components'; -import Switch from 'components/common/switch'; +import Switch from '../../common/switch'; import BrushConfigFactory from './brush-config'; import TooltipConfigFactory from './tooltip-config'; import {Datasets} from '@kepler.gl/table'; -import {InteractionConfig} from '@kepler.gl/reducers'; +import {InteractionConfig} from '@kepler.gl/types'; import { StyledPanelHeader, PanelHeaderTitle, PanelHeaderContent, PanelContent -} from 'components/common/styled-components'; -import {Messages, Crosshairs, CursorClick, Pin} from 'components/common/icons'; +} from '../../common/styled-components'; +import {Messages, Crosshairs, CursorClick, Pin} from '../../common/icons'; import {FormattedMessage} from '@kepler.gl/localization'; -import {ValueOf} from 'types'; +import {ValueOf} from '@kepler.gl/types'; interface InteractionPanelProps { datasets: Datasets; config: ValueOf; onConfigChange: any; interactionConfigIcons?: { - [key: string]: ReactElement; + [key: string]: React.ElementType; }; } @@ -53,7 +53,7 @@ const StyledInteractionPanel = styled.div` InteractionPanelFactory.deps = [TooltipConfigFactory, BrushConfigFactory]; -const INTERACTION_CONFIG_ICONS = { +const INTERACTION_CONFIG_ICONS: {[key: string]: React.ElementType} = { tooltip: Messages, geocoder: Pin, brush: Crosshairs, diff --git a/src/components/side-panel/interaction-panel/tooltip-config.tsx b/src/components/src/side-panel/interaction-panel/tooltip-config.tsx similarity index 95% rename from src/components/side-panel/interaction-panel/tooltip-config.tsx rename to src/components/src/side-panel/interaction-panel/tooltip-config.tsx index 5c3eb1612d..8118b2884a 100644 --- a/src/components/side-panel/interaction-panel/tooltip-config.tsx +++ b/src/components/src/side-panel/interaction-panel/tooltip-config.tsx @@ -28,11 +28,11 @@ import { SBFlexboxNoMargin, Button, PanelLabel -} from 'components/common/styled-components'; -import DatasetTagFactory from 'components/side-panel/common/dataset-tag'; +} from '../../common/styled-components'; +import DatasetTagFactory from '../common/dataset-tag'; import TooltipChickletFactory from './tooltip-config/tooltip-chicklet'; -import Switch from 'components/common/switch'; -import ItemSelector from 'components/common/item-selector/item-selector'; +import Switch from '../../common/switch'; +import ItemSelector from '../../common/item-selector/item-selector'; import {COMPARE_TYPES, GEOCODER_DATASET_NAME} from '@kepler.gl/constants'; import FieldSelectorFactory from '../../common/field-selector'; import KeplerTable, {Datasets} from '@kepler.gl/table'; @@ -74,14 +74,14 @@ type TooltipConfigProps = { [key: string]: {name: string; format: string | null}[]; }; compareMode: boolean; - compareType: string[]; + compareType: string | null; }; onChange: (config: { fieldsToShow: { [key: string]: {name: string; format: string | null}[]; }; compareMode: boolean; - compareType: string[]; + compareType: string | null; }) => void; datasets: Datasets; intl: IntlShape; @@ -93,14 +93,14 @@ type DatasetTooltipConfigProps = { [key: string]: {name: string; format: string | null}[]; }; compareMode: boolean; - compareType: string[]; + compareType: string | null; }; onChange: (config: { fieldsToShow: { [key: string]: {name: string; format: string | null}[]; }; compareMode: boolean; - compareType: string[]; + compareType: string | null; }) => void; dataset: KeplerTable; }; diff --git a/src/components/side-panel/interaction-panel/tooltip-config/tooltip-chicklet.tsx b/src/components/src/side-panel/interaction-panel/tooltip-config/tooltip-chicklet.tsx similarity index 96% rename from src/components/side-panel/interaction-panel/tooltip-config/tooltip-chicklet.tsx rename to src/components/src/side-panel/interaction-panel/tooltip-config/tooltip-chicklet.tsx index 58ce5df330..cf657cf439 100644 --- a/src/components/side-panel/interaction-panel/tooltip-config/tooltip-chicklet.tsx +++ b/src/components/src/side-panel/interaction-panel/tooltip-config/tooltip-chicklet.tsx @@ -20,14 +20,14 @@ import React, {Component, ComponentType} from 'react'; import styled from 'styled-components'; -import {ChickletButton, ChickletTag} from 'components/common/item-selector/chickleted-input'; -import {Hash, Delete} from 'components/common/icons'; -import DropdownList from 'components/common/item-selector/dropdown-list'; +import {ChickletButton, ChickletTag} from '../../../common/item-selector/chickleted-input'; +import {Hash, Delete} from '../../../common/icons'; +import DropdownList from '../../../common/item-selector/dropdown-list'; import {FormattedMessage} from '@kepler.gl/localization'; import onClickOutside from 'react-onclickoutside'; import {FIELD_OPTS, TOOLTIP_FORMATS, TOOLTIP_FORMAT_TYPES, TOOLTIP_KEY} from '@kepler.gl/constants'; import {getFormatter} from '@kepler.gl/utils'; -import TippyTooltip from 'components/common/tippy-tooltip'; +import TippyTooltip from '../../../common/tippy-tooltip'; interface TooltipChickletProps { disabled: boolean; diff --git a/src/components/side-panel/layer-manager.tsx b/src/components/src/side-panel/layer-manager.tsx similarity index 97% rename from src/components/side-panel/layer-manager.tsx rename to src/components/src/side-panel/layer-manager.tsx index 040d93ced0..37cdab7ef5 100644 --- a/src/components/side-panel/layer-manager.tsx +++ b/src/components/src/side-panel/layer-manager.tsx @@ -31,13 +31,13 @@ import PanelTitleFactory from './panel-title'; import DatasetSectionFactory from './layer-panel/dataset-section'; import AddLayerButtonFactory from './layer-panel/add-layer-button'; -import ItemSelector from 'components/common/item-selector/item-selector'; -import {PanelLabel, SidePanelDivider, SidePanelSection} from 'components/common/styled-components'; +import ItemSelector from '../common/item-selector/item-selector'; +import {PanelLabel, SidePanelDivider, SidePanelSection} from '../common/styled-components'; import {LAYER_BLENDINGS} from '@kepler.gl/constants'; import {Layer, LayerClassesType} from '@kepler.gl/layers'; import {UIStateActions, VisStateActions, ActionHandler} from '@kepler.gl/actions'; -import {SidePanelItem} from 'components/types'; +import {SidePanelItem} from '../types'; import {LayerPanelListView} from '@kepler.gl/types'; import {Datasets} from '@kepler.gl/table'; diff --git a/src/components/side-panel/layer-panel/add-layer-button.tsx b/src/components/src/side-panel/layer-panel/add-layer-button.tsx similarity index 95% rename from src/components/side-panel/layer-panel/add-layer-button.tsx rename to src/components/src/side-panel/layer-panel/add-layer-button.tsx index 1e8b29ce46..1d8c7cfb1f 100644 --- a/src/components/side-panel/layer-panel/add-layer-button.tsx +++ b/src/components/src/side-panel/layer-panel/add-layer-button.tsx @@ -24,11 +24,11 @@ import {FormattedMessage} from '@kepler.gl/localization'; import {WrappedComponentProps} from 'react-intl'; import Tippy from '@tippyjs/react'; -import {Add} from 'components/common/icons'; -import {Button} from 'components/common/styled-components'; -import {DatasetSquare} from 'components'; -import Typeahead from 'components/common/item-selector/typeahead'; -import Accessor from 'components/common/item-selector/accessor'; +import {Add} from '../../common/icons'; +import {Button} from '../../common/styled-components'; +import {DatasetSquare} from '../..'; +import Typeahead from '../../common/item-selector/typeahead'; +import Accessor from '../../common/item-selector/accessor'; import {Datasets} from '@kepler.gl/table'; import {RGBColor} from '@kepler.gl/types'; diff --git a/src/components/side-panel/layer-panel/color-palette.tsx b/src/components/src/side-panel/layer-panel/color-palette.tsx similarity index 100% rename from src/components/side-panel/layer-panel/color-palette.tsx rename to src/components/src/side-panel/layer-panel/color-palette.tsx diff --git a/src/components/side-panel/layer-panel/color-range-selector.tsx b/src/components/src/side-panel/layer-panel/color-range-selector.tsx similarity index 97% rename from src/components/side-panel/layer-panel/color-range-selector.tsx rename to src/components/src/side-panel/layer-panel/color-range-selector.tsx index dec9d743a8..51157ebde9 100644 --- a/src/components/side-panel/layer-panel/color-range-selector.tsx +++ b/src/components/src/side-panel/layer-panel/color-range-selector.tsx @@ -23,9 +23,9 @@ import uniq from 'lodash.uniq'; import styled from 'styled-components'; import {createSelector} from 'reselect'; -import ItemSelector from 'components/common/item-selector/item-selector'; -import {PanelLabel} from 'components/common/styled-components'; -import Switch from 'components/common/switch'; +import ItemSelector from '../../common/item-selector/item-selector'; +import {PanelLabel} from '../../common/styled-components'; +import Switch from '../../common/switch'; import ColorPalette from './color-palette'; import CustomPalette from './custom-palette'; import {COLOR_RANGES, ColorRange} from '@kepler.gl/constants'; diff --git a/src/components/side-panel/layer-panel/color-selector.tsx b/src/components/src/side-panel/layer-panel/color-selector.tsx similarity index 98% rename from src/components/side-panel/layer-panel/color-selector.tsx rename to src/components/src/side-panel/layer-panel/color-selector.tsx index caef409f55..95a2ba6bbb 100644 --- a/src/components/side-panel/layer-panel/color-selector.tsx +++ b/src/components/src/side-panel/layer-panel/color-selector.tsx @@ -24,7 +24,7 @@ import {rgbToHex} from '@kepler.gl/utils'; import SingleColorPalette from './single-color-palette'; import ColorRangeSelector from './color-range-selector'; import ColorPalette from './color-palette'; -import {StyledPanelDropdown} from 'components/common/styled-components'; +import {StyledPanelDropdown} from '../../common/styled-components'; import onClickOutside from 'react-onclickoutside'; import {ColorRange} from '@kepler.gl/constants'; import {NestedPartial, RGBColor, ColorUI} from '@kepler.gl/types'; diff --git a/src/components/side-panel/layer-panel/column-selector.tsx b/src/components/src/side-panel/layer-panel/column-selector.tsx similarity index 95% rename from src/components/side-panel/layer-panel/column-selector.tsx rename to src/components/src/side-panel/layer-panel/column-selector.tsx index 50e7baa1c7..9e4791e183 100644 --- a/src/components/side-panel/layer-panel/column-selector.tsx +++ b/src/components/src/side-panel/layer-panel/column-selector.tsx @@ -21,8 +21,8 @@ import React from 'react'; import styled from 'styled-components'; import {FormattedMessage} from '@kepler.gl/localization'; -import {PanelLabel} from 'components/common/styled-components'; -import FieldSelectorFactory from 'components/common/field-selector'; +import {PanelLabel} from '../../common/styled-components'; +import FieldSelectorFactory from '../../common/field-selector'; import {validateColumn} from '@kepler.gl/reducers'; import {LayerColumn, LayerColumns} from '@kepler.gl/layers'; import {Field, FieldPair} from '@kepler.gl/types'; diff --git a/src/components/side-panel/layer-panel/custom-palette.tsx b/src/components/src/side-panel/layer-panel/custom-palette.tsx similarity index 97% rename from src/components/side-panel/layer-panel/custom-palette.tsx rename to src/components/src/side-panel/layer-panel/custom-palette.tsx index ceb82e79a9..67b795edb9 100644 --- a/src/components/side-panel/layer-panel/custom-palette.tsx +++ b/src/components/src/side-panel/layer-panel/custom-palette.tsx @@ -22,10 +22,10 @@ import React, {Component, createRef, MouseEventHandler, MouseEvent} from 'react' import classnames from 'classnames'; import styled, {css} from 'styled-components'; import {SortableContainer, SortableElement, SortableHandle} from 'react-sortable-hoc'; -import Portaled from 'components/common/portaled'; +import Portaled from '../../common/portaled'; -import {Button, InlineInput} from 'components/common/styled-components'; -import {VertDots, Trash} from 'components/common/icons'; +import {Button, InlineInput} from '../../common/styled-components'; +import {VertDots, Trash} from '../../common/icons'; import ColorPalette from './color-palette'; import CustomPicker from './custom-picker'; import {arrayMove} from '@kepler.gl/utils'; diff --git a/src/components/side-panel/layer-panel/custom-picker.tsx b/src/components/src/side-panel/layer-panel/custom-picker.tsx similarity index 100% rename from src/components/side-panel/layer-panel/custom-picker.tsx rename to src/components/src/side-panel/layer-panel/custom-picker.tsx diff --git a/src/components/side-panel/layer-panel/dataset-layer-group.tsx b/src/components/src/side-panel/layer-panel/dataset-layer-group.tsx similarity index 100% rename from src/components/side-panel/layer-panel/dataset-layer-group.tsx rename to src/components/src/side-panel/layer-panel/dataset-layer-group.tsx diff --git a/src/components/side-panel/layer-panel/dataset-layer-section.tsx b/src/components/src/side-panel/layer-panel/dataset-layer-section.tsx similarity index 100% rename from src/components/side-panel/layer-panel/dataset-layer-section.tsx rename to src/components/src/side-panel/layer-panel/dataset-layer-section.tsx diff --git a/src/components/side-panel/layer-panel/dataset-section.tsx b/src/components/src/side-panel/layer-panel/dataset-section.tsx similarity index 97% rename from src/components/side-panel/layer-panel/dataset-section.tsx rename to src/components/src/side-panel/layer-panel/dataset-section.tsx index 6e8dd4feff..1f0a1784e3 100644 --- a/src/components/side-panel/layer-panel/dataset-section.tsx +++ b/src/components/src/side-panel/layer-panel/dataset-section.tsx @@ -21,8 +21,8 @@ import React from 'react'; import styled from 'styled-components'; import {FormattedMessage} from '@kepler.gl/localization'; -import {Add} from 'components/common/icons'; -import {Button} from 'components/common/styled-components'; +import {Add} from '../../common/icons'; +import {Button} from '../../common/styled-components'; import SourceDataCatalogFactory from '../common/source-data-catalog'; import {UIStateActions, VisStateActions, ActionHandler} from '@kepler.gl/actions'; diff --git a/src/components/side-panel/layer-panel/dimension-scale-selector.tsx b/src/components/src/side-panel/layer-panel/dimension-scale-selector.tsx similarity index 93% rename from src/components/side-panel/layer-panel/dimension-scale-selector.tsx rename to src/components/src/side-panel/layer-panel/dimension-scale-selector.tsx index 5aaa32c912..c402a792dc 100644 --- a/src/components/side-panel/layer-panel/dimension-scale-selector.tsx +++ b/src/components/src/side-panel/layer-panel/dimension-scale-selector.tsx @@ -19,8 +19,8 @@ // THE SOFTWARE. import React from 'react'; -import {PanelLabel, SidePanelSection} from 'components/common/styled-components'; -import ItemSelector from 'components/common/item-selector/item-selector'; +import {PanelLabel, SidePanelSection} from '../../common/styled-components'; +import ItemSelector from '../../common/item-selector/item-selector'; import {FormattedMessage} from '@kepler.gl/localization'; import {camelize} from '@kepler.gl/utils'; diff --git a/src/components/side-panel/layer-panel/how-to-button.tsx b/src/components/src/side-panel/layer-panel/how-to-button.tsx similarity index 96% rename from src/components/side-panel/layer-panel/how-to-button.tsx rename to src/components/src/side-panel/layer-panel/how-to-button.tsx index 3c995fa2b4..a438ca21a6 100644 --- a/src/components/side-panel/layer-panel/how-to-button.tsx +++ b/src/components/src/side-panel/layer-panel/how-to-button.tsx @@ -22,7 +22,7 @@ import React, {MouseEventHandler} from 'react'; import styled from 'styled-components'; import {FormattedMessage} from '@kepler.gl/localization'; -import {Button} from 'components/common/styled-components'; +import {Button} from '../../common/styled-components'; const StyledHowToButton = styled.div` position: absolute; diff --git a/src/components/side-panel/layer-panel/layer-column-config.tsx b/src/components/src/side-panel/layer-panel/layer-column-config.tsx similarity index 97% rename from src/components/side-panel/layer-panel/layer-column-config.tsx rename to src/components/src/side-panel/layer-panel/layer-column-config.tsx index 0e7b7d0f91..7cc2bf9479 100644 --- a/src/components/side-panel/layer-panel/layer-column-config.tsx +++ b/src/components/src/side-panel/layer-panel/layer-column-config.tsx @@ -21,7 +21,7 @@ import React, {useCallback, useMemo} from 'react'; import styled from 'styled-components'; import {FormattedMessage} from '@kepler.gl/localization'; -import {PanelLabel, SidePanelSection} from 'components/common/styled-components'; +import {PanelLabel, SidePanelSection} from '../../common/styled-components'; import ColumnSelectorFactory from './column-selector'; import {ColumnPairs, Layer, LayerColumns, LayerBaseConfig} from '@kepler.gl/layers'; import {Field, FieldPair} from '@kepler.gl/types'; diff --git a/src/components/side-panel/layer-panel/layer-config-group.tsx b/src/components/src/side-panel/layer-panel/layer-config-group.tsx similarity index 97% rename from src/components/side-panel/layer-panel/layer-config-group.tsx rename to src/components/src/side-panel/layer-panel/layer-config-group.tsx index b981bd99a8..29284905b7 100644 --- a/src/components/side-panel/layer-panel/layer-config-group.tsx +++ b/src/components/src/side-panel/layer-panel/layer-config-group.tsx @@ -23,9 +23,9 @@ import {polyfill} from 'react-lifecycles-compat'; import styled from 'styled-components'; import classnames from 'classnames'; import {FormattedMessage} from 'react-intl'; -import Switch from 'components/common/switch'; -import InfoHelperFactory from 'components/common/info-helper'; -import {VertThreeDots} from 'components/common/icons'; +import Switch from '../../common/switch'; +import InfoHelperFactory from '../../common/info-helper'; +import {VertThreeDots} from '../../common/icons'; import {Layer} from '@kepler.gl/layers'; import {LayerVisConfig} from '@kepler.gl/types'; diff --git a/src/components/side-panel/layer-panel/layer-configurator.tsx b/src/components/src/side-panel/layer-panel/layer-configurator.tsx similarity index 99% rename from src/components/side-panel/layer-panel/layer-configurator.tsx rename to src/components/src/side-panel/layer-panel/layer-configurator.tsx index 0900e79703..d925a5c70c 100644 --- a/src/components/side-panel/layer-panel/layer-configurator.tsx +++ b/src/components/src/side-panel/layer-panel/layer-configurator.tsx @@ -23,15 +23,15 @@ import React, {Component, Fragment} from 'react'; import styled from 'styled-components'; import {FormattedMessage} from '@kepler.gl/localization'; -import {Input, PanelLabel, SidePanelSection} from 'components/common/styled-components'; -import ItemSelector from 'components/common/item-selector/item-selector'; +import {Input, PanelLabel, SidePanelSection} from '../../common/styled-components'; +import ItemSelector from '../../common/item-selector/item-selector'; import VisConfigByFieldSelectorFactory from './vis-config-by-field-selector'; import LayerColumnConfigFactory from './layer-column-config'; import LayerTypeSelectorFactory from './layer-type-selector'; import DimensionScaleSelector from './dimension-scale-selector'; import ColorSelector from './color-selector'; -import SourceDataSelectorFactory from 'components/side-panel/common/source-data-selector'; +import SourceDataSelectorFactory from '../common/source-data-selector'; import VisConfigSwitchFactory from './vis-config-switch'; import VisConfigSliderFactory from './vis-config-slider'; import LayerConfigGroupFactory, {ConfigGroupCollapsibleContent} from './layer-config-group'; diff --git a/src/components/side-panel/layer-panel/layer-list.tsx b/src/components/src/side-panel/layer-panel/layer-list.tsx similarity index 100% rename from src/components/side-panel/layer-panel/layer-list.tsx rename to src/components/src/side-panel/layer-panel/layer-list.tsx diff --git a/src/components/side-panel/layer-panel/layer-panel-header.tsx b/src/components/src/side-panel/layer-panel/layer-panel-header.tsx similarity index 97% rename from src/components/side-panel/layer-panel/layer-panel-header.tsx rename to src/components/src/side-panel/layer-panel/layer-panel-header.tsx index ea642c3b2f..0513be35cb 100644 --- a/src/components/side-panel/layer-panel/layer-panel-header.tsx +++ b/src/components/src/side-panel/layer-panel/layer-panel-header.tsx @@ -28,8 +28,8 @@ import React, { import classnames from 'classnames'; import styled, {css} from 'styled-components'; import {SortableHandle} from 'react-sortable-hoc'; -import PanelHeaderActionFactory from 'components/side-panel/panel-header-action'; -import {Tooltip} from 'components/common/styled-components'; +import PanelHeaderActionFactory from '../panel-header-action'; +import {Tooltip} from '../../common/styled-components'; import { Copy, ArrowDown, @@ -38,12 +38,12 @@ import { Trash, VertDots, WarningSign -} from 'components/common/icons'; +} from '../../common/icons'; -import {InlineInput, StyledPanelHeader} from 'components/common/styled-components'; +import {InlineInput, StyledPanelHeader} from '../../common/styled-components'; import {FormattedMessage} from '@kepler.gl/localization'; import {RGBColor} from '@kepler.gl/types'; -import {BaseProps} from 'components/common/icons/base'; +import {BaseProps} from '../../common/icons'; type LayerLabelEditorProps = { layerId: string; diff --git a/src/components/side-panel/layer-panel/layer-panel.tsx b/src/components/src/side-panel/layer-panel/layer-panel.tsx similarity index 100% rename from src/components/side-panel/layer-panel/layer-panel.tsx rename to src/components/src/side-panel/layer-panel/layer-panel.tsx diff --git a/src/components/side-panel/layer-panel/layer-type-dropdown-list.tsx b/src/components/src/side-panel/layer-panel/layer-type-dropdown-list.tsx similarity index 100% rename from src/components/side-panel/layer-panel/layer-type-dropdown-list.tsx rename to src/components/src/side-panel/layer-panel/layer-type-dropdown-list.tsx diff --git a/src/components/side-panel/layer-panel/layer-type-list-item.tsx b/src/components/src/side-panel/layer-panel/layer-type-list-item.tsx similarity index 98% rename from src/components/side-panel/layer-panel/layer-type-list-item.tsx rename to src/components/src/side-panel/layer-panel/layer-type-list-item.tsx index 7f21ac0312..9996fe4e28 100644 --- a/src/components/side-panel/layer-panel/layer-type-list-item.tsx +++ b/src/components/src/side-panel/layer-panel/layer-type-list-item.tsx @@ -23,7 +23,7 @@ import styled, {withTheme} from 'styled-components'; import {CLOUDFRONT} from '@kepler.gl/constants'; import classNames from 'classnames'; import {FormattedMessage} from '@kepler.gl/localization'; -import {BaseProps} from 'components/common/icons/base'; +import {BaseProps} from '../../common/icons'; type LayerTypeListItemProps = { value: { diff --git a/src/components/side-panel/layer-panel/layer-type-selector.tsx b/src/components/src/side-panel/layer-panel/layer-type-selector.tsx similarity index 95% rename from src/components/side-panel/layer-panel/layer-type-selector.tsx rename to src/components/src/side-panel/layer-panel/layer-type-selector.tsx index f387472d08..e7a91919a6 100644 --- a/src/components/side-panel/layer-panel/layer-type-selector.tsx +++ b/src/components/src/side-panel/layer-panel/layer-type-selector.tsx @@ -23,9 +23,9 @@ import styled, {withTheme} from 'styled-components'; import LayerTypeDropdownListFactory, {LayerTypeOption} from './layer-type-dropdown-list'; import LayerTypeListItemFactory from './layer-type-list-item'; -import ItemSelector from 'components/common/item-selector/item-selector'; +import ItemSelector from '../../common/item-selector/item-selector'; -import {SidePanelSection} from 'components/common/styled-components'; +import {SidePanelSection} from '../../common/styled-components'; type Option = { id: string; diff --git a/src/components/side-panel/layer-panel/panel-view-list-toggle.tsx b/src/components/src/side-panel/layer-panel/panel-view-list-toggle.tsx similarity index 95% rename from src/components/side-panel/layer-panel/panel-view-list-toggle.tsx rename to src/components/src/side-panel/layer-panel/panel-view-list-toggle.tsx index b23d162c9b..f01e415278 100644 --- a/src/components/side-panel/layer-panel/panel-view-list-toggle.tsx +++ b/src/components/src/side-panel/layer-panel/panel-view-list-toggle.tsx @@ -20,9 +20,9 @@ import React, {useMemo} from 'react'; import styled from 'styled-components'; -import OrderByList from 'components/common/icons/order-by-list'; -import OrderByDataset from 'components/common/icons/order-by-dataset'; -import {Tooltip} from 'components/common/styled-components'; +import OrderByList from '../../common/icons/order-by-list'; +import OrderByDataset from '../../common/icons/order-by-dataset'; +import {Tooltip} from '../../common/styled-components'; import {FormattedMessage} from '@kepler.gl/localization'; import {LayerPanelListView} from '@kepler.gl/types'; diff --git a/src/components/side-panel/layer-panel/single-color-palette.tsx b/src/components/src/side-panel/layer-panel/single-color-palette.tsx similarity index 100% rename from src/components/side-panel/layer-panel/single-color-palette.tsx rename to src/components/src/side-panel/layer-panel/single-color-palette.tsx diff --git a/src/components/side-panel/layer-panel/text-label-panel.tsx b/src/components/src/side-panel/layer-panel/text-label-panel.tsx similarity index 96% rename from src/components/side-panel/layer-panel/text-label-panel.tsx rename to src/components/src/side-panel/layer-panel/text-label-panel.tsx index 78f549203e..e8c1614595 100644 --- a/src/components/side-panel/layer-panel/text-label-panel.tsx +++ b/src/components/src/side-panel/layer-panel/text-label-panel.tsx @@ -27,15 +27,15 @@ import { SBFlexboxItem, SidePanelSection, SpaceBetweenFlexbox -} from 'components/common/styled-components'; -import {Add} from 'components/common/icons'; +} from '../../common/styled-components'; +import {Add} from '../../common/icons'; import ColorSelector from './color-selector'; -import ItemSelector from 'components/common/item-selector/item-selector'; +import ItemSelector from '../../common/item-selector/item-selector'; import LayerConfigGroupFactory, { ConfigGroupCollapsibleContent, ConfigGroupCollapsibleHeader } from './layer-config-group'; -import RangeSliderFactory from 'components/common/range-slider'; +import RangeSliderFactory from '../../common/range-slider'; import FieldSelectorFactory from '../../common/field-selector'; import {RGBColor, LayerTextLabel, Field} from '@kepler.gl/types'; diff --git a/src/components/side-panel/layer-panel/vis-config-by-field-selector.tsx b/src/components/src/side-panel/layer-panel/vis-config-by-field-selector.tsx similarity index 96% rename from src/components/side-panel/layer-panel/vis-config-by-field-selector.tsx rename to src/components/src/side-panel/layer-panel/vis-config-by-field-selector.tsx index aa8a01b20a..1066c62f72 100644 --- a/src/components/side-panel/layer-panel/vis-config-by-field-selector.tsx +++ b/src/components/src/side-panel/layer-panel/vis-config-by-field-selector.tsx @@ -23,8 +23,8 @@ import {FormattedMessage, injectIntl, WrappedComponentProps} from 'react-intl'; import {Field} from '@kepler.gl/types'; -import {PanelLabel, PanelLabelWrapper, SidePanelSection} from 'components/common/styled-components'; -import InfoHelperFactory from 'components/common/info-helper'; +import {PanelLabel, PanelLabelWrapper, SidePanelSection} from '../../common/styled-components'; +import InfoHelperFactory from '../../common/info-helper'; import DimensionScaleSelector from './dimension-scale-selector'; import {camelize} from '@kepler.gl/utils'; import FieldSelectorFactory from '../../common/field-selector'; diff --git a/src/components/side-panel/layer-panel/vis-config-slider.tsx b/src/components/src/side-panel/layer-panel/vis-config-slider.tsx similarity index 97% rename from src/components/side-panel/layer-panel/vis-config-slider.tsx rename to src/components/src/side-panel/layer-panel/vis-config-slider.tsx index eb2ede6706..716fc01f77 100644 --- a/src/components/side-panel/layer-panel/vis-config-slider.tsx +++ b/src/components/src/side-panel/layer-panel/vis-config-slider.tsx @@ -21,11 +21,11 @@ import React, {useState, useCallback, useEffect, useRef} from 'react'; import styled from 'styled-components'; -import {PanelLabel, SidePanelSection} from 'components/common/styled-components'; -import RangeSliderFactory from 'components/common/range-slider'; +import {PanelLabel, SidePanelSection} from '../../common/styled-components'; +import RangeSliderFactory from '../../common/range-slider'; import {FormattedMessage} from '@kepler.gl/localization'; import {KeyEvent} from '@kepler.gl/constants'; -import {Checkbox} from 'components'; +import {Checkbox} from '../..'; import {Layer, LayerBaseConfig} from '@kepler.gl/layers'; import {isInRange} from '@kepler.gl/table'; import {clamp} from '@kepler.gl/utils'; diff --git a/src/components/side-panel/layer-panel/vis-config-switch.tsx b/src/components/src/side-panel/layer-panel/vis-config-switch.tsx similarity index 93% rename from src/components/side-panel/layer-panel/vis-config-switch.tsx rename to src/components/src/side-panel/layer-panel/vis-config-switch.tsx index 6d6bf072db..77a936a123 100644 --- a/src/components/side-panel/layer-panel/vis-config-switch.tsx +++ b/src/components/src/side-panel/layer-panel/vis-config-switch.tsx @@ -20,9 +20,9 @@ import React from 'react'; import styled from 'styled-components'; -import InfoHelperFactory from 'components/common/info-helper'; -import Switch from 'components/common/switch'; -import {SidePanelSection, PanelLabel} from 'components/common/styled-components'; +import InfoHelperFactory from '../../common/info-helper'; +import Switch from '../../common/switch'; +import {SidePanelSection, PanelLabel} from '../../common/styled-components'; import {FormattedMessage} from '@kepler.gl/localization'; import {capitalizeFirstLetter} from '@kepler.gl/utils'; import {Layer} from '@kepler.gl/layers'; diff --git a/src/components/side-panel/map-manager.tsx b/src/components/src/side-panel/map-manager.tsx similarity index 93% rename from src/components/side-panel/map-manager.tsx rename to src/components/src/side-panel/map-manager.tsx index ff14d4615a..4cf565311c 100644 --- a/src/components/side-panel/map-manager.tsx +++ b/src/components/src/side-panel/map-manager.tsx @@ -20,11 +20,11 @@ import React, {Component} from 'react'; -import {Button, SidePanelSection} from 'components/common/styled-components'; -import MapStyleSelectorFactory from 'components/side-panel/map-style-panel/map-style-selector'; -import LayerGroupSelectorFactory from 'components/side-panel/map-style-panel/map-layer-selector'; +import {Button, SidePanelSection} from '../common/styled-components'; +import MapStyleSelectorFactory from './map-style-panel/map-style-selector'; +import LayerGroupSelectorFactory from './map-style-panel/map-layer-selector'; -import {Add} from 'components/common/icons'; +import {Add} from '../common/icons'; import ColorSelector from './layer-panel/color-selector'; import {createSelector} from 'reselect'; import {injectIntl, WrappedComponentProps} from 'react-intl'; diff --git a/src/components/side-panel/map-style-panel/map-layer-selector.tsx b/src/components/src/side-panel/map-style-panel/map-layer-selector.tsx similarity index 94% rename from src/components/side-panel/map-style-panel/map-layer-selector.tsx rename to src/components/src/side-panel/map-style-panel/map-layer-selector.tsx index f9421b62cb..6a601b96a1 100644 --- a/src/components/side-panel/map-style-panel/map-layer-selector.tsx +++ b/src/components/src/side-panel/map-style-panel/map-layer-selector.tsx @@ -20,20 +20,21 @@ import React, {ComponentType} from 'react'; import styled from 'styled-components'; -import PanelHeaderActionFactory from 'components/side-panel/panel-header-action'; -import {EyeSeen, EyeUnseen, Upload} from 'components/common/icons'; +import PanelHeaderActionFactory from '../panel-header-action'; +import {EyeSeen, EyeUnseen} from '../../common/icons'; import { + CenterFlexbox, PanelLabel, PanelContent, PanelLabelBold, - PanelLabelWrapper, - CenterFlexbox -} from 'components/common/styled-components'; + PanelLabelWrapper +} from '../../common/styled-components'; import {FormattedMessage} from '@kepler.gl/localization'; import {camelize} from '@kepler.gl/utils'; import {VisibleLayerGroups} from '@kepler.gl/types'; -import {BaseProps} from 'components/common/icons/base'; +import {BaseProps} from '../../common/icons'; +import {Upload} from '@kepler.gl/cloud-providers'; const StyledInteractionPanel = styled.div` padding-bottom: 12px; diff --git a/src/components/side-panel/map-style-panel/map-style-selector.tsx b/src/components/src/side-panel/map-style-panel/map-style-selector.tsx similarity index 94% rename from src/components/side-panel/map-style-panel/map-style-selector.tsx rename to src/components/src/side-panel/map-style-panel/map-style-selector.tsx index 9834d63a79..fe5f46807a 100644 --- a/src/components/side-panel/map-style-panel/map-style-selector.tsx +++ b/src/components/src/side-panel/map-style-panel/map-style-selector.tsx @@ -21,18 +21,18 @@ import React, {ComponentType} from 'react'; import styled from 'styled-components'; import classnames from 'classnames'; -import {ArrowDown} from 'components/common/icons'; -import PanelHeaderActionFactory from 'components/side-panel/panel-header-action'; +import {ArrowDown} from '../../common/icons'; +import PanelHeaderActionFactory from '../panel-header-action'; import { PanelHeaderContent, PanelHeaderTitle, PanelLabel, StyledPanelHeader -} from 'components/common/styled-components'; +} from '../../common/styled-components'; import {FormattedMessage} from '@kepler.gl/localization'; import {MapStyle} from '@kepler.gl/reducers'; -import {BaseProps} from 'components/common/icons/base'; +import {BaseProps} from '../../common/icons'; const StyledMapDropdown = styled(StyledPanelHeader)` height: 48px; diff --git a/src/components/side-panel/panel-dropdown.tsx b/src/components/src/side-panel/panel-dropdown.tsx similarity index 96% rename from src/components/side-panel/panel-dropdown.tsx rename to src/components/src/side-panel/panel-dropdown.tsx index d1b948387b..654e5034c1 100644 --- a/src/components/side-panel/panel-dropdown.tsx +++ b/src/components/src/side-panel/panel-dropdown.tsx @@ -19,7 +19,7 @@ // THE SOFTWARE. import React, {Component} from 'react'; -import {StyledPanelDropdown} from 'components/common/styled-components'; +import {StyledPanelDropdown} from '../common/styled-components'; import listensToClickOutside from 'react-onclickoutside'; type ClickOutsideCloseDropdownProps = { diff --git a/src/components/side-panel/panel-header-action.tsx b/src/components/src/side-panel/panel-header-action.tsx similarity index 96% rename from src/components/side-panel/panel-header-action.tsx rename to src/components/src/side-panel/panel-header-action.tsx index bc4ba16a72..a01655a173 100644 --- a/src/components/side-panel/panel-header-action.tsx +++ b/src/components/src/side-panel/panel-header-action.tsx @@ -23,8 +23,8 @@ import {TooltipProps} from 'react-tooltip'; import classnames from 'classnames'; import styled from 'styled-components'; import {FormattedMessage} from '@kepler.gl/localization'; -import {Tooltip} from 'components/common/styled-components'; -import {BaseProps} from 'components/common/icons/base'; +import {Tooltip} from '../common/styled-components'; +import {BaseProps} from '../common/icons'; interface PanelHeaderActionProps { id?: string; diff --git a/src/components/side-panel/panel-header.tsx b/src/components/src/side-panel/panel-header.tsx similarity index 96% rename from src/components/side-panel/panel-header.tsx rename to src/components/src/side-panel/panel-header.tsx index 39dade38db..b8a34227c4 100644 --- a/src/components/side-panel/panel-header.tsx +++ b/src/components/src/side-panel/panel-header.tsx @@ -22,15 +22,15 @@ import React, {Component} from 'react'; import styled from 'styled-components'; import classnames from 'classnames'; import {createSelector} from 'reselect'; -import {Tooltip} from 'components/common/styled-components'; -import KeplerGlLogo from 'components/common/logo'; -import {Save, DataTable, Save2, Picture, Db, Map as MapIcon, Share} from 'components/common/icons'; -import ClickOutsideCloseDropdown from 'components/side-panel/panel-dropdown'; -import Toolbar from 'components/common/toolbar'; -import ToolbarItem, {ToolbarItemProps} from 'components/common/toolbar-item'; +import {Tooltip} from '../common/styled-components'; +import KeplerGlLogo from '../common/logo'; +import {Save, DataTable, Save2, Picture, Db, Map as MapIcon, Share} from '../common/icons'; +import ClickOutsideCloseDropdown from './panel-dropdown'; +import Toolbar from '../common/toolbar'; +import ToolbarItem, {ToolbarItemProps} from '../common/toolbar-item'; import {FormattedMessage} from '@kepler.gl/localization'; import {UiState} from '@kepler.gl/types'; -import {BaseProps} from 'components/common/icons/base'; +import {BaseProps} from '../common/icons'; type StyledPanelActionProps = { active?: boolean; diff --git a/src/components/side-panel/panel-tab.tsx b/src/components/src/side-panel/panel-tab.tsx similarity index 95% rename from src/components/side-panel/panel-tab.tsx rename to src/components/src/side-panel/panel-tab.tsx index 459267bb4a..0c7ff5c342 100644 --- a/src/components/side-panel/panel-tab.tsx +++ b/src/components/src/side-panel/panel-tab.tsx @@ -20,9 +20,9 @@ import React from 'react'; import styled from 'styled-components'; -import {Tooltip} from 'components/common/styled-components'; +import {Tooltip} from '../common/styled-components'; import {FormattedMessage} from '@kepler.gl/localization'; -import {BaseProps} from 'components/common/icons/base'; +import {BaseProps} from '../common/icons'; type StyledPanelTabProps = { active?: boolean; diff --git a/src/components/side-panel/panel-title.tsx b/src/components/src/side-panel/panel-title.tsx similarity index 100% rename from src/components/side-panel/panel-title.tsx rename to src/components/src/side-panel/panel-title.tsx diff --git a/src/components/side-panel/panel-toggle.tsx b/src/components/src/side-panel/panel-toggle.tsx similarity index 100% rename from src/components/side-panel/panel-toggle.tsx rename to src/components/src/side-panel/panel-toggle.tsx diff --git a/src/components/side-panel/side-bar.tsx b/src/components/src/side-panel/side-bar.tsx similarity index 98% rename from src/components/side-panel/side-bar.tsx rename to src/components/src/side-panel/side-bar.tsx index 1fcf1013cb..29543187b9 100644 --- a/src/components/side-panel/side-bar.tsx +++ b/src/components/src/side-panel/side-bar.tsx @@ -20,7 +20,7 @@ import React, {Component} from 'react'; import styled from 'styled-components'; -import {ArrowRight} from 'components/common/icons'; +import {ArrowRight} from '../common/icons'; type CollapseButtonProps = { isOpen: boolean; diff --git a/src/components/types.ts b/src/components/src/types.ts similarity index 100% rename from src/components/types.ts rename to src/components/src/types.ts diff --git a/src/components/tsconfig.production.json b/src/components/tsconfig.production.json new file mode 100644 index 0000000000..9edef1c338 --- /dev/null +++ b/src/components/tsconfig.production.json @@ -0,0 +1,33 @@ +{ + "compilerOptions": { + "target": "es2020", + "allowJs": false, + "checkJs": false, + "jsx": "react", + "module": "esnext", + "moduleResolution": "node", + "declaration":true, + "emitDeclarationOnly":true, + "noImplicitAny": false, + "noImplicitReturns": true, + "noImplicitThis": true, + "noUnusedLocals": false, //TODO needs to be removed once all isolations are ready + "outDir": "dist", + "sourceMap": true, + "strictNullChecks": true, + "suppressImplicitAnyIndexErrors": false, + "esModuleInterop": true, + "allowSyntheticDefaultImports": true, + "skipLibCheck": true, + "strict": true, + "resolveJsonModule": true, + "isolatedModules": true, + "baseUrl": "./src", + "paths": { + "*": ["*"] + } + }, + "include": [ + "src" + ] +} diff --git a/src/constants/babel.config.js b/src/constants/babel.config.js index 7aec54a783..8693d21ea7 100644 --- a/src/constants/babel.config.js +++ b/src/constants/babel.config.js @@ -24,6 +24,7 @@ const PRESETS = ['@babel/preset-env', '@babel/preset-react', '@babel/preset-type const PLUGINS = [ ['@babel/plugin-transform-typescript', {isTSX: true, allowDeclareFields: true}], '@babel/plugin-transform-modules-commonjs', + '@babel/plugin-proposal-class-properties', '@babel/plugin-proposal-export-namespace-from', '@babel/plugin-proposal-optional-chaining', [ diff --git a/src/deckgl-layers/package.json b/src/deckgl-layers/package.json index d8c98e39bc..31733c9fbb 100644 --- a/src/deckgl-layers/package.json +++ b/src/deckgl-layers/package.json @@ -5,7 +5,7 @@ "description": "kepler.gl constants used by kepler.gl components, actions and reducers", "license": "MIT", "main": "dist/index.js", - "types": "index.d.ts", + "types": "dist/index.d.ts", "keywords": [ "babel", "es6", @@ -49,17 +49,6 @@ "@kepler.gl/constants": "2.5.5", "lodash.memoize": "^4.1.2" }, - "exports": { - ".": "./dist/index.js", - "./*": "./dist/*" - }, - "typesVersions": { - "*": { - "*": [ - "dist/*" - ] - } - }, "nyc": { "sourceMap": false, "instrument": false diff --git a/src/index.js b/src/index.js index 2402514718..ae3b36b7a8 100644 --- a/src/index.js +++ b/src/index.js @@ -22,10 +22,10 @@ export * from '@kepler.gl/reducers'; // Schemas -export * from './schemas'; +export * from '@kepler.gl/schemas'; // Actions -export * from './actions'; +export * from '@kepler.gl/actions'; // Constants export * from '@kepler.gl/constants'; @@ -34,13 +34,13 @@ export * from '@kepler.gl/constants'; export * from '@kepler.gl/processors'; // Components -export * from './components'; +export * from '@kepler.gl/components'; // Layers -export * from './layers'; +export * from '@kepler.gl/layers'; // Styles -export * from './styles'; +export * from '@kepler.gl/styles'; // Middleware export * from '@kepler.gl/middleware'; diff --git a/src/layers/package.json b/src/layers/package.json index e58a7846c3..4cdd01a9e5 100644 --- a/src/layers/package.json +++ b/src/layers/package.json @@ -5,7 +5,7 @@ "description": "kepler.gl constants used by kepler.gl components, actions and reducers", "license": "MIT", "main": "dist/index.js", - "types": "dist/layers/src/index.d.ts", + "types": "dist/index.d.ts", "keywords": [ "babel", "es6", diff --git a/src/layers/src/arc-layer/arc-layer-icon.tsx b/src/layers/src/arc-layer/arc-layer-icon.tsx index bcf142b991..1d0e274a42 100644 --- a/src/layers/src/arc-layer/arc-layer-icon.tsx +++ b/src/layers/src/arc-layer/arc-layer-icon.tsx @@ -20,7 +20,7 @@ import React, {Component} from 'react'; import PropTypes from 'prop-types'; -import Base from 'components/common/icons/base'; +import {Base} from '../base'; class ArcLayerIcon extends Component { static propTypes = { diff --git a/src/layers/src/base.tsx b/src/layers/src/base.tsx new file mode 100644 index 0000000000..5229190661 --- /dev/null +++ b/src/layers/src/base.tsx @@ -0,0 +1,95 @@ +// Copyright (c) 2022 Uber Technologies, Inc. +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. + +import React, {Component, CSSProperties} from 'react'; + +const getStyleClassFromColor = (totalColor: number, colors: string[]) => + new Array(totalColor) + .fill(1) + .reduce((accu, c, i) => `${accu}.cr${i + 1} {fill:${colors[i % colors.length]};}`, ''); + +const nop = () => {}; + +export type BaseProps = { + /** Set the height of the icon, ex. '16px' */ + height?: string; + /** Set the width of the icon, ex. '16px' */ + width?: string; + /** Set the viewbox of the svg */ + viewBox?: string; + /** Path element */ + + predefinedClassName?: string; + className?: string; + style?: CSSProperties; + colors?: string[]; + totalColor?: number; +} & React.SVGAttributes & + React.DOMAttributes; + +export class Base extends Component { + static displayName = 'Base Icon'; + + static defaultProps = { + height: null, + width: null, + viewBox: '0 0 64 64', + predefinedClassName: '', + className: '', + style: { + fill: 'currentColor' + } + }; + + render() { + const { + height, + width, + viewBox, + style, + children, + predefinedClassName, + className, + colors, + totalColor, + ...props + } = this.props; + const svgHeight = height; + const svgWidth = width || svgHeight; + + const fillStyle = + Array.isArray(colors) && totalColor && getStyleClassFromColor(totalColor, colors); + + return ( + + {fillStyle ? : null} + {children} + + ); + } +} diff --git a/src/layers/src/cluster-layer/cluster-layer-icon.tsx b/src/layers/src/cluster-layer/cluster-layer-icon.tsx index 88ede102b3..8c70f55ca7 100644 --- a/src/layers/src/cluster-layer/cluster-layer-icon.tsx +++ b/src/layers/src/cluster-layer/cluster-layer-icon.tsx @@ -20,7 +20,7 @@ import React, {Component} from 'react'; import PropTypes from 'prop-types'; -import Base from 'components/common/icons/base'; +import {Base} from '../base'; class ClusterLayerIcon extends Component { static propTypes = { diff --git a/src/layers/src/default-layer-icon.tsx b/src/layers/src/default-layer-icon.tsx index c92ab2909a..7041233f60 100644 --- a/src/layers/src/default-layer-icon.tsx +++ b/src/layers/src/default-layer-icon.tsx @@ -20,7 +20,7 @@ import React, {Component} from 'react'; import PropTypes from 'prop-types'; -import Base from 'components/common/icons/base'; +import {Base} from './base'; class DefaultLayerIcon extends Component { static propTypes = { diff --git a/src/layers/src/geojson-layer/geojson-layer-icon.tsx b/src/layers/src/geojson-layer/geojson-layer-icon.tsx index ad45793776..112995f240 100644 --- a/src/layers/src/geojson-layer/geojson-layer-icon.tsx +++ b/src/layers/src/geojson-layer/geojson-layer-icon.tsx @@ -20,7 +20,7 @@ import React, {Component} from 'react'; import PropTypes from 'prop-types'; -import Base from 'components/common/icons/base'; +import {Base} from '../base'; export default class GeojsonLayerIcon extends Component { static propTypes = { diff --git a/src/layers/src/grid-layer/grid-layer-icon.tsx b/src/layers/src/grid-layer/grid-layer-icon.tsx index 95b0feb695..81a395222b 100644 --- a/src/layers/src/grid-layer/grid-layer-icon.tsx +++ b/src/layers/src/grid-layer/grid-layer-icon.tsx @@ -20,7 +20,7 @@ import React, {Component} from 'react'; import PropTypes from 'prop-types'; -import Base from '../../../components/common/icons/base'; +import {Base} from '../base'; export default class GridLayerIcon extends Component { static propTypes = { diff --git a/src/layers/src/h3-hexagon-layer/h3-hexagon-layer-icon.tsx b/src/layers/src/h3-hexagon-layer/h3-hexagon-layer-icon.tsx index 6dfb3fef68..85f8d51762 100644 --- a/src/layers/src/h3-hexagon-layer/h3-hexagon-layer-icon.tsx +++ b/src/layers/src/h3-hexagon-layer/h3-hexagon-layer-icon.tsx @@ -20,7 +20,7 @@ import React, {Component} from 'react'; import PropTypes from 'prop-types'; -import Base from 'components/common/icons/base'; +import {Base} from '../base'; class H3HexagonLayerIcon extends Component { static propTypes = { diff --git a/src/layers/src/heatmap-layer/heatmap-layer-icon.tsx b/src/layers/src/heatmap-layer/heatmap-layer-icon.tsx index 9fe6436acb..61fd1d18bc 100644 --- a/src/layers/src/heatmap-layer/heatmap-layer-icon.tsx +++ b/src/layers/src/heatmap-layer/heatmap-layer-icon.tsx @@ -20,7 +20,7 @@ import React, {Component} from 'react'; import PropTypes from 'prop-types'; -import Base from 'components/common/icons/base'; +import {Base} from '../base'; export default class HeatmapLayerIcon extends Component { static propTypes = { diff --git a/src/layers/src/hexagon-layer/hexagon-layer-icon.tsx b/src/layers/src/hexagon-layer/hexagon-layer-icon.tsx index 16b0b4c062..fb1078ec5b 100644 --- a/src/layers/src/hexagon-layer/hexagon-layer-icon.tsx +++ b/src/layers/src/hexagon-layer/hexagon-layer-icon.tsx @@ -20,7 +20,7 @@ import React, {Component} from 'react'; import PropTypes from 'prop-types'; -import Base from 'components/common/icons/base'; +import {Base} from '../base'; export default class HexagonLayerIcon extends Component { static propTypes = { diff --git a/src/layers/src/icon-layer/icon-info-modal.tsx b/src/layers/src/icon-layer/icon-info-modal.tsx index 958d220152..67cfdef0e1 100644 --- a/src/layers/src/icon-layer/icon-info-modal.tsx +++ b/src/layers/src/icon-layer/icon-info-modal.tsx @@ -21,9 +21,13 @@ import React from 'react'; import styled from 'styled-components'; import {line} from 'd3-shape'; -import {CenterFlexbox} from 'components/common/styled-components'; import {FormattedMessage} from '@kepler.gl/localization'; -import {Table} from 'components/common/icons'; +import Table from '../table'; + +const CenterFlexbox = styled.div` + display: flex; + align-items: center; +`; const lineFunction = line() .x(d => d[0] * 10) diff --git a/src/layers/src/icon-layer/icon-layer-icon.tsx b/src/layers/src/icon-layer/icon-layer-icon.tsx index 9e46ed64c1..73f168caca 100644 --- a/src/layers/src/icon-layer/icon-layer-icon.tsx +++ b/src/layers/src/icon-layer/icon-layer-icon.tsx @@ -20,7 +20,7 @@ import React, {Component} from 'react'; import PropTypes from 'prop-types'; -import Base from 'components/common/icons/base'; +import {Base} from '../base'; export default class IconLayerIcon extends Component { static propTypes = { diff --git a/src/layers/src/index.ts b/src/layers/src/index.ts index 3cf34e5bbc..d6bf2d7411 100644 --- a/src/layers/src/index.ts +++ b/src/layers/src/index.ts @@ -103,3 +103,4 @@ export type OVERLAY_TYPE = {[key: string]: string}; export * from './mapbox-utils'; export * from './types'; export * from './h3-hexagon-layer'; +export {default as Table} from './table'; diff --git a/src/layers/src/line-layer/line-layer-icon.tsx b/src/layers/src/line-layer/line-layer-icon.tsx index bd834c5ba9..7311ab3a44 100644 --- a/src/layers/src/line-layer/line-layer-icon.tsx +++ b/src/layers/src/line-layer/line-layer-icon.tsx @@ -20,7 +20,7 @@ import React, {Component} from 'react'; import PropTypes from 'prop-types'; -import Base from 'components/common/icons/base'; +import {Base} from '../base'; export default class LineLayerIcon extends Component { static propTypes = { diff --git a/src/layers/src/point-layer/point-layer-icon.tsx b/src/layers/src/point-layer/point-layer-icon.tsx index e5ffc25a4a..828911e760 100644 --- a/src/layers/src/point-layer/point-layer-icon.tsx +++ b/src/layers/src/point-layer/point-layer-icon.tsx @@ -20,7 +20,7 @@ import React, {Component} from 'react'; import PropTypes from 'prop-types'; -import Base from 'components/common/icons/base'; +import {Base} from '../base'; class PointLayerIcon extends Component { static propTypes = { diff --git a/src/layers/src/s2-geometry-layer/s2-layer-icon.tsx b/src/layers/src/s2-geometry-layer/s2-layer-icon.tsx index f711a25b32..374b4872aa 100644 --- a/src/layers/src/s2-geometry-layer/s2-layer-icon.tsx +++ b/src/layers/src/s2-geometry-layer/s2-layer-icon.tsx @@ -20,7 +20,7 @@ import React, {Component} from 'react'; import PropTypes from 'prop-types'; -import Base from 'components/common/icons/base'; +import {Base} from '../base'; class S2LayerIcon extends Component { static propTypes = { diff --git a/src/layers/src/scenegraph-layer/scenegraph-info-modal.tsx b/src/layers/src/scenegraph-layer/scenegraph-info-modal.tsx index fb6cfb0979..8e2744c39d 100644 --- a/src/layers/src/scenegraph-layer/scenegraph-info-modal.tsx +++ b/src/layers/src/scenegraph-layer/scenegraph-info-modal.tsx @@ -20,7 +20,27 @@ import React from 'react'; import styled from 'styled-components'; -import {StyledTable as Table} from 'components/common/styled-components'; + +export const Table = styled.table` + width: 100%; + border-spacing: 0; + + thead { + tr th { + background: ${props => props.theme.panelBackgroundLT}; + color: ${props => props.theme.titleColorLT}; + padding: 18px 12px; + text-align: start; + } + } + + tbody { + tr td { + border-bottom: ${props => props.theme.panelBorderLT}; + padding: 12px; + } + } +`; const StyledTitle = styled.div` font-size: 20px; diff --git a/src/layers/src/scenegraph-layer/scenegraph-layer-icon.tsx b/src/layers/src/scenegraph-layer/scenegraph-layer-icon.tsx index caf485ff06..0478def39a 100644 --- a/src/layers/src/scenegraph-layer/scenegraph-layer-icon.tsx +++ b/src/layers/src/scenegraph-layer/scenegraph-layer-icon.tsx @@ -20,7 +20,7 @@ import React, {Component} from 'react'; import PropTypes from 'prop-types'; -import Base from 'components/common/icons/base'; +import {Base} from '../base'; export default class ScenegraphLayerIcon extends Component { static propTypes = { diff --git a/src/components/common/icons/table.tsx b/src/layers/src/table.tsx similarity index 97% rename from src/components/common/icons/table.tsx rename to src/layers/src/table.tsx index a47c1e3f79..5c302054f4 100644 --- a/src/components/common/icons/table.tsx +++ b/src/layers/src/table.tsx @@ -19,7 +19,7 @@ // THE SOFTWARE. import React, {Component} from 'react'; -import Base, {BaseProps} from './base'; +import {Base, BaseProps} from './base'; export default class Table extends Component> { static defaultProps = { diff --git a/src/layers/src/trip-layer/trip-layer-icon.tsx b/src/layers/src/trip-layer/trip-layer-icon.tsx index 9a39663a16..84a072d842 100644 --- a/src/layers/src/trip-layer/trip-layer-icon.tsx +++ b/src/layers/src/trip-layer/trip-layer-icon.tsx @@ -20,7 +20,7 @@ import React, {Component} from 'react'; import PropTypes from 'prop-types'; -import Base from 'components/common/icons/base'; +import {Base} from '../base'; export default class TripLayerIcon extends Component { static propTypes = { diff --git a/src/layers/tsconfig.production.json b/src/layers/tsconfig.production.json index 6fd65f2391..3c6aa0a93f 100644 --- a/src/layers/tsconfig.production.json +++ b/src/layers/tsconfig.production.json @@ -22,9 +22,9 @@ "strict": true, "resolveJsonModule": true, "isolatedModules": true, - "baseUrl": "../../src", //TODO change once all dependencies are isolated + "baseUrl": "./src", "paths": { - "@kepler.gl/layers": ["layers/src"] //TODO change once all dependencies are isolated + "*": ["*"] } }, "include": ["src"] diff --git a/src/localization/package.json b/src/localization/package.json index 11099330d6..5ae684dd49 100644 --- a/src/localization/package.json +++ b/src/localization/package.json @@ -5,7 +5,7 @@ "description": "kepler.gl constants used by kepler.gl components, actions and reducers", "license": "MIT", "main": "dist/index.js", - "types": "dist/localization/src/index.d.ts", + "types": "dist/index.d.ts", "keywords": [ "babel", "es6", diff --git a/src/localization/tsconfig.production.json b/src/localization/tsconfig.production.json index d066ae7792..3c6aa0a93f 100644 --- a/src/localization/tsconfig.production.json +++ b/src/localization/tsconfig.production.json @@ -22,9 +22,9 @@ "strict": true, "resolveJsonModule": true, "isolatedModules": true, - "baseUrl": "../../src", //TODO change once all dependencies are isolated + "baseUrl": "./src", "paths": { - "@kepler.gl/localization": ["localization"] //TODO change once all dependencies are isolated + "*": ["*"] } }, "include": ["src"] diff --git a/src/middleware/package.json b/src/middleware/package.json index dc37a4c94d..70815ae759 100644 --- a/src/middleware/package.json +++ b/src/middleware/package.json @@ -5,7 +5,7 @@ "description": "kepler.gl middleware used by kepler.gl components, actions and reducers", "license": "MIT", "main": "dist/index.js", - "types": "index.d.ts", + "types": "dist/index.d.ts", "keywords": [ "babel", "es6", diff --git a/src/processors/package.json b/src/processors/package.json index 030c8d125e..3e4b8f1ff6 100644 --- a/src/processors/package.json +++ b/src/processors/package.json @@ -5,7 +5,7 @@ "description": "kepler.gl constants used by kepler.gl components, actions and reducers", "license": "MIT", "main": "dist/index.js", - "types": "dist/processors/src/index.d.ts", + "types": "dist/index.d.ts", "keywords": [ "babel", "es6", diff --git a/src/processors/tsconfig.production.json b/src/processors/tsconfig.production.json index 64e6b32560..3c6aa0a93f 100644 --- a/src/processors/tsconfig.production.json +++ b/src/processors/tsconfig.production.json @@ -22,9 +22,9 @@ "strict": true, "resolveJsonModule": true, "isolatedModules": true, - "baseUrl": "../../src", //TODO change once all dependencies are isolated + "baseUrl": "./src", "paths": { - "@kepler.gl/processors": ["processors/src"] //TODO change once all dependencies are isolated + "*": ["*"] } }, "include": ["src"] diff --git a/src/reducers/package.json b/src/reducers/package.json index f45fb44be3..72de905753 100644 --- a/src/reducers/package.json +++ b/src/reducers/package.json @@ -5,7 +5,7 @@ "description": "kepler.gl constants used by kepler.gl components, actions and reducers", "license": "MIT", "main": "dist/index.js", - "types": "dist/reducers/src/index.d.ts", + "types": "dist/index.d.ts", "keywords": [ "babel", "es6", diff --git a/src/reducers/src/combined-updaters.ts b/src/reducers/src/combined-updaters.ts index c5b63b6fc4..e12e8dd90c 100644 --- a/src/reducers/src/combined-updaters.ts +++ b/src/reducers/src/combined-updaters.ts @@ -34,7 +34,7 @@ import {MapState, UiState, AddDataToMapPayload, ParsedConfig} from '@kepler.gl/t import {MapStyle} from './map-style-updaters'; import {ProviderState} from './provider-state-updaters'; import {loadFilesSuccessUpdaterAction} from '@kepler.gl/actions'; -import {VisState} from 'schemas'; +import {VisState} from '@kepler.gl/schemas'; import {Layer} from '@kepler.gl/layers'; import {isPlainObject} from '@kepler.gl/utils'; import {findMapBounds} from './data-utils'; diff --git a/src/reducers/src/core.ts b/src/reducers/src/core.ts index dc1f180c53..9a0486e2ea 100644 --- a/src/reducers/src/core.ts +++ b/src/reducers/src/core.ts @@ -28,7 +28,7 @@ import {providerStateReducerFactory} from './provider-state'; import composers from './composers'; -import {VisState} from 'schemas'; +import {VisState} from '@kepler.gl/schemas'; import {MapState, UiState} from '@kepler.gl/types'; import {MapStyle} from './map-style-updaters'; import {ProviderState} from './provider-state-updaters'; diff --git a/src/reducers/src/layer-utils.ts b/src/reducers/src/layer-utils.ts index 82e250bc1d..25e4fe7f16 100644 --- a/src/reducers/src/layer-utils.ts +++ b/src/reducers/src/layer-utils.ts @@ -34,7 +34,7 @@ import { } from '@kepler.gl/layers'; import KeplerTable, {DataRow, Datasets} from '@kepler.gl/table'; -import {VisState} from 'schemas'; +import {VisState} from '@kepler.gl/schemas'; import {isFunction, getMapLayersFromSplitMaps} from '@kepler.gl/utils'; import {ThreeDBuildingLayer} from '@kepler.gl/deckgl-layers'; diff --git a/src/reducers/src/provider-state-updaters.ts b/src/reducers/src/provider-state-updaters.ts index e9892e5a20..252984e8ae 100644 --- a/src/reducers/src/provider-state-updaters.ts +++ b/src/reducers/src/provider-state-updaters.ts @@ -51,7 +51,7 @@ import { } from '@kepler.gl/constants'; import {ExportFileToCloudPayload} from '@kepler.gl/types'; -import {FILE_CONFLICT_MSG, MapListItem} from 'cloud-providers'; +import {FILE_CONFLICT_MSG, MapListItem} from '@kepler.gl/cloud-providers'; import {DATASET_HANDLERS} from '@kepler.gl/processors'; type ActionPayload

= { diff --git a/src/reducers/src/ui-state-updaters.ts b/src/reducers/src/ui-state-updaters.ts index 87fdbd4851..b2f1edc446 100644 --- a/src/reducers/src/ui-state-updaters.ts +++ b/src/reducers/src/ui-state-updaters.ts @@ -31,7 +31,7 @@ import { MAP_CONTROLS, ExportImage } from '@kepler.gl/constants'; -import {ActionTypes} from 'actions'; +import {ActionTypes} from '@kepler.gl/actions'; import {LOCALE_CODES} from '@kepler.gl/localization'; import {createNotification, errorNotification, calculateExportImageSize} from '@kepler.gl/utils'; import {payload_, apply_, compose_} from './composer-helpers'; diff --git a/src/reducers/src/vis-state-merger.ts b/src/reducers/src/vis-state-merger.ts index 748cee4f69..49302bd69e 100644 --- a/src/reducers/src/vis-state-merger.ts +++ b/src/reducers/src/vis-state-merger.ts @@ -33,7 +33,7 @@ import { visStateSchema } from '@kepler.gl/schemas'; -import {ParsedConfig} from 'schemas'; +import {ParsedConfig} from '@kepler.gl/schemas'; import {ParsedLayer, SavedInteractionConfig, TooltipInfo} from '@kepler.gl/types'; import {KeplerTable, Datasets} from '@kepler.gl/table'; import { diff --git a/src/reducers/tsconfig.production.json b/src/reducers/tsconfig.production.json index fb5d063a6d..3852e6a4d8 100644 --- a/src/reducers/tsconfig.production.json +++ b/src/reducers/tsconfig.production.json @@ -22,9 +22,9 @@ "strict": true, "resolveJsonModule": true, "isolatedModules": true, - "baseUrl": "../../src", //TODO change once all dependencies are isolated + "baseUrl": "./src", "paths": { - "*": ["*"] //TODO change once all dependencies are isolated + "*": ["*"] } }, "include": [ diff --git a/src/schemas/package.json b/src/schemas/package.json index 6245d02b8d..c4a9788f86 100644 --- a/src/schemas/package.json +++ b/src/schemas/package.json @@ -5,7 +5,7 @@ "description": "kepler.gl schemas used by kepler.gl components, actions and reducers", "license": "MIT", "main": "dist/index.js", - "types": "index.d.ts", + "types": "dist/index.d.ts", "keywords": [ "babel", "es6", @@ -38,15 +38,6 @@ "react-map-gl-draw": "0.14.8", "@kepler.gl/types": "2.5.5" }, - "exports": { - ".": "./dist/index.js", - "./*": "./dist/*" - }, - "typesVersions": { - "*": { - "*": ["dist/*"] - } - }, "nyc": { "sourceMap": false, "instrument": false diff --git a/src/styles/package.json b/src/styles/package.json index 6535572c8d..839cda44df 100644 --- a/src/styles/package.json +++ b/src/styles/package.json @@ -49,17 +49,6 @@ "@kepler.gl/constants": "2.5.5", "lodash.memoize": "^4.1.2" }, - "exports": { - ".": "./dist/index.js", - "./*": "./dist/*" - }, - "typesVersions": { - "*": { - "*": [ - "dist/*" - ] - } - }, "nyc": { "sourceMap": false, "instrument": false diff --git a/src/table/tsconfig.production.json b/src/table/tsconfig.production.json index cddf14f7ca..3852e6a4d8 100644 --- a/src/table/tsconfig.production.json +++ b/src/table/tsconfig.production.json @@ -22,9 +22,9 @@ "strict": true, "resolveJsonModule": true, "isolatedModules": true, - "baseUrl": "./src", //TODO change once all dependencies are isolated + "baseUrl": "./src", "paths": { - "*": ["*"] //TODO change once all dependencies are isolated + "*": ["*"] } }, "include": [ diff --git a/src/tasks/package.json b/src/tasks/package.json index d34f43dbd2..e97be47517 100644 --- a/src/tasks/package.json +++ b/src/tasks/package.json @@ -5,7 +5,7 @@ "description": "kepler.gl constants used by kepler.gl components, actions and reducers", "license": "MIT", "main": "dist/index.js", - "types": "dist/tasks/src/index.d.ts", + "types": "dist/index.d.ts", "keywords": [ "babel", "es6", diff --git a/src/tasks/tsconfig.production.json b/src/tasks/tsconfig.production.json index e26008fb4d..24a0b27770 100644 --- a/src/tasks/tsconfig.production.json +++ b/src/tasks/tsconfig.production.json @@ -22,9 +22,9 @@ "strict": true, "resolveJsonModule": true, "isolatedModules": true, - "baseUrl": "../../src", //TODO change once all dependencies are isolated + "baseUrl": "./src", "paths": { - "@kepler.gl/tasks": ["tasks/src"] //TODO change once all dependencies are isolated + "*": ["*"] } }, "include": [ diff --git a/src/types/reducers.d.ts b/src/types/reducers.d.ts index 98e74d8233..091f0d8468 100644 --- a/src/types/reducers.d.ts +++ b/src/types/reducers.d.ts @@ -190,7 +190,6 @@ export type AnimationConfig = { }; export type BaseInteraction = { - id: string; label: string; enabled: boolean; }; @@ -200,6 +199,7 @@ export type TooltipField = { }; export type CompareType = string | null; export type TooltipInfo = BaseInteraction & { + id: 'tooltip'; config: { fieldsToShow: { [key: string]: TooltipField[]; @@ -209,14 +209,17 @@ export type TooltipInfo = BaseInteraction & { }; }; export type Geocoder = BaseInteraction & { + id: 'geocoder'; position: number[] | null; }; export type Brush = BaseInteraction & { + id: 'brush'; config: { size: number; }; }; export type Coordinate = BaseInteraction & { + id: 'coordinate'; position: number[] | null; }; export type InteractionConfig = { diff --git a/src/utils/package.json b/src/utils/package.json index adee4c854b..61b62ff4f5 100644 --- a/src/utils/package.json +++ b/src/utils/package.json @@ -5,7 +5,7 @@ "description": "kepler.gl constants used by kepler.gl components, actions and reducers", "license": "MIT", "main": "dist/index.js", - "types": "index.d.ts", + "types": "dist/index.d.ts", "keywords": [ "babel", "es6", @@ -57,17 +57,6 @@ "viewport-mercator-project": "^6.0.0", "wellknown": "^0.5.0" }, - "exports": { - ".": "./dist/index.js", - "./*": "./dist/*" - }, - "typesVersions": { - "*": { - "*": [ - "dist/*" - ] - } - }, "nyc": { "sourceMap": false, "instrument": false diff --git a/src/utils/src/index.ts b/src/utils/src/index.ts index 7305071979..2cdf5c660b 100644 --- a/src/utils/src/index.ts +++ b/src/utils/src/index.ts @@ -31,8 +31,6 @@ export { } from './color-utils'; export {errorNotification} from './notifications-utils'; -export {getHexFields, containValidTime} from '@kepler.gl/layers'; - export {createNotification, exportImageError, successNotification} from './notifications-utils'; export {default as domtoimage} from './dom-to-image'; @@ -136,7 +134,6 @@ export { capitalizeFirstLetter, camelToTitle, camelize, - getHTMLMapModeTileUrl, toArray, insertValue, isObject, diff --git a/src/utils/src/utils.ts b/src/utils/src/utils.ts index f58c1d05e9..a820ff2df4 100644 --- a/src/utils/src/utils.ts +++ b/src/utils/src/utils.ts @@ -73,15 +73,6 @@ export const camelize = str => { }); }; -/** - * Returns the img url for a given map export option - * @param mode export option - * @return {string} url - */ -export function getHTMLMapModeTileUrl(mode) { - return `https://d1a3f4spazzrp4.cloudfront.net/kepler.gl/documentation/map-${mode.toLowerCase()}-mode.png`; -} - /** * Converts non-arrays to arrays. Leaves arrays alone. Converts * undefined values to empty arrays ([] instead of [undefined]). diff --git a/src/utils/tsconfig.production.json b/src/utils/tsconfig.production.json index cddf14f7ca..3852e6a4d8 100644 --- a/src/utils/tsconfig.production.json +++ b/src/utils/tsconfig.production.json @@ -22,9 +22,9 @@ "strict": true, "resolveJsonModule": true, "isolatedModules": true, - "baseUrl": "./src", //TODO change once all dependencies are isolated + "baseUrl": "./src", "paths": { - "*": ["*"] //TODO change once all dependencies are isolated + "*": ["*"] } }, "include": [ diff --git a/test/browser-headless/component/map-container-test.js b/test/browser-headless/component/map-container-test.js index b5f9672dbb..cf5b086842 100644 --- a/test/browser-headless/component/map-container-test.js +++ b/test/browser-headless/component/map-container-test.js @@ -28,13 +28,13 @@ import { MapContainerFactory, EditorFactory, MapControlFactory, - MapPopoverFactory -} from 'components'; + MapPopoverFactory, + mapFieldsSelector +} from '@kepler.gl/components'; import MapboxGLMap from 'react-map-gl'; import Tippy from '@tippyjs/react/headless'; import {gl, InteractionTestRunner} from '@deck.gl/test-utils'; -import {mapFieldsSelector} from 'components/kepler-gl'; import {mockKeplerProps} from '../../helpers/mock-state'; const MapContainer = appInjector.get(MapContainerFactory); diff --git a/test/browser/components/bottom-widget-test.js b/test/browser/components/bottom-widget-test.js index 8cceb78880..4885a524a6 100644 --- a/test/browser/components/bottom-widget-test.js +++ b/test/browser/components/bottom-widget-test.js @@ -21,8 +21,12 @@ import React from 'react'; import test from 'tape'; import {IntlWrapper, mountWithTheme} from 'test/helpers/component-utils'; -import {BottomWidgetFactory, TimeWidgetFactory, AnimationControlFactory} from 'components'; -import {appInjector} from 'components/container'; +import { + BottomWidgetFactory, + TimeWidgetFactory, + AnimationControlFactory, + appInjector +} from '@kepler.gl/components'; import {VisStateActions} from '@kepler.gl/actions'; const BottomWidget = appInjector.get(BottomWidgetFactory); diff --git a/test/browser/components/common/animation-control-test.js b/test/browser/components/common/animation-control-test.js index 502501c113..0a8fd7e759 100644 --- a/test/browser/components/common/animation-control-test.js +++ b/test/browser/components/common/animation-control-test.js @@ -28,11 +28,11 @@ import {mountWithTheme} from 'test/helpers/component-utils'; import { AnimationControlFactory, PlaybackControlsFactory, - FloatingTimeDisplayFactory -} from 'components'; -import {appInjector} from 'components/container'; + FloatingTimeDisplayFactory, + appInjector, + IconButton +} from '@kepler.gl/components'; import {StateWTripGeojson} from 'test/helpers/mock-state'; -import IconButton from 'components/common/icon-button'; import {visStateReducer as reducer} from '@kepler.gl/reducers'; diff --git a/test/browser/components/common/color-legend-test.js b/test/browser/components/common/color-legend-test.js index ada020de7f..53abe6d3a1 100644 --- a/test/browser/components/common/color-legend-test.js +++ b/test/browser/components/common/color-legend-test.js @@ -22,7 +22,7 @@ import React from 'react'; import test from 'tape'; import {mountWithTheme} from 'test/helpers/component-utils'; -import ColorLegend, {LegendRow} from 'components/common/color-legend'; +import {ColorLegend, LegendRow} from '@kepler.gl/components'; test('Components -> ColorLegend.render', t => { t.doesNotThrow(() => { diff --git a/test/browser/components/common/file-uploader-test.js b/test/browser/components/common/file-uploader-test.js index c5b4ece58e..0632741679 100644 --- a/test/browser/components/common/file-uploader-test.js +++ b/test/browser/components/common/file-uploader-test.js @@ -23,9 +23,7 @@ import test from 'tape'; import sinon from 'sinon'; import {IntlWrapper, mountWithTheme} from 'test/helpers/component-utils'; -import {FileUpload, WarningMsg} from 'components/common/file-uploader/file-upload'; -import FileDrop from 'components/common/file-uploader/file-drop'; -import UploadButton from 'components/common/file-uploader/upload-button'; +import {FileUpload, WarningMsg, FileDrop, UploadButton} from '@kepler.gl/components'; test('Components -> FileUploader.render', t => { let wrapper; diff --git a/test/browser/components/common/item-selector-test.js b/test/browser/components/common/item-selector-test.js index 107c16877c..8970043cad 100644 --- a/test/browser/components/common/item-selector-test.js +++ b/test/browser/components/common/item-selector-test.js @@ -22,9 +22,7 @@ import React from 'react'; import test from 'tape'; import sinon from 'sinon'; import {IntlWrapper, mountWithTheme} from 'test/helpers/component-utils'; -import {ItemSelector} from 'components'; -import Typeahead from 'components/common/item-selector/typeahead'; -import DropdownList, {ListItem} from 'components/common/item-selector/dropdown-list'; +import {ItemSelector, Typeahead, DropdownList, ListItem} from '@kepler.gl/components'; test('Components -> ItemSelector.render', t => { let wrapper; diff --git a/test/browser/components/common/range-plot-test.js b/test/browser/components/common/range-plot-test.js index 07693e4532..d67b54cc5c 100644 --- a/test/browser/components/common/range-plot-test.js +++ b/test/browser/components/common/range-plot-test.js @@ -22,8 +22,7 @@ import React from 'react'; import test from 'tape'; import {mountWithTheme} from 'test/helpers/component-utils'; -import {appInjector} from 'components/container'; -import {RangePlotFactory} from 'components'; +import {appInjector, RangePlotFactory} from '@kepler.gl/components'; const RangePlot = appInjector.get(RangePlotFactory); diff --git a/test/browser/components/common/range-slider-test.js b/test/browser/components/common/range-slider-test.js index e984f7ab89..7ddc03ed06 100644 --- a/test/browser/components/common/range-slider-test.js +++ b/test/browser/components/common/range-slider-test.js @@ -21,9 +21,7 @@ import React from 'react'; import test from 'tape'; import {IntlWrapper, mountWithTheme} from 'test/helpers/component-utils'; -import {RangeSlider, Slider} from 'components'; -import SliderHandle from 'components/common/slider/slider-handle'; -import SliderBarHandle from 'components/common/slider/slider-bar-handle'; +import {RangeSlider, Slider, SliderHandle, SliderBarHandle} from '@kepler.gl/components'; test('Components -> RangeSlider.render', t => { let wrapper; diff --git a/test/browser/components/container-test.js b/test/browser/components/container-test.js index 2d01bebd25..5ef1233f43 100644 --- a/test/browser/components/container-test.js +++ b/test/browser/components/container-test.js @@ -33,7 +33,7 @@ import { } from '@kepler.gl/reducers'; import {keplerGlInit} from '@kepler.gl/actions'; -import Container, {ERROR_MSG} from 'components/container'; +import Container, {ERROR_MSG} from '@kepler.gl/components'; import {DEFAULT_MAPBOX_API_URL} from '@kepler.gl/constants'; const initialCoreState = coreReducer(undefined, keplerGlInit()); const initialState = { diff --git a/test/browser/components/editor/feature-action-panel-test.js b/test/browser/components/editor/feature-action-panel-test.js index 0411f4f136..756c750d74 100644 --- a/test/browser/components/editor/feature-action-panel-test.js +++ b/test/browser/components/editor/feature-action-panel-test.js @@ -21,7 +21,7 @@ import React from 'react'; import test from 'tape'; import sinon from 'sinon'; -import {PureFeatureActionPanelFactory} from 'components/editor/feature-action-panel'; +import {PureFeatureActionPanelFactory} from '@kepler.gl/components'; import {IntlWrapper, mountWithTheme} from 'test/helpers/component-utils'; const FeatureActionPanel = PureFeatureActionPanelFactory(); diff --git a/test/browser/components/editor/feature-styles-test.js b/test/browser/components/editor/feature-styles-test.js index efa99b3e43..a17f05cc7f 100644 --- a/test/browser/components/editor/feature-styles-test.js +++ b/test/browser/components/editor/feature-styles-test.js @@ -20,7 +20,7 @@ import test from 'tape'; import {RenderStates, RenderTypes} from 'react-map-gl-draw'; -import {getStyle} from 'components/editor/feature-styles'; +import {getStyle} from '@kepler.gl/components'; test('FeatureStyles - getStyles point', t => { const feature = { diff --git a/test/browser/components/filters/time-widget-test.js b/test/browser/components/filters/time-widget-test.js index 58e9af490f..458c1e21d2 100644 --- a/test/browser/components/filters/time-widget-test.js +++ b/test/browser/components/filters/time-widget-test.js @@ -38,13 +38,12 @@ import { AnimationSpeedSliderFactory, Icons, TimeSliderMarkerFactory, - TimeRangeSliderTimeTitleFactory -} from 'components'; -import IconButton from 'components/common/icon-button'; -import SliderHandle from 'components/common/slider/slider-handle'; -import Typeahead from 'components/common/item-selector/typeahead'; - -import {appInjector} from 'components/container'; + TimeRangeSliderTimeTitleFactory, + IconButton, + SliderHandle, + Typeahead, + appInjector +} from '@kepler.gl/components'; const TimeWidget = appInjector.get(TimeWidgetFactory); const TimeRangeSlider = appInjector.get(TimeRangeSliderFactory); diff --git a/test/browser/components/geocoder-panel-test.js b/test/browser/components/geocoder-panel-test.js index 09bb22797f..03d09dc5e6 100644 --- a/test/browser/components/geocoder-panel-test.js +++ b/test/browser/components/geocoder-panel-test.js @@ -23,9 +23,7 @@ import React from 'react'; import sinon from 'sinon'; import test from 'tape'; import {IntlWrapper, mountWithTheme} from 'test/helpers/component-utils'; -import GeocoderPanelFactory from 'components/geocoder-panel'; -import {appInjector} from 'components/container'; -import {testForCoordinates} from 'components/geocoder/geocoder'; +import {GeocoderPanelFactory, appInjector, testForCoordinates} from '@kepler.gl/components'; import {cmpDatasetData, cmpObjectKeys} from '../../helpers/comparison-utils'; const GeocoderPanel = appInjector.get(GeocoderPanelFactory); diff --git a/test/browser/components/injector-test.js b/test/browser/components/injector-test.js index 286593275d..6799b33832 100644 --- a/test/browser/components/injector-test.js +++ b/test/browser/components/injector-test.js @@ -26,10 +26,16 @@ import {Provider} from 'react-redux'; import sinon from 'sinon'; import {console as Console} from 'global/window'; -import {withState, injectComponents, PanelHeaderFactory} from 'components'; +import {withState, injectComponents, PanelHeaderFactory} from '@kepler.gl/components'; import {keplerGlInit} from '@kepler.gl/actions'; -import {keplerGlReducerCore as coreReducer, visStateLens, uiStateLens, mapStateLens, mapStyleLens} from '@kepler.gl/reducers'; +import { + keplerGlReducerCore as coreReducer, + visStateLens, + uiStateLens, + mapStateLens, + mapStyleLens +} from '@kepler.gl/reducers'; const mockStore = configureStore(); const initialCoreState = coreReducer(undefined, keplerGlInit({})); diff --git a/test/browser/components/kepler-gl-test.js b/test/browser/components/kepler-gl-test.js index 0d57f916c7..d3203989a7 100644 --- a/test/browser/components/kepler-gl-test.js +++ b/test/browser/components/kepler-gl-test.js @@ -36,10 +36,10 @@ import { BottomWidgetFactory, ModalContainerFactory, PlotContainerFactory, - GeocoderPanelFactory -} from 'components'; -import NotificationPanelFactory from 'components/notification-panel'; -import {DEFAULT_MAP_STYLES, EXPORT_IMAGE_ID} from 'constants'; + GeocoderPanelFactory, + NotificationPanelFactory +} from '@kepler.gl/components'; +import {DEFAULT_MAP_STYLES, EXPORT_IMAGE_ID} from '@kepler.gl/constants'; import {GEOCODER_DATASET_NAME} from '@kepler.gl/constants'; // mock state import {StateWithGeocoderDataset} from 'test/helpers/mock-state'; diff --git a/test/browser/components/map-container-test.js b/test/browser/components/map-container-test.js index 2492710d73..df667d9cc3 100644 --- a/test/browser/components/map-container-test.js +++ b/test/browser/components/map-container-test.js @@ -23,8 +23,7 @@ import {IntlWrapper, mountWithTheme} from 'test/helpers/component-utils'; import sinon from 'sinon'; import test from 'tape'; -import {appInjector, MapContainerFactory} from 'components'; -import {mapFieldsSelector} from 'components/kepler-gl'; +import {appInjector, MapContainerFactory, mapFieldsSelector} from '@kepler.gl/components'; import {mockKeplerProps} from '../../helpers/mock-state'; const MapContainer = appInjector.get(MapContainerFactory); diff --git a/test/browser/components/map/map-control-test.js b/test/browser/components/map/map-control-test.js index 1d0b1cf346..9bb88d63ec 100644 --- a/test/browser/components/map/map-control-test.js +++ b/test/browser/components/map/map-control-test.js @@ -23,20 +23,20 @@ import React from 'react'; import sinon from 'sinon'; import test from 'tape'; -import {IntlWrapper, mountWithTheme} from 'test/helpers/component-utils'; +import {IntlWrapper, mountWithTheme} from '../../../helpers/component-utils'; -import {MapControlButton} from 'components/common/styled-components'; -import ToolbarItem from 'components/common/toolbar-item'; - -import {mapFieldsSelector} from 'components/kepler-gl'; import { + MapControlButton, + ToolbarItem, + mapFieldsSelector, appInjector, MapLayerSelector, MapContainerFactory, MapLegendFactory, MapControlFactory, - MapControlToolbarFactory -} from 'components'; + MapControlToolbarFactory, + Icons +} from '@kepler.gl/components'; import { mockKeplerProps, mockKeplerPropsWithState, @@ -44,12 +44,11 @@ import { StateWFiles } from '../../../helpers/mock-state'; -import {Cube3d, Split, Legend, DrawPolygon, Layers, Delete} from 'components/common/icons'; - import {LOCALE_CODES, LOCALES} from '@kepler.gl/localization'; import {toggleMapControl} from '@kepler.gl/actions'; import {keplerGlReducerCore} from '@kepler.gl/reducers'; +const {Cube3d, Split, Legend, DrawPolygon, Layers, Delete} = Icons; const MapControl = appInjector.get(MapControlFactory); const MapContainer = appInjector.get(MapContainerFactory); const MapLegend = appInjector.get(MapLegendFactory); diff --git a/test/browser/components/map/map-legend-test.js b/test/browser/components/map/map-legend-test.js index 57299fc6d1..fde67df404 100644 --- a/test/browser/components/map/map-legend-test.js +++ b/test/browser/components/map/map-legend-test.js @@ -23,13 +23,15 @@ import test from 'tape'; import {mount} from 'enzyme'; import cloneDeep from 'lodash.clonedeep'; -import MapLegendFactory, { +import { + MapLegendFactory, StyledMapControlLegend, LayerColorLegend, VisualChannelMetric, LayerSizeLegend, - SingleColorLegend -} from 'components/map/map-legend'; + SingleColorLegend, + appInjector +} from '@kepler.gl/components'; import { StateWFilesFiltersLayerColor, expectedSavedLayer1 as pointLayer, @@ -37,7 +39,6 @@ import { expectedSavedLayer2 as geojsonLayer } from 'test/helpers/mock-state'; import {IntlWrapper, mountWithTheme} from 'test/helpers/component-utils'; -import {appInjector} from 'components'; const MapLegend = appInjector.get(MapLegendFactory); diff --git a/test/browser/components/map/map-popover-test.js b/test/browser/components/map/map-popover-test.js index 764edb19fa..4d1a8be1a0 100644 --- a/test/browser/components/map/map-popover-test.js +++ b/test/browser/components/map/map-popover-test.js @@ -22,11 +22,10 @@ import React from 'react'; import sinon from 'sinon'; import test from 'tape'; -import {Pin} from 'components/common/icons'; import {IntlWrapper, mountWithTheme} from 'test/helpers/component-utils'; -import MapPopoverFactory from 'components/map/map-popover'; -import {appInjector} from 'components'; +import {Icons, MapPopoverFactory, appInjector} from '@kepler.gl/components'; +const {Pin} = Icons; const MapPopover = appInjector.get(MapPopoverFactory); test('Map Popover - render', t => { diff --git a/test/browser/components/modals/data-table-modal-test.js b/test/browser/components/modals/data-table-modal-test.js index 2e45893065..9cf9fb8456 100644 --- a/test/browser/components/modals/data-table-modal-test.js +++ b/test/browser/components/modals/data-table-modal-test.js @@ -28,21 +28,23 @@ import CloneDeep from 'lodash.clonedeep'; import {VisStateActions} from '@kepler.gl/actions'; import {visStateReducer} from '@kepler.gl/reducers'; -import FieldTokenFactory from 'components/common/field-token'; -import {VertThreeDots, ArrowUp} from 'components/common/icons'; -import DataTableModalFactory, { +import { + FieldTokenFactory, + Icons, + DataTableModalFactory, DatasetTabs, - DatasetModalTab -} from 'components/modals/data-table-modal'; -import DataTableFactory from 'components/common/data-table'; -import OptionDropdown from 'components/common/data-table/option-dropdown'; + DatasetModalTab, + DataTableFactory, + OptionDropdown, + appInjector +} from '@kepler.gl/components'; import {testFields, testAllData} from 'test/fixtures/test-csv-data'; import {geoStyleFields, geoStyleRows} from 'test/fixtures/geojson'; import {StateWFiles, testCsvDataId, testGeoJsonDataId} from 'test/helpers/mock-state'; -import {appInjector} from 'components/container'; import {createDataContainer} from '@kepler.gl/table'; +const {VertThreeDots, ArrowUp} = Icons; const DataTableModal = appInjector.get(DataTableModalFactory); const DataTable = appInjector.get(DataTableFactory); const FieldToken = appInjector.get(FieldTokenFactory); diff --git a/test/browser/components/modals/export-image-modal-test.js b/test/browser/components/modals/export-image-modal-test.js index 6a14e308e1..6d722ea510 100644 --- a/test/browser/components/modals/export-image-modal-test.js +++ b/test/browser/components/modals/export-image-modal-test.js @@ -23,10 +23,12 @@ import test from 'tape-catch'; import sinon from 'sinon'; import {IntlWrapper, mountWithTheme} from 'test/helpers/component-utils'; -import ExportImageModalFactory from 'components/modals/export-image-modal'; -import ImagePreview from 'components/common/image-preview'; -import {appInjector} from 'components/container'; -import {SelectionButton} from 'components/common/styled-components'; +import { + ExportImageModalFactory, + ImagePreview, + appInjector, + SelectionButton +} from '@kepler.gl/components'; import {INITIAL_UI_STATE} from '@kepler.gl/reducers'; diff --git a/test/browser/components/modals/load-data-modal-test.js b/test/browser/components/modals/load-data-modal-test.js index dc6aade9f7..a050ab1044 100644 --- a/test/browser/components/modals/load-data-modal-test.js +++ b/test/browser/components/modals/load-data-modal-test.js @@ -21,11 +21,12 @@ import React from 'react'; import test from 'tape'; import {IntlWrapper, mountWithTheme} from 'test/helpers/component-utils'; -import LoadDataModalFactory from 'components/modals/load-data-modal'; -import {ModalTabItem} from 'components/modals/modal-tabs'; -import LoadStorageMapFactory from 'components/modals/load-storage-map'; - -import {appInjector} from 'components/container'; +import { + LoadDataModalFactory, + ModalTabItem, + LoadStorageMapFactory, + appInjector +} from '@kepler.gl/components'; const LoadDataModal = appInjector.get(LoadDataModalFactory); const LoadStorageMap = appInjector.get(LoadStorageMapFactory); diff --git a/test/browser/components/modals/load-storage-map-test.js b/test/browser/components/modals/load-storage-map-test.js index 24ee8613a0..91b5e679ff 100644 --- a/test/browser/components/modals/load-storage-map-test.js +++ b/test/browser/components/modals/load-storage-map-test.js @@ -22,10 +22,9 @@ import React from 'react'; import test from 'tape'; import {mountWithTheme} from 'test/helpers/component-utils'; import sinon from 'sinon'; -import LoadStorageMapFactory from 'components/modals/load-storage-map'; +import {LoadStorageMapFactory, appInjector} from '@kepler.gl/components'; import MockProvider from 'test/helpers/mock-provider'; -import {appInjector} from 'components/container'; const mockProvider = new MockProvider(); diff --git a/test/browser/components/modals/save-map-modal-test.js b/test/browser/components/modals/save-map-modal-test.js index 73a29a5e89..c483f895a8 100644 --- a/test/browser/components/modals/save-map-modal-test.js +++ b/test/browser/components/modals/save-map-modal-test.js @@ -22,10 +22,7 @@ import React from 'react'; import test from 'tape'; import {mountWithTheme, IntlWrapper} from 'test/helpers/component-utils'; import sinon from 'sinon'; -import SaveMapModalFactory from '../../../../src/components/modals/save-map-modal'; - -import CloudTile from '../../../../src/components/modals/cloud-tile'; -import ImagePreview from '../../../../src/components/common/image-preview'; +import {SaveMapModalFactory, CloudTile, ImagePreview} from '@kepler.gl/components'; import MockProvider from 'test/helpers/mock-provider'; const mockProvider = new MockProvider(); diff --git a/test/browser/components/modals/share-map-modal-test.js b/test/browser/components/modals/share-map-modal-test.js index f9e0b55f42..41f29e6ab0 100644 --- a/test/browser/components/modals/share-map-modal-test.js +++ b/test/browser/components/modals/share-map-modal-test.js @@ -22,10 +22,7 @@ import React from 'react'; import test from 'tape'; import {IntlWrapper, mountWithTheme} from 'test/helpers/component-utils'; import sinon from 'sinon'; -import ShareMapUrlModalFactory, {SharingUrl} from 'components/modals/share-map-modal'; - -import CloudTile from 'components/modals/cloud-tile'; -import StatusPanel from 'components/modals/status-panel'; +import {ShareMapUrlModalFactory, SharingUrl, CloudTile, StatusPanel} from '@kepler.gl/components'; const ShareMapUrlModal = ShareMapUrlModalFactory(); test('Components -> ShareMapUrlModal.mount', t => { diff --git a/test/browser/components/notifications/notification-item-test.js b/test/browser/components/notifications/notification-item-test.js index 406211029d..445b1fe35e 100644 --- a/test/browser/components/notifications/notification-item-test.js +++ b/test/browser/components/notifications/notification-item-test.js @@ -21,7 +21,7 @@ import React from 'react'; import test from 'tape'; import {shallow} from 'enzyme'; -import NotificationItemFactory from 'components/notification-panel/notification-item'; +import {NotificationItemFactory} from '@kepler.gl/components'; import {createNotification} from '@kepler.gl/utils'; import {theme} from '@kepler.gl/styles'; diff --git a/test/browser/components/notifications/notification-panel-test.js b/test/browser/components/notifications/notification-panel-test.js index df6161ae2a..7dad312eca 100644 --- a/test/browser/components/notifications/notification-panel-test.js +++ b/test/browser/components/notifications/notification-panel-test.js @@ -22,8 +22,7 @@ import React from 'react'; import test from 'tape'; import sinon from 'sinon'; import {shallow} from 'enzyme'; -import NotificationItemFactory from 'components/notification-panel/notification-item'; -import NotificationPanelFactory from 'components/notification-panel'; +import {NotificationItemFactory, NotificationPanelFactory} from '@kepler.gl/components'; import {createNotification} from '@kepler.gl/utils'; import {theme} from '@kepler.gl/styles'; diff --git a/test/browser/components/plot-container-test.js b/test/browser/components/plot-container-test.js index f86027ae3a..0c5c86584e 100644 --- a/test/browser/components/plot-container-test.js +++ b/test/browser/components/plot-container-test.js @@ -22,8 +22,12 @@ import React from 'react'; import {IntlWrapper, mountWithTheme} from 'test/helpers/component-utils'; import test from 'tape'; -import {appInjector, PlotContainerFactory, MapContainerFactory} from 'components'; -import {plotContainerSelector} from 'components/kepler-gl'; +import { + appInjector, + PlotContainerFactory, + MapContainerFactory, + plotContainerSelector +} from '@kepler.gl/components'; import {mockKeplerProps} from '../../helpers/mock-state'; const PlotContainer = appInjector.get(PlotContainerFactory); diff --git a/test/browser/components/side-panel/color-selector-test.js b/test/browser/components/side-panel/color-selector-test.js index c01da15a18..cc795b88bd 100644 --- a/test/browser/components/side-panel/color-selector-test.js +++ b/test/browser/components/side-panel/color-selector-test.js @@ -24,33 +24,31 @@ import {mount} from 'enzyme'; import sinon from 'sinon'; import cloneDeep from 'lodash.clonedeep'; -import ColorSelector, { - ColorSelectorInput, - ColorBlock -} from 'components/side-panel/layer-panel/color-selector'; import { + ColorSelector, + ColorSelectorInput, + ColorBlock, LayerColorSelector, LayerColorRangeSelector, ArcLayerColorSelector, getLayerConfiguratorProps, - getVisConfiguratorProps -} from 'components/side-panel/layer-panel/layer-configurator'; -import SingleColorPalette from 'components/side-panel/layer-panel/single-color-palette'; -import ColorRangeSelector, { + getVisConfiguratorProps, + SingleColorPalette, + ColorRangeSelector, PaletteConfig, ColorPaletteGroup, - ALL_TYPES -} from 'components/side-panel/layer-panel/color-range-selector'; -import ColorPalette from 'components/side-panel/layer-panel/color-palette'; -import CustomPalette from 'components/side-panel/layer-panel/custom-palette'; -import CustomPicker from 'components/side-panel/layer-panel/custom-picker'; -import {Button} from 'components/common/styled-components'; + ALL_TYPES, + ColorPalette, + CustomPalette, + CustomPicker, + Button +} from '@kepler.gl/components'; import {COLOR_RANGES} from '@kepler.gl/constants'; import {StateWFilesFiltersLayerColor, StateWTrips} from 'test/helpers/mock-state'; import {IntlWrapper, mountWithTheme} from 'test/helpers/component-utils'; -import {hexToRgb} from '../../../../src/utils'; +import {hexToRgb} from '@kepler.gl/utils'; test('Components -> ColorSelector.render', t => { t.doesNotThrow(() => { diff --git a/test/browser/components/side-panel/filter-manager-test.js b/test/browser/components/side-panel/filter-manager-test.js index 4a3642c5cd..17eab8258b 100644 --- a/test/browser/components/side-panel/filter-manager-test.js +++ b/test/browser/components/side-panel/filter-manager-test.js @@ -27,12 +27,10 @@ import { FilterPanelFactory, FieldSelectorFactory, Button, - FilterPanelHeaderFactory -} from 'components'; - -import NewFilterPanelFactory from 'components/side-panel/filter-panel/filter-panel'; - -import {appInjector} from 'components/container'; + FilterPanelHeaderFactory, + NewFilterPanelFactory, + appInjector +} from '@kepler.gl/components'; import {mountWithTheme, IntlWrapper} from 'test/helpers/component-utils'; import {keplerGlReducerCore as keplerGlReducer} from '@kepler.gl/reducers'; import {VisStateActions} from '@kepler.gl/actions'; diff --git a/test/browser/components/side-panel/layer-configurator-test.js b/test/browser/components/side-panel/layer-configurator-test.js index 657d222676..0e75ba75b7 100644 --- a/test/browser/components/side-panel/layer-configurator-test.js +++ b/test/browser/components/side-panel/layer-configurator-test.js @@ -24,9 +24,8 @@ import React from 'react'; import test from 'tape'; import sinon from 'sinon'; -import {LayerConfiguratorFactory} from 'components'; +import {LayerConfiguratorFactory, appInjector} from '@kepler.gl/components'; import {StateWFiles, testCsvDataId} from 'test/helpers/mock-state'; -import {appInjector} from 'components/container'; import {IntlWrapper, mountWithTheme} from 'test/helpers/component-utils'; // components diff --git a/test/browser/components/side-panel/layer-list-test.js b/test/browser/components/side-panel/layer-list-test.js index b3b69f5656..adc12269a0 100644 --- a/test/browser/components/side-panel/layer-list-test.js +++ b/test/browser/components/side-panel/layer-list-test.js @@ -25,11 +25,9 @@ import {StateWMultiH3Layers} from 'test/helpers/mock-state'; import {VisStateActions, UIStateActions} from '@kepler.gl/actions'; -import {appInjector} from 'components/container'; +import {appInjector, LayerListFactory} from '@kepler.gl/components'; import {IntlWrapper, mountWithTheme} from 'test/helpers/component-utils'; -import LayerListFactory from 'components/side-panel/layer-panel/layer-list'; - const LayerList = appInjector.get(LayerListFactory); const defaultProps = { diff --git a/test/browser/components/side-panel/layer-manager-test.js b/test/browser/components/side-panel/layer-manager-test.js index 84c4f699e1..78ec76b550 100644 --- a/test/browser/components/side-panel/layer-manager-test.js +++ b/test/browser/components/side-panel/layer-manager-test.js @@ -28,18 +28,17 @@ import { DatasetSectionFactory, PanelViewListToggleFactory, PanelTitleFactory, - AddLayerButtonFactory -} from 'components'; + AddLayerButtonFactory, + appInjector, + Layers +} from '@kepler.gl/components'; -import {appInjector} from 'components/container'; import {mountWithTheme, IntlWrapper} from 'test/helpers/component-utils'; import {VisStateActions, UIStateActions} from '@kepler.gl/actions'; import {StateWMultiH3Layers} from 'test/helpers/mock-state'; -import {Layers} from 'components/common/icons'; - const LayerManager = appInjector.get(LayerManagerFactory); const LayerList = appInjector.get(LayerListFactory); const DatasetLayerGroup = appInjector.get(DatasetLayerGroupFactory); 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 451c9489a3..c12e916cf1 100644 --- a/test/browser/components/side-panel/layer-panel-header-test.js +++ b/test/browser/components/side-panel/layer-panel-header-test.js @@ -23,9 +23,7 @@ import React from 'react'; import test from 'tape'; -import {LayerPanelHeaderFactory} from 'components'; -import {DragHandle} from 'components/side-panel/layer-panel/layer-panel-header'; -import {appInjector} from 'components/container'; +import {LayerPanelHeaderFactory, DragHandle, appInjector} from '@kepler.gl/components'; import {mountWithTheme, IntlWrapper} from 'test/helpers/component-utils'; // components 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 eda5bf99a3..debe1d878e 100644 --- a/test/browser/components/side-panel/save-export-dropdown-test.js +++ b/test/browser/components/side-panel/save-export-dropdown-test.js @@ -24,9 +24,9 @@ import {mount} from 'enzyme'; import sinon from 'sinon'; import { SaveExportDropdownFactory, - PanelHeaderDropdownFactory -} from 'components/side-panel/panel-header'; -import ToolbarItem from 'components/common/toolbar-item'; + PanelHeaderDropdownFactory, + ToolbarItem +} from '@kepler.gl/components'; import {IntlWrapper} from 'test/helpers/component-utils'; test('SaveExportDropdown', t => { diff --git a/test/browser/components/side-panel/side-panel-test.js b/test/browser/components/side-panel/side-panel-test.js index fc7accfd1a..fe6b4cfb9f 100644 --- a/test/browser/components/side-panel/side-panel-test.js +++ b/test/browser/components/side-panel/side-panel-test.js @@ -21,21 +21,23 @@ import React from 'react'; import test from 'tape'; import sinon from 'sinon'; -import SidePanelFactory from 'components/side-panel'; -import SidebarFactory from 'components/side-panel/side-bar'; -import PanelHeaderFactory, {SaveExportDropdownFactory} from 'components/side-panel/panel-header'; -import LayerManagerFactory from 'components/side-panel/layer-manager'; -import FilterManagerFactory from 'components/side-panel/filter-manager'; -import InteractionManagerFactory from 'components/side-panel/interaction-manager'; -import MapManagerFactory from 'components/side-panel/map-manager'; -import PanelToggleFactory from 'components/side-panel/panel-toggle'; -import CustomPanelsFactory from 'components/side-panel/custom-panel'; - -import ToolbarItem from 'components/common/toolbar-item'; +import { + SidePanelFactory, + SidebarFactory, + PanelHeaderFactory, + SaveExportDropdownFactory, + LayerManagerFactory, + FilterManagerFactory, + InteractionManagerFactory, + MapManagerFactory, + PanelToggleFactory, + CustomPanelsFactory, + ToolbarItem, + appInjector +} from '@kepler.gl/components'; import {VisStateActions, MapStyleActions, UIStateActions} from '@kepler.gl/actions'; -import {appInjector} from 'components/container'; import {IntlWrapper, mountWithTheme} from 'test/helpers/component-utils'; // components diff --git a/test/browser/components/tooltip-config-test.js b/test/browser/components/tooltip-config-test.js index c698234e47..238a1e5530 100644 --- a/test/browser/components/tooltip-config-test.js +++ b/test/browser/components/tooltip-config-test.js @@ -24,20 +24,23 @@ import test from 'tape'; import uniq from 'lodash.uniq'; import {IntlWrapper, mountWithTheme} from 'test/helpers/component-utils'; -import TooltipConfigFactory from 'components/side-panel/interaction-panel/tooltip-config'; -import DatasetTagFactory from 'components/side-panel/common/dataset-tag'; -import FieldSelectorFactory from 'components/common/field-selector'; -import ChickletedInput, {ChickletButton} from 'components/common/item-selector/chickleted-input'; +import { + TooltipConfigFactory, + DatasetTagFactory, + FieldSelectorFactory, + ChickletedInput, + ChickletButton, + DropdownList, + Typeahead, + Icons, + appInjector +} from '@kepler.gl/components'; -import DropdownList from 'components/common/item-selector/dropdown-list'; -import Typeahead from 'components/common/item-selector/typeahead'; - -import {Hash, Delete} from 'components/common/icons'; import {StateWFiles, StateWithGeocoderDataset} from 'test/helpers/mock-state'; -import {appInjector} from 'components/container'; const TooltipConfig = appInjector.get(TooltipConfigFactory); const DatasetTag = appInjector.get(DatasetTagFactory); +const {Hash, Delete} = Icons; // const tooltipConfig = { // fieldsToShow: { diff --git a/test/helpers/layer-utils.js b/test/helpers/layer-utils.js index 763100906d..5244249850 100644 --- a/test/helpers/layer-utils.js +++ b/test/helpers/layer-utils.js @@ -32,7 +32,7 @@ import { renderDeckGlLayer, validateLayerWithData, mapStateReducer as mapState, - visStateReducer, + visStateReducer, keplerGlReducerCore } from '@kepler.gl/reducers'; import {getGpuFilterProps} from '@kepler.gl/table'; diff --git a/test/helpers/mock-state.js b/test/helpers/mock-state.js index 5758d5cf00..67b9a09593 100644 --- a/test/helpers/mock-state.js +++ b/test/helpers/mock-state.js @@ -33,7 +33,7 @@ import { DEFAULT_HIGHLIGHT_COLOR, DEFAULT_LAYER_LABEL } from '@kepler.gl/constants'; -import {DEFAULT_KEPLER_GL_PROPS} from 'components'; +import {DEFAULT_KEPLER_GL_PROPS, getUpdateVisDataPayload} from '@kepler.gl/components'; import { addDataToMap, VisStateActions, @@ -57,7 +57,6 @@ import { import tripGeojson, {tripDataInfo} from 'test/fixtures/trip-geojson'; import {processCsvData, processGeojson} from '@kepler.gl/processors'; import {MOCK_MAP_STYLE} from './mock-map-styles'; -import {getUpdateVisDataPayload} from 'components/geocoder-panel'; const geojsonFields = cloneDeep(fields); const geojsonRows = cloneDeep(rows); diff --git a/test/node/utils/kepler-gl-utils-test.js b/test/node/utils/kepler-gl-utils-test.js index 590598e8c5..09ab60f2e3 100644 --- a/test/node/utils/kepler-gl-utils-test.js +++ b/test/node/utils/kepler-gl-utils-test.js @@ -20,7 +20,7 @@ import test from 'tape'; import {GEOCODER_DATASET_NAME} from '@kepler.gl/constants'; -import {getVisibleDatasets} from 'components/kepler-gl'; +import {getVisibleDatasets} from '@kepler.gl/components'; test('kepler-gl utils -> getVisibleDatasets', t => { // Geocoder dataset mock can be an empty object since the filter function only cares about the key