aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnna Koskinen <Ansku@users.noreply.github.com>2019-11-14 11:20:42 +0200
committerGitHub <noreply@github.com>2019-11-14 11:20:42 +0200
commit0956eafcff4e971e3d16afbf2e0133367202e94d (patch)
treed7a195f9a9effa8bf52a6e7ae083498d4f4ce968
parentea4105de7443d9388e80b6bbe4ad8fe74d3e9c81 (diff)
downloadvaadin-framework-0956eafcff4e971e3d16afbf2e0133367202e94d.tar.gz
vaadin-framework-0956eafcff4e971e3d16afbf2e0133367202e94d.zip
Reduce excess positioning calls for ComboBox popup. (#11808) (#11809)
- If an open popup is reset to its default position on every update from the server before getting adjusted again to the actual expected position, on heavier applications some of those intermediate positions might get rendered. If the ComboBox is positioned at the right edge and the popup contents are longer than the input field (i.e. popup should open to the left, not right) this might cause flickering. - Setting the default position is only actually needed when the popup is opened in order to give it a baseline, otherwise it's better to simply adjust the position if needed. Continues on #11718
-rw-r--r--client/src/main/java/com/vaadin/client/ui/VComboBox.java29
1 files changed, 21 insertions, 8 deletions
diff --git a/client/src/main/java/com/vaadin/client/ui/VComboBox.java b/client/src/main/java/com/vaadin/client/ui/VComboBox.java
index 3c2f599300..438234d30b 100644
--- a/client/src/main/java/com/vaadin/client/ui/VComboBox.java
+++ b/client/src/main/java/com/vaadin/client/ui/VComboBox.java
@@ -428,10 +428,15 @@ public class VComboBox extends Composite implements Field, KeyDownHandler,
// Add TT anchor point
getElement().setId("VAADIN_COMBOBOX_OPTIONLIST");
- leftPosition = getDesiredLeftPosition();
- topPosition = getDesiredTopPosition();
+ // Set the default position if the popup isn't already visible,
+ // the setPopupPositionAndShow call later on can deal with any
+ // adjustments that might be needed
+ if (!popup.isShowing()) {
+ leftPosition = getDesiredLeftPosition();
+ topPosition = getDesiredTopPosition();
- setPopupPosition(leftPosition, topPosition);
+ setPopupPosition(leftPosition, topPosition);
+ }
int nullOffset = getNullSelectionItemShouldBeVisible() ? 1 : 0;
boolean firstPage = currentPage == 0;
@@ -894,16 +899,24 @@ public class VComboBox extends Composite implements Field, KeyDownHandler,
}
}
+ if (offsetWidth + menuMarginBorderPaddingWidth
+ + left < VComboBox.this.getAbsoluteLeft()
+ + VComboBox.this.getOffsetWidth()) {
+ // Popup doesn't reach all the way to the end of the input
+ // field, filtering may have changed the popup width.
+ left = VComboBox.this.getAbsoluteLeft();
+ }
if (offsetWidth + menuMarginBorderPaddingWidth + left > Window
.getClientWidth()) {
+ // Popup doesn't fit the view, needs to be opened to the left
+ // instead.
left = VComboBox.this.getAbsoluteLeft()
+ VComboBox.this.getOffsetWidth() - offsetWidth
- (int) menuMarginBorderPaddingWidth;
- if (left < 0) {
- left = 0;
- menu.setWidth(Window.getClientWidth() + "px");
-
- }
+ }
+ if (left < 0) {
+ left = 0;
+ menu.setWidth(Window.getClientWidth() + "px");
}
setPopupPosition(left, top);