diff --git a/components/card/__tests__/__snapshots__/demo-extend.test.ts.snap b/components/card/__tests__/__snapshots__/demo-extend.test.ts.snap
index b1624b2ce0..5863c7de91 100644
--- a/components/card/__tests__/__snapshots__/demo-extend.test.ts.snap
+++ b/components/card/__tests__/__snapshots__/demo-extend.test.ts.snap
@@ -433,111 +433,10 @@ Array [
         class="ant-skeleton ant-skeleton-active"
       >
         <div
-<<<<<<< HEAD
           class="ant-skeleton-content"
         >
           <ul
             class="ant-skeleton-paragraph"
-=======
-          class="ant-row"
-          style="margin-left:-4px;margin-right:-4px"
-        >
-          <div
-            class="ant-col ant-col-22"
-            style="padding-left:4px;padding-right:4px"
-          >
-            <div
-              class="ant-card-loading-block"
-            />
-          </div>
-        </div>
-        <div
-          class="ant-row"
-          style="margin-left:-4px;margin-right:-4px"
-        >
-          <div
-            class="ant-col ant-col-8"
-            style="padding-left:4px;padding-right:4px"
-          >
-            <div
-              class="ant-card-loading-block"
-            />
-          </div>
-          <div
-            class="ant-col ant-col-15"
-            style="padding-left:4px;padding-right:4px"
-          >
-            <div
-              class="ant-card-loading-block"
-            />
-          </div>
-        </div>
-        <div
-          class="ant-row"
-          style="margin-left:-4px;margin-right:-4px"
-        >
-          <div
-            class="ant-col ant-col-6"
-            style="padding-left:4px;padding-right:4px"
-          >
-            <div
-              class="ant-card-loading-block"
-            />
-          </div>
-          <div
-            class="ant-col ant-col-18"
-            style="padding-left:4px;padding-right:4px"
-          >
-            <div
-              class="ant-card-loading-block"
-            />
-          </div>
-        </div>
-        <div
-          class="ant-row"
-          style="margin-left:-4px;margin-right:-4px"
-        >
-          <div
-            class="ant-col ant-col-13"
-            style="padding-left:4px;padding-right:4px"
-          >
-            <div
-              class="ant-card-loading-block"
-            />
-          </div>
-          <div
-            class="ant-col ant-col-9"
-            style="padding-left:4px;padding-right:4px"
-          >
-            <div
-              class="ant-card-loading-block"
-            />
-          </div>
-        </div>
-        <div
-          class="ant-row"
-          style="margin-left:-4px;margin-right:-4px"
-        >
-          <div
-            class="ant-col ant-col-4"
-            style="padding-left:4px;padding-right:4px"
-          >
-            <div
-              class="ant-card-loading-block"
-            />
-          </div>
-          <div
-            class="ant-col ant-col-3"
-            style="padding-left:4px;padding-right:4px"
-          >
-            <div
-              class="ant-card-loading-block"
-            />
-          </div>
-          <div
-            class="ant-col ant-col-16"
-            style="padding-left:4px;padding-right:4px"
->>>>>>> origin/master
           >
             <li />
             <li />
diff --git a/components/card/__tests__/__snapshots__/demo.test.js.snap b/components/card/__tests__/__snapshots__/demo.test.js.snap
index 12e4abba23..3bb058ccaf 100644
--- a/components/card/__tests__/__snapshots__/demo.test.js.snap
+++ b/components/card/__tests__/__snapshots__/demo.test.js.snap
@@ -433,111 +433,10 @@ Array [
         class="ant-skeleton ant-skeleton-active"
       >
         <div
-<<<<<<< HEAD
           class="ant-skeleton-content"
         >
           <ul
             class="ant-skeleton-paragraph"
-=======
-          class="ant-row"
-          style="margin-left:-4px;margin-right:-4px"
-        >
-          <div
-            class="ant-col ant-col-22"
-            style="padding-left:4px;padding-right:4px"
-          >
-            <div
-              class="ant-card-loading-block"
-            />
-          </div>
-        </div>
-        <div
-          class="ant-row"
-          style="margin-left:-4px;margin-right:-4px"
-        >
-          <div
-            class="ant-col ant-col-8"
-            style="padding-left:4px;padding-right:4px"
-          >
-            <div
-              class="ant-card-loading-block"
-            />
-          </div>
-          <div
-            class="ant-col ant-col-15"
-            style="padding-left:4px;padding-right:4px"
-          >
-            <div
-              class="ant-card-loading-block"
-            />
-          </div>
-        </div>
-        <div
-          class="ant-row"
-          style="margin-left:-4px;margin-right:-4px"
-        >
-          <div
-            class="ant-col ant-col-6"
-            style="padding-left:4px;padding-right:4px"
-          >
-            <div
-              class="ant-card-loading-block"
-            />
-          </div>
-          <div
-            class="ant-col ant-col-18"
-            style="padding-left:4px;padding-right:4px"
-          >
-            <div
-              class="ant-card-loading-block"
-            />
-          </div>
-        </div>
-        <div
-          class="ant-row"
-          style="margin-left:-4px;margin-right:-4px"
-        >
-          <div
-            class="ant-col ant-col-13"
-            style="padding-left:4px;padding-right:4px"
-          >
-            <div
-              class="ant-card-loading-block"
-            />
-          </div>
-          <div
-            class="ant-col ant-col-9"
-            style="padding-left:4px;padding-right:4px"
-          >
-            <div
-              class="ant-card-loading-block"
-            />
-          </div>
-        </div>
-        <div
-          class="ant-row"
-          style="margin-left:-4px;margin-right:-4px"
-        >
-          <div
-            class="ant-col ant-col-4"
-            style="padding-left:4px;padding-right:4px"
-          >
-            <div
-              class="ant-card-loading-block"
-            />
-          </div>
-          <div
-            class="ant-col ant-col-3"
-            style="padding-left:4px;padding-right:4px"
-          >
-            <div
-              class="ant-card-loading-block"
-            />
-          </div>
-          <div
-            class="ant-col ant-col-16"
-            style="padding-left:4px;padding-right:4px"
->>>>>>> origin/master
           >
             <li />
             <li />
diff --git a/components/card/__tests__/__snapshots__/index.test.js.snap b/components/card/__tests__/__snapshots__/index.test.js.snap
index b90d4f0bb0..ca5fee27fc 100644
--- a/components/card/__tests__/__snapshots__/index.test.js.snap
+++ b/components/card/__tests__/__snapshots__/index.test.js.snap
@@ -22,19 +22,10 @@ exports[`Card should still have padding when card which set padding to 0 is load
       class="ant-skeleton ant-skeleton-active"
     >
       <div
-<<<<<<< HEAD
         class="ant-skeleton-content"
       >
         <ul
           class="ant-skeleton-paragraph"
-=======
-        class="ant-row"
-        style="margin-left: -4px; margin-right: -4px;"
-      >
-        <div
-          class="ant-col ant-col-22"
-          style="padding-left: 4px; padding-right: 4px;"
->>>>>>> origin/master
         >
           <li />
           <li />
@@ -42,103 +33,7 @@ exports[`Card should still have padding when card which set padding to 0 is load
           <li
             style="width: 61%;"
           />
-<<<<<<< HEAD
         </ul>
-=======
-        </div>
-      </div>
-      <div
-        class="ant-row"
-        style="margin-left: -4px; margin-right: -4px;"
-      >
-        <div
-          class="ant-col ant-col-8"
-          style="padding-left: 4px; padding-right: 4px;"
-        >
-          <div
-            class="ant-card-loading-block"
-          />
-        </div>
-        <div
-          class="ant-col ant-col-15"
-          style="padding-left: 4px; padding-right: 4px;"
-        >
-          <div
-            class="ant-card-loading-block"
-          />
-        </div>
-      </div>
-      <div
-        class="ant-row"
-        style="margin-left: -4px; margin-right: -4px;"
-      >
-        <div
-          class="ant-col ant-col-6"
-          style="padding-left: 4px; padding-right: 4px;"
-        >
-          <div
-            class="ant-card-loading-block"
-          />
-        </div>
-        <div
-          class="ant-col ant-col-18"
-          style="padding-left: 4px; padding-right: 4px;"
-        >
-          <div
-            class="ant-card-loading-block"
-          />
-        </div>
-      </div>
-      <div
-        class="ant-row"
-        style="margin-left: -4px; margin-right: -4px;"
-      >
-        <div
-          class="ant-col ant-col-13"
-          style="padding-left: 4px; padding-right: 4px;"
-        >
-          <div
-            class="ant-card-loading-block"
-          />
-        </div>
-        <div
-          class="ant-col ant-col-9"
-          style="padding-left: 4px; padding-right: 4px;"
-        >
-          <div
-            class="ant-card-loading-block"
-          />
-        </div>
-      </div>
-      <div
-        class="ant-row"
-        style="margin-left: -4px; margin-right: -4px;"
-      >
-        <div
-          class="ant-col ant-col-4"
-          style="padding-left: 4px; padding-right: 4px;"
-        >
-          <div
-            class="ant-card-loading-block"
-          />
-        </div>
-        <div
-          class="ant-col ant-col-3"
-          style="padding-left: 4px; padding-right: 4px;"
-        >
-          <div
-            class="ant-card-loading-block"
-          />
-        </div>
-        <div
-          class="ant-col ant-col-16"
-          style="padding-left: 4px; padding-right: 4px;"
-        >
-          <div
-            class="ant-card-loading-block"
-          />
-        </div>
->>>>>>> origin/master
       </div>
     </div>
   </div>
diff --git a/components/date-picker/style/index.tsx b/components/date-picker/style/index.tsx
index 1ff84714b4..c370dc244f 100644
--- a/components/date-picker/style/index.tsx
+++ b/components/date-picker/style/index.tsx
@@ -1035,7 +1035,10 @@ const genPickerStyle: GenerateStyle<PickerToken> = token => {
         // Fix incorrect position of picker popup
         // https://github.com/ant-design/ant-design/issues/35590
         top: -9999,
-        left: -9999,
+        left: {
+          _skip_check_: true,
+          value: -9999,
+        },
         zIndex: token.zIndexPopup,
 
         '&&-hidden': {
diff --git a/components/form/__tests__/__snapshots__/demo-extend.test.ts.snap b/components/form/__tests__/__snapshots__/demo-extend.test.ts.snap
index 7bf64fe849..6f50bc577d 100644
--- a/components/form/__tests__/__snapshots__/demo-extend.test.ts.snap
+++ b/components/form/__tests__/__snapshots__/demo-extend.test.ts.snap
@@ -1824,11 +1824,9 @@ exports[`renders ./components/form/demo/disabled.md extend context correctly 1`]
 >
   <div
     class="ant-row ant-form-item"
-    role="row"
   >
     <div
       class="ant-col ant-col-4 ant-form-item-label"
-      role="cell"
     >
       <label
         class=""
@@ -1840,7 +1838,6 @@ exports[`renders ./components/form/demo/disabled.md extend context correctly 1`]
     </div>
     <div
       class="ant-col ant-col-14 ant-form-item-control"
-      role="cell"
     >
       <div
         class="ant-form-item-control-input"
@@ -1874,11 +1871,9 @@ exports[`renders ./components/form/demo/disabled.md extend context correctly 1`]
   </div>
   <div
     class="ant-row ant-form-item"
-    role="row"
   >
     <div
       class="ant-col ant-col-4 ant-form-item-label"
-      role="cell"
     >
       <label
         class=""
@@ -1889,7 +1884,6 @@ exports[`renders ./components/form/demo/disabled.md extend context correctly 1`]
     </div>
     <div
       class="ant-col ant-col-14 ant-form-item-control"
-      role="cell"
     >
       <div
         class="ant-form-item-control-input"
@@ -1947,11 +1941,9 @@ exports[`renders ./components/form/demo/disabled.md extend context correctly 1`]
   </div>
   <div
     class="ant-row ant-form-item"
-    role="row"
   >
     <div
       class="ant-col ant-col-4 ant-form-item-label"
-      role="cell"
     >
       <label
         class=""
@@ -1962,7 +1954,6 @@ exports[`renders ./components/form/demo/disabled.md extend context correctly 1`]
     </div>
     <div
       class="ant-col ant-col-14 ant-form-item-control"
-      role="cell"
     >
       <div
         class="ant-form-item-control-input"
@@ -1982,11 +1973,9 @@ exports[`renders ./components/form/demo/disabled.md extend context correctly 1`]
   </div>
   <div
     class="ant-row ant-form-item"
-    role="row"
   >
     <div
       class="ant-col ant-col-4 ant-form-item-label"
-      role="cell"
     >
       <label
         class=""
@@ -1997,7 +1986,6 @@ exports[`renders ./components/form/demo/disabled.md extend context correctly 1`]
     </div>
     <div
       class="ant-col ant-col-14 ant-form-item-control"
-      role="cell"
     >
       <div
         class="ant-form-item-control-input"
@@ -2126,11 +2114,9 @@ exports[`renders ./components/form/demo/disabled.md extend context correctly 1`]
   </div>
   <div
     class="ant-row ant-form-item"
-    role="row"
   >
     <div
       class="ant-col ant-col-4 ant-form-item-label"
-      role="cell"
     >
       <label
         class=""
@@ -2141,7 +2127,6 @@ exports[`renders ./components/form/demo/disabled.md extend context correctly 1`]
     </div>
     <div
       class="ant-col ant-col-14 ant-form-item-control"
-      role="cell"
     >
       <div
         class="ant-form-item-control-input"
@@ -2309,11 +2294,9 @@ exports[`renders ./components/form/demo/disabled.md extend context correctly 1`]
   </div>
   <div
     class="ant-row ant-form-item"
-    role="row"
   >
     <div
       class="ant-col ant-col-4 ant-form-item-label"
-      role="cell"
     >
       <label
         class=""
@@ -2324,7 +2307,6 @@ exports[`renders ./components/form/demo/disabled.md extend context correctly 1`]
     </div>
     <div
       class="ant-col ant-col-14 ant-form-item-control"
-      role="cell"
     >
       <div
         class="ant-form-item-control-input"
@@ -2449,11 +2431,9 @@ exports[`renders ./components/form/demo/disabled.md extend context correctly 1`]
   </div>
   <div
     class="ant-row ant-form-item"
-    role="row"
   >
     <div
       class="ant-col ant-col-4 ant-form-item-label"
-      role="cell"
     >
       <label
         class=""
@@ -2464,7 +2444,6 @@ exports[`renders ./components/form/demo/disabled.md extend context correctly 1`]
     </div>
     <div
       class="ant-col ant-col-14 ant-form-item-control"
-      role="cell"
     >
       <div
         class="ant-form-item-control-input"
@@ -3072,11 +3051,9 @@ exports[`renders ./components/form/demo/disabled.md extend context correctly 1`]
   </div>
   <div
     class="ant-row ant-form-item"
-    role="row"
   >
     <div
       class="ant-col ant-col-4 ant-form-item-label"
-      role="cell"
     >
       <label
         class=""
@@ -3087,7 +3064,6 @@ exports[`renders ./components/form/demo/disabled.md extend context correctly 1`]
     </div>
     <div
       class="ant-col ant-col-14 ant-form-item-control"
-      role="cell"
     >
       <div
         class="ant-form-item-control-input"
@@ -4281,11 +4257,9 @@ exports[`renders ./components/form/demo/disabled.md extend context correctly 1`]
   </div>
   <div
     class="ant-row ant-form-item"
-    role="row"
   >
     <div
       class="ant-col ant-col-4 ant-form-item-label"
-      role="cell"
     >
       <label
         class=""
@@ -4296,7 +4270,6 @@ exports[`renders ./components/form/demo/disabled.md extend context correctly 1`]
     </div>
     <div
       class="ant-col ant-col-14 ant-form-item-control"
-      role="cell"
     >
       <div
         class="ant-form-item-control-input"
@@ -4384,11 +4357,9 @@ exports[`renders ./components/form/demo/disabled.md extend context correctly 1`]
   </div>
   <div
     class="ant-row ant-form-item"
-    role="row"
   >
     <div
       class="ant-col ant-col-4 ant-form-item-label"
-      role="cell"
     >
       <label
         class=""
@@ -4399,7 +4370,6 @@ exports[`renders ./components/form/demo/disabled.md extend context correctly 1`]
     </div>
     <div
       class="ant-col ant-col-14 ant-form-item-control"
-      role="cell"
     >
       <div
         class="ant-form-item-control-input"
@@ -4418,11 +4388,9 @@ exports[`renders ./components/form/demo/disabled.md extend context correctly 1`]
   </div>
   <div
     class="ant-row ant-form-item"
-    role="row"
   >
     <div
       class="ant-col ant-col-4 ant-form-item-label"
-      role="cell"
     >
       <label
         class=""
@@ -4433,7 +4401,6 @@ exports[`renders ./components/form/demo/disabled.md extend context correctly 1`]
     </div>
     <div
       class="ant-col ant-col-14 ant-form-item-control"
-      role="cell"
     >
       <div
         class="ant-form-item-control-input"
@@ -4461,11 +4428,9 @@ exports[`renders ./components/form/demo/disabled.md extend context correctly 1`]
   </div>
   <div
     class="ant-row ant-form-item"
-    role="row"
   >
     <div
       class="ant-col ant-col-4 ant-form-item-label"
-      role="cell"
     >
       <label
         class=""
@@ -4476,7 +4441,6 @@ exports[`renders ./components/form/demo/disabled.md extend context correctly 1`]
     </div>
     <div
       class="ant-col ant-col-14 ant-form-item-control"
-      role="cell"
     >
       <div
         class="ant-form-item-control-input"
diff --git a/components/form/__tests__/__snapshots__/demo.test.js.snap b/components/form/__tests__/__snapshots__/demo.test.js.snap
index 7e8872af2e..9fc380315e 100644
--- a/components/form/__tests__/__snapshots__/demo.test.js.snap
+++ b/components/form/__tests__/__snapshots__/demo.test.js.snap
@@ -1380,11 +1380,9 @@ exports[`renders ./components/form/demo/disabled.md correctly 1`] = `
 >
   <div
     class="ant-row ant-form-item"
-    role="row"
   >
     <div
       class="ant-col ant-col-4 ant-form-item-label"
-      role="cell"
     >
       <label
         class=""
@@ -1396,7 +1394,6 @@ exports[`renders ./components/form/demo/disabled.md correctly 1`] = `
     </div>
     <div
       class="ant-col ant-col-14 ant-form-item-control"
-      role="cell"
     >
       <div
         class="ant-form-item-control-input"
@@ -1430,11 +1427,9 @@ exports[`renders ./components/form/demo/disabled.md correctly 1`] = `
   </div>
   <div
     class="ant-row ant-form-item"
-    role="row"
   >
     <div
       class="ant-col ant-col-4 ant-form-item-label"
-      role="cell"
     >
       <label
         class=""
@@ -1445,7 +1440,6 @@ exports[`renders ./components/form/demo/disabled.md correctly 1`] = `
     </div>
     <div
       class="ant-col ant-col-14 ant-form-item-control"
-      role="cell"
     >
       <div
         class="ant-form-item-control-input"
@@ -1503,11 +1497,9 @@ exports[`renders ./components/form/demo/disabled.md correctly 1`] = `
   </div>
   <div
     class="ant-row ant-form-item"
-    role="row"
   >
     <div
       class="ant-col ant-col-4 ant-form-item-label"
-      role="cell"
     >
       <label
         class=""
@@ -1518,7 +1510,6 @@ exports[`renders ./components/form/demo/disabled.md correctly 1`] = `
     </div>
     <div
       class="ant-col ant-col-14 ant-form-item-control"
-      role="cell"
     >
       <div
         class="ant-form-item-control-input"
@@ -1538,11 +1529,9 @@ exports[`renders ./components/form/demo/disabled.md correctly 1`] = `
   </div>
   <div
     class="ant-row ant-form-item"
-    role="row"
   >
     <div
       class="ant-col ant-col-4 ant-form-item-label"
-      role="cell"
     >
       <label
         class=""
@@ -1553,7 +1542,6 @@ exports[`renders ./components/form/demo/disabled.md correctly 1`] = `
     </div>
     <div
       class="ant-col ant-col-14 ant-form-item-control"
-      role="cell"
     >
       <div
         class="ant-form-item-control-input"
@@ -1625,11 +1613,9 @@ exports[`renders ./components/form/demo/disabled.md correctly 1`] = `
   </div>
   <div
     class="ant-row ant-form-item"
-    role="row"
   >
     <div
       class="ant-col ant-col-4 ant-form-item-label"
-      role="cell"
     >
       <label
         class=""
@@ -1640,7 +1626,6 @@ exports[`renders ./components/form/demo/disabled.md correctly 1`] = `
     </div>
     <div
       class="ant-col ant-col-14 ant-form-item-control"
-      role="cell"
     >
       <div
         class="ant-form-item-control-input"
@@ -1711,11 +1696,9 @@ exports[`renders ./components/form/demo/disabled.md correctly 1`] = `
   </div>
   <div
     class="ant-row ant-form-item"
-    role="row"
   >
     <div
       class="ant-col ant-col-4 ant-form-item-label"
-      role="cell"
     >
       <label
         class=""
@@ -1726,7 +1709,6 @@ exports[`renders ./components/form/demo/disabled.md correctly 1`] = `
     </div>
     <div
       class="ant-col ant-col-14 ant-form-item-control"
-      role="cell"
     >
       <div
         class="ant-form-item-control-input"
@@ -1797,11 +1779,9 @@ exports[`renders ./components/form/demo/disabled.md correctly 1`] = `
   </div>
   <div
     class="ant-row ant-form-item"
-    role="row"
   >
     <div
       class="ant-col ant-col-4 ant-form-item-label"
-      role="cell"
     >
       <label
         class=""
@@ -1812,7 +1792,6 @@ exports[`renders ./components/form/demo/disabled.md correctly 1`] = `
     </div>
     <div
       class="ant-col ant-col-14 ant-form-item-control"
-      role="cell"
     >
       <div
         class="ant-form-item-control-input"
@@ -1866,11 +1845,9 @@ exports[`renders ./components/form/demo/disabled.md correctly 1`] = `
   </div>
   <div
     class="ant-row ant-form-item"
-    role="row"
   >
     <div
       class="ant-col ant-col-4 ant-form-item-label"
-      role="cell"
     >
       <label
         class=""
@@ -1881,7 +1858,6 @@ exports[`renders ./components/form/demo/disabled.md correctly 1`] = `
     </div>
     <div
       class="ant-col ant-col-14 ant-form-item-control"
-      role="cell"
     >
       <div
         class="ant-form-item-control-input"
@@ -1978,11 +1954,9 @@ exports[`renders ./components/form/demo/disabled.md correctly 1`] = `
   </div>
   <div
     class="ant-row ant-form-item"
-    role="row"
   >
     <div
       class="ant-col ant-col-4 ant-form-item-label"
-      role="cell"
     >
       <label
         class=""
@@ -1993,7 +1967,6 @@ exports[`renders ./components/form/demo/disabled.md correctly 1`] = `
     </div>
     <div
       class="ant-col ant-col-14 ant-form-item-control"
-      role="cell"
     >
       <div
         class="ant-form-item-control-input"
@@ -2081,11 +2054,9 @@ exports[`renders ./components/form/demo/disabled.md correctly 1`] = `
   </div>
   <div
     class="ant-row ant-form-item"
-    role="row"
   >
     <div
       class="ant-col ant-col-4 ant-form-item-label"
-      role="cell"
     >
       <label
         class=""
@@ -2096,7 +2067,6 @@ exports[`renders ./components/form/demo/disabled.md correctly 1`] = `
     </div>
     <div
       class="ant-col ant-col-14 ant-form-item-control"
-      role="cell"
     >
       <div
         class="ant-form-item-control-input"
@@ -2115,11 +2085,9 @@ exports[`renders ./components/form/demo/disabled.md correctly 1`] = `
   </div>
   <div
     class="ant-row ant-form-item"
-    role="row"
   >
     <div
       class="ant-col ant-col-4 ant-form-item-label"
-      role="cell"
     >
       <label
         class=""
@@ -2130,7 +2098,6 @@ exports[`renders ./components/form/demo/disabled.md correctly 1`] = `
     </div>
     <div
       class="ant-col ant-col-14 ant-form-item-control"
-      role="cell"
     >
       <div
         class="ant-form-item-control-input"
@@ -2158,11 +2125,9 @@ exports[`renders ./components/form/demo/disabled.md correctly 1`] = `
   </div>
   <div
     class="ant-row ant-form-item"
-    role="row"
   >
     <div
       class="ant-col ant-col-4 ant-form-item-label"
-      role="cell"
     >
       <label
         class=""
@@ -2173,7 +2138,6 @@ exports[`renders ./components/form/demo/disabled.md correctly 1`] = `
     </div>
     <div
       class="ant-col ant-col-14 ant-form-item-control"
-      role="cell"
     >
       <div
         class="ant-form-item-control-input"
diff --git a/components/form/__tests__/__snapshots__/index.test.js.snap b/components/form/__tests__/__snapshots__/index.test.js.snap
index 40864ab933..96e7066bec 100644
--- a/components/form/__tests__/__snapshots__/index.test.js.snap
+++ b/components/form/__tests__/__snapshots__/index.test.js.snap
@@ -91,11 +91,9 @@ exports[`Form form should support disabled 1`] = `
 >
   <div
     class="ant-row ant-form-item"
-    role="row"
   >
     <div
       class="ant-col ant-col-4 ant-form-item-label"
-      role="cell"
     >
       <label
         class=""
@@ -107,7 +105,6 @@ exports[`Form form should support disabled 1`] = `
     </div>
     <div
       class="ant-col ant-col-14 ant-form-item-control"
-      role="cell"
     >
       <div
         class="ant-form-item-control-input"
@@ -141,11 +138,9 @@ exports[`Form form should support disabled 1`] = `
   </div>
   <div
     class="ant-row ant-form-item"
-    role="row"
   >
     <div
       class="ant-col ant-col-4 ant-form-item-label"
-      role="cell"
     >
       <label
         class=""
@@ -156,7 +151,6 @@ exports[`Form form should support disabled 1`] = `
     </div>
     <div
       class="ant-col ant-col-14 ant-form-item-control"
-      role="cell"
     >
       <div
         class="ant-form-item-control-input"
@@ -212,11 +206,9 @@ exports[`Form form should support disabled 1`] = `
   </div>
   <div
     class="ant-row ant-form-item"
-    role="row"
   >
     <div
       class="ant-col ant-col-4 ant-form-item-label"
-      role="cell"
     >
       <label
         class=""
@@ -227,7 +219,6 @@ exports[`Form form should support disabled 1`] = `
     </div>
     <div
       class="ant-col ant-col-14 ant-form-item-control"
-      role="cell"
     >
       <div
         class="ant-form-item-control-input"
@@ -246,11 +237,9 @@ exports[`Form form should support disabled 1`] = `
   </div>
   <div
     class="ant-row ant-form-item"
-    role="row"
   >
     <div
       class="ant-col ant-col-4 ant-form-item-label"
-      role="cell"
     >
       <label
         class=""
@@ -261,7 +250,6 @@ exports[`Form form should support disabled 1`] = `
     </div>
     <div
       class="ant-col ant-col-14 ant-form-item-control"
-      role="cell"
     >
       <div
         class="ant-form-item-control-input"
@@ -332,11 +320,9 @@ exports[`Form form should support disabled 1`] = `
   </div>
   <div
     class="ant-row ant-form-item"
-    role="row"
   >
     <div
       class="ant-col ant-col-4 ant-form-item-label"
-      role="cell"
     >
       <label
         class=""
@@ -347,7 +333,6 @@ exports[`Form form should support disabled 1`] = `
     </div>
     <div
       class="ant-col ant-col-14 ant-form-item-control"
-      role="cell"
     >
       <div
         class="ant-form-item-control-input"
@@ -417,11 +402,9 @@ exports[`Form form should support disabled 1`] = `
   </div>
   <div
     class="ant-row ant-form-item"
-    role="row"
   >
     <div
       class="ant-col ant-col-4 ant-form-item-label"
-      role="cell"
     >
       <label
         class=""
@@ -432,7 +415,6 @@ exports[`Form form should support disabled 1`] = `
     </div>
     <div
       class="ant-col ant-col-14 ant-form-item-control"
-      role="cell"
     >
       <div
         class="ant-form-item-control-input"
@@ -502,11 +484,9 @@ exports[`Form form should support disabled 1`] = `
   </div>
   <div
     class="ant-row ant-form-item"
-    role="row"
   >
     <div
       class="ant-col ant-col-4 ant-form-item-label"
-      role="cell"
     >
       <label
         class=""
@@ -517,7 +497,6 @@ exports[`Form form should support disabled 1`] = `
     </div>
     <div
       class="ant-col ant-col-14 ant-form-item-control"
-      role="cell"
     >
       <div
         class="ant-form-item-control-input"
@@ -570,11 +549,9 @@ exports[`Form form should support disabled 1`] = `
   </div>
   <div
     class="ant-row ant-form-item"
-    role="row"
   >
     <div
       class="ant-col ant-col-4 ant-form-item-label"
-      role="cell"
     >
       <label
         class=""
@@ -585,7 +562,6 @@ exports[`Form form should support disabled 1`] = `
     </div>
     <div
       class="ant-col ant-col-14 ant-form-item-control"
-      role="cell"
     >
       <div
         class="ant-form-item-control-input"
@@ -680,11 +656,9 @@ exports[`Form form should support disabled 1`] = `
   </div>
   <div
     class="ant-row ant-form-item"
-    role="row"
   >
     <div
       class="ant-col ant-col-4 ant-form-item-label"
-      role="cell"
     >
       <label
         class=""
@@ -695,7 +669,6 @@ exports[`Form form should support disabled 1`] = `
     </div>
     <div
       class="ant-col ant-col-14 ant-form-item-control"
-      role="cell"
     >
       <div
         class="ant-form-item-control-input"
@@ -782,11 +755,9 @@ exports[`Form form should support disabled 1`] = `
   </div>
   <div
     class="ant-row ant-form-item"
-    role="row"
   >
     <div
       class="ant-col ant-col-4 ant-form-item-label"
-      role="cell"
     >
       <label
         class=""
@@ -797,7 +768,6 @@ exports[`Form form should support disabled 1`] = `
     </div>
     <div
       class="ant-col ant-col-14 ant-form-item-control"
-      role="cell"
     >
       <div
         class="ant-form-item-control-input"
@@ -815,11 +785,9 @@ exports[`Form form should support disabled 1`] = `
   </div>
   <div
     class="ant-row ant-form-item"
-    role="row"
   >
     <div
       class="ant-col ant-col-4 ant-form-item-label"
-      role="cell"
     >
       <label
         class=""
@@ -830,7 +798,6 @@ exports[`Form form should support disabled 1`] = `
     </div>
     <div
       class="ant-col ant-col-14 ant-form-item-control"
-      role="cell"
     >
       <div
         class="ant-form-item-control-input"
@@ -857,11 +824,9 @@ exports[`Form form should support disabled 1`] = `
   </div>
   <div
     class="ant-row ant-form-item"
-    role="row"
   >
     <div
       class="ant-col ant-col-4 ant-form-item-label"
-      role="cell"
     >
       <label
         class=""
@@ -872,7 +837,6 @@ exports[`Form form should support disabled 1`] = `
     </div>
     <div
       class="ant-col ant-col-14 ant-form-item-control"
-      role="cell"
     >
       <div
         class="ant-form-item-control-input"
@@ -901,11 +865,9 @@ exports[`Form form should support disabled 2`] = `
 >
   <div
     class="ant-row ant-form-item ant-form-item-has-success"
-    role="row"
   >
     <div
       class="ant-col ant-col-4 ant-form-item-label"
-      role="cell"
     >
       <label
         class=""
@@ -917,7 +879,6 @@ exports[`Form form should support disabled 2`] = `
     </div>
     <div
       class="ant-col ant-col-14 ant-form-item-control"
-      role="cell"
     >
       <div
         class="ant-form-item-control-input"
@@ -951,11 +912,9 @@ exports[`Form form should support disabled 2`] = `
   </div>
   <div
     class="ant-row ant-form-item"
-    role="row"
   >
     <div
       class="ant-col ant-col-4 ant-form-item-label"
-      role="cell"
     >
       <label
         class=""
@@ -966,7 +925,6 @@ exports[`Form form should support disabled 2`] = `
     </div>
     <div
       class="ant-col ant-col-14 ant-form-item-control"
-      role="cell"
     >
       <div
         class="ant-form-item-control-input"
@@ -1022,11 +980,9 @@ exports[`Form form should support disabled 2`] = `
   </div>
   <div
     class="ant-row ant-form-item"
-    role="row"
   >
     <div
       class="ant-col ant-col-4 ant-form-item-label"
-      role="cell"
     >
       <label
         class=""
@@ -1037,7 +993,6 @@ exports[`Form form should support disabled 2`] = `
     </div>
     <div
       class="ant-col ant-col-14 ant-form-item-control"
-      role="cell"
     >
       <div
         class="ant-form-item-control-input"
@@ -1056,11 +1011,9 @@ exports[`Form form should support disabled 2`] = `
   </div>
   <div
     class="ant-row ant-form-item"
-    role="row"
   >
     <div
       class="ant-col ant-col-4 ant-form-item-label"
-      role="cell"
     >
       <label
         class=""
@@ -1071,7 +1024,6 @@ exports[`Form form should support disabled 2`] = `
     </div>
     <div
       class="ant-col ant-col-14 ant-form-item-control"
-      role="cell"
     >
       <div
         class="ant-form-item-control-input"
@@ -1142,11 +1094,9 @@ exports[`Form form should support disabled 2`] = `
   </div>
   <div
     class="ant-row ant-form-item"
-    role="row"
   >
     <div
       class="ant-col ant-col-4 ant-form-item-label"
-      role="cell"
     >
       <label
         class=""
@@ -1157,7 +1107,6 @@ exports[`Form form should support disabled 2`] = `
     </div>
     <div
       class="ant-col ant-col-14 ant-form-item-control"
-      role="cell"
     >
       <div
         class="ant-form-item-control-input"
@@ -1227,11 +1176,9 @@ exports[`Form form should support disabled 2`] = `
   </div>
   <div
     class="ant-row ant-form-item"
-    role="row"
   >
     <div
       class="ant-col ant-col-4 ant-form-item-label"
-      role="cell"
     >
       <label
         class=""
@@ -1242,7 +1189,6 @@ exports[`Form form should support disabled 2`] = `
     </div>
     <div
       class="ant-col ant-col-14 ant-form-item-control"
-      role="cell"
     >
       <div
         class="ant-form-item-control-input"
@@ -1312,11 +1258,9 @@ exports[`Form form should support disabled 2`] = `
   </div>
   <div
     class="ant-row ant-form-item"
-    role="row"
   >
     <div
       class="ant-col ant-col-4 ant-form-item-label"
-      role="cell"
     >
       <label
         class=""
@@ -1327,7 +1271,6 @@ exports[`Form form should support disabled 2`] = `
     </div>
     <div
       class="ant-col ant-col-14 ant-form-item-control"
-      role="cell"
     >
       <div
         class="ant-form-item-control-input"
@@ -1380,11 +1323,9 @@ exports[`Form form should support disabled 2`] = `
   </div>
   <div
     class="ant-row ant-form-item"
-    role="row"
   >
     <div
       class="ant-col ant-col-4 ant-form-item-label"
-      role="cell"
     >
       <label
         class=""
@@ -1395,7 +1336,6 @@ exports[`Form form should support disabled 2`] = `
     </div>
     <div
       class="ant-col ant-col-14 ant-form-item-control"
-      role="cell"
     >
       <div
         class="ant-form-item-control-input"
@@ -1490,11 +1430,9 @@ exports[`Form form should support disabled 2`] = `
   </div>
   <div
     class="ant-row ant-form-item"
-    role="row"
   >
     <div
       class="ant-col ant-col-4 ant-form-item-label"
-      role="cell"
     >
       <label
         class=""
@@ -1505,7 +1443,6 @@ exports[`Form form should support disabled 2`] = `
     </div>
     <div
       class="ant-col ant-col-14 ant-form-item-control"
-      role="cell"
     >
       <div
         class="ant-form-item-control-input"
@@ -1592,11 +1529,9 @@ exports[`Form form should support disabled 2`] = `
   </div>
   <div
     class="ant-row ant-form-item"
-    role="row"
   >
     <div
       class="ant-col ant-col-4 ant-form-item-label"
-      role="cell"
     >
       <label
         class=""
@@ -1607,7 +1542,6 @@ exports[`Form form should support disabled 2`] = `
     </div>
     <div
       class="ant-col ant-col-14 ant-form-item-control"
-      role="cell"
     >
       <div
         class="ant-form-item-control-input"
@@ -1625,11 +1559,9 @@ exports[`Form form should support disabled 2`] = `
   </div>
   <div
     class="ant-row ant-form-item"
-    role="row"
   >
     <div
       class="ant-col ant-col-4 ant-form-item-label"
-      role="cell"
     >
       <label
         class=""
@@ -1640,7 +1572,6 @@ exports[`Form form should support disabled 2`] = `
     </div>
     <div
       class="ant-col ant-col-14 ant-form-item-control"
-      role="cell"
     >
       <div
         class="ant-form-item-control-input"
@@ -1667,11 +1598,9 @@ exports[`Form form should support disabled 2`] = `
   </div>
   <div
     class="ant-row ant-form-item"
-    role="row"
   >
     <div
       class="ant-col ant-col-4 ant-form-item-label"
-      role="cell"
     >
       <label
         class=""
@@ -1682,7 +1611,6 @@ exports[`Form form should support disabled 2`] = `
     </div>
     <div
       class="ant-col ant-col-14 ant-form-item-control"
-      role="cell"
     >
       <div
         class="ant-form-item-control-input"
diff --git a/components/modal/demo/dark.md b/components/modal/demo/dark.md
index 7ca8333270..a26eedbb60 100644
--- a/components/modal/demo/dark.md
+++ b/components/modal/demo/dark.md
@@ -569,7 +569,7 @@ export default () => {
           <Meta title="Europe Street beat" description="www.instagram.com" />
         </Card>
         <Slider defaultValue={30} />
-        <DatePicker defaultValue={moment('2015/01/01', 'YYYY/MM/DD')} format="YYYY/MM/DD" />
+        <DatePicker defaultValue={dayjs('2015/01/01', 'YYYY/MM/DD')} format="YYYY/MM/DD" />
         <Badge count={5}>
           <a href="#" className="head-example" />
         </Badge>