Skip to content

Commit 2c2a5ac

Browse files
authored
fix: handle renderers set before adding to DOM (#3672)
1 parent 91616da commit 2c2a5ac

2 files changed

Lines changed: 64 additions & 11 deletions

File tree

‎packages/dialog/src/vaadin-dialog.js‎

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -287,21 +287,28 @@ export class DialogOverlay extends OverlayElement {
287287
requestContentUpdate() {
288288
super.requestContentUpdate();
289289

290-
// If a new renderer has been set, make sure to reattach the header/footer roots
291-
if (this.headerContainer && !this.headerContainer.parentElement) {
292-
this.appendChild(this.headerContainer);
293-
}
290+
if (this.headerContainer) {
291+
// If a new renderer has been set, make sure to reattach the container
292+
if (!this.headerContainer.parentElement) {
293+
this.appendChild(this.headerContainer);
294+
}
294295

295-
if (this.footerContainer && !this.footerContainer.parentElement) {
296-
this.appendChild(this.footerContainer);
296+
if (this.headerRenderer) {
297+
// Only call header renderer after the container has been initialized
298+
this.headerRenderer.call(this.owner, this.headerContainer, this.owner);
299+
}
297300
}
298301

299-
if (this.headerRenderer) {
300-
this.headerRenderer.call(this.owner, this.headerContainer, this.owner);
301-
}
302+
if (this.footerContainer) {
303+
// If a new renderer has been set, make sure to reattach the container
304+
if (!this.footerContainer.parentElement) {
305+
this.appendChild(this.footerContainer);
306+
}
302307

303-
if (this.footerRenderer) {
304-
this.footerRenderer.call(this.owner, this.footerContainer, this.owner);
308+
if (this.footerRenderer) {
309+
// Only call header renderer after the container has been initialized
310+
this.footerRenderer.call(this.owner, this.footerContainer, this.owner);
311+
}
305312
}
306313

307314
this._headerTitleRenderer();

‎packages/dialog/test/header-footer.test.js‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { expect } from '@esm-bundle/chai';
22
import { fixtureSync } from '@vaadin/testing-helpers';
3+
import sinon from 'sinon';
34
import './not-animated-styles.js';
45
import '../vaadin-dialog.js';
56
import { createRenderer } from './helpers.js';
@@ -527,3 +528,48 @@ describe('header/footer feature', () => {
527528
});
528529
});
529530
});
531+
532+
describe('renderer set before attach', () => {
533+
let dialog;
534+
535+
beforeEach(() => {
536+
dialog = document.createElement('vaadin-dialog');
537+
dialog.renderer = createRenderer('Content');
538+
});
539+
540+
afterEach(() => {
541+
document.body.removeChild(dialog);
542+
});
543+
544+
it('should not throw when setting header renderer before adding to DOM', () => {
545+
dialog.headerRenderer = createRenderer('Header');
546+
dialog.opened = true;
547+
expect(() => {
548+
document.body.appendChild(dialog);
549+
}).to.not.throw(Error);
550+
});
551+
552+
it('should not throw when setting footer renderer before adding to DOM', () => {
553+
dialog.footerRenderer = createRenderer('Footer');
554+
dialog.opened = true;
555+
expect(() => {
556+
document.body.appendChild(dialog);
557+
}).to.not.throw(Error);
558+
});
559+
560+
it('should only call header renderer once after adding dialog to DOM', () => {
561+
const spy = sinon.spy();
562+
dialog.headerRenderer = spy;
563+
dialog.opened = true;
564+
document.body.appendChild(dialog);
565+
expect(spy.calledOnce).to.be.true;
566+
});
567+
568+
it('should only call footer renderer once after adding dialog to DOM', () => {
569+
const spy = sinon.spy();
570+
dialog.footerRenderer = spy;
571+
dialog.opened = true;
572+
document.body.appendChild(dialog);
573+
expect(spy.calledOnce).to.be.true;
574+
});
575+
});

0 commit comments

Comments
 (0)