From 423654430ea2440a05fd957d17d6d06e480b05dc Mon Sep 17 00:00:00 2001
From: ilanus <hasanovtk@gmail.com>
Date: Wed, 31 Oct 2018 13:53:10 +0100
Subject: [PATCH] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20finalize=20comment?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../__tests__/__snapshots__/demo.test.js.snap | 864 +++++++++---------
 components/comment/demo/nested.md             |  32 +-
 components/comment/index.tsx                  |  12 +-
 components/comment/style/index.less           |   6 +-
 4 files changed, 446 insertions(+), 468 deletions(-)

diff --git a/components/comment/__tests__/__snapshots__/demo.test.js.snap b/components/comment/__tests__/__snapshots__/demo.test.js.snap
index 9994284e1c..360780e049 100644
--- a/components/comment/__tests__/__snapshots__/demo.test.js.snap
+++ b/components/comment/__tests__/__snapshots__/demo.test.js.snap
@@ -1,6 +1,119 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`renders ./components/comment/demo/basic.md correctly 1`] = `
+<div
+  class="ant-comment"
+>
+  <div
+    class="ant-comment-inner"
+  >
+    <div
+      class="ant-comment-avatar"
+    >
+      <span
+        class="ant-avatar ant-avatar-circle ant-avatar-image"
+      >
+        <img
+          alt="Han Solo"
+          src="https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png"
+        />
+      </span>
+    </div>
+    <div
+      class="ant-comment-content"
+    >
+      <div
+        class="ant-comment-content-author"
+      >
+        <span
+          class="ant-comment-content-author-name"
+        >
+          <a>
+            Han Solo
+          </a>
+        </span>
+        <span
+          class="ant-comment-content-author-time"
+        >
+          <span>
+            a few seconds ago
+          </span>
+        </span>
+      </div>
+      <div
+        class="ant-comment-content-detail"
+      >
+        <p>
+          We supply a series of design principles, practical patterns and high quality design resources (Sketch and Axure), to help people create their product prototypes beautifully and efficiently.
+        </p>
+      </div>
+      <ul
+        class="ant-comment-actions"
+      >
+        <li>
+          <span>
+            <i
+              class="anticon anticon-like"
+            >
+              <svg
+                aria-hidden="true"
+                class=""
+                data-icon="like"
+                fill="currentColor"
+                height="1em"
+                viewBox="64 64 896 896"
+                width="1em"
+              >
+                <path
+                  d="M885.9 533.7c16.8-22.2 26.1-49.4 26.1-77.7 0-44.9-25.1-87.4-65.5-111.1a67.67 67.67 0 0 0-34.3-9.3H572.4l6-122.9c1.4-29.7-9.1-57.9-29.5-79.4A106.62 106.62 0 0 0 471 99.9c-52 0-98 35-111.8 85.1l-85.9 311H144c-17.7 0-32 14.3-32 32v364c0 17.7 14.3 32 32 32h601.3c9.2 0 18.2-1.8 26.5-5.4 47.6-20.3 78.3-66.8 78.3-118.4 0-12.6-1.8-25-5.4-37 16.8-22.2 26.1-49.4 26.1-77.7 0-12.6-1.8-25-5.4-37 16.8-22.2 26.1-49.4 26.1-77.7-.2-12.6-2-25.1-5.6-37.1zM184 852V568h81v284h-81zm636.4-353l-21.9 19 13.9 25.4a56.2 56.2 0 0 1 6.9 27.3c0 16.5-7.2 32.2-19.6 43l-21.9 19 13.9 25.4a56.2 56.2 0 0 1 6.9 27.3c0 16.5-7.2 32.2-19.6 43l-21.9 19 13.9 25.4a56.2 56.2 0 0 1 6.9 27.3c0 22.4-13.2 42.6-33.6 51.8H329V564.8l99.5-360.5a44.1 44.1 0 0 1 42.2-32.3c7.6 0 15.1 2.2 21.1 6.7 9.9 7.4 15.2 18.6 14.6 30.5l-9.6 198.4h314.4C829 418.5 840 436.9 840 456c0 16.5-7.2 32.1-19.6 43z"
+                />
+              </svg>
+            </i>
+            <span
+              style="padding-left:8px;cursor:auto"
+            >
+              0
+            </span>
+          </span>
+        </li>
+        <li>
+          <span>
+            <i
+              class="anticon anticon-dislike"
+            >
+              <svg
+                aria-hidden="true"
+                class=""
+                data-icon="dislike"
+                fill="currentColor"
+                height="1em"
+                viewBox="64 64 896 896"
+                width="1em"
+              >
+                <path
+                  d="M885.9 490.3c3.6-12 5.4-24.4 5.4-37 0-28.3-9.3-55.5-26.1-77.7 3.6-12 5.4-24.4 5.4-37 0-28.3-9.3-55.5-26.1-77.7 3.6-12 5.4-24.4 5.4-37 0-51.6-30.7-98.1-78.3-118.4a66.1 66.1 0 0 0-26.5-5.4H144c-17.7 0-32 14.3-32 32v364c0 17.7 14.3 32 32 32h129.3l85.8 310.8C372.9 889 418.9 924 470.9 924c29.7 0 57.4-11.8 77.9-33.4 20.5-21.5 31-49.7 29.5-79.4l-6-122.9h239.9c12.1 0 23.9-3.2 34.3-9.3 40.4-23.5 65.5-66.1 65.5-111 0-28.3-9.3-55.5-26.1-77.7zM184 456V172h81v284h-81zm627.2 160.4H496.8l9.6 198.4c.6 11.9-4.7 23.1-14.6 30.5-6.1 4.5-13.6 6.8-21.1 6.7a44.28 44.28 0 0 1-42.2-32.3L329 459.2V172h415.4a56.85 56.85 0 0 1 33.6 51.8c0 9.7-2.3 18.9-6.9 27.3l-13.9 25.4 21.9 19a56.76 56.76 0 0 1 19.6 43c0 9.7-2.3 18.9-6.9 27.3l-13.9 25.4 21.9 19a56.76 56.76 0 0 1 19.6 43c0 9.7-2.3 18.9-6.9 27.3l-14 25.5 21.9 19a56.76 56.76 0 0 1 19.6 43c0 19.1-11 37.5-28.8 48.4z"
+                />
+              </svg>
+            </i>
+            <span
+              style="padding-left:8px;cursor:auto"
+            >
+              0
+            </span>
+          </span>
+        </li>
+        <li>
+          <span>
+            Reply to
+          </span>
+        </li>
+      </ul>
+    </div>
+  </div>
+</div>
+`;
+
+exports[`renders ./components/comment/demo/editor.md correctly 1`] = `
 <div>
   <div
     class="ant-comment"
@@ -25,99 +138,244 @@ exports[`renders ./components/comment/demo/basic.md correctly 1`] = `
       >
         <div
           class="ant-comment-content-author"
-        >
-          <span
-            class="ant-comment-content-author-name"
-          >
-            <a>
-              Han Solo
-            </a>
-          </span>
-          <span
-            class="ant-comment-content-author-time"
-          >
-            <span>
-              a few seconds ago
-            </span>
-          </span>
-        </div>
+        />
         <div
           class="ant-comment-content-detail"
         >
-          <p>
-            We supply a series of design principles, practical patterns and high quality design resources (Sketch and Axure), to help people create their product prototypes beautifully and efficiently.
-          </p>
+          <form
+            class="ant-form ant-form-horizontal"
+          >
+            <div
+              class="ant-row ant-form-item"
+            >
+              <div
+                class="ant-form-item-control-wrapper"
+              >
+                <div
+                  class="ant-form-item-control"
+                >
+                  <span
+                    class="ant-form-item-children"
+                  >
+                    <textarea
+                      class="ant-input"
+                      data-__field="[object Object]"
+                      data-__meta="[object Object]"
+                      id="message"
+                      rows="4"
+                    />
+                  </span>
+                </div>
+              </div>
+            </div>
+            <div
+              class="ant-row ant-form-item"
+            >
+              <div
+                class="ant-form-item-control-wrapper"
+              >
+                <div
+                  class="ant-form-item-control"
+                >
+                  <span
+                    class="ant-form-item-children"
+                  >
+                    <button
+                      class="ant-btn ant-btn-primary"
+                      type="submit"
+                    >
+                      <span>
+                        Add Comment
+                      </span>
+                    </button>
+                  </span>
+                </div>
+              </div>
+            </div>
+          </form>
         </div>
-        <ul
-          class="ant-comment-actions"
-        >
-          <li>
-            <span>
-              <i
-                class="anticon anticon-like"
-              >
-                <svg
-                  aria-hidden="true"
-                  class=""
-                  data-icon="like"
-                  fill="currentColor"
-                  height="1em"
-                  viewBox="64 64 896 896"
-                  width="1em"
-                >
-                  <path
-                    d="M885.9 533.7c16.8-22.2 26.1-49.4 26.1-77.7 0-44.9-25.1-87.4-65.5-111.1a67.67 67.67 0 0 0-34.3-9.3H572.4l6-122.9c1.4-29.7-9.1-57.9-29.5-79.4A106.62 106.62 0 0 0 471 99.9c-52 0-98 35-111.8 85.1l-85.9 311H144c-17.7 0-32 14.3-32 32v364c0 17.7 14.3 32 32 32h601.3c9.2 0 18.2-1.8 26.5-5.4 47.6-20.3 78.3-66.8 78.3-118.4 0-12.6-1.8-25-5.4-37 16.8-22.2 26.1-49.4 26.1-77.7 0-12.6-1.8-25-5.4-37 16.8-22.2 26.1-49.4 26.1-77.7-.2-12.6-2-25.1-5.6-37.1zM184 852V568h81v284h-81zm636.4-353l-21.9 19 13.9 25.4a56.2 56.2 0 0 1 6.9 27.3c0 16.5-7.2 32.2-19.6 43l-21.9 19 13.9 25.4a56.2 56.2 0 0 1 6.9 27.3c0 16.5-7.2 32.2-19.6 43l-21.9 19 13.9 25.4a56.2 56.2 0 0 1 6.9 27.3c0 22.4-13.2 42.6-33.6 51.8H329V564.8l99.5-360.5a44.1 44.1 0 0 1 42.2-32.3c7.6 0 15.1 2.2 21.1 6.7 9.9 7.4 15.2 18.6 14.6 30.5l-9.6 198.4h314.4C829 418.5 840 436.9 840 456c0 16.5-7.2 32.1-19.6 43z"
-                  />
-                </svg>
-              </i>
-              <span
-                style="padding-left:8px;cursor:auto"
-              >
-                0
-              </span>
-            </span>
-          </li>
-          <li>
-            <span>
-              <i
-                class="anticon anticon-dislike"
-              >
-                <svg
-                  aria-hidden="true"
-                  class=""
-                  data-icon="dislike"
-                  fill="currentColor"
-                  height="1em"
-                  viewBox="64 64 896 896"
-                  width="1em"
-                >
-                  <path
-                    d="M885.9 490.3c3.6-12 5.4-24.4 5.4-37 0-28.3-9.3-55.5-26.1-77.7 3.6-12 5.4-24.4 5.4-37 0-28.3-9.3-55.5-26.1-77.7 3.6-12 5.4-24.4 5.4-37 0-51.6-30.7-98.1-78.3-118.4a66.1 66.1 0 0 0-26.5-5.4H144c-17.7 0-32 14.3-32 32v364c0 17.7 14.3 32 32 32h129.3l85.8 310.8C372.9 889 418.9 924 470.9 924c29.7 0 57.4-11.8 77.9-33.4 20.5-21.5 31-49.7 29.5-79.4l-6-122.9h239.9c12.1 0 23.9-3.2 34.3-9.3 40.4-23.5 65.5-66.1 65.5-111 0-28.3-9.3-55.5-26.1-77.7zM184 456V172h81v284h-81zm627.2 160.4H496.8l9.6 198.4c.6 11.9-4.7 23.1-14.6 30.5-6.1 4.5-13.6 6.8-21.1 6.7a44.28 44.28 0 0 1-42.2-32.3L329 459.2V172h415.4a56.85 56.85 0 0 1 33.6 51.8c0 9.7-2.3 18.9-6.9 27.3l-13.9 25.4 21.9 19a56.76 56.76 0 0 1 19.6 43c0 9.7-2.3 18.9-6.9 27.3l-13.9 25.4 21.9 19a56.76 56.76 0 0 1 19.6 43c0 9.7-2.3 18.9-6.9 27.3l-14 25.5 21.9 19a56.76 56.76 0 0 1 19.6 43c0 19.1-11 37.5-28.8 48.4z"
-                  />
-                </svg>
-              </i>
-              <span
-                style="padding-left:8px;cursor:auto"
-              >
-                0
-              </span>
-            </span>
-          </li>
-          <li>
-            <span>
-              Reply to
-            </span>
-          </li>
-        </ul>
       </div>
     </div>
   </div>
 </div>
 `;
 
-exports[`renders ./components/comment/demo/editor.md correctly 1`] = `
-<div>
-  <div>
+exports[`renders ./components/comment/demo/list.md correctly 1`] = `
+<div
+  class="ant-list comment-list ant-list-split"
+>
+  <div
+    class="ant-list-header"
+  >
+    2 replies
+  </div>
+  <div
+    class="ant-spin-nested-loading"
+  >
+    <div
+      class="ant-spin-container"
+    >
+      <div
+        class="ant-comment"
+      >
+        <div
+          class="ant-comment-inner"
+        >
+          <div
+            class="ant-comment-avatar"
+          >
+            <img
+              src="https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png"
+            />
+          </div>
+          <div
+            class="ant-comment-content"
+          >
+            <div
+              class="ant-comment-content-author"
+            >
+              <span
+                class="ant-comment-content-author-name"
+              >
+                Han Solo
+              </span>
+              <span
+                class="ant-comment-content-author-time"
+              >
+                <span>
+                  a day ago
+                </span>
+              </span>
+            </div>
+            <div
+              class="ant-comment-content-detail"
+            >
+              <p>
+                We supply a series of design principles, practical patterns and high quality design resources (Sketch and Axure), to help people create their product prototypes beautifully and efficiently.
+              </p>
+            </div>
+            <ul
+              class="ant-comment-actions"
+            >
+              <li>
+                <span>
+                  Reply to
+                </span>
+              </li>
+            </ul>
+          </div>
+        </div>
+      </div>
+      <div
+        class="ant-comment"
+      >
+        <div
+          class="ant-comment-inner"
+        >
+          <div
+            class="ant-comment-avatar"
+          >
+            <img
+              src="https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png"
+            />
+          </div>
+          <div
+            class="ant-comment-content"
+          >
+            <div
+              class="ant-comment-content-author"
+            >
+              <span
+                class="ant-comment-content-author-name"
+              >
+                Han Solo
+              </span>
+              <span
+                class="ant-comment-content-author-time"
+              >
+                <span>
+                  2 days ago
+                </span>
+              </span>
+            </div>
+            <div
+              class="ant-comment-content-detail"
+            >
+              <p>
+                We supply a series of design principles, practical patterns and high quality design resources (Sketch and Axure), to help people create their product prototypes beautifully and efficiently.
+              </p>
+            </div>
+            <ul
+              class="ant-comment-actions"
+            >
+              <li>
+                <span>
+                  Reply to
+                </span>
+              </li>
+            </ul>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+`;
+
+exports[`renders ./components/comment/demo/nested.md correctly 1`] = `
+<div
+  class="ant-comment"
+>
+  <div
+    class="ant-comment-inner"
+  >
+    <div
+      class="ant-comment-avatar"
+    >
+      <span
+        class="ant-avatar ant-avatar-circle ant-avatar-image"
+      >
+        <img
+          alt="Han Solo"
+          src="https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png"
+        />
+      </span>
+    </div>
+    <div
+      class="ant-comment-content"
+    >
+      <div
+        class="ant-comment-content-author"
+      >
+        <span
+          class="ant-comment-content-author-name"
+        >
+          <a>
+            Han Solo
+          </a>
+        </span>
+      </div>
+      <div
+        class="ant-comment-content-detail"
+      >
+        <p>
+          We supply a series of design principles, practical patterns and high quality design resources (Sketch and Axure).
+        </p>
+      </div>
+      <ul
+        class="ant-comment-actions"
+      >
+        <li>
+          <span>
+            Reply to
+          </span>
+        </li>
+      </ul>
+    </div>
+  </div>
+  <div
+    class="ant-comment-nested"
+  >
     <div
       class="ant-comment"
     >
@@ -141,85 +399,36 @@ exports[`renders ./components/comment/demo/editor.md correctly 1`] = `
         >
           <div
             class="ant-comment-content-author"
-          />
+          >
+            <span
+              class="ant-comment-content-author-name"
+            >
+              <a>
+                Han Solo
+              </a>
+            </span>
+          </div>
           <div
             class="ant-comment-content-detail"
           >
-            <form
-              class="ant-form ant-form-horizontal"
-            >
-              <div
-                class="ant-row ant-form-item"
-              >
-                <div
-                  class="ant-form-item-control-wrapper"
-                >
-                  <div
-                    class="ant-form-item-control"
-                  >
-                    <span
-                      class="ant-form-item-children"
-                    >
-                      <textarea
-                        class="ant-input"
-                        data-__field="[object Object]"
-                        data-__meta="[object Object]"
-                        id="message"
-                        rows="4"
-                      />
-                    </span>
-                  </div>
-                </div>
-              </div>
-              <div
-                class="ant-row ant-form-item"
-              >
-                <div
-                  class="ant-form-item-control-wrapper"
-                >
-                  <div
-                    class="ant-form-item-control"
-                  >
-                    <span
-                      class="ant-form-item-children"
-                    >
-                      <button
-                        class="ant-btn ant-btn-primary"
-                        type="submit"
-                      >
-                        <span>
-                          Add Comment
-                        </span>
-                      </button>
-                    </span>
-                  </div>
-                </div>
-              </div>
-            </form>
+            <p>
+              We supply a series of design principles, practical patterns and high quality design resources (Sketch and Axure).
+            </p>
           </div>
+          <ul
+            class="ant-comment-actions"
+          >
+            <li>
+              <span>
+                Reply to
+              </span>
+            </li>
+          </ul>
         </div>
       </div>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`renders ./components/comment/demo/list.md correctly 1`] = `
-<div
-  class="ant-list comment-list ant-list-split"
->
-  <div
-    class="ant-list-header"
-  >
-    2 replies
-  </div>
-  <div
-    class="ant-spin-nested-loading"
-  >
-    <div
-      class="ant-spin-container"
-    >
-      <div>
+      <div
+        class="ant-comment-nested"
+      >
         <div
           class="ant-comment"
         >
@@ -228,269 +437,46 @@ exports[`renders ./components/comment/demo/list.md correctly 1`] = `
           >
             <div
               class="ant-comment-avatar"
-            >
-              <img
-                src="https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png"
-              />
-            </div>
-            <div
-              class="ant-comment-content"
-            >
-              <div
-                class="ant-comment-content-author"
-              >
-                <span
-                  class="ant-comment-content-author-name"
-                >
-                  Han Solo
-                </span>
-                <span
-                  class="ant-comment-content-author-time"
-                >
-                  <span>
-                    a day ago
-                  </span>
-                </span>
-              </div>
-              <div
-                class="ant-comment-content-detail"
-              >
-                <p>
-                  We supply a series of design principles, practical patterns and high quality design resources (Sketch and Axure), to help people create their product prototypes beautifully and efficiently.
-                </p>
-              </div>
-              <ul
-                class="ant-comment-actions"
-              >
-                <li>
-                  <span>
-                    Reply to
-                  </span>
-                </li>
-              </ul>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div>
-        <div
-          class="ant-comment"
-        >
-          <div
-            class="ant-comment-inner"
-          >
-            <div
-              class="ant-comment-avatar"
-            >
-              <img
-                src="https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png"
-              />
-            </div>
-            <div
-              class="ant-comment-content"
-            >
-              <div
-                class="ant-comment-content-author"
-              >
-                <span
-                  class="ant-comment-content-author-name"
-                >
-                  Han Solo
-                </span>
-                <span
-                  class="ant-comment-content-author-time"
-                >
-                  <span>
-                    2 days ago
-                  </span>
-                </span>
-              </div>
-              <div
-                class="ant-comment-content-detail"
-              >
-                <p>
-                  We supply a series of design principles, practical patterns and high quality design resources (Sketch and Axure), to help people create their product prototypes beautifully and efficiently.
-                </p>
-              </div>
-              <ul
-                class="ant-comment-actions"
-              >
-                <li>
-                  <span>
-                    Reply to
-                  </span>
-                </li>
-              </ul>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`renders ./components/comment/demo/nested.md correctly 1`] = `
-<div>
-  <div
-    class="ant-comment"
-  >
-    <div
-      class="ant-comment-inner"
-    >
-      <div
-        class="ant-comment-avatar"
-      >
-        <span
-          class="ant-avatar ant-avatar-circle ant-avatar-image"
-        >
-          <img
-            alt="Han Solo"
-            src="https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png"
-          />
-        </span>
-      </div>
-      <div
-        class="ant-comment-content"
-      >
-        <div
-          class="ant-comment-content-author"
-        >
-          <span
-            class="ant-comment-content-author-name"
-          >
-            <a>
-              Han Solo
-            </a>
-          </span>
-        </div>
-        <div
-          class="ant-comment-content-detail"
-        >
-          <p>
-            We supply a series of design principles, practical patterns and high quality design resources (Sketch and Axure).
-          </p>
-        </div>
-        <ul
-          class="ant-comment-actions"
-        >
-          <li>
-            <span>
-              Reply to
-            </span>
-          </li>
-        </ul>
-      </div>
-    </div>
-  </div>
-  <div
-    class="ant-comment-nested"
-  >
-    <div>
-      <div
-        class="ant-comment"
-      >
-        <div
-          class="ant-comment-inner"
-        >
-          <div
-            class="ant-comment-avatar"
-          >
-            <span
-              class="ant-avatar ant-avatar-circle ant-avatar-image"
-            >
-              <img
-                alt="Han Solo"
-                src="https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png"
-              />
-            </span>
-          </div>
-          <div
-            class="ant-comment-content"
-          >
-            <div
-              class="ant-comment-content-author"
             >
               <span
-                class="ant-comment-content-author-name"
+                class="ant-avatar ant-avatar-circle ant-avatar-image"
               >
-                <a>
-                  Han Solo
-                </a>
+                <img
+                  alt="Han Solo"
+                  src="https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png"
+                />
               </span>
             </div>
             <div
-              class="ant-comment-content-detail"
-            >
-              <p>
-                We supply a series of design principles, practical patterns and high quality design resources (Sketch and Axure).
-              </p>
-            </div>
-            <ul
-              class="ant-comment-actions"
-            >
-              <li>
-                <span>
-                  Reply to
-                </span>
-              </li>
-            </ul>
-          </div>
-        </div>
-      </div>
-      <div
-        class="ant-comment-nested"
-      >
-        <div>
-          <div
-            class="ant-comment"
-          >
-            <div
-              class="ant-comment-inner"
+              class="ant-comment-content"
             >
               <div
-                class="ant-comment-avatar"
+                class="ant-comment-content-author"
               >
                 <span
-                  class="ant-avatar ant-avatar-circle ant-avatar-image"
+                  class="ant-comment-content-author-name"
                 >
-                  <img
-                    alt="Han Solo"
-                    src="https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png"
-                  />
+                  <a>
+                    Han Solo
+                  </a>
                 </span>
               </div>
               <div
-                class="ant-comment-content"
+                class="ant-comment-content-detail"
               >
-                <div
-                  class="ant-comment-content-author"
-                >
-                  <span
-                    class="ant-comment-content-author-name"
-                  >
-                    <a>
-                      Han Solo
-                    </a>
-                  </span>
-                </div>
-                <div
-                  class="ant-comment-content-detail"
-                >
-                  <p>
-                    We supply a series of design principles, practical patterns and high quality design resources (Sketch and Axure).
-                  </p>
-                </div>
-                <ul
-                  class="ant-comment-actions"
-                >
-                  <li>
-                    <span>
-                      Reply to
-                    </span>
-                  </li>
-                </ul>
+                <p>
+                  We supply a series of design principles, practical patterns and high quality design resources (Sketch and Axure).
+                </p>
               </div>
+              <ul
+                class="ant-comment-actions"
+              >
+                <li>
+                  <span>
+                    Reply to
+                  </span>
+                </li>
+              </ul>
             </div>
           </div>
         </div>
@@ -498,56 +484,54 @@ exports[`renders ./components/comment/demo/nested.md correctly 1`] = `
       <div
         class="ant-comment-nested"
       >
-        <div>
+        <div
+          class="ant-comment"
+        >
           <div
-            class="ant-comment"
+            class="ant-comment-inner"
           >
             <div
-              class="ant-comment-inner"
+              class="ant-comment-avatar"
+            >
+              <span
+                class="ant-avatar ant-avatar-circle ant-avatar-image"
+              >
+                <img
+                  alt="Han Solo"
+                  src="https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png"
+                />
+              </span>
+            </div>
+            <div
+              class="ant-comment-content"
             >
               <div
-                class="ant-comment-avatar"
+                class="ant-comment-content-author"
               >
                 <span
-                  class="ant-avatar ant-avatar-circle ant-avatar-image"
+                  class="ant-comment-content-author-name"
                 >
-                  <img
-                    alt="Han Solo"
-                    src="https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png"
-                  />
+                  <a>
+                    Han Solo
+                  </a>
                 </span>
               </div>
               <div
-                class="ant-comment-content"
+                class="ant-comment-content-detail"
               >
-                <div
-                  class="ant-comment-content-author"
-                >
-                  <span
-                    class="ant-comment-content-author-name"
-                  >
-                    <a>
-                      Han Solo
-                    </a>
-                  </span>
-                </div>
-                <div
-                  class="ant-comment-content-detail"
-                >
-                  <p>
-                    We supply a series of design principles, practical patterns and high quality design resources (Sketch and Axure).
-                  </p>
-                </div>
-                <ul
-                  class="ant-comment-actions"
-                >
-                  <li>
-                    <span>
-                      Reply to
-                    </span>
-                  </li>
-                </ul>
+                <p>
+                  We supply a series of design principles, practical patterns and high quality design resources (Sketch and Axure).
+                </p>
               </div>
+              <ul
+                class="ant-comment-actions"
+              >
+                <li>
+                  <span>
+                    Reply to
+                  </span>
+                </li>
+              </ul>
             </div>
           </div>
         </div>
diff --git a/components/comment/demo/nested.md b/components/comment/demo/nested.md
index 51f71193fe..90eb4462c9 100644
--- a/components/comment/demo/nested.md
+++ b/components/comment/demo/nested.md
@@ -16,23 +16,21 @@ Comment can be nested
 ````jsx
 import { Comment, Avatar } from 'antd';
 
-function ExampleComment({ children }) {
-  return (
-    <Comment
-      actions={[<span>Reply to</span>]}
-      author={<a>Han Solo</a>}
-      avatar={(
-        <Avatar
-          src="https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png"
-          alt="Han Solo"
-        />
-      )}
-      content={<p>We supply a series of design principles, practical patterns and high quality design resources (Sketch and Axure).</p>}
-    >
-      {children}
-    </Comment>
-  );
-}
+const ExampleComment = ({ children }) => (
+  <Comment
+    actions={[<span>Reply to</span>]}
+    author={<a>Han Solo</a>}
+    avatar={(
+      <Avatar
+        src="https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png"
+        alt="Han Solo"
+      />
+    )}
+    content={<p>We supply a series of design principles, practical patterns and high quality design resources (Sketch and Axure).</p>}
+  >
+    {children}
+  </Comment>
+);
 
 ReactDOM.render(
   <ExampleComment>
diff --git a/components/comment/index.tsx b/components/comment/index.tsx
index 015707a5e9..1572f62ba8 100644
--- a/components/comment/index.tsx
+++ b/components/comment/index.tsx
@@ -14,8 +14,6 @@ export interface CommentProps {
   content: React.ReactNode;
   /** Nested comments should be provided as children of the Comment */
   children?: any;
-  /** Optional ID for the comment */
-  id?: string;
   /** Comment prefix defaults to '.ant-comment' */
   prefixCls?: string;
   /** Additional style for the comment */
@@ -101,11 +99,9 @@ export default class Comment extends React.Component<CommentProps, {}> {
     );
 
     const comment = (
-      <div {...otherProps} className={classString} style={style}>
-        <div className={`${prefixCls}-inner`}>
-          {avatarDom}
-          {contentDom}
-        </div>
+      <div className={`${prefixCls}-inner`}>
+        {avatarDom}
+        {contentDom}
       </div>
     );
 
@@ -114,7 +110,7 @@ export default class Comment extends React.Component<CommentProps, {}> {
         .map(children, (child: React.ReactElement<any>) => this.renderNested(child));
 
     return (
-      <div>
+      <div {...otherProps} className={classString} style={style}>
         {comment}
         {nestedComments}
       </div>
diff --git a/components/comment/style/index.less b/components/comment/style/index.less
index 3744acdc21..3eb72cb7c1 100644
--- a/components/comment/style/index.less
+++ b/components/comment/style/index.less
@@ -19,7 +19,7 @@
     img {
       width: 32px;
       height: 32px;
-      border-radius: 16px;
+      border-radius: 50%;
     }
   }
 
@@ -44,7 +44,7 @@
       }
 
       &-name {
-        transition: color 0.3s ease;
+        transition: color .3s;
         font-size: 14px;
         color: @comment-author-name-color;
         > * {
@@ -71,7 +71,7 @@
       color: @comment-action-color;
       > span {
         padding-right: 10px;
-        transition: color 0.3s ease;
+        transition: color .3s;
         font-size: 12px;
         color: @comment-action-color;
         cursor: pointer;