Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix gatsby-plugin-nprogress default options param #3533

Merged
merged 5 commits into from
Jan 15, 2018
Merged

Fix gatsby-plugin-nprogress default options param #3533

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7e48daa
Fix default `pluginOptions` parameter
Jan 15, 2018
a09d904
Indent `styles` template string correctly
Jan 15, 2018
0b8c1ad
Merge branch 'master' into fix/nprogress-default-options-param
Jan 15, 2018
ed3969b
Merge branch 'master' into fix/nprogress-default-options-param
KyleAMathews Jan 15, 2018
a07893d
Change default
KyleAMathews Jan 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
130 changes: 68 additions & 62 deletions packages/gatsby-plugin-nprogress/src/gatsby-browser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,81 +1,87 @@
import NProgress from "nprogress"

exports.onClientEntry = (a, pluginOptions = { color: `#29d` }) => {
const defaultOptions = { color: `#29d` }

exports.onClientEntry = (a, pluginOptions = {}) => {
// Merge default options with user defined options in `gatsby-config.js`
const options = { ...defaultOptions, ...pluginOptions }

window.___emitter.on(`onDelayedLoadPageResources`, () => {
NProgress.configure(pluginOptions)
NProgress.configure(options)
NProgress.start()
})
window.___emitter.on(`onPostLoadPageResources`, () => {
NProgress.done()
})

// Inject styles.
const styles = `#nprogress {
pointer-events: none;
}
#nprogress .bar {
background: ${pluginOptions.color};
position: fixed;
z-index: 1031;
top: 0;
left: 0;
width: 100%;
height: 2px;
}
#nprogress .peg {
display: block;
position: absolute;
right: 0px;
width: 100px;
height: 100%;
box-shadow: 0 0 10px ${pluginOptions.color}, 0 0 5px ${pluginOptions.color};
opacity: 1.0;
-webkit-transform: rotate(3deg) translate(0px, -4px);
-ms-transform: rotate(3deg) translate(0px, -4px);
transform: rotate(3deg) translate(0px, -4px);
}
#nprogress .spinner {
display: block;
position: fixed;
z-index: 1031;
top: 15px;
right: 15px;
}
#nprogress .spinner-icon {
width: 18px;
height: 18px;
box-sizing: border-box;
border: solid 2px transparent;
border-top-color: ${pluginOptions.color};
border-left-color: ${pluginOptions.color};
border-radius: 50%;
-webkit-animation: nprogress-spinner 400ms linear infinite;
animation: nprogress-spinner 400ms linear infinite;
}
.nprogress-custom-parent {
overflow: hidden;
position: relative;
}
.nprogress-custom-parent #nprogress .spinner,
.nprogress-custom-parent #nprogress .bar {
position: absolute;
}
@-webkit-keyframes nprogress-spinner {
0% {
-webkit-transform: rotate(0deg);
const styles = `
#nprogress {
pointer-events: none;
}
100% {
#nprogress .bar {
background: ${options.color};
position: fixed;
z-index: 1031;
top: 0;
left: 0;
width: 100%;
height: 2px;
}
#nprogress .peg {
display: block;
position: absolute;
right: 0px;
width: 100px;
height: 100%;
box-shadow: 0 0 10px ${options.color}, 0 0 5px ${options.color};
opacity: 1.0;
-webkit-transform: rotate(3deg) translate(0px, -4px);
-ms-transform: rotate(3deg) translate(0px, -4px);
transform: rotate(3deg) translate(0px, -4px);
}
#nprogress .spinner {
display: block;
position: fixed;
z-index: 1031;
top: 15px;
right: 15px;
}
#nprogress .spinner-icon {
width: 18px;
height: 18px;
box-sizing: border-box;
border: solid 2px transparent;
border-top-color: ${options.color};
border-left-color: ${options.color};
border-radius: 50%;
-webkit-animation: nprogress-spinner 400ms linear infinite;
animation: nprogress-spinner 400ms linear infinite;
}
.nprogress-custom-parent {
overflow: hidden;
position: relative;
}
.nprogress-custom-parent #nprogress .spinner,
.nprogress-custom-parent #nprogress .bar {
position: absolute;
}
@-webkit-keyframes nprogress-spinner {
0% {
-webkit-transform: rotate(0deg);
}
100% {
-webkit-transform: rotate(360deg);
}
}
}
@keyframes nprogress-spinner {
0% {
@keyframes nprogress-spinner {
0% {
transform: rotate(0deg);
}
100% {
}
100% {
transform: rotate(360deg);
}
}
}
`

const node = document.createElement(`style`)
Expand Down