Skip to content
This repository has been archived by the owner on Oct 22, 2023. It is now read-only.

Commit

Permalink
Smoother transition when newtab image is slow
Browse files Browse the repository at this point in the history
  • Loading branch information
Josiah Keller committed Feb 20, 2017
1 parent 6cf4f1b commit 4dac6c9
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 9 deletions.
34 changes: 28 additions & 6 deletions js/about/newtab.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ class NewTabPage extends React.Component {
this.state = {
showSiteRemovalNotification: false,
imageLoadFailed: false,
imageLoadCompleted: false,
updatedStamp: undefined,
showEmptyPage: true,
showImages: false,
Expand Down Expand Up @@ -61,6 +62,7 @@ class NewTabPage extends React.Component {
})
})
}

get showImages () {
return this.state.showImages && !!this.state.backgroundImage
}
Expand Down Expand Up @@ -227,6 +229,21 @@ class NewTabPage extends React.Component {
: this.fallbackImage
})
}
/**
* Displays background image once it loads
*/
onImageLoadCompleted () {
this.setState({
imageLoadCompleted: true
})
}
/**
* Helper for background className
*/
get backgroundClassName () {
return 'backgroundContainer' +
(this.state.imageLoadCompleted ? ' backgroundLoaded' : '')
}

render () {
// don't render if user prefers an empty page
Expand All @@ -249,12 +266,17 @@ class NewTabPage extends React.Component {
backgroundProps.style = this.state.backgroundImage.style
gradientClassName = 'bgGradient'
}
return <div className='dynamicBackground' {...backgroundProps}>
{
this.showImages
? <img src={this.state.backgroundImage.source} onError={this.onImageLoadFailed.bind(this)} data-test-id='backgroundImage' />
: null
}
return <div className='dynamicBackground'>
<div className={this.backgroundClassName} {...backgroundProps}>
{
this.showImages
? <img src={this.state.backgroundImage.source}
onLoad={this.onImageLoadCompleted.bind(this)}
onError={this.onImageLoadFailed.bind(this)}
data-test-id='backgroundImage' />
: null
}
</div>
<div className={gradientClassName} />
<div className='content'>
<main>
Expand Down
20 changes: 17 additions & 3 deletions less/about/newtab.less
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ body {
background: #fff;
}

body, .dynamicBackground, bgGradient {
bgGradient {
opacity: 0;
animation: fadeIn 200ms;
animation-fill-mode: forwards;
Expand All @@ -45,14 +45,28 @@ ul {
}

.dynamicBackground {
display: flex;
flex: 1;
background-color: #000;
}

.backgroundContainer {
background-position: top center;
background-repeat: no-repeat;
background-size: cover;
display: flex;
flex: 1;
position: absolute;
left: 0px;
top: 0px;
width: 100%;
height: 100%;
opacity: 0;
> img {
display: none;
}
&.backgroundLoaded {
animation: fadeIn 200ms;
animation-fill-mode: forwards;
}
}

.gradient {
Expand Down

0 comments on commit 4dac6c9

Please sign in to comment.