|
| 1 | +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 |
| 2 | +--- a/android/src/main/java/com/swmansion/enriched/markdown/segments/TableContainerView.kt |
| 3 | ++++ b/android/src/main/java/com/swmansion/enriched/markdown/segments/TableContainerView.kt |
| 4 | +@@ -131,7 +131,7 @@ class TableContainerView( |
| 5 | + TableCellData( |
| 6 | + attributedText = renderCellNode(cell, isHeader, align), |
| 7 | + plainText = extractPlainText(cell), |
| 8 | +- markdownText = MarkdownASTSerializer.serializeChildren(cell), |
| 9 | ++ markdownText = MarkdownASTSerializer.serializeTableCell(cell), |
| 10 | + isHeader = isHeader, |
| 11 | + alignment = align, |
| 12 | + ) |
| 13 | +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 |
| 14 | +--- a/android/src/main/java/com/swmansion/enriched/markdown/utils/common/serialization/MarkdownASTSerializer.kt |
| 15 | ++++ b/android/src/main/java/com/swmansion/enriched/markdown/utils/common/serialization/MarkdownASTSerializer.kt |
| 16 | +@@ -20,6 +20,12 @@ object MarkdownASTSerializer { |
| 17 | + return buffer.toString() |
| 18 | + } |
| 19 | + |
| 20 | ++ private val tableCellLineBreak = Regex("""(?<!\\)(\\*)\n""") |
| 21 | ++ |
| 22 | ++ /** Serializes a table cell's content; a newline inside it becomes `<br>` so the row stays on one line. */ |
| 23 | ++ fun serializeTableCell(cell: MarkdownASTNode): String = |
| 24 | ++ serializeChildren(cell).replace(tableCellLineBreak, "$1$1<br>") |
| 25 | ++ |
| 26 | + /** |
| 27 | + * Serializes a Blockquote or Admonition node back to markdown, including |
| 28 | + * the `> ` prefix on every line and `> [!TYPE]` header for admonitions. |
| 29 | +@@ -179,7 +185,7 @@ object MarkdownASTSerializer { |
| 30 | + for (section in node.children) { |
| 31 | + for (row in section.children) { |
| 32 | + if (row.type != NodeType.TableRow) continue |
| 33 | +- val cells = row.children.map { serializeChildren(it) } |
| 34 | ++ val cells = row.children.map { serializeTableCell(it) } |
| 35 | + buffer.append("| ") |
| 36 | + buffer.append(cells.joinToString(" | ")) |
| 37 | + buffer.append(" |\n") |
| 38 | +diff --git a/ios/segments/TableContainerView.m b/ios/segments/TableContainerView.m |
| 39 | +--- a/ios/segments/TableContainerView.m |
| 40 | ++++ b/ios/segments/TableContainerView.m |
| 41 | +@@ -163,7 +163,7 @@ static NSArray<NSArray<TableCellData *> *> *ENRMTableBuildRows(MarkdownASTNode * |
| 42 | + cell.isHeader = isSectionHead || (cellNode.type == MarkdownNodeTypeTableHeaderCell); |
| 43 | + cell.alignment = ENRMTableTextAlignmentFromString(cellNode.attributes[@"align"]); |
| 44 | + cell.plainText = ENRMTablePlainTextFromNode(cellNode); |
| 45 | +- cell.markdownText = markdownFromASTNodeChildren(cellNode); |
| 46 | ++ cell.markdownText = markdownFromTableCellNode(cellNode); |
| 47 | + |
| 48 | + StyleConfig *cellConfig = cell.isHeader ? headerCellConfig : bodyCellConfig; |
| 49 | + cell.attributedText = |
| 50 | +diff --git a/ios/utils/MarkdownASTSerializer.h b/ios/utils/MarkdownASTSerializer.h |
| 51 | +--- a/ios/utils/MarkdownASTSerializer.h |
| 52 | ++++ b/ios/utils/MarkdownASTSerializer.h |
| 53 | +@@ -17,6 +17,9 @@ NSString *markdownFromASTNode(MarkdownASTNode *node); |
| 54 | + /// Useful for extracting the markdown content of a container node (e.g. a table cell). |
| 55 | + NSString *markdownFromASTNodeChildren(MarkdownASTNode *node); |
| 56 | + |
| 57 | ++/// Serializes a table cell's content; a newline inside it becomes `<br>` so the row stays on one line. |
| 58 | ++NSString *markdownFromTableCellNode(MarkdownASTNode *node); |
| 59 | ++ |
| 60 | + /// Serializes a Blockquote or Admonition node to full markdown, including `> ` line |
| 61 | + /// prefixes and `> [!TYPE]` header for admonitions. |
| 62 | + NSString *markdownFromBlockquoteNode(MarkdownASTNode *node); |
| 63 | +diff --git a/ios/utils/MarkdownASTSerializer.m b/ios/utils/MarkdownASTSerializer.m |
| 64 | +--- a/ios/utils/MarkdownASTSerializer.m |
| 65 | ++++ b/ios/utils/MarkdownASTSerializer.m |
| 66 | +@@ -148,7 +148,7 @@ static void appendTableMarkdown(MarkdownASTNode *node, NSMutableString *buffer) |
| 67 | + continue; |
| 68 | + NSMutableArray<NSString *> *cells = [NSMutableArray arrayWithCapacity:row.children.count]; |
| 69 | + for (MarkdownASTNode *cell in row.children) { |
| 70 | +- [cells addObject:markdownFromASTNodeChildren(cell)]; |
| 71 | ++ [cells addObject:markdownFromTableCellNode(cell)]; |
| 72 | + } |
| 73 | + [buffer appendFormat:@"| %@ |\n", [cells componentsJoinedByString:@" | "]]; |
| 74 | + if (!headerDone) { |
| 75 | +@@ -333,6 +333,17 @@ NSString *markdownFromASTNodeChildren(MarkdownASTNode *node) |
| 76 | + return [buffer copy]; |
| 77 | + } |
| 78 | + |
| 79 | ++NSString *markdownFromTableCellNode(MarkdownASTNode *node) |
| 80 | ++{ |
| 81 | ++ NSString *markdown = markdownFromASTNodeChildren(node); |
| 82 | ++ if (![markdown containsString:@"\n"]) |
| 83 | ++ return markdown; |
| 84 | ++ return [markdown stringByReplacingOccurrencesOfString:@"(?<!\\\\)(\\\\*)\n" |
| 85 | ++ withString:@"$1$1<br>" |
| 86 | ++ options:NSRegularExpressionSearch |
| 87 | ++ range:NSMakeRange(0, markdown.length)]; |
| 88 | ++} |
| 89 | ++ |
| 90 | + NSString *markdownFromBlockquoteNode(MarkdownASTNode *node) |
| 91 | + { |
| 92 | + if (!node) |
0 commit comments