Kepler.gl is a powerful open source geospatial analysis tool for large-scale data sets.
[Enhancement] Export time widget factories (#1133)
Shan He112806811d67
diff --git a/src/components/bottom-widget.js b/src/components/bottom-widget.jsindex e26daa017..4a4361212 100644--- a/src/components/bottom-widget.js+++ b/src/components/bottom-widget.js@@ -44,10 +44,10 @@ const BottomWidgetContainer = styled.div`position: absolute;display: flex;flex-direction: column;- padding-top: ${props => props.theme.sidePanel.margin.top}px;- padding-right: ${props => props.theme.sidePanel.margin.right}px;- padding-bottom: ${props => props.theme.sidePanel.margin.bottom}px;- padding-left: ${props => props.theme.sidePanel.margin.left}px;+ padding-top: ${props => props.theme.bottomWidgetPaddingTop}px;+ padding-right: ${props => props.theme.bottomWidgetPaddingRight}px;+ padding-bottom: ${props => props.theme.bottomWidgetPaddingBottom}px;+ padding-left: ${props => props.theme.bottomWidgetPaddingLeft}px;width: ${props => props.width}px;bottom: 0;right: 0;diff --git a/src/components/common/animation-control/animation-speed-slider.js b/src/components/common/animation-control/animation-speed-slider.jsindex 49504de79..ac0f7fa9c 100644--- a/src/components/common/animation-control/animation-speed-slider.js+++ b/src/components/common/animation-control/animation-speed-slider.js@@ -20,7 +20,7 @@import React, {Component} from 'react';import styled from 'styled-components';-import RangeSlider from 'components/common/range-slider';+import RangeSliderFactory from 'components/common/range-slider';import onClickOutside from 'react-onclickoutside';import {SPEED_CONTROL_RANGE} from 'constants/default-settings';@@ -41,33 +41,37 @@ const SpeedSliderContainer = styled.div`}`;-class AnimationSpeedSlider extends Component {- handleClickOutside = e => {- this.props.onHide();- };+AnimationSpeedSliderFactory.deps = [RangeSliderFactory];- _onChange = v => this.props.updateAnimationSpeed(v[1]);+export default function AnimationSpeedSliderFactory(RangeSlider) {+ class AnimationSpeedSlider extends Component {+ handleClickOutside = e => {+ this.props.onHide();+ };- render() {- return (- <SpeedSliderContainer className="animation-control__speed-slider">- <SliderWrapper>- <RangeSlider- range={SPEED_CONTROL_RANGE}- step={0.01}- value0={0}- value1={this.props.speed}- onChange={this._onChange}- isRanged={false}- showTooltip- showInput- inputTheme="secondary"- inputSize="tiny"- />- </SliderWrapper>- </SpeedSliderContainer>- );+ _onChange = v => this.props.updateAnimationSpeed(v[1]);++ render() {+ return (+ <SpeedSliderContainer className="animation-control__speed-slider">+ <SliderWrapper>+ <RangeSlider+ range={SPEED_CONTROL_RANGE}+ step={0.01}+ value0={0}+ value1={this.props.speed}+ onChange={this._onChange}+ isRanged={false}+ showTooltip+ showInput+ inputTheme="secondary"+ inputSize="tiny"+ />+ </SliderWrapper>+ </SpeedSliderContainer>+ );+ }}-}-export default onClickOutside(AnimationSpeedSlider);+ return onClickOutside(AnimationSpeedSlider);+}diff --git a/src/components/common/animation-control/speed-control.js b/src/components/common/animation-control/speed-control.jsindex 0aac5286b..c0373a975 100644--- a/src/components/common/animation-control/speed-control.js+++ b/src/components/common/animation-control/speed-control.js@@ -20,7 +20,7 @@import React from 'react';import styled from 'styled-components';-import AnimationSpeedSlider from './animation-speed-slider';+import AnimationSpeedSliderFactory from './animation-speed-slider';import {Button, CenterFlexbox} from 'components/common/styled-components';import {Rocket} from 'components/common/icons';@@ -37,7 +37,9 @@ const StyledSpeedText = styled.div`text-align: left;`;-function SpeedControlFactory() {+SpeedControlFactory.deps = [AnimationSpeedSliderFactory];++function SpeedControlFactory(AnimationSpeedSlider) {const SpeedControl = ({onClick,updateAnimationSpeed,diff --git a/src/components/common/item-selector/dropdown-list.js b/src/components/common/item-selector/dropdown-list.jsindex 3db381761..5fc184026 100644--- a/src/components/common/item-selector/dropdown-list.js+++ b/src/components/common/item-selector/dropdown-list.js@@ -39,7 +39,9 @@ export const ListItem = ({value, displayOption = defaultDisplay}) => (const DropdownListWrapper = styled.div`background-color: ${props =>props.light ? props.theme.dropdownListBgdLT : props.theme.dropdownListBgd};- border-top: 1px solid ${props => props.theme.dropdownListBorderTop};+ border-top: 1px solid+ ${props =>+ props.light ? props.theme.dropdownListBorderTopLT : props.theme.dropdownListBorderTop};${props => (props.light ? props.theme.dropdownListLT : props.theme.dropdownList)};`;diff --git a/src/components/common/item-selector/item-selector.js b/src/components/common/item-selector/item-selector.jsindex dc098a643..7b5809c95 100644--- a/src/components/common/item-selector/item-selector.js+++ b/src/components/common/item-selector/item-selector.js@@ -172,6 +172,7 @@ class ItemSelector extends Component {if (this.props.multiSelect) {const items = uniqBy(previousSelected.concat(toArray(item)), getValue);+this.props.onChange(items);} else {this.props.onChange(getValue(item));@@ -188,7 +189,8 @@ class ItemSelector extends Component {this.props.onChange(null);};- _showTypeahead = () => {+ _showTypeahead = e => {+ e.stopPropagation();if (!this.props.disabled) {this.setState({showTypeahead: truediff --git a/src/components/common/range-plot.js b/src/components/common/range-plot.jsindex 9f499d971..04805b250 100644--- a/src/components/common/range-plot.js+++ b/src/components/common/range-plot.js@@ -39,73 +39,78 @@ const histogramStyle = {unHighlightedW: 0.4};-export default class RangePlot extends Component {- static propTypes = {- value: PropTypes.arrayOf(PropTypes.number).isRequired,- histogram: PropTypes.arrayOf(- PropTypes.shape({- x0: PropTypes.number,- x1: PropTypes.number- })- ),- lineChart: PropTypes.object,- plotType: PropTypes.string,- isEnlarged: PropTypes.bool,- onBlur: PropTypes.func,- width: PropTypes.number.isRequired- };-- state = {- hoveredDP: null- };-- domainSelector = props => props.lineChart && props.lineChart.xDomain;- hintFormatter = createSelector(this.domainSelector, domain => getTimeWidgetHintFormatter(domain));-- onMouseMove = hoveredDP => {- this.setState({hoveredDP});- };-- render() {- const {onBrush, range, value, width, plotType, lineChart, histogram} = this.props;- const domain = [histogram[0].x0, histogram[histogram.length - 1].x1];-- const brushComponent = (- <RangeBrush domain={domain} onBrush={onBrush} range={range} value={value} width={width} />+export default function RangePlotFactory() {+ class RangePlot extends Component {+ static propTypes = {+ value: PropTypes.arrayOf(PropTypes.number).isRequired,+ histogram: PropTypes.arrayOf(+ PropTypes.shape({+ x0: PropTypes.number,+ x1: PropTypes.number+ })+ ),+ lineChart: PropTypes.object,+ plotType: PropTypes.string,+ isEnlarged: PropTypes.bool,+ onBlur: PropTypes.func,+ width: PropTypes.number.isRequired+ };++ state = {+ hoveredDP: null+ };++ domainSelector = props => props.lineChart && props.lineChart.xDomain;+ hintFormatter = createSelector(this.domainSelector, domain =>+ getTimeWidgetHintFormatter(domain));- return (- <div- style={{- height: `${containerH}px`,- position: 'relative'- }}- >- {plotType === 'lineChart' ? (- <LineChart- hoveredDP={this.state.hoveredDP}- width={width}- height={containerH}- margin={chartMargin}- children={brushComponent}- onMouseMove={this.onMouseMove}- yDomain={lineChart.yDomain}- hintFormat={this.hintFormatter(this.props)}- data={lineChart.series}- />- ) : (- <Histogram- width={width}- height={chartH}- value={value}- margin={chartMargin}- histogram={histogram}- brushComponent={brushComponent}- />- )}- </div>- );+ onMouseMove = hoveredDP => {+ this.setState({hoveredDP});+ };++ render() {+ const {onBrush, range, value, width, plotType, lineChart, histogram} = this.props;+ const domain = [histogram[0].x0, histogram[histogram.length - 1].x1];++ const brushComponent = (+ <RangeBrush domain={domain} onBrush={onBrush} range={range} value={value} width={width} />+ );++ return (+ <div+ style={{+ height: `${containerH}px`,+ position: 'relative'+ }}+ >+ {plotType === 'lineChart' ? (+ <LineChart+ hoveredDP={this.state.hoveredDP}+ width={width}+ height={containerH}+ margin={chartMargin}+ children={brushComponent}+ onMouseMove={this.onMouseMove}+ yDomain={lineChart.yDomain}+ hintFormat={this.hintFormatter(this.props)}+ data={lineChart.series}+ />+ ) : (+ <Histogram+ width={width}+ height={chartH}+ value={value}+ margin={chartMargin}+ histogram={histogram}+ brushComponent={brushComponent}+ />+ )}+ </div>+ );+ }}+ return RangePlot;}const Histogram = ({width, height, margin, histogram, value, brushComponent}) => {diff --git a/src/components/common/range-slider.js b/src/components/common/range-slider.jsindex adf89735f..ea23c2de4 100644--- a/src/components/common/range-slider.js+++ b/src/components/common/range-slider.js@@ -23,7 +23,7 @@ import {polyfill} from 'react-lifecycles-compat';import PropTypes from 'prop-types';import styled from 'styled-components';-import RangePlot from './range-plot';+import RangePlotFactory from './range-plot';import Slider from 'components/common/slider/slider';import {Input} from 'components/common/styled-components';@@ -46,219 +46,223 @@ const RangeInputWrapper = styled.div`justify-content: space-between;`;-class RangeSlider extends Component {- static propTypes = {- range: PropTypes.arrayOf(PropTypes.number).isRequired,- value0: PropTypes.number.isRequired,- value1: PropTypes.number.isRequired,- onChange: PropTypes.func.isRequired,- histogram: PropTypes.arrayOf(PropTypes.any),- isRanged: PropTypes.bool,- isEnlarged: PropTypes.bool,- showInput: PropTypes.bool,- inputTheme: PropTypes.string,- inputSize: PropTypes.string,- step: PropTypes.number,- sliderHandleWidth: PropTypes.number,- xAxis: PropTypes.func- };-- static defaultProps = {- isEnlarged: false,- isRanged: true,- showInput: true,- sliderHandleWidth: 12,- inputTheme: '',- inputSize: 'small',- onChange: () => {}- };-- static getDerivedStateFromProps(props, state) {- let update = null;- const {value0, value1} = props;- if (props.value0 !== state.prevValue0 && !isNaN(value0)) {- update = {...(update || {}), value0, prevValue0: value0};+RangeSliderFactory.deps = [RangePlotFactory];++export default function RangeSliderFactory(RangePlot) {+ class RangeSlider extends Component {+ static propTypes = {+ range: PropTypes.arrayOf(PropTypes.number).isRequired,+ value0: PropTypes.number.isRequired,+ value1: PropTypes.number.isRequired,+ onChange: PropTypes.func.isRequired,+ histogram: PropTypes.arrayOf(PropTypes.any),+ isRanged: PropTypes.bool,+ isEnlarged: PropTypes.bool,+ showInput: PropTypes.bool,+ inputTheme: PropTypes.string,+ inputSize: PropTypes.string,+ step: PropTypes.number,+ sliderHandleWidth: PropTypes.number,+ xAxis: PropTypes.func+ };++ static defaultProps = {+ isEnlarged: false,+ isRanged: true,+ showInput: true,+ sliderHandleWidth: 12,+ inputTheme: '',+ inputSize: 'small',+ onChange: () => {}+ };++ static getDerivedStateFromProps(props, state) {+ let update = null;+ const {value0, value1} = props;+ if (props.value0 !== state.prevValue0 && !isNaN(value0)) {+ update = {...(update || {}), value0, prevValue0: value0};+ }+ if (props.value1 !== state.prevValue1 && !isNaN(value1)) {+ update = {...(update || {}), value1, prevValue1: value1};+ }+ return update;}- if (props.value1 !== state.prevValue1 && !isNaN(value1)) {- update = {...(update || {}), value1, prevValue1: value1};++ state = {+ value0: 0,+ value1: 1,+ prevValue0: 0,+ prevValue1: 1,+ width: 288+ };++ componentDidMount() {+ this._resize();}- return update;- }- state = {- value0: 0,- value1: 1,- prevValue0: 0,- prevValue1: 1,- width: 288- };+ componentDidUpdate(prevProps, prevState) {+ this._resize();+ }- componentDidMount() {- this._resize();- }+ sliderContainer = createRef();+ inputValue0 = createRef();+ inputValue1 = createRef();- componentDidUpdate(prevProps, prevState) {- this._resize();- }+ _isVal0InRange = val => {+ const {value1, range} = this.props;- sliderContainer = createRef();- inputValue0 = createRef();- inputValue1 = createRef();+ return Boolean(val >= range[0] && val <= value1);+ };- _isVal0InRange = val => {- const {value1, range} = this.props;+ _isVal1InRange = val => {+ const {range, value0} = this.props;- return Boolean(val >= range[0] && val <= value1);- };+ return Boolean(val <= range[1] && val >= value0);+ };- _isVal1InRange = val => {- const {range, value0} = this.props;+ _roundValToStep = val => {+ const {range, step} = this.props;- return Boolean(val <= range[1] && val >= value0);- };+ return roundValToStep(range[0], step, val);+ };- _roundValToStep = val => {- const {range, step} = this.props;+ _setRangeVal1 = val => {+ const {value0, onChange} = this.props;+ val = Number(val);+ if (this._isVal1InRange(val)) {+ onChange([value0, this._roundValToStep(val)]);+ return true;+ }+ return false;+ };- return roundValToStep(range[0], step, val);- };+ _setRangeVal0 = val => {+ const {value1, onChange} = this.props;+ const val0 = Number(val);++ if (this._isVal0InRange(val0)) {+ onChange([this._roundValToStep(val0), value1]);+ return true;+ }+ return false;+ };- _setRangeVal1 = val => {- const {value0, onChange} = this.props;- val = Number(val);- if (this._isVal1InRange(val)) {- onChange([value0, this._roundValToStep(val)]);- return true;+ _resize() {+ const width = this.sliderContainer.current.offsetWidth;+ if (width !== this.state.width) {+ this.setState({width});+ }}- return false;- };+ _onChangeInput = (key, e) => {+ this.setState({[key]: e.target.value});+ };- _setRangeVal0 = val => {- const {value1, onChange} = this.props;- const val0 = Number(val);+ _renderInput(key) {+ const setRange = key === 'value0' ? this._setRangeVal0 : this._setRangeVal1;+ const ref = key === 'value0' ? this.inputValue0 : this.inputValue1;+ const update = e => {+ if (!setRange(e.target.value)) {+ this.setState({[key]: this.state[key]});+ }+ };- if (this._isVal0InRange(val0)) {- onChange([this._roundValToStep(val0), value1]);- return true;- }- return false;- };+ const onChange = this._onChangeInput.bind(this, key);- _resize() {- const width = this.sliderContainer.current.offsetWidth;- if (width !== this.state.width) {- this.setState({width});+ return (+ <SliderInput+ className="kg-range-slider__input"+ type="number"+ ref={ref}+ id={`slider-input-${key}`}+ key={key}+ value={this.state[key]}+ onChange={onChange}+ onKeyPress={e => {+ if (e.key === 'Enter') {+ update(e);+ ref.current.blur();+ }+ }}+ onBlur={update}+ flush={key === 'value0'}+ size={this.props.inputSize}+ secondary={this.props.inputTheme === 'secondary'}+ />+ );}- }- _onChangeInput = (key, e) => {- this.setState({[key]: e.target.value});- };-- _renderInput(key) {- const setRange = key === 'value0' ? this._setRangeVal0 : this._setRangeVal1;- const ref = key === 'value0' ? this.inputValue0 : this.inputValue1;- const update = e => {- if (!setRange(e.target.value)) {- this.setState({[key]: this.state[key]});- }- };- const onChange = this._onChangeInput.bind(this, key);-- return (- <SliderInput- className="kg-range-slider__input"- type="number"- ref={ref}- id={`slider-input-${key}`}- key={key}- value={this.state[key]}- onChange={onChange}- onKeyPress={e => {- if (e.key === 'Enter') {- update(e);- ref.current.blur();- }- }}- onBlur={update}- flush={key === 'value0'}- size={this.props.inputSize}- secondary={this.props.inputTheme === 'secondary'}- />- );- }+ render() {+ const {+ isRanged,+ showInput,+ histogram,+ lineChart,+ plotType,+ isEnlarged,+ range,+ onChange,+ value0,+ value1,+ sliderHandleWidth,+ step+ } = this.props;- render() {- const {- isRanged,- showInput,- histogram,- lineChart,- plotType,- isEnlarged,- range,- onChange,- value0,- value1,- sliderHandleWidth,- step- } = this.props;-- const height = isRanged && showInput ? '16px' : '24px';- const {width} = this.state;- const plotWidth = Math.max(width - sliderHandleWidth, 0);-- return (- <div- className="kg-range-slider"- style={{width: '100%', padding: `0 ${sliderHandleWidth / 2}px`}}- ref={this.sliderContainer}- >- {histogram && histogram.length ? (- <RangePlot- histogram={histogram}- lineChart={lineChart}- plotType={plotType}- isEnlarged={isEnlarged}- onBrush={(val0, val1) => {- onChange([this._roundValToStep(val0), this._roundValToStep(val1)]);- }}- range={range}- value={[value0, value1]}- width={plotWidth}- />- ) : null}- <SliderWrapper style={{height}} className="kg-range-slider__slider">- {this.props.xAxis ? <this.props.xAxis width={plotWidth} domain={range} /> : null}- <Slider- showValues={false}- isRanged={isRanged}- minValue={range[0]}- maxValue={range[1]}- value0={value0}- value1={value1}- step={step}- handleWidth={sliderHandleWidth}- onSlider0Change={this._setRangeVal0}- onSlider1Change={this._setRangeVal1}- onSliderBarChange={(val0, val1) => {- onChange([val0, val1]);- }}- enableBarDrag- />- {!isRanged && showInput ? this._renderInput('value1') : null}- </SliderWrapper>- {isRanged && showInput ? (- <RangeInputWrapper className="range-slider__input-group">- {this._renderInput('value0')}- {this._renderInput('value1')}- </RangeInputWrapper>- ) : null}- </div>- );+ const height = isRanged && showInput ? '16px' : '24px';+ const {width} = this.state;+ const plotWidth = Math.max(width - sliderHandleWidth, 0);++ return (+ <div+ className="kg-range-slider"+ style={{width: '100%', padding: `0 ${sliderHandleWidth / 2}px`}}+ ref={this.sliderContainer}+ >+ {histogram && histogram.length ? (+ <RangePlot+ histogram={histogram}+ lineChart={lineChart}+ plotType={plotType}+ isEnlarged={isEnlarged}+ onBrush={(val0, val1) => {+ onChange([this._roundValToStep(val0), this._roundValToStep(val1)]);+ }}+ range={range}+ value={[value0, value1]}+ width={plotWidth}+ />+ ) : null}+ <SliderWrapper style={{height}} className="kg-range-slider__slider">+ {this.props.xAxis ? <this.props.xAxis width={plotWidth} domain={range} /> : null}+ <Slider+ showValues={false}+ isRanged={isRanged}+ minValue={range[0]}+ maxValue={range[1]}+ value0={value0}+ value1={value1}+ step={step}+ handleWidth={sliderHandleWidth}+ onSlider0Change={this._setRangeVal0}+ onSlider1Change={this._setRangeVal1}+ onSliderBarChange={(val0, val1) => {+ onChange([val0, val1]);+ }}+ enableBarDrag+ />+ {!isRanged && showInput ? this._renderInput('value1') : null}+ </SliderWrapper>+ {isRanged && showInput ? (+ <RangeInputWrapper className="range-slider__input-group">+ {this._renderInput('value0')}+ {this._renderInput('value1')}+ </RangeInputWrapper>+ ) : null}+ </div>+ );+ }}-}-polyfill(RangeSlider);+ polyfill(RangeSlider);-export default RangeSlider;+ return RangeSlider;+}diff --git a/src/components/common/time-range-slider.js b/src/components/common/time-range-slider.jsindex 64a6459fc..50ec8b95d 100644--- a/src/components/common/time-range-slider.js+++ b/src/components/common/time-range-slider.js@@ -28,7 +28,7 @@ import {createSelector} from 'reselect';import {Minus} from 'components/common/icons';import {SelectTextBold, SelectText} from 'components/common/styled-components';-import RangeSlider from 'components/common/range-slider';+import RangeSliderFactory from 'components/common/range-slider';import TimeSliderMarker from 'components/common/time-slider-marker';import PlaybackControlsFactory from 'components/common/animation-control/playback-controls';import {BASE_SPEED, DEFAULT_TIME_FORMAT} from 'constants/default-settings';@@ -51,9 +51,9 @@ const StyledSliderContainer = styled.div`}`;-TimeRangeSliderFactory.deps = [PlaybackControlsFactory];+TimeRangeSliderFactory.deps = [PlaybackControlsFactory, RangeSliderFactory];-export default function TimeRangeSliderFactory(PlaybackControls) {+export default function TimeRangeSliderFactory(PlaybackControls, RangeSlider) {class TimeRangeSlider extends Component {static propTypes = {onChange: PropTypes.func.isRequired,diff --git a/src/components/filters/range-filter.js b/src/components/filters/range-filter.jsindex faac19a60..4024f56fe 100644--- a/src/components/filters/range-filter.js+++ b/src/components/filters/range-filter.js@@ -19,9 +19,11 @@// THE SOFTWARE.import React from 'react';-import RangeSlider from 'components/common/range-slider';+import RangeSliderFactory from 'components/common/range-slider';-export default function RangeFilterFactory() {+RangeFilterFactory.deps = [RangeSliderFactory];++export default function RangeFilterFactory(RangeSlider) {const RangeFilter = ({filter, setFilter}) => (<div><RangeSliderdiff --git a/src/components/filters/time-range-filter.js b/src/components/filters/time-range-filter.jsindex 25b21b537..9af35513b 100644--- a/src/components/filters/time-range-filter.js+++ b/src/components/filters/time-range-filter.js@@ -30,6 +30,7 @@ TimeRangeFilterFactory.deps = [TimeRangeSliderFactory];function TimeRangeFilterFactory(TimeRangeSlider) {const TimeRangeFilter = ({filter, setFilter, isAnimatable, toggleAnimation, hideTimeTitle}) => (<TimeRangeSlider+ id={filter.id}domain={filter.domain}value={filter.value}plotType={filter.plotType}diff --git a/src/components/index.js b/src/components/index.jsindex 977096e36..65f73f7aa 100644--- a/src/components/index.js+++ b/src/components/index.js@@ -19,6 +19,8 @@// THE SOFTWARE.import TimeRangeSliderFactory from './common/time-range-slider';+import RangeSliderFactory from './common/range-slider';+import {appInjector} from './container';// Componentsexport {default as KeplerGl, default, injectComponents} from './container';@@ -46,6 +48,8 @@ export {AddDataButtonFactory, default as LayerManagerFactory} from './side-panelexport {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 VisConfigSliderFactory} from './side-panel/layer-panel/vis-config-slider';+export {default as TextLabelPanelFactory} from './side-panel/layer-panel/text-label-panel';export {default as SourceDataCatalogFactory} from './side-panel/common/source-data-catalog';export {default as SourceDataSelectorFactory} from './side-panel/common/source-data-selector';@@ -82,6 +86,8 @@ 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 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';// // common factoryexport {default as AnimationControlFactory} from './common/animation-control/animation-control';@@ -89,6 +95,9 @@ export {default as SpeedControlFactory} from './common/animation-control/speed-cexport {default as AnimationPlaybacksFactory} from './common/animation-control/playback-controls';export {default as FloatingTimeDisplayFactory} from './common/animation-control/floating-time-display';export {default as DatasetSquare} from './common/styled-components';+export {default as AnimationSpeedSliderFactory} from './common/animation-control/animation-speed-slider';+export {default as RangePlotFactory} from './common/range-plot';+export {FieldListItemFactory} from './common/field-selector';// // Filters factoryexport {default as TimeWidgetFactory} from './filters/time-widget';@@ -110,15 +119,21 @@ export {default as FileUploadFactory, FileUpload} from './common/file-uploader/fexport {default as DatasetLabel} from './common/dataset-label';export {default as ItemSelector} from './common/item-selector/item-selector';export {default as FieldSelector} from './common/field-selector';-export {default as RangeSlider} from './common/range-slider';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 LoadingSpinner} from './common/loading-spinner';export {default as LoadingDialog} from './modals/loading-dialog';+export {default as FieldToken} from './common/field-token';+export {default as Portaled} from './common/portaled';+export {default as DropdownList} from './common/item-selector/dropdown-list';+export * from './common/styled-components';import * as Icons from './common/icons';export {Icons};-export const TimeRangeSlider = TimeRangeSliderFactory();-export {TimeRangeSliderFactory};+// Individual Component from Dependency Tree+export const TimeRangeSlider = appInjector.get(TimeRangeSliderFactory);+export const RangeSlider = appInjector.get(RangeSliderFactory);++export {TimeRangeSliderFactory, RangeSliderFactory};diff --git a/src/components/kepler-gl.js b/src/components/kepler-gl.jsindex 20cb54183..2f1129319 100644--- a/src/components/kepler-gl.js+++ b/src/components/kepler-gl.js@@ -383,9 +383,7 @@ function KeplerGlFactory(animationConfig={animationConfig}visStateActions={visStateActions}sidePanelWidth={- uiState.readOnly- ? 0- : this.props.sidePanelWidth + DIMENSIONS.sidePanel.margin.left+ uiState.readOnly ? 0 : this.props.sidePanelWidth + theme.sidePanel.margin.left}containerW={containerW}/>diff --git a/src/components/side-panel/interaction-panel/brush-config.js b/src/components/side-panel/interaction-panel/brush-config.jsindex 0d4d03760..fd68f64d5 100644--- a/src/components/side-panel/interaction-panel/brush-config.js+++ b/src/components/side-panel/interaction-panel/brush-config.js@@ -19,13 +19,15 @@// THE SOFTWARE.import React from 'react';-import RangeSlider from 'components/common/range-slider';+import RangeSliderFactory from 'components/common/range-slider';import {PanelLabel, SidePanelSection} from 'components/common/styled-components';import {BRUSH_CONFIG} from 'utils/interaction-utils';import {FormattedMessage} from 'react-intl';-function BrushConfigFactory() {+BrushConfigFactory.deps = [RangeSliderFactory];++function BrushConfigFactory(RangeSlider) {const BrushConfig = ({config, onChange}) => (<SidePanelSection><PanelLabel>diff --git a/src/components/side-panel/layer-panel/layer-configurator.js b/src/components/side-panel/layer-panel/layer-configurator.jsindex 99d06bc8b..2dd77cf43 100644--- a/src/components/side-panel/layer-panel/layer-configurator.js+++ b/src/components/side-panel/layer-panel/layer-configurator.js@@ -34,9 +34,9 @@ import DimensionScaleSelector from './dimension-scale-selector';import ColorSelector from './color-selector';import SourceDataSelectorFactory from 'components/side-panel/common/source-data-selector';import VisConfigSwitch from './vis-config-switch';-import VisConfigSlider from './vis-config-slider';+import VisConfigSliderFactory from './vis-config-slider';import LayerConfigGroup, {ConfigGroupCollapsibleContent} from './layer-config-group';-import TextLabelPanel from './text-label-panel';+import TextLabelPanelFactory from './text-label-panel';import {capitalizeFirstLetter} from 'utils/utils';@@ -78,9 +78,17 @@ export const getLayerChannelConfigProps = props => ({onChange: props.updateLayerVisualChannelConfig});-LayerConfiguratorFactory.deps = [SourceDataSelectorFactory];--export default function LayerConfiguratorFactory(SourceDataSelector) {+LayerConfiguratorFactory.deps = [+ SourceDataSelectorFactory,+ VisConfigSliderFactory,+ TextLabelPanelFactory+];++export default function LayerConfiguratorFactory(+ SourceDataSelector,+ VisConfigSlider,+ TextLabelPanel+) {class LayerConfigurator extends Component {static propTypes = {layer: PropTypes.object.isRequired,diff --git a/src/components/side-panel/layer-panel/text-label-panel.js b/src/components/side-panel/layer-panel/text-label-panel.jsindex a8082cd4f..240a3377b 100644--- a/src/components/side-panel/layer-panel/text-label-panel.js+++ b/src/components/side-panel/layer-panel/text-label-panel.js@@ -37,105 +37,109 @@ import LayerConfigGroup, {ConfigGroupCollapsibleContent,ConfigGroupCollapsibleHeader} from './layer-config-group';-import RangeSlider from 'components/common/range-slider';+import RangeSliderFactory from 'components/common/range-slider';import {LAYER_TEXT_CONFIGS} from 'layers/layer-factory';-class TextLabelPanel extends Component {- static propTypes = {- fields: PropTypes.arrayOf(PropTypes.object),- textLabel: PropTypes.arrayOf(PropTypes.object),- updateLayerTextLabel: PropTypes.func.isRequired- };+TextLabelPanelFactory.deps = [RangeSliderFactory];- render() {- const {updateLayerTextLabel, textLabel, fields} = this.props;- const currentFields = textLabel.map(tl => tl.field && tl.field.name).filter(d => d);- return (- <LayerConfigGroup label={'panel.text.label'} collapsible>- <ConfigGroupCollapsibleHeader>- <FieldSelector- fields={fields}- value={currentFields}- onSelect={selected => updateLayerTextLabel('all', 'fields', selected)}- multiSelect- />- </ConfigGroupCollapsibleHeader>- <ConfigGroupCollapsibleContent>- {textLabel.map((tl, idx) => (- <div key={tl.field ? tl.field.name : `null-${idx}`}>- <PanelLabel>- <FormattedMessage id={'panel.text.labelWithId'} values={{labelId: idx + 1}} />- </PanelLabel>- <SidePanelSection>- <FieldSelector- fields={fields}- value={(tl.field && tl.field.name) || 'placeholder.selectField'}- placeholder={'placeholder.empty'}- onSelect={v => updateLayerTextLabel(idx, 'field', v)}- erasable- />- </SidePanelSection>- <SidePanelSection>- <PanelLabel>- <FormattedMessage id="panel.text.fontSize" />- </PanelLabel>- <RangeSlider- {...LAYER_TEXT_CONFIGS.fontSize}- value1={tl.size}- isRange={false}- onChange={v => updateLayerTextLabel(idx, 'size', v[1])}- />- </SidePanelSection>- <SidePanelSection>+export default function TextLabelPanelFactory(RangeSlider) {+ class TextLabelPanel extends Component {+ static propTypes = {+ fields: PropTypes.arrayOf(PropTypes.object),+ textLabel: PropTypes.arrayOf(PropTypes.object),+ updateLayerTextLabel: PropTypes.func.isRequired+ };++ render() {+ const {updateLayerTextLabel, textLabel, fields} = this.props;+ const currentFields = textLabel.map(tl => tl.field && tl.field.name).filter(d => d);+ return (+ <LayerConfigGroup label={'panel.text.label'} collapsible>+ <ConfigGroupCollapsibleHeader>+ <FieldSelector+ fields={fields}+ value={currentFields}+ onSelect={selected => updateLayerTextLabel('all', 'fields', selected)}+ multiSelect+ />+ </ConfigGroupCollapsibleHeader>+ <ConfigGroupCollapsibleContent>+ {textLabel.map((tl, idx) => (+ <div key={tl.field ? tl.field.name : `null-${idx}`}><PanelLabel>- <FormattedMessage id="panel.text.fontColor" />+ <FormattedMessage id={'panel.text.labelWithId'} values={{labelId: idx + 1}} /></PanelLabel>- <ColorSelector- colorSets={[- {- selectedColor: tl.color,- setColor: v => updateLayerTextLabel(idx, 'color', v)- }- ]}- />- </SidePanelSection>- <SidePanelSection>- <SpaceBetweenFlexbox>- <SBFlexboxItem>- <PanelLabel>- <FormattedMessage id="panel.text.textAnchor" />- </PanelLabel>- <ItemSelector- {...LAYER_TEXT_CONFIGS.textAnchor}- selectedItems={tl.anchor}- onChange={val => updateLayerTextLabel(idx, 'anchor', val)}- />- </SBFlexboxItem>- <SBFlexboxItem>- <PanelLabel>- <FormattedMessage id="panel.text.alignment" />- </PanelLabel>- <ItemSelector- {...LAYER_TEXT_CONFIGS.textAlignment}- selectedItems={tl.alignment}- onChange={val => updateLayerTextLabel(idx, 'alignment', val)}- />- </SBFlexboxItem>- </SpaceBetweenFlexbox>- </SidePanelSection>- </div>- ))}- <SidePanelSection>- <Button link onClick={val => updateLayerTextLabel(textLabel.length)}>- <Add height="12px" />- <FormattedMessage id="panel.text.addMoreLabel" />- </Button>- </SidePanelSection>- </ConfigGroupCollapsibleContent>- </LayerConfigGroup>- );+ <SidePanelSection>+ <FieldSelector+ fields={fields}+ value={(tl.field && tl.field.name) || 'placeholder.selectField'}+ placeholder={'placeholder.empty'}+ onSelect={v => updateLayerTextLabel(idx, 'field', v)}+ erasable+ />+ </SidePanelSection>+ <SidePanelSection>+ <PanelLabel>+ <FormattedMessage id="panel.text.fontSize" />+ </PanelLabel>+ <RangeSlider+ {...LAYER_TEXT_CONFIGS.fontSize}+ value1={tl.size}+ isRange={false}+ onChange={v => updateLayerTextLabel(idx, 'size', v[1])}+ />+ </SidePanelSection>+ <SidePanelSection>+ <PanelLabel>+ <FormattedMessage id="panel.text.fontColor" />+ </PanelLabel>+ <ColorSelector+ colorSets={[+ {+ selectedColor: tl.color,+ setColor: v => updateLayerTextLabel(idx, 'color', v)+ }+ ]}+ />+ </SidePanelSection>+ <SidePanelSection>+ <SpaceBetweenFlexbox>+ <SBFlexboxItem>+ <PanelLabel>+ <FormattedMessage id="panel.text.textAnchor" />+ </PanelLabel>+ <ItemSelector+ {...LAYER_TEXT_CONFIGS.textAnchor}+ selectedItems={tl.anchor}+ onChange={val => updateLayerTextLabel(idx, 'anchor', val)}+ />+ </SBFlexboxItem>+ <SBFlexboxItem>+ <PanelLabel>+ <FormattedMessage id="panel.text.alignment" />+ </PanelLabel>+ <ItemSelector+ {...LAYER_TEXT_CONFIGS.textAlignment}+ selectedItems={tl.alignment}+ onChange={val => updateLayerTextLabel(idx, 'alignment', val)}+ />+ </SBFlexboxItem>+ </SpaceBetweenFlexbox>+ </SidePanelSection>+ </div>+ ))}+ <SidePanelSection>+ <Button link onClick={val => updateLayerTextLabel(textLabel.length)}>+ <Add height="12px" />+ <FormattedMessage id="panel.text.addMoreLabel" />+ </Button>+ </SidePanelSection>+ </ConfigGroupCollapsibleContent>+ </LayerConfigGroup>+ );+ }}-}-export default TextLabelPanel;+ return TextLabelPanel;+}diff --git a/src/components/side-panel/layer-panel/vis-config-slider.js b/src/components/side-panel/layer-panel/vis-config-slider.jsindex 606dcc2e6..2a449afec 100644--- a/src/components/side-panel/layer-panel/vis-config-slider.js+++ b/src/components/side-panel/layer-panel/vis-config-slider.js@@ -22,7 +22,7 @@ import React from 'react';import PropTypes from 'prop-types';import {PanelLabel, SidePanelSection} from 'components/common/styled-components';-import RangeSlider from 'components/common/range-slider';+import RangeSliderFactory from 'components/common/range-slider';import {FormattedMessage} from 'react-intl';const propTypes = {@@ -37,42 +37,46 @@ const propTypes = {inputTheme: PropTypes.bool};-export const VisConfigSlider = ({- layer: {config},- property,- label,- range,- step,- isRanged,- disabled,- onChange,- inputTheme-}) => (- <SidePanelSection disabled={Boolean(disabled)}>- {label ? (- <PanelLabel>- {typeof label === 'string' ? (- <FormattedMessage id={label} />- ) : typeof label === 'function' ? (- <FormattedMessage id={label(config)} />- ) : (- <FormattedMessage id={`property.${property}`} />- )}- </PanelLabel>- ) : null}- <RangeSlider- range={range}- value0={isRanged ? config.visConfig[property][0] : range[0]}- value1={isRanged ? config.visConfig[property][1] : config.visConfig[property]}- step={step}- isRanged={Boolean(isRanged)}- onChange={value => onChange({[property]: isRanged ? value : value[1]})}- inputTheme={inputTheme}- showInput- />- </SidePanelSection>-);+VisConfigSliderFactory.deps = [RangeSliderFactory];-VisConfigSlider.propTypes = propTypes;+export default function VisConfigSliderFactory(RangeSlider) {+ const VisConfigSlider = ({+ layer: {config},+ property,+ label,+ range,+ step,+ isRanged,+ disabled,+ onChange,+ inputTheme+ }) => (+ <SidePanelSection disabled={Boolean(disabled)}>+ {label ? (+ <PanelLabel>+ {typeof label === 'string' ? (+ <FormattedMessage id={label} />+ ) : typeof label === 'function' ? (+ <FormattedMessage id={label(config)} />+ ) : (+ <FormattedMessage id={`property.${property}`} />+ )}+ </PanelLabel>+ ) : null}+ <RangeSlider+ range={range}+ value0={isRanged ? config.visConfig[property][0] : range[0]}+ value1={isRanged ? config.visConfig[property][1] : config.visConfig[property]}+ step={step}+ isRanged={Boolean(isRanged)}+ onChange={value => onChange({[property]: isRanged ? value : value[1]})}+ inputTheme={inputTheme}+ showInput+ />+ </SidePanelSection>+ );-export default VisConfigSlider;+ VisConfigSlider.propTypes = propTypes;++ return VisConfigSlider;+}diff --git a/src/constants/index.js b/src/constants/index.jsindex 6767c529d..93bd49aa6 100644--- a/src/constants/index.js+++ b/src/constants/index.js@@ -65,3 +65,4 @@ export {BUG_REPORT_LINK, USER_GUIDE_DOC} from './user-guides';export {VizColorPalette, DataVizColors} from './custom-color-ranges';export {COLOR_RANGES, DefaultColorRange} from './color-ranges';export {DEFAULT_COLOR_RANGE} from 'layers/layer-factory';+export {PLOT_TYPES} from 'utils/filter-utils';diff --git a/src/styles/base.js b/src/styles/base.jsindex 9cf0f18b3..8cba9e227 100644--- a/src/styles/base.js+++ b/src/styles/base.js@@ -142,6 +142,7 @@ export const dropdownListShadow = '0 6px 12px 0 rgba(0,0,0,0.16)';export const dropdownListBgd = '#3A414C';export const dropdownListBgdLT = '#FFFFFF';export const dropdownListBorderTop = '#242730';+export const dropdownListBorderTopLT = '#D3D8E0';export const dropdownWrapperZ = 100;// Switchexport const switchWidth = 24;@@ -205,6 +206,10 @@ export const tooltipColor = '#333334';export const bottomInnerPdSide = 32;export const bottomInnerPdVert = 6;export const bottomPanelGap = 20;+export const bottomWidgetPaddingTop = 20;+export const bottomWidgetPaddingRight = 20;+export const bottomWidgetPaddingBottom = 30;+export const bottomWidgetPaddingLeft = 20;// Modalexport const modalTitleColor = '#3A414C';@@ -883,6 +888,7 @@ export const theme = {dropdownListBgd,dropdownListBgdLT,dropdownListBorderTop,+ dropdownListBorderTopLT,labelColor,labelColorLT,@@ -1061,6 +1067,10 @@ export const theme = {bottomInnerPdSide,bottomInnerPdVert,bottomPanelGap,+ bottomWidgetPaddingTop,+ bottomWidgetPaddingRight,+ bottomWidgetPaddingBottom,+ bottomWidgetPaddingLeft,// SlidersliderBarColor,