Merge pull request #7 from berkandirim/master

berkandirim · web-flow · commit 7f7913825867 · 2019-10-14T11:07:07.000+02:00
v0.3.3
diff --git a/lib/image.js b/lib/image.js
@@ -68,8 +68,8 @@ Image.propTypes = {
   id: _propTypes.default.string,
   align: _propTypes.default.string,
   medium: _propTypes.default.string,
-  width: _propTypes.default.number,
-  height: _propTypes.default.number,
+  width: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.number]),
+  height: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.number]),
   className: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.object])
 };
 var _default = Image;
diff --git a/lib/link.js b/lib/link.js
@@ -62,7 +62,7 @@ Link.propTypes = {
   alias: _propTypes.default.string,
   name: _propTypes.default.string,
   medium: _propTypes.default.string,
-  children: _propTypes.default.oneOfType([_propTypes.default.object, _propTypes.default.func, _propTypes.default.array]),
+  children: _propTypes.default.oneOfType([_propTypes.default.object, _propTypes.default.func, _propTypes.default.array, _propTypes.default.string]),
   align: _propTypes.default.string,
   className: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.object]),
   allCaps: _propTypes.default.bool
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "htmplar",
   "description": "Developer friendly email development with React",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "repository": "https://github.com/adidas/htmplar.git",
   "author": "Bilal Çınarlı <bcinarli@gmail.com>",
   "license": "MIT",
diff --git a/src/templating/image.js b/src/templating/image.js
@@ -57,8 +57,14 @@ Image.propTypes = {
   id: PropTypes.string,
   align: PropTypes.string,
   medium: PropTypes.string,
-  width: PropTypes.number,
-  height: PropTypes.number,
+  width: PropTypes.oneOfType([
+    PropTypes.string,
+    PropTypes.number
+  ]),
+  height: PropTypes.oneOfType([
+    PropTypes.string,
+    PropTypes.number
+  ]),
   className: PropTypes.oneOfType([
     PropTypes.string,
     PropTypes.object
diff --git a/src/templating/link.js b/src/templating/link.js
@@ -54,7 +54,8 @@ Link.propTypes = {
   children: PropTypes.oneOfType([
     PropTypes.object,
     PropTypes.func,
-    PropTypes.array
+    PropTypes.array,
+    PropTypes.string
   ]),
   align: PropTypes.string,
   className: PropTypes.oneOfType([

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "htmplar",`
`3`	`3`	`"description": "Developer friendly email development with React",`
`4`		`- "version": "0.3.2",`
	`4`	`+ "version": "0.3.3",`
`5`	`5`	`"repository": "https://github.com/adidas/htmplar.git",`
`6`	`6`	`"author": "Bilal Çınarlı <bcinarli@gmail.com>",`
`7`	`7`	`"license": "MIT",`