From 75b28d3eacfa17ed9b0a303ab1ba55df7d9b1569 Mon Sep 17 00:00:00 2001 From: Jouni Koivuviita Date: Thu, 2 Oct 2025 15:13:40 +0300 Subject: [PATCH 1/2] fix: dialog base styles max-width --- packages/dialog/src/styles/vaadin-dialog-overlay-base-styles.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/dialog/src/styles/vaadin-dialog-overlay-base-styles.js b/packages/dialog/src/styles/vaadin-dialog-overlay-base-styles.js index 54772d8945..e7adea36f3 100644 --- a/packages/dialog/src/styles/vaadin-dialog-overlay-base-styles.js +++ b/packages/dialog/src/styles/vaadin-dialog-overlay-base-styles.js @@ -37,7 +37,7 @@ export const dialogOverlayBase = css` border-radius: var(--vaadin-dialog-border-radius, var(--vaadin-radius-l)); width: max-content; min-width: min(var(--vaadin-dialog-min-width, 4em), 100%); - max-width: var(--vaadin-dialog-max-width, 100%); + max-width: min(var(--vaadin-dialog-max-width, 100%), 100%); max-height: 100%; } From b9156887dd785500d96cd1bb9b7b1f0bc7d47132 Mon Sep 17 00:00:00 2001 From: Sergey Vinogradov Date: Mon, 6 Oct 2025 15:20:25 +0400 Subject: [PATCH 2/2] fix unit tests --- packages/dialog/test/dialog.test.js | 2 +- packages/dialog/test/draggable-resizable.test.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/dialog/test/dialog.test.js b/packages/dialog/test/dialog.test.js index 421f0b3516..ecbc0c532c 100644 --- a/packages/dialog/test/dialog.test.js +++ b/packages/dialog/test/dialog.test.js @@ -354,7 +354,7 @@ describe('vaadin-dialog', () => { dialog.height = 400; await nextRender(); expect(getComputedStyle(overlay.$.overlay).position).to.equal('relative'); - expect(getComputedStyle(overlay.$.overlay).maxWidth).to.equal('100%'); + expect(getComputedStyle(overlay.$.overlay).maxWidth).to.be.oneOf(['100%', 'min(100%, 100%)']); }); it('should reset overlay width when set to null', async () => { diff --git a/packages/dialog/test/draggable-resizable.test.js b/packages/dialog/test/draggable-resizable.test.js index a6cfe05077..ac18bf2c62 100644 --- a/packages/dialog/test/draggable-resizable.test.js +++ b/packages/dialog/test/draggable-resizable.test.js @@ -628,7 +628,7 @@ describe('draggable', () => { it('should not set overlay max-width to none on drag', async () => { drag(container); await nextRender(); - expect(getComputedStyle(dialog.$.overlay.$.overlay).maxWidth).to.equal('100%'); + expect(getComputedStyle(dialog.$.overlay.$.overlay).maxWidth).to.be.oneOf(['100%', 'min(100%, 100%)']); }); });