From 7e209f0a51a03f593929c0ca41c20054460d0179 Mon Sep 17 00:00:00 2001
From: Jonathan Gabaut <possimpible@gmail.com>
Date: Thu, 3 Sep 2020 19:50:36 -0700
Subject: [PATCH] fix: add `flex` type to `ColSize` interface (#26578)

According to the API in the docs and based on my own usage, it's a valid value so let's make it official!
---
 components/grid/col.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/components/grid/col.tsx b/components/grid/col.tsx
index e1e4057904..78499d66d0 100644
--- a/components/grid/col.tsx
+++ b/components/grid/col.tsx
@@ -9,6 +9,7 @@ type ColSpanType = number | string;
 type FlexType = number | 'none' | 'auto' | string;
 
 export interface ColSize {
+  flex?: FlexType;
   span?: ColSpanType;
   order?: ColSpanType;
   offset?: ColSpanType;
@@ -17,6 +18,7 @@ export interface ColSize {
 }
 
 export interface ColProps extends React.HTMLAttributes<HTMLDivElement> {
+  flex?: FlexType;
   span?: ColSpanType;
   order?: ColSpanType;
   offset?: ColSpanType;
@@ -29,7 +31,6 @@ export interface ColProps extends React.HTMLAttributes<HTMLDivElement> {
   xl?: ColSpanType | ColSize;
   xxl?: ColSpanType | ColSize;
   prefixCls?: string;
-  flex?: FlexType;
 }
 
 function parseFlex(flex: FlexType): string {