Skip to content

dev to master #1948

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rismehta merged 6 commits into from
Aug 7, 2026
Merged

dev to master #1948

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
feb2406
Update theme selector states for scribble component
Jul 8, 2026
d45084c
Adding hamburger menu item support to add item styles
Jul 23, 2026
0330eec
Adding support to make <a> reachable through theme editor
Jul 23, 2026
d4c4cbd
Merge pull request #1921 from adobe/UpdateScribbleStates
muskgupta Jul 29, 2026
040f877
FORMS-26630: Add show as popup property in guidecontainer model json …
akshayvas Jul 30, 2026
590591f
FORMS-26813 : Show custom acceptMessage for unsupported file type in …
mayankjindalmj Aug 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ...va/com/adobe/cq/forms/core/components/internal/models/v1/form/TermsAndConditionsImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
public class TermsAndConditionsImpl extends PanelImpl implements TermsAndConditions {

private static final String CUSTOM_TNC_PROPERTY = "fd:tnc";
private static final String SHOW_AS_POPUP_PROPERTY = "fd:showAsPopup";

@JsonIgnore
@ValueMapValue(injectionStrategy = InjectionStrategy.OPTIONAL, name = ReservedProperties.PN_SHOW_APPROVAL_OPTION)
Expand Down Expand Up @@ -88,6 +89,7 @@ public boolean isShowAsPopup() {
if (resource.getValueMap().containsKey(CUSTOM_TNC_PROPERTY)) {
properties.put(CUSTOM_TNC_PROPERTY, true);
}
properties.put(SHOW_AS_POPUP_PROPERTY, isShowAsPopup());
return properties;
}

Expand Down
2 changes: 2 additions & 0 deletions ...om/adobe/cq/forms/core/components/internal/models/v1/form/TermsAndConditionsImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,8 @@ public void testCustomFDProperty() {
Map<String, Object> props = tnc.getProperties();
Assert.assertTrue(props.containsKey("fd:tnc"));
Assert.assertTrue((Boolean) props.get("fd:tnc"));
Assert.assertTrue(props.containsKey("fd:showAsPopup"));
Assert.assertTrue((Boolean) props.get("fd:showAsPopup"));

}

Expand Down
1 change: 1 addition & 0 deletions bundles/af-core/src/test/resources/form/termsandconditions/exporter-termsandconditions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"properties": {
"fd:path": "/content/termsandconditions",
"fd:tnc": true,
"fd:showAsPopup": true,
"customProp": "customPropValue"
},
"label": {
Expand Down
3 changes: 2 additions & 1 deletion ...ore/src/test/resources/form/termsandconditions/exporter-termsandconditionsNoWrapData.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
"name": "termsandconditions1694159302516",
"properties": {
"fd:path": "/content/termsandconditionsNoWrapData",
"fd:tnc": true
"fd:tnc": true,
"fd:showAsPopup": true
},
"label": {
"value": "Terms And Conditions"
Expand Down
1 change: 1 addition & 0 deletions ...root/content/forms/af/core-components-it/samples/fileinput/fileinputv4/basic/.content.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
jcr:title="File Input - 3"
sling:resourceType="core/fd/components/form/fileinput/v4/fileinput"
accept="[application/pdf]"
acceptMessage="This file type is not supported!"
description="This is long description"
fieldType="file-input"
id="fileinput_tooltip_scenario_test"
Expand Down
18 changes: 18 additions & 0 deletions ...jcr_root/apps/core/fd/components/form/container/v2/container/_cq_themeConfig/.content.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,24 @@
cssSelector=".cmp-adaptiveform-container__hamburger-menu-link:active"/>
</states>
</hamburgerMenuLink>
<hamburgerMenuItem
jcr:primaryType="nt:unstructured"
jcr:title="Item"
id="af2_hamburgermenuitem"
cssSelector=".cmp-adaptiveform-container__hamburger-menu-item"
longTitle="Hamburger Menu Item"
propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
<states jcr:primaryType="nt:unstructured">
<hidden
jcr:primaryType="nt:unstructured"
jcr:title="Hidden"
cssSelector=".cmp-adaptiveform-container__hamburger-menu-item[data-panel-visible='false']"/>
<disabled
jcr:primaryType="nt:unstructured"
jcr:title="Disabled"
cssSelector=".cmp-adaptiveform-container__hamburger-menu-item[data-panel-enabled='false']"/>
</states>
</hamburgerMenuItem>
<hamburgerMenuItemActive
jcr:primaryType="nt:unstructured"
jcr:title="Active Item"
Expand Down
5 changes: 4 additions & 1 deletion ...t/apps/core/fd/components/form/container/v2/container/clientlibs/site/js/hamburgerMenu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ if (typeof window.HamburgerMenu === 'undefined') {
};

static cssClasses = {
item: `${HamburgerMenu.bemBlock}-item`,
active: `${HamburgerMenu.bemBlock}-item--active`,
activeParent: `${HamburgerMenu.bemBlock}-item--activeparent`,
hamburgerMenuWidget: {
Expand Down Expand Up @@ -108,6 +109,7 @@ if (typeof window.HamburgerMenu === 'undefined') {
textSpan.setAttribute('tabindex', "0");
link.appendChild(textSpan);
li.appendChild(link);
li.classList.add(HamburgerMenu.cssClasses.item);
li.setAttribute('data-panel-id', item?.id);
li.setAttribute('data-panel-visible', item?.visible);
li.setAttribute('data-panel-enabled', item?.enabled);
Expand Down Expand Up @@ -289,7 +291,8 @@ if (typeof window.HamburgerMenu === 'undefined') {
link.appendChild(textSpan);
link.style.visibility = item?.label?.visible ? 'visible' : 'hidden';
li.appendChild(link);


li.classList.add(HamburgerMenu.cssClasses.item);
li.setAttribute('data-panel-id', item?.id);
li.setAttribute('data-panel-visible', item?.visible);
li.setAttribute('data-panel-enabled', item?.enabled);
Expand Down
9 changes: 8 additions & 1 deletion ...jcr_root/apps/core/fd/components/form/fileinput/v3/fileinput/_cq_styleConfig/.content.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,14 @@
id="af2_fileinputfilename"
cssSelector=".cmp-adaptiveform-fileinput__filename"
longTitle="File Input File Name"
propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"/>
propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
<states jcr:primaryType="nt:unstructured">
<hover
jcr:primaryType="nt:unstructured"
jcr:title="Hover"
cssSelector=".cmp-adaptiveform-fileinput__filename:hover"/>
</states>
</fileinputFileName>
<fileinputFileDelete
jcr:primaryType="nt:unstructured"
jcr:title="File Delete"
Expand Down
9 changes: 8 additions & 1 deletion ...jcr_root/apps/core/fd/components/form/fileinput/v4/fileinput/_cq_styleConfig/.content.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,14 @@
id="af2_fileinputfilename"
cssSelector=".cmp-adaptiveform-fileinput__filename"
longTitle="File Input File Name"
propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"/>
propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common">
<states jcr:primaryType="nt:unstructured">
<hover
jcr:primaryType="nt:unstructured"
jcr:title="Hover"
cssSelector=".cmp-adaptiveform-fileinput__filename:hover"/>
</states>
</fileinputFileName>
<fileinputFileDelete
jcr:primaryType="nt:unstructured"
jcr:title="File Delete"
Expand Down
2 changes: 1 addition & 1 deletion ...apps/core/fd/components/form/fileinput/v4/fileinput/clientlibs/site/js/fileinputwidget.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ if (typeof window.FileInputWidget === 'undefined') {
const messages = {
[this.invalidFeature.SIZE]: customMessages.maxFileSize || FormView.LanguageUtils.getTranslatedString(this.lang, "FileSizeGreater", [fileNames, this.options.maxFileSize]),
[this.invalidFeature.NAME]: customMessages.invalidFileName || FormView.LanguageUtils.getTranslatedString(this.lang, "FileNameInvalid", [fileNames]),
[this.invalidFeature.MIMETYPE]: customMessages.invalidMimeType || FormView.LanguageUtils.getTranslatedString(this.lang, "FileMimeTypeInvalid", [fileNames]),
[this.invalidFeature.MIMETYPE]: customMessages.accept || FormView.LanguageUtils.getTranslatedString(this.lang, "FileMimeTypeInvalid", [fileNames]),
[this.invalidFeature.SIZE_ZERO]: customMessages.zeroFileSize || FormView.LanguageUtils.getTranslatedString(this.lang, "FileSizeZero", [fileNames])
};
return messages[invalidFeature];
Expand Down
Loading
Loading