Fix line breaks were stripped out (#11)

Author: zerolab

CHANGELOG.md

@@ -7,13 +7,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [unreleased]
 
-## [0.3.1] - 2025-04-01
+## [0.3.2] - 2025-04-02
+
+## Fixed
+
+- Line breaks were stripped out ([#11](https://github.com/torchbox/wagtail-tinytableblock/pull/11))
+
+
+## [0.3.1] - 2025-04-02
 
 ## Added
 
 - The missing unlink toolbar icon, when links are enabled
 
-## [0.3] - 2025-04-01
+## [0.3] - 2025-04-02
 
 ## Added
 
@@ -63,6 +70,7 @@ Initial release
 
 
 [unreleased]: https://github.com/torchbox/wagtail-tinytableblock/compare/v0.2.3...HEAD
+[0.3.2]: https://github.com/torchbox/wagtail-tinytableblock/compare/v0.3.1...v0.3.2
 [0.3.1]: https://github.com/torchbox/wagtail-tinytableblock/compare/v0.3...v0.3.1
 [0.3]: https://github.com/torchbox/wagtail-tinytableblock/compare/v0.2.4...v0.3
 [0.2.4]: https://github.com/torchbox/wagtail-tinytableblock/compare/v0.2.3...v0.2.4

src/wagtail_tinytableblock/__version__.py

@@ -1 +1 @@
-__version__ = "0.3.1"
+__version__ = "0.3.2"

src/wagtail_tinytableblock/static/wagtail_tinytableblock/js/tiny-table-block.js

@@ -42,6 +42,7 @@ class TinyTableBlockDefinition extends window.wagtailStreamField.blocks.FieldBlo
         table_sizing_mode: 'responsive',
         table_resize_bars: false,
         object_resizing: false,
+        newline_behavior: "linebreak",
         contextmenu_never_use_native: contextmenu_never_use_native,
         skin: (window.matchMedia("(prefers-color-scheme: dark)").matches ? "oxide-dark" : "oxide"),
         content_css: (window.matchMedia("(prefers-color-scheme: dark)").matches ? "dark" : "default"),
@@ -90,7 +91,22 @@ class TinyTableBlockDefinition extends window.wagtailStreamField.blocks.FieldBlo
                 e.preventDefault();
               }
           });
-        }
+        },
+        paste_preprocess: function(editor, args) {
+            // Check if the current selection is inside a table cell
+            const isTableCell = editor.dom.getParent(editor.selection.getNode(), 'td,th');
+
+            if (isTableCell) {
+              // Replace newlines with <br> tags
+              args.content = args.content.replace(/\n/g, '<br>');
+
+              // Also unwrap any paragraphs that might come with the paste
+              args.content = args.content.replace(/<p>(.*?)<\/p>/g, '$1<br>');
+
+              // Remove trailing <br> if present
+              args.content = args.content.replace(/<br>$/, '');
+            }
+          }
     });
 
     return block;

src/wagtail_tinytableblock/utils.py

@@ -15,7 +15,7 @@
 
 
 def sanitise_html(content: str, *, allow_links: bool = False) -> str:
-    tags: set[str] = {"table", "tr", "th", "td", "thead", "tbody", "caption"}
+    tags: set[str] = {"table", "tr", "th", "td", "thead", "tbody", "caption", "br"}
     attributes: dict[str, set[str]] = {
         "*": {"class"},
         "th": {"colspan", "rowspan", "align", "scope", "style"},

tests/test_utils.py

@@ -36,7 +36,7 @@ def test_simple_table_with_thead(self):
             </thead>
             <tbody>
                 <tr>
-                    <td>Cell 1</td>
+                    <td>Cell on<br> on two lines</td>
                     <td>Cell 2</td>
                 </tr>
             </tbody>
@@ -64,7 +64,7 @@ def test_simple_table_with_thead(self):
             result["rows"][0],
             [
                 {
-                    "value": "Cell 1",
+                    "value": "Cell on<br/> on two lines",
                     "type": "td",
                 },
                 {