From e872c95c072e049adcaede8b42c9dfbcd4a6c50e Mon Sep 17 00:00:00 2001 From: web-padawan Date: Fri, 2 Aug 2024 16:40:54 +0300 Subject: [PATCH] feat: add Popover component to platform --- .../generator/templates/template-vaadin-spring-bom.xml | 10 ++++++++++ vaadin-core-internal/pom.xml | 4 ++++ .../frontend/views/components/components-view.ts | 7 +++++-- .../java/com/vaadin/platform/test/ComponentsView.java | 4 ++++ .../src/main/java/com/vaadin/prodbundle/EagerView.java | 2 ++ vaadin-testbench-junit5/pom.xml | 5 +++++ vaadin-testbench/pom.xml | 5 +++++ versions.json | 6 ++++++ 8 files changed, 41 insertions(+), 2 deletions(-) diff --git a/scripts/generator/templates/template-vaadin-spring-bom.xml b/scripts/generator/templates/template-vaadin-spring-bom.xml index b184276fe..25b5c8299 100644 --- a/scripts/generator/templates/template-vaadin-spring-bom.xml +++ b/scripts/generator/templates/template-vaadin-spring-bom.xml @@ -287,6 +287,11 @@ vaadin-progress-bar-flow ${progress.bar.version} + + com.vaadin + vaadin-popover-flow + ${popover.version} + com.vaadin vaadin-radio-button-flow @@ -494,6 +499,11 @@ vaadin-ordered-layout-testbench ${vaadin.ordered.layout.version} + + com.vaadin + vaadin-popover-testbench + ${popover.version} + com.vaadin vaadin-progress-bar-testbench diff --git a/vaadin-core-internal/pom.xml b/vaadin-core-internal/pom.xml index 087612970..61658269a 100644 --- a/vaadin-core-internal/pom.xml +++ b/vaadin-core-internal/pom.xml @@ -172,6 +172,10 @@ com.vaadin vaadin-progress-bar-flow + + com.vaadin + vaadin-popover-flow + com.vaadin vaadin-radio-button-flow diff --git a/vaadin-platform-hybrid-test/frontend/views/components/components-view.ts b/vaadin-platform-hybrid-test/frontend/views/components/components-view.ts index eeb6d2642..d16d9264b 100644 --- a/vaadin-platform-hybrid-test/frontend/views/components/components-view.ts +++ b/vaadin-platform-hybrid-test/frontend/views/components/components-view.ts @@ -48,6 +48,7 @@ import '@vaadin/number-field'; import '@vaadin/password-field'; import '@vaadin/polymer-legacy-adapter/style-modules'; import '@vaadin/polymer-legacy-adapter/template-renderer'; +import '@vaadin/popover'; import '@vaadin/progress-bar'; import '@vaadin/radio-group'; import '@vaadin/rich-text-editor'; @@ -248,6 +249,8 @@ export class ComponentsView extends View { + + Main menu Nav Item 1 @@ -272,7 +275,7 @@ export class ComponentsView extends View { Nav Item 2 - 2 - +
RIGHT
LEFT
diff --git a/vaadin-platform-test/src/main/java/com/vaadin/platform/test/ComponentsView.java b/vaadin-platform-test/src/main/java/com/vaadin/platform/test/ComponentsView.java index 3e1c9bf86..c824f21ac 100644 --- a/vaadin-platform-test/src/main/java/com/vaadin/platform/test/ComponentsView.java +++ b/vaadin-platform-test/src/main/java/com/vaadin/platform/test/ComponentsView.java @@ -131,6 +131,7 @@ import com.vaadin.flow.component.orderedlayout.HorizontalLayout; import com.vaadin.flow.component.orderedlayout.Scroller; import com.vaadin.flow.component.orderedlayout.VerticalLayout; +import com.vaadin.flow.component.popover.Popover; import com.vaadin.flow.component.progressbar.ProgressBar; import com.vaadin.flow.component.radiobutton.RadioButtonGroup; import com.vaadin.flow.component.richtexteditor.RichTextEditor; @@ -631,6 +632,8 @@ protected void setPresentationValue(String newPresentationValue) { com.vaadin.flow.component.map.Map mapComponent = new com.vaadin.flow.component.map.Map(); + Popover popover = new Popover(); + SideNav sideNav = new SideNav("Navigation"); sideNav.setCollapsible(true); sideNav.addItem(new SideNavItem("Nav item 1", "/1")); @@ -687,6 +690,7 @@ protected void setPresentationValue(String newPresentationValue) { components.add(messageInput); components.add(main); components.add(mapComponent); + components.add(popover); components.add(sideNav); components.add(nativeLabel); diff --git a/vaadin-prod-bundle/src/main/java/com/vaadin/prodbundle/EagerView.java b/vaadin-prod-bundle/src/main/java/com/vaadin/prodbundle/EagerView.java index 244b88f7c..2bae0d229 100644 --- a/vaadin-prod-bundle/src/main/java/com/vaadin/prodbundle/EagerView.java +++ b/vaadin-prod-bundle/src/main/java/com/vaadin/prodbundle/EagerView.java @@ -38,6 +38,7 @@ import com.vaadin.flow.component.orderedlayout.HorizontalLayout; import com.vaadin.flow.component.orderedlayout.Scroller; import com.vaadin.flow.component.orderedlayout.VerticalLayout; +import com.vaadin.flow.component.popover.Popover; import com.vaadin.flow.component.progressbar.ProgressBar; import com.vaadin.flow.component.radiobutton.RadioButtonGroup; import com.vaadin.flow.component.select.Select; @@ -106,6 +107,7 @@ public class EagerView extends Div { public Notification notification; public NumberField numberField; public PasswordField passwordField; + public Popover popover; public ProgressBar progressBar; public RadioButtonGroup radioButtonGroup; public Scroller scroller; diff --git a/vaadin-testbench-junit5/pom.xml b/vaadin-testbench-junit5/pom.xml index b126419bf..e7c6e912a 100644 --- a/vaadin-testbench-junit5/pom.xml +++ b/vaadin-testbench-junit5/pom.xml @@ -187,6 +187,11 @@ vaadin-ordered-layout-testbench compile + + com.vaadin + vaadin-popover-testbench + compile + com.vaadin vaadin-progress-bar-testbench diff --git a/vaadin-testbench/pom.xml b/vaadin-testbench/pom.xml index f705ba6d3..2c3c675b6 100644 --- a/vaadin-testbench/pom.xml +++ b/vaadin-testbench/pom.xml @@ -187,6 +187,11 @@ vaadin-ordered-layout-testbench compile + + com.vaadin + vaadin-popover-testbench + compile + com.vaadin vaadin-progress-bar-testbench diff --git a/versions.json b/versions.json index c54d380a0..3c39f4c52 100644 --- a/versions.json +++ b/versions.json @@ -245,6 +245,12 @@ "jsVersion": "24.5.0-alpha6", "npmName": "@vaadin/polymer-legacy-adapter" }, + "popover": { + "javaVersion": "{{version}}", + "jsVersion": "24.5.0-alpha6", + "mode": "lit", + "npmName": "@vaadin/popover" + }, "progress-bar": { "javaVersion": "{{version}}", "jsVersion": "24.5.0-alpha6",