Skip to content

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

[Enhancement] Export side panel component factories (#282)

Shan He2a0ca5cabe21
diff --git a/src/components/container.js b/src/components/container.js
index 3ffe5497f..6a2a44619 100644
--- a/src/components/container.js
+++ b/src/components/container.js
@@ -23,7 +23,7 @@ import {connect} from 'react-redux';
import memoize from 'lodash.memoize';
import {console as Console} from 'global/window';
import {injector} from './injector';
-import KeplerGlFactory, {keplerGlChildDeps} from './kepler-gl';
+import KeplerGlFactory from './kepler-gl';
import {forwardTo} from 'actions/action-wrapper';
import {
@@ -116,13 +116,19 @@ export function ContainerFactory(KeplerGl) {
return connect(mapStateToProps, dispatchToProps)(Container);
}
-// provide all recipes to injector
-export const appInjector = [
- ContainerFactory,
- ...ContainerFactory.deps,
- ...KeplerGlFactory.deps,
- ...keplerGlChildDeps
-].reduce((inj, factory) => inj.provide(factory, factory), injector());
+// entryPoint
+function flattenDeps(allDeps, factory) {
+ const addToDeps = allDeps.concat([factory]);
+ return Array.isArray(factory.deps) && factory.deps.length ?
+ factory.deps.reduce((accu, dep) => flattenDeps(accu, dep), addToDeps) :
+ addToDeps;
+}
+
+const allDependencies = flattenDeps([], ContainerFactory);
+
+// provide all dependencites to appInjector
+export const appInjector = allDependencies
+ .reduce((inj, factory) => inj.provide(factory, factory), injector());
// Helper to inject custom components and return kepler.gl container
export function injectComponents(recipes) {
diff --git a/src/components/index.js b/src/components/index.js
index 5f623de8e..6acb4f0ee 100644
--- a/src/components/index.js
+++ b/src/components/index.js
@@ -23,7 +23,7 @@ export {default as KeplerGl, default, injectComponents} from './container';
// factories
export {default as KeplerGlFactory} from './kepler-gl';
-export {default as SidePanelFactory} from './side-panel';
+export {default as SidePanelFactory, PanelTitleFactory} from './side-panel';
export {default as MapContainerFactory} from './map-container';
export {default as BottomWidgetFactory} from './bottom-widget';
export {default as ModalContainerFactory} from './modal-container';
@@ -31,6 +31,22 @@ export {default as PlotContainerFactory} from './plot-container';
// // side panel factories
export {default as PanelHeaderFactory} from './side-panel/panel-header'
+export {CollapseButtonFactory, default as SidebarFactory} from './side-panel/side-bar';
+
+export {AddDataButtonFactory, default as LayerManagerFactory} from './side-panel/layer-manager';
+export {default as LayerPanelFactory} from './side-panel/layer-panel/layer-panel';
+export {default as SourceDataCatalogFactory} from './side-panel/source-data-catalog';
+
+export {default as FilterManagerFactory} from './side-panel/filter-manager';
+export {default as FilterPanelFactory} from './side-panel/filter-panel/filter-panel';
+
+export {default as InteractionManagerFactory} from './side-panel/interaction-manager';
+export {default as BrushConfigFactory} from './side-panel/interaction-panel/brush-config';
+export {default as TooltipConfigFactory} from './side-panel/interaction-panel/tooltip-config';
+
+export {default as MapManagerFactory} from './side-panel/map-manager';
+export {default as LayerGroupSelectorFactory} from './side-panel/map-style-panel/map-layer-selector';
+export {default as MapStyleSelectorFactory} from './side-panel/map-style-panel/map-style-selector';
// // map container factories
export {default as MapPopoverFactory} from './map/map-popover';
@@ -40,6 +56,10 @@ export {default as MapControlFactory} from './map/map-control';
export {default as DeleteDatasetModalFactory} from './modals/delete-data-modal';
export {default as DataTableModalFactory} from './modals/data-table-modal';
export {default as LoadDataModalFactory} from './modals/load-data-modal';
+export {default as ExportImageModalFactory} from './modals/export-image-modal';
+export {default as ExportDataModalFactory} from './modals/export-data-modal';
+export {default as ExportConfigModalFactory} from './modals/export-config-modal';
+export {default as AddMapStyleModalFactory} from './modals/add-map-style-modal';
// // Bottom widget factory
export {default as TimeWidgetFactory} from './filters/time-widget';
diff --git a/src/components/kepler-gl.js b/src/components/kepler-gl.js
index d84dba3e0..e7849b9bd 100644
--- a/src/components/kepler-gl.js
+++ b/src/components/kepler-gl.js
@@ -72,13 +72,6 @@ const GlobalStyle = styled.div`
}
`;
-export const keplerGlChildDeps = [
- ...BottomWidgetFactory.deps,
- ...SidePanelFactory.deps,
- ...ModalContainerFactory.deps,
- ...MapContainerFactory.deps
-];
-
KeplerGlFactory.deps = [
BottomWidgetFactory,
MapContainerFactory,
diff --git a/src/components/map-container.js b/src/components/map-container.js
index f9267092e..8fe1ed351 100644
--- a/src/components/map-container.js
+++ b/src/components/map-container.js
@@ -55,7 +55,8 @@ const getGlConst = d => GL[d];
const MAPBOXGL_STYLE_UPDATE = 'style.load';
MapContainerFactory.deps = [
- MapPopoverFactory, MapControlFactory];
+ MapPopoverFactory, MapControlFactory
+];
export default function MapContainerFactory(MapPopover, MapControl) {
class MapContainer extends Component {
diff --git a/src/components/side-panel.js b/src/components/side-panel.js
index ebc867a50..666873086 100644
--- a/src/components/side-panel.js
+++ b/src/components/side-panel.js
@@ -22,13 +22,13 @@ import React, {Component} from 'react';
import PropTypes from 'prop-types';
import styled from 'styled-components';
-import Sidebar from './side-panel/side-bar';
+import SidebarFactory from './side-panel/side-bar';
import PanelHeaderFactory from './side-panel/panel-header';
-import LayerManager from './side-panel/layer-manager';
-import FilterManager from './side-panel/filter-manager';
-import InteractionManager from './side-panel/interaction-manager';
-import MapManager from './side-panel/map-manager';
-import PanelToggle from './side-panel/panel-toggle';
+import LayerManagerFactory from './side-panel/layer-manager';
+import FilterManagerFactory from './side-panel/filter-manager';
+import InteractionManagerFactory from './side-panel/interaction-manager';
+import MapManagerFactory from './side-panel/map-manager';
+import PanelToggleFactory from './side-panel/panel-toggle';
import {
ADD_DATA_ID,
@@ -48,7 +48,7 @@ const SidePanelContent = styled.div`
overflow-x: hidden;
`;
-const PanelTitle = styled.div`
+export const PanelTitleFactory = () => styled.div`
color: ${props => props.theme.titleTextColor};
font-size: 20px;
font-weight: 400;
@@ -56,13 +56,31 @@ const PanelTitle = styled.div`
margin-bottom: 14px;
`;
-SidePanelFactory.deps = [PanelHeaderFactory];
+SidePanelFactory.deps = [
+ SidebarFactory,
+ PanelHeaderFactory,
+ PanelToggleFactory,
+ PanelTitleFactory,
+ LayerManagerFactory,
+ FilterManagerFactory,
+ InteractionManagerFactory,
+ MapManagerFactory
+];
/**
*
* Vertical sidebar containing input components for the rendering layers
*/
-export default function SidePanelFactory(PanelHeader) {
+export default function SidePanelFactory(
+ Sidebar,
+ PanelHeader,
+ PanelToggle,
+ PanelTitle,
+ LayerManager,
+ FilterManager,
+ InteractionManager,
+ MapManager
+) {
return class SidePanel extends Component {
static propTypes = {
diff --git a/src/components/side-panel/filter-manager.js b/src/components/side-panel/filter-manager.js
index 2a4e0a7b4..52ad67e86 100644
--- a/src/components/side-panel/filter-manager.js
+++ b/src/components/side-panel/filter-manager.js
@@ -27,76 +27,85 @@ import {
Button
} from 'components/common/styled-components';
import {Add} from 'components/common/icons';
-import SourceDataCatalog from './source-data-catalog';
-import FilterPanel from './filter-panel/filter-panel';
+import SourceDataCatalogFactory from './source-data-catalog';
+import FilterPanelFactory from './filter-panel/filter-panel';
-export default class FilterManager extends Component {
- static propTypes = {
- datasets: PropTypes.object,
- addFilter: PropTypes.func.isRequired,
- removeFilter: PropTypes.func.isRequired,
- enlargeFilter: PropTypes.func.isRequired,
- toggleAnimation: PropTypes.func.isRequired,
- setFilter: PropTypes.func.isRequired,
- filters: PropTypes.arrayOf(PropTypes.any).isRequired,
- showDatasetTable: PropTypes.func,
+FilterManagerFactory.deps = [
+ SourceDataCatalogFactory,
+ FilterPanelFactory
+];
- // fields can be undefined when dataset is not selected
- fields: PropTypes.arrayOf(PropTypes.any)
- };
+function FilterManagerFactory(SourceDataCatalog, FilterPanel) {
+ return class FilterManager extends Component {
+ static propTypes = {
+ datasets: PropTypes.object,
+ addFilter: PropTypes.func.isRequired,
+ removeFilter: PropTypes.func.isRequired,
+ enlargeFilter: PropTypes.func.isRequired,
+ toggleAnimation: PropTypes.func.isRequired,
+ setFilter: PropTypes.func.isRequired,
+ filters: PropTypes.arrayOf(PropTypes.any).isRequired,
+ showDatasetTable: PropTypes.func,
- /* selectors */
- datasetsSelector = state => state.datasets;
- defaultDatasetSelector = createSelector(
- this.datasetsSelector,
- datasets =>
- (Object.keys(datasets).length && Object.keys(datasets)[0]) || null
- );
+ // fields can be undefined when dataset is not selected
+ fields: PropTypes.arrayOf(PropTypes.any)
+ };
- /* actions */
- _addFilter = () => {
- const defaultDataset = this.defaultDatasetSelector(this.props);
- this.props.addFilter(defaultDataset);
- };
+ /* selectors */
+ datasetsSelector = state => state.datasets;
+ defaultDatasetSelector = createSelector(
+ this.datasetsSelector,
+ datasets =>
+ (Object.keys(datasets).length && Object.keys(datasets)[0]) || null
+ );
- render() {
- const {filters, datasets} = this.props;
- const isAnyFilterAnimating = filters.some(f => f.isAnimating);
- const hadEmptyFilter = filters.some(f => !f.name);
- const hadDataset = Object.keys(datasets).length;
+ /* actions */
+ _addFilter = () => {
+ const defaultDataset = this.defaultDatasetSelector(this.props);
+ this.props.addFilter(defaultDataset);
+ };
- return (
- <div className="filter-manager">
- <SourceDataCatalog
- datasets={datasets}
- showDatasetTable={this.props.showDatasetTable}
- />
- <SidePanelDivider />
- <SidePanelSection>
- {filters &&
- filters.map((filter, idx) => (
- <FilterPanel
- key={`${filter.id}-${idx}`}
- idx={idx}
- filters={filters}
- filter={filter}
- datasets={datasets}
- isAnyFilterAnimating={isAnyFilterAnimating}
- removeFilter={() => this.props.removeFilter(idx)}
- enlargeFilter={() => this.props.enlargeFilter(idx)}
- toggleAnimation={() => this.props.toggleAnimation(idx)}
- setFilter={this.props.setFilter}
- />
- ))}
- </SidePanelSection>
- <Button
- inactive={hadEmptyFilter || !hadDataset}
- width="105px"
- onClick={this._addFilter}
- >
- <Add height="12px" />Add Filter
- </Button>
- </div>
- );
- }
-};
+ render() {
+ const {filters, datasets} = this.props;
+ const isAnyFilterAnimating = filters.some(f => f.isAnimating);
+ const hadEmptyFilter = filters.some(f => !f.name);
+ const hadDataset = Object.keys(datasets).length;
+
+ return (
+ <div className="filter-manager">
+ <SourceDataCatalog
+ datasets={datasets}
+ showDatasetTable={this.props.showDatasetTable}
+ />
+ <SidePanelDivider />
+ <SidePanelSection>
+ {filters &&
+ filters.map((filter, idx) => (
+ <FilterPanel
+ key={`${filter.id}-${idx}`}
+ idx={idx}
+ filters={filters}
+ filter={filter}
+ datasets={datasets}
+ isAnyFilterAnimating={isAnyFilterAnimating}
+ removeFilter={() => this.props.removeFilter(idx)}
+ enlargeFilter={() => this.props.enlargeFilter(idx)}
+ toggleAnimation={() => this.props.toggleAnimation(idx)}
+ setFilter={this.props.setFilter}
+ />
+ ))}
+ </SidePanelSection>
+ <Button
+ inactive={hadEmptyFilter || !hadDataset}
+ width="105px"
+ onClick={this._addFilter}
+ >
+ <Add height="12px" />Add Filter
+ </Button>
+ </div>
+ );
+ }
+ };
+}
+
+export default FilterManagerFactory;
diff --git a/src/components/side-panel/filter-panel/filter-panel.js b/src/components/side-panel/filter-panel/filter-panel.js
index adceec4c8..3bebd3944 100644
--- a/src/components/side-panel/filter-panel/filter-panel.js
+++ b/src/components/side-panel/filter-panel/filter-panel.js
@@ -51,113 +51,117 @@ const StyledFilterContent = styled.div`
padding: 12px;
`;
-export default class FilterPanel extends Component {
- static propTypes = {
- idx: PropTypes.number,
- filters: PropTypes.arrayOf(PropTypes.any).isRequired,
- filter: PropTypes.object.isRequired,
- setFilter: PropTypes.func.isRequired,
- removeFilter: PropTypes.func.isRequired,
- enlargeFilter: PropTypes.func.isRequired,
- toggleAnimation: PropTypes.func.isRequired,
- datasets: PropTypes.object,
- showDatasetTable: PropTypes.func,
- isAnyFilterAnimating: PropTypes.bool
- };
+function FilterPanelFactory() {
+ return class FilterPanel extends Component {
+ static propTypes = {
+ idx: PropTypes.number,
+ filters: PropTypes.arrayOf(PropTypes.any).isRequired,
+ filter: PropTypes.object.isRequired,
+ setFilter: PropTypes.func.isRequired,
+ removeFilter: PropTypes.func.isRequired,
+ enlargeFilter: PropTypes.func.isRequired,
+ toggleAnimation: PropTypes.func.isRequired,
+ datasets: PropTypes.object,
+ showDatasetTable: PropTypes.func,
+ isAnyFilterAnimating: PropTypes.bool
+ };
- /* selectors */
- fieldsSelector = props =>
- (props.filter.dataId && props.datasets[props.filter.dataId].fields) || [];
- filterSelector = props => props.filters;
- nameSelector = props => props.filter.name;
- dataIdSelector = props => props.filter.dataId;
+ /* selectors */
+ fieldsSelector = props =>
+ (props.filter.dataId && props.datasets[props.filter.dataId].fields) || [];
+ filterSelector = props => props.filters;
+ nameSelector = props => props.filter.name;
+ dataIdSelector = props => props.filter.dataId;
- // only show current field and field that's not already been used as a filter
- availableFieldsSelector = createSelector(
- this.fieldsSelector,
- this.filterSelector,
- this.nameSelector,
- this.dataIdSelector,
- (fields, filters, name, dataId) =>
- fields.filter(
- f =>
- f.type &&
- f.type !== ALL_FIELD_TYPES.geojson &&
- (f.name === name ||
- !filters.find(d => d.name === f.name && d.dataId === dataId))
- )
- );
+ // only show current field and field that's not already been used as a filter
+ availableFieldsSelector = createSelector(
+ this.fieldsSelector,
+ this.filterSelector,
+ this.nameSelector,
+ this.dataIdSelector,
+ (fields, filters, name, dataId) =>
+ fields.filter(
+ f =>
+ f.type &&
+ f.type !== ALL_FIELD_TYPES.geojson &&
+ (f.name === name ||
+ !filters.find(d => d.name === f.name && d.dataId === dataId))
+ )
+ );
- render() {
- const {
- datasets,
- enlargeFilter,
- filter,
- idx,
- isAnyFilterAnimating,
- removeFilter,
- setFilter,
- toggleAnimation
- } = this.props;
- const {name, enlarged, type, dataId} = filter;
- const FilterComponent = type && Filters[FILTER_COMPONENTS[type]];
- const allAvailableFields = this.availableFieldsSelector(this.props);
+ render() {
+ const {
+ datasets,
+ enlargeFilter,
+ filter,
+ idx,
+ isAnyFilterAnimating,
+ removeFilter,
+ setFilter,
+ toggleAnimation
+ } = this.props;
+ const {name, enlarged, type, dataId} = filter;
+ const FilterComponent = type && Filters[FILTER_COMPONENTS[type]];
+ const allAvailableFields = this.availableFieldsSelector(this.props);
- return (
- <StyledFilterPanel className="filter-panel">
- <StyledFilterHeader className="filter-panel__header"
- labelRCGColorValues={datasets[dataId].color}>
- <div style={{flexGrow: 1}}>
- <FieldSelector
- inputTheme="secondary"
- fields={allAvailableFields}
- value={name}
- erasable={false}
- onSelect={value => setFilter(idx, 'name', value.name)}
- />
- </div>
- <PanelHeaderAction
- id={filter.id}
- tooltip="delete"
- tooltipType="error"
- onClick={removeFilter}
- hoverColor={'errorColor'}
- IconComponent={Trash}
- />
- {type === FILTER_TYPES.timeRange && (
+ return (
+ <StyledFilterPanel className="filter-panel">
+ <StyledFilterHeader className="filter-panel__header"
+ labelRCGColorValues={datasets[dataId].color}>
+ <div style={{flexGrow: 1}}>
+ <FieldSelector
+ inputTheme="secondary"
+ fields={allAvailableFields}
+ value={name}
+ erasable={false}
+ onSelect={value => setFilter(idx, 'name', value.name)}
+ />
+ </div>
<PanelHeaderAction
id={filter.id}
- onClick={enlargeFilter}
- tooltip="Time Playback"
- IconComponent={Clock}
- active={enlarged}
- />
- )}
- </StyledFilterHeader>
- <StyledFilterContent className="filter-panel__content">
- {Object.keys(datasets).length > 1 && (
- <SourceDataSelector
- inputTheme="secondary"
- datasets={datasets}
- disabled={filter.freeze}
- dataId={filter.dataId}
- onSelect={value => setFilter(idx, 'dataId', value)}
+ tooltip="delete"
+ tooltipType="error"
+ onClick={removeFilter}
+ hoverColor={'errorColor'}
+ IconComponent={Trash}
/>
- )}
- {type &&
- !enlarged && (
- <div className="filter-panel__filter">
- <FilterComponent
- filter={filter}
- idx={idx}
- isAnyFilterAnimating={isAnyFilterAnimating}
- toggleAnimation={toggleAnimation}
- setFilter={value => setFilter(idx, 'value', value)}
+ {type === FILTER_TYPES.timeRange && (
+ <PanelHeaderAction
+ id={filter.id}
+ onClick={enlargeFilter}
+ tooltip="Time Playback"
+ IconComponent={Clock}
+ active={enlarged}
/>
- </div>
- )}
- </StyledFilterContent>
- </StyledFilterPanel>
- );
+ )}
+ </StyledFilterHeader>
+ <StyledFilterContent className="filter-panel__content">
+ {Object.keys(datasets).length > 1 && (
+ <SourceDataSelector
+ inputTheme="secondary"
+ datasets={datasets}
+ disabled={filter.freeze}
+ dataId={filter.dataId}
+ onSelect={value => setFilter(idx, 'dataId', value)}
+ />
+ )}
+ {type &&
+ !enlarged && (
+ <div className="filter-panel__filter">
+ <FilterComponent
+ filter={filter}
+ idx={idx}
+ isAnyFilterAnimating={isAnyFilterAnimating}
+ toggleAnimation={toggleAnimation}
+ setFilter={value => setFilter(idx, 'value', value)}
+ />
+ </div>
+ )}
+ </StyledFilterContent>
+ </StyledFilterPanel>
+ );
+ }
}
}
+
+export default FilterPanelFactory;
diff --git a/src/components/side-panel/interaction-manager.js b/src/components/side-panel/interaction-manager.js
index 6303ab254..66e38f525 100644
--- a/src/components/side-panel/interaction-manager.js
+++ b/src/components/side-panel/interaction-manager.js
@@ -19,19 +19,25 @@
// THE SOFTWARE.
import React from 'react';
-import InteractionPanel from './interaction-panel/interaction-panel';
+import InteractionPanelFactory from './interaction-panel/interaction-panel';
-const InteractionManager = ({interactionConfig, datasets, onConfigChange}) => (
- <div className="interaction-manager">
- {Object.keys(interactionConfig).map(key => (
- <InteractionPanel
- datasets={datasets}
- config={interactionConfig[key]}
- key={key}
- onConfigChange={onConfigChange}
- />
- ))}
- </div>
-);
+InteractionManagerFactory.deps = [InteractionPanelFactory];
-export default InteractionManager;
+function InteractionManagerFactory(InteractionPanel) {
+ const InteractionManager = ({interactionConfig, datasets, onConfigChange}) => (
+ <div className="interaction-manager">
+ {Object.keys(interactionConfig).map(key => (
+ <InteractionPanel
+ datasets={datasets}
+ config={interactionConfig[key]}
+ key={key}
+ onConfigChange={onConfigChange}
+ />
+ ))}
+ </div>
+ );
+
+ return InteractionManager;
+}
+
+export default InteractionManagerFactory;
diff --git a/src/components/side-panel/interaction-panel/brush-config.js b/src/components/side-panel/interaction-panel/brush-config.js
new file mode 100644
index 000000000..381ecf6ed
--- /dev/null
+++ b/src/components/side-panel/interaction-panel/brush-config.js
@@ -0,0 +1,29 @@
+import React from 'react';
+import RangeSlider from 'components/common/range-slider';
+
+import {
+ PanelLabel,
+ SidePanelSection
+} from 'components/common/styled-components';
+import {BRUSH_CONFIG} from 'utils/interaction-utils';
+
+function BrushConfigFactory() {
+ const BrushConfig = ({config, onChange}) => (
+ <SidePanelSection>
+ <PanelLabel>Brush Radius (km)</PanelLabel>
+ <RangeSlider
+ range={BRUSH_CONFIG.range}
+ value0={0}
+ value1={config.size || 10 / 2}
+ step={0.1}
+ isRanged={false}
+ onChange={value => onChange({...config, size: value[1]})}
+ inputTheme="secondary"
+ />
+ </SidePanelSection>
+ );
+
+ return BrushConfig;
+}
+
+export default BrushConfigFactory;
diff --git a/src/components/side-panel/interaction-panel/interaction-panel.js b/src/components/side-panel/interaction-panel/interaction-panel.js
index 477c9a616..70ffe77e6 100644
--- a/src/components/side-panel/interaction-panel/interaction-panel.js
+++ b/src/components/side-panel/interaction-panel/interaction-panel.js
@@ -22,18 +22,16 @@ import React, {Component} from 'react';
import PropTypes from 'prop-types';
import styled from 'styled-components';
import Switch from 'components/common/switch';
-import RangeSlider from 'components/common/range-slider';
-import FieldSelector from 'components/common/field-selector';
+
+import BrushConfigFactory from './brush-config';
+import TooltipConfigFactory from './tooltip-config';
+
import {
- PanelLabel,
- SidePanelSection,
StyledPanelHeader,
PanelHeaderTitle,
PanelHeaderContent,
PanelContent
} from 'components/common/styled-components';
-import {DatasetTag} from '../source-data-catalog';
-import {BRUSH_CONFIG} from 'utils/interaction-utils';
const StyledPanelContent = PanelContent.extend`
border-top: 1px solid ${props => props.theme.panelBorderColor};
@@ -43,120 +41,88 @@ const StyledInteractionPanel = styled.div`
padding-bottom: 6px;
`;
-export default class InteractionPanel extends Component {
- static propTypes = {
- datasets: PropTypes.object.isRequired,
- config: PropTypes.object.isRequired,
- onConfigChange: PropTypes.func.isRequired
- };
-
- state = {isConfigActive: false};
-
- _updateConfig = newProp => {
- this.props.onConfigChange({
- ...this.props.config,
- ...newProp
- });
- };
-
- _enableConfig = () => {
- this.setState({isConfigActive: !this.state.isConfigActive});
- };
-
- render() {
- const {config, datasets} = this.props;
- const onChange = newConfig => this._updateConfig({config: newConfig});
- let template = null;
-
- switch (config.id) {
- case 'tooltip':
- template = (
- <TooltipConfig
- datasets={datasets}
- config={config.config}
- onChange={onChange}
- />
- );
- break;
-
- case 'brush':
- template = <BrushConfig config={config.config} onChange={onChange} />;
- break;
-
- default:
- break;
- }
+InteractionPanelFactory.deps = [
+ TooltipConfigFactory,
+ BrushConfigFactory
+];
- return (
- <StyledInteractionPanel className="interaction-panel">
- <StyledPanelHeader
- className="interaction-panel__header"
- onClick={this._enableConfig}
- >
- <PanelHeaderContent className="interaction-panel__header__content">
- <div className="interaction-panel__header__icon icon">
- <config.iconComponent height="12px"/>
- </div>
- <div className="interaction-panel__header__title">
- <PanelHeaderTitle>{config.id}</PanelHeaderTitle>
- </div>
- </PanelHeaderContent>
- <div className="interaction-panel__header__actions">
- <Switch
- checked={config.enabled}
- id={`${config.id}-toggle`}
- onChange={() => this._updateConfig({enabled: !config.enabled})}
- secondary
+function InteractionPanelFactory(TooltipConfig, BrushConfig) {
+ return class InteractionPanel extends Component {
+ static propTypes = {
+ datasets: PropTypes.object.isRequired,
+ config: PropTypes.object.isRequired,
+ onConfigChange: PropTypes.func.isRequired
+ };
+
+ state = {isConfigActive: false};
+
+ _updateConfig = newProp => {
+ this.props.onConfigChange({
+ ...this.props.config,
+ ...newProp
+ });
+ };
+
+ _enableConfig = () => {
+ this.setState({isConfigActive: !this.state.isConfigActive});
+ };
+
+ render() {
+ const {config, datasets} = this.props;
+ const onChange = newConfig => this._updateConfig({config: newConfig});
+ let template = null;
+
+ switch (config.id) {
+ case 'tooltip':
+ template = (
+ <TooltipConfig
+ datasets={datasets}
+ config={config.config}
+ onChange={onChange}
/>
- </div>
- </StyledPanelHeader>
- {config.enabled && (
- <StyledPanelContent className="interaction-panel__content">
- {template}
- </StyledPanelContent>
- )}
- </StyledInteractionPanel>
- );
+ );
+ break;
+
+ case 'brush':
+ template = <BrushConfig config={config.config} onChange={onChange} />;
+ break;
+
+ default:
+ break;
+ }
+
+ return (
+ <StyledInteractionPanel className="interaction-panel">
+ <StyledPanelHeader
+ className="interaction-panel__header"
+ onClick={this._enableConfig}
+ >
+ <PanelHeaderContent className="interaction-panel__header__content">
+ <div className="interaction-panel__header__icon icon">
+ <config.iconComponent height="12px"/>
+ </div>
+ <div className="interaction-panel__header__title">
+ <PanelHeaderTitle>{config.id}</PanelHeaderTitle>
+ </div>
+ </PanelHeaderContent>
+ <div className="interaction-panel__header__actions">
+ <Switch
+ checked={config.enabled}
+ id={`${config.id}-toggle`}
+ onChange={() => this._updateConfig({enabled: !config.enabled})}
+ secondary
+ />
+ </div>
+ </StyledPanelHeader>
+ {config.enabled && (
+ <StyledPanelContent className="interaction-panel__content">
+ {template}
+ </StyledPanelContent>
+ )}
+ </StyledInteractionPanel>
+ );
+ }
}
}
-const TooltipConfig = ({config, datasets, onChange}) => (
- <div>
- {Object.keys(config.fieldsToShow).map(dataId => (
- <SidePanelSection key={dataId}>
- <DatasetTag dataset={datasets[dataId]} />
- <FieldSelector
- fields={datasets[dataId].fields}
- value={config.fieldsToShow[dataId]}
- onSelect={fieldsToShow => {
- const newConfig = {
- ...config,
- fieldsToShow: {
- ...config.fieldsToShow,
- [dataId]: fieldsToShow.map(d => d.name)
- }
- };
- onChange(newConfig);
- }}
- closeOnSelect={false}
- multiSelect
- />
- </SidePanelSection>
- ))}
- </div>
-);
-
-const BrushConfig = ({config, onChange}) => (
- <SidePanelSection>
- <PanelLabel>Brush Radius (km)</PanelLabel>
- <RangeSlider
- range={BRUSH_CONFIG.range}
- value0={0}
- value1={config.size || 10 / 2}
- step={0.1}
- isRanged={false}
- onChange={value => onChange({...config, size: value[1]})}
- inputTheme="secondary"
- />
- </SidePanelSection>
-);
+export default InteractionPanelFactory;
diff --git a/src/components/side-panel/interaction-panel/tooltip-config.js b/src/components/side-panel/interaction-panel/tooltip-config.js
new file mode 100644
index 000000000..f1c6cffac
--- /dev/null
+++ b/src/components/side-panel/interaction-panel/tooltip-config.js
@@ -0,0 +1,37 @@
+import React from 'react';
+import {DatasetTag} from '../source-data-catalog';
+
+import {SidePanelSection} from 'components/common/styled-components';
+import FieldSelector from 'components/common/field-selector';
+
+function TooltipConfigFactory() {
+ const TooltipConfig = ({config, datasets, onChange}) => (
+ <div>
+ {Object.keys(config.fieldsToShow).map(dataId => (
+ <SidePanelSection key={dataId}>
+ <DatasetTag dataset={datasets[dataId]} />
+ <FieldSelector
+ fields={datasets[dataId].fields}
+ value={config.fieldsToShow[dataId]}
+ onSelect={fieldsToShow => {
+ const newConfig = {
+ ...config,
+ fieldsToShow: {
+ ...config.fieldsToShow,
+ [dataId]: fieldsToShow.map(d => d.name)
+ }
+ };
+ onChange(newConfig);
+ }}
+ closeOnSelect={false}
+ multiSelect
+ />
+ </SidePanelSection>
+ ))}
+ </div>
+ );
+
+ return TooltipConfig;
+}
+
+export default TooltipConfigFactory;
diff --git a/src/components/side-panel/layer-manager.js b/src/components/side-panel/layer-manager.js
index 964e120a4..cf75ea19a 100644
--- a/src/components/side-panel/layer-manager.js
+++ b/src/components/side-panel/layer-manager.js
@@ -24,8 +24,8 @@ import Sortable from 'react-anything-sortable';
import styled from 'styled-components';
import {createSelector} from 'reselect';
-import LayerPanel from './layer-panel/layer-panel';
-import SourceDataCatalog from './source-data-catalog';
+import LayerPanelFactory from './layer-panel/layer-panel';
+import SourceDataCatalogFactory from './source-data-catalog';
import {Add} from 'components/common/icons';
import ItemSelector from 'components/common/item-selector/item-selector';
import {
@@ -77,112 +77,6 @@ const StyledSortable = styled.div`
}
`;
-export default class LayerManager extends Component {
- static propTypes = {
- addLayer: PropTypes.func.isRequired,
- datasets: PropTypes.object.isRequired,
- layerBlending: PropTypes.string.isRequired,
- layerClasses: PropTypes.object.isRequired,
- layers: PropTypes.arrayOf(PropTypes.any).isRequired,
- layerConfigChange: PropTypes.func.isRequired,
- layerVisualChannelConfigChange: PropTypes.func.isRequired,
- layerTypeChange: PropTypes.func.isRequired,
- layerVisConfigChange: PropTypes.func.isRequired,
- openModal: PropTypes.func.isRequired,
- removeLayer: PropTypes.func.isRequired,
- removeDataset: PropTypes.func.isRequired,
- showDatasetTable: PropTypes.func.isRequired,
- updateLayerBlending: PropTypes.func.isRequired,
- updateLayerOrder: PropTypes.func.isRequired
- };
-
- layerClassSelector = props => props.layerClasses;
- layerTypeOptionsSelector = createSelector(
- this.layerClassSelector,
- layerClasses => Object.keys(layerClasses).map(key => {
- const layer = new layerClasses[key]();
- return {
- id: key,
- label: layer.name,
- icon: layer.layerIcon
- };
- }));
-
- _addEmptyNewLayer = () => {
- this.props.addLayer();
- };
-
- _handleSort = order => {
- this.props.updateLayerOrder(order);
- };
-
- render() {
- const {layers, datasets, layerOrder, openModal} = this.props;
- const defaultDataset = Object.keys(datasets)[0];
- const layerTypeOptions = this.layerTypeOptionsSelector(this.props);
-
- const layerActions = {
- layerConfigChange: this.props.layerConfigChange,
- layerVisualChannelConfigChange: this.props.layerVisualChannelConfigChange,
- layerTypeChange: this.props.layerTypeChange,
- layerVisConfigChange: this.props.layerVisConfigChange,
- removeLayer: this.props.removeLayer
- };
-
- const panelProps = {datasets, openModal, layerTypeOptions};
-
- return (
- <StyledSortable className="layer-manager">
- <SourceDataCatalog
- datasets={datasets}
- showDatasetTable={this.props.showDatasetTable}
- removeDataset={this.props.removeDataset}
- showDeleteDataset
- />
- <Button
- onClick={this.props.showAddDataModal}
- isInactive={!defaultDataset}
- width="105px"
- secondary
- >
- <Add height="12px" />Add Data
- </Button>
- <SidePanelDivider />
- <SidePanelSection>
- <Sortable
- onSort={this._handleSort}
- direction="vertical"
- sortHandle="sort--handle"
- dynamic
- >
- {layerOrder.map(idx => (
- <LayerPanel
- {...panelProps}
- {...layerActions}
- sortData={idx}
- key={layers[idx].id}
- idx={idx}
- layer={layers[idx]}
- />
- ))}
- </Sortable>
- </SidePanelSection>
- <SidePanelSection>
- {defaultDataset ? (
- <Button onClick={this._addEmptyNewLayer} width="105px">
- <Add height="12px" />Add Layer
- </Button>
- ) : null}
- </SidePanelSection>
- <LayerBlendingSelector
- layerBlending={this.props.layerBlending}
- updateLayerBlending={this.props.updateLayerBlending}
- />
- </StyledSortable>
- );
- }
-}
-
const LayerBlendingSelector = ({layerBlending, updateLayerBlending}) => (
<SidePanelSection>
<PanelLabel>Layer Blending</PanelLabel>
@@ -195,3 +89,130 @@ const LayerBlendingSelector = ({layerBlending, updateLayerBlending}) => (
/>
</SidePanelSection>
);
+
+function AddDataButtonFactory() {
+ const AddDataButton = ({onClick, isInactive}) => (
+ <Button
+ onClick={onClick}
+ isInactive={!isInactive}
+ width="105px"
+ secondary
+ >
+ <Add height="12px" />Add Data
+ </Button>
+ );
+
+ return AddDataButton;
+}
+
+LayerManagerFactory.deps = [
+ AddDataButtonFactory,
+ LayerPanelFactory,
+ SourceDataCatalogFactory
+];
+
+function LayerManagerFactory(AddDataButton, LayerPanel, SourceDataCatalog) {
+ return class LayerManager extends Component {
+ static propTypes = {
+ addLayer: PropTypes.func.isRequired,
+ datasets: PropTypes.object.isRequired,
+ layerBlending: PropTypes.string.isRequired,
+ layerClasses: PropTypes.object.isRequired,
+ layers: PropTypes.arrayOf(PropTypes.any).isRequired,
+ layerConfigChange: PropTypes.func.isRequired,
+ layerVisualChannelConfigChange: PropTypes.func.isRequired,
+ layerTypeChange: PropTypes.func.isRequired,
+ layerVisConfigChange: PropTypes.func.isRequired,
+ openModal: PropTypes.func.isRequired,
+ removeLayer: PropTypes.func.isRequired,
+ removeDataset: PropTypes.func.isRequired,
+ showDatasetTable: PropTypes.func.isRequired,
+ updateLayerBlending: PropTypes.func.isRequired,
+ updateLayerOrder: PropTypes.func.isRequired
+ };
+
+ layerClassSelector = props => props.layerClasses;
+ layerTypeOptionsSelector = createSelector(
+ this.layerClassSelector,
+ layerClasses => Object.keys(layerClasses).map(key => {
+ const layer = new layerClasses[key]();
+ return {
+ id: key,
+ label: layer.name,
+ icon: layer.layerIcon
+ };
+ }));
+
+ _addEmptyNewLayer = () => {
+ this.props.addLayer();
+ };
+
+ _handleSort = order => {
+ this.props.updateLayerOrder(order);
+ };
+
+ render() {
+ const {layers, datasets, layerOrder, openModal} = this.props;
+ const defaultDataset = Object.keys(datasets)[0];
+ const layerTypeOptions = this.layerTypeOptionsSelector(this.props);
+
+ const layerActions = {
+ layerConfigChange: this.props.layerConfigChange,
+ layerVisualChannelConfigChange: this.props.layerVisualChannelConfigChange,
+ layerTypeChange: this.props.layerTypeChange,
+ layerVisConfigChange: this.props.layerVisConfigChange,
+ removeLayer: this.props.removeLayer
+ };
+
+ const panelProps = {datasets, openModal, layerTypeOptions};
+
+ return (
+ <StyledSortable className="layer-manager">
+ <SourceDataCatalog
+ datasets={datasets}
+ showDatasetTable={this.props.showDatasetTable}
+ removeDataset={this.props.removeDataset}
+ showDeleteDataset
+ />
+ <AddDataButton
+ onClick={this.props.showAddDataModal}
+ isInactive={!defaultDataset}
+ />
+ <SidePanelDivider />
+ <SidePanelSection>
+ <Sortable
+ onSort={this._handleSort}
+ direction="vertical"
+ sortHandle="sort--handle"
+ dynamic
+ >
+ {layerOrder.map(idx => (
+ <LayerPanel
+ {...panelProps}
+ {...layerActions}
+ sortData={idx}
+ key={layers[idx].id}
+ idx={idx}
+ layer={layers[idx]}
+ />
+ ))}
+ </Sortable>
+ </SidePanelSection>
+ <SidePanelSection>
+ {defaultDataset ? (
+ <Button onClick={this._addEmptyNewLayer} width="105px">
+ <Add height="12px" />Add Layer
+ </Button>
+ ) : null}
+ </SidePanelSection>
+ <LayerBlendingSelector
+ layerBlending={this.props.layerBlending}
+ updateLayerBlending={this.props.updateLayerBlending}
+ />
+ </StyledSortable>
+ );
+ }
+ }
+}
+
+export default LayerManagerFactory;
diff --git a/src/components/side-panel/layer-panel/layer-panel.js b/src/components/side-panel/layer-panel/layer-panel.js
index e0bafa3ed..a7b00d347 100644
--- a/src/components/side-panel/layer-panel/layer-panel.js
+++ b/src/components/side-panel/layer-panel/layer-panel.js
@@ -36,103 +36,109 @@ const PanelWrapper = styled.div`
}
`;
-@sortable
-export default class LayerPanel extends Component {
- static propTypes = {
- layer: PropTypes.object.isRequired,
- datasets: PropTypes.object.isRequired,
- idx: PropTypes.number.isRequired,
- layerConfigChange: PropTypes.func.isRequired,
- layerTypeChange: PropTypes.func.isRequired,
- openModal: PropTypes.func.isRequired,
- removeLayer: PropTypes.func.isRequired,
- onCloseConfig: PropTypes.func,
-
- layerTypeOptions: PropTypes.arrayOf(PropTypes.any),
- layerVisConfigChange: PropTypes.func,
- layerVisualChannelConfigChange: PropTypes.func
- };
-
- updateLayerConfig = newProp => {
- this.props.layerConfigChange(this.props.layer, newProp);
- };
-
- updateLayerType = newType => {
- this.props.layerTypeChange(this.props.layer, newType);
- };
-
- updateLayerVisConfig = newVisConfig => {
- this.props.layerVisConfigChange(this.props.layer, newVisConfig);
- };
-
- updateLayerVisualChannelConfig = (newConfig, channel, scaleKey) => {
- this.props.layerVisualChannelConfigChange(
- this.props.layer,
- newConfig,
- channel,
- scaleKey
- );
- };
-
- _updateLayerLabel = ({target: {value}}) => {
- this.updateLayerConfig({label: value});
- };
-
- _toggleVisibility = e => {
- e.stopPropagation();
- const isVisible = !this.props.layer.config.isVisible;
- this.updateLayerConfig({isVisible});
- };
-
- _toggleEnableConfig = e => {
- e.stopPropagation();
- const {layer: {config: {isConfigActive}}} = this.props;
- this.updateLayerConfig({isConfigActive: !isConfigActive});
- };
-
- _removeLayer = e => {
- e.stopPropagation();
- this.props.removeLayer(this.props.idx);
- };
- render() {
- const {layer, idx, datasets, layerTypeOptions} = this.props;
- const {config} = layer;
- const {isConfigActive} = config;
-
- return (
- <PanelWrapper
- active={isConfigActive}
- className={`layer-panel ${this.props.className}`}
- style={this.props.style}
- onMouseDown={this.props.onMouseDown}
- onTouchStart={this.props.onTouchStart}
- >
- <LayerPanelHeader
- isConfigActive={isConfigActive}
- id={layer.id}
- idx={idx}
- isVisible={config.isVisible}
- label={config.label}
- labelRCGColorValues={datasets[config.dataId].color}
- layerType={layer.name}
- onToggleEnableConfig={this._toggleEnableConfig}
- onToggleVisibility={this._toggleVisibility}
- onUpdateLayerLabel={this._updateLayerLabel}
- onRemoveLayer={this._removeLayer}
- />
- {isConfigActive && (
- <LayerConfigurator
- layer={layer}
- datasets={datasets}
- layerTypeOptions={layerTypeOptions}
- openModal={this.props.openModal}
- updateLayerConfig={this.updateLayerConfig}
- updateLayerVisualChannelConfig={this.updateLayerVisualChannelConfig}
- updateLayerType={this.updateLayerType}
- updateLayerVisConfig={this.updateLayerVisConfig}
+function LayerPanelFactory() {
+ @sortable
+ class LayerPanel extends Component {
+ static propTypes = {
+ layer: PropTypes.object.isRequired,
+ datasets: PropTypes.object.isRequired,
+ idx: PropTypes.number.isRequired,
+ layerConfigChange: PropTypes.func.isRequired,
+ layerTypeChange: PropTypes.func.isRequired,
+ openModal: PropTypes.func.isRequired,
+ removeLayer: PropTypes.func.isRequired,
+ onCloseConfig: PropTypes.func,
+
+ layerTypeOptions: PropTypes.arrayOf(PropTypes.any),
+ layerVisConfigChange: PropTypes.func,
+ layerVisualChannelConfigChange: PropTypes.func
+ };
+
+ updateLayerConfig = newProp => {
+ this.props.layerConfigChange(this.props.layer, newProp);
+ };
+
+ updateLayerType = newType => {
+ this.props.layerTypeChange(this.props.layer, newType);
+ };
+
+ updateLayerVisConfig = newVisConfig => {
+ this.props.layerVisConfigChange(this.props.layer, newVisConfig);
+ };
+
+ updateLayerVisualChannelConfig = (newConfig, channel, scaleKey) => {
+ this.props.layerVisualChannelConfigChange(
+ this.props.layer,
+ newConfig,
+ channel,
+ scaleKey
+ );
+ };
+
+ _updateLayerLabel = ({target: {value}}) => {
+ this.updateLayerConfig({label: value});
+ };
+
+ _toggleVisibility = e => {
+ e.stopPropagation();
+ const isVisible = !this.props.layer.config.isVisible;
+ this.updateLayerConfig({isVisible});
+ };
+
+ _toggleEnableConfig = e => {
+ e.stopPropagation();
+ const {layer: {config: {isConfigActive}}} = this.props;
+ this.updateLayerConfig({isConfigActive: !isConfigActive});
+ };
+
+ _removeLayer = e => {
+ e.stopPropagation();
+ this.props.removeLayer(this.props.idx);
+ };
+ render() {
+ const {layer, idx, datasets, layerTypeOptions} = this.props;
+ const {config} = layer;
+ const {isConfigActive} = config;
+
+ return (
+ <PanelWrapper
+ active={isConfigActive}
+ className={`layer-panel ${this.props.className}`}
+ style={this.props.style}
+ onMouseDown={this.props.onMouseDown}
+ onTouchStart={this.props.onTouchStart}
+ >
+ <LayerPanelHeader
+ isConfigActive={isConfigActive}
+ id={layer.id}
+ idx={idx}
+ isVisible={config.isVisible}
+ label={config.label}
+ labelRCGColorValues={datasets[config.dataId].color}
+ layerType={layer.name}
+ onToggleEnableConfig={this._toggleEnableConfig}
+ onToggleVisibility={this._toggleVisibility}
+ onUpdateLayerLabel={this._updateLayerLabel}
+ onRemoveLayer={this._removeLayer}
/>
- )}
- </PanelWrapper>
- );
+ {isConfigActive && (
+ <LayerConfigurator
+ layer={layer}
+ datasets={datasets}
+ layerTypeOptions={layerTypeOptions}
+ openModal={this.props.openModal}
+ updateLayerConfig={this.updateLayerConfig}
+ updateLayerVisualChannelConfig={this.updateLayerVisualChannelConfig}
+ updateLayerType={this.updateLayerType}
+ updateLayerVisConfig={this.updateLayerVisConfig}
+ />
+ )}
+ </PanelWrapper>
+ );
+ }
}
+
+ return LayerPanel;
}
+
+export default LayerPanelFactory;
diff --git a/src/components/side-panel/map-manager.js b/src/components/side-panel/map-manager.js
index c7c145cfb..c874326c9 100644
--- a/src/components/side-panel/map-manager.js
+++ b/src/components/side-panel/map-manager.js
@@ -20,210 +20,76 @@
import React, {Component} from 'react';
import PropTypes from 'prop-types';
-import classnames from 'classnames';
-import styled from 'styled-components';
-import {
- Button,
- PanelLabel,
- StyledPanelHeader,
- PanelHeaderTitle,
- PanelHeaderContent,
- PanelContent,
- PanelLabelBold,
- PanelLabelWrapper,
- CenterFlexbox
-} from 'components/common/styled-components';
-
-import PanelHeaderAction from 'components/side-panel/panel-header-action';
-import {Add, ArrowDown, EyeSeen, EyeUnseen, Upload} from 'components/common/icons';
-
-const StyledInteractionPanel = styled.div`
- padding-bottom: 12px;
-`;
-
-export default class MapManager extends Component {
- static propTypes = {
- mapStyle: PropTypes.object.isRequired,
- onConfigChange: PropTypes.func.isRequired,
- onStyleChange: PropTypes.func.isRequired,
- showAddMapStyleModal: PropTypes.func.isRequired
- };
-
- state = {
- isSelecting: false
- };
-
- _updateConfig = newProp => {
- const newConfig = {...this.props.mapStyle, ...newProp};
- this.props.onConfigChange(newConfig);
- };
-
- _toggleSelecting = () => {
- this.setState({isSelecting: !this.state.isSelecting});
- };
-
- _selectStyle = val => {
- this.props.onStyleChange(val);
- this._toggleSelecting();
- };
-
- render() {
- const {mapStyle} = this.props;
- const editableLayers = mapStyle.visibleLayerGroups;
-
- return (
- <div className="map-style-panel">
- <div>
- <MapStyleSelector
- mapStyle={mapStyle}
- isSelecting={this.state.isSelecting}
- onChange={this._selectStyle}
- toggleActive={this._toggleSelecting}
- />
- {Object.keys(editableLayers).length ? (
- <LayerGroupSelector
- layers={mapStyle.visibleLayerGroups}
- editableLayers={editableLayers}
- topLayers={mapStyle.topLayerGroups}
- onChange={this._updateConfig}
+import {Button} 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 {Add} from 'components/common/icons';
+
+MapManagerFactory.deps = [
+ MapStyleSelectorFactory,
+ LayerGroupSelectorFactory
+];
+
+function MapManagerFactory(MapStyleSelector, LayerGroupSelector) {
+ return class MapManager extends Component {
+ static propTypes = {
+ mapStyle: PropTypes.object.isRequired,
+ onConfigChange: PropTypes.func.isRequired,
+ onStyleChange: PropTypes.func.isRequired,
+ showAddMapStyleModal: PropTypes.func.isRequired
+ };
+
+ state = {
+ isSelecting: false
+ };
+
+ _updateConfig = newProp => {
+ const newConfig = {...this.props.mapStyle, ...newProp};
+ this.props.onConfigChange(newConfig);
+ };
+
+ _toggleSelecting = () => {
+ this.setState({isSelecting: !this.state.isSelecting});
+ };
+
+ _selectStyle = val => {
+ this.props.onStyleChange(val);
+ this._toggleSelecting();
+ };
+
+ render() {
+ const {mapStyle} = this.props;
+ const editableLayers = mapStyle.visibleLayerGroups;
+
+ return (
+ <div className="map-style-panel">
+ <div>
+ <MapStyleSelector
+ mapStyle={mapStyle}
+ isSelecting={this.state.isSelecting}
+ onChange={this._selectStyle}
+ toggleActive={this._toggleSelecting}
/>
- ) : null}
- <Button
- onClick={this.props.showAddMapStyleModal}
- secondary>
- <Add height="12px" />Add Map Style
- </Button>
+ {Object.keys(editableLayers).length ? (
+ <LayerGroupSelector
+ layers={mapStyle.visibleLayerGroups}
+ editableLayers={editableLayers}
+ topLayers={mapStyle.topLayerGroups}
+ onChange={this._updateConfig}
+ />
+ ) : null}
+ <Button
+ onClick={this.props.showAddMapStyleModal}
+ secondary>
+ <Add height="12px" />Add Map Style
+ </Button>
+ </div>
</div>
- </div>
- );
+ );
+ }
}
}
-const StyledMapDropdown = StyledPanelHeader.extend`
- height: 48px;
- margin-bottom: 5px;
- opacity: 1;
- position: relative;
- transition: opacity 0.05s ease-in, height 0.25s ease-out;
-
- &.collapsed {
- height: 0;
- margin-bottom: 0;
- opacity: 0;
- }
-
- :hover {
- cursor: pointer;
- background-color: ${props => props.theme.panelBackgroundHover};
- }
-
- .map-title-block img {
- margin-right: 12px;
- }
-
- .map-preview {
- border-radius: 3px;
- height: 30px;
- width: 40px;
- }
-`;
-
-const MapStyleSelector = ({mapStyle, onChange, toggleActive, isSelecting}) => (
- <div>
- <PanelLabel>Map style</PanelLabel>
- {Object.keys(mapStyle.mapStyles).map(op => (
- <StyledMapDropdown
- className={classnames('map-dropdown-option', {
- collapsed: !isSelecting && mapStyle.styleType !== op
- })}
- key={op}
- onClick={isSelecting ? () => onChange(op) : toggleActive}
- >
- <PanelHeaderContent className="map-title-block">
- <img className="map-preview" src={mapStyle.mapStyles[op].icon} />
- <PanelHeaderTitle className="map-preview-name">
- {mapStyle.mapStyles[op].label}
- </PanelHeaderTitle>
- </PanelHeaderContent>
- {!isSelecting ? (
- <PanelHeaderAction
- className="map-dropdown-option__enable-config"
- id="map-enable-config"
- IconComponent={ArrowDown}
- tooltip={'Select Base Map Style'}
- onClick={toggleActive}
- />
- ) : null}
- </StyledMapDropdown>
- ))}
- </div>
-);
-
-const StyledLayerGroupItem = styled.div`
- margin-bottom: 10px;
- display: flex;
- justify-content: space-between;
-
- &:last-child {
- margin-bottom: 0;
- }
-
- .layer-group__visibility-toggle {
- margin-right: 12px;
- }
-`;
-
-const LayerLabel = PanelLabelBold.extend`
- color: ${props =>
- props.active ? props.theme.textColor : props.theme.labelColor};
-`;
-const LayerGroupSelector = ({layers, editableLayers, onChange, topLayers}) => (
- <StyledInteractionPanel className="map-style__layer-group__selector">
- <div className="layer-group__header">
- <PanelLabel>Map Layers</PanelLabel>
- </div>
- <PanelContent className="map-style__layer-group">
- {Object.keys(editableLayers).map(slug => (
- <StyledLayerGroupItem className="layer-group__select" key={slug}>
- <PanelLabelWrapper>
- <PanelHeaderAction
- className="layer-group__visibility-toggle"
- id={`${slug}-toggle`}
- tooltip={layers[slug] ? 'hide' : 'show'}
- onClick={() =>
- onChange({
- visibleLayerGroups: {
- ...layers,
- [slug]: !layers[slug]
- }
- })
- }
- IconComponent={layers[slug] ? EyeSeen : EyeUnseen}
- active={layers[slug]}
- flush
- />
- <LayerLabel active={layers[slug]}>{slug}</LayerLabel>
- </PanelLabelWrapper>
- <CenterFlexbox className="layer-group__bring-top">
- <PanelHeaderAction
- id={`${slug}-top`}
- tooltip="Move to top of data layers"
- disabled={!layers[slug]}
- IconComponent={Upload}
- active={topLayers[slug]}
- onClick={() =>
- onChange({
- topLayerGroups: {
- ...topLayers,
- [slug]: !topLayers[slug]
- }
- })
- }
- />
- </CenterFlexbox>
- </StyledLayerGroupItem>
- ))}
- </PanelContent>
- </StyledInteractionPanel>
-);
+export default MapManagerFactory;
diff --git a/src/components/side-panel/map-style-panel/map-layer-selector.js b/src/components/side-panel/map-style-panel/map-layer-selector.js
new file mode 100644
index 000000000..5e262e6a0
--- /dev/null
+++ b/src/components/side-panel/map-style-panel/map-layer-selector.js
@@ -0,0 +1,111 @@
+// Copyright (c) 2018 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 from 'react';
+import styled from 'styled-components';
+import PanelHeaderAction from 'components/side-panel/panel-header-action';
+import {EyeSeen, EyeUnseen, Upload} from 'components/common/icons';
+
+import {
+ PanelLabel,
+ PanelContent,
+ PanelLabelBold,
+ PanelLabelWrapper,
+ CenterFlexbox
+} from 'components/common/styled-components';
+
+const StyledInteractionPanel = styled.div`
+ padding-bottom: 12px;
+`;
+
+const StyledLayerGroupItem = styled.div`
+ margin-bottom: 10px;
+ display: flex;
+ justify-content: space-between;
+
+ &:last-child {
+ margin-bottom: 0;
+ }
+
+ .layer-group__visibility-toggle {
+ margin-right: 12px;
+ }
+`;
+
+const LayerLabel = PanelLabelBold.extend`
+ color: ${props =>
+ props.active ? props.theme.textColor : props.theme.labelColor};
+`;
+
+function LayerGroupSelectorFactory() {
+ const LayerGroupSelector = ({layers, editableLayers, onChange, topLayers}) => (
+ <StyledInteractionPanel className="map-style__layer-group__selector">
+ <div className="layer-group__header">
+ <PanelLabel>Map Layers</PanelLabel>
+ </div>
+ <PanelContent className="map-style__layer-group">
+ {Object.keys(editableLayers).map(slug => (
+ <StyledLayerGroupItem className="layer-group__select" key={slug}>
+ <PanelLabelWrapper>
+ <PanelHeaderAction
+ className="layer-group__visibility-toggle"
+ id={`${slug}-toggle`}
+ tooltip={layers[slug] ? 'hide' : 'show'}
+ onClick={() =>
+ onChange({
+ visibleLayerGroups: {
+ ...layers,
+ [slug]: !layers[slug]
+ }
+ })
+ }
+ IconComponent={layers[slug] ? EyeSeen : EyeUnseen}
+ active={layers[slug]}
+ flush
+ />
+ <LayerLabel active={layers[slug]}>{slug}</LayerLabel>
+ </PanelLabelWrapper>
+ <CenterFlexbox className="layer-group__bring-top">
+ <PanelHeaderAction
+ id={`${slug}-top`}
+ tooltip="Move to top of data layers"
+ disabled={!layers[slug]}
+ IconComponent={Upload}
+ active={topLayers[slug]}
+ onClick={() =>
+ onChange({
+ topLayerGroups: {
+ ...topLayers,
+ [slug]: !topLayers[slug]
+ }
+ })
+ }
+ />
+ </CenterFlexbox>
+ </StyledLayerGroupItem>
+ ))}
+ </PanelContent>
+ </StyledInteractionPanel>
+ );
+
+ return LayerGroupSelector;
+}
+
+export default LayerGroupSelectorFactory;
diff --git a/src/components/side-panel/map-style-panel/map-style-selector.js b/src/components/side-panel/map-style-panel/map-style-selector.js
new file mode 100644
index 000000000..cee4e92e9
--- /dev/null
+++ b/src/components/side-panel/map-style-panel/map-style-selector.js
@@ -0,0 +1,77 @@
+import React from 'react';
+import classnames from 'classnames';
+import {ArrowDown} from 'components/common/icons';
+import PanelHeaderAction from 'components/side-panel/panel-header-action';
+
+import {
+ PanelLabel,
+ PanelHeaderTitle,
+ PanelHeaderContent,
+ StyledPanelHeader
+} from 'components/common/styled-components';
+
+const StyledMapDropdown = StyledPanelHeader.extend`
+ height: 48px;
+ margin-bottom: 5px;
+ opacity: 1;
+ position: relative;
+ transition: opacity 0.05s ease-in, height 0.25s ease-out;
+
+ &.collapsed {
+ height: 0;
+ margin-bottom: 0;
+ opacity: 0;
+ }
+
+ :hover {
+ cursor: pointer;
+ background-color: ${props => props.theme.panelBackgroundHover};
+ }
+
+ .map-title-block img {
+ margin-right: 12px;
+ }
+
+ .map-preview {
+ border-radius: 3px;
+ height: 30px;
+ width: 40px;
+ }
+`;
+
+function MapStyleSelectorFactory() {
+ const MapStyleSelector = ({mapStyle, onChange, toggleActive, isSelecting}) => (
+ <div>
+ <PanelLabel>Map style</PanelLabel>
+ {Object.keys(mapStyle.mapStyles).map(op => (
+ <StyledMapDropdown
+ className={classnames('map-dropdown-option', {
+ collapsed: !isSelecting && mapStyle.styleType !== op
+ })}
+ key={op}
+ onClick={isSelecting ? () => onChange(op) : toggleActive}
+ >
+ <PanelHeaderContent className="map-title-block">
+ <img className="map-preview" src={mapStyle.mapStyles[op].icon} />
+ <PanelHeaderTitle className="map-preview-name">
+ {mapStyle.mapStyles[op].label}
+ </PanelHeaderTitle>
+ </PanelHeaderContent>
+ {!isSelecting ? (
+ <PanelHeaderAction
+ className="map-dropdown-option__enable-config"
+ id="map-enable-config"
+ IconComponent={ArrowDown}
+ tooltip={'Select Base Map Style'}
+ onClick={toggleActive}
+ />
+ ) : null}
+ </StyledMapDropdown>
+ ))}
+ </div>
+ );
+
+ return MapStyleSelector;
+}
+
+export default MapStyleSelectorFactory;
diff --git a/src/components/side-panel/panel-toggle.js b/src/components/side-panel/panel-toggle.js
index 8ceab0dfb..02ba1fe79 100644
--- a/src/components/side-panel/panel-toggle.js
+++ b/src/components/side-panel/panel-toggle.js
@@ -53,37 +53,40 @@ const PanelTab = styled.div.attrs({
margin-right: 12px;
padding-bottom: 6px;
width: 30px;
-
+
:hover {
cursor: pointer;
color: ${props => props.theme.textColorHl};
}
`;
-const PanelToggle = ({panels, activePanel, togglePanel}) => (
- <PanelHeaderBottom>
- {panels.map(panel => (
- <PanelTab
- key={panel.id}
- data-tip
- data-for={`${panel.id}-nav`}
- active={activePanel === panel.id}
- onClick={() => togglePanel(panel.id)}
- >
- <panel.iconComponent height="20px" />
- <Tooltip
- id={`${panel.id}-nav`}
- effect="solid"
- delayShow={500}
- place="bottom"
+const PanelToggleFactory = () => {
+ const PanelToggle = ({panels, activePanel, togglePanel}) => (
+ <PanelHeaderBottom>
+ {panels.map(panel => (
+ <PanelTab
+ key={panel.id}
+ data-tip
+ data-for={`${panel.id}-nav`}
+ active={activePanel === panel.id}
+ onClick={() => togglePanel(panel.id)}
>
- <span>{panel.label || panel.id}</span>
- </Tooltip>
- </PanelTab>
- ))}
- </PanelHeaderBottom>
-);
+ <panel.iconComponent height="20px" />
+ <Tooltip
+ id={`${panel.id}-nav`}
+ effect="solid"
+ delayShow={500}
+ place="bottom"
+ >
+ <span>{panel.label || panel.id}</span>
+ </Tooltip>
+ </PanelTab>
+ ))}
+ </PanelHeaderBottom>
+ );
-PanelToggle.propTypes = propTypes;
+ PanelToggle.propTypes = propTypes;
+ return PanelToggle;
+}
-export default PanelToggle;
+export default PanelToggleFactory;
diff --git a/src/components/side-panel/side-bar.js b/src/components/side-panel/side-bar.js
index 66664bd5b..fe2d8246b 100644
--- a/src/components/side-panel/side-bar.js
+++ b/src/components/side-panel/side-bar.js
@@ -52,73 +52,81 @@ const SideBarInner = styled.div`
height: 100%;
`;
-const CollapseButton = styled.div`
- align-items: center;
- box-shadow: 0 1px 3px rgba(0, 0, 0, 0.2);
- justify-content: center;
- background-color: ${props => props.theme.sideBarCloseBtnBgd};
- border-radius: 1px;
- color: ${props => props.theme.sideBarCloseBtnColor};
- display: flex;
- height: 20px;
- position: absolute;
- right: -8px;
- top: ${props => props.theme.sidePanel.margin.top}px;
- width: 20px;
+export const CollapseButtonFactory = () => (
+ styled.div`
+ align-items: center;
+ box-shadow: 0 1px 3px rgba(0, 0, 0, 0.2);
+ justify-content: center;
+ background-color: ${props => props.theme.sideBarCloseBtnBgd};
+ border-radius: 1px;
+ color: ${props => props.theme.sideBarCloseBtnColor};
+ display: flex;
+ height: 20px;
+ position: absolute;
+ right: -8px;
+ top: ${props => props.theme.sidePanel.margin.top}px;
+ width: 20px;
- :hover {
- cursor: pointer;
- box-shadow: none;
- background-color: ${props => props.theme.sideBarCloseBtnBgdHover};
- }
-`;
+ :hover {
+ cursor: pointer;
+ box-shadow: none;
+ background-color: ${props => props.theme.sideBarCloseBtnBgdHover};
+ }
+ `
+);
-export default class SideBar extends Component {
- static defaultProps = {
- width: 300,
- minifiedWidth: 0,
- isOpen: true,
- onOpenOrClose: function noop() {}
- };
+SidebarFactory.deps = [CollapseButtonFactory];
- static propTypes = {
- width: PropTypes.number,
- isOpen: PropTypes.bool,
- minifiedWidth: PropTypes.number,
- onOpenOrClose: PropTypes.func
- };
+function SidebarFactory(CollapseButton) {
+ return class SideBar extends Component {
+ static defaultProps = {
+ width: 300,
+ minifiedWidth: 0,
+ isOpen: true,
+ onOpenOrClose: function noop() {}
+ };
- _onOpenOrClose = () => {
- this.props.onOpenOrClose({isOpen: !this.props.isOpen});
- };
+ static propTypes = {
+ width: PropTypes.number,
+ isOpen: PropTypes.bool,
+ minifiedWidth: PropTypes.number,
+ onOpenOrClose: PropTypes.func
+ };
+
+ _onOpenOrClose = () => {
+ this.props.onOpenOrClose({isOpen: !this.props.isOpen});
+ };
- render() {
- const {isOpen, minifiedWidth, width} = this.props;
- const horizontalOffset = isOpen ? 0 : minifiedWidth - width;
+ render() {
+ const {isOpen, minifiedWidth, width} = this.props;
+ const horizontalOffset = isOpen ? 0 : minifiedWidth - width;
+
+ return (
+ <StyledSidePanelContainer
+ width={isOpen ? width : 0}
+ className="side-panel--container"
+ >
+ <SideBarContainer className="side-bar" style={{width: `${width}px`}}
+ left={horizontalOffset}>
+ {isOpen ? (
+ <SideBarInner className="side-bar__inner">
+ {this.props.children}
+ </SideBarInner>
+ ) : null}
+ <CollapseButton
+ className="side-bar__close"
+ onClick={this._onOpenOrClose}
+ >
+ <ArrowRight
+ height="12px"
+ style={{transform: `rotate(${isOpen ? 180 : 0}deg)`}}
+ />
+ </CollapseButton>
+ </SideBarContainer>
+ </StyledSidePanelContainer>
+ );
+ }
+ };
+}
- return (
- <StyledSidePanelContainer
- width={isOpen ? width : 0}
- className="side-panel--container"
- >
- <SideBarContainer className="side-bar" style={{width: `${width}px`}}
- left={horizontalOffset}>
- {isOpen ? (
- <SideBarInner className="side-bar__inner">
- {this.props.children}
- </SideBarInner>
- ) : null}
- <CollapseButton
- className="side-bar__close"
- onClick={this._onOpenOrClose}
- >
- <ArrowRight
- height="12px"
- style={{transform: `rotate(${isOpen ? 180 : 0}deg)`}}
- />
- </CollapseButton>
- </SideBarContainer>
- </StyledSidePanelContainer>
- );
- }
-};
+export default SidebarFactory;
diff --git a/src/components/side-panel/source-data-catalog.js b/src/components/side-panel/source-data-catalog.js
index c2a993359..3f10a75e2 100644
--- a/src/components/side-panel/source-data-catalog.js
+++ b/src/components/side-panel/source-data-catalog.js
@@ -28,7 +28,7 @@ import {Table, Trash, ArrowRight} from 'components/common/icons';
const defaultRemoveDataset = datasetKey => {};
const numFormat = format(',');
-const SourceDataCatelog = styled.div`
+const SourceDataCatelogWrapper = styled.div`
transition: ${props => props.theme.transition};
`;
@@ -94,49 +94,6 @@ export const DatasetTag = ({onClick, dataset}) => (
</DatasetTagWrapper>
);
-const SourceDataCatalog = ({
- datasets,
- showDatasetTable,
- removeDataset,
- showDeleteDataset = false
-}) => (
- <SourceDataCatelog className="source-data-catalog">
- {Object.values(datasets).map((dataset, index) => (
- <SidePanelSection key={dataset.id}>
- <DatasetTitle className="source-data-title" clickable={Boolean(showDatasetTable)}>
- <DatasetTag
- dataset={dataset}
- onClick={
- showDatasetTable ? () => showDatasetTable(dataset.id) : null
- }
- />
- {showDatasetTable ?
- <CenterFlexbox className="source-data-arrow">
- <ArrowRight height="12px" />
- </CenterFlexbox> : null}
- {showDatasetTable ? (
- <ShowDataTable
- id={dataset.id}
- showDatasetTable={showDatasetTable}
- />
- ) : null}
- {showDeleteDataset ? (
- <RemoveDataset
- datasetKey={dataset.id}
- removeDataset={removeDataset}
- />
- ) : null}
- </DatasetTitle>
- {showDatasetTable ? (
- <DataRowCount className="source-data-rows">{`${numFormat(
- dataset.allData.length
- )} rows`}</DataRowCount>
- ) : null}
- </SidePanelSection>
- ))}
- </SourceDataCatelog>
-);
-
const ShowDataTable = ({id, showDatasetTable}) => (
<DataTagAction
className="dataset-action show-data-table"
@@ -169,4 +126,51 @@ const RemoveDataset = ({datasetKey, removeDataset = defaultRemoveDataset}) => (
</DataTagAction>
);
-export default SourceDataCatalog;
+function SourceDataCatalogFactory() {
+ const SourceDataCatalog = ({
+ datasets,
+ showDatasetTable,
+ removeDataset,
+ showDeleteDataset = false
+ }) => (
+ <SourceDataCatelogWrapper className="source-data-catalog">
+ {Object.values(datasets).map((dataset, index) => (
+ <SidePanelSection key={dataset.id}>
+ <DatasetTitle className="source-data-title" clickable={Boolean(showDatasetTable)}>
+ <DatasetTag
+ dataset={dataset}
+ onClick={
+ showDatasetTable ? () => showDatasetTable(dataset.id) : null
+ }
+ />
+ {showDatasetTable ?
+ <CenterFlexbox className="source-data-arrow">
+ <ArrowRight height="12px" />
+ </CenterFlexbox> : null}
+ {showDatasetTable ? (
+ <ShowDataTable
+ id={dataset.id}
+ showDatasetTable={showDatasetTable}
+ />
+ ) : null}
+ {showDeleteDataset ? (
+ <RemoveDataset
+ datasetKey={dataset.id}
+ removeDataset={removeDataset}
+ />
+ ) : null}
+ </DatasetTitle>
+ {showDatasetTable ? (
+ <DataRowCount className="source-data-rows">{`${numFormat(
+ dataset.allData.length
+ )} rows`}</DataRowCount>
+ ) : null}
+ </SidePanelSection>
+ ))}
+ </SourceDataCatelogWrapper>
+ );
+
+ return SourceDataCatalog;
+}
+
+export default SourceDataCatalogFactory;