diff --git a/src/components/Map.jsx b/src/components/Map.jsx index f4a22d1..f2fe486 100644 --- a/src/components/Map.jsx +++ b/src/components/Map.jsx @@ -15,6 +15,7 @@ import Clusters from './presentational/Map/Clusters.jsx' import SelectedEvents from './presentational/Map/SelectedEvents.jsx' import Narratives from './presentational/Map/Narratives' import DefsMarkers from './presentational/Map/DefsMarkers.jsx' +import LoadingOverlay from '../components/Overlay/Loading' import { mapClustersToLocations, isIdentical } from '../common/utilities' @@ -335,7 +336,7 @@ class Map extends React.Component { } render () { - const { isShowingSites } = this.props.app.flags + const { isShowingSites, isFetchingDomain } = this.props.app.flags const classes = this.props.app.narrative ? 'map-wrapper narrative-mode' : 'map-wrapper' const innerMap = this.map ? ( @@ -356,6 +357,11 @@ class Map extends React.Component { tabIndex='0' >
+ {innerMap}
) @@ -376,6 +382,8 @@ function mapStateToProps (state) { selected: selectors.selectSelected(state), highlighted: state.app.highlighted, map: state.app.map, + language: state.app.language, + loading: state.app.loading, narrative: state.app.associations.narrative, flags: { isShowingSites: state.app.flags.isShowingSites, diff --git a/src/components/Overlay/Loading.js b/src/components/Overlay/Loading.js index 37bd110..c678add 100644 --- a/src/components/Overlay/Loading.js +++ b/src/components/Overlay/Loading.js @@ -4,7 +4,6 @@ import copy from '../../common/data/copy.json' const LoadingOverlay = ({ isLoading, language }) => { let classes = 'loading-overlay' classes += (!isLoading) ? ' hidden' : '' - return (