Skip to content

Commit bbbbae3

Browse files
authored
fix: support teleporting multiple message elements (#4998)
1 parent 0a5116e commit bbbbae3

2 files changed

Lines changed: 26 additions & 13 deletions

File tree

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

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -246,11 +246,12 @@ class ConfirmDialog extends ElementMixin(ThemePropertyMixin(ControllerMixin(Poly
246246
},
247247

248248
/**
249-
* A reference to the message which will be placed in the overlay default slot.
249+
* A list of message nodes which will be placed in the overlay default slot.
250250
* @private
251251
*/
252-
_messageNode: {
253-
type: Object,
252+
_messageNodes: {
253+
type: Array,
254+
value: () => [],
254255
},
255256

256257
/**
@@ -268,7 +269,7 @@ class ConfirmDialog extends ElementMixin(ThemePropertyMixin(ControllerMixin(Poly
268269
'__updateConfirmButton(_confirmButton, confirmText, confirmTheme)',
269270
'__updateCancelButton(_cancelButton, cancelText, cancelTheme, cancel)',
270271
'__updateHeaderNode(_headerNode, header)',
271-
'__updateMessageNode(_messageNode, message)',
272+
'__updateMessageNodes(_messageNodes, message)',
272273
'__updateRejectButton(_rejectButton, rejectText, rejectTheme, reject)',
273274
];
274275
}
@@ -282,7 +283,7 @@ class ConfirmDialog extends ElementMixin(ThemePropertyMixin(ControllerMixin(Poly
282283
}
283284

284285
get __slottedNodes() {
285-
return [this._headerNode, this._messageNode, this._cancelButton, this._confirmButton, this._rejectButton];
286+
return [this._headerNode, ...this._messageNodes, this._cancelButton, this._confirmButton, this._rejectButton];
286287
}
287288

288289
/** @protected */
@@ -308,8 +309,11 @@ class ConfirmDialog extends ElementMixin(ThemePropertyMixin(ControllerMixin(Poly
308309
this.addController(this._headerController);
309310

310311
this._messageController = new SlotController(this, '', 'div', {
312+
// Allow providing multiple custom nodes in the default slot
313+
multiple: true,
314+
observe: false,
311315
initializer: (node) => {
312-
this._messageNode = node;
316+
this._messageNodes = [...this._messageNodes, node];
313317
},
314318
});
315319
this.addController(this._messageController);
@@ -401,9 +405,12 @@ class ConfirmDialog extends ElementMixin(ThemePropertyMixin(ControllerMixin(Poly
401405
}
402406

403407
/** @private */
404-
__updateMessageNode(messageNode, message) {
405-
if (messageNode && messageNode === this._messageController.defaultNode) {
406-
messageNode.textContent = message;
408+
__updateMessageNodes(nodes, message) {
409+
if (nodes && nodes.length > 0) {
410+
const defaultNode = nodes.find((node) => node === this._messageController.defaultNode);
411+
if (defaultNode) {
412+
defaultNode.textContent = message;
413+
}
407414
}
408415
}
409416

‎packages/confirm-dialog/test/confirm-dialog.test.js‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -169,15 +169,21 @@ describe('vaadin-confirm-dialog', () => {
169169

170170
describe('slot', () => {
171171
beforeEach(async () => {
172-
confirm = fixtureSync('<vaadin-confirm-dialog opened>Confirmation message</vaadin-confirm-dialog>');
172+
confirm = fixtureSync(`
173+
<vaadin-confirm-dialog opened>
174+
Confirmation message
175+
<div>Additional content</dib>
176+
</vaadin-confirm-dialog>
177+
`);
173178
overlay = confirm.$.dialog.$.overlay;
174179
await oneEvent(overlay, 'vaadin-overlay-open');
175180
messageSlot = overlay.shadowRoot.querySelector('[part="message"] > slot');
176181
});
177182

178-
it('should keep the element text content as a message', () => {
179-
const messageNode = messageSlot.assignedNodes()[0];
180-
expect(messageNode.textContent.trim()).to.equal('Confirmation message');
183+
it('should place all the slotted elements in the message slot', () => {
184+
const nodes = messageSlot.assignedNodes();
185+
expect(nodes[0].textContent.trim()).to.equal('Confirmation message');
186+
expect(nodes[1].textContent.trim()).to.equal('Additional content');
181187
});
182188

183189
it('should not update custom node when message property changes', () => {

0 commit comments

Comments
 (0)