row component use flex type by default

ant-design · Oct 26, 2019 · 97a2260 · 97a2260
1 parent dd04915
commit 97a2260
Show file tree

Hide file tree

Showing 25 changed files with 193 additions and 399 deletions.
diff --git a/components/auto-complete/__tests__/__snapshots__/demo.test.js.snap b/components/auto-complete/__tests__/__snapshots__/demo.test.js.snap
@@ -167,7 +167,7 @@ exports[`renders ./components/auto-complete/demo/form-debug.md correctly 1`] = `
   style="margin:0 auto"
 >
   <div
-    class="ant-row-flex ant-form-item"
+    class="ant-row ant-form-item"
   >
     <div
       class="ant-col ant-form-item-label ant-col-xs-24 ant-col-sm-8"
@@ -215,7 +215,7 @@ exports[`renders ./components/auto-complete/demo/form-debug.md correctly 1`] = `
     </div>
   </div>
   <div
-    class="ant-row-flex ant-form-item"
+    class="ant-row ant-form-item"
   >
     <div
       class="ant-col ant-form-item-label ant-col-xs-24 ant-col-sm-8"
@@ -291,7 +291,7 @@ exports[`renders ./components/auto-complete/demo/form-debug.md correctly 1`] = `
     </div>
   </div>
   <div
-    class="ant-row-flex ant-form-item"
+    class="ant-row ant-form-item"
   >
     <div
       class="ant-col ant-form-item-label ant-col-xs-24 ant-col-sm-8"
@@ -398,7 +398,7 @@ exports[`renders ./components/auto-complete/demo/form-debug.md correctly 1`] = `
     </div>
   </div>
   <div
-    class="ant-row-flex ant-form-item"
+    class="ant-row ant-form-item"
   >
     <div
       class="ant-col ant-form-item-label ant-col-xs-24 ant-col-sm-8"
@@ -475,7 +475,7 @@ exports[`renders ./components/auto-complete/demo/form-debug.md correctly 1`] = `
     </div>
   </div>
   <div
-    class="ant-row-flex ant-form-item"
+    class="ant-row ant-form-item"
   >
     <div
       class="ant-col ant-form-item-label ant-col-xs-24 ant-col-sm-8"
@@ -611,7 +611,7 @@ exports[`renders ./components/auto-complete/demo/form-debug.md correctly 1`] = `
     </div>
   </div>
   <div
-    class="ant-row-flex ant-form-item"
+    class="ant-row ant-form-item"
   >
     <div
       class="ant-col ant-form-item-label ant-col-xs-24 ant-col-sm-8"

diff --git a/components/calendar/__tests__/__snapshots__/demo.test.js.snap b/components/calendar/__tests__/__snapshots__/demo.test.js.snap
@@ -2128,7 +2128,7 @@ exports[`renders ./components/calendar/demo/customize-header.md correctly 1`] =
         Custom header 
       </div>
       <div
-        class="ant-row-flex"
+        class="ant-row"
         style="margin-left:-4px;margin-right:-4px;flex-wrap:nowrap"
       >
         <div

diff --git a/components/calendar/demo/customize-header.md b/components/calendar/demo/customize-header.md
@@ -60,7 +60,7 @@ ReactDOM.render(
         return (
           <div style={{ padding: 10 }}>
             <div style={{ marginBottom: '10px' }}>Custom header </div>
-            <Row type="flex" style={{ flexWrap: 'nowrap' }} gutter={8}>
+            <Row style={{ flexWrap: 'nowrap' }} gutter={8}>
               <Col style={{ flex: 'none' }}>
                 <Group size="small" onChange={e => onTypeChange(e.target.value)} value={type}>
                   <Button value="month">Month</Button>

diff --git a/components/comment/__tests__/__snapshots__/demo.test.js.snap b/components/comment/__tests__/__snapshots__/demo.test.js.snap
@@ -152,7 +152,7 @@ exports[`renders ./components/comment/demo/editor.md correctly 1`] = `
         >
           <div>
             <div
-              class="ant-row-flex ant-form-item"
+              class="ant-row ant-form-item"
             >
               <div
                 class="ant-col ant-form-item-control"
@@ -168,7 +168,7 @@ exports[`renders ./components/comment/demo/editor.md correctly 1`] = `
               </div>
             </div>
             <div
-              class="ant-row-flex ant-form-item"
+              class="ant-row ant-form-item"
             >
               <div
                 class="ant-col ant-form-item-control"

diff --git a/components/config-provider/__tests__/__snapshots__/components.test.js.snap b/components/config-provider/__tests__/__snapshots__/components.test.js.snap
@@ -7031,7 +7031,7 @@ exports[`ConfigProvider components Form configProvider 1`] = `
   class="config-form config-form-horizontal"
 >
   <div
-    class="config-row-flex config-form-item config-form-item-has-error"
+    class="config-row config-form-item config-form-item-has-error"
   >
     <div
       class="config-col config-form-item-control"
@@ -7055,7 +7055,7 @@ exports[`ConfigProvider components Form normal 1`] = `
   class="ant-form ant-form-horizontal"
 >
   <div
-    class="ant-row-flex ant-form-item ant-form-item-has-error"
+    class="ant-row ant-form-item ant-form-item-has-error"
   >
     <div
       class="ant-col ant-form-item-control"
@@ -7079,7 +7079,7 @@ exports[`ConfigProvider components Form prefixCls 1`] = `
   class="prefix-Form prefix-Form-horizontal"
 >
   <div
-    class="ant-row-flex prefix-Form-item prefix-Form-item-has-error"
+    class="ant-row prefix-Form-item prefix-Form-item-has-error"
   >
     <div
       class="ant-col prefix-Form-item-control"

diff --git a/components/form/FormItem.tsx b/components/form/FormItem.tsx
@@ -193,7 +193,7 @@ const FormItem: React.FC<FormItemProps> = (props: FormItemProps) => {
         }
 
         return (
-          <Row type="flex" className={classNames(itemClassName)} style={style} key="row">
+          <Row className={classNames(itemClassName)} style={style} key="row">
             {/* Label */}
             <FormItemLabel
               htmlFor={fieldId}