fix: remove warning in development (#389)

fixes #375
SocialGouv · Dec 18, 2018 · f259f8c · f259f8c
1 parent 1e40dac
commit f259f8c
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 21 deletions.
diff --git a/packages/code-du-travail-frontend/pages/code-du-travail.js b/packages/code-du-travail-frontend/pages/code-du-travail.js
@@ -65,11 +65,9 @@ class Fiche extends React.Component {
       <Answer
         title={data._source.title}
         intro={
-          <React.Fragment>
-            <div style={{ marginBottom: 20, fontSize: "0.8em" }}>
-              <BreadCrumbs entries={getFakeBreadCrumb(data._source.path)} />
-            </div>
-          </React.Fragment>
+          <div style={{ marginBottom: 20, fontSize: "0.8em" }}>
+            <BreadCrumbs entries={getFakeBreadCrumb(data._source.path)} />
+          </div>
         }
         date={format(new Date(data._source.date_debut), "D MMMM YYYY", {
           locale: frLocale

diff --git a/packages/code-du-travail-frontend/src/common/Answer.js b/packages/code-du-travail-frontend/src/common/Answer.js
@@ -42,9 +42,9 @@ class Answer extends React.Component {
     const {
       router,
       title,
-      intro,
-      html,
-      children,
+      intro = null,
+      html = null,
+      children = null,
       footer,
       date,
       icon,
@@ -78,7 +78,7 @@ class Answer extends React.Component {
             >
               <Disclaimer />
               {intro}
-              <Html>{html}</Html>
+              {html && <Html>{html}</Html>}
               {children}
               <div
                 style={{

diff --git a/packages/code-du-travail-frontend/src/piwik.js b/packages/code-du-travail-frontend/src/piwik.js
@@ -16,6 +16,7 @@ if (typeof window !== "undefined" && PIWIK_URL && PIWIK_SITE_ID) {
     siteId: PIWIK_SITE_ID,
     trackErrors: true
   });
-
   Router.events.on("routeChangeComplete", onRouteChangeComplete);
+} else if (typeof window !== "undefined") {
+  window._paq = [];
 }
diff --git a/packages/code-du-travail-ui/doc/BreadCrumbs.mdx b/packages/code-du-travail-ui/doc/BreadCrumbs.mdx
@@ -8,6 +8,7 @@ import { BreadCrumbs } from "../src";
 ## \<BreadCrumbs/\>
 
 <Playground>
+  <BreadCrumbs />
   <BreadCrumbs
     entries={[
       <a href="/">Accueil</a>,

diff --git a/packages/code-du-travail-ui/src/Article.js b/packages/code-du-travail-ui/src/Article.js
@@ -85,7 +85,7 @@ const Article = ({
           />
         </div>
       </div>
-      <div className="article__content">{children}</div>
+      {children && <div className="article__content">{children}</div>}
     </Section>
   );
 };
@@ -94,10 +94,7 @@ Article.propTypes = {
   /** article title */
   title: PropTypes.string.isRequired,
   /** article content */
-  children: PropTypes.oneOfType([
-    PropTypes.element,
-    PropTypes.arrayOf(PropTypes.element)
-  ]).isRequired,
+  children: PropTypes.node,
   date: PropTypes.string,
   sourceType: PropTypes.string,
   icon: PropTypes.func,

diff --git a/packages/code-du-travail-ui/src/BreadCrumbs.js b/packages/code-du-travail-ui/src/BreadCrumbs.js
@@ -14,14 +14,15 @@ const BreadCrumbs = ({ entries }) => (
 );
 
 BreadCrumbs.propTypes = {
-  entries: PropTypes.arrayOf(PropTypes.element)
+  entries: PropTypes.node
 };
 
 BreadCrumbs.defaultProps = {
   entries: [
     <a key="accueil" href="/">
       Accueil
-    </a>
+    </a>,
+    "end"
   ]
 };
 

diff --git a/packages/code-du-travail-ui/src/Section.js b/packages/code-du-travail-ui/src/Section.js
@@ -22,10 +22,7 @@ const Section = ({ light, dark, style, children }) => {
 };
 
 Section.propTypes = {
-  children: PropTypes.oneOfType([
-    PropTypes.element,
-    PropTypes.arrayOf(PropTypes.element)
-  ]).isRequired,
+  children: PropTypes.node.isRequired,
   style: PropTypes.object,
   light: PropTypes.bool,
   dark: PropTypes.bool