edwh-editorjs 2.0.0b5__tar.gz → 2.0.2__tar.gz

edwh_editorjs-2.0.2/CHANGELOG.md

@@ -0,0 +1,52 @@
+# Changelog
+
+<!--next-version-placeholder-->
+
+## v2.0.2 (2024-11-26)
+
+### Fix
+
+* Raw block pt2 ([`37ee6bc`](https://github.com/educationwarehouse/edwh-editorjs/commit/37ee6bc09dd8f54ca22f2652be1c5920d74779d1))
+
+## v2.0.1 (2024-11-26)
+
+### Fix
+
+* Table block, raw html block ([`849aeee`](https://github.com/educationwarehouse/edwh-editorjs/commit/849aeee9fcafd51cb71416edeb127820ee3fc89f))
+
+## v2.0.0 (2024-11-18)
+
+### Features
+
+* Rebuilt the editor logic based on MDAST for improved extensibility and maintainability ([`28c12f1`](https://github.com/educationwarehouse/edwh-editorjs/commit/28c12f1f74c71a995f9f8097f1b26be45f835ad4))
+* Added support for (basic) tables and custom Editor.js blocks, such as `linkTool` and `<editorjs>` ([`a6dfadf`](https://github.com/educationwarehouse/edwh-editorjs/commit/a6dfadf21ec008fe714704a056b9ffec751d731c))
+* Integrated `markdown2` extras to handle custom `<editorjs>` blocks ([`31d8647`](https://github.com/educationwarehouse/edwh-editorjs/commit/31d8647b7275e245dabf27a99c43d400217705be))
+
+### Fixes
+
+* Corrected behavior for nested lists ([`52a7773`](https://github.com/educationwarehouse/edwh-editorjs/commit/52a7773470dce3eee6a2d17d46b594551ed043a5))
+* Resolved an issue where rendered attachments were incorrectly marked as content-editable ([`58ab562`](https://github.com/educationwarehouse/edwh-editorjs/commit/58ab562daaca233455b3fe66b773af61f1abb0ad))
+
+
+## v1.1.0 (2024-10-31)
+
+### Feature
+
+* Expose _sanitize via EditorJSBlock.sanitize for external usage ([`7daa67c`](https://github.com/educationwarehouse/edwh-editorjs/commit/7daa67c90440510c83b573c22edf377cc2fd801f))
+
+### Documentation
+
+* Added section on defining new custom blocks ([`51d7720`](https://github.com/educationwarehouse/edwh-editorjs/commit/51d77208d4f8156e895de914f41bdeb882a508c0))
+
+## v1.0.1 (2024-10-31)
+
+### Documentation
+
+* Updated README ([`18d0216`](https://github.com/educationwarehouse/edwh-editorjs/commit/18d021629bcb223b89a9731e9ad8c574248f75c7))
+
+## v1.0.0 (2024-10-31)
+
+### Feature
+
+* Implemented more blocks (raw, warning, code, table, quote) ([`fb93bd9`](https://github.com/educationwarehouse/edwh-editorjs/commit/fb93bd959f06fa86bc23c9bfc51a8b7fddfc65f2))
+* Refactor to Registry Pattern so new block can be easily added ([`b06c86d`](https://github.com/educationwarehouse/edwh-editorjs/commit/b06c86da623dd2a2d92f7c48353a1f3208fb5749))

{edwh_editorjs-2.0.0b5 → edwh_editorjs-2.0.2}/PKG-INFO

@@ -1,11 +1,9 @@
 Metadata-Version: 2.3
 Name: edwh-editorjs
-Version: 2.0.0b5
+Version: 2.0.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>
-License: MIT
-License-File: LICENSE
 Keywords: bleach,clean,editor,editor.js,html,javascript,json,parser,wysiwyg
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers

edwh_editorjs-2.0.2/editorjs/__about__.py

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

{edwh_editorjs-2.0.0b5 → edwh_editorjs-2.0.2}/editorjs/blocks.py

@@ -130,6 +130,14 @@ 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
@@ -144,6 +152,7 @@ class ParagraphBlock(EditorJSBlock):
 
         skip = 0
         nodes = node.get("children", [])
+        any_html = False
 
         for idx, child in enumerate(nodes):
             if skip:
@@ -151,6 +160,7 @@ class ParagraphBlock(EditorJSBlock):
                 continue
 
             _type = child.get("type")
+            any_html |= _type == "html"
 
             # deal with custom types
             if _type == "html" and child.get("value", "").startswith("<editorjs"):
@@ -163,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
@@ -171,8 +181,10 @@ class ParagraphBlock(EditorJSBlock):
 
             elif _type == "image":
                 if current_text:
-                    result.append({"data": {"text": current_text}, "type": "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
 
                 result.extend(ImageBlock.to_json(child))
             else:
@@ -191,7 +203,7 @@ class ParagraphBlock(EditorJSBlock):
 
         # final text after image:
         if current_text:
-            result.append({"data": {"text": current_text}, "type": "paragraph"})
+            result.append(raw_block(current_text) if any_html else paragraph_block(current_text))
 
         return result
 
@@ -493,8 +505,10 @@ class TableBlock(EditorJSBlock):
         return [
             {
                 "type": "table",
-                "content": table,
-                "withHeadings": with_headings,
+                "data": {
+                    "content": table,
+                    "withHeadings": with_headings,
+                }
             }
         ]
 
@@ -585,7 +599,7 @@ class AttachmentBlock(EditorJSBlock):
                 </div>
             </div>
             <div class="cdx-attaches__file-info">
-                <div class="cdx-attaches__title" contenteditable="true" data-placeholder="File title" data-empty="false">
+                <div class="cdx-attaches__title" data-placeholder="File title" data-empty="false">
                 {node.get("body", "")}
                 </div>
             </div>

{edwh_editorjs-2.0.0b5 → edwh_editorjs-2.0.2}/pyproject.toml

@@ -12,7 +12,7 @@ authors = [
     { name = "SKevo", email = "skevo.cw@gmail.com" },
     { name = "Robin van der Noord", email = "robin.vdn@educationwarehouse.nl" },
 ]
-license = { text = "MIT" }
+license-expression = { text = "MIT" }
 keywords = ["editor.js", "parser", "clean", "bleach", "wysiwyg", "editor", "javascript", "html", "json"]
 classifiers = [
     "Development Status :: 4 - Beta",

{edwh_editorjs-2.0.0b5 → edwh_editorjs-2.0.2}/tests/test_core.py

@@ -1,3 +1,4 @@
+import json
 import textwrap
 
 from editorjs import EditorJS
@@ -110,3 +111,28 @@ def test_attachment():
     print(e.to_markdown())
     print(e.to_json())
     print(e.to_html())
+
+
+def test_raw_html():
+    e = EditorJS.from_markdown(textwrap.dedent("""
+    # Raw  HTML
+    
+    <marquee>This ain't no paragraph</marquee>
+    """))
+
+    blocks = json.loads(e.to_json())
+
+    assert blocks["blocks"][1]["type"] == "raw", blocks["blocks"][1]["type"]
+
+def test_code():
+    e = EditorJS.from_markdown(textwrap.dedent("""
+    Read code:
+    
+    ```
+    <marquee> code </marquee>
+    ```
+    """))
+
+    blocks = json.loads(e.to_json())
+
+    print(blocks)

edwh_editorjs-2.0.0b5/CHANGELOG.md

@@ -1,54 +0,0 @@
-# Changelog
-
-<!--next-version-placeholder-->
-
-## v2.0.0-beta.5 (2024-11-07)
-
-### Feature
-
-* Add markdown2 extra to deal with custom `<editorjs />` blocks ([`31d8647`](https://github.com/educationwarehouse/edwh-editorjs/commit/31d8647b7275e245dabf27a99c43d400217705be))
-
-## v2.0.0-beta.4 (2024-11-07)
-
-### Feature
-
-* Support (basic) tables, custom editorjs blocks like linkTool via <editorjs> ([`a6dfadf`](https://github.com/educationwarehouse/edwh-editorjs/commit/a6dfadf21ec008fe714704a056b9ffec751d731c))
-
-## v2.0.0-beta.3 (2024-11-06)
-
-### Fix
-
-* Various fixes with nested lists ([`52a7773`](https://github.com/educationwarehouse/edwh-editorjs/commit/52a7773470dce3eee6a2d17d46b594551ed043a5))
-
-## v2.0.0-beta.2 (2024-11-06)
-
-### Feature
-
-* Work in progress to do a rebuild based on mdast ([`28c12f1`](https://github.com/educationwarehouse/edwh-editorjs/commit/28c12f1f74c71a995f9f8097f1b26be45f835ad4))
-
-## v2.0.0-beta.1 (2024-11-06)
-
-
-
-## v1.1.0 (2024-10-31)
-
-### Feature
-
-* Expose _sanitize via EditorJSBlock.sanitize for external usage ([`7daa67c`](https://github.com/educationwarehouse/edwh-editorjs/commit/7daa67c90440510c83b573c22edf377cc2fd801f))
-
-### Documentation
-
-* Added section on defining new custom blocks ([`51d7720`](https://github.com/educationwarehouse/edwh-editorjs/commit/51d77208d4f8156e895de914f41bdeb882a508c0))
-
-## v1.0.1 (2024-10-31)
-
-### Documentation
-
-* Updated README ([`18d0216`](https://github.com/educationwarehouse/edwh-editorjs/commit/18d021629bcb223b89a9731e9ad8c574248f75c7))
-
-## v1.0.0 (2024-10-31)
-
-### Feature
-
-* Implemented more blocks (raw, warning, code, table, quote) ([`fb93bd9`](https://github.com/educationwarehouse/edwh-editorjs/commit/fb93bd959f06fa86bc23c9bfc51a8b7fddfc65f2))
-* Refactor to Registry Pattern so new block can be easily added ([`b06c86d`](https://github.com/educationwarehouse/edwh-editorjs/commit/b06c86da623dd2a2d92f7c48353a1f3208fb5749))

edwh_editorjs-2.0.0b5/LICENSE

@@ -1,22 +0,0 @@
-MIT License
-
-Copyright (c) 2021 SKevo
-Copyright (c) 2024 Education Warehouse
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

edwh_editorjs-2.0.0b5/editorjs/__about__.py

@@ -1 +0,0 @@
-__version__ = "2.0.0-beta.5"