update snapshot

components/empty/__tests__/__snapshots__/demo.test.js.snap

@@ -528,11 +528,7 @@ exports[`renders ./components/empty/demo/config-provider.md correctly 1`] = `
                         Name
                       </th>
                       <th
-<<<<<<< HEAD
                         class="ant-table-cell"
-=======
-                        class="ant-table-row-cell-last"
->>>>>>> origin/master
                       >
                         Age
                       </th>

components/form/__tests__/__snapshots__/demo.test.js.snap

@@ -4588,10 +4588,6 @@ exports[`renders ./components/form/demo/validate-static.md correctly 1`] = `
             class="ant-picker-input"
           >
             <input
-<<<<<<< HEAD
-=======
-              class="ant-time-picker-input"
->>>>>>> origin/master
               placeholder="Select time"
               readonly=""
               size="10"
@@ -5114,7 +5110,7 @@ exports[`renders ./components/form/demo/validate-static.md correctly 1`] = `
     </div>
   </div>
   <div
-    class="ant-row ant-form-item"
+    class="ant-row ant-form-item ant-form-item-has-feedback ant-form-item-has-success"
   >
     <div
       class="ant-col ant-form-item-label ant-col-xs-24 ant-col-sm-5"
@@ -5127,13 +5123,10 @@ exports[`renders ./components/form/demo/validate-static.md correctly 1`] = `
       </label>
     </div>
     <div
-      class="ant-col ant-form-item-control-wrapper ant-col-xs-24 ant-col-sm-12"
+      class="ant-col ant-form-item-control ant-col-xs-24 ant-col-sm-12"
     >
       <div
-        class="ant-form-item-control has-feedback has-success"
+        class="ant-form-item-control-input"
-      >
-        <span
-          class="ant-form-item-children"
       >
         <span
           class="ant-input-affix-wrapper"
@@ -5151,9 +5144,10 @@ exports[`renders ./components/form/demo/validate-static.md correctly 1`] = `
         <span
           class="ant-form-item-children-icon"
         >
-            <i
+          <span
-              aria-label="icon: check-circle"
+            aria-label="check-circle"
             class="anticon anticon-check-circle"
+            role="img"
           >
             <svg
               aria-hidden="true"
@@ -5166,17 +5160,16 @@ exports[`renders ./components/form/demo/validate-static.md correctly 1`] = `
               width="1em"
             >
               <path
-                  d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm193.5 301.7l-210.6 292a31.8 31.8 0 0 1-51.7 0L318.5 484.9c-3.8-5.3 0-12.7 6.5-12.7h46.9c10.2 0 19.9 4.9 25.9 13.3l71.2 98.8 157.2-218c6-8.3 15.6-13.3 25.9-13.3H699c6.5 0 10.3 7.4 6.5 12.7z"
+                d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm193.5 301.7l-210.6 292a31.8 31.8 0 01-51.7 0L318.5 484.9c-3.8-5.3 0-12.7 6.5-12.7h46.9c10.2 0 19.9 4.9 25.9 13.3l71.2 98.8 157.2-218c6-8.3 15.6-13.3 25.9-13.3H699c6.5 0 10.3 7.4 6.5 12.7z"
               />
             </svg>
-            </i>
           </span>
         </span>
       </div>
     </div>
   </div>
   <div
-    class="ant-row ant-form-item"
+    class="ant-row ant-form-item ant-form-item-has-feedback ant-form-item-has-warning"
   >
     <div
       class="ant-col ant-form-item-label ant-col-xs-24 ant-col-sm-5"
@@ -5189,13 +5182,10 @@ exports[`renders ./components/form/demo/validate-static.md correctly 1`] = `
       </label>
     </div>
     <div
-      class="ant-col ant-form-item-control-wrapper ant-col-xs-24 ant-col-sm-12"
+      class="ant-col ant-form-item-control ant-col-xs-24 ant-col-sm-12"
     >
       <div
-        class="ant-form-item-control has-feedback has-warning"
+        class="ant-form-item-control-input"
-      >
-        <span
-          class="ant-form-item-children"
       >
         <span
           class="ant-input-password ant-input-affix-wrapper"
@@ -5210,9 +5200,10 @@ exports[`renders ./components/form/demo/validate-static.md correctly 1`] = `
           <span
             class="ant-input-suffix"
           >
-              <i
+            <span
-                aria-label="icon: eye-invisible"
+              aria-label="eye-invisible"
               class="anticon anticon-eye-invisible ant-input-password-icon"
+              role="img"
               tabindex="-1"
             >
               <svg
@@ -5226,21 +5217,22 @@ exports[`renders ./components/form/demo/validate-static.md correctly 1`] = `
                 width="1em"
               >
                 <path
-                    d="M942.2 486.2Q889.47 375.11 816.7 305l-50.88 50.88C807.31 395.53 843.45 447.4 874.7 512 791.5 684.2 673.4 766 512 766q-72.67 0-133.87-22.38L323 798.75Q408 838 512 838q288.3 0 430.2-300.3a60.29 60.29 0 0 0 0-51.5zm-63.57-320.64L836 122.88a8 8 0 0 0-11.32 0L715.31 232.2Q624.86 186 512 186q-288.3 0-430.2 300.3a60.3 60.3 0 0 0 0 51.5q56.69 119.4 136.5 191.41L112.48 835a8 8 0 0 0 0 11.31L155.17 889a8 8 0 0 0 11.31 0l712.15-712.12a8 8 0 0 0 0-11.32zM149.3 512C232.6 339.8 350.7 258 512 258c54.54 0 104.13 9.36 149.12 28.39l-70.3 70.3a176 176 0 0 0-238.13 238.13l-83.42 83.42C223.1 637.49 183.3 582.28 149.3 512zm246.7 0a112.11 112.11 0 0 1 146.2-106.69L401.31 546.2A112 112 0 0 1 396 512z"
+                  d="M942.2 486.2Q889.47 375.11 816.7 305l-50.88 50.88C807.31 395.53 843.45 447.4 874.7 512 791.5 684.2 673.4 766 512 766q-72.67 0-133.87-22.38L323 798.75Q408 838 512 838q288.3 0 430.2-300.3a60.29 60.29 0 000-51.5zm-63.57-320.64L836 122.88a8 8 0 00-11.32 0L715.31 232.2Q624.86 186 512 186q-288.3 0-430.2 300.3a60.3 60.3 0 000 51.5q56.69 119.4 136.5 191.41L112.48 835a8 8 0 000 11.31L155.17 889a8 8 0 0011.31 0l712.15-712.12a8 8 0 000-11.32zM149.3 512C232.6 339.8 350.7 258 512 258c54.54 0 104.13 9.36 149.12 28.39l-70.3 70.3a176 176 0 00-238.13 238.13l-83.42 83.42C223.1 637.49 183.3 582.28 149.3 512zm246.7 0a112.11 112.11 0 01146.2-106.69L401.31 546.2A112 112 0 01396 512z"
                 />
                 <path
-                    d="M508 624c-3.46 0-6.87-.16-10.25-.47l-52.82 52.82a176.09 176.09 0 0 0 227.42-227.42l-52.82 52.82c.31 3.38.47 6.79.47 10.25a111.94 111.94 0 0 1-112 112z"
+                  d="M508 624c-3.46 0-6.87-.16-10.25-.47l-52.82 52.82a176.09 176.09 0 00227.42-227.42l-52.82 52.82c.31 3.38.47 6.79.47 10.25a111.94 111.94 0 01-112 112z"
                 />
               </svg>
-              </i>
+            </span>
           </span>
         </span>
         <span
           class="ant-form-item-children-icon"
         >
-            <i
+          <span
-              aria-label="icon: exclamation-circle"
+            aria-label="exclamation-circle"
             class="anticon anticon-exclamation-circle"
+            role="img"
           >
             <svg
               aria-hidden="true"
@@ -5253,17 +5245,16 @@ exports[`renders ./components/form/demo/validate-static.md correctly 1`] = `
               width="1em"
             >
               <path
-                  d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm-32 232c0-4.4 3.6-8 8-8h48c4.4 0 8 3.6 8 8v272c0 4.4-3.6 8-8 8h-48c-4.4 0-8-3.6-8-8V296zm32 440a48.01 48.01 0 0 1 0-96 48.01 48.01 0 0 1 0 96z"
+                d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm-32 232c0-4.4 3.6-8 8-8h48c4.4 0 8 3.6 8 8v272c0 4.4-3.6 8-8 8h-48c-4.4 0-8-3.6-8-8V296zm32 440a48.01 48.01 0 010-96 48.01 48.01 0 010 96z"
               />
             </svg>
-            </i>
           </span>
         </span>
       </div>
     </div>
   </div>
   <div
-    class="ant-row ant-form-item"
+    class="ant-row ant-form-item ant-form-item-has-feedback ant-form-item-has-error"
   >
     <div
       class="ant-col ant-form-item-label ant-col-xs-24 ant-col-sm-5"
@@ -5276,13 +5267,10 @@ exports[`renders ./components/form/demo/validate-static.md correctly 1`] = `
       </label>
     </div>
     <div
-      class="ant-col ant-form-item-control-wrapper ant-col-xs-24 ant-col-sm-12"
+      class="ant-col ant-form-item-control ant-col-xs-24 ant-col-sm-12"
     >
       <div
-        class="ant-form-item-control has-feedback has-error"
+        class="ant-form-item-control-input"
-      >
-        <span
-          class="ant-form-item-children"
       >
         <span
           class="ant-input-password ant-input-affix-wrapper"
@@ -5297,9 +5285,10 @@ exports[`renders ./components/form/demo/validate-static.md correctly 1`] = `
           <span
             class="ant-input-suffix"
           >
-              <i
+            <span
-                aria-label="icon: eye-invisible"
+              aria-label="eye-invisible"
               class="anticon anticon-eye-invisible ant-input-password-icon"
+              role="img"
               tabindex="-1"
             >
               <svg
@@ -5313,21 +5302,22 @@ exports[`renders ./components/form/demo/validate-static.md correctly 1`] = `
                 width="1em"
               >
                 <path
-                    d="M942.2 486.2Q889.47 375.11 816.7 305l-50.88 50.88C807.31 395.53 843.45 447.4 874.7 512 791.5 684.2 673.4 766 512 766q-72.67 0-133.87-22.38L323 798.75Q408 838 512 838q288.3 0 430.2-300.3a60.29 60.29 0 0 0 0-51.5zm-63.57-320.64L836 122.88a8 8 0 0 0-11.32 0L715.31 232.2Q624.86 186 512 186q-288.3 0-430.2 300.3a60.3 60.3 0 0 0 0 51.5q56.69 119.4 136.5 191.41L112.48 835a8 8 0 0 0 0 11.31L155.17 889a8 8 0 0 0 11.31 0l712.15-712.12a8 8 0 0 0 0-11.32zM149.3 512C232.6 339.8 350.7 258 512 258c54.54 0 104.13 9.36 149.12 28.39l-70.3 70.3a176 176 0 0 0-238.13 238.13l-83.42 83.42C223.1 637.49 183.3 582.28 149.3 512zm246.7 0a112.11 112.11 0 0 1 146.2-106.69L401.31 546.2A112 112 0 0 1 396 512z"
+                  d="M942.2 486.2Q889.47 375.11 816.7 305l-50.88 50.88C807.31 395.53 843.45 447.4 874.7 512 791.5 684.2 673.4 766 512 766q-72.67 0-133.87-22.38L323 798.75Q408 838 512 838q288.3 0 430.2-300.3a60.29 60.29 0 000-51.5zm-63.57-320.64L836 122.88a8 8 0 00-11.32 0L715.31 232.2Q624.86 186 512 186q-288.3 0-430.2 300.3a60.3 60.3 0 000 51.5q56.69 119.4 136.5 191.41L112.48 835a8 8 0 000 11.31L155.17 889a8 8 0 0011.31 0l712.15-712.12a8 8 0 000-11.32zM149.3 512C232.6 339.8 350.7 258 512 258c54.54 0 104.13 9.36 149.12 28.39l-70.3 70.3a176 176 0 00-238.13 238.13l-83.42 83.42C223.1 637.49 183.3 582.28 149.3 512zm246.7 0a112.11 112.11 0 01146.2-106.69L401.31 546.2A112 112 0 01396 512z"
                 />
                 <path
-                    d="M508 624c-3.46 0-6.87-.16-10.25-.47l-52.82 52.82a176.09 176.09 0 0 0 227.42-227.42l-52.82 52.82c.31 3.38.47 6.79.47 10.25a111.94 111.94 0 0 1-112 112z"
+                  d="M508 624c-3.46 0-6.87-.16-10.25-.47l-52.82 52.82a176.09 176.09 0 00227.42-227.42l-52.82 52.82c.31 3.38.47 6.79.47 10.25a111.94 111.94 0 01-112 112z"
                 />
               </svg>
-              </i>
+            </span>
           </span>
         </span>
         <span
           class="ant-form-item-children-icon"
         >
-            <i
+          <span
-              aria-label="icon: close-circle"
+            aria-label="close-circle"
             class="anticon anticon-close-circle"
+            role="img"
           >
             <svg
               aria-hidden="true"
@@ -5340,10 +5330,9 @@ exports[`renders ./components/form/demo/validate-static.md correctly 1`] = `
               width="1em"
             >
               <path
-                  d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm165.4 618.2l-66-.3L512 563.4l-99.3 118.4-66.1.3c-4.4 0-8-3.5-8-8 0-1.9.7-3.7 1.9-5.2l130.1-155L340.5 359a8.32 8.32 0 0 1-1.9-5.2c0-4.4 3.6-8 8-8l66.1.3L512 464.6l99.3-118.4 66-.3c4.4 0 8 3.5 8 8 0 1.9-.7 3.7-1.9 5.2L553.5 514l130 155c1.2 1.5 1.9 3.3 1.9 5.2 0 4.4-3.6 8-8 8z"
+                d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm165.4 618.2l-66-.3L512 563.4l-99.3 118.4-66.1.3c-4.4 0-8-3.5-8-8 0-1.9.7-3.7 1.9-5.2l130.1-155L340.5 359a8.32 8.32 0 01-1.9-5.2c0-4.4 3.6-8 8-8l66.1.3L512 464.6l99.3-118.4 66-.3c4.4 0 8 3.5 8 8 0 1.9-.7 3.7-1.9 5.2L553.5 514l130 155c1.2 1.5 1.9 3.3 1.9 5.2 0 4.4-3.6 8-8 8z"
               />
             </svg>
-            </i>
           </span>
         </span>
       </div>

components/form/__tests__/index.test.js

@@ -5,7 +5,6 @@ import Form from '..';
 import Input from '../../input';
 import Button from '../../button';
 import mountTest from '../../../tests/shared/mountTest';
-import './type.test';
 
 jest.mock('scroll-into-view-if-needed');
 

components/form/__tests__/type.test.tsx

@@ -1,98 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-import * as React from 'react';
-import Form, { FormComponentProps, FormCreateOption } from '../Form';
-
-describe('Form TypeScript test', async () => {
-  it('empty test case placeholder to avoid jest error', () => {
-    // empty
-  });
-});
-
-// test Form.create on component without own props
-class WithoutOwnProps extends React.Component<any, any> {
-  state = {
-    foo: 'bar',
-  };
-  render() {
-    return <div>foo</div>;
-  }
-}
-
-const WithoutOwnPropsForm = Form.create()(WithoutOwnProps);
-
-<WithoutOwnPropsForm />;
-
-// test Form.create on component with own props
-interface WithOwnPropsProps extends FormComponentProps {
-  name: string;
-}
-
-class WithOwnProps extends React.Component<WithOwnPropsProps, any> {
-  state = {
-    foo: 'bar',
-  };
-
-  render() {
-    return <div>foo</div>;
-  }
-}
-
-const WithOwnPropsForm = Form.create<WithOwnPropsProps>()(WithOwnProps);
-
-<WithOwnPropsForm name="foo" />;
-
-// test Form.create with options
-interface WithCreateOptionsProps extends FormComponentProps {
-  username: string;
-}
-
-class WithCreateOptions extends React.Component<WithCreateOptionsProps, {}> {
-  render() {
-    return <div>foo</div>;
-  }
-}
-
-const mapPropsToFields = (props: WithCreateOptionsProps) => {
-  const { username } = props;
-
-  return {
-    username: Form.createFormField({ value: username }),
-  };
-};
-
-const formOptions: FormCreateOption<WithCreateOptionsProps> = { mapPropsToFields };
-
-const WithCreateOptionsForm = Form.create(formOptions)(WithCreateOptions);
-
-<WithCreateOptionsForm username="foo" />;
-
-// Should work with forwardRef & wrappedComponentRef
-// https://github.com/ant-design/ant-design/issues/16229
-if (React.forwardRef) {
-  interface ForwardProps extends FormComponentProps {
-    str: string;
-  }
-
-  const ForwardDemo = React.forwardRef(({ str }: ForwardProps, ref: React.Ref<HTMLDivElement>) => {
-    return <div ref={ref}>{str || ''}</div>;
-  });
-  const WrappedForwardDemo = Form.create<ForwardProps>()(ForwardDemo);
-  <WrappedForwardDemo str="" />;
-}
-
-interface WrappedRefProps extends FormComponentProps {
-  str: string;
-  test?: () => void;
-}
-class WrapRefDemo extends React.Component<WrappedRefProps> {
-  public getForm() {
-    return this.props.form;
-  }
-  public render() {
-    return <div>{this.props.str || ''}</div>;
-  }
-}
-
-const WrappedWrapRefDemo = Form.create<WrappedRefProps>()(WrapRefDemo);
-<WrappedWrapRefDemo str="" wrappedComponentRef={() => null} />;

components/input/__tests__/__snapshots__/demo.test.js.snap

@@ -411,92 +411,6 @@ exports[`renders ./components/input/demo/align.md correctly 1`] = `
         size="12"
         value=""
       />
-<<<<<<< HEAD
-=======
-      <i
-        aria-label="icon: calendar"
-        class="anticon anticon-calendar ant-calendar-picker-icon"
-      >
-        <svg
-          aria-hidden="true"
-          class=""
-          data-icon="calendar"
-          fill="currentColor"
-          focusable="false"
-          height="1em"
-          viewBox="64 64 896 896"
-          width="1em"
-        >
-          <path
-            d="M880 184H712v-64c0-4.4-3.6-8-8-8h-56c-4.4 0-8 3.6-8 8v64H384v-64c0-4.4-3.6-8-8-8h-56c-4.4 0-8 3.6-8 8v64H144c-17.7 0-32 14.3-32 32v664c0 17.7 14.3 32 32 32h736c17.7 0 32-14.3 32-32V216c0-17.7-14.3-32-32-32zm-40 656H184V460h656v380zM184 392V256h128v48c0 4.4 3.6 8 8 8h56c4.4 0 8-3.6 8-8v-48h256v48c0 4.4 3.6 8 8 8h56c4.4 0 8-3.6 8-8v-48h128v136H184z"
-          />
-        </svg>
-      </i>
-    </div>
-  </span>
-  <span
-    class="ant-time-picker"
-    style="width:100px"
-  >
-    <input
-      class="ant-time-picker-input"
-      placeholder="Select time"
-      type="text"
-      value=""
-    />
-    <span
-      class="ant-time-picker-icon"
-    >
-      <i
-        aria-label="icon: clock-circle"
-        class="anticon anticon-clock-circle ant-time-picker-clock-icon"
-      >
-        <svg
-          aria-hidden="true"
-          class=""
-          data-icon="clock-circle"
-          fill="currentColor"
-          focusable="false"
-          height="1em"
-          viewBox="64 64 896 896"
-          width="1em"
-        >
-          <path
-            d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm0 820c-205.4 0-372-166.6-372-372s166.6-372 372-372 372 166.6 372 372-166.6 372-372 372z"
-          />
-          <path
-            d="M686.7 638.6L544.1 535.5V288c0-4.4-3.6-8-8-8H488c-4.4 0-8 3.6-8 8v275.4c0 2.6 1.2 5 3.3 6.5l165.4 120.6c3.6 2.6 8.6 1.8 11.2-1.7l28.6-39c2.6-3.7 1.8-8.7-1.8-11.2z"
-          />
-        </svg>
-      </i>
-    </span>
-  </span>
-  <div
-    class="ant-select ant-select-enabled"
-    style="width:100px"
-  >
-    <div
-      aria-autocomplete="list"
-      aria-controls=""
-      aria-expanded="false"
-      aria-haspopup="true"
-      class="ant-select-selection
-            ant-select-selection--single"
-      role="combobox"
-      tabindex="0"
-    >
-      <div
-        class="ant-select-selection__rendered"
-      >
-        <div
-          class="ant-select-selection-selected-value"
-          style="display:block;opacity:1"
-          title="Jack"
-        >
-          Jack
-        </div>
-      </div>
->>>>>>> origin/master
       <span
         class="ant-picker-suffix"
       >

components/table/__tests__/__snapshots__/Table.expand.test.js.snap

@@ -28,11 +28,7 @@ exports[`Table.expand click to expand 1`] = `
               <thead>
                 <tr>
                   <th
-<<<<<<< HEAD
                     class="ant-table-cell"
-=======
-                    class="ant-table-row-cell-last"
->>>>>>> origin/master
                   >
                     Name
                   </th>

components/table/__tests__/__snapshots__/Table.filter.test.js.snap

@@ -61,46 +61,45 @@ exports[`Table.filter renders custom filter icon as string correctly 1`] = `
       class="ant-spin-container"
     >
       <div
-        class="ant-table ant-table-default ant-table-scroll-position-left"
+        class="ant-table"
+      >
+        <div
+          class="ant-table-container"
         >
           <div
             class="ant-table-content"
-        >
-          <div
-            class="ant-table-body"
           >
             <table
-              class=""
+              style="table-layout: auto;"
             >
               <colgroup>
                 <col />
               </colgroup>
-              <thead
+              <thead>
-                class="ant-table-thead"
-              >
                 <tr>
                   <th
-                    class="ant-table-column-has-actions ant-table-column-has-filters ant-table-row-cell-last"
+                    class="ant-table-cell"
+                  >
+                    <div
+                      class="ant-table-filter-column"
                     >
                       <span
-                      class="ant-table-header-column"
+                        class="ant-table-filter-column-title"
-                    >
-                      <div>
-                        <span
-                          class="ant-table-column-title"
                       >
                         Name
                       </span>
                       <span
-                          class="ant-table-column-sorter"
+                        class="ant-table-filter-trigger-container"
-                        />
+                      >
-                      </div>
-                    </span>
                         <span
-                      class="ant-table-filter-icon ant-dropdown-trigger"
+                          class="ant-table-filter-trigger ant-dropdown-trigger"
+                          role="button"
+                          tabindex="-1"
                         >
                           string
                         </span>
+                      </span>
+                    </div>
                   </th>
                 </tr>
               </thead>
@@ -109,40 +108,36 @@ exports[`Table.filter renders custom filter icon as string correctly 1`] = `
               >
                 <tr
                   class="ant-table-row ant-table-row-level-0"
-                  data-row-key="0"
                 >
                   <td
-                    class="ant-table-column-has-actions ant-table-column-has-filters"
+                    class="ant-table-cell"
                   >
                     Jack
                   </td>
                 </tr>
                 <tr
                   class="ant-table-row ant-table-row-level-0"
-                  data-row-key="1"
                 >
                   <td
-                    class="ant-table-column-has-actions ant-table-column-has-filters"
+                    class="ant-table-cell"
                   >
                     Lucy
                   </td>
                 </tr>
                 <tr
                   class="ant-table-row ant-table-row-level-0"
-                  data-row-key="2"
                 >
                   <td
-                    class="ant-table-column-has-actions ant-table-column-has-filters"
+                    class="ant-table-cell"
                   >
                     Tom
                   </td>
                 </tr>
                 <tr
                   class="ant-table-row ant-table-row-level-0"
-                  data-row-key="3"
                 >
                   <td
-                    class="ant-table-column-has-actions ant-table-column-has-filters"
+                    class="ant-table-cell"
                   >
                     Jerry
                   </td>
@@ -201,38 +196,33 @@ exports[`Table.filter renders custom filter icon with right Tooltip title 1`] =
               <thead>
                 <tr>
                   <th
-<<<<<<< HEAD
                     class="ant-table-cell"
                   >
                     <div
                       class="ant-table-filter-column"
-=======
-                    class="ant-table-column-has-actions ant-table-column-has-filters ant-table-row-cell-last"
                     >
                       <span
-                      class="ant-table-header-column"
+                        class="ant-table-filter-column-title"
-                    >
-                      <div>
-                        <span
-                          class="ant-table-column-title"
                       >
                         Name
                       </span>
                       <span
-                          class="ant-table-column-sorter"
+                        class="ant-table-filter-trigger-container"
-                        />
+                      >
-                      </div>
-                    </span>
                         <span
-                      class="ant-tooltip-open ant-table-filter-icon ant-dropdown-trigger"
+                          class="ant-table-filter-trigger ant-dropdown-trigger"
-                      style=""
+                          role="button"
+                          tabindex="-1"
+                        >
+                          <span
+                            class="ant-tooltip-open"
                           >
                             Tooltip
                           </span>
                           <div>
                             <div
-                        class="ant-tooltip ant-tooltip-placement-top zoom-big-fast-appear"
+                              class="ant-tooltip"
-                        style="left: -999px; top: -1003px; transform-origin: 50% 4px;"
+                              style="opacity: 0;"
                             >
                               <div
                                 class="ant-tooltip-content"
@@ -249,6 +239,9 @@ exports[`Table.filter renders custom filter icon with right Tooltip title 1`] =
                               </div>
                             </div>
                           </div>
+                        </span>
+                      </span>
+                    </div>
                   </th>
                 </tr>
               </thead>
@@ -257,40 +250,36 @@ exports[`Table.filter renders custom filter icon with right Tooltip title 1`] =
               >
                 <tr
                   class="ant-table-row ant-table-row-level-0"
-                  data-row-key="0"
                 >
                   <td
-                    class="ant-table-column-has-actions ant-table-column-has-filters"
+                    class="ant-table-cell"
                   >
                     Jack
                   </td>
                 </tr>
                 <tr
                   class="ant-table-row ant-table-row-level-0"
-                  data-row-key="1"
                 >
                   <td
-                    class="ant-table-column-has-actions ant-table-column-has-filters"
+                    class="ant-table-cell"
                   >
                     Lucy
                   </td>
                 </tr>
                 <tr
                   class="ant-table-row ant-table-row-level-0"
-                  data-row-key="2"
                 >
                   <td
-                    class="ant-table-column-has-actions ant-table-column-has-filters"
+                    class="ant-table-cell"
                   >
                     Tom
                   </td>
                 </tr>
                 <tr
                   class="ant-table-row ant-table-row-level-0"
-                  data-row-key="3"
                 >
                   <td
-                    class="ant-table-column-has-actions ant-table-column-has-filters"
+                    class="ant-table-cell"
                   >
                     Jerry
                   </td>
@@ -316,30 +305,27 @@ exports[`Table.filter renders filter correctly 1`] = `
       class="ant-spin-container"
     >
       <div
-        class="ant-table ant-table-default ant-table-scroll-position-left"
+        class="ant-table"
+      >
+        <div
+          class="ant-table-container"
         >
           <div
             class="ant-table-content"
-        >
-          <div
-            class="ant-table-body"
           >
             <table
-              class=""
+              style="table-layout: auto;"
             >
               <colgroup>
                 <col />
               </colgroup>
-              <thead
+              <thead>
-                class="ant-table-thead"
-              >
                 <tr>
                   <th
-                    class="ant-table-column-has-actions ant-table-column-has-filters ant-table-row-cell-last"
+                    class="ant-table-cell"
                   >
-                    <span
+                    <div
-                      class="ant-table-header-column"
+                      class="ant-table-filter-column"
->>>>>>> origin/master
                     >
                       <span
                         class="ant-table-filter-column-title"
@@ -649,11 +635,7 @@ exports[`Table.filter should support getPopupContainer 1`] = `
               <thead>
                 <tr>
                   <th
-<<<<<<< HEAD
                     class="ant-table-cell"
-=======
-                    class="ant-table-column-has-actions ant-table-column-has-filters ant-table-row-cell-last"
->>>>>>> origin/master
                   >
                     <div
                       class="ant-table-filter-column"
@@ -868,11 +850,7 @@ exports[`Table.filter should support getPopupContainer from ConfigProvider 1`] =
               <thead>
                 <tr>
                   <th
-<<<<<<< HEAD
                     class="ant-table-cell"
-=======
-                    class="ant-table-column-has-actions ant-table-column-has-filters ant-table-row-cell-last"
->>>>>>> origin/master
                   >
                     <div
                       class="ant-table-filter-column"

components/table/__tests__/__snapshots__/Table.pagination.test.js.snap

@@ -28,11 +28,7 @@ exports[`Table.pagination Accepts pagination as true 1`] = `
               <thead>
                 <tr>
                   <th
-<<<<<<< HEAD
                     class="ant-table-cell"
-=======
-                    class="ant-table-row-cell-last"
->>>>>>> origin/master
                   >
                     Name
                   </th>
@@ -189,11 +185,7 @@ exports[`Table.pagination renders pagination correctly 1`] = `
               <thead>
                 <tr>
                   <th
-<<<<<<< HEAD
                     class="ant-table-cell"
-=======
-                    class="ant-table-row-cell-last"
->>>>>>> origin/master
                   >
                     Name
                   </th>

components/table/__tests__/__snapshots__/Table.rowSelection.test.js.snap

@@ -49,7 +49,6 @@ exports[`Table.rowSelection fix selection column on the left 1`] = `
                           <span
                             class="ant-checkbox-inner"
                           />
-<<<<<<< HEAD
                         </span>
                       </label>
                     </div>
@@ -72,13 +71,6 @@ exports[`Table.rowSelection fix selection column on the left 1`] = `
                   >
                     <label
                       class="ant-checkbox-wrapper"
-=======
-                        </div>
-                      </span>
-                    </th>
-                    <th
-                      class="ant-table-row-cell-last"
->>>>>>> origin/master
                     >
                       <span
                         class="ant-checkbox"
@@ -161,17 +153,11 @@ exports[`Table.rowSelection fix selection column on the left 1`] = `
                   <td
                     class="ant-table-cell ant-table-selection-column"
                   >
-<<<<<<< HEAD
                     <label
                       class="ant-checkbox-wrapper"
                     >
                       <span
                         class="ant-checkbox"
-=======
-                    <tr>
-                      <th
-                        class="ant-table-selection-column ant-table-row-cell-last"
->>>>>>> origin/master
                       >
                         <input
                           class="ant-checkbox-input"
@@ -323,7 +309,6 @@ exports[`Table.rowSelection fix selection column on the left when any other colu
                           <span
                             class="ant-checkbox-inner"
                           />
-<<<<<<< HEAD
                         </span>
                       </label>
                     </div>
@@ -348,13 +333,6 @@ exports[`Table.rowSelection fix selection column on the left when any other colu
                   >
                     <label
                       class="ant-checkbox-wrapper"
-=======
-                        </div>
-                      </span>
-                    </th>
-                    <th
-                      class="ant-table-fixed-columns-in-body ant-table-row-cell-last"
->>>>>>> origin/master
                     >
                       <span
                         class="ant-checkbox"
@@ -443,53 +421,11 @@ exports[`Table.rowSelection fix selection column on the left when any other colu
                     class="ant-table-cell ant-table-selection-column ant-table-cell-fix-left"
                     style="position:sticky;left:0"
                   >
-<<<<<<< HEAD
                     <label
                       class="ant-checkbox-wrapper"
                     >
                       <span
                         class="ant-checkbox"
-=======
-                    <tr>
-                      <th
-                        class="ant-table-selection-column"
-                      >
-                        <span
-                          class="ant-table-header-column"
-                        >
-                          <div>
-                            <span
-                              class="ant-table-column-title"
-                            >
-                              <div
-                                class="ant-table-selection"
-                              >
-                                <label
-                                  class="ant-checkbox-wrapper"
-                                >
-                                  <span
-                                    class="ant-checkbox"
-                                  >
-                                    <input
-                                      class="ant-checkbox-input"
-                                      type="checkbox"
-                                    />
-                                    <span
-                                      class="ant-checkbox-inner"
-                                    />
-                                  </span>
-                                </label>
-                              </div>
-                            </span>
-                            <span
-                              class="ant-table-column-sorter"
-                            />
-                          </div>
-                        </span>
-                      </th>
-                      <th
-                        class="ant-table-row-cell-last"
->>>>>>> origin/master
                       >
                         <input
                           class="ant-checkbox-input"
@@ -650,11 +586,7 @@ exports[`Table.rowSelection use column as selection column when key is \`selecti
               <thead>
                 <tr>
                   <th
-<<<<<<< HEAD
                     class="ant-table-cell ant-table-selection-column"
-=======
-                    class="ant-table-selection-column ant-table-row-cell-last"
->>>>>>> origin/master
                   >
                     <div
                       class="ant-table-selection"

components/table/__tests__/__snapshots__/Table.sorter.test.js.snap

@@ -4,11 +4,7 @@ exports[`Table.sorter renders sorter icon correctly 1`] = `
 <thead>
   <tr>
     <th
-<<<<<<< HEAD
       class="ant-table-cell ant-table-column-has-sorters"
-=======
-      class="ant-table-column-has-actions ant-table-column-has-sorters ant-table-row-cell-last"
->>>>>>> origin/master
     >
       <div
         class="ant-table-column-sorters"
@@ -98,11 +94,7 @@ exports[`Table.sorter should support defaultOrder in Column 1`] = `
               <thead>
                 <tr>
                   <th
-<<<<<<< HEAD
                     class="ant-table-cell ant-table-column-has-sorters"
-=======
-                    class="ant-table-column-has-actions ant-table-column-has-sorters ant-table-column-sort ant-table-row-cell-last"
->>>>>>> origin/master
                   >
                     <div
                       class="ant-table-column-sorters"

components/table/__tests__/__snapshots__/Table.test.js.snap

@@ -36,11 +36,7 @@ exports[`Table renders JSX correctly 1`] = `
                     Name
                   </th>
                   <th
-<<<<<<< HEAD
                     class="ant-table-cell"
-=======
-                    class="ant-table-row-cell-last"
->>>>>>> origin/master
                     rowspan="2"
                   >
                     Age

components/table/__tests__/__snapshots__/empty.test.js.snap

@@ -70,11 +70,7 @@ exports[`Table renders empty table 1`] = `
                     Column 7
                   </th>
                   <th
-<<<<<<< HEAD
                     class="ant-table-cell"
-=======
-                    class="ant-table-row-cell-last"
->>>>>>> origin/master
                   >
                     Column 8
                   </th>
@@ -218,11 +214,7 @@ exports[`Table renders empty table with custom emptyText 1`] = `
                     Column 7
                   </th>
                   <th
-<<<<<<< HEAD
                     class="ant-table-cell"
-=======
-                    class="ant-table-row-cell-last"
->>>>>>> origin/master
                   >
                     Column 8
                   </th>
@@ -318,240 +310,9 @@ exports[`Table renders empty table with fixed columns 1`] = `
             <table
               style="table-layout:auto"
             >
-<<<<<<< HEAD
               <colgroup>
                 <col
                   style="width:100px;min-width:100px"
-=======
-              <table
-                class=""
-              >
-                <colgroup>
-                  <col
-                    style="width:100px;min-width:100px"
-                  />
-                  <col
-                    style="width:100px;min-width:100px"
-                  />
-                  <col />
-                  <col />
-                  <col />
-                  <col />
-                  <col />
-                  <col />
-                  <col />
-                  <col />
-                  <col
-                    style="width:100px;min-width:100px"
-                  />
-                </colgroup>
-                <thead
-                  class="ant-table-thead"
-                >
-                  <tr>
-                    <th
-                      class="ant-table-fixed-columns-in-body ant-table-row-cell-break-word"
-                    >
-                      <span
-                        class="ant-table-header-column"
-                      >
-                        <div>
-                          <span
-                            class="ant-table-column-title"
-                          >
-                            Full Name
-                          </span>
-                          <span
-                            class="ant-table-column-sorter"
-                          />
-                        </div>
-                      </span>
-                    </th>
-                    <th
-                      class="ant-table-fixed-columns-in-body ant-table-row-cell-break-word"
-                    >
-                      <span
-                        class="ant-table-header-column"
-                      >
-                        <div>
-                          <span
-                            class="ant-table-column-title"
-                          >
-                            Age
-                          </span>
-                          <span
-                            class="ant-table-column-sorter"
-                          />
-                        </div>
-                      </span>
-                    </th>
-                    <th
-                      class=""
-                    >
-                      <span
-                        class="ant-table-header-column"
-                      >
-                        <div>
-                          <span
-                            class="ant-table-column-title"
-                          >
-                            Column 1
-                          </span>
-                          <span
-                            class="ant-table-column-sorter"
-                          />
-                        </div>
-                      </span>
-                    </th>
-                    <th
-                      class=""
-                    >
-                      <span
-                        class="ant-table-header-column"
-                      >
-                        <div>
-                          <span
-                            class="ant-table-column-title"
-                          >
-                            Column 2
-                          </span>
-                          <span
-                            class="ant-table-column-sorter"
-                          />
-                        </div>
-                      </span>
-                    </th>
-                    <th
-                      class=""
-                    >
-                      <span
-                        class="ant-table-header-column"
-                      >
-                        <div>
-                          <span
-                            class="ant-table-column-title"
-                          >
-                            Column 3
-                          </span>
-                          <span
-                            class="ant-table-column-sorter"
-                          />
-                        </div>
-                      </span>
-                    </th>
-                    <th
-                      class=""
-                    >
-                      <span
-                        class="ant-table-header-column"
-                      >
-                        <div>
-                          <span
-                            class="ant-table-column-title"
-                          >
-                            Column 4
-                          </span>
-                          <span
-                            class="ant-table-column-sorter"
-                          />
-                        </div>
-                      </span>
-                    </th>
-                    <th
-                      class=""
-                    >
-                      <span
-                        class="ant-table-header-column"
-                      >
-                        <div>
-                          <span
-                            class="ant-table-column-title"
-                          >
-                            Column 5
-                          </span>
-                          <span
-                            class="ant-table-column-sorter"
-                          />
-                        </div>
-                      </span>
-                    </th>
-                    <th
-                      class=""
-                    >
-                      <span
-                        class="ant-table-header-column"
-                      >
-                        <div>
-                          <span
-                            class="ant-table-column-title"
-                          >
-                            Column 6
-                          </span>
-                          <span
-                            class="ant-table-column-sorter"
-                          />
-                        </div>
-                      </span>
-                    </th>
-                    <th
-                      class=""
-                    >
-                      <span
-                        class="ant-table-header-column"
-                      >
-                        <div>
-                          <span
-                            class="ant-table-column-title"
-                          >
-                            Column 7
-                          </span>
-                          <span
-                            class="ant-table-column-sorter"
-                          />
-                        </div>
-                      </span>
-                    </th>
-                    <th
-                      class=""
-                    >
-                      <span
-                        class="ant-table-header-column"
-                      >
-                        <div>
-                          <span
-                            class="ant-table-column-title"
-                          >
-                            Column 8
-                          </span>
-                          <span
-                            class="ant-table-column-sorter"
-                          />
-                        </div>
-                      </span>
-                    </th>
-                    <th
-                      class="ant-table-fixed-columns-in-body ant-table-row-cell-break-word ant-table-row-cell-last"
-                    >
-                      <span
-                        class="ant-table-header-column"
-                      >
-                        <div>
-                          <span
-                            class="ant-table-column-title"
-                          >
-                            Action
-                          </span>
-                          <span
-                            class="ant-table-column-sorter"
-                          />
-                        </div>
-                      </span>
-                    </th>
-                  </tr>
-                </thead>
-                <tbody
-                  class="ant-table-tbody"
->>>>>>> origin/master
                 />
                 <col
                   style="width:100px;min-width:100px"
@@ -665,7 +426,6 @@ exports[`Table renders empty table with fixed columns 1`] = `
                               rx="32"
                               ry="7"
                             />
-<<<<<<< HEAD
                             <g
                               class="ant-empty-img-simple-g"
                               fill-rule="nonzero"
@@ -683,62 +443,6 @@ exports[`Table renders empty table with fixed columns 1`] = `
                       </div>
                       <p
                         class="ant-empty-description"
-=======
-                          </div>
-                        </span>
-                      </th>
-                      <th
-                        class="ant-table-row-cell-break-word ant-table-row-cell-last"
-                      >
-                        <span
-                          class="ant-table-header-column"
-                        >
-                          <div>
-                            <span
-                              class="ant-table-column-title"
-                            >
-                              Age
-                            </span>
-                            <span
-                              class="ant-table-column-sorter"
-                            />
-                          </div>
-                        </span>
-                      </th>
-                    </tr>
-                  </thead>
-                  <tbody
-                    class="ant-table-tbody"
-                  />
-                </table>
-              </div>
-            </div>
-          </div>
-          <div
-            class="ant-table-fixed-right"
-          >
-            <div
-              class="ant-table-body-outer"
-              style="-webkit-transform:translate3d (0, 0, 0)"
-            >
-              <div
-                class="ant-table-body-inner"
-              >
-                <table
-                  class="ant-table-fixed"
-                >
-                  <colgroup>
-                    <col
-                      style="width:100px;min-width:100px"
-                    />
-                  </colgroup>
-                  <thead
-                    class="ant-table-thead"
-                  >
-                    <tr>
-                      <th
-                        class="ant-table-row-cell-break-word ant-table-row-cell-last"
->>>>>>> origin/master
                       >
                         No Data
                       </p>
@@ -847,11 +551,7 @@ exports[`Table renders empty table without emptyText when loading 1`] = `
                     Column 7
                   </th>
                   <th
-<<<<<<< HEAD
                     class="ant-table-cell"
-=======
-                    class="ant-table-row-cell-last"
->>>>>>> origin/master
                   >
                     Column 8
                   </th>

components/time-picker/__tests__/__snapshots__/demo.test.js.snap

@@ -137,10 +137,6 @@ exports[`renders ./components/time-picker/demo/addon.md correctly 1`] = `
     class="ant-picker-input"
   >
     <input
-<<<<<<< HEAD
-=======
-      class="ant-time-picker-input"
->>>>>>> origin/master
       placeholder="Select time"
       readonly=""
       size="10"
@@ -185,10 +181,6 @@ exports[`renders ./components/time-picker/demo/basic.md correctly 1`] = `
     class="ant-picker-input"
   >
     <input
-<<<<<<< HEAD
-=======
-      class="ant-time-picker-input"
->>>>>>> origin/master
       placeholder="Select time"
       readonly=""
       size="10"
@@ -233,11 +225,7 @@ exports[`renders ./components/time-picker/demo/disabled.md correctly 1`] = `
     class="ant-picker-input"
   >
     <input
-<<<<<<< HEAD
       disabled=""
-=======
-      class="ant-time-picker-input"
->>>>>>> origin/master
       placeholder="Select time"
       readonly=""
       size="10"
@@ -274,239 +262,14 @@ exports[`renders ./components/time-picker/demo/disabled.md correctly 1`] = `
 </div>
 `;
 
-<<<<<<< HEAD
-=======
-exports[`renders ./components/time-picker/demo/addon.md correctly 1`] = `
-<span
-  class="ant-time-picker"
->
-  <input
-    class="ant-time-picker-input"
-    placeholder="Select time"
-    type="text"
-    value=""
-  />
-  <span
-    class="ant-time-picker-icon"
-  >
-    <i
-      aria-label="icon: clock-circle"
-      class="anticon anticon-clock-circle ant-time-picker-clock-icon"
-    >
-      <svg
-        aria-hidden="true"
-        class=""
-        data-icon="clock-circle"
-        fill="currentColor"
-        focusable="false"
-        height="1em"
-        viewBox="64 64 896 896"
-        width="1em"
-      >
-        <path
-          d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm0 820c-205.4 0-372-166.6-372-372s166.6-372 372-372 372 166.6 372 372-166.6 372-372 372z"
-        />
-        <path
-          d="M686.7 638.6L544.1 535.5V288c0-4.4-3.6-8-8-8H488c-4.4 0-8 3.6-8 8v275.4c0 2.6 1.2 5 3.3 6.5l165.4 120.6c3.6 2.6 8.6 1.8 11.2-1.7l28.6-39c2.6-3.7 1.8-8.7-1.8-11.2z"
-        />
-      </svg>
-    </i>
-  </span>
-</span>
-`;
-
-exports[`renders ./components/time-picker/demo/basic.md correctly 1`] = `
-<span
-  class="ant-time-picker"
->
-  <input
-    class="ant-time-picker-input"
-    placeholder="Select time"
-    type="text"
-    value=""
-  />
-  <span
-    class="ant-time-picker-icon"
-  >
-    <i
-      aria-label="icon: clock-circle"
-      class="anticon anticon-clock-circle ant-time-picker-clock-icon"
-    >
-      <svg
-        aria-hidden="true"
-        class=""
-        data-icon="clock-circle"
-        fill="currentColor"
-        focusable="false"
-        height="1em"
-        viewBox="64 64 896 896"
-        width="1em"
-      >
-        <path
-          d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm0 820c-205.4 0-372-166.6-372-372s166.6-372 372-372 372 166.6 372 372-166.6 372-372 372z"
-        />
-        <path
-          d="M686.7 638.6L544.1 535.5V288c0-4.4-3.6-8-8-8H488c-4.4 0-8 3.6-8 8v275.4c0 2.6 1.2 5 3.3 6.5l165.4 120.6c3.6 2.6 8.6 1.8 11.2-1.7l28.6-39c2.6-3.7 1.8-8.7-1.8-11.2z"
-        />
-      </svg>
-    </i>
-  </span>
-</span>
-`;
-
-exports[`renders ./components/time-picker/demo/disabled.md correctly 1`] = `
-<span
-  class="ant-time-picker"
->
-  <input
-    class="ant-time-picker-input"
-    disabled=""
-    placeholder="Select time"
-    type="text"
-    value="12:08:23"
-  />
-  <span
-    class="ant-time-picker-icon"
-  >
-    <i
-      aria-label="icon: clock-circle"
-      class="anticon anticon-clock-circle ant-time-picker-clock-icon"
-    >
-      <svg
-        aria-hidden="true"
-        class=""
-        data-icon="clock-circle"
-        fill="currentColor"
-        focusable="false"
-        height="1em"
-        viewBox="64 64 896 896"
-        width="1em"
-      >
-        <path
-          d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm0 820c-205.4 0-372-166.6-372-372s166.6-372 372-372 372 166.6 372 372-166.6 372-372 372z"
-        />
-        <path
-          d="M686.7 638.6L544.1 535.5V288c0-4.4-3.6-8-8-8H488c-4.4 0-8 3.6-8 8v275.4c0 2.6 1.2 5 3.3 6.5l165.4 120.6c3.6 2.6 8.6 1.8 11.2-1.7l28.6-39c2.6-3.7 1.8-8.7-1.8-11.2z"
-        />
-      </svg>
-    </i>
-  </span>
-</span>
-`;
-
->>>>>>> origin/master
 exports[`renders ./components/time-picker/demo/hide-column.md correctly 1`] = `
 <div
   class="ant-picker"
 >
-<<<<<<< HEAD
   <div
     class="ant-picker-input"
   >
     <input
-=======
-  <input
-    class="ant-time-picker-input"
-    placeholder="Select time"
-    type="text"
-    value="12:08"
-  />
-  <span
-    class="ant-time-picker-icon"
-  >
-    <i
-      aria-label="icon: clock-circle"
-      class="anticon anticon-clock-circle ant-time-picker-clock-icon"
-    >
-      <svg
-        aria-hidden="true"
-        class=""
-        data-icon="clock-circle"
-        fill="currentColor"
-        focusable="false"
-        height="1em"
-        viewBox="64 64 896 896"
-        width="1em"
-      >
-        <path
-          d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm0 820c-205.4 0-372-166.6-372-372s166.6-372 372-372 372 166.6 372 372-166.6 372-372 372z"
-        />
-        <path
-          d="M686.7 638.6L544.1 535.5V288c0-4.4-3.6-8-8-8H488c-4.4 0-8 3.6-8 8v275.4c0 2.6 1.2 5 3.3 6.5l165.4 120.6c3.6 2.6 8.6 1.8 11.2-1.7l28.6-39c2.6-3.7 1.8-8.7-1.8-11.2z"
-        />
-      </svg>
-    </i>
-  </span>
-  <i
-    aria-label="icon: close-circle"
-    class="anticon anticon-close-circle ant-time-picker-clear"
-    tabindex="-1"
-  >
-    <svg
-      aria-hidden="true"
-      class=""
-      data-icon="close-circle"
-      fill="currentColor"
-      focusable="false"
-      height="1em"
-      viewBox="64 64 896 896"
-      width="1em"
-    >
-      <path
-        d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm165.4 618.2l-66-.3L512 563.4l-99.3 118.4-66.1.3c-4.4 0-8-3.5-8-8 0-1.9.7-3.7 1.9-5.2l130.1-155L340.5 359a8.32 8.32 0 0 1-1.9-5.2c0-4.4 3.6-8 8-8l66.1.3L512 464.6l99.3-118.4 66-.3c4.4 0 8 3.5 8 8 0 1.9-.7 3.7-1.9 5.2L553.5 514l130 155c1.2 1.5 1.9 3.3 1.9 5.2 0 4.4-3.6 8-8 8z"
-      />
-    </svg>
-  </i>
-</span>
-`;
-
-exports[`renders ./components/time-picker/demo/interval-options.md correctly 1`] = `
-<span
-  class="ant-time-picker"
->
-  <input
-    class="ant-time-picker-input"
-    placeholder="Select time"
-    type="text"
-    value=""
-  />
-  <span
-    class="ant-time-picker-icon"
-  >
-    <i
-      aria-label="icon: clock-circle"
-      class="anticon anticon-clock-circle ant-time-picker-clock-icon"
-    >
-      <svg
-        aria-hidden="true"
-        class=""
-        data-icon="clock-circle"
-        fill="currentColor"
-        focusable="false"
-        height="1em"
-        viewBox="64 64 896 896"
-        width="1em"
-      >
-        <path
-          d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm0 820c-205.4 0-372-166.6-372-372s166.6-372 372-372 372 166.6 372 372-166.6 372-372 372z"
-        />
-        <path
-          d="M686.7 638.6L544.1 535.5V288c0-4.4-3.6-8-8-8H488c-4.4 0-8 3.6-8 8v275.4c0 2.6 1.2 5 3.3 6.5l165.4 120.6c3.6 2.6 8.6 1.8 11.2-1.7l28.6-39c2.6-3.7 1.8-8.7-1.8-11.2z"
-        />
-      </svg>
-    </i>
-  </span>
-</span>
-`;
-
-exports[`renders ./components/time-picker/demo/size.md correctly 1`] = `
-<div>
-  <span
-    class="ant-time-picker ant-time-picker-large"
-  >
-    <input
-      class="ant-time-picker-input"
->>>>>>> origin/master
       placeholder="Select time"
       readonly=""
       size="10"
@@ -575,10 +338,6 @@ exports[`renders ./components/time-picker/demo/interval-options.md correctly 1`]
     class="ant-picker-input"
   >
     <input
-<<<<<<< HEAD
-=======
-      class="ant-time-picker-input"
->>>>>>> origin/master
       placeholder="Select time"
       readonly=""
       size="10"
@@ -636,7 +395,6 @@ exports[`renders ./components/time-picker/demo/range-picker.md correctly 1`] = `
       <span
         class="ant-picker-separator"
       >
-<<<<<<< HEAD
         →
       </span>
     </div>
@@ -653,22 +411,6 @@ exports[`renders ./components/time-picker/demo/range-picker.md correctly 1`] = `
     <div
       class="ant-picker-active-bar"
       style="left:0;width:0;position:absolute"
-=======
-        <path
-          d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm165.4 618.2l-66-.3L512 563.4l-99.3 118.4-66.1.3c-4.4 0-8-3.5-8-8 0-1.9.7-3.7 1.9-5.2l130.1-155L340.5 359a8.32 8.32 0 0 1-1.9-5.2c0-4.4 3.6-8 8-8l66.1.3L512 464.6l99.3-118.4 66-.3c4.4 0 8 3.5 8 8 0 1.9-.7 3.7-1.9 5.2L553.5 514l130 155c1.2 1.5 1.9 3.3 1.9 5.2 0 4.4-3.6 8-8 8z"
-        />
-      </svg>
-    </i>
-  </span>
-  <span
-    class="ant-time-picker ant-time-picker-small"
-  >
-    <input
-      class="ant-time-picker-input"
-      placeholder="Select time"
-      type="text"
-      value="12:08:23"
->>>>>>> origin/master
     />
     <span
       class="ant-picker-suffix"
@@ -905,19 +647,8 @@ exports[`renders ./components/time-picker/demo/suffix.md correctly 1`] = `
 <div
   class="ant-picker"
 >
-<<<<<<< HEAD
   <div
     class="ant-picker-input"
-=======
-  <input
-    class="ant-time-picker-input"
-    placeholder="Select time"
-    type="text"
-    value=""
-  />
-  <span
-    class="ant-time-picker-icon"
->>>>>>> origin/master
   >
     <input
       placeholder="Select time"
@@ -957,19 +688,8 @@ exports[`renders ./components/time-picker/demo/value.md correctly 1`] = `
 <div
   class="ant-picker"
 >
-<<<<<<< HEAD
   <div
     class="ant-picker-input"
-=======
-  <input
-    class="ant-time-picker-input"
-    placeholder="Select time"
-    type="text"
-    value=""
-  />
-  <span
-    class="ant-time-picker-icon"
->>>>>>> origin/master
   >
     <input
       placeholder="Select time"

components/time-picker/__tests__/__snapshots__/index.test.js.snap

@@ -4,7 +4,6 @@ exports[`TimePicker not render clean icon when allowClear is false 1`] = `
 <div
   class="ant-picker"
 >
-<<<<<<< HEAD
   <div
     class="ant-picker-input"
   >
@@ -12,53 +11,6 @@ exports[`TimePicker not render clean icon when allowClear is false 1`] = `
       placeholder="Select time"
       readonly=""
       size="10"
-=======
-  <input
-    class="ant-time-picker-input"
-    placeholder="Select time"
-    type="text"
-    value="00:00:00"
-  />
-  <span
-    class="ant-time-picker-icon"
-  >
-    <i
-      aria-label="icon: clock-circle"
-      class="anticon anticon-clock-circle ant-time-picker-clock-icon"
-    >
-      <svg
-        aria-hidden="true"
-        class=""
-        data-icon="clock-circle"
-        fill="currentColor"
-        focusable="false"
-        height="1em"
-        viewBox="64 64 896 896"
-        width="1em"
-      >
-        <path
-          d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm0 820c-205.4 0-372-166.6-372-372s166.6-372 372-372 372 166.6 372 372-166.6 372-372 372z"
-        />
-        <path
-          d="M686.7 638.6L544.1 535.5V288c0-4.4-3.6-8-8-8H488c-4.4 0-8 3.6-8 8v275.4c0 2.6 1.2 5 3.3 6.5l165.4 120.6c3.6 2.6 8.6 1.8 11.2-1.7l28.6-39c2.6-3.7 1.8-8.7-1.8-11.2z"
-        />
-      </svg>
-    </i>
-  </span>
-</span>
-`;
-
-exports[`TimePicker prop locale should works 1`] = `
-Array [
-  <span
-    class="ant-time-picker"
-    style=""
-  >
-    <input
-      class="ant-time-picker-input"
-      placeholder="Избери дата"
-      type="text"
->>>>>>> origin/master
       value="00:00:00"
     />
     <span

components/transfer/__tests__/__snapshots__/demo.test.js.snap

@@ -1892,11 +1892,7 @@ exports[`renders ./components/transfer/demo/table-transfer.md correctly 1`] = `
                               Tag
                             </th>
                             <th
-<<<<<<< HEAD
                               class="ant-table-cell"
-=======
-                              class="ant-table-row-cell-last"
->>>>>>> origin/master
                             >
                               Description
                             </th>
@@ -2555,11 +2551,7 @@ exports[`renders ./components/transfer/demo/table-transfer.md correctly 1`] = `
                               </div>
                             </th>
                             <th
-<<<<<<< HEAD
                               class="ant-table-cell"
-=======
-                              class="ant-table-row-cell-last"
->>>>>>> origin/master
                             >
                               Name
                             </th>

components/tree/__tests__/__snapshots__/demo.test.js.snap

@@ -308,37 +308,8 @@ exports[`renders ./components/tree/demo/basic-controlled.md correctly 1`] = `
         class="ant-tree-list-holder-inner"
         style="display:flex;flex-direction:column"
       >
-<<<<<<< HEAD
         <div
           class="ant-tree-treenode ant-tree-treenode-switcher-open ant-tree-treenode-checkbox-indeterminate"
-=======
-        <span
-          class="ant-tree-switcher ant-tree-switcher-noop"
-        >
-          <i
-            aria-label="icon: down"
-            class="anticon anticon-down ant-tree-switcher-icon"
-          >
-            <svg
-              aria-hidden="true"
-              class=""
-              data-icon="down"
-              fill="currentColor"
-              focusable="false"
-              height="1em"
-              viewBox="64 64 896 896"
-              width="1em"
-            >
-              <path
-                d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"
-              />
-            </svg>
-          </i>
-        </span>
-        <span
-          class="ant-tree-node-content-wrapper ant-tree-node-content-wrapper-normal ant-tree-node-selected"
-          title="leaf"
->>>>>>> origin/master
         >
           <span
             class="ant-tree-switcher ant-tree-switcher_open"
@@ -371,7 +342,6 @@ exports[`renders ./components/tree/demo/basic-controlled.md correctly 1`] = `
               class="ant-tree-checkbox-inner"
             />
           </span>
-<<<<<<< HEAD
           <span
             class="ant-tree-node-content-wrapper ant-tree-node-content-wrapper-open"
             title="0-0"
@@ -385,40 +355,6 @@ exports[`renders ./components/tree/demo/basic-controlled.md correctly 1`] = `
         </div>
         <div
           class="ant-tree-treenode ant-tree-treenode-switcher-open ant-tree-treenode-checkbox-checked"
-=======
-        </span>
-      </li>
-      <li
-        class="ant-tree-treenode-switcher-open"
-        role="treeitem"
-      >
-        <span
-          class="ant-tree-switcher ant-tree-switcher-noop"
-        >
-          <i
-            aria-label="icon: down"
-            class="anticon anticon-down ant-tree-switcher-icon"
-          >
-            <svg
-              aria-hidden="true"
-              class=""
-              data-icon="down"
-              fill="currentColor"
-              focusable="false"
-              height="1em"
-              viewBox="64 64 896 896"
-              width="1em"
-            >
-              <path
-                d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"
-              />
-            </svg>
-          </i>
-        </span>
-        <span
-          class="ant-tree-node-content-wrapper ant-tree-node-content-wrapper-normal"
-          title="leaf"
->>>>>>> origin/master
         >
           <span
             aria-hidden="true"
@@ -1039,7 +975,6 @@ exports[`renders ./components/tree/demo/directory.md correctly 1`] = `
       tabindex="0"
       value=""
     />
-<<<<<<< HEAD
   </div>
   <div
     class="ant-tree-list"
@@ -1051,129 +986,19 @@ exports[`renders ./components/tree/demo/directory.md correctly 1`] = `
       >
         <div
           class="ant-tree-treenode ant-tree-treenode-switcher-open"
-=======
-    <span
-      class="ant-tree-node-content-wrapper ant-tree-node-content-wrapper-normal"
-      title="Tree Node"
-    >
-      <span
-        class="ant-tree-title"
-      >
-        Tree Node
-      </span>
-    </span>
-  </li>
-</ul>
-`;
-
-exports[`renders ./components/tree/demo/line.md correctly 1`] = `
-<div>
-  <div
-    style="margin-bottom:16px"
-  >
-    showLine: 
-    <button
-      aria-checked="true"
-      checked=""
-      class="ant-switch ant-switch-checked"
-      role="switch"
-      type="button"
-    >
-      <span
-        class="ant-switch-inner"
-      />
-    </button>
-    <br />
-    <br />
-    showIcon: 
-    <button
-      aria-checked="false"
-      class="ant-switch"
-      role="switch"
-      type="button"
-    >
-      <span
-        class="ant-switch-inner"
-      />
-    </button>
-  </div>
-  <ul
-    class="ant-tree ant-tree-icon-hide ant-tree-show-line"
-    role="tree"
-    unselectable="on"
-  >
-    <li
-      class="ant-tree-treenode-switcher-open"
-      role="treeitem"
         >
           <span
             class="ant-tree-switcher ant-tree-switcher_open"
           >
-        <i
-          aria-label="icon: minus-square"
-          class="anticon anticon-minus-square ant-tree-switcher-line-icon"
-        >
-          <svg
-            aria-hidden="true"
-            class=""
-            data-icon="minus-square"
-            fill="currentColor"
-            focusable="false"
-            height="1em"
-            viewBox="64 64 896 896"
-            width="1em"
-          >
-            <path
-              d="M328 544h368c4.4 0 8-3.6 8-8v-48c0-4.4-3.6-8-8-8H328c-4.4 0-8 3.6-8 8v48c0 4.4 3.6 8 8 8z"
-            />
-            <path
-              d="M880 112H144c-17.7 0-32 14.3-32 32v736c0 17.7 14.3 32 32 32h736c17.7 0 32-14.3 32-32V144c0-17.7-14.3-32-32-32zm-40 728H184V184h656v656z"
-            />
-          </svg>
-        </i>
-      </span>
-      <span
-        class="ant-tree-node-content-wrapper ant-tree-node-content-wrapper-open"
-        title="parent 1"
-      >
-        <span
-          class="ant-tree-title"
-        >
-          parent 1
-        </span>
-      </span>
-      <ul
-        class="ant-tree-child-tree ant-tree-child-tree-open"
-        data-expanded="true"
-        role="group"
-      >
-        <li
-          class="ant-tree-treenode-switcher-open"
-          role="treeitem"
->>>>>>> origin/master
-        >
-          <span
-            class="ant-tree-switcher ant-tree-switcher_open"
-          >
-<<<<<<< HEAD
             <span
               aria-label="caret-down"
               class="anticon anticon-caret-down ant-tree-switcher-icon"
               role="img"
-=======
-            <i
-              aria-label="icon: minus-square"
-              class="anticon anticon-minus-square ant-tree-switcher-line-icon"
->>>>>>> origin/master
             >
               <svg
                 aria-hidden="true"
                 class=""
-<<<<<<< HEAD
                 data-icon="caret-down"
-=======
-                data-icon="minus-square"
->>>>>>> origin/master
                 fill="currentColor"
                 focusable="false"
                 height="1em"
@@ -1181,7 +1006,6 @@ exports[`renders ./components/tree/demo/line.md correctly 1`] = `
                 width="1em"
               >
                 <path
-<<<<<<< HEAD
                   d="M840.4 300H183.6c-19.7 0-30.7 20.8-18.5 35l328.4 380.8c9.4 10.9 27.5 10.9 37 0L858.9 335c12.2-14.2 1.2-35-18.5-35z"
                 />
               </svg>
@@ -1247,40 +1071,6 @@ exports[`renders ./components/tree/demo/line.md correctly 1`] = `
                 aria-label="file"
                 class="anticon anticon-file"
                 role="img"
-=======
-                  d="M328 544h368c4.4 0 8-3.6 8-8v-48c0-4.4-3.6-8-8-8H328c-4.4 0-8 3.6-8 8v48c0 4.4 3.6 8 8 8z"
-                />
-                <path
-                  d="M880 112H144c-17.7 0-32 14.3-32 32v736c0 17.7 14.3 32 32 32h736c17.7 0 32-14.3 32-32V144c0-17.7-14.3-32-32-32zm-40 728H184V184h656v656z"
-                />
-              </svg>
-            </i>
-          </span>
-          <span
-            class="ant-tree-node-content-wrapper ant-tree-node-content-wrapper-open"
-            title="parent 1-0"
-          >
-            <span
-              class="ant-tree-title"
-            >
-              parent 1-0
-            </span>
-          </span>
-          <ul
-            class="ant-tree-child-tree ant-tree-child-tree-open"
-            data-expanded="true"
-            role="group"
-          >
-            <li
-              class="ant-tree-treenode-switcher-close"
-              role="treeitem"
-            >
-              <span
-                class="ant-tree-switcher ant-tree-switcher-noop"
-              >
-                <i
-                  aria-label="icon: file"
-                  class="anticon anticon-file ant-tree-switcher-line-icon"
               >
                 <svg
                   aria-hidden="true"
@@ -1292,21 +1082,6 @@ exports[`renders ./components/tree/demo/line.md correctly 1`] = `
                   viewBox="64 64 896 896"
                   width="1em"
                 >
-                    <path
-                      d="M854.6 288.6L639.4 73.4c-6-6-14.1-9.4-22.6-9.4H192c-17.7 0-32 14.3-32 32v832c0 17.7 14.3 32 32 32h640c17.7 0 32-14.3 32-32V311.3c0-8.5-3.4-16.7-9.4-22.7zM790.2 326H602V137.8L790.2 326zm1.8 562H232V136h302v216a42 42 0 0 0 42 42h216v494z"
-                    />
-                  </svg>
-                </i>
-              </span>
-              <span
-                class="ant-tree-node-content-wrapper ant-tree-node-content-wrapper-normal"
-                title="leaf"
->>>>>>> origin/master
-              >
-                <span
-                  class="ant-tree-title"
-                >
-<<<<<<< HEAD
                   <path
                     d="M854.6 288.6L639.4 73.4c-6-6-14.1-9.4-22.6-9.4H192c-17.7 0-32 14.3-32 32v832c0 17.7 14.3 32 32 32h640c17.7 0 32-14.3 32-32V311.3c0-8.5-3.4-16.7-9.4-22.7zM790.2 326H602V137.8L790.2 326zm1.8 562H232V136h302v216a42 42 0 0042 42h216v494z"
                   />
@@ -1345,21 +1120,6 @@ exports[`renders ./components/tree/demo/line.md correctly 1`] = `
                 aria-label="file"
                 class="anticon anticon-file"
                 role="img"
-=======
-                  leaf
-                </span>
-              </span>
-            </li>
-            <li
-              class="ant-tree-treenode-switcher-close"
-              role="treeitem"
-            >
-              <span
-                class="ant-tree-switcher ant-tree-switcher-noop"
-              >
-                <i
-                  aria-label="icon: file"
-                  class="anticon anticon-file ant-tree-switcher-line-icon"
               >
                 <svg
                   aria-hidden="true"
@@ -1371,21 +1131,6 @@ exports[`renders ./components/tree/demo/line.md correctly 1`] = `
                   viewBox="64 64 896 896"
                   width="1em"
                 >
-                    <path
-                      d="M854.6 288.6L639.4 73.4c-6-6-14.1-9.4-22.6-9.4H192c-17.7 0-32 14.3-32 32v832c0 17.7 14.3 32 32 32h640c17.7 0 32-14.3 32-32V311.3c0-8.5-3.4-16.7-9.4-22.7zM790.2 326H602V137.8L790.2 326zm1.8 562H232V136h302v216a42 42 0 0 0 42 42h216v494z"
-                    />
-                  </svg>
-                </i>
-              </span>
-              <span
-                class="ant-tree-node-content-wrapper ant-tree-node-content-wrapper-normal"
-                title="leaf"
->>>>>>> origin/master
-              >
-                <span
-                  class="ant-tree-title"
-                >
-<<<<<<< HEAD
                   <path
                     d="M854.6 288.6L639.4 73.4c-6-6-14.1-9.4-22.6-9.4H192c-17.7 0-32 14.3-32 32v832c0 17.7 14.3 32 32 32h640c17.7 0 32-14.3 32-32V311.3c0-8.5-3.4-16.7-9.4-22.7zM790.2 326H602V137.8L790.2 326zm1.8 562H232V136h302v216a42 42 0 0042 42h216v494z"
                   />
@@ -1571,274 +1316,6 @@ exports[`renders ./components/tree/demo/draggable.md correctly 1`] = `
 >
   <div
     role="tree"
-=======
-                  leaf
-                </span>
-              </span>
-            </li>
-            <li
-              class="ant-tree-treenode-switcher-close"
-              role="treeitem"
-            >
-              <span
-                class="ant-tree-switcher ant-tree-switcher-noop"
-              >
-                <i
-                  aria-label="icon: file"
-                  class="anticon anticon-file ant-tree-switcher-line-icon"
-                >
-                  <svg
-                    aria-hidden="true"
-                    class=""
-                    data-icon="file"
-                    fill="currentColor"
-                    focusable="false"
-                    height="1em"
-                    viewBox="64 64 896 896"
-                    width="1em"
-                  >
-                    <path
-                      d="M854.6 288.6L639.4 73.4c-6-6-14.1-9.4-22.6-9.4H192c-17.7 0-32 14.3-32 32v832c0 17.7 14.3 32 32 32h640c17.7 0 32-14.3 32-32V311.3c0-8.5-3.4-16.7-9.4-22.7zM790.2 326H602V137.8L790.2 326zm1.8 562H232V136h302v216a42 42 0 0 0 42 42h216v494z"
-                    />
-                  </svg>
-                </i>
-              </span>
-              <span
-                class="ant-tree-node-content-wrapper ant-tree-node-content-wrapper-normal"
-                title="leaf"
-              >
-                <span
-                  class="ant-tree-title"
-                >
-                  leaf
-                </span>
-              </span>
-            </li>
-          </ul>
-        </li>
-        <li
-          class="ant-tree-treenode-switcher-open"
-          role="treeitem"
-        >
-          <span
-            class="ant-tree-switcher ant-tree-switcher_open"
-          >
-            <i
-              aria-label="icon: minus-square"
-              class="anticon anticon-minus-square ant-tree-switcher-line-icon"
-            >
-              <svg
-                aria-hidden="true"
-                class=""
-                data-icon="minus-square"
-                fill="currentColor"
-                focusable="false"
-                height="1em"
-                viewBox="64 64 896 896"
-                width="1em"
-              >
-                <path
-                  d="M328 544h368c4.4 0 8-3.6 8-8v-48c0-4.4-3.6-8-8-8H328c-4.4 0-8 3.6-8 8v48c0 4.4 3.6 8 8 8z"
-                />
-                <path
-                  d="M880 112H144c-17.7 0-32 14.3-32 32v736c0 17.7 14.3 32 32 32h736c17.7 0 32-14.3 32-32V144c0-17.7-14.3-32-32-32zm-40 728H184V184h656v656z"
-                />
-              </svg>
-            </i>
-          </span>
-          <span
-            class="ant-tree-node-content-wrapper ant-tree-node-content-wrapper-open"
-            title="parent 1-1"
-          >
-            <span
-              class="ant-tree-title"
-            >
-              parent 1-1
-            </span>
-          </span>
-          <ul
-            class="ant-tree-child-tree ant-tree-child-tree-open"
-            data-expanded="true"
-            role="group"
-          >
-            <li
-              class="ant-tree-treenode-switcher-close"
-              role="treeitem"
-            >
-              <span
-                class="ant-tree-switcher ant-tree-switcher-noop"
-              >
-                <i
-                  aria-label="icon: file"
-                  class="anticon anticon-file ant-tree-switcher-line-icon"
-                >
-                  <svg
-                    aria-hidden="true"
-                    class=""
-                    data-icon="file"
-                    fill="currentColor"
-                    focusable="false"
-                    height="1em"
-                    viewBox="64 64 896 896"
-                    width="1em"
-                  >
-                    <path
-                      d="M854.6 288.6L639.4 73.4c-6-6-14.1-9.4-22.6-9.4H192c-17.7 0-32 14.3-32 32v832c0 17.7 14.3 32 32 32h640c17.7 0 32-14.3 32-32V311.3c0-8.5-3.4-16.7-9.4-22.7zM790.2 326H602V137.8L790.2 326zm1.8 562H232V136h302v216a42 42 0 0 0 42 42h216v494z"
-                    />
-                  </svg>
-                </i>
-              </span>
-              <span
-                class="ant-tree-node-content-wrapper ant-tree-node-content-wrapper-normal"
-                title="leaf"
-              >
-                <span
-                  class="ant-tree-title"
-                >
-                  leaf
-                </span>
-              </span>
-            </li>
-          </ul>
-        </li>
-        <li
-          class="ant-tree-treenode-switcher-open"
-          role="treeitem"
-        >
-          <span
-            class="ant-tree-switcher ant-tree-switcher_open"
-          >
-            <i
-              aria-label="icon: minus-square"
-              class="anticon anticon-minus-square ant-tree-switcher-line-icon"
-            >
-              <svg
-                aria-hidden="true"
-                class=""
-                data-icon="minus-square"
-                fill="currentColor"
-                focusable="false"
-                height="1em"
-                viewBox="64 64 896 896"
-                width="1em"
-              >
-                <path
-                  d="M328 544h368c4.4 0 8-3.6 8-8v-48c0-4.4-3.6-8-8-8H328c-4.4 0-8 3.6-8 8v48c0 4.4 3.6 8 8 8z"
-                />
-                <path
-                  d="M880 112H144c-17.7 0-32 14.3-32 32v736c0 17.7 14.3 32 32 32h736c17.7 0 32-14.3 32-32V144c0-17.7-14.3-32-32-32zm-40 728H184V184h656v656z"
-                />
-              </svg>
-            </i>
-          </span>
-          <span
-            class="ant-tree-node-content-wrapper ant-tree-node-content-wrapper-open"
-            title="parent 1-2"
-          >
-            <span
-              class="ant-tree-title"
-            >
-              parent 1-2
-            </span>
-          </span>
-          <ul
-            class="ant-tree-child-tree ant-tree-child-tree-open"
-            data-expanded="true"
-            role="group"
-          >
-            <li
-              class="ant-tree-treenode-switcher-close"
-              role="treeitem"
-            >
-              <span
-                class="ant-tree-switcher ant-tree-switcher-noop"
-              >
-                <i
-                  aria-label="icon: file"
-                  class="anticon anticon-file ant-tree-switcher-line-icon"
-                >
-                  <svg
-                    aria-hidden="true"
-                    class=""
-                    data-icon="file"
-                    fill="currentColor"
-                    focusable="false"
-                    height="1em"
-                    viewBox="64 64 896 896"
-                    width="1em"
-                  >
-                    <path
-                      d="M854.6 288.6L639.4 73.4c-6-6-14.1-9.4-22.6-9.4H192c-17.7 0-32 14.3-32 32v832c0 17.7 14.3 32 32 32h640c17.7 0 32-14.3 32-32V311.3c0-8.5-3.4-16.7-9.4-22.7zM790.2 326H602V137.8L790.2 326zm1.8 562H232V136h302v216a42 42 0 0 0 42 42h216v494z"
-                    />
-                  </svg>
-                </i>
-              </span>
-              <span
-                class="ant-tree-node-content-wrapper ant-tree-node-content-wrapper-normal"
-                title="leaf"
-              >
-                <span
-                  class="ant-tree-title"
-                >
-                  leaf
-                </span>
-              </span>
-            </li>
-            <li
-              class="ant-tree-treenode-switcher-close"
-              role="treeitem"
-            >
-              <span
-                class="ant-tree-switcher ant-tree-switcher-noop"
-              >
-                <i
-                  aria-label="icon: form"
-                  class="anticon anticon-form"
-                >
-                  <svg
-                    aria-hidden="true"
-                    class=""
-                    data-icon="form"
-                    fill="currentColor"
-                    focusable="false"
-                    height="1em"
-                    viewBox="64 64 896 896"
-                    width="1em"
-                  >
-                    <path
-                      d="M904 512h-56c-4.4 0-8 3.6-8 8v320H184V184h320c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8H144c-17.7 0-32 14.3-32 32v736c0 17.7 14.3 32 32 32h736c17.7 0 32-14.3 32-32V520c0-4.4-3.6-8-8-8z"
-                    />
-                    <path
-                      d="M355.9 534.9L354 653.8c-.1 8.9 7.1 16.2 16 16.2h.4l118-2.9c2-.1 4-.9 5.4-2.3l415.9-415c3.1-3.1 3.1-8.2 0-11.3L785.4 114.3c-1.6-1.6-3.6-2.3-5.7-2.3s-4.1.8-5.7 2.3l-415.8 415a8.3 8.3 0 0 0-2.3 5.6zm63.5 23.6L779.7 199l45.2 45.1-360.5 359.7-45.7 1.1.7-46.4z"
-                    />
-                  </svg>
-                </i>
-              </span>
-              <span
-                class="ant-tree-node-content-wrapper ant-tree-node-content-wrapper-normal"
-                title="leaf"
-              >
-                <span
-                  class="ant-tree-title"
-                >
-                  leaf
-                </span>
-              </span>
-            </li>
-          </ul>
-        </li>
-      </ul>
-    </li>
-  </ul>
-</div>
-`;
-
-exports[`renders ./components/tree/demo/search.md correctly 1`] = `
-<div>
-  <span
-    class="ant-input-search ant-input-affix-wrapper"
-    style="margin-bottom:8px"
->>>>>>> origin/master
   >
     <input
       style="width:0;height:0;display:flex;overflow:hidden;opacity:0;border:0;padding:0;margin:0"
@@ -2293,9 +1770,39 @@ exports[`renders ./components/tree/demo/dynamic.md correctly 1`] = `
 `;
 
 exports[`renders ./components/tree/demo/line.md correctly 1`] = `
-<div
+<div>
+  <div
+    style="margin-bottom:16px"
+  >
+    showLine: 
+    <button
+      aria-checked="true"
+      checked=""
+      class="ant-switch ant-switch-checked"
+      role="switch"
+      type="button"
+    >
+      <span
+        class="ant-switch-inner"
+      />
+    </button>
+    <br />
+    <br />
+    showIcon: 
+    <button
+      aria-checked="false"
+      class="ant-switch"
+      role="switch"
+      type="button"
+    >
+      <span
+        class="ant-switch-inner"
+      />
+    </button>
+  </div>
+  <div
     class="ant-tree ant-tree-icon-hide ant-tree-show-line"
->
+  >
     <div
       role="tree"
     >
@@ -2651,6 +2158,7 @@ exports[`renders ./components/tree/demo/line.md correctly 1`] = `
         </div>
       </div>
     </div>
+  </div>
 </div>
 `;
 
@@ -2698,7 +2206,6 @@ exports[`renders ./components/tree/demo/search.md correctly 1`] = `
     <div
       role="tree"
     >
-<<<<<<< HEAD
       <input
         style="width:0;height:0;display:flex;overflow:hidden;opacity:0;border:0;padding:0;margin:0"
         tabindex="0"
@@ -2715,114 +2222,19 @@ exports[`renders ./components/tree/demo/search.md correctly 1`] = `
         >
           <div
             class="ant-tree-treenode ant-tree-treenode-switcher-close"
-=======
-      <li
-        class="ant-tree-treenode-switcher-open"
-        role="treeitem"
-      >
-        <span
-          class="ant-tree-switcher ant-tree-switcher_open"
-        >
-          <i
-            aria-label="icon: down"
-            class="anticon anticon-down ant-tree-switcher-icon"
-          >
-            <svg
-              aria-hidden="true"
-              class=""
-              data-icon="down"
-              fill="currentColor"
-              focusable="false"
-              height="1em"
-              viewBox="64 64 896 896"
-              width="1em"
-            >
-              <path
-                d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"
-              />
-            </svg>
-          </i>
-        </span>
-        <span
-          class="ant-tree-node-content-wrapper ant-tree-node-content-wrapper-open"
-          title="parent 1-0"
-        >
-          <span
-            class="ant-tree-title"
-          >
-            parent 1-0
-          </span>
-        </span>
-        <ul
-          class="ant-tree-child-tree ant-tree-child-tree-open"
-          data-expanded="true"
-          role="group"
-        >
-          <li
-            class="ant-tree-treenode-switcher-close"
-            role="treeitem"
-          >
-            <span
-              class="ant-tree-switcher ant-tree-switcher-noop"
-            >
-              <i
-                aria-label="icon: down"
-                class="anticon anticon-down ant-tree-switcher-icon"
-              >
-                <svg
-                  aria-hidden="true"
-                  class=""
-                  data-icon="down"
-                  fill="currentColor"
-                  focusable="false"
-                  height="1em"
-                  viewBox="64 64 896 896"
-                  width="1em"
-                >
-                  <path
-                    d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"
-                  />
-                </svg>
-              </i>
-            </span>
-            <span
-              class="ant-tree-node-content-wrapper ant-tree-node-content-wrapper-normal"
-              title="leaf"
-            >
-              <span
-                class="ant-tree-title"
-              >
-                leaf
-              </span>
-            </span>
-          </li>
-          <li
-            class="ant-tree-treenode-switcher-close"
-            role="treeitem"
->>>>>>> origin/master
           >
             <span
               class="ant-tree-switcher ant-tree-switcher_close"
             >
-<<<<<<< HEAD
               <span
                 aria-label="caret-down"
                 class="anticon anticon-caret-down ant-tree-switcher-icon"
                 role="img"
-=======
-              <i
-                aria-label="icon: down"
-                class="anticon anticon-down ant-tree-switcher-icon"
->>>>>>> origin/master
               >
                 <svg
                   aria-hidden="true"
                   class=""
-<<<<<<< HEAD
                   data-icon="caret-down"
-=======
-                  data-icon="down"
->>>>>>> origin/master
                   fill="currentColor"
                   focusable="false"
                   height="1em"
@@ -2830,11 +2242,7 @@ exports[`renders ./components/tree/demo/search.md correctly 1`] = `
                   width="1em"
                 >
                   <path
-<<<<<<< HEAD
                     d="M840.4 300H183.6c-19.7 0-30.7 20.8-18.5 35l328.4 380.8c9.4 10.9 27.5 10.9 37 0L858.9 335c12.2-14.2 1.2-35-18.5-35z"
-=======
-                    d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"
->>>>>>> origin/master
                   />
                 </svg>
               </span>
@@ -2861,25 +2269,15 @@ exports[`renders ./components/tree/demo/search.md correctly 1`] = `
             <span
               class="ant-tree-switcher ant-tree-switcher_close"
             >
-<<<<<<< HEAD
               <span
                 aria-label="caret-down"
                 class="anticon anticon-caret-down ant-tree-switcher-icon"
                 role="img"
-=======
-              <i
-                aria-label="icon: down"
-                class="anticon anticon-down ant-tree-switcher-icon"
->>>>>>> origin/master
               >
                 <svg
                   aria-hidden="true"
                   class=""
-<<<<<<< HEAD
                   data-icon="caret-down"
-=======
-                  data-icon="down"
->>>>>>> origin/master
                   fill="currentColor"
                   focusable="false"
                   height="1em"
@@ -2887,11 +2285,7 @@ exports[`renders ./components/tree/demo/search.md correctly 1`] = `
                   width="1em"
                 >
                   <path
-<<<<<<< HEAD
                     d="M840.4 300H183.6c-19.7 0-30.7 20.8-18.5 35l328.4 380.8c9.4 10.9 27.5 10.9 37 0L858.9 335c12.2-14.2 1.2-35-18.5-35z"
-=======
-                    d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"
->>>>>>> origin/master
                   />
                 </svg>
               </span>

components/tree/__tests__/__snapshots__/index.test.js.snap

@@ -1,14 +1,28 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`Tree icon and switcherIcon of Tree with showLine should render correctly 1`] = `
-<ul
+<div
   class="ant-tree ant-tree-show-line"
-  role="tree"
-  unselectable="on"
 >
-  <li
+  <div
-    class="ant-tree-treenode-switcher-close"
+    role="tree"
-    role="treeitem"
+  >
+    <input
+      style="width: 0px; height: 0px; display: flex; overflow: hidden; opacity: 0; border: 0px; padding: 0px; margin: 0px;"
+      tabindex="0"
+      value=""
+    />
+  </div>
+  <div
+    class="ant-tree-list"
+  >
+    <div>
+      <div
+        class="ant-tree-list-holder-inner"
+        style="display: flex; flex-direction: column;"
+      >
+        <div
+          class="ant-tree-treenode ant-tree-treenode-switcher-close"
         >
           <span
             class="ant-tree-switcher ant-tree-switcher_close"
@@ -30,10 +44,9 @@ exports[`Tree icon and switcherIcon of Tree with showLine should render correctl
               ---
             </span>
           </span>
-  </li>
+        </div>
-  <li
+        <div
-    class="ant-tree-treenode-switcher-close"
+          class="ant-tree-treenode ant-tree-treenode-switcher-close"
-    role="treeitem"
         >
           <span
             class="ant-tree-switcher ant-tree-switcher_close"
@@ -53,17 +66,17 @@ exports[`Tree icon and switcherIcon of Tree with showLine should render correctl
               ---
             </span>
           </span>
-  </li>
+        </div>
-  <li
+        <div
-    class="ant-tree-treenode-switcher-close"
+          class="ant-tree-treenode ant-tree-treenode-switcher-close"
-    role="treeitem"
         >
           <span
             class="ant-tree-switcher ant-tree-switcher_close"
           >
-      <i
+            <span
-        aria-label="icon: plus-square"
+              aria-label="plus-square"
               class="anticon anticon-plus-square ant-tree-switcher-line-icon"
+              role="img"
             >
               <svg
                 aria-hidden="true"
@@ -82,7 +95,7 @@ exports[`Tree icon and switcherIcon of Tree with showLine should render correctl
                   d="M880 112H144c-17.7 0-32 14.3-32 32v736c0 17.7 14.3 32 32 32h736c17.7 0 32-14.3 32-32V144c0-17.7-14.3-32-32-32zm-40 728H184V184h656v656z"
                 />
               </svg>
-      </i>
+            </span>
           </span>
           <span
             class="ant-tree-node-content-wrapper ant-tree-node-content-wrapper-close"
@@ -97,6 +110,9 @@ exports[`Tree icon and switcherIcon of Tree with showLine should render correctl
               ---
             </span>
           </span>
-  </li>
+        </div>
-</ul>
+      </div>
+    </div>
+  </div>
+</div>
 `;