From 6f35c2df73e32504f0d2f8ceb60a6a63a46e5a1a Mon Sep 17 00:00:00 2001
From: Markus Haack <mhaack@adobe.com>
Date: Wed, 11 Mar 2026 14:13:45 +0100
Subject: [PATCH 1/3] chore: scaffolding for table block

---
 component-definition.json   | 15 +++++++++++++++
 component-models.json       | 11 +++++++++++
 ue/models/blocks/table.json | 33 +++++++++++++++++++++++++++++++++
 3 files changed, 59 insertions(+)
 create mode 100644 ue/models/blocks/table.json

diff --git a/component-definition.json b/component-definition.json
index 62bdbcae..20e0d652 100644
--- a/component-definition.json
+++ b/component-definition.json
@@ -294,6 +294,21 @@
             }
           }
         },
+        {
+          "title": "Table",
+          "id": "table",
+          "model": "table",
+          "plugins": {
+            "da": {
+              "fields": [
+                {
+                  "name": "table",
+                  "selector": "div>div"
+                }
+              ]
+            }
+          }
+        },
         {
           "title": "Tabs",
           "id": "tabs",
diff --git a/component-models.json b/component-models.json
index d03097a3..37910d4e 100644
--- a/component-models.json
+++ b/component-models.json
@@ -222,6 +222,17 @@
       }
     ]
   },
+  {
+    "id": "table",
+    "fields": [
+      {
+        "component": "richtext",
+        "name": "table",
+        "value": "",
+        "label": "Table Content"
+      }
+    ]
+  },
   {
     "id": "tabs-item",
     "fields": [
diff --git a/ue/models/blocks/table.json b/ue/models/blocks/table.json
new file mode 100644
index 00000000..361175f3
--- /dev/null
+++ b/ue/models/blocks/table.json
@@ -0,0 +1,33 @@
+{
+  "definitions": [
+    {
+      "title": "Table",
+      "id": "table",
+      "model": "table",
+      "plugins": {
+        "da": {
+          "fields": [
+            {
+              "name": "table",
+              "selector": "div>div"
+            }
+          ]
+        }
+      }
+    }
+  ],
+  "models": [
+    {
+      "id": "table",
+      "fields": [
+        {
+          "component": "richtext",
+          "name": "table",
+          "value": "",
+          "label": "Table Content"
+        }
+      ]
+    }
+  ],
+  "filters": []
+}
\ No newline at end of file

From 0161e449b2afc29f8dc33cf53fb555a030f9a440 Mon Sep 17 00:00:00 2001
From: Markus Haack <mhaack@adobe.com>
Date: Wed, 11 Mar 2026 14:15:24 +0100
Subject: [PATCH 2/3] fix: table for ue

---
 component-definition.json   |  1 +
 component-filters.json      | 13 +++++++++++++
 ue/models/blocks/table.json | 17 ++++++++++++++++-
 3 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/component-definition.json b/component-definition.json
index 20e0d652..35195620 100644
--- a/component-definition.json
+++ b/component-definition.json
@@ -298,6 +298,7 @@
           "title": "Table",
           "id": "table",
           "model": "table",
+          "filter": "table",
           "plugins": {
             "da": {
               "fields": [
diff --git a/component-filters.json b/component-filters.json
index 3f99889a..c826b8ba 100644
--- a/component-filters.json
+++ b/component-filters.json
@@ -61,6 +61,19 @@
       "image"
     ]
   },
+  {
+    "id": "table",
+    "rte": {
+      "toolbar": {
+        "insert": [
+          "table"
+        ],
+        "sections": [
+          "insert"
+        ]
+      }
+    }
+  },
   {
     "id": "tabs",
     "components": [
diff --git a/ue/models/blocks/table.json b/ue/models/blocks/table.json
index 361175f3..2c2a70d5 100644
--- a/ue/models/blocks/table.json
+++ b/ue/models/blocks/table.json
@@ -4,6 +4,7 @@
       "title": "Table",
       "id": "table",
       "model": "table",
+      "filter": "table",
       "plugins": {
         "da": {
           "fields": [
@@ -29,5 +30,19 @@
       ]
     }
   ],
-  "filters": []
+  "filters": [
+    {
+      "id": "table",
+      "rte": {
+        "toolbar": {
+          "insert": [
+            "table"
+          ],
+          "sections": [
+            "insert"
+          ]
+        }
+      }
+    }
+  ]
 }
\ No newline at end of file

From f1ad5ce827027b879369b7737ed66e08f401cf07 Mon Sep 17 00:00:00 2001
From: Markus Haack <mhaack@adobe.com>
Date: Wed, 11 Mar 2026 17:15:19 +0100
Subject: [PATCH 3/3] fix: improve table

---
 component-definition.json   | 3 +++
 ue/models/blocks/table.json | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/component-definition.json b/component-definition.json
index 35195620..87ba0af1 100644
--- a/component-definition.json
+++ b/component-definition.json
@@ -301,6 +301,9 @@
           "filter": "table",
           "plugins": {
             "da": {
+              "name": "table",
+              "rows": 1,
+              "columns": 1,
               "fields": [
                 {
                   "name": "table",
diff --git a/ue/models/blocks/table.json b/ue/models/blocks/table.json
index 2c2a70d5..cfed3605 100644
--- a/ue/models/blocks/table.json
+++ b/ue/models/blocks/table.json
@@ -7,6 +7,9 @@
       "filter": "table",
       "plugins": {
         "da": {
+          "name": "table",
+          "rows": 1,
+          "columns": 1,
           "fields": [
             {
               "name": "table",