fix rebase

Author: FrancoisGe

addons/html_editor/static/src/main/font/color_plugin.js

@@ -146,10 +146,11 @@ export class ColorPlugin extends Plugin {
             }
         }
 
-        this.selectedColors.color =
-            hasGradient && hasTextGradientClass ? backgroundImage : rgbaToHex(elStyle.color);
-        this.selectedColors.backgroundColor =
-            hasGradient && !hasTextGradientClass ? backgroundImage : rgbaToHex(backgroundColor);
+        return {
+            color: hasGradient && hasTextGradientClass ? backgroundImage : rgbaToHex(elStyle.color),
+            backgroundColor:
+                hasGradient && !hasTextGradientClass ? backgroundImage : rgbaToHex(backgroundColor),
+        };
     }
 
     /**

addons/html_editor/static/src/main/power_buttons_plugin.js

@@ -77,7 +77,7 @@ export class PowerButtonsPlugin extends Plugin {
             const btn = this.document.createElement("button");
             let className = "power_button btn px-2 py-1 cursor-pointer";
             if (icon) {
-                let iconLibrary = icon.includes("fa-") ? "fa" : "oi";
+                const iconLibrary = icon.includes("fa-") ? "fa" : "oi";
                 className += ` ${iconLibrary} ${icon}`;
             } else {
                 const span = this.document.createElement("span");
@@ -138,15 +138,16 @@ export class PowerButtonsPlugin extends Plugin {
     }
 
     getPlaceholderWidth(block) {
-        this.dependencies.history.disableObserver();
-        const clone = block.cloneNode(true);
-        clone.innerText = clone.getAttribute("o-we-hint-text");
-        clone.style.width = "fit-content";
-        clone.style.visibility = "hidden";
-        this.editable.appendChild(clone);
-        const { width } = clone.getBoundingClientRect();
-        this.editable.removeChild(clone);
-        this.dependencies.history.enableObserver();
+        let width;
+        this.dependencies.history.ignoreDOMMutations(() => {
+            const clone = block.cloneNode(true);
+            clone.innerText = clone.getAttribute("o-we-hint-text");
+            clone.style.width = "fit-content";
+            clone.style.visibility = "hidden";
+            this.editable.appendChild(clone);
+            width = clone.getBoundingClientRect().width;
+            this.editable.removeChild(clone);
+        });
         return width;
     }