edwh-editorjs 2.0.1__py3-none-any.whl → 2.1.0__py3-none-any.whl

editorjs/__about__.py

@@ -1 +1 @@
-__version__ = "2.0.1"
+__version__ = "2.1.0"

editorjs/blocks.py

@@ -130,12 +130,20 @@ class HeadingBlock(EditorJSBlock):
         return child.get("value", "")
 
 
+def paragraph_block(text: str):
+    return {"type": "paragraph", "data": {"text": text}}
+
+
+def raw_block(html: str):
+    return {"type": "raw", "data": {"html": html}}
+
+
 @block("paragraph")
 class ParagraphBlock(EditorJSBlock):
     @classmethod
     def to_markdown(cls, data: EditorChildData) -> str:
         text = data.get("text", "")
-        return f"{text}\n"
+        return f"{text}\n\n"
 
     @classmethod
     def to_json(cls, node: MDChildNode) -> list[dict]:
@@ -165,7 +173,7 @@ class ParagraphBlock(EditorJSBlock):
                 else:
                     # <editorjs>something</editorjs> = 3 children
                     result.extend(
-                        EditorJSCustom.to_json({"children": nodes[idx: idx + 2]})
+                        EditorJSCustom.to_json({"children": nodes[idx : idx + 2]})
                     )
 
                     skip = 2
@@ -173,9 +181,14 @@ class ParagraphBlock(EditorJSBlock):
 
             elif _type == "image":
                 if current_text:
-                    result.append({"data": {"text": current_text}, "type": "raw" if any_html else "paragraph"})
+                    # {"id":"zksvpxQTDD","type":"raw","data":{"html":"<marquee> raw </marquee>"}}
+                    result.append(
+                        raw_block(current_text)
+                        if any_html
+                        else paragraph_block(current_text)
+                    )
                     current_text = ""
-                    any_html = False # reset
+                    any_html = False  # reset
 
                 result.extend(ImageBlock.to_json(child))
             else:
@@ -194,7 +207,9 @@ class ParagraphBlock(EditorJSBlock):
 
         # final text after image:
         if current_text:
-            result.append({"data": {"text": current_text}, "type": "raw" if any_html else "paragraph"})
+            result.append(
+                raw_block(current_text) if any_html else paragraph_block(current_text)
+            )
 
         return result
 
@@ -430,7 +445,8 @@ class RawBlock(EditorJSBlock):
 
     @classmethod
     def to_markdown(cls, data: EditorChildData) -> str:
-        return data.get("html", "")
+        text = data.get("html", "")
+        return f"{text}\n\n"
 
     @classmethod
     def to_json(cls, node: MDChildNode) -> list[dict]:
@@ -499,7 +515,7 @@ class TableBlock(EditorJSBlock):
                 "data": {
                     "content": table,
                     "withHeadings": with_headings,
-                }
+                },
             }
         ]
 

editorjs/core.py

@@ -31,13 +31,14 @@ class EditorJS:
         self._md = markdown2.Markdown(extras=extras)  # todo: striketrough, ?
 
     @classmethod
-    def from_json(cls, data: str | dict) -> Self:
+    def from_json(cls, data: str | dict | list) -> Self:
         """
         Load from EditorJS JSON Blocks
         """
-        data = data if isinstance(data, dict) else json.loads(data)
+        data = data if isinstance(data, (dict, list)) else json.loads(data)
+        blocks = data["blocks"] if isinstance(data, dict) else data
         markdown_items = []
-        for child in data["blocks"]:
+        for child in blocks:
             _type = child["type"]
             if not (block := BLOCKS.get(_type)):
                 raise TypeError(f"Unsupported block type `{_type}`")

{edwh_editorjs-2.0.1.dist-info → edwh_editorjs-2.1.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: edwh-editorjs
-Version: 2.0.1
+Version: 2.1.0
 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.1.0.dist-info/RECORD

@@ -0,0 +1,10 @@
+editorjs/__about__.py,sha256=Xybt2skBZamGMNlLuOX1IG-h4uIxqUDGAO8MIGWrJac,22
+editorjs/__init__.py,sha256=-OHUf7ZXfkbdFB1r85eIjpHRfql-GCNUCKuBEdEt2Rc,58
+editorjs/blocks.py,sha256=kQxmx8QDDVhb1YP6JTFOCKGTYHfcbGswtkryorp1Cn8,22285
+editorjs/core.py,sha256=T_7pOzLp7dBxxFSgfG0-ogZShVKaUBd5h_PEEuuSzdQ,3406
+editorjs/exceptions.py,sha256=TyfHvk2Z5RbKxTDK7lrjgwAgVgInXIuDW63eO5jzVFw,106
+editorjs/helpers.py,sha256=q861o5liNibMTp-Ozay17taF7CTNsRe901lYhhxdwHg,73
+editorjs/types.py,sha256=W7IZWMWgzJaQulybIt0Gx5N63rVj4mEy73VJWo4VAQA,1029
+edwh_editorjs-2.1.0.dist-info/METADATA,sha256=DmCP8FVdXpma3tupQeNLLTOKMSVpt6qYZTIAxaRo6qY,972
+edwh_editorjs-2.1.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+edwh_editorjs-2.1.0.dist-info/RECORD,,

edwh_editorjs-2.0.1.dist-info/RECORD

@@ -1,10 +0,0 @@
-editorjs/__about__.py,sha256=wAxkK8w13vqoF47A8iqWdSlIgRRXmZiQ0R4wePZfzhs,22
-editorjs/__init__.py,sha256=-OHUf7ZXfkbdFB1r85eIjpHRfql-GCNUCKuBEdEt2Rc,58
-editorjs/blocks.py,sha256=QBHiAck6lX6454XhixRuWWzzsYEcMWTUGlxHzG1B8gM,21871
-editorjs/core.py,sha256=CdZnprX-vkjFJATxPfG1acDqGKkHa3mDfbMEeXiR6eI,3331
-editorjs/exceptions.py,sha256=TyfHvk2Z5RbKxTDK7lrjgwAgVgInXIuDW63eO5jzVFw,106
-editorjs/helpers.py,sha256=q861o5liNibMTp-Ozay17taF7CTNsRe901lYhhxdwHg,73
-editorjs/types.py,sha256=W7IZWMWgzJaQulybIt0Gx5N63rVj4mEy73VJWo4VAQA,1029
-edwh_editorjs-2.0.1.dist-info/METADATA,sha256=ojEg0-0U-zubbzWHmU6raAtHdgwSWNWFSvyrNHk2iy8,972
-edwh_editorjs-2.0.1.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-edwh_editorjs-2.0.1.dist-info/RECORD,,