allow jsx in error component (#516)

kununu · Apr 29, 2019 · c5fd2fb · c5fd2fb
1 parent d048bda
commit c5fd2fb
Show file tree

Hide file tree

Showing 14 changed files with 136 additions and 130 deletions.
diff --git a/docs/iframe.html b/docs/iframe.html
@@ -57,4 +57,4 @@
     console.warn('unable to connect to parent frame for connecting dev tools');
   }</script></head><body><div class="sb-nopreview sb-wrapper"><div class="sb-nopreview_main"><h1 class="sb-nopreview_heading sb-heading">No Preview</h1><p>Sorry, but you either have no stories or none are selected somehow.</p><ul><li>Please check the storybook config.</li><li>Try reloading the page.</li></ul></div></div><div class="sb-errordisplay sb-wrapper"><div id="error-message" class="sb-heading"></div><pre class="sb-errordisplay_code">
     <code id="error-stack"></code>
-  </pre></div><div id="root"></div><script src="runtime~main.e60190c357946296b8a1.bundle.js"></script><script src="vendors~main.e60190c357946296b8a1.bundle.js"></script><script src="main.e60190c357946296b8a1.bundle.js"></script></body></html>
+  </pre></div><div id="root"></div><script src="runtime~main.c6b4ffc9f003e0bbaf95.bundle.js"></script><script src="vendors~main.c6b4ffc9f003e0bbaf95.bundle.js"></script><script src="main.c6b4ffc9f003e0bbaf95.bundle.js"></script></body></html>
diff --git a/docs/index.html b/docs/index.html
@@ -80,4 +80,4 @@
       c1.2,1.5,0.7,3.5,0.7,3.5c-0.7,2.9,1,4.3,2.3,4.9l0.3-0.3c1-0.8,2-1,2.7-1c-2.7-3.4-4.7-7.7,0.5-13c1.5-1.5,3.3-2.2,5.1-2.2
       c0.2-0.5,1.1-2.4,3.7-3.5c0,0,1.5,0.8,2.4,5.2c1.4,0.8,2.7,1.8,3.9,2.9c1.2,1.2,2.2,2.5,2.9,3.9c4.4,0.8,5.2,2.3,5.2,2.3
       c-1.2,2.6-3,3.6-3.5,3.7c-0.1,1.9-0.8,3.6-2.3,5.1c-5.2,5.2-9.6,3.2-13,0.5c0.1,0.9-0.3,2.2-1.6,3.5l-3.7,3.7
-      c-0.2,0.2-0.1,0.5-0.1,0.9l0.4,0.9L-135,297v-80H-215z"/></g></svg></a><script>document.title = 'Nukleus';</script></head><body><div id="root"></div><script src="./sb_dll/storybook_ui_dll.js"></script><script src="runtime~main.6ac4c33d73ae9704bbb9.bundle.js"></script><script src="vendors~main.6d0120097b08675c2d15.bundle.js"></script><script src="main.63a98c5aef6a878d23a7.bundle.js"></script></body></html>
+      c-0.2,0.2-0.1,0.5-0.1,0.9l0.4,0.9L-135,297v-80H-215z"/></g></svg></a><script>document.title = 'Nukleus';</script></head><body><div id="root"></div><script src="./sb_dll/storybook_ui_dll.js"></script><script src="runtime~main.6ac4c33d73ae9704bbb9.bundle.js"></script><script src="vendors~main.313a5565c870676eef3b.bundle.js"></script><script src="main.63a98c5aef6a878d23a7.bundle.js"></script></body></html>
diff --git a/docs/main.c6b4ffc9f003e0bbaf95.bundle.js b/docs/main.c6b4ffc9f003e0bbaf95.bundle.js
diff --git a/docs/main.c6b4ffc9f003e0bbaf95.bundle.js.map b/docs/main.c6b4ffc9f003e0bbaf95.bundle.js.map
diff --git a/docs/main.e60190c357946296b8a1.bundle.js b/docs/main.e60190c357946296b8a1.bundle.js
diff --git a/docs/main.e60190c357946296b8a1.bundle.js.map b/docs/main.e60190c357946296b8a1.bundle.js.map
diff --git a/...ntime~main.e60190c357946296b8a1.bundle.js → ...ntime~main.c6b4ffc9f003e0bbaf95.bundle.js b/...ntime~main.e60190c357946296b8a1.bundle.js → ...ntime~main.c6b4ffc9f003e0bbaf95.bundle.js
diff --git a/...e~main.e60190c357946296b8a1.bundle.js.map → ...e~main.c6b4ffc9f003e0bbaf95.bundle.js.map b/...e~main.e60190c357946296b8a1.bundle.js.map → ...e~main.c6b4ffc9f003e0bbaf95.bundle.js.map
diff --git a/docs/vendors~main.313a5565c870676eef3b.bundle.js b/docs/vendors~main.313a5565c870676eef3b.bundle.js
diff --git a/docs/vendors~main.6d0120097b08675c2d15.bundle.js b/docs/vendors~main.6d0120097b08675c2d15.bundle.js
diff --git a/...ndors~main.e60190c357946296b8a1.bundle.js → ...ndors~main.c6b4ffc9f003e0bbaf95.bundle.js b/...ndors~main.e60190c357946296b8a1.bundle.js → ...ndors~main.c6b4ffc9f003e0bbaf95.bundle.js
diff --git a/...s~main.e60190c357946296b8a1.bundle.js.map → ...s~main.c6b4ffc9f003e0bbaf95.bundle.js.map b/...s~main.e60190c357946296b8a1.bundle.js.map → ...s~main.c6b4ffc9f003e0bbaf95.bundle.js.map
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nukleus",
-  "version": "14.2.1",
+  "version": "14.2.2",
   "description": "Shared components repo for kununu projects",
   "main": "dist/components/index.js",
   "repository": {

diff --git a/src/components/Error/index.jsx b/src/components/Error/index.jsx
@@ -15,8 +15,14 @@ const Error = ({info, subInfo, id}) => (
 
 
 Error.propTypes = {
-  info: PropTypes.string.isRequired,
-  subInfo: PropTypes.string,
+  info: PropTypes.oneOfType([
+    PropTypes.string,
+    PropTypes.element,
+  ]).isRequired,
+  subInfo: PropTypes.oneOfType([
+    PropTypes.string,
+    PropTypes.element,
+  ]),
   id: PropTypes.string,
 };