Fix: quotes in blocks

awcodes · Dec 20, 2023 · a617540 · a617540
1 parent 5d83fba
commit a617540
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 17 deletions.
diff --git a/resources/dist/filament-tiptap-editor.js b/resources/dist/filament-tiptap-editor.js
diff --git a/resources/js/extensions/TiptapBlock.js b/resources/js/extensions/TiptapBlock.js
@@ -105,25 +105,25 @@ export const TiptapBlock = Node.create({
             dom.contentEditable = 'false'
             dom.classList.add('tiptap-block-wrapper')
 
-            const data = typeof node.attrs.data === 'object'
+            let data = typeof node.attrs.data === 'object'
                 ? JSON.stringify(node.attrs.data)
                 : node.attrs.data
 
             dom.innerHTML = `
                 <div
-                    x-data='{
+                    x-data="{
                         showOptionsButton: ${data === '[]' ? 'false' : 'true'},
                         openSettings() {
-                            this.$dispatch("open-block-settings", {
-                                type: "${node.attrs.type}",
-                                statePath: "${node.attrs.statePath}",
-                                data: JSON.parse(\`${data}\`),
+                            this.$dispatch('open-block-settings', {
+                                type: \`${node.attrs.type}\`,
+                                statePath: \`${node.attrs.statePath}\`,
+                                data: ${data},
                             })
                         },
                         deleteBlock() {
-                            this.$dispatch("delete-block")
+                            this.$dispatch('delete-block')
                         }
-                    }'
+                    }"
                     class="tiptap-block"
                     style="min-height: 3rem;"
                 >

diff --git a/src/TiptapEditor.php b/src/TiptapEditor.php
@@ -16,6 +16,7 @@
 use FilamentTiptapEditor\Concerns\InteractsWithMedia;
 use FilamentTiptapEditor\Concerns\InteractsWithMenus;
 use Illuminate\Support\Arr;
+use Illuminate\Support\Js;
 use Illuminate\Support\Str;
 use Livewire\Component;
 
@@ -268,7 +269,7 @@ public function getInsertBlockAction(): Action
                     event: 'insert-block',
                     statePath: $component->getStatePath(),
                     type: $arguments['type'],
-                    data: $data,
+                    data: Js::from($data)->toHtml(),
                     preview: $block->getPreview($data),
                     label: $block->getLabel(),
                     coordinates: $arguments['coordinates'] ?? [],
@@ -307,7 +308,7 @@ public function getUpdateBlockAction(): Action
                     event: 'update-block',
                     statePath: $component->getStatePath(),
                     type: $arguments['type'],
-                    data: $data,
+                    data: Js::from($data)->toHtml(),
                     preview: $block->getPreview($data),
                     label: $block->getLabel(),
                 );