Kepler.gl is a powerful open source geospatial analysis tool for large-scale data sets.
[Enhancement] make visConfigSwitch a factory (#1313)
Shan Hec1a251de9052
diff --git a/src/components/index.js b/src/components/index.jsindex 51ad3367e..87b8aa170 100644--- a/src/components/index.js+++ b/src/components/index.js@@ -21,6 +21,7 @@import TimeRangeSliderFactory from './common/time-range-slider';import RangeSliderFactory from './common/range-slider';import VisConfigSliderFactory from './side-panel/layer-panel/vis-config-slider';+import VisConfigSwitchFactory from './side-panel/layer-panel/vis-config-switch';import LayerConfigGroupFactory from './side-panel/layer-panel/layer-config-group';import {ChannelByValueSelectorFactory} from './side-panel/layer-panel/layer-configurator';import FieldSelectorFactory from './common/field-selector';@@ -179,6 +180,7 @@ export {Icons};export const TimeRangeSlider = appInjector.get(TimeRangeSliderFactory);export const RangeSlider = appInjector.get(RangeSliderFactory);export const VisConfigSlider = appInjector.get(VisConfigSliderFactory);+export const VisConfigSwitch = appInjector.get(VisConfigSwitchFactory);export const LayerConfigGroup = appInjector.get(LayerConfigGroupFactory);export const ChannelByValueSelector = appInjector.get(ChannelByValueSelectorFactory);export const FieldSelector = appInjector.get(FieldSelectorFactory);@@ -189,6 +191,7 @@ export {TimeRangeSliderFactory,RangeSliderFactory,VisConfigSliderFactory,+ VisConfigSwitchFactory,LayerConfigGroupFactory,ChannelByValueSelectorFactory};diff --git a/src/components/side-panel/layer-panel/layer-configurator.js b/src/components/side-panel/layer-panel/layer-configurator.jsindex b10c6c8ac..d2c014905 100644--- a/src/components/side-panel/layer-panel/layer-configurator.js+++ b/src/components/side-panel/layer-panel/layer-configurator.js@@ -33,7 +33,7 @@ import LayerTypeSelectorFactory from './layer-type-selector';import DimensionScaleSelector from './dimension-scale-selector';import ColorSelector from './color-selector';import SourceDataSelectorFactory from 'components/side-panel/common/source-data-selector';-import VisConfigSwitch from './vis-config-switch';+import VisConfigSwitchFactory from './vis-config-switch';import VisConfigSliderFactory from './vis-config-slider';import LayerConfigGroupFactory, {ConfigGroupCollapsibleContent} from './layer-config-group';import TextLabelPanelFactory from './text-label-panel';@@ -89,7 +89,8 @@ LayerConfiguratorFactory.deps = [LayerConfigGroupFactory,ChannelByValueSelectorFactory,LayerColumnConfigFactory,- LayerTypeSelectorFactory+ LayerTypeSelectorFactory,+ VisConfigSwitchFactory];export default function LayerConfiguratorFactory(@@ -99,7 +100,8 @@ export default function LayerConfiguratorFactory(LayerConfigGroup,ChannelByValueSelector,LayerColumnConfig,- LayerTypeSelector+ LayerTypeSelector,+ VisConfigSwitch) {class LayerConfigurator extends Component {static propTypes = {diff --git a/src/components/side-panel/layer-panel/vis-config-switch.js b/src/components/side-panel/layer-panel/vis-config-switch.jsindex 433478a14..e7f384f0b 100644--- a/src/components/side-panel/layer-panel/vis-config-switch.js+++ b/src/components/side-panel/layer-panel/vis-config-switch.js@@ -21,7 +21,7 @@import React from 'react';import PropTypes from 'prop-types';import styled from 'styled-components';-import InfoHelper from 'components/common/info-helper';+import InfoHelperFacotry from 'components/common/info-helper';import Switch from 'components/common/switch';import {SidePanelSection, PanelLabel} from 'components/common/styled-components';import {capitalizeFirstLetter} from 'utils/utils';@@ -45,39 +45,42 @@ const StyledVisConfigSwitch = styled.div`}`;-const VisConfigSwitch = ({- layer: {id, config},- property,- onChange,- label,- description,- disabled-}) => (- <SidePanelSection disabled={Boolean(disabled)}>- <StyledVisConfigSwitch className="vis-config-switch">- <div className="vis-config-switch__title">- {label ? (- <PanelLabel>- {(label && <FormattedMessage id={label} />) || capitalizeFirstLetter(property)}- </PanelLabel>- ) : null}- {description ? (- <div>- <InfoHelper description={description} id={`${id}-${property}-description`} />- </div>- ) : null}- </div>- <div className="vis-config-switch__switch">- <Switch- checked={config.visConfig[property]}- id={`${id}-${property}-switch`}- onChange={() => onChange({[property]: !config.visConfig[property]})}- />- </div>- </StyledVisConfigSwitch>- </SidePanelSection>-);+VisConfigSwitchFactory.deps = [InfoHelperFacotry];+function VisConfigSwitchFactory(InfoHelper) {+ const VisConfigSwitch = ({+ layer: {id, config},+ property,+ onChange,+ label,+ description,+ disabled+ }) => (+ <SidePanelSection disabled={Boolean(disabled)}>+ <StyledVisConfigSwitch className="vis-config-switch">+ <div className="vis-config-switch__title">+ {label ? (+ <PanelLabel>+ {(label && <FormattedMessage id={label} />) || capitalizeFirstLetter(property)}+ </PanelLabel>+ ) : null}+ {description ? (+ <div>+ <InfoHelper description={description} id={`${id}-${property}-description`} />+ </div>+ ) : null}+ </div>+ <div className="vis-config-switch__switch">+ <Switch+ checked={config.visConfig[property]}+ id={`${id}-${property}-switch`}+ onChange={() => onChange({[property]: !config.visConfig[property]})}+ />+ </div>+ </StyledVisConfigSwitch>+ </SidePanelSection>+ );-VisConfigSwitch.propTypes = propTypes;--export default VisConfigSwitch;+ VisConfigSwitch.propTypes = propTypes;+ return VisConfigSwitch;+}+export default VisConfigSwitchFactory;