From 1b5b2412e0a519d260d8e63826eba0f410ad0741 Mon Sep 17 00:00:00 2001 From: Stoyan Date: Mon, 6 Oct 2025 13:31:55 +0300 Subject: [PATCH 1/4] fix(ui5-date-picker): open picker on correct view based on valueFormat/formatPattern --- packages/main/src/DateComponentBase.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/main/src/DateComponentBase.ts b/packages/main/src/DateComponentBase.ts index adb1bcdfad18..70615a98d8e1 100644 --- a/packages/main/src/DateComponentBase.ts +++ b/packages/main/src/DateComponentBase.ts @@ -155,7 +155,7 @@ class DateComponentBase extends UI5Element { } get _formatPattern() { - return this.formatPattern || "medium"; // get from config + return this.formatPattern || this.valueFormat || "medium"; // get from config } get _isPattern() { From 7ffc707e6596290000e6a3ab15230cd9b0099fb3 Mon Sep 17 00:00:00 2001 From: Stoyan Date: Fri, 10 Oct 2025 15:43:07 +0300 Subject: [PATCH 2/4] fix: add discussion test --- packages/main/cypress/specs/DatePicker.cy.tsx | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/packages/main/cypress/specs/DatePicker.cy.tsx b/packages/main/cypress/specs/DatePicker.cy.tsx index c85616ee671d..d5f42ee992eb 100644 --- a/packages/main/cypress/specs/DatePicker.cy.tsx +++ b/packages/main/cypress/specs/DatePicker.cy.tsx @@ -1547,6 +1547,31 @@ describe("Date Picker Tests", () => { .shadow() .find("ui5-yearpicker") .should("be.visible"); + }); + + it("Date picker in month mode, using valueFormat", () => { + cy.mount(); + + cy.get("[ui5-date-picker]") + .as("datePicker") + .ui5DatePickerGetInnerInput() + .realClick() + .should("be.focused") + .realPress("F4"); + + cy.get("@datePicker") + .should("have.attr", "open"); + + cy.get("@datePicker") + .shadow() + .find("ui5-calendar") + .as("calendar") + .should("have.attr", "_current-picker", "month"); + + cy.get("@calendar") + .shadow() + .find("ui5-monthpicker") + .should("be.visible"); }); }); From 1d9c054c4ecfda8dfeede51b555749db9882ba68 Mon Sep 17 00:00:00 2001 From: Stoyan Date: Fri, 10 Oct 2025 15:47:13 +0300 Subject: [PATCH 3/4] Revert "fix: add discussion test" This reverts commit 7ffc707e6596290000e6a3ab15230cd9b0099fb3. --- packages/main/cypress/specs/DatePicker.cy.tsx | 25 ------------------- 1 file changed, 25 deletions(-) diff --git a/packages/main/cypress/specs/DatePicker.cy.tsx b/packages/main/cypress/specs/DatePicker.cy.tsx index d5f42ee992eb..c85616ee671d 100644 --- a/packages/main/cypress/specs/DatePicker.cy.tsx +++ b/packages/main/cypress/specs/DatePicker.cy.tsx @@ -1547,31 +1547,6 @@ describe("Date Picker Tests", () => { .shadow() .find("ui5-yearpicker") .should("be.visible"); - }); - - it("Date picker in month mode, using valueFormat", () => { - cy.mount(); - - cy.get("[ui5-date-picker]") - .as("datePicker") - .ui5DatePickerGetInnerInput() - .realClick() - .should("be.focused") - .realPress("F4"); - - cy.get("@datePicker") - .should("have.attr", "open"); - - cy.get("@datePicker") - .shadow() - .find("ui5-calendar") - .as("calendar") - .should("have.attr", "_current-picker", "month"); - - cy.get("@calendar") - .shadow() - .find("ui5-monthpicker") - .should("be.visible"); }); }); From e2a160ac991ff8b72aa9b375df0490ed6447420f Mon Sep 17 00:00:00 2001 From: Stoyan Date: Fri, 10 Oct 2025 15:49:55 +0300 Subject: [PATCH 4/4] fix: add discussion test --- packages/main/cypress/specs/DatePicker.cy.tsx | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/packages/main/cypress/specs/DatePicker.cy.tsx b/packages/main/cypress/specs/DatePicker.cy.tsx index 2b6ed5558b2f..ab041b51da11 100644 --- a/packages/main/cypress/specs/DatePicker.cy.tsx +++ b/packages/main/cypress/specs/DatePicker.cy.tsx @@ -1549,6 +1549,31 @@ describe("Date Picker Tests", () => { .should("be.visible"); }); + it("Date picker in month mode, using valueFormat", () => { + cy.mount(); + + cy.get("[ui5-date-picker]") + .as("datePicker") + .ui5DatePickerGetInnerInput() + .realClick() + .should("be.focused") + .realPress("F4"); + + cy.get("@datePicker") + .should("have.attr", "open"); + + cy.get("@datePicker") + .shadow() + .find("ui5-calendar") + .as("calendar") + .should("have.attr", "_current-picker", "month"); + + cy.get("@calendar") + .shadow() + .find("ui5-monthpicker") + .should("be.visible"); + }); + it("Should not auto-format incomplete date while typing", () => { cy.mount(); cy.get("[ui5-date-picker]")