edwh-editorjs 2.6.0__py3-none-any.whl → 2.6.2__py3-none-any.whl

editorjs/__about__.py

@@ -1 +1 @@
-__version__ = "2.6.0"
+__version__ = "2.6.2"

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
 
@@ -826,8 +841,11 @@ class EditorJSCustom(EditorJSBlock, markdown2.Extra):
         root = lxml.html.fromstring(html)
 
         attributes = dict(root.attrib)
-        inner_html = "".join(
-            lxml.html.tostring(child, encoding="unicode") for child in root
+
+        # support both innerText + innerHTML:
+        inner_html = (root.text or "") + "".join(
+            lxml.html.tostring(child, encoding="unicode", with_tail=True)
+            for child in root
         )
 
         return attributes, inner_html
@@ -845,7 +863,6 @@ class EditorJSCustom(EditorJSBlock, markdown2.Extra):
         handler = BLOCKS.get(_type)
 
         if not handler:
-            raise ValueError(f"debug: {attrs = } {body = }")  # fixme
             raise ValueError(f"Unknown custom type {_type}")
 
         return handler, attrs

{edwh_editorjs-2.6.0.dist-info → edwh_editorjs-2.6.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: edwh-editorjs
-Version: 2.6.0
+Version: 2.6.2
 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.0.dist-info → edwh_editorjs-2.6.2.dist-info}/RECORD

@@ -1,10 +1,10 @@
-editorjs/__about__.py,sha256=OEib63e0yPEGlhEXyrWE1OwRnleR0cHI7KSX7oZEQLs,22
+editorjs/__about__.py,sha256=53Sii4w6BIWn-1RhaTyqUO46gDe4nDCRQDAcpsWFH24,22
 editorjs/__init__.py,sha256=-OHUf7ZXfkbdFB1r85eIjpHRfql-GCNUCKuBEdEt2Rc,58
-editorjs/blocks.py,sha256=QWua1EMZ1dnaIMHw_nY1T4FjNsvCdpa_uVqZsdxdFqk,29454
+editorjs/blocks.py,sha256=0tBuIHmDlAL_G4-SZ_zmJ9gGLabWjqAixKV2yjxbkPM,30201
 editorjs/core.py,sha256=4igv2l8Rm1S92kxKrIXGIUlNHh6pnjq8F28XQr91I9o,4510
 editorjs/exceptions.py,sha256=oKuWqi4CSnFGZfVZWtTZ2XZeHXm5xF-nAtX_1YLm6sI,230
 editorjs/helpers.py,sha256=q861o5liNibMTp-Ozay17taF7CTNsRe901lYhhxdwHg,73
 editorjs/types.py,sha256=W7IZWMWgzJaQulybIt0Gx5N63rVj4mEy73VJWo4VAQA,1029
-edwh_editorjs-2.6.0.dist-info/METADATA,sha256=a_7OrfF1yVNADyKGr03a9H7ek_coxp3decstPniHbSM,1045
-edwh_editorjs-2.6.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-edwh_editorjs-2.6.0.dist-info/RECORD,,
+edwh_editorjs-2.6.2.dist-info/METADATA,sha256=x6iZwk2IpCW6QRcLfbnUURH-0B3eTpSY5QBjw-NXBxQ,1045
+edwh_editorjs-2.6.2.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+edwh_editorjs-2.6.2.dist-info/RECORD,,