Skip to content
TypeScript
5.0 KB
Raw Blame
diff --git a/android/src/main/java/com/swmansion/enriched/markdown/segments/TableContainerView.kt b/android/src/main/java/com/swmansion/enriched/markdown/segments/TableContainerView.kt
--- a/android/src/main/java/com/swmansion/enriched/markdown/segments/TableContainerView.kt
+++ b/android/src/main/java/com/swmansion/enriched/markdown/segments/TableContainerView.kt
@@ -131,7 +131,7 @@ class TableContainerView(
             TableCellData(
               attributedText = renderCellNode(cell, isHeader, align),
               plainText = extractPlainText(cell),
-              markdownText = MarkdownASTSerializer.serializeChildren(cell),
+              markdownText = MarkdownASTSerializer.serializeTableCell(cell),
               isHeader = isHeader,
               alignment = align,
             )
diff --git a/android/src/main/java/com/swmansion/enriched/markdown/utils/common/serialization/MarkdownASTSerializer.kt b/android/src/main/java/com/swmansion/enriched/markdown/utils/common/serialization/MarkdownASTSerializer.kt
--- a/android/src/main/java/com/swmansion/enriched/markdown/utils/common/serialization/MarkdownASTSerializer.kt
+++ b/android/src/main/java/com/swmansion/enriched/markdown/utils/common/serialization/MarkdownASTSerializer.kt
@@ -20,6 +20,12 @@ object MarkdownASTSerializer {
     return buffer.toString()
   }
 
+  private val tableCellLineBreak = Regex("""(?<!\\)(\\*)\n""")
+
+  /** Serializes a table cell's content; a newline inside it becomes `<br>` so the row stays on one line. */
+  fun serializeTableCell(cell: MarkdownASTNode): String =
+    serializeChildren(cell).replace(tableCellLineBreak, "$1$1<br>")
+
   /**
    * Serializes a Blockquote or Admonition node back to markdown, including
    * the `> ` prefix on every line and `> [!TYPE]` header for admonitions.
@@ -179,7 +185,7 @@ object MarkdownASTSerializer {
     for (section in node.children) {
       for (row in section.children) {
         if (row.type != NodeType.TableRow) continue
-        val cells = row.children.map { serializeChildren(it) }
+        val cells = row.children.map { serializeTableCell(it) }
         buffer.append("| ")
         buffer.append(cells.joinToString(" | "))
         buffer.append(" |\n")
diff --git a/ios/segments/TableContainerView.m b/ios/segments/TableContainerView.m
--- a/ios/segments/TableContainerView.m
+++ b/ios/segments/TableContainerView.m
@@ -163,7 +163,7 @@ static NSArray<NSArray<TableCellData *> *> *ENRMTableBuildRows(MarkdownASTNode *
         cell.isHeader = isSectionHead || (cellNode.type == MarkdownNodeTypeTableHeaderCell);
         cell.alignment = ENRMTableTextAlignmentFromString(cellNode.attributes[@"align"]);
         cell.plainText = ENRMTablePlainTextFromNode(cellNode);
-        cell.markdownText = markdownFromASTNodeChildren(cellNode);
+        cell.markdownText = markdownFromTableCellNode(cellNode);
 
         StyleConfig *cellConfig = cell.isHeader ? headerCellConfig : bodyCellConfig;
         cell.attributedText =
diff --git a/ios/utils/MarkdownASTSerializer.h b/ios/utils/MarkdownASTSerializer.h
--- a/ios/utils/MarkdownASTSerializer.h
+++ b/ios/utils/MarkdownASTSerializer.h
@@ -17,6 +17,9 @@ NSString *markdownFromASTNode(MarkdownASTNode *node);
 /// Useful for extracting the markdown content of a container node (e.g. a table cell).
 NSString *markdownFromASTNodeChildren(MarkdownASTNode *node);
 
+/// Serializes a table cell's content; a newline inside it becomes `<br>` so the row stays on one line.
+NSString *markdownFromTableCellNode(MarkdownASTNode *node);
+
 /// Serializes a Blockquote or Admonition node to full markdown, including `> ` line
 /// prefixes and `> [!TYPE]` header for admonitions.
 NSString *markdownFromBlockquoteNode(MarkdownASTNode *node);
diff --git a/ios/utils/MarkdownASTSerializer.m b/ios/utils/MarkdownASTSerializer.m
--- a/ios/utils/MarkdownASTSerializer.m
+++ b/ios/utils/MarkdownASTSerializer.m
@@ -148,7 +148,7 @@ static void appendTableMarkdown(MarkdownASTNode *node, NSMutableString *buffer)
         continue;
       NSMutableArray<NSString *> *cells = [NSMutableArray arrayWithCapacity:row.children.count];
       for (MarkdownASTNode *cell in row.children) {
-        [cells addObject:markdownFromASTNodeChildren(cell)];
+        [cells addObject:markdownFromTableCellNode(cell)];
       }
       [buffer appendFormat:@"| %@ |\n", [cells componentsJoinedByString:@" | "]];
       if (!headerDone) {
@@ -333,6 +333,17 @@ NSString *markdownFromASTNodeChildren(MarkdownASTNode *node)
   return [buffer copy];
 }
 
+NSString *markdownFromTableCellNode(MarkdownASTNode *node)
+{
+  NSString *markdown = markdownFromASTNodeChildren(node);
+  if (![markdown containsString:@"\n"])
+    return markdown;
+  return [markdown stringByReplacingOccurrencesOfString:@"(?<!\\\\)(\\\\*)\n"
+                                            withString:@"$1$1<br>"
+                                               options:NSRegularExpressionSearch
+                                                 range:NSMakeRange(0, markdown.length)];
+}
+
 NSString *markdownFromBlockquoteNode(MarkdownASTNode *node)
 {
   if (!node)