Merge pull request #565 from awcodes/fix/tool-includes

Fix: ensure all tools get registered
awcodes · Feb 1, 2025 · 11f3958 · 11f3958
2 parents 0846f4e + cee1aef
commit 11f3958
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 23 deletions.
diff --git a/resources/dist/filament-tiptap-editor.js b/resources/dist/filament-tiptap-editor.js
diff --git a/resources/js/plugin.js b/resources/js/plugin.js
@@ -156,6 +156,7 @@ export default function tiptap({
    tools = [],
    disabled = false,
    locale = 'en',
+   bubbleMenuTools = [],
    floatingMenuTools = [],
    placeholder = null,
    mergeTags = [],
@@ -175,6 +176,7 @@ export default function tiptap({
         updatedAt: Date.now(),
         disabled: disabled,
         locale: locale,
+        bubbleMenuTools: bubbleMenuTools,
         floatingMenuTools: floatingMenuTools,
         getExtensions() {
             const tools = this.tools.map((tool) => {
@@ -229,7 +231,7 @@ export default function tiptap({
                     tippyOptions: {
                         duration: [500, 0],
                         maxWidth: 'none',
-                        placement: 'top',
+                        placement: 'auto',
                         theme: 'tiptap-editor-bubble',
                         interactive: true,
                         appendTo: this.$refs.element,
@@ -279,6 +281,14 @@ export default function tiptap({
                     });
                 }
 
+                if (this.bubbleMenuTools.length) {
+                    this.bubbleMenuTools.forEach((tool) => {
+                        if (!tools.includes(tool)) {
+                            tools.push(tool);
+                        }
+                    });
+                }
+
                 tools.forEach((tool) => {
                     if (keys.includes(tool)) {
                         editorExtensions[tool].forEach((e) => {

diff --git a/resources/views/tiptap-editor.blade.php b/resources/views/tiptap-editor.blade.php
@@ -43,6 +43,7 @@ class="relative z-0 tiptap-wrapper rounded-md bg-white dark:bg-gray-900 focus-wi
                         tools: @js($tools),
                         disabled: @js($isDisabled),
                         locale: '{{ app()->getLocale() }}',
+                        bubbleMenuTools: @js($bubbleMenuTools),
                         floatingMenuTools: @js($floatingMenuTools),
                         placeholder: @js($getPlaceholder()),
                         mergeTags: @js($mergeTags),