Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@
import com.vaadin.server.AbstractClientConnector;
import com.vaadin.server.AbstractExtension;
import com.vaadin.shared.Registration;
import com.vaadin.shared.communication.SharedState;
import com.vaadin.ui.TextField;

import org.vaadin.addons.client.ResetButtonClickRpc;
import org.vaadin.addons.client.ResetButtonForTextFieldState;

import java.util.ArrayList;
import java.util.List;
Expand Down Expand Up @@ -33,4 +35,17 @@ public Registration addResetButtonClickedListener(ResetButtonClickListener liste

return () -> listeners.remove(listener);
}
}

@Override
protected ResetButtonForTextFieldState getState() {
return (ResetButtonForTextFieldState) super.getState();
}

public void setShowForReadOnly(boolean pValue) {
getState().showForReadOnly = pValue;
}

public boolean isShowForReadOnly() {
return getState().showForReadOnly;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import com.vaadin.client.communication.StateChangeEvent;
import com.vaadin.client.extensions.AbstractExtensionConnector;
import com.vaadin.client.ui.VTextField;
import com.vaadin.shared.communication.SharedState;
import com.vaadin.shared.ui.Connect;

import org.vaadin.addons.ResetButtonForTextField;
Expand Down Expand Up @@ -93,7 +94,7 @@ public void onKeyUp(KeyUpEvent event) {
}

private void updateResetButtonVisibility() {
if (textField.getValue().isEmpty() || textField.isReadOnly()
if (textField.getValue().isEmpty() || (!getState().showForReadOnly && textField.isReadOnly())
|| !textField.isEnabled()
|| textField.getStyleName().contains("v-textfield-prompt")) {
resetButtonElement.getStyle().setDisplay(Display.NONE);
Expand All @@ -107,4 +108,9 @@ private void clearTextField() {
updateResetButtonVisibility();
textField.getElement().focus();
}

@Override
public ResetButtonForTextFieldState getState() {
return (ResetButtonForTextFieldState) super.getState();
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package org.vaadin.addons.client;

import com.vaadin.shared.communication.SharedState;

public class ResetButtonForTextFieldState extends SharedState{
public boolean showForReadOnly = false;
}