Allow "input()" to be called multiple times per block

varabyte · Dec 26, 2021 · 1c9f2fe · 1c9f2fe
1 parent be2270b
commit 1c9f2fe
Showing 1 changed file with 17 additions and 1 deletion.
diff --git a/konsole/src/main/kotlin/com/varabyte/konsole/foundation/input/InputSupport.kt b/konsole/src/main/kotlin/com/varabyte/konsole/foundation/input/InputSupport.kt
@@ -142,6 +142,17 @@ private class InputState {
 private val UpdateInputJobKey = KonsoleBlock.RunScope.Lifecycle.createKey<Job>()
 private val OnlyCalledOncePerRenderKey = KonsoleBlock.Render.Lifecycle.createKey<Unit>()
 
+/**
+ * Clear all input related data when we're done using it
+ *
+ * This can be useful if we, for example, allow calling "input()" serially multiple times in the same block.
+ */
+private fun ConcurrentScopedData.finishInput() {
+    remove(OnlyCalledOncePerRenderKey)
+    remove(InputState.Key)
+    remove(UpdateInputJobKey)
+}
+
 /**
  * If necessary, instantiate data that the [input] method expects to exist.
  *
@@ -157,12 +168,16 @@ private fun ConcurrentScopedData.prepareInput(scope: RenderScope) {
     }
 
     prepareKeyFlow(konsoleBlock.app.terminal)
-    if (tryPut(InputState.Key) { InputState() }) {
+    var stopTimer = false
+    if (tryPut(InputState.Key, { InputState() }, { stopTimer = true })) {
         val state = get(InputState.Key)!!
         addTimer(KonsoleAnim.ONE_FRAME_60FPS, repeat = true) {
             if (state.elapse(elapsed)) {
                 konsoleBlock.requestRerender()
             }
+            if (stopTimer) {
+                repeat = false
+            }
         }
         konsoleBlock.onFinishing {
             if (state.blinkOn) {
@@ -221,6 +236,7 @@ private fun ConcurrentScopedData.prepareInput(scope: RenderScope) {
                                 }
                                 if (!rejected) {
                                     get(SystemInputEnteredCallbackKey) { this.invoke() }
+                                    finishInput()
                                 }
                             }
                             else ->