diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/FormConstants.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/FormConstants.java
index 5d7c410231..e163ce8f30 100644
--- a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/FormConstants.java
+++ b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/FormConstants.java
@@ -146,4 +146,13 @@ private FormConstants() {
     /** The resource type for date time input field v1 */
     public static final String RT_FD_FORM_DATETIME_V1 = RT_FD_FORM_PREFIX + "datetime/v1/datetime";
 
+    /** The resource type for table v1 */
+    public static final String RT_FD_FORM_TABLE_V1 = RT_FD_FORM_PREFIX + "table/v1/table";
+
+    /** The resource type for table header v1 */
+    public static final String RT_FD_FORM_TABLE_HEADER_V1 = RT_FD_FORM_PREFIX + "tableheader/v1/tableheader";
+
+    /** The resource type for table row v1 */
+    public static final String RT_FD_FORM_TABLE_ROW_V1 = RT_FD_FORM_PREFIX + "tablerow/v1/tablerow";
+
 }
diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/ReservedProperties.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/ReservedProperties.java
index 545b2a6f5c..64b0fad3d4 100644
--- a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/ReservedProperties.java
+++ b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/ReservedProperties.java
@@ -172,6 +172,22 @@ private ReservedProperties() {
 
     public static final String FD_DRAFT_ID = "fd:draftId";
 
+    public static final String PN_CQ_ANNOTATIONS = "cq:annotations";
+
+    /**
+     * Comma-separated proportional column widths JCR property, also passed into fd:dor for DOR table rendering (matches
+     * GuideTableElement key).
+     */
+    public static final String PN_DOR_COLUMN_WIDTHS = "columnWidth";
+
+    /** When true, adaptive form table columns can be sorted at runtime (publish). */
+    public static final String PN_ENABLE_SORTING = "enableSorting";
+
+    /** fd:viewType values for table sub-components — used as :type in exported JSON and matched in AF2→AF1 DOR transformer. */
+    public static final String VT_TABLE = "table";
+    public static final String VT_TABLE_ROW = "table-row";
+    public static final String VT_TABLE_HEADER = "table-header";
+
     // Begin: Form submission related properties
     public static final String FD_SUBMIT_PROPERTIES = "fd:submit";
     public static final String PN_SUBMIT_ACTION_TYPE = "actionType";
diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/TableHeaderImpl.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/TableHeaderImpl.java
new file mode 100644
index 0000000000..cec915f247
--- /dev/null
+++ b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/TableHeaderImpl.java
@@ -0,0 +1,42 @@
+/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ Copyright 2026 Adobe
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~     http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
+package com.adobe.cq.forms.core.components.internal.models.v1.form;
+
+import org.apache.sling.api.SlingHttpServletRequest;
+import org.apache.sling.api.resource.Resource;
+import org.apache.sling.models.annotations.Exporter;
+import org.apache.sling.models.annotations.Model;
+import org.jetbrains.annotations.NotNull;
+
+import com.adobe.cq.export.json.ComponentExporter;
+import com.adobe.cq.export.json.ExporterConstants;
+import com.adobe.cq.forms.core.components.internal.form.FormConstants;
+import com.adobe.cq.forms.core.components.internal.form.ReservedProperties;
+import com.adobe.cq.forms.core.components.models.form.Panel;
+
+@Model(
+    adaptables = { SlingHttpServletRequest.class, Resource.class },
+    adapters = { Panel.class, ComponentExporter.class },
+    resourceType = { FormConstants.RT_FD_FORM_TABLE_HEADER_V1 })
+@Exporter(name = ExporterConstants.SLING_MODEL_EXPORTER_NAME, extensions = ExporterConstants.SLING_MODEL_EXTENSION)
+public class TableHeaderImpl extends PanelImpl {
+
+    @Override
+    @NotNull
+    public String getExportedType() {
+        return ReservedProperties.VT_TABLE_HEADER;
+    }
+}
diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/TableImpl.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/TableImpl.java
new file mode 100644
index 0000000000..cf10ec50ca
--- /dev/null
+++ b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/TableImpl.java
@@ -0,0 +1,142 @@
+/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ Copyright 2026 Adobe
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~     http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
+package com.adobe.cq.forms.core.components.internal.models.v1.form;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Nullable;
+
+import org.apache.sling.api.SlingHttpServletRequest;
+import org.apache.sling.api.resource.Resource;
+import org.apache.sling.models.annotations.Exporter;
+import org.apache.sling.models.annotations.Model;
+import org.apache.sling.models.annotations.injectorspecific.InjectionStrategy;
+import org.apache.sling.models.annotations.injectorspecific.ValueMapValue;
+import org.jetbrains.annotations.NotNull;
+
+import com.adobe.cq.export.json.ComponentExporter;
+import com.adobe.cq.export.json.ExporterConstants;
+import com.adobe.cq.forms.core.components.internal.form.FormConstants;
+import com.adobe.cq.forms.core.components.internal.form.ReservedProperties;
+import com.adobe.cq.forms.core.components.models.form.Panel;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+@Model(
+    adaptables = { SlingHttpServletRequest.class, Resource.class },
+    adapters = { Panel.class, ComponentExporter.class },
+    resourceType = { FormConstants.RT_FD_FORM_TABLE_V1 })
+@Exporter(name = ExporterConstants.SLING_MODEL_EXPORTER_NAME, extensions = ExporterConstants.SLING_MODEL_EXTENSION)
+public class TableImpl extends PanelImpl {
+
+    @ValueMapValue(injectionStrategy = InjectionStrategy.OPTIONAL, name = ReservedProperties.PN_DOR_COLUMN_WIDTHS)
+    @Nullable
+    protected String columnWidth;
+
+    @ValueMapValue(injectionStrategy = InjectionStrategy.OPTIONAL, name = ReservedProperties.PN_ENABLE_SORTING)
+    @Nullable
+    protected Boolean enableSorting;
+
+    /**
+     * When {@code true}, runtime (publish) enables client-side column sorting.
+     * Omitted from JSON when {@code false} (see {@link JsonInclude.Include#NON_DEFAULT}).
+     */
+    @JsonProperty("enableSorting")
+    @JsonInclude(JsonInclude.Include.NON_DEFAULT)
+    public boolean isEnableSorting() {
+        return Boolean.TRUE.equals(enableSorting);
+    }
+
+    /**
+     * Returns the raw comma-separated column width string from JCR (e.g. "1,1,4").
+     * Used in edit mode as the {@code data-column-widths} attribute.
+     */
+    @JsonIgnore
+    public String getColumnWidth() {
+        return columnWidth;
+    }
+
+    /**
+     * True when {@link #getColumnWidthColStyles()} would return a non-empty list (valid authored widths).
+     */
+    @JsonIgnore
+    public boolean isColumnWidthsConfigured() {
+        return !getColumnWidthColStyles().isEmpty();
+    }
+
+    @Override
+    @NotNull
+    public String getExportedType() {
+        return ReservedProperties.VT_TABLE;
+    }
+
+    @Override
+    @JsonIgnore
+    @NotNull
+    public Map<String, Object> getDorProperties() {
+        Map<String, Object> props = new LinkedHashMap<>(super.getDorProperties());
+        if (columnWidth != null && !columnWidth.isEmpty()) {
+            // Pass authored proportional widths into fd:dor so DoRTableElement can compute
+            // proportional XFA column widths (e.g. "1,2,1" → relative pixel widths).
+            props.put(ReservedProperties.PN_DOR_COLUMN_WIDTHS, columnWidth);
+        }
+        return props;
+    }
+
+    /**
+     * One entry per column for {@code <col style="...">}: {@code width: N%} (no HTL string concatenation).
+     * For example, proportional {@code "1,1,4"} becomes {@code width: 16%}, {@code width: 16%}, {@code width: 66%}.
+     * Negative or non-numeric values are treated as 1. The last column absorbs any rounding remainder so widths sum to 100%.
+     */
+    @JsonIgnore
+    public List<String> getColumnWidthColStyles() {
+        if (columnWidth == null || columnWidth.isEmpty()) {
+            return Collections.emptyList();
+        }
+        String[] parts = columnWidth.split(",");
+        int[] values = new int[parts.length];
+        int sum = 0;
+        for (int i = 0; i < parts.length; i++) {
+            try {
+                values[i] = Integer.parseInt(parts[i].trim());
+            } catch (NumberFormatException e) {
+                values[i] = 1;
+            }
+            if (values[i] < 0) {
+                values[i] = 0;
+            }
+            sum += values[i];
+        }
+        if (sum == 0) {
+            return Collections.emptyList();
+        }
+        List<String> result = new ArrayList<>();
+        int allocated = 0;
+        for (int i = 0; i < values.length; i++) {
+            int pct = (i == values.length - 1)
+                ? (100 - allocated)
+                : (int) Math.floor((values[i] * 100.0) / sum);
+            allocated += pct;
+            result.add("width: " + pct + "%");
+        }
+        return result;
+    }
+}
diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/TableRowImpl.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/TableRowImpl.java
new file mode 100644
index 0000000000..5fff674f1d
--- /dev/null
+++ b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/TableRowImpl.java
@@ -0,0 +1,42 @@
+/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ Copyright 2026 Adobe
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~     http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
+package com.adobe.cq.forms.core.components.internal.models.v1.form;
+
+import org.apache.sling.api.SlingHttpServletRequest;
+import org.apache.sling.api.resource.Resource;
+import org.apache.sling.models.annotations.Exporter;
+import org.apache.sling.models.annotations.Model;
+import org.jetbrains.annotations.NotNull;
+
+import com.adobe.cq.export.json.ComponentExporter;
+import com.adobe.cq.export.json.ExporterConstants;
+import com.adobe.cq.forms.core.components.internal.form.FormConstants;
+import com.adobe.cq.forms.core.components.internal.form.ReservedProperties;
+import com.adobe.cq.forms.core.components.models.form.Panel;
+
+@Model(
+    adaptables = { SlingHttpServletRequest.class, Resource.class },
+    adapters = { Panel.class, ComponentExporter.class },
+    resourceType = { FormConstants.RT_FD_FORM_TABLE_ROW_V1 })
+@Exporter(name = ExporterConstants.SLING_MODEL_EXPORTER_NAME, extensions = ExporterConstants.SLING_MODEL_EXTENSION)
+public class TableRowImpl extends PanelImpl {
+
+    @Override
+    @NotNull
+    public String getExportedType() {
+        return ReservedProperties.VT_TABLE_ROW;
+    }
+}
diff --git a/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/TableImplTest.java b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/TableImplTest.java
new file mode 100644
index 0000000000..bc60e470ac
--- /dev/null
+++ b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/TableImplTest.java
@@ -0,0 +1,204 @@
+/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ Copyright 2026 Adobe
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~     http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
+package com.adobe.cq.forms.core.components.internal.models.v1.form;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.StreamSupport;
+
+import org.apache.sling.api.resource.Resource;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+
+import com.adobe.cq.export.json.SlingModelFilter;
+import com.adobe.cq.forms.core.Utils;
+import com.adobe.cq.forms.core.components.models.form.Panel;
+import com.adobe.cq.forms.core.context.FormsCoreComponentTestContext;
+import com.day.cq.wcm.api.NameConstants;
+import com.day.cq.wcm.msm.api.MSMNameConstants;
+import io.wcm.testing.mock.aem.junit5.AemContext;
+import io.wcm.testing.mock.aem.junit5.AemContextExtension;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+@ExtendWith(AemContextExtension.class)
+public class TableImplTest {
+
+    private static final String BASE = "/form/table";
+    private static final String CONTENT_ROOT = "/content";
+    private static final String PATH_TABLE = CONTENT_ROOT + "/table";
+    private static final String PATH_TABLE_WITH_COLUMN_WIDTH = CONTENT_ROOT + "/table-with-column-width";
+    private static final String PATH_TABLE_WITH_SORTING = CONTENT_ROOT + "/table-with-sorting";
+    private static final String PATH_TABLE_WITH_EQUAL_WIDTHS = CONTENT_ROOT + "/table-with-equal-widths";
+    private static final String PATH_TABLE_WITH_INVALID_WIDTH = CONTENT_ROOT + "/table-with-invalid-width";
+    private static final String PATH_TABLE_WITH_NEGATIVE_WIDTH = CONTENT_ROOT + "/table-with-negative-width";
+    private static final String PATH_TABLE_WITH_ZERO_WIDTHS = CONTENT_ROOT + "/table-with-zero-widths";
+    private static final String PATH_TABLEHEADER = CONTENT_ROOT + "/tableheader";
+    private static final String PATH_TABLEROW = CONTENT_ROOT + "/tablerow";
+
+    private final AemContext context = FormsCoreComponentTestContext.newAemContext();
+
+    @BeforeEach
+    void setUp() {
+        context.load().json(BASE + FormsCoreComponentTestContext.TEST_CONTENT_JSON, CONTENT_ROOT);
+        context.registerService(SlingModelFilter.class, new SlingModelFilter() {
+            private final Set<String> IGNORED_NODE_NAMES = new HashSet<String>() {
+                {
+                    add(NameConstants.NN_RESPONSIVE_CONFIG);
+                    add(MSMNameConstants.NT_LIVE_SYNC_CONFIG);
+                    add("cq:annotations");
+                }
+            };
+
+            @Override
+            public Map<String, Object> filterProperties(Map<String, Object> map) {
+                return map;
+            }
+
+            @Override
+            public Iterable<Resource> filterChildResources(Iterable<Resource> childResources) {
+                return StreamSupport
+                    .stream(childResources.spliterator(), false)
+                    .filter(r -> !IGNORED_NODE_NAMES.contains(r.getName()))
+                    .collect(Collectors.toList());
+            }
+        });
+    }
+
+    @Test
+    void testGetDorProperties_noColumnWidthWhenNotAuthored() throws Exception {
+        Panel table = Utils.getComponentUnderTest(PATH_TABLE, Panel.class, context);
+        Map<String, Object> dorProps = table.getDorProperties();
+        assertNull(dorProps.get("columnWidth"),
+            "columnWidth must be absent when no columnWidth is authored");
+    }
+
+    @Test
+    void testGetDorProperties_columnWidthPassedThroughWhenAuthored() throws Exception {
+        Panel table = Utils.getComponentUnderTest(PATH_TABLE_WITH_COLUMN_WIDTH, Panel.class, context);
+        Map<String, Object> dorProps = table.getDorProperties();
+        assertEquals("1,2,1", dorProps.get("columnWidth"),
+            "columnWidth must carry the authored proportional value");
+    }
+
+    @Test
+    void testExportedType_table() throws Exception {
+        Panel table = Utils.getComponentUnderTest(PATH_TABLE, Panel.class, context);
+        assertEquals("table", table.getExportedType());
+    }
+
+    @Test
+    void testExportedType_tableHeader() throws Exception {
+        Panel header = Utils.getComponentUnderTest(PATH_TABLEHEADER, Panel.class, context);
+        assertEquals("table-header", header.getExportedType());
+    }
+
+    @Test
+    void testExportedType_tableRow() throws Exception {
+        Panel row = Utils.getComponentUnderTest(PATH_TABLEROW, Panel.class, context);
+        assertEquals("table-row", row.getExportedType());
+    }
+
+    @Test
+    void testIsEnableSorting_falseWhenNotAuthored() throws Exception {
+        TableImpl table = (TableImpl) Utils.getComponentUnderTest(PATH_TABLE, Panel.class, context);
+        assertFalse(table.isEnableSorting(), "enableSorting must be false when not authored");
+    }
+
+    @Test
+    void testIsEnableSorting_trueWhenAuthored() throws Exception {
+        TableImpl table = (TableImpl) Utils.getComponentUnderTest(PATH_TABLE_WITH_SORTING, Panel.class, context);
+        assertTrue(table.isEnableSorting(), "enableSorting must be true when authored");
+    }
+
+    @Test
+    void testGetColumnWidth_nullWhenNotAuthored() throws Exception {
+        TableImpl table = (TableImpl) Utils.getComponentUnderTest(PATH_TABLE, Panel.class, context);
+        assertNull(table.getColumnWidth(), "getColumnWidth must be null when not authored");
+    }
+
+    @Test
+    void testGetColumnWidth_returnedWhenAuthored() throws Exception {
+        TableImpl table = (TableImpl) Utils.getComponentUnderTest(PATH_TABLE_WITH_COLUMN_WIDTH, Panel.class, context);
+        assertEquals("1,2,1", table.getColumnWidth(), "getColumnWidth must return the authored value");
+    }
+
+    @Test
+    void testGetColumnWidthColStyles_emptyWhenNotAuthored() throws Exception {
+        TableImpl table = (TableImpl) Utils.getComponentUnderTest(PATH_TABLE, Panel.class, context);
+        assertTrue(table.getColumnWidthColStyles().isEmpty());
+        assertFalse(table.isColumnWidthsConfigured());
+    }
+
+    @Test
+    void testGetColumnWidthColStyles_sumsTo100() throws Exception {
+        TableImpl table = (TableImpl) Utils.getComponentUnderTest(PATH_TABLE_WITH_EQUAL_WIDTHS, Panel.class, context);
+        List<String> styles = table.getColumnWidthColStyles();
+        assertEquals(3, styles.size());
+        int total = styles.stream()
+            .mapToInt(s -> Integer.parseInt(s.replace("width: ", "").replace("%", "").trim()))
+            .sum();
+        assertEquals(100, total, "column widths must sum to 100%");
+        assertTrue(table.isColumnWidthsConfigured());
+    }
+
+    @Test
+    void testGetColumnWidthColStyles_proportionalWidths() throws Exception {
+        TableImpl table = (TableImpl) Utils.getComponentUnderTest(PATH_TABLE_WITH_COLUMN_WIDTH, Panel.class, context);
+        List<String> styles = table.getColumnWidthColStyles();
+        assertEquals(3, styles.size());
+        int total = styles.stream()
+            .mapToInt(s -> Integer.parseInt(s.replace("width: ", "").replace("%", "").trim()))
+            .sum();
+        assertEquals(100, total, "proportional widths must sum to 100%");
+    }
+
+    @Test
+    void testGetColumnWidthColStyles_invalidValueTreatedAs1() throws Exception {
+        TableImpl table = (TableImpl) Utils.getComponentUnderTest(PATH_TABLE_WITH_INVALID_WIDTH, Panel.class, context);
+        List<String> styles = table.getColumnWidthColStyles();
+        assertEquals(2, styles.size(), "invalid token should be treated as 1");
+        int total = styles.stream()
+            .mapToInt(s -> Integer.parseInt(s.replace("width: ", "").replace("%", "").trim()))
+            .sum();
+        assertEquals(100, total, "widths must sum to 100% even with invalid token");
+    }
+
+    @Test
+    void testGetColumnWidthColStyles_negativeValueTreatedAs0() throws Exception {
+        TableImpl table = (TableImpl) Utils.getComponentUnderTest(PATH_TABLE_WITH_NEGATIVE_WIDTH, Panel.class, context);
+        List<String> styles = table.getColumnWidthColStyles();
+        assertEquals(3, styles.size(), "negative value should be clamped to 0");
+        int total = styles.stream()
+            .mapToInt(s -> Integer.parseInt(s.replace("width: ", "").replace("%", "").trim()))
+            .sum();
+        assertEquals(100, total, "widths must sum to 100% even with negative token");
+    }
+
+    @Test
+    void testGetColumnWidthColStyles_allZeroReturnsEmpty() throws Exception {
+        TableImpl table = (TableImpl) Utils.getComponentUnderTest(PATH_TABLE_WITH_ZERO_WIDTHS, Panel.class, context);
+        assertTrue(table.getColumnWidthColStyles().isEmpty(), "all-zero widths must return empty list");
+        assertFalse(table.isColumnWidthsConfigured());
+    }
+}
diff --git a/bundles/af-core/src/test/resources/form/table/test-content.json b/bundles/af-core/src/test/resources/form/table/test-content.json
new file mode 100644
index 0000000000..b8f78a18b9
--- /dev/null
+++ b/bundles/af-core/src/test/resources/form/table/test-content.json
@@ -0,0 +1,71 @@
+{
+  "table": {
+    "jcr:primaryType": "nt:unstructured",
+    "sling:resourceType": "core/fd/components/form/table/v1/table",
+    "name": "myTable",
+    "jcr:title": "My Table",
+    "fieldType": "panel"
+  },
+  "table-with-column-width": {
+    "jcr:primaryType": "nt:unstructured",
+    "sling:resourceType": "core/fd/components/form/table/v1/table",
+    "name": "myTableWithWidths",
+    "jcr:title": "My Table With Column Widths",
+    "fieldType": "panel",
+    "columnWidth": "1,2,1"
+  },
+  "table-with-sorting": {
+    "jcr:primaryType": "nt:unstructured",
+    "sling:resourceType": "core/fd/components/form/table/v1/table",
+    "name": "myTableWithSorting",
+    "jcr:title": "My Table With Sorting",
+    "fieldType": "panel",
+    "enableSorting": true
+  },
+  "table-with-equal-widths": {
+    "jcr:primaryType": "nt:unstructured",
+    "sling:resourceType": "core/fd/components/form/table/v1/table",
+    "name": "myTableWithEqualWidths",
+    "jcr:title": "My Table Equal Widths",
+    "fieldType": "panel",
+    "columnWidth": "1,1,1"
+  },
+  "table-with-invalid-width": {
+    "jcr:primaryType": "nt:unstructured",
+    "sling:resourceType": "core/fd/components/form/table/v1/table",
+    "name": "myTableWithInvalidWidth",
+    "jcr:title": "My Table Invalid Width",
+    "fieldType": "panel",
+    "columnWidth": "abc,1"
+  },
+  "table-with-negative-width": {
+    "jcr:primaryType": "nt:unstructured",
+    "sling:resourceType": "core/fd/components/form/table/v1/table",
+    "name": "myTableWithNegativeWidth",
+    "jcr:title": "My Table Negative Width",
+    "fieldType": "panel",
+    "columnWidth": "-1,2,3"
+  },
+  "table-with-zero-widths": {
+    "jcr:primaryType": "nt:unstructured",
+    "sling:resourceType": "core/fd/components/form/table/v1/table",
+    "name": "myTableWithZeroWidths",
+    "jcr:title": "My Table Zero Widths",
+    "fieldType": "panel",
+    "columnWidth": "0,0"
+  },
+  "tableheader": {
+    "jcr:primaryType": "nt:unstructured",
+    "sling:resourceType": "core/fd/components/form/tableheader/v1/tableheader",
+    "name": "myTableHeader",
+    "jcr:title": "My Table Header",
+    "fieldType": "panel"
+  },
+  "tablerow": {
+    "jcr:primaryType": "nt:unstructured",
+    "sling:resourceType": "core/fd/components/form/tablerow/v1/tablerow",
+    "name": "myTableRow",
+    "jcr:title": "My Table Row",
+    "fieldType": "panel"
+  }
+}
diff --git a/examples/ui.apps/src/main/content/jcr_root/apps/forms-components-examples/components/form/table/.content.xml b/examples/ui.apps/src/main/content/jcr_root/apps/forms-components-examples/components/form/table/.content.xml
new file mode 100644
index 0000000000..94b7b43b75
--- /dev/null
+++ b/examples/ui.apps/src/main/content/jcr_root/apps/forms-components-examples/components/form/table/.content.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
+    cq:icon="table"
+    jcr:primaryType="cq:Component"
+    jcr:title="Adaptive Form Table"
+    jcr:description="Display data in a table format."
+    sling:resourceSuperType="core/fd/components/form/table/v1/table"
+    componentGroup="Core Components Examples - Adaptive Form"/>
diff --git a/examples/ui.apps/src/main/content/jcr_root/apps/forms-components-examples/components/form/table/_cq_template.xml b/examples/ui.apps/src/main/content/jcr_root/apps/forms-components-examples/components/form/table/_cq_template.xml
new file mode 100644
index 0000000000..da8b08472f
--- /dev/null
+++ b/examples/ui.apps/src/main/content/jcr_root/apps/forms-components-examples/components/form/table/_cq_template.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Copyright 2026 Adobe
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
+    jcr:primaryType="nt:unstructured"
+    jcr:title="Table"
+    fieldType="panel"
+    enableSorting="{Boolean}true">
+    <!-- Header Row -->
+    <header
+      jcr:primaryType="nt:unstructured"
+      sling:resourceType="core/fd/components/form/tableheader/v1/tableheader"
+      fieldType="panel"
+      jcr:title="Header Row">
+        <column1
+            jcr:primaryType="nt:unstructured"
+            sling:resourceType="forms-components-examples/components/form/text"
+            fieldType="plain-text"
+            jcr:title="Column 1"
+            name="column1"
+            value="Column 1"/>
+        <column2
+            jcr:primaryType="nt:unstructured"
+            sling:resourceType="forms-components-examples/components/form/text"
+            fieldType="plain-text"
+            jcr:title="Column 2"
+            name="column2"
+            value="Column 2"/>
+    </header>
+    <!-- Data Row 1 -->
+    <row1
+        jcr:primaryType="nt:unstructured"
+        sling:resourceType="core/fd/components/form/tablerow/v1/tablerow"
+        fieldType="panel"
+        jcr:title="Row 1">
+          <cell1
+              jcr:primaryType="nt:unstructured"
+              sling:resourceType="forms-components-examples/components/form/textinput"
+              fieldType="text-input"/>
+          <cell2
+              jcr:primaryType="nt:unstructured"
+              sling:resourceType="forms-components-examples/components/form/textinput"
+              fieldType="text-input"/>
+    </row1>
+    <!-- Data Row 2 -->
+    <row2
+        jcr:primaryType="nt:unstructured"
+        sling:resourceType="core/fd/components/form/tablerow/v1/tablerow"
+        fieldType="panel"
+        jcr:title="Row 2">
+          <cell1
+              jcr:primaryType="nt:unstructured"
+              sling:resourceType="forms-components-examples/components/form/textinput"
+              fieldType="text-input"/>
+          <cell2
+              jcr:primaryType="nt:unstructured"
+              sling:resourceType="forms-components-examples/components/form/textinput"
+              fieldType="text-input"/>
+    </row2>
+</jcr:root>
diff --git a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/table/.content.xml b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/table/.content.xml
new file mode 100644
index 0000000000..7256712059
--- /dev/null
+++ b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/table/.content.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal"
+    jcr:mixinTypes="[rep:AccessControllable]"
+    jcr:primaryType="sling:Folder"
+    lcFolder="{Long}0"
+    type="lcFolder"
+/>
diff --git a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/table/basic/.content.xml b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/table/basic/.content.xml
new file mode 100644
index 0000000000..d727511cdf
--- /dev/null
+++ b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/table/basic/.content.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:xmp="http://ns.adobe.com/xap/1.0/" xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:fd="http://www.adobe.com/aemfd/fd/1.0" xmlns:dam="http://www.day.com/dam/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
+    jcr:primaryType="dam:Asset">
+    <jcr:content
+        jcr:lastModified="{Date}2024-01-01T00:00:00.000+05:30"
+        jcr:primaryType="dam:AssetContent"
+        sling:resourceType="fd/fm/af/render"
+        guide="1"
+        type="guide">
+        <metadata
+            fd:version="2.1"
+            jcr:primaryType="nt:unstructured"
+            allowedRenderFormat="HTML"
+            author="admin"
+            availableInMobileApp="{Boolean}false"
+            dorType="none"
+            formmodel="none"
+            hasCustomThumbnail="{Boolean}false"
+            title="Adaptive Form V2 (IT)"/>
+    </jcr:content>
+</jcr:root>
diff --git a/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/table/.content.xml b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/table/.content.xml
new file mode 100644
index 0000000000..a0ac99e384
--- /dev/null
+++ b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/table/.content.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
+    jcr:primaryType="sling:Folder"/>
diff --git a/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/table/basic/.content.xml b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/table/basic/.content.xml
new file mode 100644
index 0000000000..b8eba43a5f
--- /dev/null
+++ b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/table/basic/.content.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:fd="http://www.adobe.com/aemfd/fd/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
+    jcr:primaryType="cq:Page">
+    <jcr:content
+        cq:deviceGroups="[mobile/groups/responsive]"
+        cq:template="/conf/core-components-examples/settings/wcm/templates/af-blank-v2"
+        jcr:language="en"
+        jcr:primaryType="cq:PageContent"
+        jcr:title="Adaptive Form V2 (IT)"
+        sling:resourceType="forms-components-examples/components/page">
+        <guideContainer
+            fd:version="2.1"
+            fieldType="form"
+            jcr:primaryType="nt:unstructured"
+            sling:resourceType="forms-components-examples/components/form/container">
+            <table
+                jcr:primaryType="nt:unstructured"
+                jcr:title="Table"
+                sling:resourceType="core/fd/components/form/table/v1/table"
+                fieldType="panel"
+                name="table"
+                visible="{Boolean}true"
+                enabled="{Boolean}true"
+                hideTitle="{Boolean}false">
+                <!-- Header Row -->
+                <header
+                    jcr:primaryType="nt:unstructured"
+                    jcr:title="Header Row"
+                    sling:resourceType="core/fd/components/form/tableheader/v1/tableheader"
+                    fieldType="panel">
+                    <column1
+                        jcr:primaryType="nt:unstructured"
+                        jcr:title="Name"
+                        sling:resourceType="core/fd/components/form/text/v1/text"
+                        fieldType="plain-text"
+                        name="column1"
+                        value="Name"/>
+                    <column2
+                        jcr:primaryType="nt:unstructured"
+                        jcr:title="Age"
+                        sling:resourceType="core/fd/components/form/text/v1/text"
+                        fieldType="plain-text"
+                        name="column2"
+                        value="Age"/>
+                </header>
+                <!-- Static Row -->
+                <row1
+                    jcr:primaryType="nt:unstructured"
+                    jcr:title="Row 1"
+                    sling:resourceType="core/fd/components/form/tablerow/v1/tablerow"
+                    fieldType="panel"
+                    name="row1"
+                    repeatable="{Boolean}false">
+                    <cell1
+                        jcr:primaryType="nt:unstructured"
+                        jcr:title="Name Input"
+                        sling:resourceType="core/fd/components/form/textinput/v1/textinput"
+                        fieldType="text-input"
+                        name="nameInput1"/>
+                    <cell2
+                        jcr:primaryType="nt:unstructured"
+                        jcr:title="Age Input"
+                        sling:resourceType="core/fd/components/form/textinput/v1/textinput"
+                        fieldType="text-input"
+                        name="ageInput1"/>
+                </row1>
+                <!-- Repeatable Row -->
+                <row2
+                    jcr:primaryType="nt:unstructured"
+                    jcr:title="Row 2"
+                    sling:resourceType="core/fd/components/form/tablerow/v1/tablerow"
+                    fieldType="panel"
+                    name="row2"
+                    repeatable="{Boolean}true"
+                    minOccur="1"
+                    maxOccur="3">
+                    <cell1
+                        jcr:primaryType="nt:unstructured"
+                        jcr:title="Name Input"
+                        sling:resourceType="core/fd/components/form/textinput/v1/textinput"
+                        fieldType="text-input"
+                        name="nameInput2"/>
+                    <cell2
+                        jcr:primaryType="nt:unstructured"
+                        jcr:title="Age Input"
+                        sling:resourceType="core/fd/components/form/textinput/v1/textinput"
+                        fieldType="text-input"
+                        name="ageInput2"/>
+                </row2>
+            </table>
+        </guideContainer>
+    </jcr:content>
+</jcr:root>
diff --git a/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/table/columnwidth/.content.xml b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/table/columnwidth/.content.xml
new file mode 100644
index 0000000000..22bc42ad4a
--- /dev/null
+++ b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/table/columnwidth/.content.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:fd="http://www.adobe.com/aemfd/fd/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
+    jcr:primaryType="cq:Page">
+    <jcr:content
+        cq:deviceGroups="[mobile/groups/responsive]"
+        cq:template="/conf/core-components-examples/settings/wcm/templates/af-blank-v2"
+        jcr:language="en"
+        jcr:primaryType="cq:PageContent"
+        jcr:title="Adaptive Form V2 (IT) - Table Column Width"
+        sling:resourceType="forms-components-examples/components/page">
+        <guideContainer
+            fd:version="2.1"
+            fieldType="form"
+            jcr:primaryType="nt:unstructured"
+            sling:resourceType="forms-components-examples/components/form/container">
+            <!--
+                columnWidth="1,2,1" → proportional widths: 25%, 50%, 25%
+                (3 columns total, weights sum to 4; col0=1/4, col1=2/4, col2=1/4)
+            -->
+            <table
+                jcr:primaryType="nt:unstructured"
+                jcr:title="Column Width Table"
+                sling:resourceType="core/fd/components/form/table/v1/table"
+                fieldType="panel"
+                name="table"
+                visible="{Boolean}true"
+                enabled="{Boolean}true"
+                hideTitle="{Boolean}false"
+                columnWidth="1,2,1">
+                <header
+                    jcr:primaryType="nt:unstructured"
+                    jcr:title="Header Row"
+                    sling:resourceType="core/fd/components/form/tableheader/v1/tableheader"
+                    fieldType="panel">
+                    <column1
+                        jcr:primaryType="nt:unstructured"
+                        jcr:title="Small"
+                        sling:resourceType="core/fd/components/form/text/v1/text"
+                        fieldType="plain-text"
+                        name="column1"
+                        value="Small"/>
+                    <column2
+                        jcr:primaryType="nt:unstructured"
+                        jcr:title="Wide"
+                        sling:resourceType="core/fd/components/form/text/v1/text"
+                        fieldType="plain-text"
+                        name="column2"
+                        value="Wide"/>
+                    <column3
+                        jcr:primaryType="nt:unstructured"
+                        jcr:title="Small"
+                        sling:resourceType="core/fd/components/form/text/v1/text"
+                        fieldType="plain-text"
+                        name="column3"
+                        value="Small"/>
+                </header>
+                <row1
+                    jcr:primaryType="nt:unstructured"
+                    jcr:title="Row 1"
+                    sling:resourceType="core/fd/components/form/tablerow/v1/tablerow"
+                    fieldType="panel"
+                    name="row1"
+                    repeatable="{Boolean}false">
+                    <cell1
+                        jcr:primaryType="nt:unstructured"
+                        jcr:title="Input A"
+                        sling:resourceType="core/fd/components/form/textinput/v1/textinput"
+                        fieldType="text-input"
+                        name="inputA"/>
+                    <cell2
+                        jcr:primaryType="nt:unstructured"
+                        jcr:title="Input B"
+                        sling:resourceType="core/fd/components/form/textinput/v1/textinput"
+                        fieldType="text-input"
+                        name="inputB"/>
+                    <cell3
+                        jcr:primaryType="nt:unstructured"
+                        jcr:title="Input C"
+                        sling:resourceType="core/fd/components/form/textinput/v1/textinput"
+                        fieldType="text-input"
+                        name="inputC"/>
+                </row1>
+            </table>
+        </guideContainer>
+    </jcr:content>
+</jcr:root>
diff --git a/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/table/mergesplit/.content.xml b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/table/mergesplit/.content.xml
new file mode 100644
index 0000000000..ab04372bc4
--- /dev/null
+++ b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/table/mergesplit/.content.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:fd="http://www.adobe.com/aemfd/fd/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
+    jcr:primaryType="cq:Page">
+    <jcr:content
+        cq:deviceGroups="[mobile/groups/responsive]"
+        cq:template="/conf/core-components-examples/settings/wcm/templates/af-blank-v2"
+        jcr:language="en"
+        jcr:primaryType="cq:PageContent"
+        jcr:title="Adaptive Form V2 (IT) - Table Row Merge/Split"
+        sling:resourceType="forms-components-examples/components/page">
+        <guideContainer
+            fd:version="2.1"
+            fieldType="form"
+            jcr:primaryType="nt:unstructured"
+            sling:resourceType="forms-components-examples/components/form/container">
+            <table
+                jcr:primaryType="nt:unstructured"
+                jcr:title="Merge Split Table"
+                sling:resourceType="core/fd/components/form/table/v1/table"
+                fieldType="panel"
+                name="table"
+                visible="{Boolean}true"
+                enabled="{Boolean}true"
+                hideTitle="{Boolean}false">
+                <header
+                    jcr:primaryType="nt:unstructured"
+                    jcr:title="Header Row"
+                    sling:resourceType="core/fd/components/form/tableheader/v1/tableheader"
+                    fieldType="panel">
+                    <column1
+                        jcr:primaryType="nt:unstructured"
+                        jcr:title="Column 1"
+                        sling:resourceType="core/fd/components/form/text/v1/text"
+                        fieldType="plain-text"
+                        name="column1"
+                        value="Column 1"/>
+                    <column2
+                        jcr:primaryType="nt:unstructured"
+                        jcr:title="Column 2"
+                        sling:resourceType="core/fd/components/form/text/v1/text"
+                        fieldType="plain-text"
+                        name="column2"
+                        value="Column 2"/>
+                    <column3
+                        jcr:primaryType="nt:unstructured"
+                        jcr:title="Column 3"
+                        sling:resourceType="core/fd/components/form/text/v1/text"
+                        fieldType="plain-text"
+                        name="column3"
+                        value="Column 3"/>
+                </header>
+                <row1
+                    jcr:primaryType="nt:unstructured"
+                    jcr:title="Row 1"
+                    sling:resourceType="core/fd/components/form/tablerow/v1/tablerow"
+                    fieldType="panel"
+                    name="row1"
+                    repeatable="{Boolean}false">
+                    <mergedCell
+                        jcr:primaryType="nt:unstructured"
+                        jcr:title="Merged Cell"
+                        sling:resourceType="core/fd/components/form/textinput/v1/textinput"
+                        fieldType="text-input"
+                        name="mergedCell"
+                        colspan="2"/>
+                    <cell3
+                        jcr:primaryType="nt:unstructured"
+                        jcr:title="Third Input"
+                        sling:resourceType="core/fd/components/form/textinput/v1/textinput"
+                        fieldType="text-input"
+                        name="cell3"/>
+                </row1>
+                <row2
+                    jcr:primaryType="nt:unstructured"
+                    jcr:title="Row 2"
+                    sling:resourceType="core/fd/components/form/tablerow/v1/tablerow"
+                    fieldType="panel"
+                    name="row2"
+                    repeatable="{Boolean}false">
+                    <cell1
+                        jcr:primaryType="nt:unstructured"
+                        jcr:title="Input A"
+                        sling:resourceType="core/fd/components/form/textinput/v1/textinput"
+                        fieldType="text-input"
+                        name="cell1"/>
+                    <cell2
+                        jcr:primaryType="nt:unstructured"
+                        jcr:title="Input B"
+                        sling:resourceType="core/fd/components/form/textinput/v1/textinput"
+                        fieldType="text-input"
+                        name="cell2"/>
+                    <cell3
+                        jcr:primaryType="nt:unstructured"
+                        jcr:title="Input C"
+                        sling:resourceType="core/fd/components/form/textinput/v1/textinput"
+                        fieldType="text-input"
+                        name="cell3"/>
+                </row2>
+            </table>
+        </guideContainer>
+    </jcr:content>
+</jcr:root>
diff --git a/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/table/sorting/.content.xml b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/table/sorting/.content.xml
new file mode 100644
index 0000000000..3274c4a7c6
--- /dev/null
+++ b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/table/sorting/.content.xml
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:fd="http://www.adobe.com/aemfd/fd/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
+    jcr:primaryType="cq:Page">
+    <jcr:content
+        cq:deviceGroups="[mobile/groups/responsive]"
+        cq:template="/conf/core-components-examples/settings/wcm/templates/af-blank-v2"
+        jcr:language="en"
+        jcr:primaryType="cq:PageContent"
+        jcr:title="Adaptive Form V2 (IT) - Table Sorting"
+        sling:resourceType="forms-components-examples/components/page">
+        <guideContainer
+            fd:version="2.1"
+            fieldType="form"
+            jcr:primaryType="nt:unstructured"
+            sling:resourceType="forms-components-examples/components/form/container">
+            <!--
+                enableSorting=true on the table; column2 has disableSorting=true
+                so only column1 gets a sort button at runtime.
+            -->
+            <table
+                jcr:primaryType="nt:unstructured"
+                jcr:title="Sortable Table"
+                sling:resourceType="core/fd/components/form/table/v1/table"
+                fieldType="panel"
+                name="table"
+                visible="{Boolean}true"
+                enabled="{Boolean}true"
+                hideTitle="{Boolean}false"
+                enableSorting="{Boolean}true">
+                <header
+                    jcr:primaryType="nt:unstructured"
+                    jcr:title="Header Row"
+                    sling:resourceType="core/fd/components/form/tableheader/v1/tableheader"
+                    fieldType="panel">
+                    <!-- column1: sort enabled (inherits table-level enableSorting) -->
+                    <column1
+                        jcr:primaryType="nt:unstructured"
+                        jcr:title="Name"
+                        sling:resourceType="core/fd/components/form/text/v1/text"
+                        fieldType="plain-text"
+                        name="column1"
+                        value="Name"/>
+                    <!-- column2: sort explicitly disabled for this column -->
+                    <column2
+                        jcr:primaryType="nt:unstructured"
+                        jcr:title="Score"
+                        sling:resourceType="core/fd/components/form/text/v1/text"
+                        fieldType="plain-text"
+                        name="column2"
+                        value="Score"
+                        disableSorting="{Boolean}true"/>
+                </header>
+                <!-- Row A -->
+                <rowA
+                    jcr:primaryType="nt:unstructured"
+                    jcr:title="Row A"
+                    sling:resourceType="core/fd/components/form/tablerow/v1/tablerow"
+                    fieldType="panel"
+                    name="rowA"
+                    repeatable="{Boolean}false">
+                    <cell1
+                        jcr:primaryType="nt:unstructured"
+                        jcr:title="Name"
+                        sling:resourceType="core/fd/components/form/textinput/v1/textinput"
+                        fieldType="text-input"
+                        name="nameA"
+                        default="Charlie"/>
+                    <cell2
+                        jcr:primaryType="nt:unstructured"
+                        jcr:title="Score"
+                        sling:resourceType="core/fd/components/form/textinput/v1/textinput"
+                        fieldType="text-input"
+                        name="scoreA"
+                        default="30"/>
+                </rowA>
+                <!-- Row B -->
+                <rowB
+                    jcr:primaryType="nt:unstructured"
+                    jcr:title="Row B"
+                    sling:resourceType="core/fd/components/form/tablerow/v1/tablerow"
+                    fieldType="panel"
+                    name="rowB"
+                    repeatable="{Boolean}false">
+                    <cell1
+                        jcr:primaryType="nt:unstructured"
+                        jcr:title="Name"
+                        sling:resourceType="core/fd/components/form/textinput/v1/textinput"
+                        fieldType="text-input"
+                        name="nameB"
+                        default="Alice"/>
+                    <cell2
+                        jcr:primaryType="nt:unstructured"
+                        jcr:title="Score"
+                        sling:resourceType="core/fd/components/form/textinput/v1/textinput"
+                        fieldType="text-input"
+                        name="scoreB"
+                        default="10"/>
+                </rowB>
+                <!-- Row C -->
+                <rowC
+                    jcr:primaryType="nt:unstructured"
+                    jcr:title="Row C"
+                    sling:resourceType="core/fd/components/form/tablerow/v1/tablerow"
+                    fieldType="panel"
+                    name="rowC"
+                    repeatable="{Boolean}false">
+                    <cell1
+                        jcr:primaryType="nt:unstructured"
+                        jcr:title="Name"
+                        sling:resourceType="core/fd/components/form/textinput/v1/textinput"
+                        fieldType="text-input"
+                        name="nameC"
+                        default="Bob"/>
+                    <cell2
+                        jcr:primaryType="nt:unstructured"
+                        jcr:title="Score"
+                        sling:resourceType="core/fd/components/form/textinput/v1/textinput"
+                        fieldType="text-input"
+                        name="scoreC"
+                        default="20"/>
+                </rowC>
+            </table>
+        </guideContainer>
+    </jcr:content>
+</jcr:root>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all/.content.xml
index c484806166..1cda561465 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all/.content.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all/.content.xml
@@ -5,4 +5,4 @@
     cssProcessor="[default:none,min:none]"
     jsProcessor="[default:none,min:none]"
     categories="[core.forms.components.runtime.all]"
-    embed="[core.forms.components.runtime.base,core.forms.components.container.v2.runtime,core.forms.components.datePicker.v1.runtime,core.forms.components.textinput.v1.runtime,core.forms.components.numberinput.v1.runtime,core.forms.components.panelcontainer.v1.runtime,core.forms.components.radiobutton.v2.runtime,core.forms.components.text.v1.runtime,core.forms.components.checkboxgroup.v1.runtime,core.forms.components.button.v1.runtime,core.forms.components.image.v1.runtime,core.forms.components.dropdown.v1.runtime,core.forms.components.fileinput.v4.runtime,core.forms.components.accordion.v1.runtime,core.forms.components.tabs.v1.runtime,core.forms.components.wizard.v1.runtime,core.forms.components.verticaltabs.v1.runtime,core.forms.components.recaptcha.v1.runtime,core.forms.components.checkbox.v1.runtime,core.forms.components.fragment.v1.runtime,core.forms.components.switch.v1.runtime,core.forms.components.termsandconditions.v1.runtime,core.forms.components.review.v1.runtime,core.forms.components.scribble.v1.runtime,core.forms.components.datetime.v1.runtime]"/>
+    embed="[core.forms.components.runtime.base,core.forms.components.container.v2.runtime,core.forms.components.datePicker.v1.runtime,core.forms.components.textinput.v1.runtime,core.forms.components.numberinput.v1.runtime,core.forms.components.panelcontainer.v1.runtime,core.forms.components.radiobutton.v2.runtime,core.forms.components.text.v1.runtime,core.forms.components.checkboxgroup.v1.runtime,core.forms.components.button.v1.runtime,core.forms.components.image.v1.runtime,core.forms.components.dropdown.v1.runtime,core.forms.components.fileinput.v4.runtime,core.forms.components.accordion.v1.runtime,core.forms.components.tabs.v1.runtime,core.forms.components.wizard.v1.runtime,core.forms.components.verticaltabs.v1.runtime,core.forms.components.recaptcha.v1.runtime,core.forms.components.checkbox.v1.runtime,core.forms.components.fragment.v1.runtime,core.forms.components.switch.v1.runtime,core.forms.components.termsandconditions.v1.runtime,core.forms.components.review.v1.runtime,core.forms.components.scribble.v1.runtime,core.forms.components.datetime.v1.runtime,core.forms.components.table.v1.runtime,core.forms.components.tablerow.v1.runtime,core.forms.components.tableheader.v1.runtime]"/>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/base/v1/base/_cq_editConfig.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/base/v1/base/_cq_editConfig.xml
index fc6d62c32d..7ba376a0b0 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/base/v1/base/_cq_editConfig.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/base/v1/base/_cq_editConfig.xml
@@ -23,6 +23,68 @@
             handler="CQ.FormsCoreComponents.editorhooks.viewQualifiedName"
             icon="viewSOMExpression"
             text="View Qualified Name"/>
+        <viewXFAScripts
+                jcr:primaryType="nt:unstructured"
+                condition="CQ.FormsCoreComponents.editorhooks.hasXfaScripts"
+                handler="CQ.FormsCoreComponents.editorhooks.viewXfaScripts"
+                icon="code"
+                text="View XFA Scripts"/>
+        <addcolumn
+                jcr:primaryType="nt:unstructured"
+                condition="function(editable){ return CQ.FormsCoreComponents.editorhooks.isCoreTableHeaderCell(editable); }"
+                handler="CQ.FormsCoreComponents.editorhooks.addTableColumn"
+                hidden="{Boolean}true"
+                icon="columnAdd"
+                text="Add Column"/>
+        <delcolumn
+                jcr:primaryType="nt:unstructured"
+                condition="function(editable){ return CQ.FormsCoreComponents.editorhooks.isCoreTableHeaderCell(editable); }"
+                handler="CQ.FormsCoreComponents.editorhooks.deleteTableColumn"
+                hidden="{Boolean}true"
+                icon="tableColumnRemove"
+                text="Delete Column"/>
+        <!-- <mergeheadercells
+                jcr:primaryType="nt:unstructured"
+                condition="function(editable){ return CQ.FormsCoreComponents.editorhooks.isCoreTableHeaderCell(editable); }"
+                handler="CQ.FormsCoreComponents.editorhooks.mergeTableHeaderCells"
+                hidden="{Boolean}true"
+                icon="tableMergeCells"
+                text="Merge Cells"/>
+        <splitheadercell
+                jcr:primaryType="nt:unstructured"
+                condition="function(editable){ return CQ.FormsCoreComponents.editorhooks.isMergedHeaderCell(editable); }"
+                handler="CQ.FormsCoreComponents.editorhooks.splitTableHeaderCell"
+                hidden="{Boolean}true"
+                icon="tableCellsSplit"
+                text="Split Cell"/> -->
+        <mergerowcells
+                jcr:primaryType="nt:unstructured"
+                condition="function(editable){ return CQ.FormsCoreComponents.editorhooks.isCoreTableRowCell(editable); }"
+                handler="CQ.FormsCoreComponents.editorhooks.mergeTableRowCells"
+                hidden="{Boolean}true"
+                icon="tableMergeCells"
+                text="Merge Cells"/>
+        <splitrowcell
+                jcr:primaryType="nt:unstructured"
+                condition="function(editable){ return CQ.FormsCoreComponents.editorhooks.isMergedRowCell(editable); }"
+                handler="CQ.FormsCoreComponents.editorhooks.splitTableRowCell"
+                hidden="{Boolean}true"
+                icon="tableCellsSplit"
+                text="Split Cell"/>
+        <removecolumnsorting
+                jcr:primaryType="nt:unstructured"
+                condition="function(editable){ return CQ.FormsCoreComponents.editorhooks.isCoreTableHeaderCellSortingEnabled(editable); }"
+                handler="CQ.FormsCoreComponents.editorhooks.removeColumnSorting"
+                hidden="{Boolean}true"
+                icon="filterRemove"
+                text="Remove Sorting"/>
+        <enablecolumnsorting
+                jcr:primaryType="nt:unstructured"
+                condition="function(editable){ return CQ.FormsCoreComponents.editorhooks.isCoreTableHeaderCellSortingDisabled(editable); }"
+                handler="CQ.FormsCoreComponents.editorhooks.enableColumnSorting"
+                hidden="{Boolean}true"
+                icon="filterAdd"
+                text="Enable Sorting"/>
     </cq:actionConfigs>
     <cq:inplaceEditing
             jcr:primaryType="cq:InplaceEditingConfig"
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/clientlibs/editorhook/js.txt b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/clientlibs/editorhook/js.txt
index 3c95876c44..61ff69491d 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/clientlibs/editorhook/js.txt
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/clientlibs/editorhook/js.txt
@@ -22,5 +22,6 @@ dorhook.js
 copypastehook.js
 toolbaractionhook.js
 qualifiedNameHook.js
+tableroweditorhook.js
 panelselect.js
 fragmentshook.js
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/clientlibs/editorhook/js/replacehook.js b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/clientlibs/editorhook/js/replacehook.js
index 3e3ae98578..45a9899b51 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/clientlibs/editorhook/js/replacehook.js
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/clientlibs/editorhook/js/replacehook.js
@@ -30,8 +30,10 @@
         'checkbox-group': fieldTypes.SELECT,
         'checkbox': fieldTypes.CHECKBOX,
         'date-input': fieldTypes.TEXT,
+        'datetime-input': fieldTypes.TEXT,
         'drop-down': fieldTypes.SELECT,
         'email': fieldTypes.TEXT,
+        'multiline-input': fieldTypes.TEXT,
         'number-input': fieldTypes.TEXT,
         'radio-group': fieldTypes.SELECT,
         'reset': fieldTypes.NON_INPUT,
@@ -63,7 +65,53 @@
             url: Granite.HTTP.externalize(componentPath + jsonPath),
             cache: false
         });
-        return result.responseJSON.fieldType;
+        return result.responseJSON && result.responseJSON.fieldType;
+    }
+
+    /**
+     * Component .json often omits fieldType; default resource model.json has it (used for replace matching).
+     */
+    function getTemplateFieldType(compTemplatePath) {
+        var ft = getComponentType(compTemplatePath, componentJsonPath);
+        if (ft) {
+            return ft;
+        }
+        return getComponentType(compTemplatePath, editableJsonPath);
+    }
+
+    /**
+     * Restrict replace targets to components allowed in the direct parent container (e.g. table row policy).
+     * @param {Array} allowedFromParent from author.components.computeAllowedComponents
+     * @returns {Set|null} template paths, or null to skip filtering
+     */
+    function buildAllowedTemplatePathSet(allowedFromParent) {
+        if (!allowedFromParent || !allowedFromParent.length) {
+            return null;
+        }
+        var set = new Set();
+        allowedFromParent.forEach(function (c) {
+            var tp = c.templatePath || (c.componentConfig && c.componentConfig.templatePath);
+            if (tp) {
+                set.add(tp);
+            }
+        });
+        return set.size ? set : null;
+    }
+
+    /**
+     * Inside a table row cell, allow replacing with any field allowed in the row (not only same typeMap family),
+     * e.g. text input → checkbox, while still respecting row policy and cannotBeReplacedWith.
+     */
+    function isUnderCoreTableRow(editable) {
+        var p = author.editables.getParent(editable);
+        while (p) {
+            if (typeof p.type === "string" &&
+                (p.type.indexOf("/form/tablerow/") !== -1 || p.type.indexOf("/form/tableheader/") !== -1)) {
+                return true;
+            }
+            p = author.editables.getParent(p);
+        }
+        return false;
     }
 
     window.CQ.FormsCoreComponents.editorhooks.isReplaceable = function (editable) {
@@ -93,7 +141,10 @@
             allowedComponents = author.components.computeAllowedComponents(parent, author.pageDesign),
             selectList;
 
-        var filterComponent = function (allowedComponents) {
+        var allowedTemplatePaths = buildAllowedTemplatePathSet(allowedComponents);
+        var skipTypeFamilyMatch = isUnderCoreTableRow(editable);
+
+        var filterComponent = function () {
             var editableType = getComponentType(editable.path, editableJsonPath);
             var groups = {},
                 keyword = $searchComponent[0].value,
@@ -117,8 +168,11 @@
                 if (!compTemplatePath) {
                     return;
                 }
+                if (allowedTemplatePaths && !allowedTemplatePaths.has(compTemplatePath)) {
+                    return;
+                }
                 if (!allowedCompFieldTypes[compTemplatePath]) {
-                    allowedCompFieldTypes[compTemplatePath] = getComponentType(compTemplatePath, componentJsonPath);
+                    allowedCompFieldTypes[compTemplatePath] = getTemplateFieldType(compTemplatePath);
                 }
 
                 var cfg = component.componentConfig,
@@ -131,8 +185,9 @@
                 }
 
                 if (!(keyword.length > 0) || isKeywordFound) {
-                    if ((!cannotBeReplacedWith.includes(componentType))
-                        && typeMap[editableType] === typeMap[componentType]) {
+                    var sameTypeFamily = typeMap[editableType] === typeMap[componentType];
+                    if (!cannotBeReplacedWith.includes(componentType)
+                        && (skipTypeFamilyMatch || sameTypeFamily)) {
                         performReplace = true;
                     }
 
@@ -158,17 +213,17 @@
             });
         };
 
-        var bindEventToReplaceComponentDialog = function (allowedComponents, editable) {
+        var bindEventToReplaceComponentDialog = function () {
             $searchComponent.off("keydown.replaceComponent.coral-search");
             $searchComponent.on("keydown.replaceComponent.coral-search", $.debounce(150, function (event) {
-                filterComponent(allowedComponents);
+                filterComponent();
             }));
 
             $clearButton.off("click.replaceComponent.clearButton");
             $clearButton.on("click.replaceComponent.clearButton", function () {
                 if ($searchComponent[0].value.trim().length) {
                     $searchComponent[0].value = "";
-                    filterComponent(allowedComponents);
+                    filterComponent();
                 }
             });
 
@@ -189,8 +244,8 @@
             $clearButton = $searchComponent.find('button');
             $('.' + dialogCssClass).css("min-width", "320px");
 
-            filterComponent(allowedComponents);
-            bindEventToReplaceComponentDialog(allowedComponents, editable);
+            filterComponent();
+            bindEventToReplaceComponentDialog();
             dialog.show();
         });
     }
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/clientlibs/editorhook/js/tableroweditorhook.js b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/clientlibs/editorhook/js/tableroweditorhook.js
new file mode 100644
index 0000000000..fff4994216
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/clientlibs/editorhook/js/tableroweditorhook.js
@@ -0,0 +1,1438 @@
+/*******************************************************************************
+ * Copyright 2026 Adobe
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+(function (window, author, $, Coral) {
+    "use strict";
+
+    window.CQ = window.CQ || {};
+    window.CQ.FormsCoreComponents = window.CQ.FormsCoreComponents || {};
+    window.CQ.FormsCoreComponents.editorhooks = window.CQ.FormsCoreComponents.editorhooks || {};
+
+    var RESOURCE_TYPE_TABLEROW = "core/fd/components/form/tablerow/v1/tablerow";
+    var RESOURCE_TYPE_TABLEHEADER = "core/fd/components/form/tableheader/v1/tableheader";
+    var RESOURCE_TYPE_TEXTINPUT = "core/fd/components/form/textinput/v1/textinput";
+    var RESOURCE_TYPE_TEXT_DRAW = "core/fd/components/form/text/v1/text";
+    var DELETE_ROW_DIALOG_ID = "core-forms-delete-table-row-dialog";
+    var DELETE_COLUMN_DIALOG_ID = "core-forms-delete-table-column-dialog";
+
+    function getEditableDom(editable) {
+        if (editable.dom && editable.dom.length) {
+            return editable.dom;
+        }
+        if (editable.element && editable.element.dom) {
+            return editable.element.dom;
+        }
+        return $();
+    }
+
+    /**
+     * Wrapper for the row in the authoring DOM (data vs header).
+     * @param {Granite.author.Editable} editable
+     * @returns {jQuery}
+     */
+    function getRowWrapper(editable) {
+        var $dom = $(getEditableDom(editable));
+        var $row = $dom.closest(".cmp-adaptiveform-tablerow, .cmp-adaptiveform-tableheader");
+        if ($row.length) {
+            return $row;
+        }
+        return $dom.closest(".cmp-adaptiveform-table__body > *, .cmp-adaptiveform-table__head > *");
+    }
+
+    /**
+     * Path of the row resource (direct child of table parent), not a nested cell.
+     * @param {jQuery} $row row wrapper in the authoring DOM
+     * @param {string} tableParentPath editable.getParentPath() of the selected row
+     * @returns {string|null}
+     */
+    function getRowPathUnderTableParent($row, tableParentPath) {
+        if (!$row || !$row.length || !tableParentPath) {
+            return null;
+        }
+        var normalizedParent = tableParentPath.replace(/\/$/, "");
+        var prefix = normalizedParent + "/";
+        var $cur = $row;
+        var depth;
+        for (depth = 0; depth < 20 && $cur.length; depth++) {
+            var p = $cur.attr("data-cq-data-path") ||
+                $cur.attr("data-path") ||
+                $cur.attr("data-editpath") ||
+                $cur.attr("data-ajax-viewable");
+            if (typeof p === "string") {
+                try {
+                    p = decodeURIComponent(p);
+                } catch (e) {
+                    // ignore
+                }
+                if (p.indexOf(prefix) === 0) {
+                    var rest = p.substring(prefix.length);
+                    if (rest.indexOf("/") === -1) {
+                        return p;
+                    }
+                }
+            }
+            $cur = $cur.parent();
+        }
+        return null;
+    }
+
+    /**
+     * Ordered child node names under the table parent (JCR order from Sling .1.json).
+     * Supports direct children, :items + :itemsOrder (responsive / container JSON).
+     * @param {object} parentJson
+     * @returns {string[]}
+     */
+    function getOrderedChildResourceNames(parentJson) {
+        if (!parentJson || typeof parentJson !== "object") {
+            return [];
+        }
+        function isResourceChild(key, obj) {
+            if (!key || key.indexOf("jcr:") === 0 || key.indexOf("sling:") === 0 || key.indexOf("cq:") === 0) {
+                return false;
+            }
+            if (key.charAt(0) === ":") {
+                return false;
+            }
+            var v = obj[key];
+            return !!(v && typeof v === "object" && !Array.isArray(v) && v["sling:resourceType"]);
+        }
+        var container = parentJson[":items"] && typeof parentJson[":items"] === "object"
+            ? parentJson[":items"]
+            : parentJson;
+        var order = parentJson[":itemsOrder"];
+        if (Array.isArray(order) && order.length) {
+            return order.filter(function (key) {
+                return isResourceChild(key, container);
+            });
+        }
+        var names = [];
+        Object.keys(container).forEach(function (key) {
+            if (isResourceChild(key, container)) {
+                names.push(key);
+            }
+        });
+        if (names.length === 0 && parentJson[":items"] && container === parentJson[":items"]) {
+            Object.keys(parentJson).forEach(function (key) {
+                if (isResourceChild(key, parentJson)) {
+                    names.push(key);
+                }
+            });
+        }
+        return names;
+    }
+
+    /**
+     * When DOM has no path on sibling wrappers, resolve neighbor name from repository order.
+     * @param {string} tableParentPath
+     * @param {Granite.author.Editable} editable
+     * @param {"up"|"down"} direction
+     * @returns {jQuery.jqXHR|JQuery.Promise}
+     */
+    function fetchNeighborNameFromParentJson(tableParentPath, editable, direction) {
+        var myName = editable.path.substring(editable.path.lastIndexOf("/") + 1);
+        return $.ajax({
+            url: Granite.HTTP.externalize(tableParentPath + ".1.json"),
+            type: "GET",
+            dataType: "json",
+            cache: false
+        }).then(function (json) {
+            var names = getOrderedChildResourceNames(json);
+            var idx = names.indexOf(myName);
+            if (idx < 0) {
+                return null;
+            }
+            if (direction === "up") {
+                return idx > 0 ? names[idx - 1] : null;
+            }
+            if (direction === "down") {
+                return idx < names.length - 1 ? names[idx + 1] : null;
+            }
+            return null;
+        });
+    }
+
+    /**
+     * Neighbor row node name for Sling :order (DOM first, then parent .1.json).
+     * @param {Granite.author.Editable} editable
+     * @param {"up"|"down"} direction
+     * @returns {jQuery.Promise<string|null>}
+     */
+    function resolveNeighborRowName(editable, direction) {
+        var tableParentPath = editable.getParentPath();
+        var $row = getRowWrapper(editable);
+        var $sibling = direction === "up" ? $row.prev() : $row.next();
+        var siblingPath = getRowPathUnderTableParent($sibling, tableParentPath);
+        if (siblingPath) {
+            return $.when(siblingPath.substring(siblingPath.lastIndexOf("/") + 1));
+        }
+        return fetchNeighborNameFromParentJson(tableParentPath, editable, direction);
+    }
+
+    function isTableHeaderRow(editable) {
+        var rt = editable.type;
+        if (typeof rt === "string" && rt.indexOf("tableheader") !== -1) {
+            return true;
+        }
+        return $(getEditableDom(editable)).closest(".cmp-adaptiveform-tableheader").length > 0;
+    }
+
+    /**
+     * @param {Granite.author.Editable} editable
+     * @returns {boolean} true if this is the table header row (delete/move must stay disabled).
+     */
+    window.CQ.FormsCoreComponents.editorhooks.isCoreTableHeaderRow = function (editable) {
+        return isTableHeaderRow(editable);
+    };
+
+    /**
+     * Number of header rows under the table (each tableheader renders a tr.cmp-adaptiveform-tableheader).
+     * @param {Granite.author.Editable} editable
+     * @returns {number}
+     */
+    function countCoreTableHeaderRowsInDom(editable) {
+        var $dom = $(getEditableDom(editable));
+        var $table = $dom.closest(".cmp-adaptiveform-table");
+        if (!$table.length) {
+            return 0;
+        }
+        return $table.find(".cmp-adaptiveform-table__head .cmp-adaptiveform-tableheader").length;
+    }
+
+    /**
+     * True when the selected row is a header row and another header row exists (delete allowed).
+     * @param {Granite.author.Editable} editable
+     * @returns {boolean}
+     */
+    window.CQ.FormsCoreComponents.editorhooks.canDeleteCoreTableHeaderRow = function (editable) {
+        if (!isTableHeaderRow(editable)) {
+            return false;
+        }
+        return countCoreTableHeaderRowsInDom(editable) > 1;
+    };
+
+    /**
+     * @param {Granite.author.Editable} editable
+     * @returns {boolean} true if the row cannot move up (first data row or header).
+     */
+    window.CQ.FormsCoreComponents.editorhooks.isFirstCoreTableRow = function (editable) {
+        if (isTableHeaderRow(editable)) {
+            return true;
+        }
+        var $row = getRowWrapper(editable);
+        return $row.prev().length === 0;
+    };
+
+    /**
+     * @param {Granite.author.Editable} editable
+     * @returns {boolean} true if the row cannot move down (last row or header).
+     */
+    window.CQ.FormsCoreComponents.editorhooks.isLastCoreTableRow = function (editable) {
+        if (isTableHeaderRow(editable)) {
+            return true;
+        }
+        var $row = getRowWrapper(editable);
+        return $row.is(":last-child");
+    };
+
+    function getSlingOrderParam() {
+        if (Granite.Sling && Granite.Sling.ORDER) {
+            return Granite.Sling.ORDER;
+        }
+        if (window.CQ && CQ.Sling && CQ.Sling.ORDER) {
+            return CQ.Sling.ORDER;
+        }
+        return "sling:order";
+    }
+
+    function getDeleteParams() {
+        var p = { "_charset_": "UTF-8" };
+        if (Granite.Sling && Granite.Sling.OPERATION) {
+            p[Granite.Sling.STATUS] = Granite.Sling.STATUS_BROWSER;
+            p[Granite.Sling.OPERATION] = Granite.Sling.OPERATION_DELETE;
+        } else if (window.CQ && CQ.Sling && CQ.Sling.OPERATION) {
+            p[CQ.Sling.STATUS] = CQ.Sling.STATUS_BROWSER;
+            p[CQ.Sling.OPERATION] = CQ.Sling.OPERATION_DELETE;
+        } else {
+            p["sling:status"] = "browser";
+            p[":operation"] = "delete";
+        }
+        return p;
+    }
+
+    function refreshParentTable(editable) {
+        var tableEditable = Granite.author.editables.getParent(editable);
+        if (tableEditable) {
+            tableEditable.refresh();
+        }
+    }
+
+    /**
+     * Logical column span for one header cell (native colspan or legacy data-colspan).
+     * @param {jQuery} $cell .cmp-adaptiveform-tablehead element
+     * @returns {number}
+     */
+    function getTableHeadCellColspan($cell) {
+        var cs = parseInt($cell.attr("data-colspan"), 10);
+        if (isNaN(cs) || cs < 1) {
+            cs = parseInt($cell.attr("colspan"), 10);
+        }
+        return isNaN(cs) || cs < 1 ? 1 : cs;
+    }
+
+    /**
+     * Sum of colspans for a set of header cells (logical table width).
+     * @param {jQuery} $headerCells
+     * @returns {number}
+     */
+    function sumTableHeadCellColspans($headerCells) {
+        var total = 0;
+        if (!$headerCells || !$headerCells.length) {
+            return 0;
+        }
+        $headerCells.each(function () {
+            total += getTableHeadCellColspan($(this));
+        });
+        return total;
+    }
+
+    /**
+     * Number of logical columns: first header row's colspan sum, else cell count from the data row.
+     * @param {Granite.author.Editable} editable selected table row
+     * @returns {number}
+     */
+    function getColumnCount(editable) {
+        var $dom = $(getEditableDom(editable));
+        var $table = $dom.closest(".cmp-adaptiveform-table");
+        var $firstHeaderRow = $table.find(".cmp-adaptiveform-table__head .cmp-adaptiveform-tableheader").first();
+        var fromHeader = sumTableHeadCellColspans($firstHeaderRow.find(".cmp-adaptiveform-tablehead"));
+        if (fromHeader > 0) {
+            return fromHeader;
+        }
+        var $dataRow = $dom.closest(".cmp-adaptiveform-tablerow");
+        var rowCells = $dataRow.length ? $dataRow.find(".cmp-adaptiveform-tablecell").length : 0;
+        if (rowCells > 0) {
+            return rowCells;
+        }
+        rowCells = $dom.find(".cmp-adaptiveform-tablecell").length;
+        return rowCells > 0 ? rowCells : 1;
+    }
+
+    /**
+     * JSON for a new tablerow matching core table defaults (see table _cq_template / examples).
+     * @param {number} numCols
+     * @returns {object}
+     */
+    function buildRowContent(numCols) {
+        var baseTime = Date.now();
+        var content = {
+            "jcr:primaryType": "nt:unstructured",
+            "sling:resourceType": RESOURCE_TYPE_TABLEROW,
+            "fieldType": "panel",
+            "jcr:title": Granite.I18n.get("Row")
+        };
+        var i;
+        for (i = 0; i < numCols; i++) {
+            var cellName = "cell" + baseTime + "_" + i;
+            content[cellName] = {
+                "jcr:primaryType": "nt:unstructured",
+                "sling:resourceType": RESOURCE_TYPE_TEXTINPUT,
+                "fieldType": "text-input"
+            };
+        }
+        return content;
+    }
+
+    /**
+     * Column count for the header row that contains the selection (for new header rows).
+     * @param {Granite.author.Editable} editable
+     * @returns {number}
+     */
+    function getHeaderRowColumnCount(editable) {
+        var $row = getRowWrapper(editable);
+        var fromRow = sumTableHeadCellColspans($row.find(".cmp-adaptiveform-tablehead"));
+        if (fromRow > 0) {
+            return fromRow;
+        }
+        var $table = $(getEditableDom(editable)).closest(".cmp-adaptiveform-table");
+        var $firstHeadRow = $table.find(".cmp-adaptiveform-table__widget > .cmp-adaptiveform-table__head .cmp-adaptiveform-tableheader").first();
+        var fallback = sumTableHeadCellColspans($firstHeadRow.find(".cmp-adaptiveform-tablehead"));
+        return fallback > 0 ? fallback : 1;
+    }
+
+    /**
+     * JSON for a new table header row (plain-text header cells), matching table _cq_template.
+     * @param {number} numCols
+     * @returns {object}
+     */
+    function buildHeaderRowContent(numCols) {
+        var baseTime = Date.now();
+        var content = {
+            "jcr:primaryType": "nt:unstructured",
+            "sling:resourceType": RESOURCE_TYPE_TABLEHEADER,
+            "fieldType": "panel",
+            "jcr:title": Granite.I18n.get("Header Row")
+        };
+        var i;
+        for (i = 0; i < numCols; i++) {
+            var uid = baseTime + "_" + i;
+            var cellName = "column_" + uid;
+            content[cellName] = buildHeaderTextColumnJson(uid);
+        }
+        return content;
+    }
+
+    /**
+     * Inserts a new table row after the selected row (same parent path, Sling import + order).
+     * @param {Granite.author.Editable} editable selected core tablerow
+     */
+    window.CQ.FormsCoreComponents.editorhooks.addTableRow = function (editable) {
+        var tableParentPath = editable.getParentPath();
+        var selectedNodeName = editable.path.substring(editable.path.lastIndexOf("/") + 1);
+        var newNodePath = tableParentPath + "/row" + Date.now();
+        var numCols = getColumnCount(editable);
+        var templateJson = buildRowContent(numCols);
+        var importParams = {
+            "_charset_": "UTF-8",
+            ":operation": "import",
+            ":contentType": "json",
+            ":replace": true,
+            ":replaceProperties": true,
+            ":content": JSON.stringify(templateJson)
+        };
+        var orderKey = getSlingOrderParam();
+        var orderParams = { "_charset_": "UTF-8" };
+        orderParams[orderKey] = "after " + selectedNodeName;
+
+        $.ajax({
+            url: Granite.HTTP.externalize(newNodePath),
+            type: "POST",
+            data: importParams
+        }).then(function () {
+            return $.ajax({
+                url: Granite.HTTP.externalize(newNodePath),
+                type: "POST",
+                data: orderParams
+            });
+        }).done(function () {
+            refreshParentTable(editable);
+        }).fail(function () {
+            author.ui.helpers.notify({
+                content: Granite.I18n.get("Failed to add table row."),
+                type: author.ui.helpers.NOTIFICATION_TYPES.ERROR
+            });
+        });
+    };
+
+    /**
+     * Deletes the selected data row after confirmation (header row is gated via edit config condition).
+     * @param {Granite.author.Editable} editable
+     */
+    window.CQ.FormsCoreComponents.editorhooks.deleteTableRow = function (editable) {
+        var rowPath = editable.path;
+        var tableEditable = Granite.author.editables.getParent(editable);
+
+        $("#" + DELETE_ROW_DIALOG_ID).remove();
+
+        var dialog = new Coral.Dialog().set({
+            id: DELETE_ROW_DIALOG_ID,
+            header: {
+                innerHTML: Granite.I18n.get("Delete Row")
+            },
+            content: {
+                innerHTML: Granite.I18n.get("Do you want to delete the selected row?")
+            },
+            footer: {},
+            closable: "on"
+        });
+
+        var yesBtn = new Coral.Button();
+        yesBtn.label.textContent = Granite.I18n.get("Yes");
+        yesBtn.variant = Coral.Button.variant.PRIMARY;
+        yesBtn.on("click", function () {
+            $.ajax({
+                url: Granite.HTTP.externalize(rowPath),
+                type: "POST",
+                data: getDeleteParams()
+            }).done(function () {
+                if (tableEditable) {
+                    tableEditable.refresh();
+                }
+            }).fail(function () {
+                author.ui.helpers.notify({
+                    content: Granite.I18n.get("Failed to delete table row."),
+                    type: author.ui.helpers.NOTIFICATION_TYPES.ERROR
+                });
+            });
+            dialog.hide();
+            dialog.remove();
+        });
+
+        var noBtn = new Coral.Button();
+        noBtn.label.textContent = Granite.I18n.get("No");
+        noBtn.on("click", function () {
+            dialog.hide();
+            dialog.remove();
+        });
+
+        dialog.footer.appendChild(yesBtn);
+        dialog.footer.appendChild(noBtn);
+        document.body.appendChild(dialog);
+        dialog.show();
+    };
+
+    /**
+     * Moves the row up (Sling order before previous sibling row).
+     * @param {Granite.author.Editable} editable
+     */
+    window.CQ.FormsCoreComponents.editorhooks.moveTableRowUp = function (editable) {
+        resolveNeighborRowName(editable, "up").done(function (neighborName) {
+            if (!neighborName) {
+                author.ui.helpers.notify({
+                    content: Granite.I18n.get("Could not resolve the previous row for reorder."),
+                    type: author.ui.helpers.NOTIFICATION_TYPES.ERROR
+                });
+                return;
+            }
+            var orderKey = getSlingOrderParam();
+            var orderParams = { "_charset_": "UTF-8" };
+            orderParams[orderKey] = "before " + neighborName;
+
+            $.ajax({
+                url: Granite.HTTP.externalize(editable.path),
+                type: "POST",
+                data: orderParams
+            }).done(function () {
+                refreshParentTable(editable);
+            }).fail(function () {
+                author.ui.helpers.notify({
+                    content: Granite.I18n.get("Failed to move table row."),
+                    type: author.ui.helpers.NOTIFICATION_TYPES.ERROR
+                });
+            });
+        }).fail(function () {
+            author.ui.helpers.notify({
+                content: Granite.I18n.get("Could not resolve the previous row for reorder."),
+                type: author.ui.helpers.NOTIFICATION_TYPES.ERROR
+            });
+        });
+    };
+
+    /**
+     * Moves the row down (Sling order after next sibling row).
+     * @param {Granite.author.Editable} editable
+     */
+    window.CQ.FormsCoreComponents.editorhooks.moveTableRowDown = function (editable) {
+        resolveNeighborRowName(editable, "down").done(function (neighborName) {
+            if (!neighborName) {
+                author.ui.helpers.notify({
+                    content: Granite.I18n.get("Could not resolve the next row for reorder."),
+                    type: author.ui.helpers.NOTIFICATION_TYPES.ERROR
+                });
+                return;
+            }
+            var orderKey = getSlingOrderParam();
+            var orderParams = { "_charset_": "UTF-8" };
+            orderParams[orderKey] = "after " + neighborName;
+
+            $.ajax({
+                url: Granite.HTTP.externalize(editable.path),
+                type: "POST",
+                data: orderParams
+            }).done(function () {
+                refreshParentTable(editable);
+            }).fail(function () {
+                author.ui.helpers.notify({
+                    content: Granite.I18n.get("Failed to move table row."),
+                    type: author.ui.helpers.NOTIFICATION_TYPES.ERROR
+                });
+            });
+        }).fail(function () {
+            author.ui.helpers.notify({
+                content: Granite.I18n.get("Could not resolve the next row for reorder."),
+                type: author.ui.helpers.NOTIFICATION_TYPES.ERROR
+            });
+        });
+    };
+
+    var MERGE_HEADER_CELLS_DIALOG_ID = "core-forms-merge-header-cells-dialog";
+    var SPLIT_HEADER_CELL_DIALOG_ID = "core-forms-split-header-cell-dialog";
+
+    /**
+     * Returns the header cell colspan from .cmp-adaptiveform-tablehead (data-colspan or native colspan).
+     * data-colspan (edit mode div) or native colspan (publish mode <th>).
+     * @param {Granite.author.Editable} editable
+     * @returns {number}
+     */
+    function getHeaderCellColspan(editable) {
+        var $wrapper = $(getEditableDom(editable)).closest(".cmp-adaptiveform-tablehead");
+        return getTableHeadCellColspan($wrapper);
+    }
+
+    /**
+     * True when the editable is inside a core table header column (any component type).
+     * Matches the body-cell symmetry: actions are based on DOM context, not resource type,
+     * so example-layer wrappers (forms-components-examples/components/form/text) work too.
+     * @param {Granite.author.Editable} editable
+     * @returns {boolean}
+     */
+    window.CQ.FormsCoreComponents.editorhooks.isCoreTableHeaderCell = function (editable) {
+        if (!editable || typeof editable.type !== "string") {
+            return false;
+        }
+        return $(getEditableDom(editable)).closest(".cmp-adaptiveform-table__head").length > 0;
+    };
+
+    function getTableEditableFromHeaderCellText(editable) {
+        var headerEditable = Granite.author.editables.getParent(editable);
+        if (!headerEditable) {
+            return null;
+        }
+        return Granite.author.editables.getParent(headerEditable);
+    }
+
+    function fetchOrderedChildNames(parentPath) {
+        return $.ajax({
+            url: Granite.HTTP.externalize(parentPath + ".1.json"),
+            type: "GET",
+            dataType: "json",
+            cache: false
+        }).then(function (json) {
+            return getOrderedChildResourceNames(json);
+        });
+    }
+
+    function getResourceTypeFromTableJson(tableJson, nodeName) {
+        var container = tableJson[":items"] && typeof tableJson[":items"] === "object"
+            ? tableJson[":items"]
+            : tableJson;
+        var item = container[nodeName];
+        return item && item["sling:resourceType"] ? item["sling:resourceType"] : null;
+    }
+
+    function buildHeaderTextColumnJson(uniqueSuffix) {
+        return {
+            "jcr:primaryType": "nt:unstructured",
+            "sling:resourceType": RESOURCE_TYPE_TEXT_DRAW,
+            "fieldType": "plain-text",
+            "jcr:title": Granite.I18n.get("Column"),
+            "name": "column_" + uniqueSuffix,
+            "value": Granite.I18n.get("Column")
+        };
+    }
+
+    function buildBodyTextInputJson() {
+        return {
+            "jcr:primaryType": "nt:unstructured",
+            "sling:resourceType": RESOURCE_TYPE_TEXTINPUT,
+            "fieldType": "text-input",
+        };
+    }
+
+    function postImportAndOrderAfter(targetPath, jsonContent, orderAfterNodeName) {
+        var importParams = {
+            "_charset_": "UTF-8",
+            ":operation": "import",
+            ":contentType": "json",
+            ":replace": true,
+            ":replaceProperties": true,
+            ":content": JSON.stringify(jsonContent)
+        };
+        var orderKey = getSlingOrderParam();
+        var orderParams = { "_charset_": "UTF-8" };
+        orderParams[orderKey] = "after " + orderAfterNodeName;
+        return $.ajax({
+            url: Granite.HTTP.externalize(targetPath),
+            type: "POST",
+            data: importParams
+        }).then(function () {
+            return $.ajax({
+                url: Granite.HTTP.externalize(targetPath),
+                type: "POST",
+                data: orderParams
+            });
+        });
+    }
+
+    /**
+     * Adds a column to the right of the selected header cell (new header label + one cell per body row).
+     * @param {Granite.author.Editable} editable selected header text field
+     */
+    window.CQ.FormsCoreComponents.editorhooks.addTableColumn = function (editable) {
+        var headerPath = editable.getParentPath();
+        var tablePath = headerPath.substring(0, headerPath.lastIndexOf("/"));
+        var selectedCellName = editable.path.substring(editable.path.lastIndexOf("/") + 1);
+        var tableEditable = getTableEditableFromHeaderCellText(editable);
+
+        fetchOrderedChildNames(headerPath).done(function (headerOrder) {
+            var colIndex = headerOrder.indexOf(selectedCellName);
+            if (colIndex < 0) {
+                author.ui.helpers.notify({
+                    content: Granite.I18n.get("Could not resolve the selected column."),
+                    type: author.ui.helpers.NOTIFICATION_TYPES.ERROR
+                });
+                return;
+            }
+            var orderAfterName = headerOrder[colIndex];
+            var uid = Date.now();
+            var newHeaderName = "column_" + uid;
+            var newHeaderPath = headerPath + "/" + newHeaderName;
+
+            postImportAndOrderAfter(newHeaderPath, buildHeaderTextColumnJson(uid), orderAfterName)
+                .then(function () {
+                    return $.ajax({
+                        url: Granite.HTTP.externalize(tablePath + ".1.json"),
+                        type: "GET",
+                        dataType: "json",
+                        cache: false
+                    });
+                })
+                .then(function (tableJson) {
+                    var rowNames = getOrderedChildResourceNames(tableJson);
+                    var chain = $.when();
+                    var dataRowIndex = 0;
+                    rowNames.forEach(function (rowName) {
+                        var rt = getResourceTypeFromTableJson(tableJson, rowName);
+                        if (rt !== RESOURCE_TYPE_TABLEROW) {
+                            return;
+                        }
+                        var rowPath = tablePath + "/" + rowName;
+                        (function (rp, rIndex) {
+                            chain = chain.then(function () {
+                                return fetchOrderedChildNames(rp).then(function (cellNames) {
+                                    if (colIndex < 0 || colIndex >= cellNames.length) {
+                                        return $.when();
+                                    }
+                                    var afterCell = cellNames[colIndex];
+                                    var newCellName = "cell_" + uid + "_" + rIndex;
+                                    var newCellPath = rp + "/" + newCellName;
+                                    return postImportAndOrderAfter(
+                                        newCellPath,
+                                        buildBodyTextInputJson(),
+                                        afterCell
+                                    );
+                                });
+                            });
+                        })(rowPath, dataRowIndex);
+                        dataRowIndex += 1;
+                    });
+                    return chain;
+                })
+                .done(function () {
+                    if (tableEditable) {
+                        tableEditable.refresh();
+                    }
+                })
+                .fail(function () {
+                    author.ui.helpers.notify({
+                        content: Granite.I18n.get("Failed to add table column."),
+                        type: author.ui.helpers.NOTIFICATION_TYPES.ERROR
+                    });
+                });
+        }).fail(function () {
+            author.ui.helpers.notify({
+                content: Granite.I18n.get("Failed to read table header."),
+                type: author.ui.helpers.NOTIFICATION_TYPES.ERROR
+            });
+        });
+    };
+
+    /**
+     * Deletes the column for the selected header cell (header label + same index cell in each body row).
+     * @param {Granite.author.Editable} editable selected header text field
+     */
+    window.CQ.FormsCoreComponents.editorhooks.deleteTableColumn = function (editable) {
+        var headerPath = editable.getParentPath();
+        var tablePath = headerPath.substring(0, headerPath.lastIndexOf("/"));
+        var selectedCellName = editable.path.substring(editable.path.lastIndexOf("/") + 1);
+        var tableEditable = getTableEditableFromHeaderCellText(editable);
+
+        fetchOrderedChildNames(headerPath).done(function (headerOrder) {
+            if (headerOrder.length <= 1) {
+                author.ui.helpers.notify({
+                    content: Granite.I18n.get("The table must keep at least one column."),
+                    type: author.ui.helpers.NOTIFICATION_TYPES.INFO
+                });
+                return;
+            }
+            var colIndex = headerOrder.indexOf(selectedCellName);
+            if (colIndex < 0) {
+                author.ui.helpers.notify({
+                    content: Granite.I18n.get("Could not resolve the selected column."),
+                    type: author.ui.helpers.NOTIFICATION_TYPES.ERROR
+                });
+                return;
+            }
+
+            $("#" + DELETE_COLUMN_DIALOG_ID).remove();
+
+            var dialog = new Coral.Dialog().set({
+                id: DELETE_COLUMN_DIALOG_ID,
+                header: {
+                    innerHTML: Granite.I18n.get("Delete Column")
+                },
+                content: {
+                    innerHTML: Granite.I18n.get("Do you want to delete the selected column from the table?")
+                },
+                footer: {},
+                closable: "on"
+            });
+
+            var yesBtn = new Coral.Button();
+            yesBtn.label.textContent = Granite.I18n.get("Yes");
+            yesBtn.variant = Coral.Button.variant.PRIMARY;
+            yesBtn.on("click", function () {
+                var headerCellPath = headerPath + "/" + selectedCellName;
+
+                $.ajax({
+                    url: Granite.HTTP.externalize(headerCellPath),
+                    type: "POST",
+                    data: getDeleteParams()
+                }).then(function () {
+                    return $.ajax({
+                        url: Granite.HTTP.externalize(tablePath + ".1.json"),
+                        type: "GET",
+                        dataType: "json",
+                        cache: false
+                    });
+                }).then(function (tableJson) {
+                    var rowNames = getOrderedChildResourceNames(tableJson);
+                    var chain = $.when();
+                    rowNames.forEach(function (rowName) {
+                        var rt = getResourceTypeFromTableJson(tableJson, rowName);
+                        if (rt !== RESOURCE_TYPE_TABLEROW) {
+                            return;
+                        }
+                        var rowPath = tablePath + "/" + rowName;
+                        chain = chain.then(function () {
+                            return fetchOrderedChildNames(rowPath).then(function (cellNames) {
+                                if (colIndex >= cellNames.length) {
+                                    return $.when();
+                                }
+                                var cellToRemove = rowPath + "/" + cellNames[colIndex];
+                                return $.ajax({
+                                    url: Granite.HTTP.externalize(cellToRemove),
+                                    type: "POST",
+                                    data: getDeleteParams()
+                                });
+                            });
+                        });
+                    });
+                    return chain;
+                }).done(function () {
+                    if (tableEditable) {
+                        tableEditable.refresh();
+                    }
+                }).fail(function () {
+                    author.ui.helpers.notify({
+                        content: Granite.I18n.get("Failed to delete table column."),
+                        type: author.ui.helpers.NOTIFICATION_TYPES.ERROR
+                    });
+                });
+
+                dialog.hide();
+                dialog.remove();
+            });
+
+            var noBtn = new Coral.Button();
+            noBtn.label.textContent = Granite.I18n.get("No");
+            noBtn.on("click", function () {
+                dialog.hide();
+                dialog.remove();
+            });
+
+            dialog.footer.appendChild(yesBtn);
+            dialog.footer.appendChild(noBtn);
+            document.body.appendChild(dialog);
+            dialog.show();
+        }).fail(function () {
+            author.ui.helpers.notify({
+                content: Granite.I18n.get("Failed to read table header."),
+                type: author.ui.helpers.NOTIFICATION_TYPES.ERROR
+            });
+        });
+    };
+    /**
+     * True when the header cell has a colspan > 1 (has been merged).
+     * Used as the condition for the "Split Cell" action config.
+     * @param {Granite.author.Editable} editable
+     * @returns {boolean}
+     */
+    window.CQ.FormsCoreComponents.editorhooks.isMergedHeaderCell = function (editable) {
+        if (!window.CQ.FormsCoreComponents.editorhooks.isCoreTableHeaderCell(editable)) {
+            return false;
+        }
+        return getHeaderCellColspan(editable) > 1;
+    };
+
+    /**
+     * Merges 2+ consecutive, same-row selected header cells into one by:
+     * - summing their colspan values
+     * - deleting all but the first (DOM-order) cell
+     * - posting the total colspan to the first cell
+     * @param {Granite.author.Editable} editable
+     */
+    window.CQ.FormsCoreComponents.editorhooks.mergeTableHeaderCells = function (editable) {
+        var currentSelectionItems = Granite.author.selection.getAllSelected();
+        var selectedCount = currentSelectionItems ? currentSelectionItems.length : 0;
+
+        function showError(message) {
+            $("#" + MERGE_HEADER_CELLS_DIALOG_ID).remove();
+            var dialog = new Coral.Dialog().set({
+                id: MERGE_HEADER_CELLS_DIALOG_ID,
+                header: { innerHTML: Granite.I18n.get("Invalid Selection") },
+                content: { innerHTML: Granite.I18n.get(message) },
+                footer: {
+                    innerHTML: '<button is="coral-button" variant="primary" coral-close>' + Granite.I18n.get("Ok") + '</button>'
+                },
+                closable: "on",
+                variant: "error"
+            });
+            document.body.appendChild(dialog);
+            dialog.show();
+        }
+
+        if (!currentSelectionItems || selectedCount < 2) {
+            showError("Select two or more header cells to merge.");
+            return;
+        }
+
+        // All selected items must be header cells
+        var allHeaderCells = currentSelectionItems.every(function (item) {
+            return window.CQ.FormsCoreComponents.editorhooks.isCoreTableHeaderCell(item);
+        });
+        if (!allHeaderCells) {
+            showError("All selected cells must be table header cells.");
+            return;
+        }
+
+        // All must share the same parent header row path
+        var firstParentPath = currentSelectionItems[0].getParentPath();
+        var allSameRow = currentSelectionItems.every(function (item) {
+            return item.getParentPath() === firstParentPath;
+        });
+        if (!allSameRow) {
+            showError("All selected cells must be in the same header row.");
+            return;
+        }
+
+        // Determine DOM order within the header row and verify cells are consecutive.
+        // In edit mode the row is a decoration div with class cmp-adaptiveform-tableheader
+        // (no data-cmp-is attribute — that only exists in publish mode <tr>).
+        var $headerRow = $(getEditableDom(currentSelectionItems[0]))
+            .closest(".cmp-adaptiveform-tableheader");
+        var $allWrappers = $headerRow.find(".cmp-adaptiveform-tablehead");
+
+        var indices = currentSelectionItems.map(function (item) {
+            return $allWrappers.index($(getEditableDom(item)).closest(".cmp-adaptiveform-tablehead"));
+        }).sort(function (a, b) { return a - b; });
+
+        var isConsecutive = indices.every(function (idx, i) {
+            return i === 0 || idx === indices[i - 1] + 1;
+        });
+        if (!isConsecutive) {
+            showError("Select consecutive header cells in the same row to merge.");
+            return;
+        }
+
+        // Re-sort items by DOM index so the first in DOM order is kept
+        var sortedItems = currentSelectionItems.slice().sort(function (a, b) {
+            var aIdx = $allWrappers.index($(getEditableDom(a)).closest(".cmp-adaptiveform-tablehead"));
+            var bIdx = $allWrappers.index($(getEditableDom(b)).closest(".cmp-adaptiveform-tablehead"));
+            return aIdx - bIdx;
+        });
+
+        var firstItem = sortedItems[0];
+        var firstCellPath = firstItem.path;
+        var totalColspan = 0;
+        sortedItems.forEach(function (item) {
+            totalColspan += getHeaderCellColspan(item);
+        });
+
+        var deleteParams = getDeleteParams();
+        var chain = $.when();
+
+        // Delete all cells except the first (in DOM order)
+        sortedItems.slice(1).forEach(function (item) {
+            var itemPath = item.path;
+            chain = chain.then(function () {
+                return $.ajax({
+                    url: Granite.HTTP.externalize(itemPath),
+                    type: "POST",
+                    data: deleteParams
+                });
+            });
+        });
+
+        // Set the accumulated colspan on the surviving first cell
+        chain = chain.then(function () {
+            return $.ajax({
+                url: Granite.HTTP.externalize(firstCellPath),
+                type: "POST",
+                data: { "_charset_": "UTF-8", "colspan": String(totalColspan) }
+            });
+        }).done(function () {
+            var tableEditable = getTableEditableFromHeaderCellText(firstItem);
+            if (tableEditable) {
+                tableEditable.refresh();
+            }
+        }).fail(function () {
+            author.ui.helpers.notify({
+                content: Granite.I18n.get("Failed to merge header cells."),
+                type: author.ui.helpers.NOTIFICATION_TYPES.ERROR
+            });
+        });
+    };
+
+    /**
+     * Splits a merged header cell (colspan > 1) back into individual cells by:
+     * - removing the colspan property from the current cell
+     * - inserting (colspan - 1) new header text cells immediately after it
+     * @param {Granite.author.Editable} editable
+     */
+    window.CQ.FormsCoreComponents.editorhooks.splitTableHeaderCell = function (editable) {
+        var colSpan = getHeaderCellColspan(editable);
+
+        if (colSpan <= 1) {
+            $("#" + SPLIT_HEADER_CELL_DIALOG_ID).remove();
+            var dialog = new Coral.Dialog().set({
+                id: SPLIT_HEADER_CELL_DIALOG_ID,
+                header: { innerHTML: Granite.I18n.get("Invalid Selection") },
+                content: { innerHTML: Granite.I18n.get("Select a merged cell to split.") },
+                footer: {
+                    innerHTML: '<button is="coral-button" variant="primary" coral-close>' + Granite.I18n.get("Ok") + '</button>'
+                },
+                closable: "on",
+                variant: "error"
+            });
+            document.body.appendChild(dialog);
+            dialog.show();
+            return;
+        }
+
+        var cellPath = editable.path;
+        var headerPath = editable.getParentPath();
+        var cellName = cellPath.substring(cellPath.lastIndexOf("/") + 1);
+        var tableEditable = getTableEditableFromHeaderCellText(editable);
+        var numNewCells = colSpan - 1;
+
+        // Pre-build the new cell descriptors so each closure captures the right values
+        var uid = Date.now();
+        var cellsToCreate = [];
+        for (var i = 0; i < numNewCells; i++) {
+            var suffix = uid + "_" + i;
+            var newName = "column_" + suffix;
+            cellsToCreate.push({
+                name: newName,
+                path: headerPath + "/" + newName,
+                content: buildHeaderTextColumnJson(suffix)
+            });
+        }
+
+        // Remove the colspan property from the current cell, then insert new cells sequentially
+        $.ajax({
+            url: Granite.HTTP.externalize(cellPath),
+            type: "POST",
+            data: { "_charset_": "UTF-8", "colspan@Delete": "true" }
+        }).then(function () {
+            var chain = $.when();
+            cellsToCreate.forEach(function (cell, i) {
+                var orderAfter = i === 0 ? cellName : cellsToCreate[i - 1].name;
+                chain = chain.then(function () {
+                    return postImportAndOrderAfter(cell.path, cell.content, orderAfter);
+                });
+            });
+            return chain;
+        }).done(function () {
+            if (tableEditable) {
+                tableEditable.refresh();
+            }
+        }).fail(function () {
+            author.ui.helpers.notify({
+                content: Granite.I18n.get("Failed to split header cell."),
+                type: author.ui.helpers.NOTIFICATION_TYPES.ERROR
+            });
+        });
+    };
+
+    // ─── Body-row cell merge / split ────────────────────────────────────────────
+
+    var MERGE_ROW_CELLS_DIALOG_ID = "core-forms-merge-row-cells-dialog";
+    var SPLIT_ROW_CELL_DIALOG_ID = "core-forms-split-row-cell-dialog";
+
+    /**
+     * Returns the body-row cell colspan from .cmp-adaptiveform-tablecell
+     * (native colspan attribute set in edit mode via data-sly-attribute).
+     * @param {Granite.author.Editable} editable
+     * @returns {number}
+     */
+    function getRowCellColspan(editable) {
+        var $td = $(getEditableDom(editable)).closest(".cmp-adaptiveform-tablecell");
+        var cs = parseInt($td.attr("colspan"), 10);
+        return isNaN(cs) || cs < 1 ? 1 : cs;
+    }
+
+    /**
+     * True when the editable is Adaptive Form Text-Input (or any field) inside a
+     * body table-row cell (not a header cell).
+     * @param {Granite.author.Editable} editable
+     * @returns {boolean}
+     */
+    window.CQ.FormsCoreComponents.editorhooks.isCoreTableRowCell = function (editable) {
+        if (!editable || typeof editable.type !== "string") {
+            return false;
+        }
+        var $dom = $(getEditableDom(editable));
+        return $dom.closest(".cmp-adaptiveform-table__body").length > 0
+            && $dom.closest(".cmp-adaptiveform-tablecell").length > 0;
+    };
+
+    function getTableEditableFromRowCellChild(editable) {
+        var rowEditable = Granite.author.editables.getParent(editable);
+        if (!rowEditable) {
+            return null;
+        }
+        return Granite.author.editables.getParent(rowEditable);
+    }
+
+    /**
+     * True when the body-row cell has a colspan > 1 (has been merged).
+     * @param {Granite.author.Editable} editable
+     * @returns {boolean}
+     */
+    window.CQ.FormsCoreComponents.editorhooks.isMergedRowCell = function (editable) {
+        if (!window.CQ.FormsCoreComponents.editorhooks.isCoreTableRowCell(editable)) {
+            return false;
+        }
+        return getRowCellColspan(editable) > 1;
+    };
+
+    /**
+     * Merges 2+ consecutive, same-row selected body cells into one by:
+     * - summing their colspan values
+     * - deleting all but the first (DOM-order) cell
+     * - posting the total colspan to the first cell
+     * @param {Granite.author.Editable} editable
+     */
+    window.CQ.FormsCoreComponents.editorhooks.mergeTableRowCells = function (editable) {
+        var currentSelectionItems = Granite.author.selection.getAllSelected();
+        var selectedCount = currentSelectionItems ? currentSelectionItems.length : 0;
+
+        function showError(message) {
+            $("#" + MERGE_ROW_CELLS_DIALOG_ID).remove();
+            var dialog = new Coral.Dialog().set({
+                id: MERGE_ROW_CELLS_DIALOG_ID,
+                header: { innerHTML: Granite.I18n.get("Invalid Selection") },
+                content: { innerHTML: Granite.I18n.get(message) },
+                footer: {
+                    innerHTML: '<button is="coral-button" variant="primary" coral-close>' + Granite.I18n.get("Ok") + '</button>'
+                },
+                closable: "on",
+                variant: "error"
+            });
+            document.body.appendChild(dialog);
+            dialog.show();
+        }
+
+        if (!currentSelectionItems || selectedCount < 2) {
+            showError("Select two or more row cells to merge.");
+            return;
+        }
+
+        var allRowCells = currentSelectionItems.every(function (item) {
+            return window.CQ.FormsCoreComponents.editorhooks.isCoreTableRowCell(item);
+        });
+        if (!allRowCells) {
+            showError("All selected cells must be table row cells.");
+            return;
+        }
+
+        var firstParentPath = currentSelectionItems[0].getParentPath();
+        var allSameRow = currentSelectionItems.every(function (item) {
+            return item.getParentPath() === firstParentPath;
+        });
+        if (!allSameRow) {
+            showError("All selected cells must be in the same row.");
+            return;
+        }
+
+        var $row = $(getEditableDom(currentSelectionItems[0]))
+            .closest(".cmp-adaptiveform-tablerow");
+        var $allCells = $row.find(".cmp-adaptiveform-tablecell");
+
+        var indices = currentSelectionItems.map(function (item) {
+            return $allCells.index($(getEditableDom(item)).closest(".cmp-adaptiveform-tablecell"));
+        }).sort(function (a, b) { return a - b; });
+
+        var isConsecutive = indices.every(function (idx, i) {
+            return i === 0 || idx === indices[i - 1] + 1;
+        });
+        if (!isConsecutive) {
+            showError("Select consecutive cells in the same row to merge.");
+            return;
+        }
+
+        var sortedItems = currentSelectionItems.slice().sort(function (a, b) {
+            var aIdx = $allCells.index($(getEditableDom(a)).closest(".cmp-adaptiveform-tablecell"));
+            var bIdx = $allCells.index($(getEditableDom(b)).closest(".cmp-adaptiveform-tablecell"));
+            return aIdx - bIdx;
+        });
+
+        var firstItem = sortedItems[0];
+        var firstCellPath = firstItem.path;
+        var totalColspan = 0;
+        sortedItems.forEach(function (item) {
+            totalColspan += getRowCellColspan(item);
+        });
+
+        var deleteParams = getDeleteParams();
+        var chain = $.when();
+
+        sortedItems.slice(1).forEach(function (item) {
+            var itemPath = item.path;
+            chain = chain.then(function () {
+                return $.ajax({
+                    url: Granite.HTTP.externalize(itemPath),
+                    type: "POST",
+                    data: deleteParams
+                });
+            });
+        });
+
+        chain.then(function () {
+            return $.ajax({
+                url: Granite.HTTP.externalize(firstCellPath),
+                type: "POST",
+                data: { "_charset_": "UTF-8", "colspan": String(totalColspan) }
+            });
+        }).done(function () {
+            var tableEditable = getTableEditableFromRowCellChild(firstItem);
+            if (tableEditable) {
+                tableEditable.refresh();
+            }
+        }).fail(function () {
+            author.ui.helpers.notify({
+                content: Granite.I18n.get("Failed to merge row cells."),
+                type: author.ui.helpers.NOTIFICATION_TYPES.ERROR
+            });
+        });
+    };
+
+    /**
+     * Splits a merged body row cell (colspan > 1) back into individual cells by:
+     * - removing the colspan property from the current cell
+     * - inserting (colspan - 1) new text-input cells immediately after it
+     * @param {Granite.author.Editable} editable
+     */
+    window.CQ.FormsCoreComponents.editorhooks.splitTableRowCell = function (editable) {
+        var colSpan = getRowCellColspan(editable);
+
+        if (colSpan <= 1) {
+            $("#" + SPLIT_ROW_CELL_DIALOG_ID).remove();
+            var dialog = new Coral.Dialog().set({
+                id: SPLIT_ROW_CELL_DIALOG_ID,
+                header: { innerHTML: Granite.I18n.get("Invalid Selection") },
+                content: { innerHTML: Granite.I18n.get("Select a merged cell to split.") },
+                footer: {
+                    innerHTML: '<button is="coral-button" variant="primary" coral-close>' + Granite.I18n.get("Ok") + '</button>'
+                },
+                closable: "on",
+                variant: "error"
+            });
+            document.body.appendChild(dialog);
+            dialog.show();
+            return;
+        }
+
+        var cellPath = editable.path;
+        var rowPath = editable.getParentPath();
+        var cellName = cellPath.substring(cellPath.lastIndexOf("/") + 1);
+        var tableEditable = getTableEditableFromRowCellChild(editable);
+        var numNewCells = colSpan - 1;
+
+        var uid = Date.now();
+        var cellsToCreate = [];
+        for (var i = 0; i < numNewCells; i++) {
+            var newName = "cell_" + uid + "_" + i;
+            cellsToCreate.push({
+                name: newName,
+                path: rowPath + "/" + newName,
+                content: buildBodyTextInputJson()
+            });
+        }
+
+        $.ajax({
+            url: Granite.HTTP.externalize(cellPath),
+            type: "POST",
+            data: { "_charset_": "UTF-8", "colspan@Delete": "true" }
+        }).then(function () {
+            var chain = $.when();
+            cellsToCreate.forEach(function (cell, i) {
+                var orderAfter = i === 0 ? cellName : cellsToCreate[i - 1].name;
+                chain = chain.then(function () {
+                    return postImportAndOrderAfter(cell.path, cell.content, orderAfter);
+                });
+            });
+            return chain;
+        }).done(function () {
+            if (tableEditable) {
+                tableEditable.refresh();
+            }
+        }).fail(function () {
+            author.ui.helpers.notify({
+                content: Granite.I18n.get("Failed to split row cell."),
+                type: author.ui.helpers.NOTIFICATION_TYPES.ERROR
+            });
+        });
+    };
+
+    // When a tablerow/tableheader editable's .dom gets resolved to the <table>
+    // wrapper (foster-parented markers, refresh edge cases) instead of the real
+    // <tr>, relocate it by data-cq-data-path before the overlay paints.
+    // See cq-guides GuideTouchAuthoringEditListeners.js for the original pattern.
+    function isTableRowLikeEditable(editable) {
+        if (!editable || typeof editable.type !== "string") {
+            return false;
+        }
+        return editable.type.indexOf("tablerow") !== -1
+            || editable.type.indexOf("tableheader") !== -1;
+    }
+
+    function installOverlayRenderOverride() {
+        if (!author.edit || !author.edit.Overlay || !author.edit.Overlay.prototype
+            || typeof author.edit.Overlay.prototype.render !== "function") {
+            return false;
+        }
+        if (author.edit.Overlay.prototype.render.__afTableWrapped) {
+            return true;
+        }
+        var _superOverlayRender = author.edit.Overlay.prototype.render;
+        var wrapped = function (editable, container) {
+            if (isTableRowLikeEditable(editable)
+                && editable.dom
+                && typeof editable.dom.attr === "function"
+                && editable.dom.attr("data-cq-data-path") !== editable.path) {
+                var $real = editable.dom.find('[data-cq-data-path="' + editable.path + '"]');
+                if ($real.length) {
+                    editable.dom = $real;
+                }
+            }
+            return _superOverlayRender.apply(this, [editable, container]);
+        };
+        wrapped.__afTableWrapped = true;
+        author.edit.Overlay.prototype.render = wrapped;
+        return true;
+    }
+
+    if (!installOverlayRenderOverride()) {
+        $(function () { installOverlayRenderOverride(); });
+    }
+
+    /**
+     * True when the header cell currently has a sort button rendered (table-level sorting is on
+     * and this column has not had its sort button individually removed).
+     * Used as the condition for the "Remove Sorting" action config.
+     * @param {Granite.author.Editable} editable
+     * @returns {boolean}
+     */
+    window.CQ.FormsCoreComponents.editorhooks.isCoreTableHeaderCellSortingEnabled = function (editable) {
+        if (!window.CQ.FormsCoreComponents.editorhooks.isCoreTableHeaderCell(editable)) {
+            return false;
+        }
+        return $(getEditableDom(editable))
+            .closest(".cmp-adaptiveform-tablehead")
+            .find(".cmp-adaptiveform-table__sort-button")
+            .length > 0;
+    };
+
+    /**
+     * True when table-level sorting is on but this column's sort button has been individually
+     * removed (disableSorting=true on the cell node).
+     * Used as the condition for the "Enable Sorting" action config.
+     * @param {Granite.author.Editable} editable
+     * @returns {boolean}
+     */
+    window.CQ.FormsCoreComponents.editorhooks.isCoreTableHeaderCellSortingDisabled = function (editable) {
+        if (!window.CQ.FormsCoreComponents.editorhooks.isCoreTableHeaderCell(editable)) {
+            return false;
+        }
+        var $dom = $(getEditableDom(editable));
+        var tableSortingOn = $dom.closest(".cmp-adaptiveform-table")
+            .attr("data-cmp-sorting-enabled") === "true";
+        if (!tableSortingOn) {
+            return false;
+        }
+        return $dom.closest(".cmp-adaptiveform-tablehead")
+            .find(".cmp-adaptiveform-table__sort-button")
+            .length === 0;
+    };
+
+    /**
+     * Removes the sort button from a single header column by writing disableSorting=true
+     * on the cell's JCR node, then refreshes the parent table editable.
+     * @param {Granite.author.Editable} editable
+     */
+    window.CQ.FormsCoreComponents.editorhooks.removeColumnSorting = function (editable) {
+        var cellPath = editable.path;
+        var tableEditable = getTableEditableFromHeaderCellText(editable);
+
+        $.ajax({
+            url: Granite.HTTP.externalize(cellPath),
+            type: "POST",
+            data: {
+                "_charset_": "UTF-8",
+                "disableSorting": "true",
+                "disableSorting@TypeHint": "Boolean"
+            }
+        }).done(function () {
+            if (tableEditable) {
+                tableEditable.refresh();
+            }
+        }).fail(function () {
+            author.ui.helpers.notify({
+                content: Granite.I18n.get("Failed to remove sorting for this column."),
+                type: author.ui.helpers.NOTIFICATION_TYPES.ERROR
+            });
+        });
+    };
+
+    /**
+     * Re-enables the sort button for a single header column by deleting the disableSorting
+     * property from the cell's JCR node, then refreshes the parent table editable.
+     * @param {Granite.author.Editable} editable
+     */
+    window.CQ.FormsCoreComponents.editorhooks.enableColumnSorting = function (editable) {
+        var cellPath = editable.path;
+        var tableEditable = getTableEditableFromHeaderCellText(editable);
+
+        $.ajax({
+            url: Granite.HTTP.externalize(cellPath),
+            type: "POST",
+            data: {
+                "_charset_": "UTF-8",
+                "disableSorting@Delete": "true"
+            }
+        }).done(function () {
+            if (tableEditable) {
+                tableEditable.refresh();
+            }
+        }).fail(function () {
+            author.ui.helpers.notify({
+                content: Granite.I18n.get("Failed to enable sorting for this column."),
+                type: author.ui.helpers.NOTIFICATION_TYPES.ERROR
+            });
+        });
+    };
+
+})(window, Granite.author, jQuery, Coral);
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/clientlibs/editorhook/js/toolbaractionhook.js b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/clientlibs/editorhook/js/toolbaractionhook.js
index 0f8c9fa567..2711904d74 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/clientlibs/editorhook/js/toolbaractionhook.js
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/clientlibs/editorhook/js/toolbaractionhook.js
@@ -17,10 +17,36 @@
     "use strict";
     let superSitesEditorAppendButton = ns.edit.Toolbar.prototype.appendButton;
 
+    /**
+     * Table row cells must not expose the standard Delete action (row/column flows handle structure).
+     * @param {Granite.author.Editable} editable
+     * @returns {boolean}
+     */
+    function isEditableInsideCoreTableRow(editable) {
+        if (!editable || !ns.editables || typeof ns.editables.getParent !== "function") {
+            return false;
+        }
+        var p = ns.editables.getParent(editable);
+        while (p) {
+            if (typeof p.type === "string" && p.type.indexOf("/form/tablerow/") !== -1) {
+                return true;
+            }
+            p = ns.editables.getParent(p);
+        }
+        return false;
+    }
+
+    function shouldSuppressStandardDelete(editable, name) {
+        return editable && String(name).toUpperCase() === "DELETE" && isEditableInsideCoreTableRow(editable);
+    }
+
     /**
      * @override
      */
     ns.edit.Toolbar.prototype.appendButton = function (editable, name, action) {
+        if (shouldSuppressStandardDelete(editable, name)) {
+            return;
+        }
         correctEditableEditorType(editable, name);
         superSitesEditorAppendButton.apply(this, [editable, name, action]);
     };
@@ -33,6 +59,9 @@
     if(window.guidelib){
         var superFormsEditorAppendButton = window.guidelib.touchlib.editToolbar.prototype.appendButton;
         window.guidelib.touchlib.editToolbar.prototype.appendButton = function (editable, name, action) {
+            if (shouldSuppressStandardDelete(editable, name)) {
+                return;
+            }
             //adding this check because we don't want to change editorType for v1 forms.
             if(window.guidelib.touchlib.utils.checkIfCoreComponentsBasedForm()){
                 correctEditableEditorType(editable, name);
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/table/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/table/.content.xml
new file mode 100644
index 0000000000..3d0c31ab4d
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/table/.content.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
+          jcr:primaryType="sling:Folder"/>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/table/v1/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/table/v1/.content.xml
new file mode 100644
index 0000000000..10ece0a90c
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/table/v1/.content.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
+          jcr:primaryType="nt:unstructured">
+    <table/>
+</jcr:root>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/table/v1/table/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/table/v1/table/.content.xml
new file mode 100644
index 0000000000..aed2f4d91c
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/table/v1/table/.content.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
+    cq:icon="table"
+    cq:isContainer="{Boolean}true"
+    jcr:description="Capture data in rows and columns in a table format."
+    jcr:primaryType="cq:Component"
+    jcr:title="Adaptive Form Table (v1)"
+    sling:resourceSuperType="core/fd/components/form/panelcontainer/v1/panelcontainer"
+    componentGroup=".core-adaptiveform"/>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/table/v1/table/README.md b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/table/v1/table/README.md
new file mode 100644
index 0000000000..320db04e21
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/table/v1/table/README.md
@@ -0,0 +1,79 @@
+<!--
+Copyright 2026 Adobe
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+Adaptive Form Table (v1)
+====
+Adaptive Form Table component written in HTL that allows authors to capture data in a tabular format with rows and columns.
+
+## Features
+
+* Ability to contain `tableheader` and `tablerow` child components
+* Configurable proportional column widths via comma-separated values
+* Optional column sorting with ascending/descending toggle (per-column sort can be individually disabled)
+* Document of Record (DoR) support — table structure and column widths exported for XFA-based DoR rendering
+* Short description / long description / question mark help pattern
+* Visible and enabled state binding for rules engine
+
+### Use Object
+The Adaptive Form Table component uses the `com.adobe.cq.forms.core.components.models.form.Panel` Sling Model for its Use-object.
+
+### Edit Dialog Properties
+The following properties are written to JCR for this component and are expected to be available as `Resource` properties:
+
+1. `./jcr:title` - defines the label to use for this component
+2. `./hideTitle` - if set to `true`, the label of this component will be hidden
+3. `./name` - defines the name of the field, which will be submitted with the form data
+4. `./description` - defines a help message rendered below the table title
+5. `./columnWidth` - comma-separated proportional column widths (e.g. `1,2,1`); sets `table-layout: fixed` and injects a `<colgroup>` with percentage widths; also forwarded into `fd:dor` for DoR column sizing
+6. `./enableSorting` - if set to `true`, renders sort buttons on all header cells that do not have `./disableSorting` set
+
+## Client Libraries
+The component provides a `core.forms.components.table.v1.runtime` client library category that contains the JavaScript runtime for the component.
+It should be added to a relevant site client library using the `embed` property.
+
+It also provides a `core.forms.components.table.v1.editor` editor client library category that includes
+JavaScript handling for authoring interactions. It is already included by its edit dialog.
+
+## BEM Description
+```
+BLOCK cmp-adaptiveform-table
+    ELEMENT cmp-adaptiveform-table__title
+    ELEMENT cmp-adaptiveform-table__help-container
+    ELEMENT cmp-adaptiveform-table__shortdescription
+    ELEMENT cmp-adaptiveform-table__longdescription
+    ELEMENT cmp-adaptiveform-table__questionmark
+    ELEMENT cmp-adaptiveform-table__widget
+    ELEMENT cmp-adaptiveform-table__head
+    ELEMENT cmp-adaptiveform-table__body
+```
+
+## JavaScript Data Attribute Bindings
+
+Apply a `data-cmp-is="adaptiveFormTable"` attribute to the `cmp-adaptiveform-table` block to enable initialization of the JavaScript component.
+
+The following attributes are required for initialization:
+1. `data-cmp-is="adaptiveFormTable"`
+2. `data-cmp-adaptiveformcontainer-path="${formstructparser.formContainerPath}"`
+
+The following are optional attributes that can be added to the component:
+1. `data-cmp-visible` - boolean indicating whether the component is currently visible
+2. `data-cmp-enabled` - boolean indicating whether the component is currently enabled
+3. `data-cmp-sorting-enabled` - set to `"true"` when `./enableSorting` is authored; controls sort button rendering in `tableheader.html`
+
+## Information
+* **Vendor**: Adobe
+* **Version**: v1
+* **Compatibility**: Cloud
+* **Status**: production-ready
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/table/v1/table/_cq_dialog/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/table/v1/table/_cq_dialog/.content.xml
new file mode 100644
index 0000000000..a896c22331
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/table/v1/table/_cq_dialog/.content.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Copyright 2026 Adobe
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:granite="http://www.adobe.com/jcr/granite/1.0"
+          xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
+    jcr:primaryType="nt:unstructured"
+    jcr:title="Adaptive Form Table"
+    sling:resourceType="cq/gui/components/authoring/dialog"
+    helpPath="https://www.adobe.com/go/aem_af_cmp_table_v1"
+    trackingFeature="core-components:adaptiveform-table:v1">
+    <content
+        jcr:primaryType="nt:unstructured"
+        sling:resourceType="granite/ui/components/coral/foundation/container">
+        <items jcr:primaryType="nt:unstructured">
+            <tabs
+                jcr:primaryType="nt:unstructured"
+                sling:resourceType="granite/ui/components/coral/foundation/tabs"
+                maximized="{Boolean}true">
+                <items jcr:primaryType="nt:unstructured">
+                    <basic
+                        jcr:primaryType="nt:unstructured"
+                        jcr:title="Basic"
+                        sling:resourceType="granite/ui/components/coral/foundation/container"
+                        margin="{Boolean}true">
+                        <items jcr:primaryType="nt:unstructured">
+                            <columns
+                                    jcr:primaryType="nt:unstructured"
+                                    sling:resourceType="granite/ui/components/coral/foundation/fixedcolumns"
+                                    margin="{Boolean}true">
+                                <items jcr:primaryType="nt:unstructured">
+                                    <column
+                                            jcr:primaryType="nt:unstructured"
+                                            sling:resourceType="granite/ui/components/coral/foundation/container">
+                                        <items jcr:primaryType="nt:unstructured">
+                                            <name
+                                                    jcr:primaryType="nt:unstructured"
+                                                    sling:resourceType="granite/ui/components/coral/foundation/include"
+                                                    path="core/fd/components/form/base/v1/base/cq:dialog/content/items/tabs/items/basic/items/columns/items/column/items/name"/>
+                                            <title
+                                                    jcr:primaryType="nt:unstructured"
+                                                    sling:resourceType="granite/ui/components/coral/foundation/include"
+                                                    path="core/fd/components/form/base/v1/base/cq:dialog/content/items/tabs/items/basic/items/columns/items/column/items/title"/>
+                                            <description
+                                                    jcr:primaryType="nt:unstructured"
+                                                    sling:resourceType="granite/ui/components/coral/foundation/include"
+                                                    path="core/fd/components/form/base/v1/base/cq:dialog/content/items/tabs/items/basic/items/columns/items/column/items/description"/>
+                                            <columnWidth
+                                                    jcr:primaryType="nt:unstructured"
+                                                    sling:resourceType="granite/ui/components/coral/foundation/form/textfield"
+                                                    fieldDescription="Enter comma-separated values specifying proportionate width for table columns. Example: 1,2,3 makes columns with widths of 1/6, 2/6, and 3/6 respectively."
+                                                    fieldLabel="Column Width"
+                                                    name="./columnWidth"/>
+                                            <useFieldset
+                                                    jcr:primaryType="nt:unstructured"
+                                                    sling:resourceType="granite/ui/components/coral/foundation/form/checkbox"
+                                                    granite:hide="{Boolean}true"
+                                                    name="./fd:useFieldset"/>
+                                            <useFieldset-typehint
+                                                    jcr:primaryType="nt:unstructured"
+                                                    sling:resourceType="granite/ui/components/coral/foundation/form/hidden"
+                                                    granite:hide="{Boolean}true"
+                                                    name="./fd:useFieldset@TypeHint"/>
+                                            <enableSorting
+                                                    jcr:primaryType="nt:unstructured"
+                                                    sling:resourceType="granite/ui/components/coral/foundation/form/checkbox"
+                                                    fieldDescription="Enable sorting functionality for table columns"
+                                                    name="./enableSorting"
+                                                    text="Enable Sorting"
+                                                    uncheckedValue="false"
+                                                    value="true"/>
+                                            <enableSorting-typehint
+                                                    jcr:primaryType="nt:unstructured"
+                                                    sling:resourceType="granite/ui/components/coral/foundation/form/hidden"
+                                                    name="./enableSorting@TypeHint"
+                                                    value="Boolean"/>
+                                        </items>
+                                    </column>
+                                </items>
+                            </columns>
+                        </items>
+                    </basic>
+                </items>
+            </tabs>
+        </items>
+    </content>
+</jcr:root>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/table/v1/table/_cq_editConfig.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/table/v1/table/_cq_editConfig.xml
new file mode 100644
index 0000000000..0321a792cf
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/table/v1/table/_cq_editConfig.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Copyright 2026 Adobe
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0"
+      jcr:primaryType="cq:EditConfig"
+      cq:actions="[editannotate,-,copymove,delete,-,insert,-]"
+      cq:dialogMode="floating"
+      cq:layout="editbar"
+      cq:disableTargeting="{Boolean}true">
+    <cq:dropTargets jcr:primaryType="nt:unstructured">
+        <table
+            jcr:primaryType="cq:DropTargetConfig"
+            accept="[core/fd/components/form/tablerow/.*,core/fd/components/form/tableheader/.*]"
+            groups="[adaptiveform-table]"
+            propertyName="./items"/>
+    </cq:dropTargets>
+    <cq:listeners
+        jcr:primaryType="cq:EditListenersConfig"
+        afterchildinsert="function(editable){Granite.author.responsive.EditableActions.REFRESH.execute(editable)}"
+        afterchilddelete="function(editable){Granite.author.responsive.EditableActions.REFRESH.execute(editable)}"/>
+    <cq:actionConfigs jcr:primaryType="nt:unstructured">
+        <editexpression
+                jcr:primaryType="nt:unstructured"
+                handler="CQ.FormsCoreComponents.editorhooks.openRuleEditor"
+                order="after CONFIGURE"
+                icon="bidRule"
+                text="Edit Rules"/>
+        <saveAsFragment
+                jcr:primaryType="nt:unstructured"
+                handler="CQ.FormsCoreComponents.editorhooks.saveAsFragment"
+                icon="fragmentAdd"
+                text="Save as Fragment"/>
+        <qualifiedName
+                jcr:primaryType="nt:unstructured"
+                handler="CQ.FormsCoreComponents.editorhooks.viewQualifiedName"
+                icon="viewSOMExpression"
+                text="View Qualified Name"/>
+    </cq:actionConfigs>
+</jcr:root>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/table/v1/table/_cq_template.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/table/v1/table/_cq_template.xml
new file mode 100644
index 0000000000..ac8732f3e9
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/table/v1/table/_cq_template.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Copyright 2026 Adobe
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
+    jcr:primaryType="nt:unstructured"
+    jcr:title="Table"
+    fieldType="panel"
+    enableSorting="{Boolean}true">
+    <header
+        jcr:primaryType="nt:unstructured"
+        sling:resourceType="core/fd/components/form/tableheader/v1/tableheader"
+        fieldType="panel"
+        jcr:title="Header">
+        <column1
+            jcr:primaryType="nt:unstructured"
+            sling:resourceType="core/fd/components/form/text/v1/text"
+            fieldType="plain-text"
+            jcr:title="Column 1"
+            name="column1"
+            value="Column 1"/>
+        <column2
+            jcr:primaryType="nt:unstructured"
+            sling:resourceType="core/fd/components/form/text/v1/text"
+            fieldType="plain-text"
+            jcr:title="Column 2"
+            name="column2"
+            value="Column 2"/>
+    </header>
+    <row1
+        jcr:primaryType="nt:unstructured"
+        sling:resourceType="core/fd/components/form/tablerow/v1/tablerow"
+        jcr:title="Row 1">
+        <cell1
+            jcr:primaryType="nt:unstructured"
+            sling:resourceType="core/fd/components/form/textinput/v1/textinput"
+            jcr:title="Cell 1"
+            name="cell1"/>
+        <cell2
+            jcr:primaryType="nt:unstructured"
+            sling:resourceType="core/fd/components/form/textinput/v1/textinput"
+            jcr:title="Cell 2"
+            name="cell2"/>
+    </row1>
+</jcr:root>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/table/v1/table/clientlibs/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/table/v1/table/clientlibs/.content.xml
new file mode 100644
index 0000000000..a0ac99e384
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/table/v1/table/clientlibs/.content.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
+    jcr:primaryType="sling:Folder"/>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/table/v1/table/clientlibs/editor/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/table/v1/table/clientlibs/editor/.content.xml
new file mode 100644
index 0000000000..08d1b95941
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/table/v1/table/clientlibs/editor/.content.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
+    jcr:primaryType="cq:ClientLibraryFolder"
+    categories="[core.forms.components.table.v1.editor]"
+    dependencies="[core.forms.components.base.v1.editor, core.forms.components.commons.v1.editor.utils]"/>
\ No newline at end of file
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/table/v1/table/clientlibs/editor/css.txt b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/table/v1/table/clientlibs/editor/css.txt
new file mode 100644
index 0000000000..c6b1d9f860
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/table/v1/table/clientlibs/editor/css.txt
@@ -0,0 +1,3 @@
+
+#base=css
+tableeditor.css
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/table/v1/table/clientlibs/editor/js.txt b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/table/v1/table/clientlibs/editor/js.txt
new file mode 100644
index 0000000000..ff3581fa5b
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/table/v1/table/clientlibs/editor/js.txt
@@ -0,0 +1,2 @@
+#base=js
+tableeditor.js
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/table/v1/table/clientlibs/editor/js/tableeditor.js b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/table/v1/table/clientlibs/editor/js/tableeditor.js
new file mode 100644
index 0000000000..5441b34d1c
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/table/v1/table/clientlibs/editor/js/tableeditor.js
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright 2026 Adobe
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+
+(function(channel) {
+    "use strict";
+
+    /**
+     * Editor-specific initialization for table component
+     */
+    channel.on("cq-editor-loaded", function() {
+        console.log("Table component editor loaded");
+        
+        // Add any editor-specific logic here
+        // E.g., custom drop zone handling, add/remove row buttons, etc.
+    });
+
+})(Granite.author.MessageChannel);
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/table/v1/table/clientlibs/site/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/table/v1/table/clientlibs/site/.content.xml
new file mode 100644
index 0000000000..d586242028
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/table/v1/table/clientlibs/site/.content.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
+    jcr:primaryType="cq:ClientLibraryFolder"
+    allowProxy="{Boolean}true"
+    categories="[core.forms.components.table.v1.runtime]"
+    dependencies="[core.forms.components.runtime.base]"/>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/table/v1/table/clientlibs/site/css.txt b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/table/v1/table/clientlibs/site/css.txt
new file mode 100644
index 0000000000..40e6704b81
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/table/v1/table/clientlibs/site/css.txt
@@ -0,0 +1,3 @@
+
+#base=css
+tableview.css
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/table/v1/table/clientlibs/site/css/tableview.css b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/table/v1/table/clientlibs/site/css/tableview.css
new file mode 100644
index 0000000000..f45e61ae0a
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/table/v1/table/clientlibs/site/css/tableview.css
@@ -0,0 +1,78 @@
+/*******************************************************************************
+ * Copyright 2026 Adobe
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+
+/* All visual styles live in the theme canvas:
+ * aem-forms-theme-canvas/src/components/table/_table.scss
+ */
+
+.cmp-adaptiveform-table {}
+
+.cmp-adaptiveform-table__title {}
+
+.cmp-adaptiveform-table__help-container {}
+
+.cmp-adaptiveform-table__questionmark {}
+
+.cmp-adaptiveform-table__help-container .cmp-adaptiveform-table__questionmark {}
+
+.cmp-adaptiveform-table__shortdescription {}
+
+.cmp-adaptiveform-table__longdescription {}
+
+.cmp-adaptiveform-table__longdescription p {}
+
+.cmp-adaptiveform-table__widget {}
+
+.cmp-adaptiveform-table__head {}
+
+.cmp-adaptiveform-table__body {}
+
+.cmp-adaptiveform-tableheader {}
+
+.cmp-adaptiveform-tablerow {}
+
+.cmp-adaptiveform-table__body .cmp-adaptiveform-tablerow:hover > .cmp-adaptiveform-tablecell {}
+
+.cmp-adaptiveform-table__body .cmp-adaptiveform-tablerow > .cmp-adaptiveform-tablecell:hover {}
+
+.cmp-adaptiveform-tablecell,
+.cmp-adaptiveform-tablehead {}
+
+.cmp-adaptiveform-table__head .cmp-adaptiveform-tablehead {}
+
+.cmp-adaptiveform-table__sort-header-inner {}
+
+.cmp-adaptiveform-table__sort-button {}
+
+.cmp-adaptiveform-table__sort-button:hover,
+.cmp-adaptiveform-table__sort-button:focus-visible {}
+
+.cmp-adaptiveform-table__sort-button--asc {}
+
+.cmp-adaptiveform-table__sort-button--desc {}
+
+.cmp-adaptiveform-table__head .cmp-adaptiveform-tableheader:hover > .cmp-adaptiveform-tablehead {}
+
+.cmp-adaptiveform-table__head .cmp-adaptiveform-tableheader > .cmp-adaptiveform-tablehead:hover {}
+
+.cell-wrapper {}
+
+@media (max-width: 768px) {
+    .cmp-adaptiveform-table__widget {}
+
+    .cmp-adaptiveform-tablecell,
+    .cmp-adaptiveform-tablehead {}
+}
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/table/v1/table/clientlibs/site/js.txt b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/table/v1/table/clientlibs/site/js.txt
new file mode 100644
index 0000000000..922274d198
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/table/v1/table/clientlibs/site/js.txt
@@ -0,0 +1,2 @@
+#base=js
+tableview.js
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/table/v1/table/clientlibs/site/js/tableview.js b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/table/v1/table/clientlibs/site/js/tableview.js
new file mode 100644
index 0000000000..daca571477
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/table/v1/table/clientlibs/site/js/tableview.js
@@ -0,0 +1,348 @@
+/*******************************************************************************
+ * Copyright 2026 Adobe
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+(function () {
+    "use strict";
+
+    class Table extends FormView.FormPanel {
+
+        static NS = FormView.Constants.NS;
+        static IS = "adaptiveFormTable";
+        static bemBlock = 'cmp-adaptiveform-table';
+        static selectors = {
+            self: "[data-" + this.NS + '-is="' + this.IS + '"]',
+            widget: `.${Table.bemBlock}__widget`,
+            description: `.${Table.bemBlock}__longdescription`,
+            qm: `.${Table.bemBlock}__questionmark`,
+            tooltipDiv: `.${Table.bemBlock}__shortdescription`
+        };
+
+        constructor(params) {
+            super(params);
+            this.children = [];
+            /** @type {{ col: number, dir: 'asc'|'desc' }|null} */
+            this._tableSortState = null;
+        }
+
+        setModel(model) {
+            super.setModel(model);
+            queueMicrotask(() => {
+                this.#initColumnSortingIfEnabled();
+            });
+        }
+
+        getClass() {
+            return Table.IS;
+        }
+
+        getWidget() {
+            return null;
+        }
+
+        getDescription() {
+            return this.element.querySelector(Table.selectors.description);
+        }
+
+        getLabel() {
+            return this.element.querySelector(`.${Table.bemBlock}__title`);
+        }
+
+        getErrorDiv() {
+            return null;
+        }
+
+        getTooltipDiv() {
+            return this.element.querySelector(Table.selectors.tooltipDiv);
+        }
+
+        getQuestionMarkDiv() {
+            return this.element.querySelector(Table.selectors.qm);
+        }
+
+        setFocus(id) {
+            super.setFocus(id);
+            this.setActive();
+        }
+
+        getWidgetId() {
+            return this.getId();
+        }
+
+        /**
+         * Override updateLabel to handle the table's specific HTML structure.
+         * The table uses __title instead of __label-container > __label.
+         * @param {Object} label - The label state object.
+         */
+        updateLabel(label) {
+            const labelElement = this.getLabel();
+            if (labelElement) {
+                if (label.hasOwnProperty("value")) {
+                    labelElement.innerHTML = label.value;
+                }
+                if (label.hasOwnProperty("visible")) {
+                    if (label.visible === false) {
+                        labelElement.setAttribute("aria-hidden", "true");
+                    } else {
+                        labelElement.removeAttribute("aria-hidden");
+                    }
+                    labelElement.setAttribute("data-cmp-visible", label.visible);
+                }
+            }
+        }
+
+        /**
+         * Override applyState to use the table's specific updateLabel.
+         * @param {Object} state - The state to be applied.
+         */
+        applyState(state) {
+            this.updateVisible(state.visible);
+            this.updateEnabled(state.enabled);
+            this.initializeHelpContent(state);
+            this.updateLabel(state.label);
+        }
+
+        /**
+         * Get the <tbody> element for row insertion.
+         */
+        #getTableBody() {
+            return this.element.querySelector(`.${Table.bemBlock}__body`) ||
+                   this.element.querySelector('tbody');
+        }
+
+        /**
+         * Inserts a new table row into the <tbody> at the correct position.
+         * This is called by InstanceManager.handleAddition() when repeatableParentView is set.
+         * Foundation-style approach: insert <tr> directly as sibling within single <tbody>.
+         *
+         * @param {Object} instanceManager - The instance manager
+         * @param {Object} addedModel - The model of the added row
+         * @param {HTMLElement} htmlElement - The cloned row element (<tr>)
+         * @returns {HTMLElement} The inserted element
+         */
+        addRepeatableMarkup(instanceManager, addedModel, htmlElement) {
+            const tbody = this.#getTableBody();
+            if (!tbody) {
+                console.error('Table: No tbody found for row insertion');
+                return htmlElement;
+            }
+
+            const instanceIndex = addedModel.index;
+            const children = instanceManager.children;
+
+            if (children.length === 0) {
+                tbody.appendChild(htmlElement);
+            } else if (instanceIndex === 0) {
+                const firstChild = children[0];
+                if (firstChild && firstChild.element && firstChild.element.isConnected) {
+                    tbody.insertBefore(htmlElement, firstChild.element);
+                } else {
+                    tbody.insertBefore(htmlElement, tbody.firstElementChild);
+                }
+            } else {
+                const prevIndex = instanceIndex - 1;
+                const prevChild = children.find(c => c.getModel && c.getModel().index === prevIndex);
+                if (prevChild && prevChild.element) {
+                    prevChild.element.after(htmlElement);
+                } else {
+                    const items = instanceManager._model.items || [];
+                    const prevModel = items.find(m => m.index === prevIndex);
+                    if (prevModel) {
+                        const prevElement = document.getElementById(prevModel.id);
+                        if (prevElement) {
+                            prevElement.after(htmlElement);
+                        } else {
+                            tbody.appendChild(htmlElement);
+                        }
+                    } else {
+                        tbody.appendChild(htmlElement);
+                    }
+                }
+            }
+
+            // Utils.updateId only patches id attributes, not data-cmp-hook-* attrs.
+            // Without this, cloned rows keep the template's stale row ID on their
+            // add/remove buttons, causing every dynamically-added row to dispatch
+            // the wrong model index when clicked.
+            this.#syncTableRowHooks(htmlElement, addedModel.id);
+
+            return htmlElement;
+        }
+
+        /**
+         * Patches data-cmp-hook-add-instance / data-cmp-hook-remove-instance on a
+         * freshly cloned row so they reference the row's own model ID.
+         */
+        #syncTableRowHooks(rowElement, rowId) {
+            const addBtn = rowElement.querySelector('[data-cmp-hook-add-instance]');
+            if (addBtn) {
+                addBtn.setAttribute('data-cmp-hook-add-instance', rowId);
+            }
+            const removeBtn = rowElement.querySelector('[data-cmp-hook-remove-instance]');
+            if (removeBtn) {
+                removeBtn.setAttribute('data-cmp-hook-remove-instance', rowId);
+            }
+        }
+
+        /**
+         * Repeatable table rows: align add/remove control visibility with minOccur / maxOccur.
+         */
+        handleChildAddition(childView) {
+            this.#syncTableRowRepeatableControls(childView.getInstanceManager());
+        }
+
+        handleChildRemoval(removedInstanceView) {
+            this.#syncTableRowRepeatableControls(removedInstanceView.getInstanceManager());
+        }
+
+        #syncTableRowRepeatableControls(instanceManager) {
+            if (!instanceManager || !instanceManager.children || instanceManager.children.length === 0) {
+                return;
+            }
+            const model = instanceManager._model;
+            const items = model.items || [];
+            const activeIds = new Set(items.map((item) => item.id));
+            const minOccur = (typeof model.minOccur === 'number' && model.minOccur >= 0) ? model.minOccur : 0;
+            const maxOccur = (typeof model.maxOccur === 'number' && model.maxOccur >= 0) ? model.maxOccur : -1;
+            const dataVisible = FormView.Constants.DATA_ATTRIBUTE_VISIBLE;
+            instanceManager.children.forEach((childView) => {
+                if (!activeIds.has(childView.id)) {
+                    return;
+                }
+                const rowElement = childView.element;
+                if (!rowElement) {
+                    return;
+                }
+                const addBtn = rowElement.querySelector("[data-cmp-hook-add-instance]");
+                const removeBtn = rowElement.querySelector("[data-cmp-hook-remove-instance]");
+                if (addBtn) {
+                    addBtn.setAttribute(dataVisible, !(items.length === maxOccur && maxOccur !== -1));
+                }
+                if (removeBtn) {
+                    removeBtn.setAttribute(dataVisible, items.length > minOccur);
+                }
+            });
+        }
+
+        #initColumnSortingIfEnabled() {
+            const widget = this.element.querySelector(Table.selectors.widget);
+            if (!widget) {
+                return;
+            }
+            const thead = widget.querySelector("thead");
+            const tbody = widget.querySelector("tbody");
+            if (!thead || !tbody) {
+                return;
+            }
+            thead.querySelectorAll("th.cmp-adaptiveform-tablehead").forEach((th, index) => {
+                const btn = th.querySelector(".cmp-adaptiveform-table__sort-button");
+                if (!btn) {
+                    return;
+                }
+                btn.addEventListener("click", (e) => {
+                    e.preventDefault();
+                    e.stopPropagation();
+                    this.#sortTableByColumn(tbody, thead, index);
+                });
+            });
+        }
+
+        /**
+         * @param {HTMLTableSectionElement} tbody
+         * @param {HTMLTableSectionElement} thead
+         * @param {number} colIndex
+         */
+        #sortTableByColumn(tbody, thead, colIndex) {
+            const rows = Array.from(tbody.querySelectorAll(":scope > tr"));
+            if (rows.length <= 1) {
+                return;
+            }
+            let dir = "asc";
+            if (this._tableSortState && this._tableSortState.col === colIndex) {
+                dir = this._tableSortState.dir === "asc" ? "desc" : "asc";
+            }
+            this._tableSortState = { col: colIndex, dir: dir };
+            const mult = dir === "asc" ? 1 : -1;
+            const sorted = rows.slice().sort((a, b) => {
+                const va = this.#getCellSortValue(a.cells[colIndex]);
+                const vb = this.#getCellSortValue(b.cells[colIndex]);
+                return mult * va.localeCompare(vb, undefined, { numeric: true, sensitivity: "base" });
+            });
+            sorted.forEach((r) => tbody.appendChild(r));
+            this.#syncInstanceManagerOrderAfterSort(sorted);
+            const headerCells = thead.querySelectorAll("th.cmp-adaptiveform-tablehead");
+            headerCells.forEach((th) => {
+                th.removeAttribute("aria-sort");
+                const b = th.querySelector(".cmp-adaptiveform-table__sort-button");
+                if (b) {
+                    b.classList.remove("cmp-adaptiveform-table__sort-button--asc");
+                    b.classList.remove("cmp-adaptiveform-table__sort-button--desc");
+                }
+            });
+            const activeTh = headerCells[colIndex];
+            const activeBtn = activeTh && activeTh.querySelector(".cmp-adaptiveform-table__sort-button");
+            if (activeTh && activeBtn) {
+                activeBtn.classList.add(
+                    dir === "asc" ? "cmp-adaptiveform-table__sort-button--asc" : "cmp-adaptiveform-table__sort-button--desc"
+                );
+                activeTh.setAttribute("aria-sort", dir === "asc" ? "ascending" : "descending");
+            }
+        }
+
+        /**
+         * Keep repeatable row views aligned with DOM order after a sort.
+         * @param {HTMLTableRowElement[]} sortedRows
+         */
+        #syncInstanceManagerOrderAfterSort(sortedRows) {
+            const firstId = sortedRows[0] && sortedRows[0].id;
+            if (!firstId || !this.formContainer || !this.formContainer.getField) {
+                return;
+            }
+            const firstView = this.formContainer.getField(firstId);
+            const im = firstView && typeof firstView.getInstanceManager === "function" ? firstView.getInstanceManager() : null;
+            if (!im || !im.children || im.children.length !== sortedRows.length) {
+                return;
+            }
+            const byId = new Map(im.children.map((cv) => [cv.getId(), cv]));
+            const reordered = sortedRows.map((r) => byId.get(r.id)).filter(Boolean);
+            if (reordered.length === im.children.length) {
+                im.children = reordered;
+            }
+        }
+
+        /**
+         * @param {HTMLTableCellElement|undefined} cell
+         * @returns {string}
+         */
+        #getCellSortValue(cell) {
+            if (!cell) {
+                return "";
+            }
+            const control = cell.querySelector("input:not([type='hidden']):not([type='button']), select, textarea");
+            if (control) {
+                if (control.type === "checkbox" || control.type === "radio") {
+                    return control.checked ? "1" : "0";
+                }
+                if (typeof control.value === "string") {
+                    return control.value.trim();
+                }
+            }
+            return cell.innerText.replace(/\s+/g, " ").trim();
+        }
+    }
+
+    FormView.Utils.setupField(({element, formContainer}) => {
+        return new Table({element, formContainer})
+    }, Table.selectors.self);
+})();
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/table/v1/table/table.html b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/table/v1/table/table.html
new file mode 100644
index 0000000000..310f9a9c52
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/table/v1/table/table.html
@@ -0,0 +1,86 @@
+<!--/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Copyright 2026 Adobe
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/-->
+<sly data-sly-use.table="com.adobe.cq.forms.core.components.models.form.Panel"
+     data-sly-use.renderer="${'table.js'}"
+     data-sly-use.shortDescription="${renderer.shortDescriptionPath}"
+     data-sly-use.longDescription="${renderer.longDescriptionPath}"
+     data-sly-use.questionMark="${renderer.questionMarkPath}"
+     data-sly-use.formstructparser="com.adobe.cq.forms.core.components.models.form.FormStructureParser"></sly>
+
+<div class="cmp-adaptiveform-table cmp-container"
+     id="${table.id}"
+     data-cmp-is="adaptiveFormTable"
+     data-cmp-adaptiveformcontainer-path="${formstructparser.formContainerPath}"
+     data-cmp-visible="${table.visible ? 'true' : 'false'}"
+     data-cmp-enabled="${table.enabled ? 'true' : 'false'}"
+     data-cmp-sorting-enabled="${properties.enableSorting ? 'true' : 'false'}">
+    
+    <sly data-sly-test="${table.label.visible != false}">
+        <div class="cmp-adaptiveform-table__title cmp-container__label">${table.label.value @ context='html'}</div>
+    </sly>
+    <div class="cmp-adaptiveform-table__help-container">
+        <div data-sly-call="${questionMark.questionMark @componentId=table.id, longDescription=table.description, bemBlock='cmp-adaptiveform-table'}" data-sly-unwrap></div>
+    </div>
+    <div data-sly-call="${shortDescription.shortDescription @componentId=table.id, shortDescriptionVisible=table.tooltipVisible, shortDescription=table.tooltip, bemBlock='cmp-adaptiveform-table'}" data-sly-unwrap></div>
+    <div data-sly-call="${longDescription.longDescription @componentId=table.id, longDescription=table.description, bemBlock='cmp-adaptiveform-table'}" data-sly-unwrap></div>
+
+    <!--/* EDIT MODE: column widths not applied; children render their own <tr> with data-cq-data-path for the overlay. */-->
+    <sly data-sly-test="${wcmmode.edit}">
+        <table class="cmp-adaptiveform-table__widget"
+               aria-label="${table.label.value @ context='attribute'}">
+            <thead class="cmp-adaptiveform-table__head">
+                <sly data-sly-list.child="${resource.listChildren}">
+                    <sly data-sly-test="${child.resourceType == 'core/fd/components/form/tableheader/v1/tableheader'}">
+                        <sly data-sly-resource="${child @ decoration=false}"></sly>
+                    </sly>
+                </sly>
+            </thead>
+            <tbody class="cmp-adaptiveform-table__body">
+                <sly data-sly-list.child="${resource.listChildren}">
+                    <sly data-sly-test="${child.resourceType == 'core/fd/components/form/tablerow/v1/tablerow'}">
+                        <sly data-sly-resource="${child @ decoration=false}"></sly>
+                    </sly>
+                </sly>
+            </tbody>
+        </table>
+    </sly>
+    <!--/* PUBLISH MODE: column widths applied via colgroup; proper semantic table for accessibility. */-->
+    <sly data-sly-test="${!wcmmode.edit}">
+        <table class="cmp-adaptiveform-table__widget"
+               aria-label="${table.label.value @ context='attribute'}"
+               data-sly-attribute.style="${properties.columnWidth ? 'table-layout: fixed; width: 100%' : false}">
+            <sly data-sly-test="${table.columnWidthsConfigured}">
+                <colgroup data-sly-list.colStyle="${table.columnWidthColStyles}">
+                    <col style="${colStyle @ context='styleString'}" />
+                </colgroup>
+            </sly>
+            <thead class="cmp-adaptiveform-table__head">
+                <sly data-sly-list.child="${resource.listChildren}">
+                    <sly data-sly-test="${child.resourceType == 'core/fd/components/form/tableheader/v1/tableheader'}">
+                        <sly data-sly-resource="${child @ decoration=false}"></sly>
+                    </sly>
+                </sly>
+            </thead>
+            <tbody class="cmp-adaptiveform-table__body">
+                <sly data-sly-list.child="${resource.listChildren}">
+                    <sly data-sly-test="${child.resourceType == 'core/fd/components/form/tablerow/v1/tablerow'}">
+                        <sly data-sly-resource="${child @ decoration=false}"></sly>
+                    </sly>
+                </sly>
+            </tbody>
+        </table>
+    </sly>
+</div>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/table/v1/table/table.js b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/table/v1/table/table.js
new file mode 100644
index 0000000000..979394ffdf
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/table/v1/table/table.js
@@ -0,0 +1,31 @@
+/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ Copyright 2026 Adobe
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~     http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
+
+use(function () {
+    var labelPath = 'core/fd/components/af-commons/v1/fieldTemplates/label.html';
+    var shortDescriptionPath = "core/fd/components/af-commons/v1/fieldTemplates/shortDescription.html";
+    var longDescriptionPath = "core/fd/components/af-commons/v1/fieldTemplates/longDescription.html";
+    var questionMarkPath = "core/fd/components/af-commons/v1/fieldTemplates/questionMark.html";
+    var errorMessagePath = "core/fd/components/af-commons/v1/fieldTemplates/errorMessage.html";
+    
+    return {
+        labelPath: labelPath,
+        shortDescriptionPath: shortDescriptionPath,
+        longDescriptionPath: longDescriptionPath,
+        questionMarkPath: questionMarkPath,
+        errorMessagePath: errorMessagePath
+    }
+});
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tableheader/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tableheader/.content.xml
new file mode 100644
index 0000000000..491392d539
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tableheader/.content.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
+    jcr:primaryType="sling:Folder"/>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tableheader/v1/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tableheader/v1/.content.xml
new file mode 100644
index 0000000000..491392d539
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tableheader/v1/.content.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
+    jcr:primaryType="sling:Folder"/>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tableheader/v1/tableheader/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tableheader/v1/tableheader/.content.xml
new file mode 100644
index 0000000000..12abec6e76
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tableheader/v1/tableheader/.content.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Copyright 2026 Adobe
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
+    cq:isContainer="{Boolean}true"
+    jcr:description="Table Header component to hold header cells"
+    jcr:primaryType="cq:Component"
+    jcr:title="Table Header"
+    sling:resourceSuperType="core/fd/components/form/tablerow/v1/tablerow"
+    componentGroup=".hidden"/>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tableheader/v1/tableheader/README.md b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tableheader/v1/tableheader/README.md
new file mode 100644
index 0000000000..a24937931d
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tableheader/v1/tableheader/README.md
@@ -0,0 +1,68 @@
+<!--
+Copyright 2026 Adobe
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+Adaptive Form Table Header (v1)
+====
+Adaptive Form Table Header component written in HTL. Renders the `<thead><tr>` row of the table with one `<th>` per child cell component.
+
+## Features
+
+* Renders column header cells as semantic `<th>` elements with `scope="col"`
+* Per-column sort button — shown or hidden based on parent table's `enableSorting` and per-cell `disableSorting`
+* Header cell merge (colspan) — individual cells can span multiple columns via `./colspan`
+* Visible and enabled state binding for rules engine
+
+### Use Object
+The Adaptive Form Table Header component uses the `com.adobe.cq.forms.core.components.models.form.Panel` Sling Model for its Use-object (`TableHeaderImpl`), which exports `fd:viewType = "table-header"` for Document of Record rendering.
+
+### Edit Dialog Properties
+The following properties are written to JCR for each child cell of the table header and are expected to be available as `Resource` properties:
+
+1. `./name` - defines the name of the header cell, used as the field name in the form model
+2. `./jcr:title` - defines the display label for the column header
+3. `./disableSorting` - if set to `true`, hides the sort button for this column even when the parent table has `./enableSorting` enabled
+4. `./colspan` - number of columns this header cell spans; rendered as HTML `colspan` attribute and tracked as `data-colspan` for authoring toolbar calculations
+
+## Client Libraries
+The component provides a `core.forms.components.tableheader.v1.runtime` client library category that contains the JavaScript runtime for the component.
+It should be added to a relevant site client library using the `embed` property.
+
+## BEM Description
+```
+BLOCK cmp-adaptiveform-tableheader
+    ELEMENT cmp-adaptiveform-tablehead
+        ELEMENT cmp-adaptiveform-table__sort-header-inner
+            ELEMENT cmp-adaptiveform-table__sort-button
+                MODIFIER cmp-adaptiveform-table__sort-button--asc
+                MODIFIER cmp-adaptiveform-table__sort-button--desc
+```
+
+## JavaScript Data Attribute Bindings
+
+Apply a `data-cmp-is="adaptiveFormTableHeader"` attribute to the `<tr>` element to enable initialization.
+
+The following attributes are required for initialization:
+1. `data-cmp-is="adaptiveFormTableHeader"`
+2. `data-cmp-adaptiveformcontainer-path="${formstructparser.formContainerPath}"`
+
+The following are optional attributes:
+1. `data-cmp-visible` - boolean indicating whether the header row is currently visible
+2. `data-cmp-enabled` - boolean indicating whether the header row is currently enabled
+
+## Information
+* **Vendor**: Adobe
+* **Version**: v1
+* **Compatibility**: Cloud
+* **Status**: production-ready
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tableheader/v1/tableheader/_cq_dialog/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tableheader/v1/tableheader/_cq_dialog/.content.xml
new file mode 100644
index 0000000000..3930331f41
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tableheader/v1/tableheader/_cq_dialog/.content.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Copyright 2026 Adobe
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0"
+          xmlns:granite="http://www.adobe.com/jcr/granite/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
+          xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
+    jcr:primaryType="nt:unstructured"
+    jcr:title="Adaptive Form Table Header"
+    sling:resourceType="cq/gui/components/authoring/dialog">
+    <content
+        jcr:primaryType="nt:unstructured"
+        granite:class="cmp-adaptiveform-tableheader__editdialog"
+        sling:resourceType="granite/ui/components/coral/foundation/container">
+        <items jcr:primaryType="nt:unstructured">
+            <tabs
+                jcr:primaryType="nt:unstructured"
+                sling:resourceType="granite/ui/components/coral/foundation/tabs"
+                maximized="{Boolean}true">
+                <items jcr:primaryType="nt:unstructured"
+                    sling:hideChildren="[repeat, help, accessibility, background, cq:styles, dor, advanced]">
+                    <basic
+                        jcr:primaryType="nt:unstructured"
+                        jcr:title="Basic"
+                        sling:resourceType="granite/ui/components/coral/foundation/container"
+                        margin="{Boolean}true">
+                        <items jcr:primaryType="nt:unstructured">
+                            <columns
+                                jcr:primaryType="nt:unstructured"
+                                sling:resourceType="granite/ui/components/coral/foundation/fixedcolumns"
+                                margin="{Boolean}true">
+                                <items jcr:primaryType="nt:unstructured">
+                                    <column
+                                        jcr:primaryType="nt:unstructured"
+                                        sling:resourceType="granite/ui/components/coral/foundation/container">
+                                        <items jcr:primaryType="nt:unstructured"
+                                            sling:hideChildren="[hideTitle,richTextTitle,isTitleRichText,wrapData,wrapData-typehint,useFieldset,useFieldset-typehint,layout,bindref,visible,visible-typehint,enabled,enabled-typehint,readonly,readonly-typehint,fieldType]">
+                                            <name
+                                                jcr:primaryType="nt:unstructured"
+                                                sling:resourceType="granite/ui/components/coral/foundation/include"
+                                                path="core/fd/components/form/base/v1/base/cq:dialog/content/items/tabs/items/basic/items/columns/items/column/items/name"/>
+                                            <title
+                                                jcr:primaryType="nt:unstructured"
+                                                sling:resourceType="granite/ui/components/coral/foundation/include"
+                                                granite:class="cmp-adaptiveform-base__title"
+                                                path="core/fd/components/form/base/v1/base/cq:dialog/content/items/tabs/items/basic/items/columns/items/column/items/title"/>
+                                        </items>
+                                    </column>
+                                </items>
+                            </columns>
+                        </items>
+                    </basic>
+                </items>
+            </tabs>
+        </items>
+    </content>
+</jcr:root>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tableheader/v1/tableheader/clientlibs/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tableheader/v1/tableheader/clientlibs/.content.xml
new file mode 100644
index 0000000000..7d4ff0ff7b
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tableheader/v1/tableheader/clientlibs/.content.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
+    jcr:primaryType="nt:folder"/>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tableheader/v1/tableheader/clientlibs/site/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tableheader/v1/tableheader/clientlibs/site/.content.xml
new file mode 100644
index 0000000000..f4e5089e09
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tableheader/v1/tableheader/clientlibs/site/.content.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
+    jcr:primaryType="cq:ClientLibraryFolder"
+    allowProxy="{Boolean}true"
+    categories="[core.forms.components.tableheader.v1.runtime]"
+    dependencies="[core.forms.components.runtime.base]"/>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tableheader/v1/tableheader/clientlibs/site/js.txt b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tableheader/v1/tableheader/clientlibs/site/js.txt
new file mode 100644
index 0000000000..45302b7084
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tableheader/v1/tableheader/clientlibs/site/js.txt
@@ -0,0 +1,2 @@
+#base=js
+tableheaderview.js
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tableheader/v1/tableheader/clientlibs/site/js/tableheaderview.js b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tableheader/v1/tableheader/clientlibs/site/js/tableheaderview.js
new file mode 100644
index 0000000000..9e6f028a17
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tableheader/v1/tableheader/clientlibs/site/js/tableheaderview.js
@@ -0,0 +1,94 @@
+/*******************************************************************************
+ * Copyright 2026 Adobe
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+(function () {
+    "use strict";
+
+    class TableHeader extends FormView.FormPanel {
+
+        static NS = FormView.Constants.NS;
+        static IS = "adaptiveFormTableHeader";
+        static bemBlock = 'cmp-adaptiveform-tableheader';
+        static selectors = {
+            self: "[data-" + this.NS + '-is="' + this.IS + '"]'
+        };
+
+        constructor(params) {
+            super(params);
+            this.children = [];
+        }
+
+        getClass() {
+            return TableHeader.IS;
+        }
+
+        getWidget() {
+            return null;
+        }
+
+        getDescription() {
+            return null;
+        }
+
+        getLabel() {
+            return null;
+        }
+
+        getErrorDiv() {
+            return null;
+        }
+
+        getTooltipDiv() {
+            return null;
+        }
+
+        getQuestionMarkDiv() {
+            return null;
+        }
+
+        setFocus(id) {
+            super.setFocus(id);
+            this.setActive();
+        }
+
+        getWidgetId() {
+            return this.getId();
+        }
+
+        /**
+         * Override updateLabel to handle the table header's specific HTML structure.
+         * Table headers don't have labels in the traditional sense.
+         * @param {Object} label - The label state object.
+         */
+        updateLabel(label) {
+            // Table headers don't have visible labels, so this is a no-op
+        }
+
+        /**
+         * Override applyState for table header's specific structure.
+         * @param {Object} state - The state to be applied.
+         */
+        applyState(state) {
+            this.updateVisible(state.visible);
+            this.updateEnabled(state.enabled);
+            this.initializeHelpContent(state);
+            this.updateLabel(state.label);
+        }
+    }
+
+    FormView.Utils.setupField(({element, formContainer}) => {
+        return new TableHeader({element, formContainer})
+    }, TableHeader.selectors.self);
+})();
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tableheader/v1/tableheader/tableheader.html b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tableheader/v1/tableheader/tableheader.html
new file mode 100644
index 0000000000..6d2f855027
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tableheader/v1/tableheader/tableheader.html
@@ -0,0 +1,75 @@
+<!--/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Copyright 2026 Adobe
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/-->
+<sly data-sly-use.header="com.adobe.cq.forms.core.components.models.form.Panel"
+     data-sly-use.formstructparser="com.adobe.cq.forms.core.components.models.form.FormStructureParser"
+     data-sly-set.sortingEnabled="${resource.parent.valueMap.enableSorting}"></sly>
+<!--/* EDIT MODE: hand-rendered <tr> with Granite editable markers so the overlay
+     can bind to the real header row instead of foster-parenting to the <table>. */-->
+<sly data-sly-test="${wcmmode.edit}">
+    <tr class="cmp-adaptiveform-tableheader cq-Editable-dom cq-Editable-dom--container"
+        data-cq-data-path="${resource.path}">
+        <sly data-sly-list.cell="${resource.listChildren}">
+            <th class="cmp-adaptiveform-tablehead"
+                scope="col"
+                data-sly-attribute.colspan="${cell.valueMap.colspan}"
+                data-cmp-hook-tablehead="header">
+                <sly data-sly-test="${sortingEnabled && !cell.valueMap.disableSorting}">
+                    <div class="cmp-adaptiveform-table__sort-header-inner">
+                        <div class="cell-wrapper">
+  							<sly data-sly-resource="${cell @ decorationTagName='div'}"></sly>
+						</div>
+                        <button type="button"
+                                class="cmp-adaptiveform-table__sort-button"
+                                data-cmp-hook-table-sort="${cellList.index}"
+                                aria-label="Sort column"></button>
+                    </div>
+                </sly>
+                <sly data-sly-test="${!sortingEnabled || cell.valueMap.disableSorting}">
+                    <sly data-sly-resource="${cell @ decorationTagName='div'}"></sly>
+                </sly>
+            </th>
+        </sly>
+    </tr>
+</sly>
+<!--/* PUBLISH MODE: semantic <tr>/<th> with real HTML colspan. */-->
+<sly data-sly-test="${!wcmmode.edit}">
+    <tr id="${header.id}"
+        class="cmp-adaptiveform-tableheader"
+        data-cmp-is="adaptiveFormTableHeader"
+        data-cmp-adaptiveformcontainer-path="${formstructparser.formContainerPath}"
+        data-cmp-visible="${header.visible ? 'true' : 'false'}"
+        data-cmp-enabled="${header.enabled ? 'true' : 'false'}">
+        <sly data-sly-list.cell="${resource.listChildren}">
+            <th class="cmp-adaptiveform-tablehead"
+                scope="col"
+                data-sly-attribute.colspan="${cell.valueMap.colspan}"
+                data-cmp-hook-tablehead="header">
+                <sly data-sly-test="${sortingEnabled && !cell.valueMap.disableSorting}">
+                    <div class="cmp-adaptiveform-table__sort-header-inner">
+                        <sly data-sly-resource="${cell @ decorationTagName='div'}"></sly>
+                        <button type="button"
+                                class="cmp-adaptiveform-table__sort-button"
+                                data-cmp-hook-table-sort="${cellList.index}"
+                                aria-label="Sort column"></button>
+                    </div>
+                </sly>
+                <sly data-sly-test="${!sortingEnabled || cell.valueMap.disableSorting}">
+                    <sly data-sly-resource="${cell @ decorationTagName='div'}"></sly>
+                </sly>
+            </th>
+        </sly>
+    </tr>
+</sly>
\ No newline at end of file
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tablerow/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tablerow/.content.xml
new file mode 100644
index 0000000000..491392d539
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tablerow/.content.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
+    jcr:primaryType="sling:Folder"/>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tablerow/v1/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tablerow/v1/.content.xml
new file mode 100644
index 0000000000..491392d539
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tablerow/v1/.content.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
+    jcr:primaryType="sling:Folder"/>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tablerow/v1/tablerow/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tablerow/v1/tablerow/.content.xml
new file mode 100644
index 0000000000..b1563aba24
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tablerow/v1/tablerow/.content.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Copyright 2026 Adobe
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
+    cq:isContainer="{Boolean}true"
+    jcr:description="Table Row component to hold table cells"
+    jcr:primaryType="cq:Component"
+    jcr:title="Table Row"
+    sling:resourceSuperType="core/fd/components/form/panelcontainer/v1/panelcontainer"
+    componentGroup=".hidden"/>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tablerow/v1/tablerow/README.md b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tablerow/v1/tablerow/README.md
new file mode 100644
index 0000000000..7d79cfcb76
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tablerow/v1/tablerow/README.md
@@ -0,0 +1,78 @@
+<!--
+Copyright 2026 Adobe
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+Adaptive Form Table Row (v1)
+====
+Adaptive Form Table Row component written in HTL. Renders a `<tr>` data row inside the table body, and supports repeatable rows with add/remove controls.
+
+## Features
+
+* Renders a data row as a semantic `<tr>` with one `<td>` per child component
+* Repeatable rows — add/remove buttons are injected into the last cell when the row is configured as repeatable (`minOccur`/`maxOccur`)
+* Add/remove button visibility is controlled by `minOccur` and `maxOccur` constraints at runtime
+* Visible, enabled, and read-only state binding for rules engine
+
+### Use Object
+The Adaptive Form Table Row component uses the `com.adobe.cq.forms.core.components.models.form.Panel` Sling Model for its Use-object (`TableRowImpl`), which exports `fd:viewType = "table-row"` for Document of Record rendering.
+
+### Edit Dialog Properties
+The following properties are written to JCR for this component and are expected to be available as `Resource` properties:
+
+1. `./name` - defines the name of the row panel, used as the field name in the form model
+2. `./minOccur` - minimum number of row instances; the remove button is hidden when this count is reached
+3. `./maxOccur` - maximum number of row instances; the add button is hidden when this count is reached
+
+## Client Libraries
+The component provides a `core.forms.components.tablerow.v1.runtime` client library category that contains the JavaScript runtime for the component.
+It should be added to a relevant site client library using the `embed` property.
+
+## Repeatable Row Behaviour
+
+At runtime, `TableRow` extends `FormView.FormPanel` and overrides two methods to integrate with the table's `<tbody>` structure:
+
+- `getRepeatableDomWrapper()` — returns the `<tr>` element as the repeatable unit
+- `getRepeatableInstancesContainerElement()` — returns the parent `<tbody>` as the insertion container
+
+When a row is added or removed, the AF `InstanceManager` inserts/removes `<tr>` elements directly inside `<tbody>`, keeping the DOM structure valid. After a column sort, `TableView#syncInstanceManagerOrderAfterSort()` realigns `InstanceManager.children` to match the reordered DOM rows.
+
+## BEM Description
+```
+BLOCK cmp-adaptiveform-tablerow
+    MODIFIER cmp-adaptiveform-tablerow__root
+    ELEMENT cmp-adaptiveform-tablecell
+        MODIFIER cmp-adaptiveform-tablecell--with-row-controls
+    ELEMENT cmp-adaptiveform-tablerow__runtime-controls
+        ELEMENT cmp-adaptiveform-tablerow__add-button
+        ELEMENT cmp-adaptiveform-tablerow__remove-button
+```
+
+## JavaScript Data Attribute Bindings
+
+Apply a `data-cmp-is="adaptiveFormTableRow"` attribute to the `<tr>` element to enable initialization.
+
+The following attributes are required for initialization:
+1. `data-cmp-is="adaptiveFormTableRow"`
+2. `data-cmp-adaptiveformcontainer-path="${formstructparser.formContainerPath}"`
+
+The following are optional attributes:
+1. `data-cmp-visible` - boolean indicating whether the row is currently visible
+2. `data-cmp-enabled` - boolean indicating whether the row is currently enabled
+3. `data-cmp-readonly` - boolean indicating whether the row is currently read-only
+
+## Information
+* **Vendor**: Adobe
+* **Version**: v1
+* **Compatibility**: Cloud
+* **Status**: production-ready
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tablerow/v1/tablerow/_cq_dialog/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tablerow/v1/tablerow/_cq_dialog/.content.xml
new file mode 100644
index 0000000000..ad7aa27943
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tablerow/v1/tablerow/_cq_dialog/.content.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Copyright 2026 Adobe
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0"
+          xmlns:granite="http://www.adobe.com/jcr/granite/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
+          xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
+    jcr:primaryType="nt:unstructured"
+    jcr:title="Adaptive Form Table Row"
+    sling:resourceType="cq/gui/components/authoring/dialog">
+    <content
+        jcr:primaryType="nt:unstructured"
+        granite:class="cmp-adaptiveform-tablerow__editdialog"
+        sling:resourceType="granite/ui/components/coral/foundation/container">
+        <items jcr:primaryType="nt:unstructured">
+            <tabs
+                jcr:primaryType="nt:unstructured"
+                sling:resourceType="granite/ui/components/coral/foundation/tabs"
+                maximized="{Boolean}true">
+                <items jcr:primaryType="nt:unstructured"
+                    sling:hideChildren="[help, accessibility, background, cq:styles, dor, advanced]">
+                    <basic
+                        jcr:primaryType="nt:unstructured"
+                        jcr:title="Basic"
+                        sling:resourceType="granite/ui/components/coral/foundation/container"
+                        margin="{Boolean}true">
+                        <items jcr:primaryType="nt:unstructured">
+                            <columns
+                                jcr:primaryType="nt:unstructured"
+                                sling:resourceType="granite/ui/components/coral/foundation/fixedcolumns"
+                                margin="{Boolean}true">
+                                <items jcr:primaryType="nt:unstructured">
+                                    <column
+                                        jcr:primaryType="nt:unstructured"
+                                        sling:resourceType="granite/ui/components/coral/foundation/container">
+                                        <items jcr:primaryType="nt:unstructured"
+                                        sling:hideChildren="[hideTitle,richTextTitle,isTitleRichText,wrapData,wrapData-typehint,useFieldset,useFieldset-typehint,layout,bindref,visible,visible-typehint,enabled,enabled-typehint,readonly,readonly-typehint,fieldType]">
+                                            <name
+                                                jcr:primaryType="nt:unstructured"
+                                                sling:resourceType="granite/ui/components/coral/foundation/include"
+                                                path="core/fd/components/form/base/v1/base/cq:dialog/content/items/tabs/items/basic/items/columns/items/column/items/name"/>
+                                            <title
+                                                jcr:primaryType="nt:unstructured"
+                                                sling:resourceType="granite/ui/components/coral/foundation/include"
+                                                granite:class="cmp-adaptiveform-base__title"
+                                                path="core/fd/components/form/base/v1/base/cq:dialog/content/items/tabs/items/basic/items/columns/items/column/items/title"/>
+                                        </items>
+                                    </column>
+                                </items>
+                            </columns>
+                        </items>
+                    </basic>
+                    <repeat
+                        jcr:primaryType="nt:unstructured"
+                        jcr:title="Repeat Panel"
+                        sling:resourceType="granite/ui/components/coral/foundation/container"
+                        margin="{Boolean}true">
+                        <items jcr:primaryType="nt:unstructured">
+                            <columns
+                                jcr:primaryType="nt:unstructured"
+                                sling:resourceType="granite/ui/components/coral/foundation/fixedcolumns"
+                                margin="{Boolean}true">
+                                <items jcr:primaryType="nt:unstructured">
+                                    <column
+                                        jcr:primaryType="nt:unstructured"
+                                        sling:resourceType="granite/ui/components/coral/foundation/container">
+                                        <items jcr:primaryType="nt:unstructured">
+                                            <repeatable
+                                                jcr:primaryType="nt:unstructured"
+                                                wrapperClass="cmp-adaptiveform-panelcontainer__repeatable"
+                                                sling:resourceType="granite/ui/components/coral/foundation/form/switch"
+                                                name="./repeatable"
+                                                fieldLabel="Make row repeatable"
+                                                checked="false"/>
+                                            <minOccur
+                                                jcr:primaryType="nt:unstructured"
+                                                wrapperClass="cmp-adaptiveform-panelcontainer__minOccur"
+                                                sling:resourceType="granite/ui/components/coral/foundation/form/numberfield"
+                                                defaultValue="1"
+                                                fieldLabel="Minimum repetitions"
+                                                min="0"
+                                                name="./minOccur"/>
+                                            <maxOccur
+                                                jcr:primaryType="nt:unstructured"
+                                                wrapperClass="cmp-adaptiveform-panelcontainer__maxOccur"
+                                                sling:resourceType="granite/ui/components/coral/foundation/form/numberfield"
+                                                emptyText="No Limit"
+                                                fieldLabel="Maximum repetitions"
+                                                min="1"
+                                                name="./maxOccur"/>
+                                        </items>
+                                    </column>
+                                </items>
+                            </columns>
+                        </items>
+                    </repeat>
+                </items>
+            </tabs>
+        </items>
+    </content>
+</jcr:root>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tablerow/v1/tablerow/_cq_editConfig.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tablerow/v1/tablerow/_cq_editConfig.xml
new file mode 100644
index 0000000000..7f663170e3
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tablerow/v1/tablerow/_cq_editConfig.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Copyright 2026 Adobe
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0"
+    jcr:primaryType="cq:EditConfig"
+    cq:actions="[edit,-,-,-]"
+    cq:dialogMode="floating"
+    cq:disableTargeting="{Boolean}true"
+    cq:isContainer="{Boolean}true"
+    cq:layout="editbar">
+    <cq:listeners
+        jcr:primaryType="cq:EditListenersConfig"
+        afteredit="REFRESH_PARENT"
+        afterchildinsert="function(editable){Granite.author.responsive.EditableActions.REFRESH.execute(editable)}"
+        afterchilddelete="function(editable){Granite.author.responsive.EditableActions.REFRESH.execute(editable)}"/>
+    <cq:actionConfigs jcr:primaryType="nt:unstructured">
+        <editexpression
+            jcr:primaryType="nt:unstructured"
+            handler="CQ.FormsCoreComponents.editorhooks.openRuleEditor"
+            icon="bidRule"
+            text="Edit Rules"/>
+        <addrow
+            jcr:primaryType="nt:unstructured"
+            condition="function(editable){return !CQ.FormsCoreComponents.editorhooks.isCoreTableHeaderRow(editable);}"
+            icon="tableRowAdd"
+            handler="CQ.FormsCoreComponents.editorhooks.addTableRow"
+            text="Add Row"/>
+        <deleterow
+            jcr:primaryType="nt:unstructured"
+            condition="function(editable){return !CQ.FormsCoreComponents.editorhooks.isCoreTableHeaderRow(editable);}"
+            handler="CQ.FormsCoreComponents.editorhooks.deleteTableRow"
+            icon="tableRowRemove"
+            text="Delete Row"/>
+        <moveup
+            jcr:primaryType="nt:unstructured"
+            condition="function(editable){return !CQ.FormsCoreComponents.editorhooks.isCoreTableHeaderRow(editable) &amp;&amp; !CQ.FormsCoreComponents.editorhooks.isFirstCoreTableRow(editable);}"
+            handler="CQ.FormsCoreComponents.editorhooks.moveTableRowUp"
+            icon="arrowUp"
+            text="Move Up"/>
+        <movedown
+            jcr:primaryType="nt:unstructured"
+            condition="function(editable){return !CQ.FormsCoreComponents.editorhooks.isCoreTableHeaderRow(editable) &amp;&amp; !CQ.FormsCoreComponents.editorhooks.isLastCoreTableRow(editable);}"
+            handler="CQ.FormsCoreComponents.editorhooks.moveTableRowDown"
+            icon="arrowDown"
+            text="Move Down"/>
+    </cq:actionConfigs>
+</jcr:root>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tablerow/v1/tablerow/clientlibs/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tablerow/v1/tablerow/clientlibs/.content.xml
new file mode 100644
index 0000000000..7d4ff0ff7b
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tablerow/v1/tablerow/clientlibs/.content.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
+    jcr:primaryType="nt:folder"/>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tablerow/v1/tablerow/clientlibs/site/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tablerow/v1/tablerow/clientlibs/site/.content.xml
new file mode 100644
index 0000000000..9da4aa046e
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tablerow/v1/tablerow/clientlibs/site/.content.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
+    jcr:primaryType="cq:ClientLibraryFolder"
+    allowProxy="{Boolean}true"
+    categories="[core.forms.components.tablerow.v1.runtime]"
+    dependencies="[core.forms.components.runtime.base]"/>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tablerow/v1/tablerow/clientlibs/site/css.txt b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tablerow/v1/tablerow/clientlibs/site/css.txt
new file mode 100644
index 0000000000..021d48c55a
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tablerow/v1/tablerow/clientlibs/site/css.txt
@@ -0,0 +1,3 @@
+
+#base=css
+tablerowview.css
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tablerow/v1/tablerow/clientlibs/site/css/tablerowview.css b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tablerow/v1/tablerow/clientlibs/site/css/tablerowview.css
new file mode 100644
index 0000000000..dcb91ae672
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tablerow/v1/tablerow/clientlibs/site/css/tablerowview.css
@@ -0,0 +1,38 @@
+/*******************************************************************************
+ * Copyright 2026 Adobe
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+
+/* All visual styles live in the theme canvas:
+ * aem-forms-theme-canvas/src/components/table/_table.scss
+ */
+
+.cmp-adaptiveform-tablecell.cmp-adaptiveform-tablecell--with-row-controls {}
+
+.cmp-adaptiveform-tablecell--with-row-controls > div:first-of-type {}
+
+.cmp-adaptiveform-tablerow__runtime-controls {}
+
+.cmp-adaptiveform-tablerow__add-button,
+.cmp-adaptiveform-tablerow__remove-button {}
+
+.cmp-adaptiveform-tablerow__add-button {}
+
+.cmp-adaptiveform-tablerow__remove-button {}
+
+.cmp-adaptiveform-tablerow__add-button[data-cmp-visible="false"],
+.cmp-adaptiveform-tablerow__remove-button[data-cmp-visible="false"] {}
+
+.cmp-adaptiveform-tablerow__add-button:focus-visible,
+.cmp-adaptiveform-tablerow__remove-button:focus-visible {}
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tablerow/v1/tablerow/clientlibs/site/js.txt b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tablerow/v1/tablerow/clientlibs/site/js.txt
new file mode 100644
index 0000000000..e2b213931a
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tablerow/v1/tablerow/clientlibs/site/js.txt
@@ -0,0 +1,2 @@
+#base=js
+tablerowview.js
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tablerow/v1/tablerow/clientlibs/site/js/tablerowview.js b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tablerow/v1/tablerow/clientlibs/site/js/tablerowview.js
new file mode 100644
index 0000000000..b4ce92923c
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tablerow/v1/tablerow/clientlibs/site/js/tablerowview.js
@@ -0,0 +1,117 @@
+/*******************************************************************************
+ * Copyright 2026 Adobe
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+(function () {
+    "use strict";
+
+    class TableRow extends FormView.FormPanel {
+
+        static NS = FormView.Constants.NS;
+        static IS = "adaptiveFormTableRow";
+        static bemBlock = 'cmp-adaptiveform-tablerow';
+        static selectors = {
+            self: "[data-" + this.NS + '-is="' + this.IS + '"]'
+        };
+
+        constructor(params) {
+            super(params);
+            this.children = [];
+        }
+
+        /**
+         * For table rows in a single tbody, the row element is the repeatable unit.
+         * In edit mode with div wrappers, return the Sling wrapper div.
+         * @returns {HTMLElement}
+         */
+        getRepeatableDomWrapper() {
+            const parent = this.element.parentElement;
+            if (parent && parent.classList && parent.classList.contains(TableRow.bemBlock)) {
+                return parent;
+            }
+            return this.element;
+        }
+
+        /**
+         * Container where sibling rows are inserted — the {@code <tbody>} or div.table__body.
+         * @returns {HTMLElement}
+         */
+        getRepeatableInstancesContainerElement() {
+            const tableBody = this.element.closest(".cmp-adaptiveform-table__body") ||
+                this.element.closest("tbody");
+            return tableBody || this.element.parentElement;
+        }
+
+        getClass() {
+            return TableRow.IS;
+        }
+
+        getWidget() {
+            return null;
+        }
+
+        getDescription() {
+            return null;
+        }
+
+        getLabel() {
+            return null;
+        }
+
+        getErrorDiv() {
+            return null;
+        }
+
+        getTooltipDiv() {
+            return null;
+        }
+
+        getQuestionMarkDiv() {
+            return null;
+        }
+
+        setFocus(id) {
+            super.setFocus(id);
+            this.setActive();
+        }
+
+        getWidgetId() {
+            return this.getId();
+        }
+
+        /**
+         * Override updateLabel to handle the table row's specific HTML structure.
+         * Table rows don't have labels in the traditional sense.
+         * @param {Object} label - The label state object.
+         */
+        updateLabel(label) {
+            // Table rows don't have visible labels, so this is a no-op
+        }
+
+        /**
+         * Override applyState for table row's specific structure.
+         * @param {Object} state - The state to be applied.
+         */
+        applyState(state) {
+            this.updateVisible(state.visible);
+            this.updateEnabled(state.enabled);
+            this.initializeHelpContent(state);
+            this.updateLabel(state.label);
+        }
+    }
+
+    FormView.Utils.setupField(({element, formContainer}) => {
+        return new TableRow({element, formContainer})
+    }, TableRow.selectors.self);
+})();
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tablerow/v1/tablerow/clientlibs/site/resources/images/add-button.svg b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tablerow/v1/tablerow/clientlibs/site/resources/images/add-button.svg
new file mode 100644
index 0000000000..6276b4360e
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tablerow/v1/tablerow/clientlibs/site/resources/images/add-button.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" aria-hidden="true">
+    <path fill="#969696" d="M11 5h2v6h6v2h-6v6h-2v-6H5v-2h6V5z"/>
+</svg>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tablerow/v1/tablerow/clientlibs/site/resources/images/remove-button.svg b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tablerow/v1/tablerow/clientlibs/site/resources/images/remove-button.svg
new file mode 100644
index 0000000000..0347e252da
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tablerow/v1/tablerow/clientlibs/site/resources/images/remove-button.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" aria-hidden="true">
+    <path fill="#969696" d="M5 11h14v2H5v-2z"/>
+</svg>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tablerow/v1/tablerow/tablerow.html b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tablerow/v1/tablerow/tablerow.html
new file mode 100644
index 0000000000..b97c50c484
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tablerow/v1/tablerow/tablerow.html
@@ -0,0 +1,62 @@
+<!--/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Copyright 2026 Adobe
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/-->
+<sly data-sly-use.row="com.adobe.cq.forms.core.components.models.form.Panel"
+     data-sly-use.formstructparser="com.adobe.cq.forms.core.components.models.form.FormStructureParser"></sly>
+<!--/* EDIT MODE: hand-rendered <tr> with Granite editable markers so the overlay
+     can bind to the real row instead of foster-parenting to the <table>. */-->
+<sly data-sly-test="${wcmmode.edit}">
+    <tr class="cmp-adaptiveform-tablerow cq-Editable-dom cq-Editable-dom--container"
+        data-cq-data-path="${resource.path}">
+        <sly data-sly-list.cell="${resource.listChildren}">
+            <td class="cmp-adaptiveform-tablecell"
+                data-sly-attribute.colspan="${cell.valueMap.colspan}">
+                <sly data-sly-resource="${cell @ decorationTagName='div'}"></sly>
+            </td>
+        </sly>
+    </tr>
+</sly>
+<!--/* PUBLISH MODE: semantic <tr>/<td> with repeatable row controls. */-->
+<sly data-sly-test="${!wcmmode.edit}">
+    <tr id="${row.id}"
+        class="cmp-adaptiveform-tablerow cmp-adaptiveform-tablerow__root"
+        data-cmp-is="adaptiveFormTableRow"
+        data-cmp-adaptiveformcontainer-path="${formstructparser.formContainerPath}"
+        data-cmp-visible="${row.visible ? 'true' : 'false'}"
+        data-cmp-enabled="${row.enabled ? 'true' : 'false'}"
+        data-cmp-readonly="${row.readOnly ? 'true' : 'false'}">
+        <sly data-sly-list.cell="${resource.listChildren}">
+            <td class="cmp-adaptiveform-tablecell${row.repeatable && cellList.last ? ' cmp-adaptiveform-tablecell--with-row-controls' : ''}"
+                data-sly-attribute.colspan="${cell.valueMap.colspan}">
+                <sly data-sly-resource="${cell @ decorationTagName='div'}"></sly>
+                <sly data-sly-test="${row.repeatable && cellList.last}">
+                    <div class="cmp-adaptiveform-tablerow__runtime-controls"
+                         role="group">
+                        <button type="button"
+                                class="cmp-adaptiveform-tablerow__add-button"
+                                data-cmp-hook-add-instance="${row.id}"
+                                title="Add row"
+                                aria-label="Add row"></button>
+                        <button type="button"
+                                class="cmp-adaptiveform-tablerow__remove-button"
+                                data-cmp-hook-remove-instance="${row.id}"
+                                title="Remove row"
+                                aria-label="Remove row"></button>
+                    </div>
+                </sly>
+            </td>
+        </sly>
+    </tr>
+</sly>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/text/v1/text/_cq_editConfig.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/text/v1/text/_cq_editConfig.xml
index 49933fa77a..2a944496c4 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/text/v1/text/_cq_editConfig.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/text/v1/text/_cq_editConfig.xml
@@ -150,5 +150,47 @@
                 handler="CQ.FormsCoreComponents.editorhooks.viewQualifiedName"
                 icon="viewSOMExpression"
                 text="View Qualified Name"/>
+        <addcolumn
+                jcr:primaryType="nt:unstructured"
+                condition="function(editable){ return CQ.FormsCoreComponents.editorhooks.isCoreTableHeaderCell(editable); }"
+                handler="CQ.FormsCoreComponents.editorhooks.addTableColumn"
+                hidden="{Boolean}true"
+                icon="columnAdd"
+                text="Add Column"/>
+        <delcolumn
+                jcr:primaryType="nt:unstructured"
+                condition="function(editable){ return CQ.FormsCoreComponents.editorhooks.isCoreTableHeaderCell(editable); }"
+                handler="CQ.FormsCoreComponents.editorhooks.deleteTableColumn"
+                hidden="{Boolean}true"
+                icon="tableColumnRemove"
+                text="Delete Column"/>
+        <mergerowcells
+                jcr:primaryType="nt:unstructured"
+                condition="function(editable){ return CQ.FormsCoreComponents.editorhooks.isCoreTableRowCell(editable); }"
+                handler="CQ.FormsCoreComponents.editorhooks.mergeTableRowCells"
+                hidden="{Boolean}true"
+                icon="tableMergeCells"
+                text="Merge Cells"/>
+        <splitrowcell
+                jcr:primaryType="nt:unstructured"
+                condition="function(editable){ return CQ.FormsCoreComponents.editorhooks.isMergedRowCell(editable); }"
+                handler="CQ.FormsCoreComponents.editorhooks.splitTableRowCell"
+                hidden="{Boolean}true"
+                icon="tableCellsSplit"
+                text="Split Cell"/>
+        <removecolumnsorting
+                jcr:primaryType="nt:unstructured"
+                condition="function(editable){ return CQ.FormsCoreComponents.editorhooks.isCoreTableHeaderCellSortingEnabled(editable); }"
+                handler="CQ.FormsCoreComponents.editorhooks.removeColumnSorting"
+                hidden="{Boolean}true"
+                icon="filterRemove"
+                text="Remove Sorting"/>
+        <enablecolumnsorting
+                jcr:primaryType="nt:unstructured"
+                condition="function(editable){ return CQ.FormsCoreComponents.editorhooks.isCoreTableHeaderCellSortingDisabled(editable); }"
+                handler="CQ.FormsCoreComponents.editorhooks.enableColumnSorting"
+                hidden="{Boolean}true"
+                icon="filterAdd"
+                text="Enable Sorting"/>
     </cq:actionConfigs>
 </jcr:root>
\ No newline at end of file
diff --git a/ui.frontend/src/utils.js b/ui.frontend/src/utils.js
index af11c7f6bc..68867f5fbf 100644
--- a/ui.frontend/src/utils.js
+++ b/ui.frontend/src/utils.js
@@ -143,13 +143,17 @@ class Utils {
 
     /**
      * Creates fields from all registered fieldCreators present inside addedElement, for given form container.
+     * Also checks if the addedElement itself matches a field selector (querySelectorAll only matches descendants).
      * @param {Element} addedElement - The added element.
      * @param {module:FormView~FormContainer} formContainer - The form container.
      */
     static createFieldsForAddedElement(addedElement, formContainer) {
         Object.values(Utils.#fieldCreatorOrder).forEach(function (fieldSelector) {
             let fieldCreatorSet = Utils.#fieldCreatorSets[fieldSelector];
-            const fieldElements = addedElement.querySelectorAll(fieldCreatorSet['fieldSelector']);
+            const fieldElements = Array.from(addedElement.querySelectorAll(fieldCreatorSet['fieldSelector']));
+            if (addedElement.matches && addedElement.matches(fieldCreatorSet['fieldSelector'])) {
+                fieldElements.unshift(addedElement);
+            }
             Utils.#createFormContainerFields(fieldElements, fieldCreatorSet['fieldCreator'], formContainer);
         });
     }
@@ -202,10 +206,13 @@ class Utils {
      * @param {module:FormView~FormContainer} formContainer - The form container.
      */
     static #removeChildReferences(fieldView, formContainer) {
+        if (!fieldView) {
+            return;
+        }
         let childViewList = fieldView.children;
         if (childViewList) {
             for (let index = 0; index < childViewList.length; index++) {
-                Utils.#removeChildReferences(childViewList[index]);
+                Utils.#removeChildReferences(childViewList[index], formContainer);
             }
         }
         //remove instanceManger for child repeatable panel
@@ -221,10 +228,13 @@ class Utils {
      * @param {module:FormView~FormContainer} formContainer - The form container.
      */
     static removeFieldReferences(fieldView, formContainer) {
+        if (!fieldView) {
+            return;
+        }
         let childViewList = fieldView.children;
         if (childViewList) {
             for (let index = 0; index < childViewList.length; index++) {
-                Utils.#removeChildReferences(childViewList[index]);
+                Utils.#removeChildReferences(childViewList[index], formContainer);
             }
         }
         Utils.#removeFieldId(formContainer, fieldView.id);
@@ -232,11 +242,16 @@ class Utils {
 
     /**
      * Update the id inside the given html element.
+     * Also checks if the root element itself has the id (querySelectorAll only matches descendants).
      * @param {Element} htmlElement - The HTML element.
      * @param {string} oldId - The old ID.
      * @param {string} newId - The new ID.
      */
     static updateId(htmlElement, oldId, newId) {
+        if (htmlElement.id === oldId) {
+            htmlElement.id = newId;
+            return;
+        }
         let elementWithId = htmlElement.querySelectorAll("#" + oldId)[0];
         if (elementWithId) {
             elementWithId.id = newId;
diff --git a/ui.frontend/src/view/FormPanel.js b/ui.frontend/src/view/FormPanel.js
index 9aaf8256e4..5df19ff80f 100644
--- a/ui.frontend/src/view/FormPanel.js
+++ b/ui.frontend/src/view/FormPanel.js
@@ -36,6 +36,24 @@ class FormPanel extends FormFieldBase {
         this.children = [];
     }
 
+    /**
+     * DOM container where repeatable sibling instances live (InstanceManager parentElement,
+     * e.g. for getElementAt). Override in layout-specific panels (table row: tbody / table body div).
+     * @returns {HTMLElement|undefined}
+     */
+    getRepeatableInstancesContainerElement() {
+        return this.element.parentElement?.parentElement;
+    }
+
+    /**
+     * DOM node cloned as the repeat template and removed with the instance.
+     * Default: parent of the field root. Override when the repeatable unit differs (e.g. Sling wrapper vs tr).
+     * @returns {HTMLElement|undefined}
+     */
+    getRepeatableDomWrapper() {
+        return this.element.parentElement;
+    }
+
     /**
      * Instantiates the InstanceManager for the FormPanel.
      * @returns {InstanceManager} The newly instantiated InstanceManager.
@@ -44,7 +62,7 @@ class FormPanel extends FormFieldBase {
         return new InstanceManager({
             "formContainer": this.formContainer,
             "model": this._model.parent,
-            "parentElement": this.element.parentElement.parentElement
+            "parentElement": this.getRepeatableInstancesContainerElement()
         });
     }
 
@@ -318,8 +336,11 @@ class FormPanel extends FormFieldBase {
      * @param {Object} childView - The child view.
      * @returns {HTMLElement} The repeatable root element.
      */
-    getRepeatableRootElement(childView){
-      return childView.element.parentElement;
+    getRepeatableRootElement(childView) {
+        if (typeof childView.getRepeatableDomWrapper === "function") {
+            return childView.getRepeatableDomWrapper();
+        }
+        return childView.element.parentElement;
     }
 
     /**
diff --git a/ui.frontend/src/view/InstanceManager.js b/ui.frontend/src/view/InstanceManager.js
index 28a69fe11e..8dd95b32a3 100644
--- a/ui.frontend/src/view/InstanceManager.js
+++ b/ui.frontend/src/view/InstanceManager.js
@@ -55,12 +55,10 @@ class InstanceManager {
         let addedHtmlElement = null;
         if (instanceView == null) {
             addedHtmlElement = this.#addChildInstance(instanceModel, beforeElement);
-            Utils.createFieldsForAddedElement(addedHtmlElement, this.formContainer);
         } else if (instanceModel == null) {
             this.#removeChildInstance(instanceView.getModel());
         } else if (instanceView.getId() != instanceModel.id) {
             addedHtmlElement = this.#addChildInstance(instanceModel, beforeElement);
-            Utils.createFieldsForAddedElement(addedHtmlElement, this.formContainer);
             this.#removeChildInstance(instanceView.getModel());
         }
         return addedHtmlElement;
@@ -135,8 +133,11 @@ class InstanceManager {
          this.parentElement.insertBefore(markerElement, repeatableElement);
          this.markerElement = markerElement;
          **/
+        const wrapper = (typeof childView.getRepeatableDomWrapper === "function")
+            ? childView.getRepeatableDomWrapper()
+            : repeatableElement;
         //adding template
-        this._templateHTML = repeatableElement.cloneNode(true);
+        this._templateHTML = wrapper.cloneNode(true);
         let childModel = childView.getModel();
         // In case of removed instance by prefill, that is index is -1, model is not associated with view
         if (!childModel) {
@@ -173,7 +174,11 @@ class InstanceManager {
             console.error('Panel needs to have templateHTML to support repeatability.');
             return;
         }
-        return this.handleAddition(addedModel, beforeElement);
+        const addedHtmlElement = this.handleAddition(addedModel, beforeElement);
+        if (addedHtmlElement) {
+            Utils.createFieldsForAddedElement(addedHtmlElement, this.formContainer);
+        }
+        return addedHtmlElement;
     }
 
     /**
@@ -182,15 +187,27 @@ class InstanceManager {
      * @private
      */
     #removeChildInstance(removedModel) {
-        const removedIndex = removedModel.index;
-        let removedChildView = this.children[removedIndex];
-        if (removedIndex == -1) {
-            //That is, model was removed by prefill, and instance manager was synced with child already removed
+        if (!removedModel || !removedModel.id) {
+            return;
+        }
+        let removedChildView = this.children.find((cv) => cv && cv.getId() === removedModel.id);
+        if (!removedChildView && typeof removedModel.index === "number" && removedModel.index >= 0
+            && removedModel.index < this.children.length) {
+            removedChildView = this.children[removedModel.index];
+        }
+        if (!removedChildView) {
             removedChildView = this.formContainer.getField(removedModel.id);
         }
+        if (!removedChildView) {
+            console.warn("InstanceManager: no view for removed instance", removedModel.id);
+            return;
+        }
+        const removedIndex = this.children.indexOf(removedChildView);
         Utils.removeFieldReferences(removedChildView, this.formContainer);
         this.handleRemoval(removedChildView);
-        this.children.splice(removedIndex, 1);
+        if (removedIndex >= 0) {
+            this.children.splice(removedIndex, 1);
+        }
 
         const event = new CustomEvent(Constants.PANEL_INSTANCE_REMOVED, {"detail": removedChildView});
         this.formContainer.getFormElement().dispatchEvent(event);
@@ -314,8 +331,15 @@ class InstanceManager {
             //give parentView chance to adjust to removed instance
             this.repeatableParentView.handleChildRemoval(removedInstanceView);
         }
-        //removing just the parent view HTML child instance, to avoid repainting of UI for removal of each child HTML
-        removedInstanceView.element.parentElement.remove();
+        let toRemove;
+        if (typeof removedInstanceView.getRepeatableDomWrapper === "function") {
+            toRemove = removedInstanceView.getRepeatableDomWrapper();
+        } else {
+            toRemove = removedInstanceView.element.parentElement;
+        }
+        if (toRemove && toRemove.parentElement) {
+            toRemove.remove();
+        }
     }
 
     /**
diff --git a/ui.tests/test-module/libs/commons/formsConstants.js b/ui.tests/test-module/libs/commons/formsConstants.js
index e32138ba4a..be379291ac 100644
--- a/ui.tests/test-module/libs/commons/formsConstants.js
+++ b/ui.tests/test-module/libs/commons/formsConstants.js
@@ -51,7 +51,10 @@ var formsConstants = {
                 "termsandconditions": "/apps/forms-components-examples/components/form/termsandconditions",
                 "submitButton": "/apps/forms-components-examples/components/form/actions/submit",
                 "review": "/apps/forms-components-examples/components/form/review",
-                "scribble": "/apps/forms-components-examples/components/form/scribble"
+                "scribble": "/apps/forms-components-examples/components/form/scribble",
+                "table": "/apps/forms-components-examples/components/form/table",
+                "tablerow": "/apps/forms-components-examples/components/form/tablerow",
+                "tableheader": "/apps/forms-components-examples/components/form/tableheader"
             }
         },
         resourceType : {
diff --git a/ui.tests/test-module/specs/repeatable/repeatable.updatelabel.cy.js b/ui.tests/test-module/specs/repeatable/repeatable.updatelabel.cy.js
index e442a68510..da12cd3dc1 100644
--- a/ui.tests/test-module/specs/repeatable/repeatable.updatelabel.cy.js
+++ b/ui.tests/test-module/specs/repeatable/repeatable.updatelabel.cy.js
@@ -54,10 +54,27 @@ describe("Form Runtime with Panel Container", () => {
                 checkLabelText(textinputid2, panelid2, 'Text Input2', 'Panel2');
 
                 // remove instance and check label update
-                cy.get(`#${removeButton}`).find("button").click().then(() => {
-                    const [textinputid11, fieldView10] = Object.entries(formContainer._fields)[4];
-                    const [panelid11, fieldView11] = Object.entries(formContainer._fields)[5];
-                    checkLabelText(textinputid11, panelid11, 'Text Input2', 'Panel2');
+                // find Panel[1]'s remove button by its model index
+                const removeBtn1 = Object.values(formContainer._fields).find(f =>
+                    f.getModel &&
+                    f.getModel()?.fieldType === 'button' &&
+                    f.getModel()?.label?.value === 'Remove' &&
+                    f.getModel()?.parent?.index === 1
+                );
+                cy.get(`#${removeBtn1.getId()}`).find("button").click().then(() => {
+                    // after Panel[1] removed, find the surviving panel at index 1 by model
+                    const panel1remaining = Object.values(formContainer._fields).find(f =>
+                        f.getModel &&
+                        f.getModel()?.fieldType === 'panel' &&
+                        f.getModel()?.repeatable === true &&
+                        f.getModel()?.index === 1
+                    );
+                    const textinput1remaining = Object.values(formContainer._fields).find(f =>
+                        f.getModel &&
+                        f.getModel()?.fieldType === 'text-input' &&
+                        f.getModel()?.parent?.id === panel1remaining.getModel().id
+                    );
+                    checkLabelText(textinput1remaining.getId(), panel1remaining.getId(), 'Text Input2', 'Panel2');
                 });
             });
         });
diff --git a/ui.tests/test-module/specs/table/table.authoring.cy.js b/ui.tests/test-module/specs/table/table.authoring.cy.js
new file mode 100644
index 0000000000..bb9b802221
--- /dev/null
+++ b/ui.tests/test-module/specs/table/table.authoring.cy.js
@@ -0,0 +1,245 @@
+/*
+ *  Copyright 2026 Adobe Systems Incorporated
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+const sitesSelectors = require('../../libs/commons/sitesSelectors'),
+    afConstants = require('../../libs/commons/formsConstants');
+
+describe('Page - Authoring', function () {
+
+    const pagePath = "/content/forms/af/core-components-it/blank";
+    const tableSamplePagePath = "/content/forms/af/core-components-it/samples/table/basic";
+
+    const formContainerDropZone = pagePath + afConstants.FORM_EDITOR_FORM_CONTAINER_SUFFIX + "/*";
+    const formContainerDropZoneSelector = sitesSelectors.overlays.overlay.component + "[data-path='" + formContainerDropZone + "']";
+
+    const tableEditPath = pagePath + afConstants.FORM_EDITOR_FORM_CONTAINER_SUFFIX + "/table";
+    const tableEditPathSelector = "[data-path='" + tableEditPath + "']";
+
+    const repeatableRowEditPath = tableSamplePagePath + afConstants.FORM_EDITOR_FORM_CONTAINER_SUFFIX + "/table/row2";
+    const repeatableRowEditPathSelector = "[data-path='" + repeatableRowEditPath + "']";
+
+    const tableHeaderJcrPath = tableSamplePagePath + afConstants.FORM_EDITOR_FORM_CONTAINER_SUFFIX + "/table/header";
+
+    /**
+     * Opens the editable toolbar for the first direct-child cell of the given header container.
+     */
+    const openFirstHeaderCellToolbar = function (headerContainerPath) {
+        cy.get(sitesSelectors.overlays.overlay.component).then($overlays => {
+            const prefix = headerContainerPath + "/";
+            const firstChildOverlay = [...$overlays].find(el => {
+                const p = el.getAttribute('data-path') || '';
+                return p.startsWith(prefix) && p.slice(prefix.length).indexOf('/') === -1;
+            });
+            expect(firstChildOverlay, 'first header cell overlay should exist').to.exist;
+            const childSelector = "[data-path='" + firstChildOverlay.getAttribute('data-path') + "']";
+            cy.openEditableToolbar(sitesSelectors.overlays.overlay.component + childSelector);
+        });
+    };
+
+    const dropTableInContainer = function () {
+        cy.selectLayer("Edit");
+        cy.insertComponent(formContainerDropZoneSelector, "Adaptive Form Table", afConstants.components.forms.resourceType.table);
+        cy.get('body').click(0, 0);
+    };
+
+    // -------------------------------------------------------------------------
+    // Basic authoring: insert, configure dialog, delete
+    // -------------------------------------------------------------------------
+
+    context('Open Forms Editor', function () {
+
+        beforeEach(function () {
+            cy.openAuthoring(pagePath);
+        });
+
+        it('insert Table in form container', function () {
+            dropTableInContainer();
+            cy.deleteComponentByPath(tableEditPath);
+        });
+
+        it('open edit dialog of Table and verify dialog fields', function () {
+            dropTableInContainer();
+            cy.openEditableToolbar(sitesSelectors.overlays.overlay.component + tableEditPathSelector);
+            cy.invokeEditableAction("[data-action='CONFIGURE']");
+
+            cy.get("[name='./jcr:title']").should("exist");
+            cy.get("[name='./name']").should("exist");
+            cy.get("[name='./columnWidth']").should("exist");
+            cy.get("[name='./enableSorting']").should("exist");
+            cy.get('.cq-dialog-cancel').click();
+            cy.deleteComponentByPath(tableEditPath);
+        });
+    });
+
+    // -------------------------------------------------------------------------
+    // TableRow dialog: Repeat Panel tab
+    // -------------------------------------------------------------------------
+
+    context('Open Forms Editor with sample table page', function () {
+
+        beforeEach(function () {
+            cy.openAuthoring(tableSamplePagePath);
+        });
+
+        it('open Repeat Panel tab of TableRow dialog and verify repeatability fields', function () {
+            cy.openEditableToolbar(sitesSelectors.overlays.overlay.component + repeatableRowEditPathSelector);
+            cy.invokeEditableAction("[data-action='CONFIGURE']");
+
+            cy.get("coral-tab").contains("Repeat Panel").click();
+
+            cy.get("[name='./repeatable']").should("exist");
+            cy.get("[name='./minOccur']").should("exist");
+            cy.get("[name='./maxOccur']").should("exist");
+
+            cy.get('.cq-dialog-cancel').click();
+        });
+    });
+
+    // -------------------------------------------------------------------------
+    // Column add
+    // -------------------------------------------------------------------------
+
+    context('Column add in Forms Editor', function () {
+
+        beforeEach(function () {
+            cy.openAuthoring(tableSamplePagePath);
+        });
+
+        it('add column via toolbar action on header cell', function () {
+            cy.getContentIFrameBody().find('.cmp-adaptiveform-tablehead').then($cells => {
+                const initialCount = $cells.length;
+
+                openFirstHeaderCellToolbar(tableHeaderJcrPath);
+                cy.invokeEditableAction("[data-action='addcolumn']");
+
+                cy.getContentIFrameBody().find('.cmp-adaptiveform-tablehead')
+                    .should('have.length', initialCount + 1);
+            });
+        });
+    });
+
+    // -------------------------------------------------------------------------
+    // Column delete
+    // -------------------------------------------------------------------------
+
+    context('Column delete in Forms Editor', function () {
+
+        beforeEach(function () {
+            cy.openAuthoring(tableSamplePagePath);
+        });
+
+        it('delete column via toolbar action on header cell', function () {
+            cy.getContentIFrameBody().find('.cmp-adaptiveform-tablehead').then($cells => {
+                const initialCount = $cells.length;
+
+                openFirstHeaderCellToolbar(tableHeaderJcrPath);
+                cy.invokeEditableAction("[data-action='delcolumn']");
+
+                cy.get('coral-dialog.is-open').should('be.visible');
+                cy.get('coral-dialog.is-open button').contains('Yes').click({ force: true });
+
+                cy.getContentIFrameBody().find('.cmp-adaptiveform-tablehead')
+                    .should('have.length', initialCount - 1);
+            });
+        });
+    });
+
+    // -------------------------------------------------------------------------
+    // Sorting: enable/disable per column via toolbar actions
+    // Sample page: /samples/table/sorting
+    //   enableSorting=true on the table; column1 is sortable; column2 has disableSorting=true.
+    // -------------------------------------------------------------------------
+
+    context('Sorting: disable per-column sort in Forms Editor', function () {
+
+        const sortingSamplePagePath = "/content/forms/af/core-components-it/samples/table/sorting";
+        const sortingTableHeaderJcrPath = sortingSamplePagePath + afConstants.FORM_EDITOR_FORM_CONTAINER_SUFFIX + "/table/header";
+
+        const openSortingHeaderCellToolbar = (nodeName) => {
+            const cellPath = sortingTableHeaderJcrPath + "/" + nodeName;
+            const selector = sitesSelectors.overlays.overlay.component + "[data-path='" + cellPath + "']";
+            // Wait for both the overlay and the content iframe table to be stable
+            // before opening the toolbar, so the editable's dom reference is wired up
+            // and the toolbar condition functions read the correct DOM state.
+            cy.getContentIFrameBody()
+                .find('.cmp-adaptiveform-table[data-cmp-sorting-enabled]')
+                .should('exist');
+            cy.get(selector).should('exist');
+            cy.openEditableToolbar(selector);
+        };
+
+        beforeEach(function () {
+            // Suppress uncaught exceptions from AEM authoring code (e.g. editable tree
+            // not fully loaded when refresh() runs) so they don't abort the test.
+            cy.on('uncaught:exception', () => false);
+            cy.openAuthoring(sortingSamplePagePath);
+        });
+
+        it('column1 (sort enabled) shows a sort button in the authoring DOM', function () {
+            cy.getContentIFrameBody()
+                .find('.cmp-adaptiveform-table__head .cmp-adaptiveform-tablehead').eq(0)
+                .find('.cmp-adaptiveform-table__sort-button')
+                .should('exist');
+        });
+
+        it('column2 (disableSorting=true) has no sort button in the authoring DOM', function () {
+            cy.getContentIFrameBody()
+                .find('.cmp-adaptiveform-table__head .cmp-adaptiveform-tablehead').eq(1)
+                .find('.cmp-adaptiveform-table__sort-button')
+                .should('not.exist');
+        });
+
+        it('table element has data-cmp-sorting-enabled="true" in authoring mode', function () {
+            cy.getContentIFrameBody()
+                .find('.cmp-adaptiveform-table[data-cmp-sorting-enabled="true"]')
+                .should('exist');
+        });
+
+        it('removecolumnsorting on column1 removes its sort button', function () {
+            cy.getContentIFrameBody()
+                .find('.cmp-adaptiveform-table__head .cmp-adaptiveform-tablehead').eq(0)
+                .find('.cmp-adaptiveform-table__sort-button')
+                .should('exist');
+
+            // Open toolbar first — AEM fires selection POSTs during overlay click.
+            // Register the intercept only after the toolbar is open so we don't catch
+            // one of those AEM-internal POSTs instead of the disableSorting POST.
+            openSortingHeaderCellToolbar('column1');
+
+            const column1Path = sortingTableHeaderJcrPath + "/column1";
+            cy.intercept('POST', column1Path).as('removeSort');
+
+            cy.invokeEditableAction("[data-action='removecolumnsorting']");
+            cy.wait('@removeSort');
+        });
+
+        it('enablecolumnsorting on column2 adds its sort button', function () {
+            cy.getContentIFrameBody()
+                .find('.cmp-adaptiveform-table__head .cmp-adaptiveform-tablehead').eq(1)
+                .find('.cmp-adaptiveform-table__sort-button')
+                .should('not.exist');
+
+            // Same: register intercept after toolbar open to avoid catching AEM selection POSTs.
+            openSortingHeaderCellToolbar('column2');
+
+            const column2Path = sortingTableHeaderJcrPath + "/column2";
+            cy.intercept('POST', column2Path).as('enableSort');
+
+            cy.invokeEditableAction("[data-action='enablecolumnsorting']");
+            cy.wait('@enableSort');
+        });
+    });
+});
diff --git a/ui.tests/test-module/specs/table/table.columnwidth.runtime.cy.js b/ui.tests/test-module/specs/table/table.columnwidth.runtime.cy.js
new file mode 100644
index 0000000000..6681bbf1f1
--- /dev/null
+++ b/ui.tests/test-module/specs/table/table.columnwidth.runtime.cy.js
@@ -0,0 +1,133 @@
+/*
+ *  Copyright 2026 Adobe Systems Incorporated
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+/**
+ * Runtime column-width tests for the table component.
+ *
+ * Sample page: content/forms/af/core-components-it/samples/table/columnwidth
+ *   - columnWidth="1,2,1"  →  proportional: col0=25%, col1=50%, col2=25%
+ *   - 3 header columns, 1 static data row
+ */
+describe('Form Runtime with Table - Column Width Tests', () => {
+
+    const pagePath = "content/forms/af/core-components-it/samples/table/columnwidth.html";
+    let formContainer = null;
+
+    beforeEach(() => {
+        cy.previewForm(pagePath).then(p => {
+            formContainer = p;
+        });
+    });
+
+    // -------------------------------------------------------------------------
+    // <colgroup> / <col> presence and count
+    // -------------------------------------------------------------------------
+
+    it('renders a <colgroup> element when columnWidth is configured', () => {
+        const allFields = formContainer.getAllFields();
+        const tableView = Object.values(allFields).find(f => f.getClass && f.getClass() === 'adaptiveFormTable');
+        const tableId = tableView.getId();
+
+        cy.get(`#${tableId} table.cmp-adaptiveform-table__widget colgroup`)
+            .should('exist');
+    });
+
+    it('renders the correct number of <col> elements matching the column count', () => {
+        const allFields = formContainer.getAllFields();
+        const tableView = Object.values(allFields).find(f => f.getClass && f.getClass() === 'adaptiveFormTable');
+        const tableId = tableView.getId();
+
+        // columnWidth="1,2,1" → 3 columns
+        cy.get(`#${tableId} table.cmp-adaptiveform-table__widget colgroup col`)
+            .should('have.length', 3);
+    });
+
+    // -------------------------------------------------------------------------
+    // Proportional widths: 1,2,1 → 25%, 50%, 25%
+    // -------------------------------------------------------------------------
+
+    it('first <col> has width close to 25% (weight 1 of sum 4)', () => {
+        const allFields = formContainer.getAllFields();
+        const tableView = Object.values(allFields).find(f => f.getClass && f.getClass() === 'adaptiveFormTable');
+        const tableId = tableView.getId();
+
+        cy.get(`#${tableId} table.cmp-adaptiveform-table__widget colgroup col`).eq(0)
+            .invoke('attr', 'style')
+            .then(style => {
+                // style should contain "width: 25%" or "width:25%"
+                expect(style).to.match(/width\s*:\s*25%/);
+            });
+    });
+
+    it('second <col> has width close to 50% (weight 2 of sum 4)', () => {
+        const allFields = formContainer.getAllFields();
+        const tableView = Object.values(allFields).find(f => f.getClass && f.getClass() === 'adaptiveFormTable');
+        const tableId = tableView.getId();
+
+        cy.get(`#${tableId} table.cmp-adaptiveform-table__widget colgroup col`).eq(1)
+            .invoke('attr', 'style')
+            .then(style => {
+                expect(style).to.match(/width\s*:\s*50%/);
+            });
+    });
+
+    it('third <col> has width close to 25% (weight 1 of sum 4)', () => {
+        const allFields = formContainer.getAllFields();
+        const tableView = Object.values(allFields).find(f => f.getClass && f.getClass() === 'adaptiveFormTable');
+        const tableId = tableView.getId();
+
+        cy.get(`#${tableId} table.cmp-adaptiveform-table__widget colgroup col`).eq(2)
+            .invoke('attr', 'style')
+            .then(style => {
+                expect(style).to.match(/width\s*:\s*25%/);
+            });
+    });
+
+
+    // -------------------------------------------------------------------------
+    // Basic structure still intact
+    // -------------------------------------------------------------------------
+
+    it('still renders the correct number of header columns', () => {
+        const allFields = formContainer.getAllFields();
+        const tableView = Object.values(allFields).find(f => f.getClass && f.getClass() === 'adaptiveFormTable');
+        const tableId = tableView.getId();
+
+        cy.get(`#${tableId} thead th.cmp-adaptiveform-tablehead`).should('have.length', 3);
+    });
+
+    it('no sort buttons are rendered (sorting not enabled on this table)', () => {
+        const allFields = formContainer.getAllFields();
+        const tableView = Object.values(allFields).find(f => f.getClass && f.getClass() === 'adaptiveFormTable');
+        const tableId = tableView.getId();
+
+        cy.get(`#${tableId} .cmp-adaptiveform-table__sort-button`).should('not.exist');
+    });
+
+    // -------------------------------------------------------------------------
+    // Without columnWidth the basic page renders no colgroup (regression guard)
+    // -------------------------------------------------------------------------
+
+    it('basic sample page (no columnWidth) has no <colgroup>', () => {
+        cy.previewForm('content/forms/af/core-components-it/samples/table/basic.html').then(fc => {
+            const allFields = fc.getAllFields();
+            const tableView = Object.values(allFields).find(f => f.getClass && f.getClass() === 'adaptiveFormTable');
+            const tableId = tableView.getId();
+
+            cy.get(`#${tableId} table.cmp-adaptiveform-table__widget colgroup`).should('not.exist');
+        });
+    });
+});
diff --git a/ui.tests/test-module/specs/table/table.mergesplit.authoring.cy.js b/ui.tests/test-module/specs/table/table.mergesplit.authoring.cy.js
new file mode 100644
index 0000000000..48c221bf41
--- /dev/null
+++ b/ui.tests/test-module/specs/table/table.mergesplit.authoring.cy.js
@@ -0,0 +1,131 @@
+/***************************************************************************
+ *  Copyright 2026 Adobe Systems Incorporated
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ ****************************************************************************/
+
+const sitesSelectors = require('../../libs/commons/sitesSelectors'),
+    afConstants = require('../../libs/commons/formsConstants');
+
+describe('Page - Authoring - Table Row Merge/Split', function () {
+
+    const tableSamplePagePath = "/content/forms/af/core-components-it/samples/table/mergesplit";
+    const tableJcrPath = tableSamplePagePath + afConstants.FORM_EDITOR_FORM_CONTAINER_SUFFIX + "/table";
+    const row1JcrPath = tableJcrPath + "/row1";
+    const row2JcrPath = tableJcrPath + "/row2";
+
+    const openRowCellToolbarByIndex = (rowPath, index) => {
+        cy.getContentIFrameBody()
+            .find('.cmp-adaptiveform-table__body')
+            .should('exist');
+        cy.get(sitesSelectors.overlays.overlay.component).then($overlays => {
+            const prefix = rowPath + "/";
+            const childOverlays = [...$overlays].filter(el => {
+                const p = el.getAttribute('data-path') || '';
+                return p.startsWith(prefix) && p.slice(prefix.length).indexOf('/') === -1;
+            });
+            expect(childOverlays.length, `should have at least ${index + 1} cell overlays under ${rowPath}`).to.be.gt(index);
+            const selector = "[data-path='" + childOverlays[index].getAttribute('data-path') + "']";
+            cy.openEditableToolbar(sitesSelectors.overlays.overlay.component + selector);
+        });
+    };
+    context('Verify pre-merged row cell state', function () {
+        beforeEach(function () {
+            cy.openAuthoring(tableSamplePagePath);
+        });
+        it('merged cell renders with colspan="2" on .cmp-adaptiveform-tablecell in authoring DOM', function () {
+            cy.getContentIFrameBody()
+                .find('.cmp-adaptiveform-table__body .cmp-adaptiveform-tablerow').first()
+                .find('.cmp-adaptiveform-tablecell[colspan="2"]')
+                .should('exist');
+        });
+
+        it('row2 cells have no colspan attribute (all unmerged)', function () {
+            cy.getContentIFrameBody()
+                .find('.cmp-adaptiveform-table__body .cmp-adaptiveform-tablerow').eq(1)
+                .find('.cmp-adaptiveform-tablecell[colspan]')
+                .should('not.exist');
+        });
+    });
+
+    context('Split row cell in Forms Editor', function () {
+
+        beforeEach(function () {
+            cy.on('uncaught:exception', () => false);
+            cy.openAuthoring(tableSamplePagePath);
+        });
+
+        it('splitrowcell removes colspan and increases the row cell count by 1', function () {
+            cy.getContentIFrameBody()
+                .find('.cmp-adaptiveform-table__body .cmp-adaptiveform-tablerow').eq(0)
+                .find('.cmp-adaptiveform-tablecell').then($cells => {
+                    const beforeCount = $cells.length;
+                    cy.getContentIFrameBody()
+                        .find('.cmp-adaptiveform-table__body .cmp-adaptiveform-tablerow').eq(0)
+                        .find('.cmp-adaptiveform-tablecell[colspan="2"]')
+                        .should('exist');
+                    openRowCellToolbarByIndex(row1JcrPath, 0);
+                    cy.invokeEditableAction("[data-action='splitrowcell']");
+                    cy.getContentIFrameBody()
+                        .find('.cmp-adaptiveform-table__body .cmp-adaptiveform-tablerow').eq(1)
+                        .find('.cmp-adaptiveform-tablecell')
+                        .should('have.length', beforeCount + 1);
+
+                    cy.getContentIFrameBody()
+                        .find('.cmp-adaptiveform-table__body .cmp-adaptiveform-tablerow').eq(1)
+                        .find('.cmp-adaptiveform-tablecell[colspan="2"]')
+                        .should('not.exist');
+                });
+        });
+    });
+
+    // -------------------------------------------------------------------------
+    // Merge row cells — validation guard: single-cell selection shows error dialog.
+    // -------------------------------------------------------------------------
+
+    context('Merge row cells validation in Forms Editor', function () {
+
+        beforeEach(function () {
+            cy.openAuthoring(tableSamplePagePath);
+        });
+
+        it('invoking mergerowcells with a single cell selected shows the validation error dialog', function () {
+            openRowCellToolbarByIndex(row2JcrPath, 0);
+            cy.invokeEditableAction("[data-action='mergerowcells']");
+
+            cy.get('coral-dialog.is-open').should('be.visible');
+            cy.get('coral-dialog.is-open coral-dialog-content')
+                .should('contain.text', 'Select two or more row cells to merge');
+            cy.get('coral-dialog.is-open button').contains('Ok').click({ force: true });
+        });
+
+        it('error dialog closes after clicking Ok and the row cell count is unchanged', function () {
+            cy.getContentIFrameBody()
+                .find('.cmp-adaptiveform-table__body .cmp-adaptiveform-tablerow').eq(1)
+                .find('.cmp-adaptiveform-tablecell').then($cells => {
+                    const beforeCount = $cells.length;
+
+                    openRowCellToolbarByIndex(row2JcrPath, 0);
+                    cy.invokeEditableAction("[data-action='mergerowcells']");
+
+                    cy.get('coral-dialog.is-open button').contains('Ok').click({ force: true });
+                    cy.get('coral-dialog').should('not.have.class', 'is-open');
+
+                    cy.getContentIFrameBody()
+                        .find('.cmp-adaptiveform-table__body .cmp-adaptiveform-tablerow').eq(1)
+                        .find('.cmp-adaptiveform-tablecell')
+                        .should('have.length', beforeCount);
+                });
+        });
+    });
+});
\ No newline at end of file
diff --git a/ui.tests/test-module/specs/table/table.repeatability.cy.js b/ui.tests/test-module/specs/table/table.repeatability.cy.js
new file mode 100644
index 0000000000..100be3f077
--- /dev/null
+++ b/ui.tests/test-module/specs/table/table.repeatability.cy.js
@@ -0,0 +1,269 @@
+/*
+ *  Copyright 2026 Adobe Systems Incorporated
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+describe('Form Runtime with Table - Repeatability Tests', () => {
+
+    // Sample page has: table > header (2 cols) + row1 (static) + row2 (repeatable, min=1, max=3)
+    const pagePath = "content/forms/af/core-components-it/samples/table/basic.html";
+    let formContainer = null;
+
+    beforeEach(() => {
+        cy.previewForm(pagePath).then(p => {
+            formContainer = p;
+        });
+    });
+
+    // -------------------------------------------------------------------------
+    // Helpers
+    // -------------------------------------------------------------------------
+
+    const getRepeatableRowInstanceManager = () => {
+        const allFields = formContainer.getAllFields();
+        const rowViews = Object.values(allFields).filter(f => f.getClass && f.getClass() === 'adaptiveFormTableRow');
+        const repeatableRowView = rowViews.find(r => r.getModel().repeatable);
+        expect(repeatableRowView, 'repeatable table row view must exist').to.exist;
+        return repeatableRowView.getInstanceManager();
+    };
+
+    /**
+     * Fires addInstance() or removeInstance() on the instance manager, waits for
+     * the AF event, then resolves with the updated instance count.
+     */
+    const triggerInstanceChange = (instanceManager, isAdd) => {
+        const EVENT_NAME = isAdd ? 'AF_PanelInstanceAdded' : 'AF_PanelInstanceRemoved';
+        let resolve;
+        const promise = new Cypress.Promise(r => { resolve = r; });
+
+        cy.get('[data-cmp-is="adaptiveFormContainer"]').then(el => {
+            const listener = e => {
+                el[0].removeEventListener(EVENT_NAME, listener);
+                resolve(e.detail);
+            };
+            el[0].addEventListener(EVENT_NAME, listener);
+        }).then(() => {
+            if (isAdd) {
+                instanceManager.addInstance();
+            } else {
+                instanceManager.removeInstance();
+            }
+        });
+
+        return promise;
+    };
+
+    // -------------------------------------------------------------------------
+    // Initial render of the repeatable row
+    // -------------------------------------------------------------------------
+
+    it('repeatable row renders add and remove buttons', () => {
+        const allFields = formContainer.getAllFields();
+        const rowViews = Object.values(allFields).filter(f => f.getClass && f.getClass() === 'adaptiveFormTableRow');
+        const repeatableRowView = rowViews.find(r => r.getModel().repeatable);
+        const rowId = repeatableRowView.getId();
+
+        cy.get(`#${rowId} .cmp-adaptiveform-tablerow__add-button`).should('exist');
+        cy.get(`#${rowId} .cmp-adaptiveform-tablerow__remove-button`).should('exist');
+    });
+
+    it('add button hook attribute references its own row id', () => {
+        const allFields = formContainer.getAllFields();
+        const rowViews = Object.values(allFields).filter(f => f.getClass && f.getClass() === 'adaptiveFormTableRow');
+        const repeatableRowView = rowViews.find(r => r.getModel().repeatable);
+        const rowId = repeatableRowView.getId();
+
+        cy.get(`#${rowId} .cmp-adaptiveform-tablerow__add-button`)
+            .invoke('attr', 'data-cmp-hook-add-instance')
+            .should('eq', rowId);
+    });
+
+    it('remove button hook attribute references its own row id', () => {
+        const allFields = formContainer.getAllFields();
+        const rowViews = Object.values(allFields).filter(f => f.getClass && f.getClass() === 'adaptiveFormTableRow');
+        const repeatableRowView = rowViews.find(r => r.getModel().repeatable);
+        const rowId = repeatableRowView.getId();
+
+        cy.get(`#${rowId} .cmp-adaptiveform-tablerow__remove-button`)
+            .invoke('attr', 'data-cmp-hook-remove-instance')
+            .should('eq', rowId);
+    });
+
+    // -------------------------------------------------------------------------
+    // minOccur / maxOccur button visibility at initial state (count = 1)
+    // -------------------------------------------------------------------------
+
+    it('remove button is hidden at minOccur (1 instance)', () => {
+        // data-cmp-visible is only written after an add/remove event fires, so we
+        // add one instance then remove it to land back at minOccur=1 with the
+        // attribute correctly set to 'false'.
+        const instanceManager = getRepeatableRowInstanceManager();
+
+        triggerInstanceChange(instanceManager, true).then(() => {
+            triggerInstanceChange(instanceManager, false).then(() => {
+                expect(instanceManager.children.length).to.equal(1);
+                const firstRowId = instanceManager.children[0].getId();
+                cy.get(`#${firstRowId} .cmp-adaptiveform-tablerow__remove-button`)
+                    .invoke('attr', 'data-cmp-visible')
+                    .should('eq', 'false');
+            });
+        });
+    });
+
+    it('add button is visible when instance count is below maxOccur', () => {
+        // data-cmp-visible is only written after an add/remove event fires, so we
+        // add one instance then remove it to land back at count=1 (below maxOccur=3)
+        // with the attribute correctly set to 'true'.
+        const instanceManager = getRepeatableRowInstanceManager();
+
+        triggerInstanceChange(instanceManager, true).then(() => {
+            triggerInstanceChange(instanceManager, false).then(() => {
+                expect(instanceManager.children.length).to.equal(1);
+                const firstRowId = instanceManager.children[0].getId();
+                cy.get(`#${firstRowId} .cmp-adaptiveform-tablerow__add-button`)
+                    .invoke('attr', 'data-cmp-visible')
+                    .should('eq', 'true');
+            });
+        });
+    });
+
+    // -------------------------------------------------------------------------
+    // Add instance
+    // -------------------------------------------------------------------------
+
+    it('adding a row increases the tbody row count by 1', () => {
+        const allFields = formContainer.getAllFields();
+        const tableView = Object.values(allFields).find(f => f.getClass && f.getClass() === 'adaptiveFormTable');
+        const tableId = tableView.getId();
+
+        cy.get(`#${tableId} tbody tr.cmp-adaptiveform-tablerow__root`).then($rows => {
+            const before = $rows.length;
+            const instanceManager = getRepeatableRowInstanceManager();
+
+            triggerInstanceChange(instanceManager, true).then(() => {
+                cy.get(`#${tableId} tbody tr.cmp-adaptiveform-tablerow__root`)
+                    .should('have.length', before + 1);
+            });
+        });
+    });
+
+    it('added rows have unique id attributes', () => {
+        const allFields = formContainer.getAllFields();
+        const tableView = Object.values(allFields).find(f => f.getClass && f.getClass() === 'adaptiveFormTable');
+        const tableId = tableView.getId();
+        const instanceManager = getRepeatableRowInstanceManager();
+
+        triggerInstanceChange(instanceManager, true).then(() => {
+            triggerInstanceChange(instanceManager, true).then(() => {
+                cy.get(`#${tableId} tbody tr.cmp-adaptiveform-tablerow__root`).then($rows => {
+                    const ids = [...$rows].map(r => r.id).filter(Boolean);
+                    const uniqueIds = new Set(ids);
+                    expect(uniqueIds.size).to.equal(ids.length);
+                });
+            });
+        });
+    });
+
+    it('add/remove hook attributes on cloned rows point to the correct row id', () => {
+        const instanceManager = getRepeatableRowInstanceManager();
+
+        triggerInstanceChange(instanceManager, true).then(() => {
+            // Assert on the instance manager's children directly — these are guaranteed
+            // to be repeatable rows and always have add/remove buttons.
+            instanceManager.children.forEach(childView => {
+                const rowId = childView.getId();
+                cy.get(`#${rowId} .cmp-adaptiveform-tablerow__add-button`)
+                    .invoke('attr', 'data-cmp-hook-add-instance')
+                    .should('eq', rowId);
+                cy.get(`#${rowId} .cmp-adaptiveform-tablerow__remove-button`)
+                    .invoke('attr', 'data-cmp-hook-remove-instance')
+                    .should('eq', rowId);
+            });
+        });
+    });
+
+    // -------------------------------------------------------------------------
+    // maxOccur enforcement (max = 3)
+    // -------------------------------------------------------------------------
+
+    it('add button is hidden on all rows when maxOccur is reached', () => {
+        const allFields = formContainer.getAllFields();
+        const tableView = Object.values(allFields).find(f => f.getClass && f.getClass() === 'adaptiveFormTable');
+        const tableId = tableView.getId();
+        const instanceManager = getRepeatableRowInstanceManager();
+
+        // Add 2 more rows to reach maxOccur=3
+        triggerInstanceChange(instanceManager, true).then(() => {
+            triggerInstanceChange(instanceManager, true).then(() => {
+                expect(instanceManager.children.length).to.equal(3);
+                cy.get(`#${tableId} .cmp-adaptiveform-tablerow__add-button`).each($btn => {
+                    cy.wrap($btn).invoke('attr', 'data-cmp-visible').should('eq', 'false');
+                });
+            });
+        });
+    });
+
+    it('instance manager model reflects correct count at maxOccur', () => {
+        const instanceManager = getRepeatableRowInstanceManager();
+
+        triggerInstanceChange(instanceManager, true).then(() => {
+            triggerInstanceChange(instanceManager, true).then(() => {
+                expect(instanceManager.children.length).to.equal(3);
+                expect(instanceManager.getModel().items.length).to.equal(3);
+                // Adding beyond max should not increase count
+                instanceManager.addInstance();
+                expect(instanceManager.children.length).to.equal(3);
+            });
+        });
+    });
+
+    // -------------------------------------------------------------------------
+    // Remove instance
+    // -------------------------------------------------------------------------
+
+    it('removing a row decreases the tbody row count by 1', () => {
+        const allFields = formContainer.getAllFields();
+        const tableView = Object.values(allFields).find(f => f.getClass && f.getClass() === 'adaptiveFormTable');
+        const tableId = tableView.getId();
+        const instanceManager = getRepeatableRowInstanceManager();
+
+        // Add one first so we can remove without hitting minOccur
+        triggerInstanceChange(instanceManager, true).then(() => {
+            cy.get(`#${tableId} tbody tr.cmp-adaptiveform-tablerow__root`).then($rows => {
+                const before = $rows.length;
+                triggerInstanceChange(instanceManager, false).then(() => {
+                    cy.get(`#${tableId} tbody tr.cmp-adaptiveform-tablerow__root`)
+                        .should('have.length', before - 1);
+                });
+            });
+        });
+    });
+
+    it('remove button is hidden on all rows when minOccur is reached after removal', () => {
+        const allFields = formContainer.getAllFields();
+        const tableView = Object.values(allFields).find(f => f.getClass && f.getClass() === 'adaptiveFormTable');
+        const tableId = tableView.getId();
+        const instanceManager = getRepeatableRowInstanceManager();
+
+        // Add then remove to land back at minOccur=1
+        triggerInstanceChange(instanceManager, true).then(() => {
+            triggerInstanceChange(instanceManager, false).then(() => {
+                expect(instanceManager.children.length).to.equal(1);
+                cy.get(`#${tableId} .cmp-adaptiveform-tablerow__remove-button`).each($btn => {
+                    cy.wrap($btn).invoke('attr', 'data-cmp-visible').should('eq', 'false');
+                });
+            });
+        });
+    });
+});
diff --git a/ui.tests/test-module/specs/table/table.runtime.cy.js b/ui.tests/test-module/specs/table/table.runtime.cy.js
new file mode 100644
index 0000000000..304e944f38
--- /dev/null
+++ b/ui.tests/test-module/specs/table/table.runtime.cy.js
@@ -0,0 +1,202 @@
+/*
+ *  Copyright 2026 Adobe Systems Incorporated
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+describe('Form Runtime with Table - Basic Tests', () => {
+
+    const pagePath = "content/forms/af/core-components-it/samples/table/basic.html";
+    let formContainer = null;
+
+    beforeEach(() => {
+        cy.previewForm(pagePath).then(p => {
+            formContainer = p;
+        });
+    });
+
+    // -------------------------------------------------------------------------
+    // HTML structure
+    // -------------------------------------------------------------------------
+
+    it('table renders the correct top-level HTML structure', () => {
+        const allFields = formContainer.getAllFields();
+        const tableModel = Object.values(allFields).find(f => f.getClass && f.getClass() === 'adaptiveFormTable');
+        expect(tableModel, 'table view should be initialized').to.exist;
+
+        const tableId = tableModel.getId();
+        cy.get(`#${tableId}`)
+            .should('exist')
+            .should('have.attr', 'data-cmp-is', 'adaptiveFormTable');
+
+        cy.get(`#${tableId} table.cmp-adaptiveform-table__widget`).should('exist');
+        cy.get(`#${tableId} thead.cmp-adaptiveform-table__head`).should('exist');
+        cy.get(`#${tableId} tbody.cmp-adaptiveform-table__body`).should('exist');
+    });
+
+    it('table has correct visibility and enabled state', () => {
+        const allFields = formContainer.getAllFields();
+        const tableView = Object.values(allFields).find(f => f.getClass && f.getClass() === 'adaptiveFormTable');
+        const tableId = tableView.getId();
+
+        cy.get(`#${tableId}`)
+            .invoke('attr', 'data-cmp-visible')
+            .should('eq', 'true');
+        cy.get(`#${tableId}`)
+            .invoke('attr', 'data-cmp-enabled')
+            .should('eq', 'true');
+    });
+
+    it('table label renders when label is visible', () => {
+        const allFields = formContainer.getAllFields();
+        const tableView = Object.values(allFields).find(f => f.getClass && f.getClass() === 'adaptiveFormTable');
+        const tableId = tableView.getId();
+
+        cy.get(`#${tableId}`).then(() => {
+            const labelModel = tableView.getModel().label;
+            if (labelModel && labelModel.visible) {
+                cy.get(`#${tableId} .cmp-adaptiveform-table__title`).should('exist');
+            }
+        });
+    });
+
+    // -------------------------------------------------------------------------
+    // Table header
+    // -------------------------------------------------------------------------
+
+    it('table header renders a <tr> inside <thead> with correct semantics', () => {
+        const allFields = formContainer.getAllFields();
+        const tableView = Object.values(allFields).find(f => f.getClass && f.getClass() === 'adaptiveFormTable');
+        const tableId = tableView.getId();
+
+        cy.get(`#${tableId} thead tr.cmp-adaptiveform-tableheader`)
+            .should('exist')
+            .should('have.attr', 'data-cmp-is', 'adaptiveFormTableHeader');
+    });
+
+    it('table header renders two <th> cells with scope="col" and correct labels', () => {
+        const allFields = formContainer.getAllFields();
+        const tableView = Object.values(allFields).find(f => f.getClass && f.getClass() === 'adaptiveFormTable');
+        const tableId = tableView.getId();
+
+        // Assert structural semantics
+        cy.get(`#${tableId} thead th.cmp-adaptiveform-tablehead`).should('have.length', 2);
+        cy.get(`#${tableId} thead th.cmp-adaptiveform-tablehead`).each($th => {
+            cy.wrap($th).should('have.attr', 'scope', 'col');
+        });
+
+        // Assert label text from the model — strip any HTML tags since the model may
+        // store rich text (e.g. "<p>Age</p>") while the DOM renders plain text
+        const headerView = Object.values(allFields).find(f => f.getClass && f.getClass() === 'adaptiveFormTableHeader');
+        const headerItems = headerView.getModel().items;
+        headerItems.forEach((item, index) => {
+            const raw = item.value || item.label?.value || '';
+            const expectedText = raw.replace(/<[^>]*>/g, '').trim();
+            if (expectedText) {
+                cy.get(`#${tableId} thead th.cmp-adaptiveform-tablehead`).eq(index)
+                    .should('contain.text', expectedText);
+            }
+        });
+    });
+
+    it('table header has correct data attributes for visibility and enabled state', () => {
+        const allFields = formContainer.getAllFields();
+        const headerView = Object.values(allFields).find(f => f.getClass && f.getClass() === 'adaptiveFormTableHeader');
+        expect(headerView, 'tableheader view should be initialized').to.exist;
+        const headerId = headerView.getId();
+
+        cy.get(`#${headerId}`)
+            .invoke('attr', 'data-cmp-visible')
+            .should('eq', 'true');
+        cy.get(`#${headerId}`)
+            .invoke('attr', 'data-cmp-enabled')
+            .should('eq', 'true');
+    });
+
+    // -------------------------------------------------------------------------
+    // Static table row
+    // -------------------------------------------------------------------------
+
+    it('static table row renders a <tr> inside <tbody> with correct class', () => {
+        const allFields = formContainer.getAllFields();
+        const tableView = Object.values(allFields).find(f => f.getClass && f.getClass() === 'adaptiveFormTable');
+        const tableId = tableView.getId();
+
+        // row1 is the non-repeatable row
+        cy.get(`#${tableId} tbody tr.cmp-adaptiveform-tablerow__root`).should('have.length.gte', 1);
+    });
+
+    it('static table row contains the correct number of <td> cells', () => {
+        const allFields = formContainer.getAllFields();
+        const tableView = Object.values(allFields).find(f => f.getClass && f.getClass() === 'adaptiveFormTable');
+        const tableId = tableView.getId();
+
+        // row1: 2 textinput cells → 2 <td> elements
+        cy.get(`#${tableId} tbody tr.cmp-adaptiveform-tablerow__root`).first().within(() => {
+            cy.get('td.cmp-adaptiveform-tablecell').should('have.length', 2);
+        });
+    });
+
+    it('static table row has no add/remove buttons', () => {
+        const allFields = formContainer.getAllFields();
+        const tableView = Object.values(allFields).find(f => f.getClass && f.getClass() === 'adaptiveFormTable');
+        const tableId = tableView.getId();
+
+        // row1 is non-repeatable so it must not render runtime controls
+        cy.get(`#${tableId} tbody tr.cmp-adaptiveform-tablerow__root`).first().within(() => {
+            cy.get('.cmp-adaptiveform-tablerow__add-button').should('not.exist');
+            cy.get('.cmp-adaptiveform-tablerow__remove-button').should('not.exist');
+        });
+    });
+
+    it('static row has correct data attributes', () => {
+        const allFields = formContainer.getAllFields();
+        const rowViews = Object.values(allFields).filter(f => f.getClass && f.getClass() === 'adaptiveFormTableRow');
+        const staticRow = rowViews.find(r => !r.getModel().repeatable);
+        expect(staticRow, 'static table row view should exist').to.exist;
+        const rowId = staticRow.getId();
+
+        cy.get(`#${rowId}`)
+            .invoke('attr', 'data-cmp-visible')
+            .should('eq', 'true');
+        cy.get(`#${rowId}`)
+            .invoke('attr', 'data-cmp-enabled')
+            .should('eq', 'true');
+    });
+
+    // -------------------------------------------------------------------------
+    // Model / view consistency
+    // -------------------------------------------------------------------------
+
+    it('form container initializes table, tableheader and tablerow views', () => {
+        const allFields = formContainer.getAllFields();
+        const tableViews = Object.values(allFields).filter(f => f.getClass && f.getClass() === 'adaptiveFormTable');
+        const headerViews = Object.values(allFields).filter(f => f.getClass && f.getClass() === 'adaptiveFormTableHeader');
+        const rowViews = Object.values(allFields).filter(f => f.getClass && f.getClass() === 'adaptiveFormTableRow');
+
+        expect(tableViews.length, 'one table view should be initialized').to.equal(1);
+        expect(headerViews.length, 'one tableheader view should be initialized').to.equal(1);
+        // row1 (static) + row2 (repeatable, 1 initial instance)
+        expect(rowViews.length, 'at least two tablerow views should be initialized').to.be.gte(2);
+    });
+
+    it('table model children count matches view children count', () => {
+        const allFields = formContainer.getAllFields();
+        const tableView = Object.values(allFields).find(f => f.getClass && f.getClass() === 'adaptiveFormTable');
+
+        const modelChildCount = tableView.getModel().items.length;
+        expect(modelChildCount, 'model should have children').to.be.gte(1);
+        // The table view's children array should reflect what the model reports
+        expect(tableView.children.length).to.equal(modelChildCount);
+    });
+});
diff --git a/ui.tests/test-module/specs/table/table.sorting.runtime.cy.js b/ui.tests/test-module/specs/table/table.sorting.runtime.cy.js
new file mode 100644
index 0000000000..67d5ddad73
--- /dev/null
+++ b/ui.tests/test-module/specs/table/table.sorting.runtime.cy.js
@@ -0,0 +1,233 @@
+/*
+ *  Copyright 2026 Adobe Systems Incorporated
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+/**
+ * Runtime sorting tests for the table component.
+ *
+ * Sample page: content/forms/af/core-components-it/samples/table/sorting
+ *   - table has enableSorting=true
+ *   - column1 (Name): sort enabled
+ *   - column2 (Score): disableSorting=true → no sort button
+ *   - 3 static data rows with default values: Charlie/30, Alice/10, Bob/20
+ */
+describe('Form Runtime with Table - Sorting Tests', () => {
+
+    const pagePath = "content/forms/af/core-components-it/samples/table/sorting.html";
+    let formContainer = null;
+
+    beforeEach(() => {
+        cy.previewForm(pagePath).then(p => {
+            formContainer = p;
+        });
+    });
+
+    // -------------------------------------------------------------------------
+    // Sort button presence
+    // -------------------------------------------------------------------------
+
+    it('renders a sort button only on columns that have sorting enabled', () => {
+        const allFields = formContainer.getAllFields();
+        const tableView = Object.values(allFields).find(f => f.getClass && f.getClass() === 'adaptiveFormTable');
+        const tableId = tableView.getId();
+
+        // column1 must have a sort button
+        cy.get(`#${tableId} thead th.cmp-adaptiveform-tablehead`).eq(0)
+            .find('.cmp-adaptiveform-table__sort-button')
+            .should('exist');
+
+        // column2 has disableSorting=true → no sort button
+        cy.get(`#${tableId} thead th.cmp-adaptiveform-tablehead`).eq(1)
+            .find('.cmp-adaptiveform-table__sort-button')
+            .should('not.exist');
+    });
+
+    it('sort button has correct aria-label', () => {
+        const allFields = formContainer.getAllFields();
+        const tableView = Object.values(allFields).find(f => f.getClass && f.getClass() === 'adaptiveFormTable');
+        const tableId = tableView.getId();
+
+        cy.get(`#${tableId} thead th.cmp-adaptiveform-tablehead`).eq(0)
+            .find('.cmp-adaptiveform-table__sort-button')
+            .should('have.attr', 'aria-label', 'Sort column');
+    });
+
+    it('sort button carries a data-cmp-hook-table-sort index attribute', () => {
+        const allFields = formContainer.getAllFields();
+        const tableView = Object.values(allFields).find(f => f.getClass && f.getClass() === 'adaptiveFormTable');
+        const tableId = tableView.getId();
+
+        cy.get(`#${tableId} thead th.cmp-adaptiveform-tablehead`).eq(0)
+            .find('.cmp-adaptiveform-table__sort-button')
+            .invoke('attr', 'data-cmp-hook-table-sort')
+            .should('eq', '0');
+    });
+
+    it('table element carries data-cmp-sorting-enabled="true"', () => {
+        const allFields = formContainer.getAllFields();
+        const tableView = Object.values(allFields).find(f => f.getClass && f.getClass() === 'adaptiveFormTable');
+        const tableId = tableView.getId();
+
+        cy.get(`#${tableId}`)
+            .invoke('attr', 'data-cmp-sorting-enabled')
+            .should('eq', 'true');
+    });
+
+    it('sort header cell has .cmp-adaptiveform-table__sort-header-inner wrapper', () => {
+        const allFields = formContainer.getAllFields();
+        const tableView = Object.values(allFields).find(f => f.getClass && f.getClass() === 'adaptiveFormTable');
+        const tableId = tableView.getId();
+
+        cy.get(`#${tableId} thead th.cmp-adaptiveform-tablehead`).eq(0)
+            .find('.cmp-adaptiveform-table__sort-header-inner')
+            .should('exist');
+    });
+
+    // -------------------------------------------------------------------------
+    // Sort state: ascending on first click
+    // -------------------------------------------------------------------------
+
+    it('first sort button click adds --asc modifier class and aria-sort="ascending" on the active th', () => {
+        const allFields = formContainer.getAllFields();
+        const tableView = Object.values(allFields).find(f => f.getClass && f.getClass() === 'adaptiveFormTable');
+        const tableId = tableView.getId();
+
+        cy.get(`#${tableId} thead th.cmp-adaptiveform-tablehead`).eq(0)
+            .find('.cmp-adaptiveform-table__sort-button')
+            .click();
+
+        cy.get(`#${tableId} thead th.cmp-adaptiveform-tablehead`).eq(0)
+            .find('.cmp-adaptiveform-table__sort-button')
+            .should('have.class', 'cmp-adaptiveform-table__sort-button--asc');
+
+        cy.get(`#${tableId} thead th.cmp-adaptiveform-tablehead`).eq(0)
+            .should('have.attr', 'aria-sort', 'ascending');
+    });
+
+    it('second sort button click on same column switches to --desc and aria-sort="descending"', () => {
+        const allFields = formContainer.getAllFields();
+        const tableView = Object.values(allFields).find(f => f.getClass && f.getClass() === 'adaptiveFormTable');
+        const tableId = tableView.getId();
+
+        const sortBtn = () => cy.get(`#${tableId} thead th.cmp-adaptiveform-tablehead`).eq(0)
+            .find('.cmp-adaptiveform-table__sort-button');
+
+        sortBtn().click();
+        sortBtn().click();
+
+        sortBtn().should('have.class', 'cmp-adaptiveform-table__sort-button--desc');
+        cy.get(`#${tableId} thead th.cmp-adaptiveform-tablehead`).eq(0)
+            .should('have.attr', 'aria-sort', 'descending');
+    });
+
+    it('other header cells have no aria-sort after a sort is applied', () => {
+        const allFields = formContainer.getAllFields();
+        const tableView = Object.values(allFields).find(f => f.getClass && f.getClass() === 'adaptiveFormTable');
+        const tableId = tableView.getId();
+
+        cy.get(`#${tableId} thead th.cmp-adaptiveform-tablehead`).eq(0)
+            .find('.cmp-adaptiveform-table__sort-button')
+            .click();
+
+        // column2 must not receive aria-sort
+        cy.get(`#${tableId} thead th.cmp-adaptiveform-tablehead`).eq(1)
+            .should('not.have.attr', 'aria-sort');
+    });
+
+    // -------------------------------------------------------------------------
+    // DOM row order after sort (values pre-filled via default property)
+    // -------------------------------------------------------------------------
+
+    it('ascending sort on column1 reorders rows alphabetically A-Z', () => {
+        const allFields = formContainer.getAllFields();
+        const tableView = Object.values(allFields).find(f => f.getClass && f.getClass() === 'adaptiveFormTable');
+        const tableId = tableView.getId();
+
+        cy.get(`#${tableId} thead th.cmp-adaptiveform-tablehead`).eq(0)
+            .find('.cmp-adaptiveform-table__sort-button')
+            .click();
+
+        // Expected ascending order: Alice, Bob, Charlie
+        cy.get(`#${tableId} tbody tr.cmp-adaptiveform-tablerow__root`).then($rows => {
+            const firstCellValues = [...$rows].map(r => {
+                const input = r.querySelector('td.cmp-adaptiveform-tablecell input');
+                return input ? input.value : r.querySelector('td.cmp-adaptiveform-tablecell').innerText.trim();
+            });
+            expect(firstCellValues[0]).to.match(/alice/i);
+            expect(firstCellValues[1]).to.match(/bob/i);
+            expect(firstCellValues[2]).to.match(/charlie/i);
+        });
+    });
+
+    it('descending sort on column1 reorders rows alphabetically Z-A', () => {
+        const allFields = formContainer.getAllFields();
+        const tableView = Object.values(allFields).find(f => f.getClass && f.getClass() === 'adaptiveFormTable');
+        const tableId = tableView.getId();
+
+        const sortBtn = cy.get(`#${tableId} thead th.cmp-adaptiveform-tablehead`).eq(0)
+            .find('.cmp-adaptiveform-table__sort-button');
+
+        sortBtn.click().click();
+
+        // Expected descending order: Charlie, Bob, Alice
+        cy.get(`#${tableId} tbody tr.cmp-adaptiveform-tablerow__root`).then($rows => {
+            const firstCellValues = [...$rows].map(r => {
+                const input = r.querySelector('td.cmp-adaptiveform-tablecell input');
+                return input ? input.value : r.querySelector('td.cmp-adaptiveform-tablecell').innerText.trim();
+            });
+            expect(firstCellValues[0]).to.match(/charlie/i);
+            expect(firstCellValues[1]).to.match(/bob/i);
+            expect(firstCellValues[2]).to.match(/alice/i);
+        });
+    });
+
+    it('tbody still contains the same number of rows after sorting', () => {
+        const allFields = formContainer.getAllFields();
+        const tableView = Object.values(allFields).find(f => f.getClass && f.getClass() === 'adaptiveFormTable');
+        const tableId = tableView.getId();
+
+        cy.get(`#${tableId} tbody tr.cmp-adaptiveform-tablerow__root`).then($before => {
+            const beforeCount = $before.length;
+
+            cy.get(`#${tableId} thead th.cmp-adaptiveform-tablehead`).eq(0)
+                .find('.cmp-adaptiveform-table__sort-button')
+                .click();
+
+            cy.get(`#${tableId} tbody tr.cmp-adaptiveform-tablerow__root`)
+                .should('have.length', beforeCount);
+        });
+    });
+
+    // -------------------------------------------------------------------------
+    // Non-active sort button stays neutral (no asc/desc class)
+    // -------------------------------------------------------------------------
+
+    it('non-active sort column has no --asc or --desc modifier after sort', () => {
+        const allFields = formContainer.getAllFields();
+        const tableView = Object.values(allFields).find(f => f.getClass && f.getClass() === 'adaptiveFormTable');
+        const tableId = tableView.getId();
+
+        // Click column1 sort; column2 has no button at all — verify column1 button stays clean
+        // on hypothetical re-click of another sortable column (use same column for the toggle test)
+        cy.get(`#${tableId} thead th.cmp-adaptiveform-tablehead`).eq(0)
+            .find('.cmp-adaptiveform-table__sort-button')
+            .click();
+
+        // The active button must not carry both classes simultaneously
+        cy.get(`#${tableId} thead th.cmp-adaptiveform-tablehead`).eq(0)
+            .find('.cmp-adaptiveform-table__sort-button')
+            .should('not.have.class', 'cmp-adaptiveform-table__sort-button--desc');
+    });
+});