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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/master-detail-layout",
-  "version": "25.0.0-alpha8",
+  "version": "25.0.0-beta1",
   "publishConfig": {
     "access": "public"
   },
@@ -21,7 +21,6 @@
   "type": "module",
   "files": [
     "src",
-    "theme",
     "vaadin-*.d.ts",
     "vaadin-*.js",
     "web-types.json",
@@ -34,20 +33,20 @@
     "web-component"
   ],
   "dependencies": {
-    "@vaadin/a11y-base": "25.0.0-alpha8",
-    "@vaadin/component-base": "25.0.0-alpha8",
-    "@vaadin/vaadin-lumo-styles": "25.0.0-alpha8",
-    "@vaadin/vaadin-themable-mixin": "25.0.0-alpha8",
+    "@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-alpha8",
+    "@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": "ebf53673d5f639d2b1b6f2b31f640f530643ee2f"
+  "gitHead": "1d20cf54e582d1f2e209126d4586f8b4c01c50e0"
 }

package/src/styles/{vaadin-master-detail-layout-core-styles.js → vaadin-master-detail-layout-base-styles.js}

@@ -3,6 +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/styles/style-props.js';
 import { css } from 'lit';
 
 export const masterDetailLayoutStyles = css`
@@ -138,22 +139,32 @@ export const masterDetailLayoutStyles = css`
   /* Decorative/visual styles */
 
   [part='backdrop'] {
-    background-color: rgba(0, 0, 0, 0.2);
-  }
-
-  [part='detail'] {
-    background: #fff;
+    background: var(--vaadin-overlay-backdrop-background, rgba(0, 0, 0, 0.2));
+    forced-color-adjust: none;
   }
 
   :host(:is([drawer], [stack])) [part='detail'] {
-    box-shadow: 0 0 20px 0 rgba(0, 0, 0, 0.3);
+    background: var(--vaadin-master-detail-layout-detail-background, var(--vaadin-background-color));
+    box-shadow: var(--vaadin-master-detail-layout-detail-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);
+    border-inline-start: var(--vaadin-master-detail-layout-border-width, 1px) solid
+      var(--vaadin-master-detail-layout-border-color, var(--vaadin-border-color-secondary));
   }
 
   :host([orientation='vertical']:not([drawer], [stack])) [part='detail'] {
-    border-top: 1px solid rgba(0, 0, 0, 0.1);
+    border-top: var(--vaadin-master-detail-layout-border-width, 1px) solid
+      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 !important;
+    }
+
+    [part='detail'] {
+      background: Canvas !important;
+    }
   }
 `;

package/src/styles/{vaadin-master-detail-layout-transition-core-styles.js → vaadin-master-detail-layout-transition-base-styles.js}

@@ -40,7 +40,7 @@ export const masterDetailLayoutTransitionStyles = css`
     }
 
     /* Needed to promote the backdrop on top the master during the transition */
-    vaadin-master-detail-layout[transition]:not([transition='replace'])::part(backdrop) {
+    vaadin-master-detail-layout[transition]::part(backdrop) {
       view-transition-name: vaadin-mdl-backdrop;
     }
 
@@ -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

@@ -10,10 +10,9 @@ import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js';
 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 { LumoInjectionMixin } from '@vaadin/vaadin-themable-mixin/lumo-injection-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
@@ -52,9 +51,7 @@ import { masterDetailLayoutTransitionStyles } from './styles/vaadin-master-detai
  * @mixes ResizeMixin
  * @mixes SlotStylesMixin
  */
-class MasterDetailLayout extends SlotStylesMixin(
-  ResizeMixin(ElementMixin(ThemableMixin(PolylitMixin(LumoInjectionMixin(LitElement))))),
-) {
+class MasterDetailLayout extends SlotStylesMixin(ResizeMixin(ElementMixin(ThemableMixin(PolylitMixin(LitElement))))) {
   static get is() {
     return 'vaadin-master-detail-layout';
   }
@@ -63,12 +60,6 @@ class MasterDetailLayout extends SlotStylesMixin(
     return masterDetailLayoutStyles;
   }
 
-  static get lumoInjector() {
-    return {
-      includeBaseStyles: true,
-    };
-  }
-
   static get properties() {
     return {
       /**
@@ -300,9 +291,9 @@ class MasterDetailLayout extends SlotStylesMixin(
 
   /** @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'));
     }
   }
@@ -532,8 +523,10 @@ class MasterDetailLayout extends SlotStylesMixin(
    * @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-alpha8",
+  "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-alpha8",
+  "version": "25.0.0-beta1",
   "description-markup": "markdown",
   "framework": "lit",
   "framework-config": {

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';