edwh-editorjs 2.4.0__tar.gz → 2.5.0a2__tar.gz

{edwh_editorjs-2.4.0 → edwh_editorjs-2.5.0a2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: edwh-editorjs
-Version: 2.4.0
+Version: 2.5.0a2
 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>
@@ -13,6 +13,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.10
+Requires-Dist: html2markdown
 Requires-Dist: humanize
 Requires-Dist: markdown2
 Requires-Dist: mdast

edwh_editorjs-2.5.0a2/editorjs/__about__.py

@@ -0,0 +1 @@
+__version__ = "2.5.0a2"

{edwh_editorjs-2.4.0 → edwh_editorjs-2.5.0a2}/editorjs/blocks.py

@@ -13,7 +13,7 @@ import markdown2
 
 from .exceptions import TODO, Unreachable
 from .types import EditorChildData, MDChildNode
-
+import html2markdown
 
 class EditorJSBlock(abc.ABC):
     @classmethod
@@ -173,6 +173,9 @@ class ParagraphBlock(EditorJSBlock):
                 }
             )
 
+        # deal with bold etc:
+        text = html2markdown.convert(text)
+
         return f"{text}\n\n"
 
     @classmethod
@@ -411,11 +414,8 @@ class ImageBlock(EditorJSBlock):
         with_background = "1" if data.get("withBackground") else ""
         stretched = "1" if data.get("stretched") else ""
 
-        if any((with_border, with_background, stretched)):
-            # custom type to support custom options:
-            return f"""<editorjs type="image" caption="{caption}" border="{with_border}" background="{with_background}" stretched="{stretched}" url="{url}" />\n\n"""
-        else:
-            return f"""![{caption}]({url} "{caption}")\n\n"""
+        # always custom type so we can render as <figure> instead of markdown2's default (simple <img>)
+        return f"""<editorjs type="image" caption="{caption}" border="{with_border}" background="{with_background}" stretched="{stretched}" url="{url}" />\n\n"""
 
     @classmethod
     def _caption(cls, node: MDChildNode):
@@ -450,7 +450,10 @@ class ImageBlock(EditorJSBlock):
             <div class="ce-block__content">
             <div class="cdx-block image-tool image-tool--filled {background and 'image-tool--withBackground'} {stretched and 'image-tool--stretched'} {border and 'image-tool--withBorder'}">
                 <div class="image-tool__image">
-                    <img class="image-tool__image-picture" src="{url}" title="{caption}" alt="{caption}">
+                    <figure>
+                        <img class="image-tool__image-picture" src="{url}" title="{caption}" alt="{caption}">
+                        <figcaption>{caption}</figcaption>
+                    </figure>
                 </div>
             </div>
         </div>

{edwh_editorjs-2.4.0 → edwh_editorjs-2.5.0a2}/editorjs/core.py

@@ -135,7 +135,6 @@ class EditorJS:
         Export HTML string
         """
         md = self.to_markdown()
-        # todo: deal with custom elements like linktool, attaches
         return self._md.convert(md)
 
     def __repr__(self):

{edwh_editorjs-2.4.0 → edwh_editorjs-2.5.0a2}/pyproject.toml

@@ -27,8 +27,9 @@ requires-python = ">=3.10"
 
 dependencies = [
     # "bleach",
-    "mdast",
-    "markdown2",
+    "mdast", # markdown -> ast
+    "markdown2",  # markdown -> html
+    "html2markdown", # html -> markdown
     "humanize",
 ]
 

{edwh_editorjs-2.4.0 → edwh_editorjs-2.5.0a2}/tests/test_core.py

@@ -256,3 +256,24 @@ def test_image_options():
     print(e.to_markdown())
     print(e.to_html())
     print(e.to_json())
+
+
+def test_figcaption():
+    js = """{"time":1742471258492,"blocks":[{"id":"ZoA3rbc05C","type":"image","data":{"caption":"Party Time!","withBorder":false,"withBackground":false,"stretched":false,"file":{"url":"https://py4web.leiden.dockers.local/img/upload/23.png?hash=979795a433fc15cb94eccb3159f1f1e4054b1664"}}}],"version":"2.30.7"}"""
+    e = EditorJS.from_json(js)
+
+    html = e.to_html()
+
+    assert "figcaption" in html
+
+def test_bold():
+    js = """{"time":1742475802066,"blocks":[{"id":"v_Kc51dnJH","type":"paragraph","data":{"text":"Deze tekst is <b>half bold</b> en half niet"},"tunes":{"alignmentTune":{"alignment":"left"}}},{"id":"q_fkuEFcY5","type":"paragraph","data":{"text":"<b>Deze tekst is heel bold</b>"},"tunes":{"alignmentTune":{"alignment":"left"}}}],"version":"2.30.7"}"""
+
+    e = EditorJS.from_json(js)
+
+    print(
+        e._mdast,
+        e.to_json(),
+        e.to_html(),
+        e.to_markdown(),
+    )

edwh_editorjs-2.4.0/editorjs/__about__.py

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