Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
scratch-www
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
xpstem
scratch-www
Commits
bc43ad7e
Commit
bc43ad7e
authored
Jul 12, 2021
by
Paul Kaplan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(annual-report): dynamically load the world map when it is scrolled to
parent
8e4ee5fb
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
54 additions
and
48 deletions
+54
-48
src/components/world-map/world-map.jsx
src/components/world-map/world-map.jsx
+7
-9
src/views/annual-report/annual-report.jsx
src/views/annual-report/annual-report.jsx
+47
-39
No files found.
src/components/world-map/world-map.jsx
View file @
bc43ad7e
const
Plotly
=
require
(
'
plotly.js/lib/core
'
);
import
React
from
'
react
'
;
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
([
Plotly
.
register
([
choropleth
]);
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
...
@@ -86,4 +84,4 @@ WorldMap.propTypes = {
...
@@ -86,4 +84,4 @@ WorldMap.propTypes = {
countryNames
:
PropTypes
.
arrayOf
(
PropTypes
.
string
)
countryNames
:
PropTypes
.
arrayOf
(
PropTypes
.
string
)
};
};
module
.
exports
=
WorldMap
;
export
default
WorldMap
;
src/views/annual-report/annual-report.jsx
View file @
bc43ad7e
...
@@ -15,7 +15,6 @@ const Grid = require('../../components/grid/grid.jsx');
...
@@ -15,7 +15,6 @@ 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
'
);
...
@@ -23,6 +22,11 @@ const BLMProjects = require('./blm-projects.json');
...
@@ -23,6 +22,11 @@ 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
...
@@ -831,6 +835,8 @@ class AnnualReport extends React.Component {
...
@@ -831,6 +835,8 @@ class AnnualReport extends React.Component {
</
div
>
</
div
>
</
div
>
</
div
>
<
div
className=
"map-wrapper"
>
<
div
className=
"map-wrapper"
>
{
this
.
state
.
currentlyVisible
===
SECTIONS
.
reach
&&
<
React
.
Suspense
fallback=
{
null
}
>
<
MediaQuery
minWidth=
{
frameless
.
desktop
}
>
<
MediaQuery
minWidth=
{
frameless
.
desktop
}
>
<
WorldMap
<
WorldMap
className=
"map"
className=
"map"
...
@@ -869,6 +875,8 @@ class AnnualReport extends React.Component {
...
@@ -869,6 +875,8 @@ class AnnualReport extends React.Component {
countryNames=
{
countryNames
}
countryNames=
{
countryNames
}
/>
/>
</
MediaQuery
>
</
MediaQuery
>
</
React
.
Suspense
>
}
</
div
>
</
div
>
</
div
>
</
div
>
</
div
>
</
div
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment