From 258fe1322750e7c8823e0385ffed277b0b813127 Mon Sep 17 00:00:00 2001
From: Martin Macko <martin@github.ksp.sk>
Date: Sat, 11 Aug 2018 19:00:52 +0200
Subject: [PATCH 1/3] Fix autodetection of used components in info addon

Closes #3989
---
 addons/info/src/components/Story.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/info/src/components/Story.js b/addons/info/src/components/Story.js
index 5201f7e3eb7a..cf3bed071a79 100644
--- a/addons/info/src/components/Story.js
+++ b/addons/info/src/components/Story.js
@@ -330,8 +330,8 @@ class Story extends Component {
         innerChildren.forEach(extract);
         return;
       }
-      if (innerChildren.props && innerChildren.props.innerChildren) {
-        extract(innerChildren.props.innerChildren);
+      if (innerChildren.props && innerChildren.props.children) {
+        extract(innerChildren.props.children);
       }
       if (
         typeof innerChildren === 'string' ||

From 88d000ec6821eb9f02bfe368031f6cc6a9e6cb33 Mon Sep 17 00:00:00 2001
From: Norbert de Langen <ndelangen@me.com>
Date: Fri, 24 Aug 2018 21:22:59 +0200
Subject: [PATCH 2/3] FIX snapshots

---
 .../info/src/__snapshots__/index.test.js.snap |  98 +++++++++
 .../__snapshots__/index.stories.storyshot     |  27 +++
 .../addon-info.stories.storyshot              | 188 ++++++++++++++++++
 3 files changed, 313 insertions(+)

diff --git a/addons/info/src/__snapshots__/index.test.js.snap b/addons/info/src/__snapshots__/index.test.js.snap
index e88575b55e15..842fb68d013e 100644
--- a/addons/info/src/__snapshots__/index.test.js.snap
+++ b/addons/info/src/__snapshots__/index.test.js.snap
@@ -1250,6 +1250,55 @@ exports[`addon Info should render <Info /> and external markdown 1`] = `
                 </Styled(pre)>
               </Pre>
             </div>
+            <div>
+              <h1
+                style={
+                  Object {
+                    "borderBottom": "1px solid #EEE",
+                    "fontSize": "25px",
+                    "margin": "20px 0 0 0",
+                    "padding": "0 0 5px 0",
+                  }
+                }
+              >
+                Prop Types
+              </h1>
+              <div
+                key="TestComponent_0"
+              >
+                <h2
+                  style={
+                    Object {
+                      "margin": "20px 0 0 0",
+                    }
+                  }
+                >
+                  "
+                  TestComponent
+                  " Component
+                </h2>
+                <Component
+                  excludedPropTypes={Array []}
+                  maxPropArrayLength={3}
+                  maxPropObjectKeys={3}
+                  maxPropStringLength={50}
+                  type={[Function]}
+                >
+                  <PropTable
+                    excludedPropTypes={Array []}
+                    maxPropArrayLength={3}
+                    maxPropObjectKeys={3}
+                    maxPropStringLength={50}
+                    propDefinitions={Array []}
+                    type={[Function]}
+                  >
+                    <small>
+                      No propTypes defined!
+                    </small>
+                  </PropTable>
+                </Component>
+              </div>
+            </div>
           </div>
         </div>
       </div>
@@ -2601,6 +2650,55 @@ containing **bold**, *cursive* text, \`code\` and [a link](https://github.com)"
                 </Styled(pre)>
               </Pre>
             </div>
+            <div>
+              <h1
+                style={
+                  Object {
+                    "borderBottom": "1px solid #EEE",
+                    "fontSize": "25px",
+                    "margin": "20px 0 0 0",
+                    "padding": "0 0 5px 0",
+                  }
+                }
+              >
+                Prop Types
+              </h1>
+              <div
+                key="TestComponent_0"
+              >
+                <h2
+                  style={
+                    Object {
+                      "margin": "20px 0 0 0",
+                    }
+                  }
+                >
+                  "
+                  TestComponent
+                  " Component
+                </h2>
+                <Component
+                  excludedPropTypes={Array []}
+                  maxPropArrayLength={3}
+                  maxPropObjectKeys={3}
+                  maxPropStringLength={50}
+                  type={[Function]}
+                >
+                  <PropTable
+                    excludedPropTypes={Array []}
+                    maxPropArrayLength={3}
+                    maxPropObjectKeys={3}
+                    maxPropStringLength={50}
+                    propDefinitions={Array []}
+                    type={[Function]}
+                  >
+                    <small>
+                      No propTypes defined!
+                    </small>
+                  </PropTable>
+                </Component>
+              </div>
+            </div>
           </div>
         </div>
       </div>
diff --git a/examples/cra-kitchen-sink/src/stories/__snapshots__/index.stories.storyshot b/examples/cra-kitchen-sink/src/stories/__snapshots__/index.stories.storyshot
index d1187a7970f0..cedc3dd0594c 100644
--- a/examples/cra-kitchen-sink/src/stories/__snapshots__/index.stories.storyshot
+++ b/examples/cra-kitchen-sink/src/stories/__snapshots__/index.stories.storyshot
@@ -198,6 +198,23 @@ exports[`Storyshots Button addons composition 1`] = `
             </button>
           </pre>
         </div>
+        <div>
+          <h1
+            style="margin:20px 0 0 0;padding:0 0 5px 0;font-size:25px;border-bottom:1px solid #EEE"
+          >
+            Prop Types
+          </h1>
+          <div>
+            <h2
+              style="margin:20px 0 0 0"
+            >
+              "InfoButton" Component
+            </h2>
+            <small>
+              No propTypes defined!
+            </small>
+          </div>
+        </div>
       </div>
     </div>
   </div>
@@ -573,6 +590,16 @@ exports[`Storyshots Button with new info 1`] = `
               </tbody>
             </table>
           </div>
+          <div>
+            <h2
+              style="margin:20px 0 0 0"
+            >
+              "InfoButton" Component
+            </h2>
+            <small>
+              No propTypes defined!
+            </small>
+          </div>
         </div>
       </div>
     </div>
diff --git a/examples/official-storybook/stories/__snapshots__/addon-info.stories.storyshot b/examples/official-storybook/stories/__snapshots__/addon-info.stories.storyshot
index 79198981beb1..493cb024a8bd 100644
--- a/examples/official-storybook/stories/__snapshots__/addon-info.stories.storyshot
+++ b/examples/official-storybook/stories/__snapshots__/addon-info.stories.storyshot
@@ -423,6 +423,33 @@ exports[`Storyshots Addons|Info.GitHub issues #1814 1`] = `
             </button>
           </pre>
         </div>
+        <div>
+          <h1
+            style="margin:20px 0 0 0;padding:0 0 5px 0;font-size:25px;border-bottom:1px solid #EEE"
+          >
+            Prop Types
+          </h1>
+          <div>
+            <h2
+              style="margin:20px 0 0 0"
+            >
+              "" Component
+            </h2>
+            <small>
+              No propTypes defined!
+            </small>
+          </div>
+          <div>
+            <h2
+              style="margin:20px 0 0 0"
+            >
+              "" Component
+            </h2>
+            <small>
+              No propTypes defined!
+            </small>
+          </div>
+        </div>
       </div>
     </div>
   </div>
@@ -5019,6 +5046,167 @@ exports[`Storyshots Addons|Info.Options.propTablesExclude Exclude component from
             </button>
           </pre>
         </div>
+        <div>
+          <h1
+            style="margin:20px 0 0 0;padding:0 0 5px 0;font-size:25px;border-bottom:1px solid #EEE"
+          >
+            Prop Types
+          </h1>
+          <div>
+            <h2
+              style="margin:20px 0 0 0"
+            >
+              "BaseButton" Component
+            </h2>
+            <table
+              class="css-1uhv8nx"
+            >
+              <thead>
+                <tr>
+                  <th
+                    class="css-11b5gui"
+                  >
+                    property
+                  </th>
+                  <th
+                    class="css-11b5gui"
+                  >
+                    propType
+                  </th>
+                  <th
+                    class="css-11b5gui"
+                  >
+                    required
+                  </th>
+                  <th
+                    class="css-11b5gui"
+                  >
+                    default
+                  </th>
+                  <th
+                    class="css-11b5gui"
+                  >
+                    description
+                  </th>
+                </tr>
+              </thead>
+              <tbody>
+                <tr>
+                  <td
+                    class="css-1qcb1f7"
+                  >
+                    disabled
+                  </td>
+                  <td
+                    class="css-1qcb1f7"
+                  >
+                    <span />
+                  </td>
+                  <td
+                    class="css-11b5gui"
+                  >
+                    -
+                  </td>
+                  <td
+                    class="css-11b5gui"
+                  >
+                    <span
+                      style="color:#a11"
+                    >
+                      false
+                    </span>
+                  </td>
+                  <td
+                    class="css-11b5gui"
+                  />
+                </tr>
+                <tr>
+                  <td
+                    class="css-1qcb1f7"
+                  >
+                    label
+                  </td>
+                  <td
+                    class="css-1qcb1f7"
+                  >
+                    <span />
+                  </td>
+                  <td
+                    class="css-11b5gui"
+                  >
+                    yes
+                  </td>
+                  <td
+                    class="css-11b5gui"
+                  >
+                    -
+                  </td>
+                  <td
+                    class="css-11b5gui"
+                  />
+                </tr>
+                <tr>
+                  <td
+                    class="css-1qcb1f7"
+                  >
+                    onClick
+                  </td>
+                  <td
+                    class="css-1qcb1f7"
+                  >
+                    <span />
+                  </td>
+                  <td
+                    class="css-11b5gui"
+                  >
+                    -
+                  </td>
+                  <td
+                    class="css-11b5gui"
+                  >
+                    <span
+                      style="color:#170"
+                    >
+                      onClick
+                    </span>
+                  </td>
+                  <td
+                    class="css-11b5gui"
+                  />
+                </tr>
+                <tr>
+                  <td
+                    class="css-1qcb1f7"
+                  >
+                    style
+                  </td>
+                  <td
+                    class="css-1qcb1f7"
+                  >
+                    <span />
+                  </td>
+                  <td
+                    class="css-11b5gui"
+                  >
+                    -
+                  </td>
+                  <td
+                    class="css-11b5gui"
+                  >
+                    <span
+                      style="color:#666"
+                    >
+                      {}
+                    </span>
+                  </td>
+                  <td
+                    class="css-11b5gui"
+                  />
+                </tr>
+              </tbody>
+            </table>
+          </div>
+        </div>
       </div>
     </div>
   </div>

From 622c5c377915889c55e1f11b2def68e9b775208a Mon Sep 17 00:00:00 2001
From: Norbert de Langen <ndelangen@me.com>
Date: Fri, 24 Aug 2018 21:52:56 +0200
Subject: [PATCH 3/3] FIX snapshots

---
 .../addon-info.stories.storyshot              | 52 +++++++++----------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/examples/official-storybook/stories/__snapshots__/addon-info.stories.storyshot b/examples/official-storybook/stories/__snapshots__/addon-info.stories.storyshot
index d80f08c7b508..3b8a0976911a 100644
--- a/examples/official-storybook/stories/__snapshots__/addon-info.stories.storyshot
+++ b/examples/official-storybook/stories/__snapshots__/addon-info.stories.storyshot
@@ -5059,32 +5059,32 @@ exports[`Storyshots Addons|Info.Options.propTablesExclude Exclude component from
               "BaseButton" Component
             </h2>
             <table
-              class="css-1uhv8nx"
+              class="css-1uhv8nx e1vdo5380"
             >
               <thead>
                 <tr>
                   <th
-                    class="css-11b5gui"
+                    class="css-11b5gui e6fp4ir1"
                   >
                     property
                   </th>
                   <th
-                    class="css-11b5gui"
+                    class="css-11b5gui e6fp4ir1"
                   >
                     propType
                   </th>
                   <th
-                    class="css-11b5gui"
+                    class="css-11b5gui e6fp4ir1"
                   >
                     required
                   </th>
                   <th
-                    class="css-11b5gui"
+                    class="css-11b5gui e6fp4ir1"
                   >
                     default
                   </th>
                   <th
-                    class="css-11b5gui"
+                    class="css-11b5gui e6fp4ir1"
                   >
                     description
                   </th>
@@ -5093,22 +5093,22 @@ exports[`Storyshots Addons|Info.Options.propTablesExclude Exclude component from
               <tbody>
                 <tr>
                   <td
-                    class="css-1qcb1f7"
+                    class="css-1qcb1f7 e6fp4ir0"
                   >
                     disabled
                   </td>
                   <td
-                    class="css-1qcb1f7"
+                    class="css-1qcb1f7 e6fp4ir0"
                   >
                     <span />
                   </td>
                   <td
-                    class="css-11b5gui"
+                    class="css-11b5gui e6fp4ir0"
                   >
                     -
                   </td>
                   <td
-                    class="css-11b5gui"
+                    class="css-11b5gui e6fp4ir0"
                   >
                     <span
                       style="color:#a11"
@@ -5117,52 +5117,52 @@ exports[`Storyshots Addons|Info.Options.propTablesExclude Exclude component from
                     </span>
                   </td>
                   <td
-                    class="css-11b5gui"
+                    class="css-11b5gui e6fp4ir0"
                   />
                 </tr>
                 <tr>
                   <td
-                    class="css-1qcb1f7"
+                    class="css-1qcb1f7 e6fp4ir0"
                   >
                     label
                   </td>
                   <td
-                    class="css-1qcb1f7"
+                    class="css-1qcb1f7 e6fp4ir0"
                   >
                     <span />
                   </td>
                   <td
-                    class="css-11b5gui"
+                    class="css-11b5gui e6fp4ir0"
                   >
                     yes
                   </td>
                   <td
-                    class="css-11b5gui"
+                    class="css-11b5gui e6fp4ir0"
                   >
                     -
                   </td>
                   <td
-                    class="css-11b5gui"
+                    class="css-11b5gui e6fp4ir0"
                   />
                 </tr>
                 <tr>
                   <td
-                    class="css-1qcb1f7"
+                    class="css-1qcb1f7 e6fp4ir0"
                   >
                     onClick
                   </td>
                   <td
-                    class="css-1qcb1f7"
+                    class="css-1qcb1f7 e6fp4ir0"
                   >
                     <span />
                   </td>
                   <td
-                    class="css-11b5gui"
+                    class="css-11b5gui e6fp4ir0"
                   >
                     -
                   </td>
                   <td
-                    class="css-11b5gui"
+                    class="css-11b5gui e6fp4ir0"
                   >
                     <span
                       style="color:#170"
@@ -5171,27 +5171,27 @@ exports[`Storyshots Addons|Info.Options.propTablesExclude Exclude component from
                     </span>
                   </td>
                   <td
-                    class="css-11b5gui"
+                    class="css-11b5gui e6fp4ir0"
                   />
                 </tr>
                 <tr>
                   <td
-                    class="css-1qcb1f7"
+                    class="css-1qcb1f7 e6fp4ir0"
                   >
                     style
                   </td>
                   <td
-                    class="css-1qcb1f7"
+                    class="css-1qcb1f7 e6fp4ir0"
                   >
                     <span />
                   </td>
                   <td
-                    class="css-11b5gui"
+                    class="css-11b5gui e6fp4ir0"
                   >
                     -
                   </td>
                   <td
-                    class="css-11b5gui"
+                    class="css-11b5gui e6fp4ir0"
                   >
                     <span
                       style="color:#666"
@@ -5200,7 +5200,7 @@ exports[`Storyshots Addons|Info.Options.propTablesExclude Exclude component from
                     </span>
                   </td>
                   <td
-                    class="css-11b5gui"
+                    class="css-11b5gui e6fp4ir0"
                   />
                 </tr>
               </tbody>