Skip to content

Commit 9c24c1d

Browse files
authored
fix: fire change event on hyperlink edit, update test timings (#7250)
1 parent 18f732c commit 9c24c1d

2 files changed

Lines changed: 7 additions & 4 deletions

File tree

‎packages/rich-text-editor/src/vaadin-rich-text-editor-mixin.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -345,8 +345,9 @@ export const RichTextEditorMixin = (superClass) =>
345345
});
346346

347347
editorContent.addEventListener('focus', () => {
348-
// Format changed, but no value changed happened
349-
if (this._toolbarState === STATE.CLICKED) {
348+
// When editing link, editor gets focus while dialog is still open.
349+
// Keep toolbar state as clicked in this case to fire change event.
350+
if (this._toolbarState === STATE.CLICKED && !this._linkEditing) {
350351
this._cleanToolbarState();
351352
}
352353
});

‎packages/rich-text-editor/test/basic.common.js‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -448,14 +448,15 @@ describe('rich text editor', () => {
448448
editor.focus();
449449
editor.setSelection(0, 6);
450450
btn.click();
451-
await nextUpdate(rte);
451+
await nextRender();
452452

453453
rte.$.linkUrl.value = url;
454454

455455
const spy = sinon.spy();
456456
rte.addEventListener('change', spy);
457457

458458
rte.$.confirmLink.click();
459+
await nextRender();
459460
flushValueDebouncer();
460461

461462
expect(spy.calledOnce).to.be.true;
@@ -468,12 +469,13 @@ describe('rich text editor', () => {
468469
editor.focus();
469470
editor.setSelection(0, 6);
470471
btn.click();
471-
await nextUpdate(rte);
472+
await nextRender();
472473

473474
const spy = sinon.spy();
474475
rte.addEventListener('change', spy);
475476

476477
rte.$.cancelLink.click();
478+
await nextRender();
477479
flushValueDebouncer();
478480
expect(rte.value).to.equal(value);
479481
expect(spy.called).to.be.false;

0 commit comments

Comments
 (0)