From 0b271f0c8ca78c70a43923756c30fa4b10a03290 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacob=20Gro=C3=9F?= Date: Sat, 10 Feb 2018 19:01:40 +0100 Subject: [PATCH 1/3] Add alt; remove container --- lib/ImageWorker.js | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/lib/ImageWorker.js b/lib/ImageWorker.js index 743e1c9..089b0dd 100644 --- a/lib/ImageWorker.js +++ b/lib/ImageWorker.js @@ -21,7 +21,7 @@ type ImageWorkerProps = { placeholder?: string | Function, style?: Object, imageClass?: string, - containerClass?: string, + alt?: string } type ImageWorkerState = { @@ -64,12 +64,12 @@ class ImageWorker extends Component { } renderPlaceholder() { - const { placeholder, style } = this.props; + const { placeholder, style, alt } = this.props; if (typeof placeholder === 'function') { const PlaceholderComponent = wrappedComponent(placeholder); return ; } else if (typeof placeholder === 'string') { - return placeholder; + return {alt}; } else { return null; } @@ -90,16 +90,11 @@ class ImageWorker extends Component { } render() { - const { style, imageClass, containerClass } = this.props; - return ( -
- { - this.state.isLoading ? this.renderPlaceholder() : - worker - } -
- ); + const { style, imageClass, alt } = this.props; + const { isLoading, imgSrc } = this.state; + return state.isLoading ? this.renderPlaceholder() : + {alt} } } From 0cfbf922df795b10958465041141264ddb31b11f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacob=20Gro=C3=9F?= Date: Sat, 10 Feb 2018 21:26:00 +0100 Subject: [PATCH 2/3] Run eslint --fix --- lib/ImageWorker.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/ImageWorker.js b/lib/ImageWorker.js index 089b0dd..e7ef695 100644 --- a/lib/ImageWorker.js +++ b/lib/ImageWorker.js @@ -92,9 +92,9 @@ class ImageWorker extends Component { render() { const { style, imageClass, alt } = this.props; const { isLoading, imgSrc } = this.state; - return state.isLoading ? this.renderPlaceholder() : - {alt} + return isLoading ? this.renderPlaceholder() : + {alt}; } } From c3ea490c069f1e028ffe1e8509d9d5867ae1a078 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacob=20Gro=C3=9F?= Date: Sun, 11 Feb 2018 09:56:44 +0100 Subject: [PATCH 3/3] Pass props through & introduce "placeholderAlt" --- lib/ImageWorker.js | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/lib/ImageWorker.js b/lib/ImageWorker.js index e7ef695..2a0ed6d 100644 --- a/lib/ImageWorker.js +++ b/lib/ImageWorker.js @@ -20,8 +20,7 @@ type ImageWorkerProps = { src: string, placeholder?: string | Function, style?: Object, - imageClass?: string, - alt?: string + placeholderAlt?: string } type ImageWorkerState = { @@ -64,12 +63,12 @@ class ImageWorker extends Component { } renderPlaceholder() { - const { placeholder, style, alt } = this.props; + const { placeholder, style, placeholderAlt } = this.props; if (typeof placeholder === 'function') { const PlaceholderComponent = wrappedComponent(placeholder); return ; } else if (typeof placeholder === 'string') { - return {alt}; + return {placeholderAlt}; } else { return null; } @@ -90,11 +89,11 @@ class ImageWorker extends Component { } render() { - const { style, imageClass, alt } = this.props; + const { style, src, placeholderAlt, placeholder, ...props } = this.props; // eslint-disable-line no-unused-vars const { isLoading, imgSrc } = this.state; return isLoading ? this.renderPlaceholder() : {alt}; + style={{ ...style }} {...props} />; } }