interaction delay key per element. (#21)

Infumia · Nov 22, 2024 · 0e85045 · 0e85045
1 parent 261c5d8
commit 0e85045
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 3 deletions.
diff --git a/common/src/main/java/net/infumia/frame/element/Element.java b/common/src/main/java/net/infumia/frame/element/Element.java
@@ -4,6 +4,7 @@
 import java.util.Collection;
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Consumer;
+import java.util.function.Function;
 import java.util.function.Predicate;
 import net.infumia.frame.context.element.ContextElementClick;
 import net.infumia.frame.context.element.ContextElementRender;
@@ -25,6 +26,9 @@ public interface Element {
     @Nullable
     Consumer<ContextElementClick> onInteractionDelay();
 
+    @Nullable
+    Function<ContextElementClick, String> interactionDelayKey();
+
     @Nullable
     Predicate<ContextElementRender> displayIf();
 

diff --git a/common/src/main/java/net/infumia/frame/element/ElementBuilder.java b/common/src/main/java/net/infumia/frame/element/ElementBuilder.java
@@ -3,6 +3,7 @@
 import java.time.Duration;
 import java.util.function.BooleanSupplier;
 import java.util.function.Consumer;
+import java.util.function.Function;
 import java.util.function.Predicate;
 import net.infumia.frame.context.element.ContextElementClick;
 import net.infumia.frame.context.element.ContextElementRender;
@@ -35,6 +36,11 @@ public interface ElementBuilder {
     @NotNull
     ElementBuilder onInteractionDelay(@NotNull Consumer<ContextElementClick> onInteractionDelay);
 
+    @NotNull
+    ElementBuilder interactionDelayKey(
+        @NotNull Function<ContextElementClick, String> interactionDelayKey
+    );
+
     @NotNull
     ElementBuilder updateOnStateChange(@NotNull State<?> state, @NotNull State<?>... otherStates);
 

diff --git a/common/src/main/java/net/infumia/frame/element/ElementItemBuilder.java b/common/src/main/java/net/infumia/frame/element/ElementItemBuilder.java
@@ -61,6 +61,12 @@ ElementItemBuilder onInteractionDelay(
         @NotNull Consumer<ContextElementClick> onInteractionDelay
     );
 
+    @NotNull
+    @Override
+    ElementItemBuilder interactionDelayKey(
+        @NotNull Function<ContextElementClick, String> interactionDelayKey
+    );
+
     @NotNull
     @Override
     ElementItemBuilder updateOnStateChange(

diff --git a/core/src/main/java/net/infumia/frame/element/ElementBuilderImpl.java b/core/src/main/java/net/infumia/frame/element/ElementBuilderImpl.java
@@ -6,6 +6,7 @@
 import java.util.HashSet;
 import java.util.function.BooleanSupplier;
 import java.util.function.Consumer;
+import java.util.function.Function;
 import java.util.function.Predicate;
 import net.infumia.frame.context.ContextBase;
 import net.infumia.frame.context.element.ContextElementClick;
@@ -23,6 +24,7 @@ public class ElementBuilderImpl<Self extends ElementBuilderImpl<Self>>
     boolean updateOnClick;
     Duration interactionDelay;
     Consumer<ContextElementClick> onInteractionDelay;
+    Function<ContextElementClick, String> interactionDelayKey;
     Predicate<ContextElementRender> displayIf;
     Collection<State<?>> updateOnStateChange;
     Collection<State<?>> updateOnStateAccess;
@@ -109,6 +111,15 @@ public Self onInteractionDelay(
         return this.self();
     }
 
+    @NotNull
+    @Override
+    public Self interactionDelayKey(
+        @NotNull final Function<ContextElementClick, String> interactionDelayKey
+    ) {
+        this.interactionDelayKey = interactionDelayKey;
+        return this.self();
+    }
+
     @NotNull
     @Override
     public Self updateOnStateChange(

diff --git a/core/src/main/java/net/infumia/frame/element/ElementImpl.java b/core/src/main/java/net/infumia/frame/element/ElementImpl.java
@@ -5,6 +5,7 @@
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Consumer;
+import java.util.function.Function;
 import java.util.function.Predicate;
 import net.infumia.frame.context.ContextBase;
 import net.infumia.frame.context.element.ContextElementClick;
@@ -25,13 +26,14 @@ public class ElementImpl implements ElementRich {
     final boolean closeOnClick;
     final Duration interactionDelay;
     final Consumer<ContextElementClick> onInteractionDelay;
+    final Function<ContextElementClick, String> interactionDelayKey;
     final Predicate<ContextElementRender> displayIf;
     final Collection<State<?>> updateOnStateChange;
     final Collection<State<?>> updateOnStateAccess;
     private boolean visible = true;
 
     public ElementImpl(
-        @NotNull final ElementBuilderImpl builder,
+        @NotNull final ElementBuilderImpl<?> builder,
         @NotNull final ContextBase parent
     ) {
         this.key = UUID.randomUUID().toString();
@@ -40,6 +42,7 @@ public ElementImpl(
         this.closeOnClick = builder.closeOnClick;
         this.interactionDelay = builder.interactionDelay;
         this.onInteractionDelay = builder.onInteractionDelay;
+        this.interactionDelayKey = builder.interactionDelayKey;
         this.displayIf = builder.displayIf;
         this.updateOnStateChange = builder.updateOnStateChange;
         this.updateOnStateAccess = builder.updateOnStateAccess;
@@ -87,7 +90,7 @@ public boolean intersects(@NotNull final Element element) {
     @NotNull
     @Override
     public ElementBuilder toBuilder() {
-        return new ElementBuilderImpl(this);
+        return new ElementBuilderImpl<>(this);
     }
 
     @Override
@@ -117,6 +120,12 @@ public Consumer<ContextElementClick> onInteractionDelay() {
         return this.onInteractionDelay;
     }
 
+    @Nullable
+    @Override
+    public Function<ContextElementClick, String> interactionDelayKey() {
+        return this.interactionDelayKey;
+    }
+
     @Nullable
     @Override
     public Predicate<ContextElementRender> displayIf() {

diff --git a/...rc/main/java/net/infumia/frame/pipeline/service/element/ServiceClickInteractionDelay.java b/...rc/main/java/net/infumia/frame/pipeline/service/element/ServiceClickInteractionDelay.java
@@ -4,6 +4,7 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.function.Consumer;
+import java.util.function.Function;
 import net.infumia.frame.context.element.ContextElementClick;
 import net.infumia.frame.element.ElementRich;
 import net.infumia.frame.metadata.MetadataAccess;
@@ -44,7 +45,14 @@ public void accept(@NotNull final PipelineContextElement.Click ctx) {
             lastInteractions = new HashMap<>();
             metadata.setFixed(MetadataKeyHolder.LAST_INTERACTION_ELEMENT, lastInteractions);
         }
-        final String key = element.key();
+        final Function<ContextElementClick, String> interactionDelayKey =
+            element.interactionDelayKey();
+        final String key;
+        if (interactionDelayKey == null) {
+            key = element.key();
+        } else {
+            key = interactionDelayKey.apply(context);
+        }
         final Long lastInteraction = lastInteractions.get(key);
         final long now = System.currentTimeMillis();
         if (lastInteraction == null) {