Skip to content

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

[Bug] Avoid repeatedly calling HIDE_EXPORT_DROPDOWN (#180)

Shan He276ef49bdebe
diff --git a/src/components/side-panel/layer-panel/color-selector.js b/src/components/side-panel/layer-panel/color-selector.js
index 4911ec445..89340cbbe 100644
--- a/src/components/side-panel/layer-panel/color-selector.js
+++ b/src/components/side-panel/layer-panel/color-selector.js
@@ -83,7 +83,8 @@ class ColorSelector extends Component {
handleClickOutside = e => {
if (this.state.editing !== false) {
this.setState({editing: false});
- } };
+ }
+ };
_onSelectColor = (color, e) => {
e.stopPropagation();
diff --git a/src/components/side-panel/panel-dropdown.js b/src/components/side-panel/panel-dropdown.js
index d3b43a7e1..710e3e30b 100644
--- a/src/components/side-panel/panel-dropdown.js
+++ b/src/components/side-panel/panel-dropdown.js
@@ -23,13 +23,20 @@ import PropTypes from 'prop-types';
import {StyledPanelDropdown} from 'components/common/styled-components';
import listensToClickOutside from 'react-onclickoutside';
-class PanelDropdown extends Component {
+class ClickOutsideCloseDropdown extends Component {
static propTypes = {
- onClose: PropTypes.func
+ onClose: PropTypes.func,
+ show: PropTypes.bool
+ };
+
+ static defaultProps = {
+ show: true
};
handleClickOutside = (e) => {
- this.props.onClose(e);
+ if (typeof this.props.onClose === 'function' && this.props.show) {
+ this.props.onClose(e);
+ }
};
render() {
@@ -41,4 +48,4 @@ class PanelDropdown extends Component {
}
};
-export default listensToClickOutside(PanelDropdown);
+export default listensToClickOutside(ClickOutsideCloseDropdown);
diff --git a/src/components/side-panel/panel-header.js b/src/components/side-panel/panel-header.js
index dac410bfe..ef7f1d8f8 100644
--- a/src/components/side-panel/panel-header.js
+++ b/src/components/side-panel/panel-header.js
@@ -24,7 +24,7 @@ import PropTypes from 'prop-types';
import {Tooltip} from 'components/common/styled-components';
import KeplerGlLogo from 'components/common/logo';
import {CodeAlt, Save, Files, Share, Picture} from 'components/common/icons';
-import PanelDropdown from 'components/side-panel/panel-dropdown';
+import ClickOutsideCloseDropdown from 'components/side-panel/panel-dropdown';
const StyledPanelHeader = styled.div.attrs({
className: 'side-side-panel__header'
@@ -158,7 +158,9 @@ export const SaveExportDropdown = ({
}) => {
return (
<StyledPanelDropdown show={show} className="save-export-dropdown">
- <PanelDropdown onClose={onClose} className="save-export-dropdown__inner">
+ <ClickOutsideCloseDropdown className="save-export-dropdown__inner"
+ show={show}
+ onClose={onClose}>
<PanelItem
label="Export Image"
onClickHandler={onExportImage}
@@ -188,7 +190,7 @@ export const SaveExportDropdown = ({
icon={(<Share height="16px" />)}
/>
) : null}
- </PanelDropdown>
+ </ClickOutsideCloseDropdown>
</StyledPanelDropdown>
);
};