fix: fire change event on hyperlink edit, update test timings (#7250) (…

…#7252) Co-authored-by: Serhii Kulykov <iamkulykov@gmail.com>
vaadin · Mar 21, 2024 · 10a5f4d · 10a5f4d
1 parent 6628afc
commit 10a5f4d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/packages/rich-text-editor/src/vaadin-rich-text-editor-mixin.js b/packages/rich-text-editor/src/vaadin-rich-text-editor-mixin.js
@@ -345,8 +345,9 @@ export const RichTextEditorMixin = (superClass) =>
       });
 
       editorContent.addEventListener('focus', () => {
-        // Format changed, but no value changed happened
-        if (this._toolbarState === STATE.CLICKED) {
+        // When editing link, editor gets focus while dialog is still open.
+        // Keep toolbar state as clicked in this case to fire change event.
+        if (this._toolbarState === STATE.CLICKED && !this._linkEditing) {
           this._cleanToolbarState();
         }
       });

diff --git a/packages/rich-text-editor/test/basic.common.js b/packages/rich-text-editor/test/basic.common.js
@@ -448,14 +448,15 @@ describe('rich text editor', () => {
           editor.focus();
           editor.setSelection(0, 6);
           btn.click();
-          await nextUpdate(rte);
+          await nextRender();
 
           rte.$.linkUrl.value = url;
 
           const spy = sinon.spy();
           rte.addEventListener('change', spy);
 
           rte.$.confirmLink.click();
+          await nextRender();
           flushValueDebouncer();
 
           expect(spy.calledOnce).to.be.true;
@@ -468,12 +469,13 @@ describe('rich text editor', () => {
           editor.focus();
           editor.setSelection(0, 6);
           btn.click();
-          await nextUpdate(rte);
+          await nextRender();
 
           const spy = sinon.spy();
           rte.addEventListener('change', spy);
 
           rte.$.cancelLink.click();
+          await nextRender();
           flushValueDebouncer();
           expect(rte.value).to.equal(value);
           expect(spy.called).to.be.false;