Add Break support in FormattedText

InkApplications · Oct 6, 2024 · 7b740d7 · 7b740d7
1 parent 26f522e
commit 7b740d7
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 0 deletions.
diff --git a/...static-html/src/jvmMain/kotlin/ink/ui/render/statichtml/renderer/FormattedTextRenderer.kt b/...static-html/src/jvmMain/kotlin/ink/ui/render/statichtml/renderer/FormattedTextRenderer.kt
@@ -39,6 +39,7 @@ private fun Tag.render(
                     }
                 }
             }
+            FormattedText.Span.Break -> br
         }
     }
 }
diff --git a/structures/api/structures.api b/structures/api/structures.api
@@ -198,6 +198,7 @@ public final class ink/ui/structures/elements/FormattedText$Builder {
 	public fun <init> ()V
 	public fun <init> (Ljava/util/List;)V
 	public synthetic fun <init> (Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun br ()V
 	public final fun code (ZLkotlin/jvm/functions/Function1;)V
 	public static synthetic fun code$default (Link/ui/structures/elements/FormattedText$Builder;ZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 	public final fun component1 ()Ljava/util/List;
@@ -219,6 +220,14 @@ public abstract interface class ink/ui/structures/elements/FormattedText$Span {
 	public abstract fun toPlainString ()Ljava/lang/String;
 }
 
+public final class ink/ui/structures/elements/FormattedText$Span$Break : ink/ui/structures/elements/FormattedText$Span {
+	public static final field INSTANCE Link/ui/structures/elements/FormattedText$Span$Break;
+	public fun equals (Ljava/lang/Object;)Z
+	public fun hashCode ()I
+	public fun toPlainString ()Ljava/lang/String;
+	public fun toString ()Ljava/lang/String;
+}
+
 public final class ink/ui/structures/elements/FormattedText$Span$Code : ink/ui/structures/elements/FormattedText$Span$Composite {
 	public fun <init> (Ljava/util/List;Z)V
 	public synthetic fun <init> (Ljava/util/List;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V

diff --git a/structures/src/commonMain/kotlin/ink/ui/structures/elements/FormattedText.kt b/structures/src/commonMain/kotlin/ink/ui/structures/elements/FormattedText.kt
@@ -17,6 +17,7 @@ data class FormattedText(
                 when (span) {
                     is Span.Text -> span.text
                     is Span.Composite -> span.inner.joinToString("") { it.toPlainString() }
+                    Span.Break -> "\n"
                 }
             },
             style = style,
@@ -44,11 +45,13 @@ data class FormattedText(
             override val inner: List<Span>,
             val url: String,
         ): Composite
+        data object Break: Span
 
         fun toPlainString(): String {
             return when (this) {
                 is Text -> text
                 is Composite -> inner.joinToString("") { it.toPlainString() }
+                Break -> "\n"
             }
         }
     }
@@ -74,5 +77,8 @@ data class FormattedText(
         fun space() {
             spans.add(Span.Text(" "))
         }
+        fun br() {
+            spans.add(Span.Break)
+        }
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -39,6 +39,7 @@ private fun Tag.render( @@
                         }
                     }
                 }
+                FormattedText.Span.Break -> br
             }
         }
     }