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.

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

fix(gatsby-image): fix memory leak and use more appropriate data structures for cache and listeners #10278

Merged
merged 16 commits into from
Mar 15, 2019
Merged
Prev Previous commit
Next Next commit
Revert propType changes
Alexander Nanberg committed Jan 18, 2019
commit 31579e4b3bf83c603941c1a9c12d0a9ec30fcd3d
100 changes: 50 additions & 50 deletions packages/gatsby-image/src/index.js
Original file line number Diff line number Diff line change
@@ -128,57 +128,7 @@ Img.propTypes = {
onLoad: PropTypes.func,
}

const fixedObject = PropTypes.shape({
width: PropTypes.number.isRequired,
height: PropTypes.number.isRequired,
src: PropTypes.string.isRequired,
srcSet: PropTypes.string.isRequired,
base64: PropTypes.string,
tracedSVG: PropTypes.string,
srcWebp: PropTypes.string,
srcSetWebp: PropTypes.string,
})

const fluidObject = PropTypes.shape({
aspectRatio: PropTypes.number.isRequired,
src: PropTypes.string.isRequired,
srcSet: PropTypes.string.isRequired,
sizes: PropTypes.string.isRequired,
base64: PropTypes.string,
tracedSVG: PropTypes.string,
srcWebp: PropTypes.string,
srcSetWebp: PropTypes.string,
})

class Image extends React.Component {
static propTypes = {
resolutions: fixedObject,
sizes: fluidObject,
fixed: fixedObject,
fluid: fluidObject,
fadeIn: PropTypes.bool,
title: PropTypes.string,
alt: PropTypes.string,
className: PropTypes.oneOfType([PropTypes.string, PropTypes.object]), // Support Glamor's css prop.
critical: PropTypes.bool,
style: PropTypes.object,
imgStyle: PropTypes.object,
placeholderStyle: PropTypes.object,
placeholderClassName: PropTypes.string,
backgroundColor: PropTypes.oneOfType([PropTypes.string, PropTypes.bool]),
onLoad: PropTypes.func,
onError: PropTypes.func,
onStartLoad: PropTypes.func,
Tag: PropTypes.string,
}

static defaultProps = {
critical: false,
fadeIn: true,
alt: ``,
Tag: `div`,
}

imageRef = React.createRef()

wrapperRef = React.createRef()
@@ -489,4 +439,54 @@ class Image extends React.Component {
}
}

Image.defaultProps = {
critical: false,
fadeIn: true,
alt: ``,
Tag: `div`,
}

const fixedObject = PropTypes.shape({
width: PropTypes.number.isRequired,
height: PropTypes.number.isRequired,
src: PropTypes.string.isRequired,
srcSet: PropTypes.string.isRequired,
base64: PropTypes.string,
tracedSVG: PropTypes.string,
srcWebp: PropTypes.string,
srcSetWebp: PropTypes.string,
})

const fluidObject = PropTypes.shape({
aspectRatio: PropTypes.number.isRequired,
src: PropTypes.string.isRequired,
srcSet: PropTypes.string.isRequired,
sizes: PropTypes.string.isRequired,
base64: PropTypes.string,
tracedSVG: PropTypes.string,
srcWebp: PropTypes.string,
srcSetWebp: PropTypes.string,
})

Image.propTypes = {
resolutions: fixedObject,
sizes: fluidObject,
fixed: fixedObject,
fluid: fluidObject,
fadeIn: PropTypes.bool,
title: PropTypes.string,
alt: PropTypes.string,
className: PropTypes.oneOfType([PropTypes.string, PropTypes.object]), // Support Glamor's css prop.
critical: PropTypes.bool,
style: PropTypes.object,
imgStyle: PropTypes.object,
placeholderStyle: PropTypes.object,
placeholderClassName: PropTypes.string,
backgroundColor: PropTypes.oneOfType([PropTypes.string, PropTypes.bool]),
onLoad: PropTypes.func,
onError: PropTypes.func,
onStartLoad: PropTypes.func,
Tag: PropTypes.string,
}

export default Image