@vaadin/master-detail-layout 25.0.0-alpha9 → 25.0.0-beta1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/master-detail-layout",
-  "version": "25.0.0-alpha9",
+  "version": "25.0.0-beta1",
   "publishConfig": {
     "access": "public"
   },
@@ -21,9 +21,6 @@
   "type": "module",
   "files": [
     "src",
-    "!src/styles/*-base-styles.d.ts",
-    "!src/styles/*-base-styles.js",
-    "theme",
     "vaadin-*.d.ts",
     "vaadin-*.js",
     "web-types.json",
@@ -36,20 +33,20 @@
     "web-component"
   ],
   "dependencies": {
-    "@vaadin/a11y-base": "25.0.0-alpha9",
-    "@vaadin/component-base": "25.0.0-alpha9",
-    "@vaadin/vaadin-lumo-styles": "25.0.0-alpha9",
-    "@vaadin/vaadin-themable-mixin": "25.0.0-alpha9",
+    "@vaadin/a11y-base": "25.0.0-beta1",
+    "@vaadin/component-base": "25.0.0-beta1",
+    "@vaadin/vaadin-themable-mixin": "25.0.0-beta1",
     "lit": "^3.0.0"
   },
   "devDependencies": {
-    "@vaadin/chai-plugins": "25.0.0-alpha9",
+    "@vaadin/chai-plugins": "25.0.0-beta1",
     "@vaadin/testing-helpers": "^2.0.0",
-    "sinon": "^18.0.0"
+    "@vaadin/vaadin-lumo-styles": "25.0.0-beta1",
+    "sinon": "^21.0.0"
   },
   "web-types": [
     "web-types.json",
     "web-types.lit.json"
   ],
-  "gitHead": "bbe4720721e0955ffc87a79b412bee38b1f0eb1e"
+  "gitHead": "1d20cf54e582d1f2e209126d4586f8b4c01c50e0"
 }

package/src/styles/vaadin-master-detail-layout-base-styles.js

@@ -3,7 +3,7 @@
  * Copyright (c) 2025 - 2025 Vaadin Ltd.
  * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
  */
-import '@vaadin/component-base/src/style-props.js';
+import '@vaadin/component-base/src/styles/style-props.js';
 import { css } from 'lit';
 
 export const masterDetailLayoutStyles = css`
@@ -139,7 +139,8 @@ export const masterDetailLayoutStyles = css`
   /* Decorative/visual styles */
 
   [part='backdrop'] {
-    background: var(--vaadin-master-detail-layout-backdrop, rgba(0, 0, 0, 0.2));
+    background: var(--vaadin-overlay-backdrop-background, rgba(0, 0, 0, 0.2));
+    forced-color-adjust: none;
   }
 
   :host(:is([drawer], [stack])) [part='detail'] {
@@ -149,17 +150,21 @@ export const masterDetailLayoutStyles = css`
 
   :host([orientation='horizontal']:not([drawer], [stack])) [part='detail'] {
     border-inline-start: var(--vaadin-master-detail-layout-border-width, 1px) solid
-      var(--vaadin-master-detail-layout-border-color, var(--vaadin-border-color));
+      var(--vaadin-master-detail-layout-border-color, var(--vaadin-border-color-secondary));
   }
 
   :host([orientation='vertical']:not([drawer], [stack])) [part='detail'] {
     border-top: var(--vaadin-master-detail-layout-border-width, 1px) solid
-      var(--vaadin-master-detail-layout-border-color, var(--vaadin-border-color));
+      var(--vaadin-master-detail-layout-border-color, var(--vaadin-border-color-secondary));
   }
 
   @media (forced-colors: active) {
     :host(:is([drawer], [stack])) [part='detail'] {
-      outline: 3px solid;
+      outline: 3px solid !important;
+    }
+
+    [part='detail'] {
+      background: Canvas !important;
     }
   }
 `;

package/src/styles/vaadin-master-detail-layout-transition-base-styles.js

@@ -88,7 +88,14 @@ export const masterDetailLayoutTransitionStyles = css`
     ::view-transition-new(vaadin-mdl-master),
     ::view-transition-old(vaadin-mdl-master) {
       object-fit: none;
-      object-position: max(0%, var(--_vaadin-mdl-dir-multiplier) * -100%) 0;
+      object-position: 0% 0;
+      width: 100%;
+      height: 100%;
+    }
+
+    :dir(rtl)::view-transition-new(vaadin-mdl-master),
+    :dir(rtl)::view-transition-old(vaadin-mdl-master) {
+      object-position: 100% 0;
     }
 
     ::view-transition-new(vaadin-mdl-master.stack-remove),

package/src/vaadin-master-detail-layout.js

@@ -11,8 +11,8 @@ import { PolylitMixin } from '@vaadin/component-base/src/polylit-mixin.js';
 import { ResizeMixin } from '@vaadin/component-base/src/resize-mixin.js';
 import { SlotStylesMixin } from '@vaadin/component-base/src/slot-styles-mixin.js';
 import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
-import { masterDetailLayoutStyles } from './styles/vaadin-master-detail-layout-core-styles.js';
-import { masterDetailLayoutTransitionStyles } from './styles/vaadin-master-detail-layout-transition-core-styles.js';
+import { masterDetailLayoutStyles } from './styles/vaadin-master-detail-layout-base-styles.js';
+import { masterDetailLayoutTransitionStyles } from './styles/vaadin-master-detail-layout-transition-base-styles.js';
 
 /**
  * `<vaadin-master-detail-layout>` is a web component for building UIs with a master
@@ -291,9 +291,9 @@ class MasterDetailLayout extends SlotStylesMixin(ResizeMixin(ElementMixin(Themab
 
   /** @private */
   __onDetailKeydown(event) {
-    if (event.key === 'Escape') {
+    if (event.key === 'Escape' && !event.defaultPrevented) {
       // Prevent firing on parent layout when using nested layouts
-      event.stopPropagation();
+      event.preventDefault();
       this.dispatchEvent(new CustomEvent('detail-escape-press'));
     }
   }
@@ -523,8 +523,10 @@ class MasterDetailLayout extends SlotStylesMixin(ResizeMixin(ElementMixin(Themab
    * @protected
    */
   async _finishTransition() {
-    // Detect new layout mode after DOM has been updated
-    this.__detectLayoutMode();
+    // Detect new layout mode after DOM has been updated.
+    // The detection is wrapped in queueMicroTask in order to allow custom Lit elements to render before measurement.
+    // https://github.com/vaadin/web-components/issues/8969
+    queueMicrotask(() => this.__detectLayoutMode());
 
     if (!this.__transition) {
       return Promise.resolve();

package/vaadin-master-detail-layout.js

@@ -1,3 +1,3 @@
-import './theme/lumo/vaadin-master-detail-layout.js';
+import './src/vaadin-master-detail-layout.js';
 
 export * from './src/vaadin-master-detail-layout.js';

package/web-types.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/web-types",
   "name": "@vaadin/master-detail-layout",
-  "version": "25.0.0-alpha9",
+  "version": "25.0.0-beta1",
   "description-markup": "markdown",
   "contributions": {
     "html": {

package/web-types.lit.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/web-types",
   "name": "@vaadin/master-detail-layout",
-  "version": "25.0.0-alpha9",
+  "version": "25.0.0-beta1",
   "description-markup": "markdown",
   "framework": "lit",
   "framework-config": {

package/src/styles/vaadin-master-detail-layout-core-styles.d.ts

@@ -1,8 +0,0 @@
-/**
- * @license
- * Copyright (c) 2025 - 2025 Vaadin Ltd.
- * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
- */
-import type { CSSResult } from 'lit';
-
-export const masterDetailLayoutStyles: CSSResult;

package/src/styles/vaadin-master-detail-layout-core-styles.js

@@ -1,159 +0,0 @@
-/**
- * @license
- * Copyright (c) 2025 - 2025 Vaadin Ltd.
- * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
- */
-import { css } from 'lit';
-
-export const masterDetailLayoutStyles = css`
-  /* Layout and positioning styles */
-
-  :host {
-    display: flex;
-    box-sizing: border-box;
-    height: 100%;
-    max-width: 100%;
-    max-height: 100%;
-    position: relative; /* Keep the positioning context stable across all modes */
-    overflow: hidden;
-  }
-
-  :host([hidden]) {
-    display: none !important;
-  }
-
-  :host([orientation='vertical']) {
-    flex-direction: column;
-  }
-
-  [part='_detail-internal'] {
-    display: contents;
-    justify-content: end;
-  }
-
-  :host([orientation='vertical']) [part='_detail-internal'] {
-    align-items: end;
-  }
-
-  :host(:is([drawer], [stack])) [part='_detail-internal'],
-  :host(:is([drawer], [stack])[has-detail]) [part='backdrop'] {
-    display: flex;
-    position: absolute;
-    z-index: 1;
-    inset: 0;
-    overscroll-behavior: contain;
-  }
-
-  :host(:not([has-detail])) [part='_detail-internal'],
-  [part='backdrop'] {
-    display: none;
-  }
-
-  :host([orientation='horizontal'][drawer]) [part='detail'] {
-    margin-inline-start: 50px;
-  }
-
-  :host([orientation='vertical'][drawer]) [part='detail'] {
-    margin-top: 50px;
-  }
-
-  :host(:is([drawer], [stack])[containment='viewport']) :is([part='_detail-internal'], [part='backdrop']) {
-    position: fixed;
-  }
-
-  /* Sizing styles */
-
-  [part] {
-    box-sizing: border-box;
-    max-width: 100%;
-    max-height: 100%;
-  }
-
-  /* No fixed size */
-  :host(:not([has-master-size])) [part='master'],
-  :host(:not([has-detail-size]):not([drawer], [stack])) [part='detail'] {
-    flex-grow: 1;
-    flex-basis: 50%;
-  }
-
-  /* Fixed size */
-  :host([has-master-size]) [part='master'],
-  :host([has-detail-size]) [part='detail'] {
-    flex-shrink: 0;
-  }
-
-  :host([orientation='horizontal'][has-master-size][has-detail]) [part='master'] {
-    width: var(--_master-size);
-  }
-
-  :host([orientation='vertical'][has-master-size][has-detail]) [part='master'] {
-    height: var(--_master-size);
-  }
-
-  :host([orientation='horizontal'][has-detail-size]:not([stack])) [part='detail'] {
-    width: var(--_detail-size);
-  }
-
-  :host([orientation='vertical'][has-detail-size]:not([stack])) [part='detail'] {
-    height: var(--_detail-size);
-  }
-
-  :host([has-master-size][has-detail-size]) [part='master'] {
-    flex-grow: 1;
-    flex-basis: var(--_master-size);
-  }
-
-  :host([has-master-size][has-detail-size]:not([drawer], [stack])) [part='detail'] {
-    flex-grow: 1;
-    flex-basis: var(--_detail-size);
-  }
-
-  /* Min size */
-  :host([orientation='horizontal'][has-master-min-size]) [part='master'] {
-    min-width: min(100%, var(--_master-min-size));
-  }
-
-  :host([orientation='vertical'][has-master-min-size]) [part='master'] {
-    min-height: min(100%, var(--_master-min-size));
-  }
-
-  :host([orientation='horizontal'][has-detail-min-size]) [part='detail'] {
-    min-width: min(100%, var(--_detail-min-size));
-  }
-
-  :host([orientation='vertical'][has-detail-min-size]) [part='detail'] {
-    min-height: min(100%, var(--_detail-min-size));
-  }
-
-  :host([drawer]) [part='master'],
-  :host([stack]) [part] {
-    width: 100% !important;
-    height: 100% !important;
-    min-width: auto !important;
-    min-height: auto !important;
-    max-width: 100% !important;
-    max-height: 100% !important;
-  }
-
-  /* Decorative/visual styles */
-
-  [part='backdrop'] {
-    background-color: rgba(0, 0, 0, 0.2);
-  }
-
-  [part='detail'] {
-    background: #fff;
-  }
-
-  :host(:is([drawer], [stack])) [part='detail'] {
-    box-shadow: 0 0 20px 0 rgba(0, 0, 0, 0.3);
-  }
-
-  :host([orientation='horizontal']:not([drawer], [stack])) [part='detail'] {
-    border-inline-start: 1px solid rgba(0, 0, 0, 0.1);
-  }
-
-  :host([orientation='vertical']:not([drawer], [stack])) [part='detail'] {
-    border-top: 1px solid rgba(0, 0, 0, 0.1);
-  }
-`;

package/src/styles/vaadin-master-detail-layout-transition-core-styles.d.ts

@@ -1,8 +0,0 @@
-/**
- * @license
- * Copyright (c) 2025 - 2025 Vaadin Ltd.
- * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
- */
-import type { CSSResult } from 'lit';
-
-export const masterDetailLayoutTransitionStyles: CSSResult;

package/src/styles/vaadin-master-detail-layout-transition-core-styles.js

@@ -1,140 +0,0 @@
-/**
- * @license
- * Copyright (c) 2025 - 2025 Vaadin Ltd.
- * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
- */
-import { css } from 'lit';
-
-export const masterDetailLayoutTransitionStyles = css`
-  @media (prefers-reduced-motion: no-preference) {
-    html {
-      --_vaadin-mdl-dir-multiplier: 1;
-      --_vaadin-mdl-stack-master-offset: 20%;
-      --_vaadin-mdl-stack-master-clip-path: inset(0 0 0 var(--_vaadin-mdl-stack-master-offset));
-      --_vaadin-mdl-easing: cubic-bezier(0.78, 0, 0.22, 1);
-    }
-
-    html[dir='rtl'] {
-      --_vaadin-mdl-dir-multiplier: -1;
-      --_vaadin-mdl-stack-master-clip-path: inset(0 var(--_vaadin-mdl-stack-master-offset) 0 0);
-    }
-
-    ::view-transition-group(vaadin-mdl-backdrop),
-    ::view-transition-group(vaadin-mdl-master),
-    ::view-transition-group(vaadin-mdl-detail) {
-      animation-duration: 0.4s;
-    }
-
-    ::view-transition-group(vaadin-mdl-master),
-    ::view-transition-group(vaadin-mdl-detail) {
-      animation-timing-function: var(--_vaadin-mdl-easing);
-    }
-
-    ::view-transition-image-pair(vaadin-mdl-master),
-    ::view-transition-image-pair(vaadin-mdl-detail),
-    ::view-transition-new(vaadin-mdl-master),
-    ::view-transition-new(vaadin-mdl-detail),
-    ::view-transition-old(vaadin-mdl-master),
-    ::view-transition-old(vaadin-mdl-detail) {
-      animation-timing-function: inherit;
-    }
-
-    /* Needed to promote the backdrop on top the master during the transition */
-    vaadin-master-detail-layout[transition]::part(backdrop) {
-      view-transition-name: vaadin-mdl-backdrop;
-    }
-
-    vaadin-master-detail-layout[transition]:not([transition='replace']):not([drawer], [stack])::part(detail),
-    vaadin-master-detail-layout[transition]:is([drawer], [stack])::part(_detail-internal) {
-      view-transition-name: vaadin-mdl-detail;
-    }
-
-    ::view-transition-group(vaadin-mdl-detail) {
-      clip-path: inset(0);
-    }
-
-    ::view-transition-new(vaadin-mdl-detail),
-    ::view-transition-old(vaadin-mdl-detail) {
-      animation-name: vaadin-mdl-detail-slide-in;
-    }
-
-    ::view-transition-old(vaadin-mdl-detail) {
-      animation-direction: reverse;
-    }
-
-    @keyframes vaadin-mdl-detail-slide-in {
-      0% {
-        translate: calc((100% + 30px) * var(--_vaadin-mdl-dir-multiplier));
-      }
-    }
-
-    vaadin-master-detail-layout[orientation='horizontal'][stack][has-detail]::part(master) {
-      translate: calc(var(--_vaadin-mdl-stack-master-offset) * var(--_vaadin-mdl-dir-multiplier) * -1);
-      opacity: 0;
-    }
-
-    vaadin-master-detail-layout[transition]::part(master) {
-      view-transition-name: vaadin-mdl-master;
-    }
-
-    vaadin-master-detail-layout[orientation='horizontal'][stack][transition='add']::part(master) {
-      view-transition-class: stack-add;
-    }
-
-    vaadin-master-detail-layout[orientation='horizontal'][stack][transition='remove']::part(master) {
-      view-transition-class: stack-remove;
-    }
-
-    ::view-transition-new(vaadin-mdl-master),
-    ::view-transition-old(vaadin-mdl-master) {
-      object-fit: none;
-      object-position: max(0%, var(--_vaadin-mdl-dir-multiplier) * -100%) 0;
-    }
-
-    ::view-transition-new(vaadin-mdl-master.stack-remove),
-    ::view-transition-old(vaadin-mdl-master.stack-remove) {
-      animation-name: vaadin-mdl-master-stack-remove;
-      clip-path: var(--_vaadin-mdl-stack-master-clip-path);
-    }
-
-    @keyframes vaadin-mdl-master-stack-remove {
-      100% {
-        clip-path: inset(0);
-      }
-    }
-
-    ::view-transition-new(vaadin-mdl-master.stack-add),
-    ::view-transition-old(vaadin-mdl-master.stack-add) {
-      animation-name: vaadin-mdl-master-stack-add;
-      clip-path: inset(0);
-    }
-
-    @keyframes vaadin-mdl-master-stack-add {
-      100% {
-        clip-path: var(--_vaadin-mdl-stack-master-clip-path);
-      }
-    }
-
-    /* prettier-ignore */
-    vaadin-master-detail-layout[orientation='vertical']:not([drawer], [stack])[transition]:not([transition='replace'])::part(detail),
-    vaadin-master-detail-layout[orientation='vertical']:is([drawer], [stack])[transition]::part(_detail-internal) {
-      view-transition-name: vaadin-mdl-detail;
-      view-transition-class: vertical;
-    }
-
-    ::view-transition-new(vaadin-mdl-detail.vertical),
-    ::view-transition-old(vaadin-mdl-detail.vertical) {
-      animation-name: vaadin-mdl-vertical-detail-slide-in;
-    }
-
-    ::view-transition-old(vaadin-mdl-detail.vertical) {
-      animation-direction: reverse;
-    }
-
-    @keyframes vaadin-mdl-vertical-detail-slide-in {
-      0% {
-        transform: translateY(calc(100% + 30px));
-      }
-    }
-  }
-`;

package/theme/lumo/vaadin-master-detail-layout-styles.d.ts

@@ -1,2 +0,0 @@
-import '@vaadin/vaadin-lumo-styles/color.js';
-import '@vaadin/vaadin-lumo-styles/style.js';

package/theme/lumo/vaadin-master-detail-layout-styles.js

@@ -1,24 +0,0 @@
-import '@vaadin/vaadin-lumo-styles/color.js';
-import '@vaadin/vaadin-lumo-styles/style.js';
-import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
-
-registerStyles(
-  'vaadin-master-detail-layout',
-  css`
-    :host(:is([drawer], [stack])) [part='detail'] {
-      background-color: var(--lumo-base-color);
-      box-shadow:
-        0 0 0 1px var(--lumo-shade-5pct),
-        var(--lumo-box-shadow-m);
-    }
-
-    [part='detail'] {
-      border-color: var(--lumo-contrast-10pct);
-    }
-
-    [part='backdrop'] {
-      background-color: var(--lumo-shade-20pct);
-    }
-  `,
-  { moduleId: 'lumo-master-detail-layout' },
-);

package/theme/lumo/vaadin-master-detail-layout.d.ts

@@ -1,2 +0,0 @@
-import './vaadin-master-detail-layout-styles.js';
-import '../../src/vaadin-master-detail-layout.js';

package/theme/lumo/vaadin-master-detail-layout.js

@@ -1,2 +0,0 @@
-import './vaadin-master-detail-layout-styles.js';
-import '../../src/vaadin-master-detail-layout.js';