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 @@ com.vaadin.componentfactory enhanced-grid-flow-demo - 0.8.0 + 0.9.0 Enhanced Grid Demo war @@ -106,7 +106,7 @@ com.vaadin.componentfactory enhanced-grid-flow - 0.8.0 + 0.9.0 diff --git a/enhanced-grid-flow/pom.xml b/enhanced-grid-flow/pom.xml index 71ab13a..2238f1d 100644 --- a/enhanced-grid-flow/pom.xml +++ b/enhanced-grid-flow/pom.xml @@ -6,7 +6,7 @@ com.vaadin.componentfactory enhanced-grid-flow - 0.8.0 + 0.9.0 jar Enhanced Grid @@ -104,7 +104,7 @@ com.vaadin.componentfactory popup - 2.2.3 + 2.2.4 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..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 @@ -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 extends Grid.Column { @@ -129,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())) { diff --git a/pom.xml b/pom.xml index 2f45724..508807e 100755 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ com.vaadin.componentfactory enhanced-grid-flow-root - 0.8.0 + 0.9.0 pom enhanced-grid-flow @@ -18,7 +18,7 @@ 1.8 UTF-8 UTF-8 - 0.8.0 + 0.9.0 2020