Skip to content

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

[Fix] Auto-display legend in split mode + Fix legend and layer panel bugs (#2190)

Igor Dykhtaa246574efe88
diff --git a/src/components/src/common/checkbox.tsx b/src/components/src/common/checkbox.tsx
index bf89ca65a..97b32c4f9 100644
--- a/src/components/src/common/checkbox.tsx
+++ b/src/components/src/common/checkbox.tsx
@@ -43,7 +43,7 @@ const StyledRadiuInput = styled.label<StyledSwitchInputProps>`
const HiddenInput = styled.input`
position: absolute;
- display: none;
+ opacity: 0;
`;
interface StyledCheckboxProps {
diff --git a/src/components/src/common/data-table/grid.tsx b/src/components/src/common/data-table/grid.tsx
index 52bb3bba7..43d391186 100644
--- a/src/components/src/common/data-table/grid.tsx
+++ b/src/components/src/common/data-table/grid.tsx
@@ -25,6 +25,29 @@ import isEqual from 'lodash.isequal';
export default class GridHack extends PureComponent<GridProps> {
grid: Grid | null = null;
+ componentDidUpdate(preProps) {
+ /*
+ * This hack exists because in react-virtualized the
+ * _columnWidthGetter is only called in the constructor
+ * even though it is reassigned with new props resulting in
+ * a new width for cells not being calculated so we must
+ * force trigger a resize.
+ *
+ * https://github.com/bvaughn/react-virtualized/blob/master/source/Grid/Grid.js#L322
+ *
+ */
+ if (!isEqual(preProps.cellSizeCache, this.props.cellSizeCache)) {
+ this.grid?.recomputeGridSize();
+ }
+ }
+
+ componentWillUnmount() {
+ //@ts-expect-error _scrollingContainer not typed in Grid
+ this.grid?._scrollingContainer?.removeEventListener('wheel', this._preventScrollBack, {
+ passive: false
+ });
+ }
+
_preventScrollBack = e => {
const {scrollLeft} = this.props;
if (scrollLeft !== undefined && scrollLeft <= 0 && e.deltaX < 0) {
@@ -50,28 +73,6 @@ export default class GridHack extends PureComponent<GridProps> {
});
}
};
- componentWillUnmount() {
- //@ts-expect-error _scrollingContainer not typed in Grid
- this.grid?._scrollingContainer?.removeEventListener('wheel', this._preventScrollBack, {
- passive: false
- });
- }
-
- componentDidUpdate(preProps) {
- /*
- * This hack exists because in react-virtualized the
- * _columnWidthGetter is only called in the constructor
- * even though it is reassigned with new props resulting in
- * a new width for cells not being calculated so we must
- * force trigger a resize.
- *
- * https://github.com/bvaughn/react-virtualized/blob/master/source/Grid/Grid.js#L322
- *
- */
- if (!isEqual(preProps.cellSizeCache, this.props.cellSizeCache)) {
- this.grid?.recomputeGridSize();
- }
- }
render() {
const {setGridRef, ...rest} = this.props;
diff --git a/src/reducers/src/combined-updaters.ts b/src/reducers/src/combined-updaters.ts
index 6081426fa..9b2febf1c 100644
--- a/src/reducers/src/combined-updaters.ts
+++ b/src/reducers/src/combined-updaters.ts
@@ -20,14 +20,20 @@
import {
toggleModalUpdater,
- loadFilesSuccessUpdater as uiStateLoadFilesSuccessUpdater
+ loadFilesSuccessUpdater as uiStateLoadFilesSuccessUpdater,
+ toggleMapControlUpdater,
+ toggleSplitMapUpdater as uiStateToggleSplitMapUpdater
} from './ui-state-updaters';
import {
updateVisDataUpdater as visStateUpdateVisDataUpdater,
setMapInfoUpdater,
- layerTypeChangeUpdater
+ layerTypeChangeUpdater,
+ toggleSplitMapUpdater as visStateToggleSplitMapUpdater
} from './vis-state-updaters';
-import {receiveMapConfigUpdater as stateMapConfigUpdater} from './map-state-updaters';
+import {
+ receiveMapConfigUpdater as stateMapConfigUpdater,
+ toggleSplitMapUpdater as mapStateToggleSplitMapUpdater
+} from './map-state-updaters';
import {
mapStyleChangeUpdater,
receiveMapConfigUpdater as styleMapConfigUpdater
@@ -40,7 +46,8 @@ import {ProviderState} from './provider-state-updaters';
import {
loadFilesSuccessUpdaterAction,
MapStyleChangeUpdaterAction,
- LayerTypeChangeUpdaterAction
+ LayerTypeChangeUpdaterAction,
+ ToggleSplitMapUpdaterAction
} from '@kepler.gl/actions';
import {VisState} from '@kepler.gl/schemas';
import {Layer} from '@kepler.gl/layers';
@@ -345,3 +352,28 @@ export const combinedLayerTypeChangeUpdater = (
visState
};
};
+
+/**
+ * Make mapLegend active when toggleSplitMap action is called
+ */
+export const toggleSplitMapUpdater = (
+ state: KeplerGlState,
+ action: ToggleSplitMapUpdaterAction
+): KeplerGlState => {
+ const newState = {
+ ...state,
+ visState: visStateToggleSplitMapUpdater(state.visState, action),
+ uiState: uiStateToggleSplitMapUpdater(state.uiState),
+ mapState: mapStateToggleSplitMapUpdater(state.mapState, action)
+ };
+
+ const isSplit = newState.visState.splitMaps.length !== 0;
+ const isLegendActive = newState.uiState.mapControls?.mapLegend?.active;
+ if (isSplit && !isLegendActive) {
+ newState.uiState = toggleMapControlUpdater(newState.uiState, {
+ payload: {panelId: 'mapLegend', index: action.payload}
+ });
+ }
+
+ return newState;
+};
diff --git a/src/reducers/src/composers.ts b/src/reducers/src/composers.ts
index 6796388a3..21e692a4f 100644
--- a/src/reducers/src/composers.ts
+++ b/src/reducers/src/composers.ts
@@ -29,7 +29,8 @@ const actionHandler = {
[ActionTypes.ADD_DATA_TO_MAP]: combinedUpdaters.addDataToMapUpdater,
[ActionTypes.MAP_STYLE_CHANGE]: combinedUpdaters.combinedMapStyleChangeUpdater,
[ActionTypes.LAYER_TYPE_CHANGE]: combinedUpdaters.combinedLayerTypeChangeUpdater,
- [ActionTypes.LOAD_FILES_SUCCESS]: combinedUpdaters.loadFilesSuccessUpdater
+ [ActionTypes.LOAD_FILES_SUCCESS]: combinedUpdaters.loadFilesSuccessUpdater,
+ [ActionTypes.TOGGLE_SPLIT_MAP]: combinedUpdaters.toggleSplitMapUpdater
};
export default actionHandler;
diff --git a/src/reducers/src/ui-state-updaters.ts b/src/reducers/src/ui-state-updaters.ts
index 05e16adbd..e957cf5d1 100644
--- a/src/reducers/src/ui-state-updaters.ts
+++ b/src/reducers/src/ui-state-updaters.ts
@@ -381,13 +381,7 @@ export const toggleMapControlUpdater = (
...state.mapControls,
[panelId]: {
...state.mapControls[panelId],
- // this handles split map interaction
- // Toggling from within the same map will simply toggle the active property
- // Toggling from within different maps we set the active property to true
- active:
- index === state.mapControls[panelId].activeMapIndex
- ? !state.mapControls[panelId].active
- : true,
+ active: !state.mapControls[panelId].active,
activeMapIndex: index
}
}
diff --git a/test/browser/components/map/map-control-test.js b/test/browser/components/map/map-control-test.js
index ff0dc5336..fdb58b77d 100644
--- a/test/browser/components/map/map-control-test.js
+++ b/test/browser/components/map/map-control-test.js
@@ -86,7 +86,8 @@ test('MapControlFactory - display options', t => {
children: <MapContainer {...propsWithSplitMap} />
});
- t.equal(wrapper.find(MapControlButton).length, 6, 'Should show 6 MapControlButton');
+ // 5 control buttons as legend is opened automatically in split map mode
+ t.equal(wrapper.find(MapControlButton).length, 5, 'Should show 5 MapControlButton');
t.equal(wrapper.find(Split).length, 0, 'Should show 0 split map split button');
t.equal(wrapper.find(Delete).length, 1, 'Should show 1 split map delete button');
t.equal(wrapper.find(Layers).length, 1, 'Should show 1 Layer button');
@@ -121,9 +122,10 @@ test('MapControlFactory - click options', t => {
toggleMapControl: onToggleMapControl,
setLocale: onSetLocale
};
+ let updateState = keplerGlReducerCore(StateWSplitMaps, toggleMapControl('mapLegend', 0));
const mapContainerProps = mapFieldsSelector(
mockKeplerPropsWithState({
- state: StateWSplitMaps,
+ state: updateState,
visStateActions,
mapStateActions,
uiStateActions
@@ -140,7 +142,7 @@ test('MapControlFactory - click options', t => {
}, 'MapContainer should not fail without props');
// layer selector is not active
- t.equal(wrapper.find(MapControlButton).length, 6, 'Should show 5 MapControlButton');
+ t.equal(wrapper.find(MapControlButton).length, 6, 'Should show 6 MapControlButton');
t.equal(wrapper.find(Delete).length, 1, 'Should show 1 delete split map button');
// click split Map
diff --git a/test/node/reducers/root-test.js b/test/node/reducers/root-test.js
index 28a0c0929..c9c0b5253 100644
--- a/test/node/reducers/root-test.js
+++ b/test/node/reducers/root-test.js
@@ -251,6 +251,8 @@ test('keplerGlReducer - splitMap and mapControl interaction', t => {
t.equal(state.test.mapState.isSplit, true, 'Should have split map');
+ t.equal(state.test.uiState.mapControls.mapLegend.active, true, 'Should open map legend');
+
state = keplerGlReducer(state, toggleMapControl('mapDraw', 1));
t.equal(