Skip to content

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

[BUG] Fix crash after layer type change (UN-2007) (#298) (#1912)

Igor Dykhta77dc25604aa0
diff --git a/src/reducers/vis-state-updaters.ts b/src/reducers/vis-state-updaters.ts
index 4b67f27a2..1894a3f46 100644
--- a/src/reducers/vis-state-updaters.ts
+++ b/src/reducers/vis-state-updaters.ts
@@ -785,8 +785,16 @@ export function layerTypeChangeUpdater<S extends VisState>(
newLayer.updateLayerDomain(state.datasets);
}
- const {layerData, layer} = calculateLayerData(newLayer, state);
- let newState = updateStateWithLayerAndData(state, {layerData, layer, idx});
+ const {clicked, hoverInfo} = state;
+
+ let newState = {
+ ...state,
+ clicked: oldLayer.isLayerHovered(clicked) ? undefined : clicked,
+ hoverInfo: oldLayer.isLayerHovered(hoverInfo) ? undefined : hoverInfo
+ };
+
+ const {layerData, layer} = calculateLayerData(newLayer, newState);
+ newState = updateStateWithLayerAndData(newState, {layerData, layer, idx});
if (layer.config.animation.enabled || oldLayer.config.animation.enabled) {
newState = updateAnimationDomain(newState);
diff --git a/test/node/reducers/vis-state-test.js b/test/node/reducers/vis-state-test.js
index f6c6699d8..3f47f1d4a 100644
--- a/test/node/reducers/vis-state-test.js
+++ b/test/node/reducers/vis-state-test.js
@@ -321,6 +321,14 @@ test('#visStateReducer -> LAYER_TYPE_CHANGE.1', t => {
layers: [{id: 'existing_layer'}, layer],
layerData: [[{data: [1, 2, 3]}, {data: [4, 5, 6]}]],
layerOrder: [1, 0],
+ hoverInfo: {
+ layer: {props: {id: 'more_layer'}},
+ picked: true
+ },
+ clicked: {
+ layer: {props: {id: 'more_layer'}},
+ picked: true
+ },
splitMaps: [
{
layers: {
@@ -364,6 +372,9 @@ test('#visStateReducer -> LAYER_TYPE_CHANGE.1', t => {
'should add newId to SplitMaps, and replace old id'
);
+ t.ok(!nextState.clicked, 'should reset clicked');
+ t.ok(!nextState.hoverInfo, 'should reset hoverInfo');
+
t.end();
});