Skip to content

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

[Enhancement] better arc layer column config layout (#1345)

Shan Hef046ac1b917d
diff --git a/src/components/side-panel/layer-panel/column-selector.js b/src/components/side-panel/layer-panel/column-selector.js
index bcde75fbb..b41466df4 100644
--- a/src/components/side-panel/layer-panel/column-selector.js
+++ b/src/components/side-panel/layer-panel/column-selector.js
@@ -32,11 +32,13 @@ const ColumnRow = styled.div`
`;
const ColumnName = styled.div`
- width: 25%;
+ width: 27%;
+ line-height: 1.2;
+ padding-right: 6px;
`;
const ColumnSelect = styled.div`
- width: 75%;
+ width: 73%;
`;
ColumnSelectorFactory.deps = [FieldSelectorFactory];
@@ -47,8 +49,8 @@ function ColumnSelectorFactory(FieldSelector) {
<ColumnName className="layer-config__column__name">
<PanelLabel>
<FormattedMessage id={`columns.${label}`} />
+ {!column.optional ? ` *` : null}
</PanelLabel>
- {!column.optional ? <PanelLabel>{` *`}</PanelLabel> : null}
</ColumnName>
<ColumnSelect className="layer-config__column__select">
<FieldSelector
diff --git a/src/utils/layer-utils.js b/src/utils/layer-utils.js
index 2f624111e..80180c984 100644
--- a/src/utils/layer-utils.js
+++ b/src/utils/layer-utils.js
@@ -87,7 +87,7 @@ export function getLayerHoverProp({
// deckgl layer to kepler-gl layer
const layer = layers[overlay.props.idx];
- if (layer.getHoverData && layersToRender[layer.id]) {
+ if (layer && layer.getHoverData && layersToRender[layer.id]) {
// if layer is visible and have hovered data
const {
config: {dataId}
diff --git a/test/node/utils/layer-utils-test.js b/test/node/utils/layer-utils-test.js
index 08c0ee7a5..9bda1ccc1 100644
--- a/test/node/utils/layer-utils-test.js
+++ b/test/node/utils/layer-utils-test.js
@@ -19,12 +19,14 @@
// THE SOFTWARE.
import test from 'tape';
-import {findDefaultLayer} from 'utils/layer-utils';
+import cloneDeep from 'lodash.clonedeep';
+
+import {findDefaultLayer, getLayerHoverProp} from 'utils/layer-utils';
import {findPointFieldPairs, createNewDataEntry} from 'utils/dataset-utils';
import {processCsvData, processGeojson} from 'processors/data-processor';
import {GEOJSON_FIELDS} from 'constants/default-settings';
import {LayerClasses, KeplerGlLayers} from 'layers';
-import {StateWTripGeojson} from 'test/helpers/mock-state';
+import {StateWTripGeojson, StateWFiles} from 'test/helpers/mock-state';
const {PointLayer, ArcLayer, GeojsonLayer, LineLayer} = KeplerGlLayers;
@@ -799,3 +801,54 @@ test('layerUtils -> findDefaultLayer: TripLayer.1 -> ts as string', t => {
);
t.end();
});
+
+test('layerUtils -> getLayerHoverProp', t => {
+ const visState = cloneDeep(StateWFiles).visState;
+ const layer = visState.layers[0];
+ const layerData = visState.layerData[0];
+ const layersToRender = {
+ [layer.id]: layer
+ };
+
+ const mockHoverInfo = {
+ object: {
+ data: layerData[0]
+ },
+ picked: true,
+ layer: {
+ props: {
+ idx: 0
+ }
+ }
+ };
+ const mockHoverInfoNotHovered = {
+ picked: false,
+ object: null
+ };
+ const args = {
+ interactionConfig: visState.interactionConfig,
+ hoverInfo: mockHoverInfo,
+ layers: visState.layers,
+ layersToRender,
+ datasets: visState.datasets
+ };
+
+ const expected = {
+ data: layerData[0],
+ fields: visState.datasets[layer.config.dataId].fields,
+ fieldsToShow: visState.interactionConfig.tooltip.config.fieldsToShow[layer.config.dataId],
+ layer
+ };
+
+ t.deepEqual(getLayerHoverProp(args), expected, 'should get correct layerHoverProp');
+
+ args.hoverInfo = mockHoverInfoNotHovered;
+ t.deepEqual(getLayerHoverProp(args), null, 'should get correct layerHoverProp');
+
+ visState.interactionConfig.tooltip.enabled = false;
+ args.hoverInfo = mockHoverInfo;
+
+ t.deepEqual(getLayerHoverProp(args), null, 'should get correct layerHoverProp');
+
+ t.end();
+});