From f7314a5d29e59cff0b3be65b5898b673446ddb5f Mon Sep 17 00:00:00 2001
From: paranoidjk <hust2012jiangkai@gmail.com>
Date: Thu, 29 Jun 2017 13:24:52 +0800
Subject: [PATCH] fix(Grid): null item should not have touch feedback. close
 #1455

---
 .../__snapshots__/demo.test.web.js.snap        | 18 +++++++++---------
 components/grid/index.web.tsx                  |  2 +-
 components/grid/style/index.less               |  3 +++
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/components/grid/__tests__/__snapshots__/demo.test.web.js.snap b/components/grid/__tests__/__snapshots__/demo.test.web.js.snap
index 6c5457e3a1..f6111ba67c 100644
--- a/components/grid/__tests__/__snapshots__/demo.test.web.js.snap
+++ b/components/grid/__tests__/__snapshots__/demo.test.web.js.snap
@@ -439,7 +439,7 @@ exports[`renders ./components/grid/demo/basic.md correctly 1`] = `
         </div>
       </div>
       <div
-        class="am-flexbox-item am-grid-item"
+        class="am-flexbox-item am-grid-item am-grid-null-item"
         style="width:25%;"
       >
         <div
@@ -451,7 +451,7 @@ exports[`renders ./components/grid/demo/basic.md correctly 1`] = `
         </div>
       </div>
       <div
-        class="am-flexbox-item am-grid-item"
+        class="am-flexbox-item am-grid-item am-grid-null-item"
         style="width:25%;"
       >
         <div
@@ -463,7 +463,7 @@ exports[`renders ./components/grid/demo/basic.md correctly 1`] = `
         </div>
       </div>
       <div
-        class="am-flexbox-item am-grid-item"
+        class="am-flexbox-item am-grid-item am-grid-null-item"
         style="width:25%;"
       >
         <div
@@ -694,7 +694,7 @@ exports[`renders ./components/grid/demo/basic.md correctly 1`] = `
         </div>
       </div>
       <div
-        class="am-flexbox-item am-grid-item"
+        class="am-flexbox-item am-grid-item am-grid-null-item"
         style="width:25%;"
       >
         <div
@@ -706,7 +706,7 @@ exports[`renders ./components/grid/demo/basic.md correctly 1`] = `
         </div>
       </div>
       <div
-        class="am-flexbox-item am-grid-item"
+        class="am-flexbox-item am-grid-item am-grid-null-item"
         style="width:25%;"
       >
         <div
@@ -718,7 +718,7 @@ exports[`renders ./components/grid/demo/basic.md correctly 1`] = `
         </div>
       </div>
       <div
-        class="am-flexbox-item am-grid-item"
+        class="am-flexbox-item am-grid-item am-grid-null-item"
         style="width:25%;"
       >
         <div
@@ -949,7 +949,7 @@ exports[`renders ./components/grid/demo/basic.md correctly 1`] = `
         </div>
       </div>
       <div
-        class="am-flexbox-item am-grid-item"
+        class="am-flexbox-item am-grid-item am-grid-null-item"
         style="width:25%;"
       >
         <div
@@ -961,7 +961,7 @@ exports[`renders ./components/grid/demo/basic.md correctly 1`] = `
         </div>
       </div>
       <div
-        class="am-flexbox-item am-grid-item"
+        class="am-flexbox-item am-grid-item am-grid-null-item"
         style="width:25%;"
       >
         <div
@@ -973,7 +973,7 @@ exports[`renders ./components/grid/demo/basic.md correctly 1`] = `
         </div>
       </div>
       <div
-        class="am-flexbox-item am-grid-item"
+        class="am-flexbox-item am-grid-item am-grid-null-item"
         style="width:25%;"
       >
         <div
diff --git a/components/grid/index.web.tsx b/components/grid/index.web.tsx
index 808f4ecc77..2d08753e69 100644
--- a/components/grid/index.web.tsx
+++ b/components/grid/index.web.tsx
@@ -101,7 +101,7 @@ export default class Grid extends React.Component<GridProps, any> {
           itemEl = (
             <Flex.Item
               key={`griditem-${dataIndex}`}
-              className={`${prefixCls}-item`}
+              className={`${prefixCls}-item ${prefixCls}-null-item`}
               style={colStyle}
             >
               <div className={`${prefixCls}-item-content`}>
diff --git a/components/grid/style/index.less b/components/grid/style/index.less
index 1bd99e2717..1b13a10590 100644
--- a/components/grid/style/index.less
+++ b/components/grid/style/index.less
@@ -18,6 +18,9 @@
         &:active {
           background-color: @fill-tap;
         }
+        &.@{gridPrefixCls}-null-item:active {
+         background-color: @fill-base;
+        }
       }
 
       &.@{gridPrefixCls}-item:before {