[BACKPORT(FORMS-23760)]: Private release/table-component IRS

.circleci/config.yml

@@ -486,7 +486,7 @@ workflows:
             branches:
               ignore: /.*/
             tags:
-              only: /^core-forms-components-reactor-\d+\.\d+\.\d+$/
+              only: /^core-forms-components-reactor-\d+\.\d+\.\d+-\w+$/
       - release:
           requires:
             - build-java-11
@@ -495,4 +495,4 @@ workflows:
             branches:
               ignore: /.*/
             tags:
-              only: /^core-forms-components-reactor-\d+\.\d+\.\d+$/
+              only: /^core-forms-components-reactor-\d+\.\d+\.\d+-\w+$/

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";
+
 }

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";

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;
+    }
+}

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;
+    }
+}

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;
+    }
+}