Skip to content

add error handle #276

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

add error handle #276

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
467aa16
add err handle
Grewer Mar 9, 2019
1e2cfc4
to pass lint
Grewer Mar 9, 2019
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
20 changes: 13 additions & 7 deletions src/Lightbox.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ class Lightbox extends Component {
this.theme = deepMerge(defaultTheme, props.theme);
this.classes = StyleSheet.create(deepMerge(defaultStyles, this.theme));
this.state = { imageLoaded: false };
this.images = this.props.images;

bindFunctions.call(this, [
'gotoNext',
Expand Down Expand Up @@ -84,9 +85,9 @@ class Lightbox extends Component {
}
}

// preload current image
// preload current image
if (this.props.currentImage !== nextProps.currentImage || !this.props.isOpen && nextProps.isOpen) {
const img = this.preloadImageData(nextProps.images[nextProps.currentImage], this.handleImageLoaded);
const img = this.preloadImageData(nextProps.images[nextProps.currentImage], this.handleImageLoaded, nextProps.currentImage);
if (img) this.setState({ imageLoaded: img.complete });
}

Expand All @@ -109,15 +110,21 @@ class Lightbox extends Component {
// ==============================

preloadImage (idx, onload) {
return this.preloadImageData(this.props.images[idx], onload);
return this.preloadImageData(this.props.images[idx], onload, idx);
}
preloadImageData (data, onload) {

loadError (e, id) {
// {src: this.props.errorImage,thumbnail:'',srcSet:[]} is can merge to this.props.errorImage
const _image = Object.assign({}, this.images[id], { src: this.props.errorImage, thumbnail: '', srcSet: [] });
this.images.splice(id, 1, _image);
}

preloadImageData (data, onload, idx) {
if (!data) return;
const img = new Image();
const sourceSet = normalizeSourceSet(data);

// TODO: add error handling for missing images
img.onerror = onload;
img.onerror = e => this.loadError(e, idx);
img.onload = onload;
img.src = data.src;

Expand Down Expand Up @@ -255,7 +262,6 @@ class Lightbox extends Component {
const { imageLoaded } = this.state;

if (!images || !images.length) return null;

const image = images[currentImage];
const sourceSet = normalizeSourceSet(image);
const sizes = sourceSet ? '100vw' : null;
Expand Down