From f523d821c31c79a7190633099d13eeacaa1e6e23 Mon Sep 17 00:00:00 2001 From: Roilan Date: Thu, 28 Apr 2016 11:35:20 -0400 Subject: [PATCH 1/2] allow string props for image width/height --- examples/kitchenSink.js | 2 +- src/components/Image.js | 10 ++++++++-- test/renderEmail-test.js | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/examples/kitchenSink.js b/examples/kitchenSink.js index 06e0aaa..b99cb83 100644 --- a/examples/kitchenSink.js +++ b/examples/kitchenSink.js @@ -16,7 +16,7 @@ const email = ( Generated by react-html-email - react + react diff --git a/src/components/Image.js b/src/components/Image.js index 663218d..2a7c507 100644 --- a/src/components/Image.js +++ b/src/components/Image.js @@ -17,7 +17,13 @@ export default function Image(props) { Image.propTypes = { alt: PropTypes.string.isRequired, src: PropTypes.string.isRequired, - width: PropTypes.number.isRequired, - height: PropTypes.number.isRequired, + width: PropTypes.oneOfType([ + PropTypes.string, + PropTypes.number + ]), + height: PropTypes.oneOfType([ + PropTypes.string, + PropTypes.number + ]), style: EmailPropTypes.style, } diff --git a/test/renderEmail-test.js b/test/renderEmail-test.js index 9d9d87a..139e42c 100644 --- a/test/renderEmail-test.js +++ b/test/renderEmail-test.js @@ -12,7 +12,7 @@ describe('renderEmail', () => { it('produces expected output from a kitchen sink example', () => { const actualOutput = renderEmail(kitchenSink) - const expectedOutput = 'Test Email
Hello, world!
Generated by react-html-emailreact
' + const expectedOutput = 'Test Email
Hello, world!
Generated by react-html-emailreact
' expect(actualOutput).toBe(expectedOutput) }) From 99985f157e1b968712d024ddc2d45320e08e0599 Mon Sep 17 00:00:00 2001 From: Roilan Date: Thu, 28 Apr 2016 11:40:09 -0400 Subject: [PATCH 2/2] lint --- examples/kitchenSink.js | 2 +- src/components/Image.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/kitchenSink.js b/examples/kitchenSink.js index b99cb83..cbcc0b8 100644 --- a/examples/kitchenSink.js +++ b/examples/kitchenSink.js @@ -16,7 +16,7 @@ const email = ( Generated by react-html-email - react + react diff --git a/src/components/Image.js b/src/components/Image.js index 2a7c507..f21f727 100644 --- a/src/components/Image.js +++ b/src/components/Image.js @@ -19,11 +19,11 @@ Image.propTypes = { src: PropTypes.string.isRequired, width: PropTypes.oneOfType([ PropTypes.string, - PropTypes.number + PropTypes.number, ]), height: PropTypes.oneOfType([ PropTypes.string, - PropTypes.number + PropTypes.number, ]), style: EmailPropTypes.style, }