Remove unused "header-active" classname and style (#13334)

Change-Id: I11de89a69161d9b355d0de63b8a61470259b518e

5 files changed, 0 insertions, 54 deletions

diff --git a/WebContent/VAADIN/themes/base/grid/grid.scss b/WebContent/VAADIN/themes/base/grid/grid.scss
index de30424d22..341fea80b5 100644
--- a/WebContent/VAADIN/themes/base/grid/grid.scss
+++ b/WebContent/VAADIN/themes/base/grid/grid.scss
@@ -23,10 +23,6 @@
 			border-color: blue;
 		}
 
-		.#{$primaryStyleName}-header-active {
-			background: lightgray;
-		}
-
 		.#{$primaryStyleName}-row-active > td {
 			background: rgb(244,244,244);
 		}
diff --git a/client/src/com/vaadin/client/widgets/Grid.java b/client/src/com/vaadin/client/widgets/Grid.java
index bbdaec8994..af9c04a773 100644
--- a/client/src/com/vaadin/client/widgets/Grid.java
+++ b/client/src/com/vaadin/client/widgets/Grid.java
@@ -1483,13 +1483,6 @@ public class Grid<T> extends ResizeComposite implements
                     cellWithFocusStyle = null;
                 }
             }
-
-            if (cellContainer == escalator.getHeader()
-                    || cellContainer == escalator.getFooter()) {
-                // Correct header and footer column also needs highlighting
-                setStyleName(cell.getElement(), headerFooterFocusStyleName,
-                        columnHasFocus);
-            }
         }
 
         /**
@@ -2399,7 +2392,6 @@ public class Grid<T> extends ResizeComposite implements
     private String rowSelectedStyleName;
     private String cellFocusStyleName;
     private String rowFocusStyleName;
-    private String headerFooterFocusStyleName;
 
     /**
      * Current selection model.
@@ -3435,7 +3427,6 @@ public class Grid<T> extends ResizeComposite implements
          * merged.
          */
         cellFocusStyleName = getStylePrimaryName() + "-cell-active";
-        headerFooterFocusStyleName = getStylePrimaryName() + "-header-active";
         rowFocusStyleName = getStylePrimaryName() + "-row-active";
 
         if (isAttached()) {
diff --git a/uitest/src/com/vaadin/testbench/elements/GridElement.java b/uitest/src/com/vaadin/testbench/elements/GridElement.java
index b0f8f94eed..07f3442510 100644
--- a/uitest/src/com/vaadin/testbench/elements/GridElement.java
+++ b/uitest/src/com/vaadin/testbench/elements/GridElement.java
@@ -23,9 +23,6 @@ import org.openqa.selenium.WebElement;
 
 import com.vaadin.testbench.By;
 import com.vaadin.testbench.TestBenchElement;
-import com.vaadin.testbench.elements.AbstractComponentElement;
-import com.vaadin.testbench.elements.AbstractElement;
-import com.vaadin.testbench.elements.ServerClass;
 
 /**
  * TestBench Element API for Grid
@@ -41,17 +38,12 @@ public class GridElement extends AbstractComponentElement {
         // TODO static final?
         // TODO rename "active" to "focused" once Valo CSS is merged
         private String FOCUSED_CELL_CLASS_NAME = "-cell-active";
-        private String FOCUSED_HEADER_CLASS_NAME = "-header-active";
         private String FROZEN_CLASS_NAME = "frozen";
 
         public boolean isFocused() {
             return getAttribute("class").contains(FOCUSED_CELL_CLASS_NAME);
         }
 
-        public boolean isFocusedHeader() {
-            return getAttribute("class").contains(FOCUSED_HEADER_CLASS_NAME);
-        }
-
         public boolean isFrozen() {
             return getAttribute("class").contains(FROZEN_CLASS_NAME);
         }
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridColspansTest.java b/uitest/src/com/vaadin/tests/components/grid/GridColspansTest.java
index f763f7820a..7a9314f6ba 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridColspansTest.java
+++ b/uitest/src/com/vaadin/tests/components/grid/GridColspansTest.java
@@ -18,13 +18,9 @@ package com.vaadin.tests.components.grid;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-import java.io.IOException;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.openqa.selenium.By;
-import org.openqa.selenium.Keys;
-import org.openqa.selenium.interactions.Actions;
 
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.testbench.elements.GridElement;
@@ -61,28 +57,6 @@ public class GridColspansTest extends MultiBrowserTest {
     }
 
     @Test
-    public void testFocusedHeaderColumnsWithNavigation() throws IOException {
-        openTestURL();
-
-        GridElement grid = $(GridElement.class).first();
-        grid.getCell(0, 1).click();
-
-        compareScreen("beforeNavigation");
-
-        for (int i = 1; i <= 6; ++i) {
-            assertEquals(true, grid.getFooterCell(1, 1).isFocusedHeader());
-            assertEquals(i < 3, grid.getFooterCell(0, 1).isFocusedHeader());
-            assertEquals(i >= 3, grid.getFooterCell(0, 3).isFocusedHeader());
-            assertEquals(true, grid.getHeaderCell(0, 1).isFocusedHeader());
-            assertEquals(i < 3, grid.getHeaderCell(1, 1).isFocusedHeader());
-            assertEquals(i >= 3, grid.getHeaderCell(1, 3).isFocusedHeader());
-            new Actions(getDriver()).sendKeys(Keys.ARROW_RIGHT).perform();
-        }
-
-        compareScreen("afterNavigation");
-    }
-
-    @Test
     public void testHideFirstColumnOfColspan() {
         openTestURL();
 
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/GridStylingTest.java b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/GridStylingTest.java
index ef9e082ee6..94d84e3e97 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/GridStylingTest.java
+++ b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/GridStylingTest.java
@@ -72,13 +72,6 @@ public class GridStylingTest extends GridStaticSectionTest {
                 classNames = getGridElement().getHeaderCell(row, col)
                         .getAttribute("class");
                 assertTrue(classNames.contains(stylename + "-cell"));
-
-                if (row == 0 && col == 0) {
-                    // TODO: rename "active" to "focused" once Valo CSS is
-                    // merged
-                    assertTrue(classNames,
-                            classNames.contains(stylename + "-header-active"));
-                }
             }
         }