diff --git a/frontend/demo/component/dialog/dialog-basic.ts b/frontend/demo/component/dialog/dialog-basic.ts
index dbc3c2c088..ab3e2079e0 100644
--- a/frontend/demo/component/dialog/dialog-basic.ts
+++ b/frontend/demo/component/dialog/dialog-basic.ts
@@ -5,7 +5,6 @@ import '@vaadin/form-layout';
import '@vaadin/text-field';
import { css, html, LitElement } from 'lit';
import { customElement, state } from 'lit/decorators.js';
-import { dialogFooterRenderer, dialogRenderer } from '@vaadin/dialog/lit.js';
import { applyTheme } from 'Frontend/demo/theme';
@customElement('dialog-basic')
@@ -42,9 +41,16 @@ export class Example extends LitElement {
@closed="${() => {
this.dialogOpened = false;
}}"
- ${dialogRenderer(this.renderDialog, [])}
- ${dialogFooterRenderer(this.renderFooter, [])}
- >
+ >
+
+
+
+
+
+ Cancel
+ Add
+
+
{
@@ -57,18 +63,6 @@ export class Example extends LitElement {
`;
}
- private renderDialog = () => html`
-
-
-
-
- `;
-
- private renderFooter = () => html`
- Cancel
- Add
- `;
-
private close() {
this.dialogOpened = false;
}
diff --git a/frontend/demo/component/dialog/dialog-closing.ts b/frontend/demo/component/dialog/dialog-closing.ts
index 13846d0000..26b25ad9eb 100644
--- a/frontend/demo/component/dialog/dialog-closing.ts
+++ b/frontend/demo/component/dialog/dialog-closing.ts
@@ -3,7 +3,6 @@ import '@vaadin/button';
import '@vaadin/dialog';
import { html, LitElement } from 'lit';
import { customElement, state } from 'lit/decorators.js';
-import { dialogFooterRenderer, dialogRenderer } from '@vaadin/dialog/lit.js';
import { applyTheme } from 'Frontend/demo/theme';
@customElement('dialog-closing')
@@ -26,20 +25,15 @@ export class Example extends LitElement {
@closed="${() => {
this.dialogOpened = false;
}}"
- ${dialogRenderer(
- () => html`
-
- System maintenance will begin at 3 PM. It is schedule to conclude at 5PM. We apologise
- for any inconvenience.
-
- `,
- []
- )}
- ${dialogFooterRenderer(
- () => html`Close`,
- []
- )}
- >
+ >
+
+ System maintenance will begin at 3 PM. It is schedule to conclude at 5PM. We apologise for
+ any inconvenience.
+
+
+ Close
+
+
Show dialog
diff --git a/frontend/demo/component/dialog/dialog-draggable.ts b/frontend/demo/component/dialog/dialog-draggable.ts
index eaa3a18842..e7bb12c4a3 100644
--- a/frontend/demo/component/dialog/dialog-draggable.ts
+++ b/frontend/demo/component/dialog/dialog-draggable.ts
@@ -6,7 +6,6 @@ import '@vaadin/text-area';
import '@vaadin/text-field';
import { html, LitElement } from 'lit';
import { customElement, state } from 'lit/decorators.js';
-import { dialogFooterRenderer, dialogHeaderRenderer, dialogRenderer } from '@vaadin/dialog/lit.js';
import { applyTheme } from 'Frontend/demo/theme';
@customElement('dialog-draggable')
@@ -31,34 +30,24 @@ export class Example extends LitElement {
@closed="${() => {
this.dialogOpened = false;
}}"
- ${dialogHeaderRenderer(
- () => html`
-
- Add note
-
- `,
- []
- )}
- ${dialogRenderer(
- () => html`
-
-
-
-
- `,
- []
- )}
- ${dialogFooterRenderer(
- () => html`
- Cancel
- Add note
- `,
- []
- )}
- >
+ >
+
+
+ Add note
+
+
+
+
+
+
+
+ Cancel
+ Add note
+
+
Show dialog
`;
diff --git a/frontend/demo/component/dialog/dialog-footer.ts b/frontend/demo/component/dialog/dialog-footer.ts
index c2ea00c387..9f35601616 100644
--- a/frontend/demo/component/dialog/dialog-footer.ts
+++ b/frontend/demo/component/dialog/dialog-footer.ts
@@ -3,7 +3,6 @@ import '@vaadin/button';
import '@vaadin/dialog';
import { html, LitElement } from 'lit';
import { customElement, state } from 'lit/decorators.js';
-import { dialogFooterRenderer, dialogRenderer } from '@vaadin/dialog/lit.js';
import { getPeople } from 'Frontend/demo/domain/DataService';
import { applyTheme } from 'Frontend/demo/theme';
import type Person from 'Frontend/generated/com/vaadin/demo/domain/Person';
@@ -36,17 +35,15 @@ export class Example extends LitElement {
@closed="${() => {
this.dialogOpened = false;
}}"
- ${dialogRenderer(() => html`Are you sure you want to delete this user permanently?`, [])}
- ${dialogFooterRenderer(
- () => html`
-
- Delete
-
- Cancel
- `,
- []
- )}
- >
+ >
+ Are you sure you want to delete this user permanently?
+
+
+ Delete
+
+ Cancel
+
+
Show dialog
`;
diff --git a/frontend/demo/component/dialog/dialog-header.ts b/frontend/demo/component/dialog/dialog-header.ts
index dde6d0588d..e7437d04c9 100644
--- a/frontend/demo/component/dialog/dialog-header.ts
+++ b/frontend/demo/component/dialog/dialog-header.ts
@@ -9,7 +9,6 @@ import '@vaadin/vaadin-lumo-styles/vaadin-iconset';
import { html, LitElement } from 'lit';
import { customElement, state } from 'lit/decorators.js';
import { ifDefined } from 'lit/directives/if-defined.js';
-import { dialogHeaderRenderer, dialogRenderer } from '@vaadin/dialog/lit.js';
import { getPeople } from 'Frontend/demo/domain/DataService';
import { applyTheme } from 'Frontend/demo/theme';
import type Person from 'Frontend/generated/com/vaadin/demo/domain/Person';
@@ -42,42 +41,36 @@ export class Example extends LitElement {
@closed="${() => {
this.dialogOpened = false;
}}"
- ${dialogHeaderRenderer(
- () => html`
-
-
-
- `,
- []
- )}
- ${dialogRenderer(this.renderDialog, this.user)}
- >
+ >
+
+
+
+
+
+
+
+
+
+
+
Show dialog
`;
}
- private renderDialog = () => html`
-
-
-
-
-
- `;
-
addressDescription() {
if (!this.user) {
return '';
diff --git a/frontend/demo/component/dialog/dialog-no-padding.ts b/frontend/demo/component/dialog/dialog-no-padding.ts
index d24bc6a4d9..d58f1895cd 100644
--- a/frontend/demo/component/dialog/dialog-no-padding.ts
+++ b/frontend/demo/component/dialog/dialog-no-padding.ts
@@ -5,7 +5,6 @@ import '@vaadin/grid';
import '@vaadin/grid/vaadin-grid-selection-column.js';
import { html, LitElement } from 'lit';
import { customElement, state } from 'lit/decorators.js';
-import { dialogFooterRenderer, dialogRenderer } from '@vaadin/dialog/lit.js';
import { columnBodyRenderer } from '@vaadin/grid/lit.js';
import { getPeople } from 'Frontend/demo/domain/DataService';
import { applyTheme } from 'Frontend/demo/theme';
@@ -40,31 +39,21 @@ export class Example extends LitElement {
@closed="${() => {
this.dialogOpened = false;
}}"
- ${dialogRenderer(
- () => html`
-
-
- (
- (item) => html`${item.firstName} ${item.lastName}`,
- []
- )}
- >
-
- `,
- this.people
- )}
- ${dialogFooterRenderer(
- () => html`
- Filter
- `,
- []
- )}
- >
+ >
+
+
+ ((item) => html`${item.firstName} ${item.lastName}`, [])}
+ >
+
+
+ Filter
+
+
Show dialog
`;
diff --git a/frontend/demo/component/dialog/dialog-resizable.ts b/frontend/demo/component/dialog/dialog-resizable.ts
index d03311909d..53e521a65b 100644
--- a/frontend/demo/component/dialog/dialog-resizable.ts
+++ b/frontend/demo/component/dialog/dialog-resizable.ts
@@ -5,7 +5,6 @@ import '@vaadin/grid';
import '@vaadin/vertical-layout';
import { html, LitElement } from 'lit';
import { customElement, state } from 'lit/decorators.js';
-import { dialogRenderer } from '@vaadin/dialog/lit.js';
import { getPeople } from 'Frontend/demo/domain/DataService';
import { applyTheme } from 'Frontend/demo/theme';
import type Person from 'Frontend/generated/com/vaadin/demo/domain/Person';
@@ -48,24 +47,20 @@ export class Example extends LitElement {
@closed="${() => {
this.dialogOpened = false;
}}"
- ${dialogRenderer(
- () => html`
-
-
-
-
-
-
-
-
-
- `,
- this.people
- )}
- >
+ >
+
+
+
+
+
+
+
+
+
+
Show dialog
`;