attrs added for blockquote and ol as wwell

stckme · Jun 11, 2024 · 3a952e6 · 3a952e6
1 parent fc6573c
commit 3a952e6
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 9 deletions.
diff --git a/tests/data/html/blockquote.html b/tests/data/html/blockquote.html
@@ -1 +1 @@
-<blockquote><p>This is a blockquote</p></blockquote>
+<blockquote id="b-NzgT2MAhuSTnpFyo-E3"><p>This is a blockquote</p></blockquote>
diff --git a/tests/data/html/ordered_list.html b/tests/data/html/ordered_list.html
@@ -1 +1 @@
-<h1>Scroll</h1><ol start="1"><li><p>One</p></li><li><p>Two</p></li><li><p>Three</p></li></ol><ol start="2"><li><p>One</p></li><li><p>Two</p></li><li><p>Three</p></li></ol>
+<h1>Scroll</h1><ol start="1" id="b-NzgT2MAhuSTnpFyo-E3"><li><p>One</p></li><li><p>Two</p></li><li><p>Three</p></li></ol><ol start="2" id="b-NzgT2MAhuSTnpFyo-E3"><li><p id="b-NzgT2MAhuSTnpFyo-E3">One</p></li><li><p>Two</p></li><li><p>Three</p></li></ol>
diff --git a/tests/data/json/blockquote.json b/tests/data/json/blockquote.json
@@ -3,6 +3,9 @@
     "content": [
       {
         "type": "blockquote",
+        "attrs": {
+          "id": "b-NzgT2MAhuSTnpFyo-E3"
+        },
         "content": [
           {
             "type": "paragraph",

diff --git a/tests/data/json/ordered_list.json b/tests/data/json/ordered_list.json
@@ -13,7 +13,8 @@
     {
       "type": "ordered_list",
       "attrs": {
-        "order": 1
+        "order": 1,
+        "id": "b-NzgT2MAhuSTnpFyo-E3"
       },
       "content": [
         {
@@ -63,14 +64,18 @@
     {
       "type": "ordered_list",
       "attrs": {
-        "start": 2
+        "start": 2,
+        "id": "b-NzgT2MAhuSTnpFyo-E3"
       },
       "content": [
         {
           "type": "list_item",
           "content": [
             {
               "type": "paragraph",
+              "attrs": {
+                "id": "b-NzgT2MAhuSTnpFyo-E3"
+              },
               "content": [
                 {
                   "type": "text",

diff --git a/tiptapy/templates/blockquote.html b/tiptapy/templates/blockquote.html
@@ -1,4 +1,4 @@
-<blockquote>
+<blockquote{{ extract_tag_attrs(node) }}>
 {%- for item in node.content -%}
   {%- with template=item.type + '.html', node=item -%} 
       {%- include template -%}

diff --git a/tiptapy/templates/orderedList.html b/tiptapy/templates/orderedList.html
@@ -1,7 +1,7 @@
 {%- if node.attrs.start -%}
-<ol start="{{ node.attrs.start }}">
+<ol start="{{ node.attrs.start }}"{{ extract_tag_attrs(node) }}>
 {%- else -%}
-<ol start="{{ node.attrs.order|default(1) }}">
+<ol start="{{ node.attrs.order|default(1) }}"{{ extract_tag_attrs(node) }}>
 {%- endif -%}
 {%- for item in node.content -%}
   {%- with template=item.type + '.html', node=item -%} 

diff --git a/tiptapy/templates/ordered_list.html b/tiptapy/templates/ordered_list.html
@@ -1,7 +1,7 @@
 {%- if node.attrs.start -%}
-<ol start="{{ node.attrs.start }}">
+<ol start="{{ node.attrs.start }}"{{ extract_tag_attrs(node) }}>
 {%- else -%}
-<ol start="{{ node.attrs.order|default(1) }}">
+<ol start="{{ node.attrs.order|default(1) }}"{{ extract_tag_attrs(node) }}>
 {%- endif -%}
 {%- for item in node.content -%}
   {%- with template=item.type + '.html', node=item -%}
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<blockquote><p>This is a blockquote</p></blockquote>
		<blockquote id="b-NzgT2MAhuSTnpFyo-E3"><p>This is a blockquote</p></blockquote>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<h1>Scroll</h1><ol start="1"><li><p>One</p></li><li><p>Two</p></li><li><p>Three</p></li></ol><ol start="2"><li><p>One</p></li><li><p>Two</p></li><li><p>Three</p></li></ol>
		<h1>Scroll</h1><ol start="1" id="b-NzgT2MAhuSTnpFyo-E3"><li><p>One</p></li><li><p>Two</p></li><li><p>Three</p></li></ol><ol start="2" id="b-NzgT2MAhuSTnpFyo-E3"><li><p id="b-NzgT2MAhuSTnpFyo-E3">One</p></li><li><p>Two</p></li><li><p>Three</p></li></ol>