Merge pull request #6620 from Abassion/master

Fix #5606: Adding support for Quill V2
primefaces · Nov 13, 2024 · eab946c · eab946c
2 parents 4f8127c + 219b91a
commit eab946c
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/apps/showcase/doc/editor/BasicDoc.vue b/apps/showcase/doc/editor/BasicDoc.vue
@@ -5,7 +5,7 @@
     <div class="card">
         <Editor v-model="value" editorStyle="height: 320px" />
     </div>
-    <DocSectionCode :code="code" :dependencies="{ quill: '1.3.7' }" component="Editor" />
+    <DocSectionCode :code="code" :dependencies="{ quill: '2.0.0' }" component="Editor" />
 </template>
 
 <script>

diff --git a/apps/showcase/doc/editor/ReadOnlyDoc.vue b/apps/showcase/doc/editor/ReadOnlyDoc.vue
@@ -5,7 +5,7 @@
     <div class="card">
         <Editor v-model="value" editorStyle="height: 320px" readonly />
     </div>
-    <DocSectionCode :code="code" :dependencies="{ quill: '1.3.7' }" component="Editor" />
+    <DocSectionCode :code="code" :dependencies="{ quill: '2.0.0' }" component="Editor" />
 </template>
 
 <script>

diff --git a/apps/showcase/doc/editor/TemplateDoc.vue b/apps/showcase/doc/editor/TemplateDoc.vue
@@ -13,7 +13,7 @@
             </template>
         </Editor>
     </div>
-    <DocSectionCode :code="code" :dependencies="{ quill: '1.3.7' }" component="Editor" />
+    <DocSectionCode :code="code" :dependencies="{ quill: '2.0.0' }" component="Editor" />
 </template>
 
 <script>

diff --git a/apps/showcase/package.json b/apps/showcase/package.json
@@ -46,7 +46,7 @@
         "postcss": "^8.4.31",
         "prettier": "2.7.1",
         "primeicons": "^7.0.0",
-        "quill": "^1.3.7",
+        "quill": "2.0.0",
         "sass": "1.45.0",
         "sass-loader": "8.0.2",
         "tailwindcss": "^3.4.1",
@@ -69,4 +69,4 @@
     "engines": {
         "node": ">=12.11.0"
     }
-}
+}
diff --git a/packages/primevue/src/editor/Editor.vue b/packages/primevue/src/editor/Editor.vue
@@ -124,7 +124,7 @@ export default {
     methods: {
         renderValue(value) {
             if (this.quill) {
-                if (value) this.quill.setContents(this.quill.clipboard.convert(value));
+                if (value) this.quill.clipboard.dangerouslyPasteHTML(value);
                 else this.quill.setText('');
             }
         },