Skip to content

GitLab

S
scratch-www
Commit 81ff3d62 authored by rschamp's avatar rschamp
Browse files
Options

Revert "feat(annual-report): dynamically load the world map when it is scrolled to" 

This reverts commit bc43ad7e.
parent bc43ad7e
Hide whitespace changes
Inline Side-by-side
Showing with 48 additions and 54 deletions
src/components/world-map/world-map.jsx
View file @ 81ff3d62
import React from 'react'; const Plotly = require('plotly.js/lib/core');
import PropTypes from 'prop-types';
import Plotly from 'plotly.js/lib/core';
import choropleth from 'plotly.js/lib/choropleth';
import createPlotlyComponent from 'react-plotly.js/factory';
// Load in the trace type for choropleth // Load in the trace type for choropleth
Plotly.register([choropleth]); Plotly.register([
require('plotly.js/lib/choropleth')
]);
// create plotly bundle that only has choropleth plots // create plotly bundle that only has choropleth plots
import createPlotlyComponent from 'react-plotly.js/factory';
const Plot = createPlotlyComponent(Plotly); const Plot = createPlotlyComponent(Plotly);
const React = require('react');
const PropTypes = require('prop-types');
const WorldMap = props => ( const WorldMap = props => (
<Plot <Plot
useResizeHandler useResizeHandler
...@@ -84,4 +86,4 @@ WorldMap.propTypes = { ...@@ -84,4 +86,4 @@ WorldMap.propTypes = {
countryNames: PropTypes.arrayOf(PropTypes.string) countryNames: PropTypes.arrayOf(PropTypes.string)
}; };
export default WorldMap; module.exports = WorldMap;
src/views/annual-report/annual-report.jsx
View file @ 81ff3d62
...@@ -15,6 +15,7 @@ const Grid = require('../../components/grid/grid.jsx'); ...@@ -15,6 +15,7 @@ const Grid = require('../../components/grid/grid.jsx');
const Button = require('../../components/forms/button.jsx'); const Button = require('../../components/forms/button.jsx');
const FlexRow = require('../../components/flex-row/flex-row.jsx'); const FlexRow = require('../../components/flex-row/flex-row.jsx');
const Comment = require('../../components/comment/comment.jsx'); const Comment = require('../../components/comment/comment.jsx');
const WorldMap = require('../../components/world-map/world-map.jsx');
const CountryUsage = require('./country-usage.json'); const CountryUsage = require('./country-usage.json');
const PeopleGrid = require('../../components/people-grid/people-grid.jsx'); const PeopleGrid = require('../../components/people-grid/people-grid.jsx');
const People = require('./people.json'); const People = require('./people.json');
...@@ -22,11 +23,6 @@ const BLMProjects = require('./blm-projects.json'); ...@@ -22,11 +23,6 @@ const BLMProjects = require('./blm-projects.json');
const VideoPreview = require('../../components/video-preview/video-preview.jsx'); const VideoPreview = require('../../components/video-preview/video-preview.jsx');
const Supporters = require('./supporters.json'); const Supporters = require('./supporters.json');
const WorldMap = React.lazy(() => import(
/* webpackChunkName: "world-map" */
'../../components/world-map/world-map.jsx'
));
require('./annual-report.scss'); require('./annual-report.scss');
// Some constants used for the page subnav and section refs // Some constants used for the page subnav and section refs
...@@ -835,48 +831,44 @@ class AnnualReport extends React.Component { ...@@ -835,48 +831,44 @@ class AnnualReport extends React.Component {
</div> </div>
</div> </div>
<div className="map-wrapper"> <div className="map-wrapper">
{this.state.currentlyVisible === SECTIONS.reach && <MediaQuery minWidth={frameless.desktop}>
<React.Suspense fallback={null}> <WorldMap
<MediaQuery minWidth={frameless.desktop}> className="map"
<WorldMap colorIndex={colorIndex}
className="map" countryData={countryData}
colorIndex={colorIndex} countryNames={countryNames}
countryData={countryData} />
countryNames={countryNames} </MediaQuery>
/> <MediaQuery
</MediaQuery> maxWidth={frameless.desktop - 1}
<MediaQuery minWidth={frameless.tabletPortrait}
maxWidth={frameless.desktop - 1} >
minWidth={frameless.tabletPortrait} <WorldMap
> className="map"
<WorldMap colorIndex={colorIndex}
className="map" countryData={countryData}
colorIndex={colorIndex} countryNames={countryNames}
countryData={countryData} />
countryNames={countryNames} </MediaQuery>
/> <MediaQuery
</MediaQuery> maxWidth={frameless.tabletPortrait - 1}
<MediaQuery minWidth={frameless.mobileIntermediate}
maxWidth={frameless.tabletPortrait - 1} >
minWidth={frameless.mobileIntermediate} <WorldMap
> className="map"
<WorldMap colorIndex={colorIndex}
className="map" countryData={countryData}
colorIndex={colorIndex} countryNames={countryNames}
countryData={countryData} />
countryNames={countryNames} </MediaQuery>
/> <MediaQuery maxWidth={frameless.mobileIntermediate - 1}>
</MediaQuery> <WorldMap
<MediaQuery maxWidth={frameless.mobileIntermediate - 1}> className="map"
<WorldMap colorIndex={colorIndex}
className="map" countryData={countryData}
colorIndex={colorIndex} countryNames={countryNames}
countryData={countryData} />
countryNames={countryNames} </MediaQuery>
/>
</MediaQuery>
</React.Suspense>
}
</div> </div>
</div> </div>
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment