Relax entries methods on select build to take iterables

ajalt · Jun 29, 2024 · ca6ad46 · ca6ad46
1 parent addb257
commit ca6ad46
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/mordant/src/commonMain/kotlin/com/github/ajalt/mordant/input/SelectListAnimation.kt b/mordant/src/commonMain/kotlin/com/github/ajalt/mordant/input/SelectListAnimation.kt
@@ -61,7 +61,7 @@ class InteractiveSelectListBuilder(private val terminal: Terminal) {
 
     /** Set the list of items to select from */
     @JvmName("entriesEntry")
-    fun entries(entries: List<SelectList.Entry>): InteractiveSelectListBuilder = apply {
+    fun entries(entries: Iterable<SelectList.Entry>): InteractiveSelectListBuilder = apply {
         config.entries = entries.toMutableList()
     }
 
@@ -72,7 +72,7 @@ class InteractiveSelectListBuilder(private val terminal: Terminal) {
 
     /** Set the list of items to select from */
     @JvmName("entriesString")
-    fun entries(entries: List<String>): InteractiveSelectListBuilder = apply {
+    fun entries(entries: Iterable<String>): InteractiveSelectListBuilder = apply {
         config.entries = entries.mapTo(mutableListOf()) { SelectList.Entry(it) }
     }
 
@@ -288,8 +288,8 @@ class InteractiveSelectListBuilder(private val terminal: Terminal) {
     }
 }
 
-private open class SelectInputAnimation(
-    final override val terminal: Terminal,
+private class SelectInputAnimation(
+    override val terminal: Terminal,
     private val config: SelectConfig,
     private val singleSelect: Boolean,
 ) : InputReceiverAnimation<List<String>?> {

diff --git a/mordant/src/nonJsMain/kotlin/com/github/ajalt/mordant/input/InteractiveSelectList.kt b/mordant/src/nonJsMain/kotlin/com/github/ajalt/mordant/input/InteractiveSelectList.kt
@@ -27,7 +27,7 @@ inline fun Terminal.interactiveSelectList(
  */
 @JvmName("interactiveSelectListString")
 fun Terminal.interactiveSelectList(
-    entries: List<String>,
+    entries: Iterable<String>,
     title: String = "",
 ): String? {
     return interactiveSelectList {
@@ -45,7 +45,7 @@ fun Terminal.interactiveSelectList(
  */
 @JvmName("interactiveSelectListEntry")
 fun Terminal.interactiveSelectList(
-    entries: List<SelectList.Entry>,
+    entries: Iterable<SelectList.Entry>,
     title: String = "",
 ): String? {
     return interactiveSelectList {
@@ -77,7 +77,7 @@ inline fun Terminal.interactiveMultiSelectList(
  */
 @JvmName("interactiveMultiSelectListEntry")
 fun Terminal.interactiveMultiSelectList(
-    entries: List<SelectList.Entry>,
+    entries: Iterable<SelectList.Entry>,
     title: String = "",
 ): List<String>? {
     return interactiveMultiSelectList {
@@ -95,7 +95,7 @@ fun Terminal.interactiveMultiSelectList(
  */
 @JvmName("interactiveMultiSelectListString")
 fun Terminal.interactiveMultiSelectList(
-    entries: List<String>,
+    entries: Iterable<String>,
     title: String = "",
 ): List<String>? {
     return interactiveMultiSelectList {