edwh-editorjs 2.6.0__tar.gz → 2.6.1__tar.gz

{edwh_editorjs-2.6.0 → edwh_editorjs-2.6.1}/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 <!--next-version-placeholder-->
 
+## v2.6.1 (2026-02-05)
+
+### Fix
+
+* **paragraph:** Handle nested HTML in alignment tag closing detection ([`7f910e1`](https://github.com/educationwarehouse/edwh-editorjs/commit/7f910e15103fe25ae0e4d1158deecc15d267d926))
+
 ## v2.6.0 (2026-02-05)
 
 ### Fix

{edwh_editorjs-2.6.0 → edwh_editorjs-2.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: edwh-editorjs
-Version: 2.6.0
+Version: 2.6.1
 Summary: EditorJS.py
 Project-URL: Homepage, https://github.com/educationwarehouse/edwh-EditorJS
 Author-email: SKevo <skevo.cw@gmail.com>, Robin van der Noord <robin.vdn@educationwarehouse.nl>

edwh_editorjs-2.6.1/blocks-diff.txt

@@ -0,0 +1,42 @@
+diff --git a/editorjs/blocks.py b/editorjs/blocks.py
+index 9627a82..bc93cee 100644
+--- a/editorjs/blocks.py
++++ b/editorjs/blocks.py
+@@ -210,14 +210,30 @@ class ParagraphBlock(EditorJSBlock):
+ 
+                 if child.get("value", "").endswith("/>"):
+                     # self-closing
+-                    result.append(EditorJSCustom.to_json(node))
++                    result.append(EditorJSCustom.to_json({"children": [child]}))
+                 else:
+-                    # <editorjs>something</editorjs> = 3 children
+-                    result.extend(
+-                        EditorJSCustom.to_json({"children": nodes[idx : idx + 2]})
+-                    )
+-
+-                    skip = 2
++                    # <editorjs>...</editorjs> may include nested HTML; find the closing tag
++                    end_idx = None
++                    for j, next_child in enumerate(nodes[idx + 1 :], start=idx + 1):
++                        if next_child.get("type") == "html" and next_child.get(
++                            "value", ""
++                        ).strip() == "</editorjs>":
++                            end_idx = j
++                            break
++
++                    if end_idx is None:
++                        # fallback to previous behavior if tag is malformed
++                        result.extend(
++                            EditorJSCustom.to_json({"children": nodes[idx : idx + 2]})
++                        )
++                        skip = 2
++                    else:
++                        result.extend(
++                            EditorJSCustom.to_json(
++                                {"children": nodes[idx : end_idx + 1]}
++                            )
++                        )
++                        skip = end_idx - idx
+ 
+                 continue
+ 

edwh_editorjs-2.6.1/debug.py

@@ -0,0 +1,22 @@
+from pathlib import Path
+
+from editorjs import EditorJS
+
+
+def main():
+    # blog = Path("blog.md").read_text()
+
+    ejs = EditorJS.from_json(
+        '{"time":1770292823347,"blocks":[{"id":"QKelxSHz2Y","type":"paragraph","data":{"text":"rechts basis"},"tunes":{"alignmentTune":{"alignment":"right"}}},{"id":"IUX70yigzz","type":"paragraph","data":{"text":"links"},"tunes":{"alignmentTune":{"alignment":"left"}}},{"id":"SaWthD_Vlr","type":"paragraph","data":{"text":"<b>rechts duur</b>"},"tunes":{"alignmentTune":{"alignment":"right"}}}],"version":"2.30.7"}'
+    )
+
+    # if html = <editorjs type='alignment' tag='p' alignment='center'> <b>Werk dat ertoe doet </b> </editorjs>
+    # assert parse_html(html).type == 'alignment'
+
+    print(ejs.to_html())  # good
+    print(ejs.to_json())  # bad, fixme
+    # {"time": 1770292880600, "blocks": [{"type": "paragraph", "data": {"text": ""}, "tunes": {"alignmentTune": {"alignment": "right"}}}, {"type": "paragraph", "data": {"text": "links"}}, {"type": "paragraph", "data": {"text": "<b></b>"}, "tunes": {"alignmentTune": {"alignment": "right"}}}, {"type": "raw", "data": {"html": "</b></editorjs>"}}], "version": "2.30.6"}
+
+
+if __name__ == "__main__":
+    main()

edwh_editorjs-2.6.1/editorjs/__about__.py

@@ -0,0 +1 @@
+__version__ = "2.6.1"

{edwh_editorjs-2.6.0 → edwh_editorjs-2.6.1}/editorjs/blocks.py

@@ -187,6 +187,18 @@ class ParagraphBlock(EditorJSBlock):
 
         return f"{text}\n\n"
 
+    @staticmethod
+    def _find_closing_editorjs_tag(nodes: list, start_idx: int) -> int | None:
+        """Find index of closing </editorjs> tag."""
+        for idx, node in enumerate(nodes[start_idx:], start=start_idx):
+            if (
+                node.get("type") == "html"
+                and node.get("value", "").strip() == "</editorjs>"
+            ):
+                return idx
+
+        return None
+
     @classmethod
     def to_json(cls, node: MDChildNode) -> list[dict]:
         result = []
@@ -210,14 +222,17 @@ class ParagraphBlock(EditorJSBlock):
 
                 if child.get("value", "").endswith("/>"):
                     # self-closing
-                    result.append(EditorJSCustom.to_json(node))
+                    result.append(EditorJSCustom.to_json({"children": [child]}))
                 else:
-                    # <editorjs>something</editorjs> = 3 children
-                    result.extend(
-                        EditorJSCustom.to_json({"children": nodes[idx : idx + 2]})
+                    # <editorjs>...</editorjs> may include nested HTML; find the closing tag
+                    end_idx = cls._find_closing_editorjs_tag(nodes, idx + 1)
+                    children_slice = (
+                        nodes[idx : idx + 2]
+                        if end_idx is None
+                        else nodes[idx : end_idx + 1]
                     )
-
-                    skip = 2
+                    skip = 2 if end_idx is None else end_idx - idx
+                    result.extend(EditorJSCustom.to_json({"children": children_slice}))
 
                 continue
 

{edwh_editorjs-2.6.0 → edwh_editorjs-2.6.1}/tests/test_core.py

@@ -328,3 +328,48 @@ def test_editorjs_alignment_tag():
 
     assert "<b>Werk dat ertoe doet" in html
     assert "<editorjs" not in html
+    assert "<code" not in html
+
+
+def test_alignment_with_nested_bold_roundtrip():
+    """
+    Test that alignment tags preserve nested bold HTML through JSON roundtrip.
+
+    Regression test for issue where nested HTML in alignment tags causes:
+    - Text content to disappear
+    - Malformed closing tags to appear as separate raw blocks
+    """
+    # Input: three paragraphs with different alignments, one with nested bold
+    input_json = r"""{"time":1770292823347,"blocks":[{"id":"QKelxSHz2Y","type":"paragraph","data":{"text":"rechts basis"},"tunes":{"alignmentTune":{"alignment":"right"}}},{"id":"IUX70yigzz","type":"paragraph","data":{"text":"links"},"tunes":{"alignmentTune":{"alignment":"left"}}},{"id":"SaWthD_Vlr","type":"paragraph","data":{"text":"<b>rechts duur</b>"},"tunes":{"alignmentTune":{"alignment":"right"}}}],"version":"2.30.7"}"""
+    # faulty output: {"time": 1770292880600, "blocks": [{"type": "paragraph", "data": {"text": ""}, "tunes": {"alignmentTune": {"alignment": "right"}}}, {"type": "paragraph", "data": {"text": "links"}}, {"type": "paragraph", "data": {"text": "<b></b>"}, "tunes": {"alignmentTune": {"alignment": "right"}}}, {"type": "raw", "data": {"html": "</b></editorjs>"}}], "version": "2.30.6"}
+
+    e = EditorJS.from_json(input_json)
+
+    # Convert through markdown and back to JSON
+    md = e.to_markdown()
+    print("Markdown output:", md)
+
+    e2 = EditorJS.from_markdown(md)
+    output_json = json.loads(e2.to_json())
+
+    output_str = json.dumps(output_json, indent=2)
+    print("Output JSON:", output_str)
+
+    # Should have exactly 3 blocks (not 4 with a malformed raw block)
+    assert len(output_json["blocks"]) == 3
+
+    # All should be paragraphs (not raw blocks)
+    for block in output_json["blocks"]:
+        assert block["type"] == "paragraph"
+
+    # Third block should preserve the bold content
+    assert (
+        "<b>rechts duur</b>" in output_json["blocks"][2]["data"]["text"]
+        or "<b>rechts duur </b>" in output_json["blocks"][2]["data"]["text"]
+    )
+
+    # Third block should preserve alignment
+    assert output_json["blocks"][2]["tunes"]["alignmentTune"]["alignment"] == "right"
+
+    assert "raw" not in output_str
+    assert "html" not in output_str

edwh_editorjs-2.6.0/debug.py

@@ -1,18 +0,0 @@
-from pathlib import Path
-
-from editorjs import EditorJS
-
-
-def main():
-    blog = Path("blog.md").read_text()
-
-    ejs = EditorJS.from_markdown(blog)
-
-    # if html = <editorjs type='alignment' tag='p' alignment='center'> <b>Werk dat ertoe doet </b> </editorjs>
-    # assert parse_html(html).type == 'alignment'
-
-    print(ejs.to_html())
-
-
-if __name__ == "__main__":
-    main()

edwh_editorjs-2.6.0/editorjs/__about__.py

@@ -1 +0,0 @@
-__version__ = "2.6.0"