Skip to content

Commit c289f0c

Browse files
rismehtaci-build
authored andcommitted
FORMS-13760 Date picker display value not working during prefill (#1180)
@review @vdua DOD(Yes)
1 parent ae88d9f commit c289f0c

File tree

3 files changed

+7
-6
lines changed
  • it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/prefill/basic
  • ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/datepicker/v1/datepicker/clientlibs/site/js
  • ui.tests/test-module/specs/prefill

3 files changed

+7
-6
lines changed

it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/prefill/basic/.content.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@
4646
sling:resourceType="forms-components-examples/components/form/datepicker"
4747
enabled="{Boolean}true"
4848
fieldType="date-input"
49+
displayFormat="d MMMM, y"
50+
displayPatternType="d MMMM, y"
4951
name="dob"
5052
readOnly="{Boolean}false"
5153
textIsRich="[true,true]"

ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/datepicker/v1/datepicker/clientlibs/site/js/datepickerview.js

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,15 +84,15 @@
8484
if (this.widgetObject == null) {
8585
this.widgetObject = new DatePickerWidget(this, this.getWidget(), model);
8686
}
87-
if (this.widgetObject.getValue() !== '') {
88-
this._model.value = this.widgetObject.getValue();
87+
if (this.isActive()) {
88+
this.widgetObject.setValue(model.value);
89+
} else {
90+
this.widgetObject.setDisplayValue(model.value);
8991
}
9092
this.widgetObject.addEventListener('blur', (e) => {
9193
this._model.value = this.widgetObject.getValue();
92-
9394
//setDisplayValue is required for cases where value remains same while focussing in and out.
9495
this.widgetObject.setDisplayValue(this._model.value);
95-
9696
this.setInactive();
9797
}, this.getWidget());
9898
this.widgetObject.addEventListener('focus', (e) => {
@@ -111,7 +111,6 @@
111111
this.setActive();
112112
});
113113
}
114-
115114
}
116115

117116
#noFormats() {

ui.tests/test-module/specs/prefill/customprefill.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ describe('Custom Prefill Test', function () {
5353
cy.previewForm(pagePath, {"params" : [`prefillId=${prefillId}`]});
5454
// validating the prefilled data
5555
cy.get(nameTextBox).should("have.value", "John Doe");
56-
cy.get(dobDropdown).should("have.value", "1999-10-10");
56+
cy.get(dobDropdown).should("have.value", "10 October, 1999");
5757
cy.get(genderRadioButton).should("have.value", "0");
5858
cy.get(jobDropdown).should("have.value", "1");
5959
}

0 commit comments

Comments
 (0)