Merge pull request #4429 from mP1/feature/SpreadsheetSuggestBoxCompon…

…ent-addXXXListener-suggestBox-addEventListener SpreadsheetSuggestBoxComponent.addXXXListener suggestBox.addEventList…
mP1 · Jan 15, 2025 · 27e523f · 27e523f
2 parents 76e5a02 + 5ea0a2f
commit 27e523f
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/src/main/java/walkingkooka/spreadsheet/dominokit/value/SpreadsheetSuggestBoxComponent.java b/src/main/java/walkingkooka/spreadsheet/dominokit/value/SpreadsheetSuggestBoxComponent.java
@@ -276,39 +276,42 @@ public SpreadsheetSuggestBoxComponent<T> addChangeListener(final ChangeListener<
 
     @Override
     public SpreadsheetSuggestBoxComponent<T> addClickListener(final EventListener listener) {
-        this.suggestBox.addEventListener(
+        return this.addEventListener(
             EventType.click,
             listener
         );
-        return this;
     }
 
     @Override
     public SpreadsheetSuggestBoxComponent<T> addFocusListener(final EventListener listener) {
-        this.suggestBox.addEventListener(
+        return this.addEventListener(
             EventType.focus,
             listener
         );
-        return this;
     }
 
     @Override
     public SpreadsheetSuggestBoxComponent<T> addKeydownListener(final EventListener listener) {
-        Objects.requireNonNull(listener, "listener");
-
-        this.suggestBox.addEventListener(
+        return this.addEventListener(
             EventType.keydown,
             listener
         );
-        return this;
     }
 
     @Override
     public SpreadsheetSuggestBoxComponent<T> addKeyupListener(final EventListener listener) {
+        return this.addEventListener(
+            EventType.keyup,
+            listener
+        );
+    }
+
+    private SpreadsheetSuggestBoxComponent<T> addEventListener(final EventType eventType,
+                                                final EventListener listener) {
         Objects.requireNonNull(listener, "listener");
 
         this.suggestBox.addEventListener(
-            EventType.keyup,
+            eventType,
             listener
         );
         return this;