Fixed remove "\r\n" Quill editor when usage code block

orchidsoftware · Sep 10, 2023 · a6168a1 · a6168a1
1 parent 69beee0
commit a6168a1
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 18 deletions.
diff --git a/public/css/orchid.rtl.css b/public/css/orchid.rtl.css
diff --git a/public/css/orchid.rtl.css.map b/public/css/orchid.rtl.css.map
diff --git a/public/js/orchid.js b/public/js/orchid.js
diff --git a/public/js/orchid.js.map b/public/js/orchid.js.map
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
diff --git a/resources/js/controllers/quill_controller.js b/resources/js/controllers/quill_controller.js
@@ -8,11 +8,11 @@ export default class extends ApplicationController {
     connect() {
         const quill = Quill;
         const selector = this.element.querySelector('.quill').id;
-        const input = this.element.querySelector('input');
+        const textarea = this.element.querySelector('textarea');
 
         const options = {
-            placeholder: input.placeholder,
-            readOnly: input.readOnly,
+            placeholder: textarea.placeholder,
+            readOnly: textarea.readOnly,
             theme: 'snow',
             modules: {
                 toolbar: {
@@ -42,13 +42,13 @@ export default class extends ApplicationController {
         let value = JSON.parse(this.data.get("value"))
 
         // set value
-        // editor.setText(input.value);
-        this.editor.root.innerHTML = input.value = value;
+        this.editor.root.innerHTML = textarea.value = value;
 
         // save value
         this.editor.on('text-change', () => {
-            input.value = this.editor.getText() ? this.editor.root.innerHTML : '';
-            input.dispatchEvent(new Event('change'));
+            // When usage this.editor.root.innerHtml "/n/r" has been lost
+            textarea.value = this.element.querySelector('.ql-editor').innerHTML || "";
+            textarea.dispatchEvent(new Event('change'));
         });
 
         this.editor.getModule('toolbar').addHandler('color', (value) => {

diff --git a/resources/views/fields/quill.blade.php b/resources/views/fields/quill.blade.php
@@ -10,6 +10,6 @@
         <div class="quill p-3 position-relative" id="quill-wrapper-{{$id}}"
              style="min-height: {{ $attributes['height'] }}">
         </div>
-        <input class="d-none" {{ $attributes }}>
+        <textarea class="d-none" {{ $attributes }}></textarea>
     </div>
 @endcomponent