@vaadin/rich-text-editor 23.3.24 → 23.3.25

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/rich-text-editor",
-  "version": "23.3.24",
+  "version": "23.3.25",
   "publishConfig": {
     "access": "public"
   },
@@ -40,14 +40,14 @@
   ],
   "dependencies": {
     "@polymer/polymer": "^3.0.0",
-    "@vaadin/button": "~23.3.24",
-    "@vaadin/component-base": "~23.3.24",
-    "@vaadin/confirm-dialog": "~23.3.24",
-    "@vaadin/text-field": "~23.3.24",
-    "@vaadin/tooltip": "~23.3.24",
-    "@vaadin/vaadin-lumo-styles": "~23.3.24",
-    "@vaadin/vaadin-material-styles": "~23.3.24",
-    "@vaadin/vaadin-themable-mixin": "~23.3.24"
+    "@vaadin/button": "~23.3.25",
+    "@vaadin/component-base": "~23.3.25",
+    "@vaadin/confirm-dialog": "~23.3.25",
+    "@vaadin/text-field": "~23.3.25",
+    "@vaadin/tooltip": "~23.3.25",
+    "@vaadin/vaadin-lumo-styles": "~23.3.25",
+    "@vaadin/vaadin-material-styles": "~23.3.25",
+    "@vaadin/vaadin-themable-mixin": "~23.3.25"
   },
   "devDependencies": {
     "@esm-bundle/chai": "^4.3.4",
@@ -62,5 +62,5 @@
     "web-types.json",
     "web-types.lit.json"
   ],
-  "gitHead": "07a74c563367975ba23733cbe7ebeddc0b2faecc"
+  "gitHead": "61b55b7a7e925aa853530b363bfa3549e44c661c"
 }

package/src/vaadin-rich-text-editor.js

@@ -26,6 +26,39 @@ registerStyles('vaadin-rich-text-editor', richTextEditorStyles, { moduleId: 'vaa
 
 const Quill = window.Quill;
 
+// Workaround for text disappearing when accepting spellcheck suggestion
+// See https://github.com/quilljs/quill/issues/2096#issuecomment-399576957
+const Inline = Quill.import('blots/inline');
+
+class CustomColor extends Inline {
+  constructor(domNode, value) {
+    super(domNode, value);
+
+    // Map <font> properties
+    domNode.style.color = domNode.color;
+
+    const span = this.replaceWith(new Inline(Inline.create()));
+
+    span.children.forEach((child) => {
+      if (child.attributes) {
+        child.attributes.copy(span);
+      }
+      if (child.unwrap) {
+        child.unwrap();
+      }
+    });
+
+    this.remove();
+
+    return span; // eslint-disable-line no-constructor-return
+  }
+}
+
+CustomColor.blotName = 'customColor';
+CustomColor.tagName = 'FONT';
+
+Quill.register(CustomColor, true);
+
 const HANDLERS = [
   'bold',
   'italic',
@@ -526,6 +559,20 @@ class RichTextEditor extends ElementMixin(ThemableMixin(PolymerElement)) {
     }
   }
 
+  /** @protected */
+  disconnectedCallback() {
+    super.disconnectedCallback();
+
+    // Ensure that htmlValue property set before attach
+    // gets applied in case of detach and re-attach.
+    if (this.__debounceSetValue && this.__debounceSetValue.isActive()) {
+      this.__debounceSetValue.flush();
+    }
+
+    this._editor.emitter.removeAllListeners();
+    this._editor.emitter.listeners = {};
+  }
+
   /** @private */
   __setDirection(dir) {
     // Needed for proper `ql-align` class to be set and activate the toolbar align button
@@ -547,18 +594,14 @@ class RichTextEditor extends ElementMixin(ThemableMixin(PolymerElement)) {
   }
 
   /** @protected */
-  ready() {
-    super.ready();
+  connectedCallback() {
+    super.connectedCallback();
 
     const editor = this.shadowRoot.querySelector('[part="content"]');
-    const toolbarConfig = this._prepareToolbar();
-    this._toolbar = toolbarConfig.container;
-
-    this._addToolbarListeners();
 
     this._editor = new Quill(editor, {
       modules: {
-        toolbar: toolbarConfig,
+        toolbar: this._toolbarConfig,
       },
     });
 
@@ -570,10 +613,6 @@ class RichTextEditor extends ElementMixin(ThemableMixin(PolymerElement)) {
       this.__patchFirefoxFocus();
     }
 
-    this.$.linkDialog.$.dialog.$.overlay.addEventListener('vaadin-overlay-open', () => {
-      this.$.linkUrl.focus();
-    });
-
     const editorContent = editor.querySelector('.ql-editor');
 
     editorContent.setAttribute('role', 'textbox');
@@ -604,6 +643,20 @@ class RichTextEditor extends ElementMixin(ThemableMixin(PolymerElement)) {
     this._editor.on('selection-change', this.__announceFormatting.bind(this));
   }
 
+  /** @protected */
+  ready() {
+    super.ready();
+
+    this._toolbarConfig = this._prepareToolbar();
+    this._toolbar = this._toolbarConfig.container;
+
+    this._addToolbarListeners();
+
+    this.$.linkDialog.$.dialog.$.overlay.addEventListener('vaadin-overlay-open', () => {
+      this.$.linkUrl.focus();
+    });
+  }
+
   /** @private */
   _prepareToolbar() {
     const clean = Quill.imports['modules/toolbar'].DEFAULTS.handlers.clean;

package/web-types.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/web-types",
   "name": "@vaadin/rich-text-editor",
-  "version": "23.3.24",
+  "version": "23.3.25",
   "description-markup": "markdown",
   "contributions": {
     "html": {

package/web-types.lit.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/web-types",
   "name": "@vaadin/rich-text-editor",
-  "version": "23.3.24",
+  "version": "23.3.25",
   "description-markup": "markdown",
   "framework": "lit",
   "framework-config": {