From 7b3085528299d40ab7bd2066c54cedf238106108 Mon Sep 17 00:00:00 2001
From: Paola De Bartolo <paola.debartolo@ext.vaadin.com>
Date: Fri, 30 Apr 2021 17:47:11 -0300
Subject: [PATCH 1/4] fix: add uses annotation to avoid missing icon

---
 .../vaadin/componentfactory/enhancedgrid/EnhancedColumn.java   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/enhanced-grid-flow/src/main/java/com/vaadin/componentfactory/enhancedgrid/EnhancedColumn.java b/enhanced-grid-flow/src/main/java/com/vaadin/componentfactory/enhancedgrid/EnhancedColumn.java
index d0d0e91..67da02b 100644
--- a/enhanced-grid-flow/src/main/java/com/vaadin/componentfactory/enhancedgrid/EnhancedColumn.java
+++ b/enhanced-grid-flow/src/main/java/com/vaadin/componentfactory/enhancedgrid/EnhancedColumn.java
@@ -25,6 +25,7 @@
 import com.vaadin.flow.component.Component;
 import com.vaadin.flow.component.HasValueAndElement;
 import com.vaadin.flow.component.dependency.JsModule;
+import com.vaadin.flow.component.dependency.Uses;
 import com.vaadin.flow.component.grid.ColumnPathRenderer;
 import com.vaadin.flow.component.grid.FilterField;
 import com.vaadin.flow.component.grid.FilterFieldDto;
@@ -34,6 +35,7 @@
 import com.vaadin.flow.component.grid.SortOrderProvider;
 import com.vaadin.flow.component.html.Div;
 import com.vaadin.flow.component.html.Span;
+import com.vaadin.flow.component.icon.Icon;
 import com.vaadin.flow.data.renderer.Renderer;
 import com.vaadin.flow.function.ValueProvider;
 import com.vaadin.flow.internal.HtmlUtils;
@@ -44,6 +46,7 @@
  * and a {@link FilterField filter component} to perform column's filtering.
  *  
  */
+@Uses(Icon.class)
 @JsModule(value = "./src/enhanced-grid-sorter.js")
 public class EnhancedColumn<T> extends Grid.Column<T> {
 

From f6772d397f8ee64741bfae2562f8a24910a7b3ee Mon Sep 17 00:00:00 2001
From: Paola De Bartolo <paola.debartolo@ext.vaadin.com>
Date: Thu, 6 May 2021 11:45:57 -0300
Subject: [PATCH 2/4] build: update popup dependency version

---
 enhanced-grid-flow/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/enhanced-grid-flow/pom.xml b/enhanced-grid-flow/pom.xml
index 71ab13a..6be0a8e 100644
--- a/enhanced-grid-flow/pom.xml
+++ b/enhanced-grid-flow/pom.xml
@@ -104,7 +104,7 @@
         <dependency>
 		   <groupId>com.vaadin.componentfactory</groupId>
 		   <artifactId>popup</artifactId>
-		   <version>2.2.3</version>
+		   <version>2.2.4</version>
 		</dependency>
 
     </dependencies>

From 47cdfea4a12f4e06cdfbdd2943509f4f5f108f83 Mon Sep 17 00:00:00 2001
From: Paola De Bartolo <paola.debartolo@ext.vaadin.com>
Date: Thu, 6 May 2021 11:47:51 -0300
Subject: [PATCH 3/4] refactor: remove executeJs call no needed after component
 update

---
 .../componentfactory/enhancedgrid/EnhancedColumn.java     | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/enhanced-grid-flow/src/main/java/com/vaadin/componentfactory/enhancedgrid/EnhancedColumn.java b/enhanced-grid-flow/src/main/java/com/vaadin/componentfactory/enhancedgrid/EnhancedColumn.java
index 67da02b..abe0588 100644
--- a/enhanced-grid-flow/src/main/java/com/vaadin/componentfactory/enhancedgrid/EnhancedColumn.java
+++ b/enhanced-grid-flow/src/main/java/com/vaadin/componentfactory/enhancedgrid/EnhancedColumn.java
@@ -132,11 +132,9 @@ private void addFilterButtonToHeader(Component headerComponent, HasValueAndEleme
         div.getElement().getStyle().set("display", "inline-block");
 		filterField.setFor(div.getId().get());		
 		headerComponent.getElement().appendChild(div.getElement());
-                 
-        // this is needed to avoid js issues when adding popup
-        headerComponent.getElement().executeJs("return").then(ignore -> {
-        	headerComponent.getElement().appendChild(filterField.getElement());
-        });
+
+		// add filter field to header
+       	headerComponent.getElement().appendChild(filterField.getElement());
                 
         grid.addFilterClickedEventListener(e -> {
            	if(e.buttonId.equals(getInternalId())) {

From bf5cce3dd4b4e3019d1a598226cfe2a46408700c Mon Sep 17 00:00:00 2001
From: Paola De Bartolo <paola.debartolo@ext.vaadin.com>
Date: Mon, 10 May 2021 11:39:12 -0300
Subject: [PATCH 4/4] build: update version to 0.9.0

---
 enhanced-grid-flow-demo/pom.xml | 4 ++--
 enhanced-grid-flow/pom.xml      | 2 +-
 pom.xml                         | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/enhanced-grid-flow-demo/pom.xml b/enhanced-grid-flow-demo/pom.xml
index 3ae39b8..c015a5a 100644
--- a/enhanced-grid-flow-demo/pom.xml
+++ b/enhanced-grid-flow-demo/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.vaadin.componentfactory</groupId>
     <artifactId>enhanced-grid-flow-demo</artifactId>
-    <version>0.8.0</version>
+    <version>0.9.0</version>
 
     <name>Enhanced Grid Demo</name>
     <packaging>war</packaging>
@@ -106,7 +106,7 @@
        <dependency>
            <groupId>com.vaadin.componentfactory</groupId>
            <artifactId>enhanced-grid-flow</artifactId>
-           <version>0.8.0</version>
+           <version>0.9.0</version>
        </dependency>
 
         <dependency>
diff --git a/enhanced-grid-flow/pom.xml b/enhanced-grid-flow/pom.xml
index 6be0a8e..2238f1d 100644
--- a/enhanced-grid-flow/pom.xml
+++ b/enhanced-grid-flow/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.vaadin.componentfactory</groupId>
     <artifactId>enhanced-grid-flow</artifactId>
-    <version>0.8.0</version>
+    <version>0.9.0</version>
     <packaging>jar</packaging>
 
     <name>Enhanced Grid</name>
diff --git a/pom.xml b/pom.xml
index 2f45724..508807e 100755
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 
     <groupId>com.vaadin.componentfactory</groupId>
     <artifactId>enhanced-grid-flow-root</artifactId>
-    <version>0.8.0</version>
+    <version>0.9.0</version>
     <packaging>pom</packaging>
     <modules>
         <module>enhanced-grid-flow</module>
@@ -18,7 +18,7 @@
         <maven.compiler.target>1.8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <enhanced-grid-flow.version>0.8.0</enhanced-grid-flow.version>
+        <enhanced-grid-flow.version>0.9.0</enhanced-grid-flow.version>
     </properties>
     <inceptionYear>2020</inceptionYear>
     <organization>