adobe
diff --git a/‎.circleci/ci/accessibilityConfig.json‎
Lines changed: 1 addition & 1 deletion b/‎.circleci/ci/accessibilityConfig.json‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎.circleci/config.yml‎
Lines changed: 2 additions & 2 deletions b/‎.circleci/config.yml‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎bundles/af-core/pom.xml‎
Lines changed: 4 additions & 0 deletions b/‎bundles/af-core/pom.xml‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/FormConstants.java‎
Lines changed: 4 additions & 1 deletion b/‎bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/FormConstants.java‎
Lines changed: 4 additions & 1 deletion
diff --git a/‎bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/ReservedProperties.java‎
Lines changed: 4 additions & 2 deletions b/‎bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/ReservedProperties.java‎
Lines changed: 4 additions & 2 deletions
diff --git a/‎bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/ButtonImpl.java‎
Lines changed: 4 additions & 0 deletions b/‎bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/ButtonImpl.java‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/FragmentImpl.java‎
Lines changed: 17 additions & 3 deletions b/‎bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/FragmentImpl.java‎
Lines changed: 17 additions & 3 deletions
diff --git a/‎bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/PanelImpl.java‎
Lines changed: 4 additions & 0 deletions b/‎bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/PanelImpl.java‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/ScribbleImpl.java‎
Lines changed: 88 additions & 0 deletions b/‎bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/ScribbleImpl.java‎
Lines changed: 88 additions & 0 deletions
diff --git a/‎bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v2/form/FormContainerImpl.java‎
Lines changed: 1 addition & 1 deletion b/‎bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v2/form/FormContainerImpl.java‎
Lines changed: 1 addition & 1 deletion
@@ -1,3 +1,3 @@
 {
-  "accessibilityExceptionList": ["landmark-one-main", "label-title-only", "region", "focus-order-semantics", "target-size", "page-has-heading-one"]
+  "accessibilityExceptionList": ["landmark-one-main", "label-title-only", "region", "focus-order-semantics", "target-size", "page-has-heading-one", "aria-required-attr", "empty-heading"]
 }
@@ -209,7 +209,7 @@ jobs:
       FT: 'true'
     resource_class: large
     working_directory: /home/circleci/build
-    parallelism: 8
+    parallelism: 4
     <<: *cypress_test_steps
 
   cypress-chrome-cloudready-with-latest-addon-without-ft:
@@ -222,7 +222,7 @@ jobs:
       FT: 'false'
     resource_class: large
     working_directory: /home/circleci/build
-    parallelism: 8
+    parallelism: 4
     <<: *cypress_test_steps
 
 #  cypress-chrome-cloudready-with-latest-addon-and-old-core-components:
 
@@ -654,6 +654,10 @@
             <artifactId>core.wcm.components.core</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>com.adobe.aem</groupId>
+            <artifactId>core-forms-print-components-print-dor-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.testing.caconfig-mock-plugin</artifactId>
 
@@ -148,4 +148,7 @@ private FormConstants() {
 
     /** Form definition type indicating submission view */
     public static final String FORM_DEFINITION_SUBMISSION = "submission";
-}
+
+    /** The channel for print */
+    public static final String CHANNEL_PRINT = "print";
+}
@@ -74,9 +74,11 @@ private ReservedProperties() {
     public static final String PN_PLACEHOLDER = "placeholder";
     public static final String PN_READ_ONLY = "readOnly";
     public static final String PN_DEFAULT_VALUE = "default";
+    public static final String PN_EMPTY_VALUE = "fd:emptyValue";
     public static final String PN_MULTI_DEFAULT_VALUES = "fd:multiDefaultValues";
     public static final String PN_FORMAT = "format";
     public static final String PN_DISPLAY_FORMAT = "displayFormat";
+    public static final String PN_CUSTOM_DISPLAY_FORMAT = "fd:customDisplayFormat";
     public static final String PN_EDIT_FORMAT = "editFormat";
     public static final String PN_DISPLAY_VALUE_EXPRESSION = "displayValueExpression";
     public static final String PN_DATA_FORMAT = "dataFormat";
@@ -163,8 +165,8 @@ private ReservedProperties() {
     public static final String FD_ENABLE_AUTO_SAVE = "fd:enableAutoSave";
     public static final String FD_AUTO_SAVE_STRATEGY_TYPE = "fd:autoSaveStrategyType";
     public static final String FD_AUTO_SAVE_INTERVAL = "fd:autoSaveInterval";
-    public static final String FD_EXCLUDE_FROM_DOR_IF_HIDDEN = "excludeFromDoRIfHidden";
-
+    public static final String FD_EXCLUDE_FROM_DOR_IF_HIDDEN = "fd:excludeFromDoRIfHidden";
+    public static final String FD_DIALOG_LABEL = "fd:dialogLabel";
     public static final String FD_XFA_SCRIPTS = "fd:xfaScripts";
 
     public static final String FD_DRAFT_ID = "fd:draftId";
 
@@ -109,6 +109,10 @@ public Map<String, Object> getDorProperties() {
         if (dorColspan != null) {
             customDorProperties.put("dorColspan", dorColspan);
         }
+        Map<String, Object> dorContainer = getDorContainer();
+        if (dorContainer != null) {
+            customDorProperties.put(CUSTOM_DOR_CONTAINER_WRAPPER, dorContainer);
+        }
         return customDorProperties;
     }
 
 
@@ -15,7 +15,9 @@
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 package com.adobe.cq.forms.core.components.internal.models.v1.form;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 
 import javax.annotation.PostConstruct;
 
@@ -43,7 +45,9 @@
 import com.adobe.cq.forms.core.components.models.form.FormContainer;
 import com.adobe.cq.forms.core.components.models.form.Fragment;
 import com.adobe.cq.forms.core.components.util.ComponentUtils;
+import com.adobe.cq.forms.core.components.views.Views;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonView;
 
 @Model(
     adaptables = { SlingHttpServletRequest.class, Resource.class },
@@ -55,6 +59,7 @@
 public class FragmentImpl extends PanelImpl implements Fragment {
 
     public static final String CUSTOM_FRAGMENT_PROPERTY_WRAPPER = "fd:fragment";
+    private static final String PRINT_CHANNEL_PATH = "/" + "print";
 
     @OSGiService
     private SlingModelFilter slingModelFilter;
@@ -70,7 +75,9 @@ public class FragmentImpl extends PanelImpl implements Fragment {
     @PostConstruct
     private void initFragmentModel() {
         ResourceResolver resourceResolver = resource.getResourceResolver();
-        fragmentContainer = ComponentUtils.getFragmentContainer(resourceResolver, fragmentPath);
+
+        String updatedFragmentPath = this.getFragmentPathBasedOnChannel(fragmentPath);
+        fragmentContainer = ComponentUtils.getFragmentContainer(resourceResolver, updatedFragmentPath);
         if (request != null) {
             FormClientLibManager formClientLibManager = request.adaptTo(FormClientLibManager.class);
             String clientLibRef = getClientLibForFragment();
@@ -80,7 +87,14 @@ private void initFragmentModel() {
         }
     }
 
-    @JsonIgnore
+    private String getFragmentPathBasedOnChannel(String fragmentPath) {
+        if (FormConstants.CHANNEL_PRINT.equals(this.channel)) {
+            return fragmentPath + PRINT_CHANNEL_PATH;
+        }
+        return fragmentPath;
+    }
+
+    @JsonView(Views.Author.class)
     public String getFragmentPath() {
         return fragmentPath;
     }
 
@@ -145,6 +145,10 @@ public Map<String, Object> getDorProperties() {
         if (dorLayoutType != null) {
             customDorProperties.put(DOR_LAYOUT_TYPE, dorLayoutType);
         }
+        Map<String, Object> dorContainer = getDorContainer();
+        if (dorContainer != null) {
+            customDorProperties.put(CUSTOM_DOR_CONTAINER_WRAPPER, dorContainer);
+        }
         return customDorProperties;
     }
 
 
@@ -0,0 +1,88 @@
+/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ Copyright 2025 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.Map;
+
+import org.apache.sling.api.SlingHttpServletRequest;
+import org.apache.sling.api.resource.Resource;
+import org.apache.sling.models.annotations.Default;
+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.ReservedProperties;
+import com.adobe.cq.forms.core.components.models.form.FieldType;
+import com.adobe.cq.forms.core.components.models.form.Scribble;
+import com.adobe.cq.forms.core.components.util.AbstractFieldImpl;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+@Model(
+    adaptables = { SlingHttpServletRequest.class, Resource.class },
+    adapters = { Scribble.class, ComponentExporter.class },
+    resourceType = "core/fd/components/form/scribble/v1/scribble")
+@Exporter(
+    name = ExporterConstants.SLING_MODEL_EXPORTER_NAME,
+    extensions = ExporterConstants.SLING_MODEL_EXTENSION)
+public class ScribbleImpl extends AbstractFieldImpl implements Scribble {
+
+    @ValueMapValue(injectionStrategy = InjectionStrategy.OPTIONAL)
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    private String value;
+
+    @ValueMapValue(injectionStrategy = InjectionStrategy.OPTIONAL, name = ReservedProperties.FD_DIALOG_LABEL)
+    @Default(values = Scribble.DEFAULT_DIALOG_LABEL)
+    protected String dialogLabel;
+
+    @ValueMapValue(injectionStrategy = InjectionStrategy.OPTIONAL, name = ReservedProperties.PN_FORMAT)
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    protected String format;
+
+    @Override
+    public String getValue() {
+        return value;
+    }
+
+    @JsonIgnore
+    public String getDialogLabel() {
+        return dialogLabel;
+    }
+
+    @Override
+    public String getFormat() {
+        return format;
+    }
+
+    @Override
+    public String getFieldType() {
+        return super.getFieldType(FieldType.FILE_INPUT);
+    }
+
+    @Override
+    public @NotNull Map<String, Object> getProperties() {
+        Map<String, Object> customProperties = super.getProperties();
+        customProperties.put(ReservedProperties.PN_VIEWTYPE, "signature");
+        if (getDialogLabel() != null)
+            customProperties.put(ReservedProperties.FD_DIALOG_LABEL, getDialogLabel());
+        return customProperties;
+    }
+}
@@ -419,7 +419,7 @@ public Map<String, Object> getDorProperties() {
             customDorProperties.put(DOR_TEMPLATE_TYPE, dorTemplateType);
         }
         if (excludeFromDoRIfHidden != null) {
-            customDorProperties.put(EXCLUDE_FROM_DOR_IF_HIDDEN, excludeFromDoRIfHidden);
+            customDorProperties.put(ReservedProperties.FD_EXCLUDE_FROM_DOR_IF_HIDDEN, excludeFromDoRIfHidden);
         }
         return customDorProperties;
     }
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`{`
`2`		`- "accessibilityExceptionList": ["landmark-one-main", "label-title-only", "region", "focus-order-semantics", "target-size", "page-has-heading-one"]`
	`2`	`+ "accessibilityExceptionList": ["landmark-one-main", "label-title-only", "region", "focus-order-semantics", "target-size", "page-has-heading-one", "aria-required-attr", "empty-heading"]`
`3`	`3`	`}`
Original file line number	Diff line number	Diff line change
`@@ -109,6 +109,10 @@ public Map<String, Object> getDorProperties() {`
`109`	`109`	`if (dorColspan != null) {`
`110`	`110`	`customDorProperties.put("dorColspan", dorColspan);`
`111`	`111`	`}`
	`112`	`+ Map<String, Object> dorContainer = getDorContainer();`
	`113`	`+ if (dorContainer != null) {`
	`114`	`+ customDorProperties.put(CUSTOM_DOR_CONTAINER_WRAPPER, dorContainer);`
	`115`	`+ }`
`112`	`116`	`return customDorProperties;`
`113`	`117`	`}`
`114`	`118`
Original file line number	Diff line number	Diff line change
`@@ -145,6 +145,10 @@ public Map<String, Object> getDorProperties() {`
`145`	`145`	`if (dorLayoutType != null) {`
`146`	`146`	`customDorProperties.put(DOR_LAYOUT_TYPE, dorLayoutType);`
`147`	`147`	`}`
	`148`	`+ Map<String, Object> dorContainer = getDorContainer();`
	`149`	`+ if (dorContainer != null) {`
	`150`	`+ customDorProperties.put(CUSTOM_DOR_CONTAINER_WRAPPER, dorContainer);`
	`151`	`+ }`
`148`	`152`	`return customDorProperties;`
`149`	`153`	`}`
`150`	`154`
Original file line number	Diff line number	Diff line change
`@@ -419,7 +419,7 @@ public Map<String, Object> getDorProperties() {`
`419`	`419`	`customDorProperties.put(DOR_TEMPLATE_TYPE, dorTemplateType);`
`420`	`420`	`}`
`421`	`421`	`if (excludeFromDoRIfHidden != null) {`
`422`		`- customDorProperties.put(EXCLUDE_FROM_DOR_IF_HIDDEN, excludeFromDoRIfHidden);`
	`422`	`+ customDorProperties.put(ReservedProperties.FD_EXCLUDE_FROM_DOR_IF_HIDDEN, excludeFromDoRIfHidden);`
`423`	`423`	`}`
`424`	`424`	`return customDorProperties;`
`425`	`425`	`}`