Browse Source

Fix position of font icons in ComboBox (#9638)

Fixes #9637
tags/8.1.0.rc2
Henri Sara 6 years ago
parent
commit
3478969053

+ 1
- 1
tests/screenshots

@@ -1 +1 @@
Subproject commit 21ea7e4a0bf740bb34ef5916caf0473c12825a54
Subproject commit 7d70f6d3fa34ae6fdbfb874994f24ba08abfe13b

+ 6
- 0
themes/src/main/themes/VAADIN/themes/valo/components/_combobox.scss View File

@@ -161,6 +161,12 @@
width: $unit-size;
line-height: 1;
padding-top: .12em;

$padding-width: ceil($unit-size/6);
@if $border-radius {
$padding-width: $padding-width + ceil($border-radius/3);
}
margin-left: $padding-width;
}

&[class*="prompt"] > [class*="input"] {

+ 26
- 0
uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxVaadinIcons.java View File

@@ -0,0 +1,26 @@
package com.vaadin.tests.components.combobox;

import java.util.Arrays;

import com.vaadin.annotations.Widgetset;
import com.vaadin.icons.VaadinIcons;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.ComboBox;

@Widgetset("com.vaadin.DefaultWidgetSet")
public class ComboBoxVaadinIcons extends AbstractTestUI {

public static final VaadinIcons[] icons = new VaadinIcons[] {
VaadinIcons.AMBULANCE, VaadinIcons.PAPERPLANE,
VaadinIcons.AIRPLANE };

@Override
protected void setup(VaadinRequest request) {
ComboBox<String> comboBox = new ComboBox<>();
comboBox.setItems(Arrays.stream(icons).map(VaadinIcons::name));
comboBox.setItemIconGenerator(VaadinIcons::valueOf);
addComponent(comboBox);
}

}

+ 23
- 0
uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxVaadinIconsTest.java View File

@@ -0,0 +1,23 @@
package com.vaadin.tests.components.combobox;

import java.io.IOException;

import org.junit.Test;
import org.openqa.selenium.Keys;

import com.vaadin.testbench.elements.ComboBoxElement;
import com.vaadin.tests.tb3.MultiBrowserTest;

public class ComboBoxVaadinIconsTest extends MultiBrowserTest {

@Test
public void testComboBoxIconRendering() throws IOException {
openTestURL();
ComboBoxElement comboBox = $(ComboBoxElement.class).first();
comboBox.openPopup();
compareScreen(comboBox.getSuggestionPopup(), "popup");
comboBox.sendKeys(Keys.ARROW_DOWN, Keys.ARROW_DOWN, Keys.ENTER);
compareScreen(comboBox, "paperplane");
}

}

Loading…
Cancel
Save