Fixes

Author: JohannesRabauer

assets/demo.gif

@@ -58,10 +58,16 @@ public abstract class AbstractEditableLabel
 	private SerializableConsumer<C> onClick = null;
 
 	public AbstractEditableLabel(final EDIT editor)
+	{
+		this(editor, " - ");
+		
+	}
+	
+	public AbstractEditableLabel(final EDIT editor, final String emptyValue)
 	{
 		super();
 		this.editor = editor;
-		this.emptyValue = " - ";
+		this.emptyValue = emptyValue;
 		this.initUI(
 			VaadinIcon.PENCIL.create(),
 			VaadinIcon.CHECK.create(),

assets/demo.png

@@ -31,7 +31,6 @@
 import com.vaadin.flow.component.ComponentEventListener;
 import com.vaadin.flow.component.button.Button;
 import com.vaadin.flow.component.textfield.BigDecimalField;
-import com.vaadin.flow.component.textfield.TextFieldVariant;
 
 
 /**
@@ -44,17 +43,41 @@ public class EditableLabelBigDecimalField
 {
 
 	private BigDecimal value;
-	private NumberFormat currencyFormatter;
+	private NumberFormat numberFormatter;
 
 	public EditableLabelBigDecimalField()
 	{
 		super(new BigDecimalField());
 	}
 
-	public EditableLabelBigDecimalField(final NumberFormat currencyFormatter)
+	public EditableLabelBigDecimalField(final NumberFormat numberFormatter)
 	{
 		this();
-		Objects.requireNonNull(this.currencyFormatter = currencyFormatter);
+		Objects.requireNonNull(this.numberFormatter = numberFormatter);
+	}
+	
+	public EditableLabelBigDecimalField(final BigDecimal value, final NumberFormat numberFormatter)
+	{
+		this(numberFormatter);
+		this.setValue(value);
+	}
+	
+	public EditableLabelBigDecimalField(final BigDecimal value)
+	{
+		this();
+		this.setValue(value);
+	}
+	
+	public EditableLabelBigDecimalField(final Double value, final NumberFormat numberFormatter)
+	{
+		this(numberFormatter);
+		this.setValue(new BigDecimal(value));
+	}
+	
+	public EditableLabelBigDecimalField(final Double value)
+	{
+		this();
+		this.setValue(new BigDecimal(value));
 	}
 
 	@Override
@@ -66,9 +89,9 @@ public void setValue(final BigDecimal value)
 		}
 		else
 		{
-			if(this.currencyFormatter != null)
+			if(this.numberFormatter != null)
 			{
-				this.setLabelText(this.currencyFormatter.format(value));
+				this.setLabelText(this.numberFormatter.format(value));
 			}
 			else
 			{
@@ -86,9 +109,9 @@ public BigDecimal getValue()
 		return this.value;
 	}
 
-	public void setCurrency(final NumberFormat currencyFormatter)
+	public void setCurrency(final NumberFormat numberFormatter)
 	{
-		this.currencyFormatter = currencyFormatter;
+		this.numberFormatter = numberFormatter;
 	}
 
 	@Override
@@ -151,13 +174,7 @@ protected void initUI(
 	)
 	{
 		super.initUI(editIcon, saveIcon, abortIcon);
-		
 		this.getEditor().setAutoselect(true);
-		this.getEditor().addThemeVariants(TextFieldVariant.LUMO_SMALL);
-		
-		this.getEditor().setWidthFull();
-		this.getEditor().setHeight(null);
-		
 		this.getEditor().addBlurListener(this::textField_onBlur);
 	}
 }

vaadin-editable-label-component/src/main/java/software/xdev/vaadin/editable_label/ui/AbstractEditableLabel.java

@@ -23,14 +23,10 @@
 import java.util.Collection;
 
 import com.vaadin.flow.component.ClickEvent;
-import com.vaadin.flow.component.Component;
-import com.vaadin.flow.component.ComponentEvent;
-import com.vaadin.flow.component.ComponentEventListener;
 import com.vaadin.flow.component.ItemLabelGenerator;
 import com.vaadin.flow.component.button.Button;
 import com.vaadin.flow.component.combobox.ComboBox;
 import com.vaadin.flow.component.datepicker.DatePicker;
-import com.vaadin.flow.data.binder.HasDataProvider;
 import com.vaadin.flow.data.provider.DataProvider;
 
 
@@ -41,7 +37,6 @@
  */
 public class EditableLabelComboBox<T>
 	extends AbstractEditableLabel<Object, EditableLabelComboBox, T, ComboBox<T>>
-	implements HasDataProvider<T>
 {
 	private T value;
 
@@ -50,22 +45,53 @@ public EditableLabelComboBox()
 		super(new ComboBox<>());
 	}
 
+	public EditableLabelComboBox(final T selectedValue, final Collection<T> selectableItems)
+	{
+		this();
+		this.setItems(selectableItems);
+		this.setValue(selectedValue);
+	}
+	
+	public EditableLabelComboBox(final T selectedValue, final T... selectableItems)
+	{
+		this();
+		this.setItems(selectableItems);
+		this.setValue(selectedValue);
+	}
+	
+	public EditableLabelComboBox(final T selectedValue, final String emptyValue, final Collection<T> selectableItems)
+	{
+		super(new ComboBox<>(), emptyValue);
+		this.setItems(selectableItems);
+		this.setValue(selectedValue);
+	}
+	
+	public EditableLabelComboBox(final T selectedValue, final String emptyValue, final T... selectableItems)
+	{
+		super(new ComboBox<>(), emptyValue);
+		this.setItems(selectableItems);
+		this.setValue(selectedValue);
+	}
+	
 	@Override
 	public void setValue(final T value)
 	{
+		final T oldValue = this.value;
+		this.value = value;
+		
 		if(value == null)
 		{
 			this.setLabelText(this.emptyValue);
 		}
 		else
 		{
-			this.value = value;
 			this.setLabelText(this.getEditor().getItemLabelGenerator().apply(this.value));
 			if(this.getLabelText().isBlank())
 			{
 				this.setLabelText(this.emptyValue);
 			}
 		}
+		this.fireChangedEvent(oldValue);
 	}
 
 	@Override
@@ -91,41 +117,20 @@ public void setItemLabelGenerator(
 	{
 		this.getEditor().setItemLabelGenerator(itemLabelGenerator);
 	}
-	
-	/**
-	 * Event handler delegate method for the {@link Button} {@link #btnEdit}.
-	 *
-	 * @eventHandlerDelegate Do NOT delete, used by UI designer!
-	 * @see ComponentEventListener#onComponentEvent(ComponentEvent)
-	 */
+
 	@Override
 	protected void btnEdit_onClick(final ClickEvent<Button> event)
 	{
 		this.getEditor().setValue(this.value);
 		this.getEditor().focus();
+		this.getEditor().setOpened(true);
 		this.enableEditMode();
 	}
-	
-	/**
-	 * Event handler delegate method for the {@link Button} {@link #btnSave}.
-	 *
-	 * @eventHandlerDelegate Do NOT delete, used by UI designer!
-	 * @see ComponentEventListener#onComponentEvent(ComponentEvent)
-	 */
+
 	@Override
 	protected void btnSave_onClick(final ClickEvent<Button> event)
 	{
-		final T oldValue = this.value;
-		this.value = this.getEditor().getValue();
-		this.setLabelText(
-			this.getEditor().getItemLabelGenerator().apply(this.value)
-		);
-		this.fireChangedEvent(oldValue);
-		if(this.getLabelText().isBlank())
-		{
-			this.setLabelText(this.emptyValue);
-		}
-		
+		this.setValue(this.value);
 		this.disableEditMode();
 	}
 
@@ -135,36 +140,16 @@ protected void btnClose_onClick(final ClickEvent<Button> event)
 		this.disableEditMode();
 	}
 
-	@Override
-	protected void initUI(
-		final Component editIcon,
-		final Component saveIcon,
-		final Component abortIcon
-	)
-	{
-		super.initUI(editIcon, saveIcon, abortIcon);
-		// this.getEditor().setItemLabelGenerator(EditableLabelComboBox.NonNull(CaptionUtils::resolveCaption));
-		this.getEditor().setWidthFull();
-		this.getEditor().getElement().setAttribute("theme", "small");
-		this.getEditor().addValueChangeListener(l ->
-		{
-			this.value = l.getValue();
-		});
-	}
-	
-	@Override
-	public void setDataProvider(final DataProvider<T, ?> dataProvider)
+	public void setDataProvider(final DataProvider<T, String> dataProvider)
 	{
-		// this.getEditor().setItems(dataProvider);
+		this.getEditor().setItems(dataProvider);
 	}
 
-	@Override
 	public void setItems(final Collection<T> items)
 	{
 		this.getEditor().setItems(items);
 	}
 
-	@Override
 	public void setItems(final T... items)
 	{
 		this.getEditor().setItems(items);