Skip to content

Merge branch v3.0.0 into master #134

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Jul 17, 2023
Merged
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
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.flowingcode.vaadin.addons</groupId>
<artifactId>twincolgrid</artifactId>
<version>2.9.3-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<name>TwinColGrid add-on</name>
<properties>
<vaadin.version>14.9.7</vaadin.version>
<vaadin.version>14.8.20</vaadin.version>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,127 @@
package com.flowingcode.vaadin.addons.twincolgrid;

import com.vaadin.flow.component.Component;
import com.vaadin.flow.component.grid.Grid.Column;
import com.vaadin.flow.component.grid.SortOrderProvider;
import com.vaadin.flow.component.textfield.TextField;
import com.vaadin.flow.function.SerializableFunction;
import com.vaadin.flow.function.ValueProvider;
import java.util.Comparator;
import java.util.function.Supplier;

/** Fluent helper object that delegates setters on both columns. */
public class FilterableTwinColumn<T> extends TwinColumn<T> {

public FilterableTwinColumn(Column<T> availableColumn, Column<T> selectionColumn) {
super(availableColumn, selectionColumn);
}

/**
* Set the placeholder of the filter text field on both columns.
*
* @see TextField#setPlaceholder(String)
*/
public FilterableTwinColumn<T> setFilterPlaceholder(String filterPlaceholder) {
TwinColGrid.getFilterTextField(getAvailableColumn()).setPlaceholder(filterPlaceholder);
TwinColGrid.getFilterTextField(getSelectionColumn()).setPlaceholder(filterPlaceholder);
return this;
}

/**
* Set to {@code false} to hide the clear button which clears the filter text field.
*
* @see TextField#setClearButtonVisible(boolean)
*/
public FilterableTwinColumn<T> setClearButtonVisible(boolean clearButtonVisible) {
TwinColGrid.getFilterTextField(getAvailableColumn()).setClearButtonVisible(clearButtonVisible);
TwinColGrid.getFilterTextField(getSelectionColumn()).setClearButtonVisible(clearButtonVisible);
return this;
}

@Override
public FilterableTwinColumn<T> setWidth(String width) {
super.setWidth(width);
return this;
}

@Override
public FilterableTwinColumn<T> setFlexGrow(int flexGrow) {
super.setFlexGrow(flexGrow);
return this;
}

@Override
public FilterableTwinColumn<T> setAutoWidth(boolean autoWidth) {
super.setAutoWidth(autoWidth);
return this;
}

@Override
public FilterableTwinColumn<T> setKey(String key) {
super.setKey(key);
return this;
}

@Override
public FilterableTwinColumn<T> setComparator(Comparator<T> comparator) {
super.setComparator(comparator);
return this;
}

@Override
public <V extends Comparable<? super V>> TwinColumn<T> setComparator(
ValueProvider<T, V> keyExtractor) {
super.setComparator(keyExtractor);
return this;
}

@Override
public FilterableTwinColumn<T> setSortProperty(String... properties) {
super.setSortProperty(properties);
return this;
}

@Override
public FilterableTwinColumn<T> setSortOrderProvider(SortOrderProvider provider) {
super.setSortOrderProvider(provider);
return this;
}

@Override
public FilterableTwinColumn<T> setSortable(boolean sortable) {
super.setSortable(sortable);
return this;
}

@Override
public FilterableTwinColumn<T> setHeader(String labelText) {
super.setHeader(labelText);
return this;
}

@Override
public FilterableTwinColumn<T> setFooter(String labelText) {
super.setFooter(labelText);
return this;
}

@Override
public FilterableTwinColumn<T> setHeader(Supplier<Component> footerComponentSupplier) {
super.setHeader(footerComponentSupplier);
return this;
}

@Override
public FilterableTwinColumn<T> setFooter(Supplier<Component> footerComponentSupplier) {
super.setFooter(footerComponentSupplier);
return this;
}

@Override
public FilterableTwinColumn<T> setClassNameGenerator(
SerializableFunction<T, String> classNameGenerator) {
super.setClassNameGenerator(classNameGenerator);
return this;
}

}
Loading