Skip to content

Change collateral of V3 version of file-input #1419

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
merged 1 commit into from
Sep 26, 2024
Merged

Change collateral of V3 version of file-input #1419

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions ...root/content/forms/af/core-components-it/samples/fileinput/fileinputv3/basic/.content.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
jcr:lastModifiedBy="admin"
jcr:primaryType="nt:unstructured"
jcr:title="File Input - 1"
sling:resourceType="core/fd/components/form/fileinput/v2/fileinput"
sling:resourceType="core/fd/components/form/fileinput/v3/fileinput"
accept="[audio/*, video/*, image/*, text/*, application/pdf]"
buttonText="Attach Files"
enabled="{Boolean}true"
Expand All @@ -43,15 +43,15 @@
<fileinput2
jcr:primaryType="nt:unstructured"
jcr:title="File Input - 2"
sling:resourceType="core/fd/components/form/fileinput/v2/fileinput"
sling:resourceType="core/fd/components/form/fileinput/v3/fileinput"
accept="[audio/*, video/*, image/*, text/*, application/pdf]"
fieldType="file-input"
name="fileinput2"
type="file"/>
<fileinput3
jcr:primaryType="nt:unstructured"
jcr:title="File Input - 3"
sling:resourceType="core/fd/components/form/fileinput/v2/fileinput"
sling:resourceType="core/fd/components/form/fileinput/v3/fileinput"
accept="[application/pdf]"
description="This is long description"
fieldType="file-input"
Expand All @@ -63,7 +63,7 @@
<fileinput4
jcr:primaryType="nt:unstructured"
jcr:title="File Input - 4"
sling:resourceType="core/fd/components/form/fileinput/v2/fileinput"
sling:resourceType="core/fd/components/form/fileinput/v3/fileinput"
accept="[application/x-msdownload,application/vnd.ms-outlook,application/pdf]"
description="This is long description"
fieldType="file-input"
Expand All @@ -77,7 +77,7 @@
jcr:lastModifiedBy="admin"
jcr:primaryType="nt:unstructured"
jcr:title="File Input - 5"
sling:resourceType="core/fd/components/form/fileinput/v2/fileinput"
sling:resourceType="core/fd/components/form/fileinput/v3/fileinput"
accept="[audio/*, video/*, image/*, text/*, application/pdf]"
buttonText="Attach Files"
enabled="{Boolean}true"
Expand Down
6 changes: 2 additions & 4 deletions ...apps/core/fd/components/form/fileinput/v3/fileinput/clientlibs/site/js/fileinputwidget.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,13 @@ if (typeof window.FileInputWidget === 'undefined') {
attachEventHandlers(widget, dragArea, model) {
super.attachEventHandlers(widget, dragArea, model)
const customBtn = dragArea?.querySelector(".cmp-adaptiveform-fileinput__widgetlabel")
customBtn?.addEventListener("click", (event) => {
event.preventDefault();
customBtn?.addEventListener("click", () => {
Copy link
Collaborator

@rismehta rismehta Sep 25, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add test cases for these changes in v3 spec ?

Copy link
Contributor Author

@pavi41 pavi41 Sep 25, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

aem-core-forms-components/ui.tests/test-module/specs/fileinput/fileinputv3.runtime.cy.js

Line 221 in 22d7cc6

it('should handle click event on attach button', () => {

It is already written here.

widget.click();
});
customBtn?.addEventListener('keypress', function(event) {
customBtn?.addEventListener('keydown', function(event) {
// Check if the Enter key is pressed
if (event.key === 'Enter' || event.keyCode === 13) {
// Trigger the click event of the file input
event.preventDefault();
widget.click();
}
});
Expand Down
2 changes: 1 addition & 1 deletion .../main/content/jcr_root/apps/core/fd/components/form/fileinput/v3/fileinput/fileinput.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<div class="cmp-adaptiveform-fileinput__dragarea">
<div class="cmp-adaptiveform-fileinput__icon"></div>
<div class="cmp-adaptiveform-fileinput__dragtext">${file.dragDropText @context='html'}</div>
<button data-sly-test="${file.buttonText}" class="cmp-adaptiveform-fileinput__widgetlabel">${file.buttonText}</button>
<button type="button" data-sly-test="${file.buttonText}" class="cmp-adaptiveform-fileinput__widgetlabel">${file.buttonText}</button>
<input class="cmp-adaptiveform-fileinput__widget"
data-sly-attribute.multiple="${file.isMultiple ? 'multiple' : ''}"
style="${file.buttonText ? 'display:none' : '' @ context='styleString'}"
Expand Down