Merge changes from origin/7.1

2c1f8e6 Add SuggestionPopup to ComboBox SubParts. (#13286)

Change-Id: I68c2d1a6f9edecf8b7197cea04e9bcb387935aa3

1 files changed, 4 insertions, 0 deletions

diff --git a/client/src/com/vaadin/client/ui/VFilterSelect.java b/client/src/com/vaadin/client/ui/VFilterSelect.java
index 7efb5b8867..9bace9141c 100644
--- a/client/src/com/vaadin/client/ui/VFilterSelect.java
+++ b/client/src/com/vaadin/client/ui/VFilterSelect.java
@@ -1988,6 +1988,8 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler,
             return tb.getElement();
         } else if ("button".equals(subPart)) {
             return popupOpener.getElement();
+        } else if ("popup".equals(subPart) && suggestionPopup.isAttached()) {
+            return suggestionPopup.getElement();
         }
         return null;
     }
@@ -1998,6 +2000,8 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler,
             return "textbox";
         } else if (popupOpener.getElement().isOrHasChild(subElement)) {
             return "button";
+        } else if (suggestionPopup.getElement().isOrHasChild(subElement)) {
+            return "popup";
         }
         return null;
     }