From 588609d3947f79c6de096aa721a3e8c83c834f5f Mon Sep 17 00:00:00 2001 From: Rajat Singla Date: Fri, 14 Jun 2024 14:37:34 +0530 Subject: [PATCH 1/2] bumpversion --- setup.cfg | 2 +- setup.py | 2 +- tiptapy/__init__.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/setup.cfg b/setup.cfg index 8b9a3f7..b26989b 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.19.0 +current_version = 0.20.0 commit = True tag = True diff --git a/setup.py b/setup.py index bd82c17..c0c4696 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ setup( name="tiptapy", - version="0.19.0", + version="0.20.0", url="https://github.com/scrolltech/tiptapy", description="Library that generates HTML output from JSON export of tiptap editor", long_description=open("README.md").read(), diff --git a/tiptapy/__init__.py b/tiptapy/__init__.py index 79d2c2d..e10dfb0 100644 --- a/tiptapy/__init__.py +++ b/tiptapy/__init__.py @@ -15,7 +15,7 @@ extract_tag_attrs, ) -__version__ = "0.19.0" +__version__ = "0.20.0" renderers: Dict = {} From 15b333d8a80d8215d6c19d66198857ab4690b70d Mon Sep 17 00:00:00 2001 From: Rajat Singla Date: Fri, 14 Jun 2024 14:41:52 +0530 Subject: [PATCH 2/2] test added for underline mark --- CHANGELOG.rst | 4 ++++ tests/data/html/mark_tags.html | 2 +- tests/data/json/mark_tags.json | 9 +++++++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index a06cfbc..6f186b5 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -2,6 +2,10 @@ History ======= +0.20.0 (2024-06-14) +------------------- +- Underline mark added. + 0.19.0 (2024-06-06) ------------------- - Render attrs for parent tag in block if present, only rendering `id` for now. diff --git a/tests/data/html/mark_tags.html b/tests/data/html/mark_tags.html index bce70c6..f394228 100644 --- a/tests/data/html/mark_tags.html +++ b/tests/data/html/mark_tags.html @@ -1 +1 @@ -

This is bold text, this is italic text, this is <script>alert('hello');</script> italic and bold text and this has a link

\ No newline at end of file +

This is bold textunderline text, this is italic text, this is <script>alert('hello');</script> italic and bold text and this has a link

\ No newline at end of file diff --git a/tests/data/json/mark_tags.json b/tests/data/json/mark_tags.json index b98ef9f..3f7b241 100644 --- a/tests/data/json/mark_tags.json +++ b/tests/data/json/mark_tags.json @@ -17,6 +17,15 @@ ], "text": "bold text" }, + { + "type": "text", + "marks": [ + { + "type": "underline" + } + ], + "text": "underline text" + }, { "type": "text", "text": ", this is "