Skip to content

Commit 3fce2ff

Browse files
committed
tweaks and enhancements
1 parent a7e7f0f commit 3fce2ff

File tree

2 files changed

+16
-13
lines changed

2 files changed

+16
-13
lines changed

domino-ui/src/main/java/org/dominokit/domino/ui/datatable/model/SearchContext.java

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package org.dominokit.domino.ui.datatable.model;
1818

1919
import java.util.ArrayList;
20+
import java.util.Iterator;
2021
import java.util.List;
2122
import java.util.function.Consumer;
2223
import java.util.stream.Collectors;
@@ -83,10 +84,12 @@ public SearchContext remove(Filter filter) {
8384
* @return this SearchContext for method chaining
8485
*/
8586
public SearchContext remove(String fieldName) {
86-
filters.removeAll(
87-
filters.stream()
88-
.filter(filter -> filter.getFieldName().equals(fieldName))
89-
.collect(Collectors.toList()));
87+
for (Iterator<Filter> it = filters.iterator(); it.hasNext(); ) {
88+
Filter filter = it.next();
89+
if (filter.getFieldName().equals(fieldName)) {
90+
it.remove();
91+
}
92+
}
9093
return this;
9194
}
9295

@@ -98,13 +101,13 @@ public SearchContext remove(String fieldName) {
98101
* @return this SearchContext for method chaining
99102
*/
100103
public SearchContext remove(String fieldName, IsFilterCategory category) {
101-
filters.removeAll(
102-
filters.stream()
103-
.filter(
104-
filter ->
105-
filter.getFieldName().equals(fieldName)
106-
&& filter.getCategory().isSameCategory(category))
107-
.collect(Collectors.toList()));
104+
for (Iterator<Filter> it = filters.iterator(); it.hasNext(); ) {
105+
Filter filter = it.next();
106+
if (filter.getFieldName().equals(fieldName)
107+
&& filter.getCategory().isSameCategory(category)) {
108+
it.remove();
109+
}
110+
}
108111
return this;
109112
}
110113

domino-ui/src/main/java/org/dominokit/domino/ui/search/SearchBox.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,8 @@ public SearchBox() {
127127
textBox =
128128
TextBox.create()
129129
.setPlaceholder(getLabels().defaultQuickSearchPlaceHolder())
130-
.appendChild(PrefixAddOn.of(searchIcon))
131-
.appendChild(PostfixAddOn.of(clearIcon))
130+
.appendChild(PrefixAddOn.of(searchIcon).addCss(dui_order_first))
131+
.appendChild(PostfixAddOn.of(clearIcon).addCss(dui_order_last))
132132
.addCss(dui_m_0)
133133
.withInputElement(
134134
(parent, input) -> {

0 commit comments

Comments
 (0)