Kepler.gl is a powerful open source geospatial analysis tool for large-scale data sets.
[Enhancement] close modal when press escape key (#1134)
Shan He667216bd0f57
diff --git a/src/components/common/item-selector/typeahead.js b/src/components/common/item-selector/typeahead.jsindex 79e6f0d3e..2fe26d4a5 100644--- a/src/components/common/item-selector/typeahead.js+++ b/src/components/common/item-selector/typeahead.js@@ -27,9 +27,9 @@ import styled from 'styled-components';import {console as Console} from 'global/window';import Accessor from './accessor';-import KeyEvent from './keyevent';import DropdownList, {ListItem} from './dropdown-list';import {Search} from 'components/common/icons';+import KeyEvent from 'constants/keyevent';const DEFAULT_CLASS = 'typeahead';/**diff --git a/src/components/editor/editor.js b/src/components/editor/editor.jsindex ef94157b3..d5a75ba54 100644--- a/src/components/editor/editor.js+++ b/src/components/editor/editor.js@@ -34,10 +34,7 @@ import {DEFAULT_RADIUS, getStyle as getFeatureStyle} from './feature-styles';import {getStyle as getEditHandleStyle, getEditHandleShape} from './handle-style';import {EDITOR_MODES} from 'constants';import {createSelector} from 'reselect';--const DELETE_KEY_EVENT_CODE = 46;-const BACKSPACE_KEY_EVENT_CODE = 8;-const ESCAPE_KEY_EVENT_CODE = 27;+import KeyEvent from 'constants/keyevent';const StyledWrapper = styled.div`cursor: ${props => (props.editor.mode === EDITOR_MODES.EDIT ? 'pointer' : 'crosshair')};@@ -122,12 +119,12 @@ export default function EditorFactory(FeatureActionPanel) {return;}- switch (event.which) {- case DELETE_KEY_EVENT_CODE:- case BACKSPACE_KEY_EVENT_CODE:+ switch (event.keyCode) {+ case KeyEvent.DOM_VK_DELETE:+ case KeyEvent.DOM_VK_BACK_SPACE:this._onDeleteSelectedFeature();break;- case ESCAPE_KEY_EVENT_CODE:+ case KeyEvent.DOM_VK_ESCAPE:this.props.onSelect(null);break;default:diff --git a/src/components/map/map-popover.js b/src/components/map/map-popover.jsindex f1b8e0dbe..a8fc1f2cd 100644--- a/src/components/map/map-popover.js+++ b/src/components/map/map-popover.js@@ -35,7 +35,7 @@ const StyledMapPopover = styled.div`font-weight: 500;background-color: ${props => props.theme.panelBackground};color: ${props => props.theme.textColor};- z-index: 1001;+ z-index: 1000;position: absolute;overflow-x: auto;diff --git a/src/components/modal-container.js b/src/components/modal-container.jsindex 8f224e665..4dddf365e 100644--- a/src/components/modal-container.js+++ b/src/components/modal-container.js@@ -24,6 +24,7 @@ import {css} from 'styled-components';import {findDOMNode} from 'react-dom';import {createSelector} from 'reselect';import get from 'lodash.get';+import document from 'global/document';import ModalDialogFactory from './modals/modal-dialog';import KeplerGlSchema from 'schemas';@@ -58,7 +59,8 @@ import {SHARE_MAP_ID,OVERWRITE_MAP_ID} from 'constants/default-settings';-import {EXPORT_MAP_FORMATS} from '../constants/default-settings';+import {EXPORT_MAP_FORMATS} from 'constants/default-settings';+import KeyEvent from 'constants/keyevent';const DataTableModalStyle = css`top: 80px;@@ -132,6 +134,14 @@ export default function ModalContainerFactory(onSaveToStorage: PropTypes.func,cloudProviders: PropTypes.arrayOf(PropTypes.object)};++ componentDidMount = () => {+ document.addEventListener('keyup', this._onKeyUp);+ };+ componentWillUnmount() {+ document.removeEventListener('keyup', this._onKeyUp);+ }+cloudProviders = props => props.cloudProviders;providerWithStorage = createSelector(this.cloudProviders, cloudProviders =>cloudProviders.filter(p => p.hasPrivateStorage())@@ -139,6 +149,14 @@ export default function ModalContainerFactory(providerWithShare = createSelector(this.cloudProviders, cloudProviders =>cloudProviders.filter(p => p.hasSharingUrl()));++ _onKeyUp = event => {+ const keyCode = event.keyCode;+ if (keyCode === KeyEvent.DOM_VK_ESCAPE) {+ this._closeModal();+ }+ };+_closeModal = () => {this.props.uiStateActions.toggleModal(null);};diff --git a/src/components/common/item-selector/keyevent.js b/src/constants/keyevent.jssimilarity index 92%rename from src/components/common/item-selector/keyevent.jsrename to src/constants/keyevent.jsindex e8f04ceda..9600e95f0 100644--- a/src/components/common/item-selector/keyevent.js+++ b/src/constants/keyevent.js@@ -23,6 +23,7 @@ import window from 'global/window';const KeyEvent = Object.assign({}, window.KeyEvent);/* eslint-enable no-use-before-define */+// event event.keyCode is deprecated, should use event.key in the futureKeyEvent.DOM_VK_UP = KeyEvent.DOM_VK_UP || 38;KeyEvent.DOM_VK_DOWN = KeyEvent.DOM_VK_DOWN || 40;KeyEvent.DOM_VK_BACK_SPACE = KeyEvent.DOM_VK_BACK_SPACE || 8;@@ -30,5 +31,6 @@ KeyEvent.DOM_VK_RETURN = KeyEvent.DOM_VK_RETURN || 13;KeyEvent.DOM_VK_ENTER = KeyEvent.DOM_VK_ENTER || 14;KeyEvent.DOM_VK_ESCAPE = KeyEvent.DOM_VK_ESCAPE || 27;KeyEvent.DOM_VK_TAB = KeyEvent.DOM_VK_TAB || 9;+KeyEvent.DOM_VK_DELETE = KeyEvent.DOM_VK_DELETE || 46;export default KeyEvent;