Merge pull request #7097 from J-Michalek/fix/editor-broken-toolbar-bu…

…ttons fix(editor): broken color buttons after modelValue update
primefaces · Jan 15, 2025 · b01abbf · b01abbf
2 parents b9a8efc + 02c7af1
commit b01abbf
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/packages/primevue/src/dialog/Dialog.vue b/packages/primevue/src/dialog/Dialog.vue
@@ -322,7 +322,7 @@ export default {
                 this.bindDocumentDragEndListener();
             }
 
-            if (this.closeOnEscape) {
+            if (this.closeOnEscape && this.closable) {
                 this.bindDocumentKeyDownListener();
             }
         },

diff --git a/packages/primevue/src/editor/Editor.vue b/packages/primevue/src/editor/Editor.vue
@@ -19,7 +19,7 @@
                     <button class="ql-italic" type="button" v-bind="ptm('italic')"></button>
                     <button class="ql-underline" type="button" v-bind="ptm('underline')"></button>
                 </span>
-                <span :key="reRenderColorKey" class="ql-formats" v-bind="ptm('formats')">
+                <span class="ql-formats" v-bind="ptm('formats')">
                     <select class="ql-color" v-bind="ptm('color')"></select>
                     <select class="ql-background" v-bind="ptm('background')"></select>
                 </span>
@@ -64,16 +64,10 @@ export default {
     extends: BaseEditor,
     inheritAttrs: false,
     emits: ['text-change', 'selection-change', 'load'],
-    data() {
-        return {
-            reRenderColorKey: 0
-        };
-    },
     quill: null,
     watch: {
         modelValue(newValue, oldValue) {
             if (newValue !== oldValue && this.quill && !this.quill.hasFocus()) {
-                this.reRenderColorKey++;
                 this.renderValue(newValue);
             }
         },