@vaadin/rich-text-editor 24.3.0-beta1 → 24.3.0-beta2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/rich-text-editor",
-  "version": "24.3.0-beta1",
+  "version": "24.3.0-beta2",
   "publishConfig": {
     "access": "public"
   },
@@ -41,18 +41,18 @@
   "dependencies": {
     "@open-wc/dedupe-mixin": "^1.3.0",
     "@polymer/polymer": "^3.0.0",
-    "@vaadin/button": "24.3.0-beta1",
-    "@vaadin/component-base": "24.3.0-beta1",
-    "@vaadin/confirm-dialog": "24.3.0-beta1",
-    "@vaadin/text-field": "24.3.0-beta1",
-    "@vaadin/tooltip": "24.3.0-beta1",
-    "@vaadin/vaadin-lumo-styles": "24.3.0-beta1",
-    "@vaadin/vaadin-material-styles": "24.3.0-beta1",
-    "@vaadin/vaadin-themable-mixin": "24.3.0-beta1"
+    "@vaadin/button": "24.3.0-beta2",
+    "@vaadin/component-base": "24.3.0-beta2",
+    "@vaadin/confirm-dialog": "24.3.0-beta2",
+    "@vaadin/text-field": "24.3.0-beta2",
+    "@vaadin/tooltip": "24.3.0-beta2",
+    "@vaadin/vaadin-lumo-styles": "24.3.0-beta2",
+    "@vaadin/vaadin-material-styles": "24.3.0-beta2",
+    "@vaadin/vaadin-themable-mixin": "24.3.0-beta2"
   },
   "devDependencies": {
     "@esm-bundle/chai": "^4.3.4",
-    "@vaadin/a11y-base": "24.3.0-beta1",
+    "@vaadin/a11y-base": "24.3.0-beta2",
     "@vaadin/testing-helpers": "^0.6.0",
     "gulp": "^4.0.2",
     "gulp-cli": "^2.3.0",
@@ -64,5 +64,5 @@
     "web-types.json",
     "web-types.lit.json"
   ],
-  "gitHead": "a197041861e1bbf8d3e966d893648f5dd462b036"
+  "gitHead": "0bbfb24cb8dcd6e1dca8ecf2269635efac53e4d0"
 }

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

@@ -172,6 +172,7 @@ export const RichTextEditorMixin = (superClass) =>
         /** @private */
         _editor: {
           type: Object,
+          sync: true,
         },
 
         /**
@@ -345,6 +346,9 @@ export const RichTextEditorMixin = (superClass) =>
       });
 
       this._editor.on('selection-change', this.__announceFormatting.bind(this));
+
+      // Flush pending htmlValue only once the editor is fully initialized
+      this.__flushPendingHtmlValue();
     }
 
     /** @protected */
@@ -691,6 +695,14 @@ export const RichTextEditorMixin = (superClass) =>
      * @param {string} htmlValue
      */
     dangerouslySetHtmlValue(htmlValue) {
+      if (!this._editor) {
+        // The editor isn't ready yet, store the value for later
+        this.__pendingHtmlValue = htmlValue;
+        // Clear a possible value to prevent it from clearing the pending htmlValue once the editor property is set
+        this.value = '';
+        return;
+      }
+
       const whitespaceCharacters = {
         '\t': '__VAADIN_RICH_TEXT_EDITOR_TAB',
         '  ': '__VAADIN_RICH_TEXT_EDITOR_DOUBLE_SPACE',
@@ -714,6 +726,13 @@ export const RichTextEditorMixin = (superClass) =>
       this._editor.setContents(deltaFromHtml, SOURCE.API);
     }
 
+    /** @private */
+    __flushPendingHtmlValue() {
+      if (this.__pendingHtmlValue) {
+        this.dangerouslySetHtmlValue(this.__pendingHtmlValue);
+      }
+    }
+
     /** @private */
     __announceFormatting() {
       const timeout = 200;
@@ -826,6 +845,11 @@ export const RichTextEditorMixin = (superClass) =>
 
     /** @private */
     _valueChanged(value, editor) {
+      if (value && this.__pendingHtmlValue) {
+        // A non-empty value is set explicitly. Clear pending htmlValue to prevent it from overriding the value.
+        this.__pendingHtmlValue = undefined;
+      }
+
       if (editor === undefined) {
         return;
       }

package/web-types.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/web-types",
   "name": "@vaadin/rich-text-editor",
-  "version": "24.3.0-beta1",
+  "version": "24.3.0-beta2",
   "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": "24.3.0-beta1",
+  "version": "24.3.0-beta2",
   "description-markup": "markdown",
   "framework": "lit",
   "framework-config": {