Skip to content

refactor: extract master-detail-layout core CSS to styles folder #9454

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 9, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
/**
* @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;
Original file line number Diff line number Diff line change
@@ -0,0 +1,155 @@
/**
* @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`
:host {
display: flex;
box-sizing: border-box;
height: 100%;
}

:host([hidden]) {
display: none !important;
}

:host(:not([has-detail])) [part='detail'],
[part='backdrop'] {
display: none;
}

:host([orientation='horizontal']) [part='master'] {
max-width: 100%;
}

/* Drawer mode */
:host(:is([drawer], [stack])) {
position: relative;
}

:host(:is([drawer], [stack])[containment='layout']) [part='detail'],
:host([drawer][containment='layout']) [part='backdrop'] {
position: absolute;
}

:host(:is([drawer], [stack])[containment='viewport']) [part='detail'],
:host([drawer][containment='viewport']) [part='backdrop'] {
position: fixed;
}

:host([drawer][has-detail]) [part='backdrop'] {
display: block;
inset: 0;
z-index: 1;
}

:host(:is([drawer], [stack])) [part='detail'] {
z-index: 1;
}

:host([drawer][orientation='horizontal']) [part='detail'] {
inset-inline-end: 0;
height: 100%;
width: var(--_detail-min-size, min-content);
max-width: 100%;
}

:host([drawer][orientation='horizontal'][containment='viewport']) [part='detail'] {
inset-block-start: 0;
}

/* No fixed size */
:host(:not([has-master-size])) [part='master'],
:host(:not([has-detail-size])) [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([has-master-size][orientation='horizontal']) [part='master'] {
width: var(--_master-size);
}

:host([has-detail-size][orientation='horizontal']:not([stack])) [part='detail'] {
width: 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]) [part='detail'] {
flex-grow: 1;
flex-basis: var(--_detail-size);
}

/* Min size */
:host([has-master-min-size][has-detail][orientation='horizontal']:not([drawer]):not([stack])) [part='master'] {
min-width: var(--_master-min-size);
}

:host([has-detail-min-size][orientation='horizontal']:not([drawer]):not([stack])) [part='detail'] {
min-width: var(--_detail-min-size);
}

:host([has-master-min-size]) [part='master'],
:host([has-detail-min-size]) [part='detail'] {
flex-shrink: 0;
}

/* Vertical */
:host([orientation='vertical']) {
flex-direction: column;
}

:host([orientation='vertical'][drawer]) [part='master'] {
max-height: 100%;
}

:host([orientation='vertical'][drawer]) [part='detail'] {
inset-block-end: 0;
width: 100%;
height: var(--_detail-min-size, min-content);
}

:host([drawer][orientation='vertical'][containment='viewport']) [part='detail'] {
inset-inline-start: 0;
}

/* Fixed size */
:host([has-master-size][orientation='vertical']) [part='master'] {
height: var(--_master-size);
}

:host([has-detail-size][orientation='vertical']:not([stack])) [part='detail'] {
height: var(--_detail-size);
}

/* Min size */
:host([has-master-min-size][orientation='vertical']:not([drawer])) [part='master'],
:host([has-master-min-size][orientation='vertical'][drawer]) {
min-height: var(--_master-min-size);
}

:host([has-detail-min-size][orientation='vertical']:not([drawer]):not([stack])) [part='detail'] {
min-height: var(--_detail-min-size);
}

/* Stack mode */
:host([stack]) [part='master'] {
max-height: 100%;
}

:host([stack]) [part='detail'] {
inset: 0;
}
`;
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
/**
* @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;
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/
import { css } from 'lit';

export const transitionStyles = css`
export const masterDetailLayoutTransitionStyles = css`
html:not([dir='rtl']) {
--_vaadin-master-detail-layout-dir-multiplier: 1;
}
Expand Down
156 changes: 5 additions & 151 deletions packages/master-detail-layout/src/vaadin-master-detail-layout.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,16 @@
* Copyright (c) 2025 - 2025 Vaadin Ltd.
* This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
*/
import { css, html, LitElement, nothing } from 'lit';
import { html, LitElement, nothing } from 'lit';
import { getFocusableElements } from '@vaadin/a11y-base/src/focus-utils.js';
import { defineCustomElement } from '@vaadin/component-base/src/define.js';
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 { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
import { transitionStyles } from './vaadin-master-detail-layout-transition-styles.js';
import { masterDetailLayoutStyles } from './styles/vaadin-master-detail-layout-styles.js';
import { masterDetailLayoutTransitionStyles } from './styles/vaadin-master-detail-layout-transition-styles.js';

/**
* `<vaadin-master-detail-layout>` is a web component for building UIs with a master
Expand Down Expand Up @@ -63,154 +64,7 @@ class MasterDetailLayout extends SlotStylesMixin(ResizeMixin(ElementMixin(Themab
}

static get styles() {
return css`
:host {
display: flex;
box-sizing: border-box;
height: 100%;
}

:host([hidden]) {
display: none !important;
}

:host(:not([has-detail])) [part='detail'],
[part='backdrop'] {
display: none;
}

:host([orientation='horizontal']) [part='master'] {
max-width: 100%;
}

/* Drawer mode */
:host(:is([drawer], [stack])) {
position: relative;
}

:host(:is([drawer], [stack])[containment='layout']) [part='detail'],
:host([drawer][containment='layout']) [part='backdrop'] {
position: absolute;
}

:host(:is([drawer], [stack])[containment='viewport']) [part='detail'],
:host([drawer][containment='viewport']) [part='backdrop'] {
position: fixed;
}

:host([drawer][has-detail]) [part='backdrop'] {
display: block;
inset: 0;
z-index: 1;
}

:host(:is([drawer], [stack])) [part='detail'] {
z-index: 1;
}

:host([drawer][orientation='horizontal']) [part='detail'] {
inset-inline-end: 0;
height: 100%;
width: var(--_detail-min-size, min-content);
max-width: 100%;
}

:host([drawer][orientation='horizontal'][containment='viewport']) [part='detail'] {
inset-block-start: 0;
}

/* No fixed size */
:host(:not([has-master-size])) [part='master'],
:host(:not([has-detail-size])) [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([has-master-size][orientation='horizontal']) [part='master'] {
width: var(--_master-size);
}

:host([has-detail-size][orientation='horizontal']:not([stack])) [part='detail'] {
width: 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]) [part='detail'] {
flex-grow: 1;
flex-basis: var(--_detail-size);
}

/* Min size */
:host([has-master-min-size][has-detail][orientation='horizontal']:not([drawer]):not([stack])) [part='master'] {
min-width: var(--_master-min-size);
}

:host([has-detail-min-size][orientation='horizontal']:not([drawer]):not([stack])) [part='detail'] {
min-width: var(--_detail-min-size);
}

:host([has-master-min-size]) [part='master'],
:host([has-detail-min-size]) [part='detail'] {
flex-shrink: 0;
}

/* Vertical */
:host([orientation='vertical']) {
flex-direction: column;
}

:host([orientation='vertical'][drawer]) [part='master'] {
max-height: 100%;
}

:host([orientation='vertical'][drawer]) [part='detail'] {
inset-block-end: 0;
width: 100%;
height: var(--_detail-min-size, min-content);
}

:host([drawer][orientation='vertical'][containment='viewport']) [part='detail'] {
inset-inline-start: 0;
}

/* Fixed size */
:host([has-master-size][orientation='vertical']) [part='master'] {
height: var(--_master-size);
}

:host([has-detail-size][orientation='vertical']:not([stack])) [part='detail'] {
height: var(--_detail-size);
}

/* Min size */
:host([has-master-min-size][orientation='vertical']:not([drawer])) [part='master'],
:host([has-master-min-size][orientation='vertical'][drawer]) {
min-height: var(--_master-min-size);
}

:host([has-detail-min-size][orientation='vertical']:not([drawer]):not([stack])) [part='detail'] {
min-height: var(--_detail-min-size);
}

/* Stack mode */
:host([stack]) [part='master'] {
max-height: 100%;
}

:host([stack]) [part='detail'] {
inset: 0;
}
`;
return masterDetailLayoutStyles;
}

static get properties() {
Expand Down Expand Up @@ -388,7 +242,7 @@ class MasterDetailLayout extends SlotStylesMixin(ResizeMixin(ElementMixin(Themab

/** @override */
get slotStyles() {
return [transitionStyles];
return [masterDetailLayoutTransitionStyles];
}

/** @protected */
Expand Down