Skip to content

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

[Enhancement] Disable layer select option when no data is loaded (#88)

Shan He7410cfa59f86
diff --git a/src/components/side-panel/layer-manager.js b/src/components/side-panel/layer-manager.js
index 85f01135c..83583f5ca 100644
--- a/src/components/side-panel/layer-manager.js
+++ b/src/components/side-panel/layer-manager.js
@@ -165,7 +165,8 @@ function LayerManagerFactory(AddDataButton, LayerPanel, SourceDataCatalog) {
return {
id: key,
label: layer.name,
- icon: layer.layerIcon
+ icon: layer.layerIcon,
+ requireData: layer.requireData
};
})
);
diff --git a/src/components/side-panel/layer-panel/layer-column-config.js b/src/components/side-panel/layer-panel/layer-column-config.js
index 01d579a5c..e02287c7a 100644
--- a/src/components/side-panel/layer-panel/layer-column-config.js
+++ b/src/components/side-panel/layer-panel/layer-column-config.js
@@ -52,7 +52,7 @@ function LayerColumnConfigFactory(ColumnSelector) {
this.columnPairs,
this.fieldPairs,
(columnPairs, fieldPairs) =>
- columnPairs
+ columnPairs && fieldPairs
? fieldPairs.map(fp => ({
name: fp.defaultName,
type: 'point',
diff --git a/src/components/side-panel/layer-panel/layer-configurator.js b/src/components/side-panel/layer-panel/layer-configurator.js
index c4186f685..952f444ae 100644
--- a/src/components/side-panel/layer-panel/layer-configurator.js
+++ b/src/components/side-panel/layer-panel/layer-configurator.js
@@ -911,6 +911,7 @@ export default function LayerConfiguratorFactory(
) : null}
<LayerConfigGroup label={'layer.basic'} collapsible expanded={!layer.hasAllColumns()}>
<LayerTypeSelector
+ datasets={datasets}
layer={layer}
layerTypeOptions={layerTypeOptions}
onSelect={updateLayerType}
diff --git a/src/components/side-panel/layer-panel/layer-type-selector.js b/src/components/side-panel/layer-panel/layer-type-selector.js
index aff5971b4..712b46aab 100644
--- a/src/components/side-panel/layer-panel/layer-type-selector.js
+++ b/src/components/side-panel/layer-panel/layer-type-selector.js
@@ -18,7 +18,7 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-import React from 'react';
+import React, {useMemo} from 'react';
import PropTypes from 'prop-types';
import classNames from 'classnames';
import styled, {withTheme} from 'styled-components';
@@ -39,6 +39,11 @@ const StyledDropdownListItem = styled.div`
padding-bottom: ${props => props.theme.layerTypeIconPdL}px;
padding-right: ${props => props.theme.layerTypeIconPdL}px;
+ &.disabled {
+ pointer-events: none;
+ opacity: 0.3;
+ }
+
&.selected {
.layer-type-selector__item__icon {
border: 1px solid #caf2f4;
@@ -98,7 +103,11 @@ const DropdownListWrapper = styled.div`
`;
const LayerTypeListItem = ({value, isTile}) => (
- <StyledListItem className={classNames('layer-type-selector__item__inner', {list: !isTile})}>
+ <StyledListItem
+ className={classNames('layer-type-selector__item__inner', {
+ list: !isTile
+ })}
+ >
<div className="layer-type-selector__item__icon">
<value.icon height={`${isTile ? ITEM_SIZE.large : ITEM_SIZE.small}px`} />
</div>
@@ -117,7 +126,8 @@ const LayerTypeDropdownList = props => (
<StyledDropdownListItem
className={classNames('layer-type-selector__item', {
selected: props.selectedItems.find(it => it.id === value.id),
- hover: props.selectionIndex === i
+ hover: props.selectionIndex === i,
+ disabled: value.disabled
})}
key={`${value.id}_${i}`}
onMouseDown={e => {
@@ -141,29 +151,39 @@ const propTypes = {
};
const StyledLayerTypeSelector = styled.div`
- // override item-selector dropdown padding
.item-selector .item-selector__dropdown {
padding: 4px 10px 4px 2px;
}
`;
-const LayerTypeSelector = ({layer, layerTypeOptions, onSelect, theme}) => (
- <SidePanelSection>
- <StyledLayerTypeSelector className="layer-config__type">
- <ItemSelector
- selectedItems={layerTypeOptions.find(op => op.id === layer.type)}
- options={layerTypeOptions}
- multiSelect={false}
- placeholder="placeholder.selectType"
- onChange={onSelect}
- getOptionValue={op => op.id}
- filterOption="label"
- displayOption={op => op.label}
- DropDownLineItemRenderComponent={LayerTypeListItem}
- DropDownRenderComponent={LayerTypeDropdownList}
- />
- </StyledLayerTypeSelector>
- </SidePanelSection>
-);
+const LayerTypeSelector = ({layer, layerTypeOptions, onSelect, datasets}) => {
+ const hasData = Boolean(Object.keys(datasets).length);
+ const typeOptions = useMemo(
+ () =>
+ layerTypeOptions.map(op => ({
+ ...op,
+ disabled: !hasData && op.requireData !== false
+ })),
+ [hasData, layerTypeOptions]
+ );
+ return (
+ <SidePanelSection>
+ <StyledLayerTypeSelector className="layer-config__type">
+ <ItemSelector
+ selectedItems={typeOptions.find(op => op.id === layer.type)}
+ options={typeOptions}
+ multiSelect={false}
+ placeholder="placeholder.selectType"
+ onChange={onSelect}
+ getOptionValue={op => op.id}
+ filterOption="label"
+ displayOption={op => op.label}
+ DropDownLineItemRenderComponent={LayerTypeListItem}
+ DropDownRenderComponent={LayerTypeDropdownList}
+ />
+ </StyledLayerTypeSelector>
+ </SidePanelSection>
+ );
+};
LayerTypeSelector.propTypes = propTypes;