lexxy 0.9.0.beta → 0.9.2.beta

data/app/assets/javascript/lexxy.js

@@ -4952,9 +4952,22 @@ class LexicalToolbarElement extends HTMLElement {
   }
 
   disconnectedCallback() {
+    this.dispose();
+  }
+
+  dispose() {
     this.#uninstallResizeObserver();
+    this.#unbindButtons();
     this.#unbindHotkeys();
     this.#unbindFocusListeners();
+    this.unregisterSelectionListener?.();
+    this.unregisterHistoryListener?.();
+
+    this.editorElement = null;
+    this.editor = null;
+    this.selection = null;
+
+    this.#createEditorPromise();
   }
 
   attributeChangedCallback(name, oldValue, newValue) {
@@ -4998,10 +5011,12 @@ class LexicalToolbarElement extends HTMLElement {
     this.connectedCallback();
   }
 
-  #createEditorPromise() {
+  async #createEditorPromise() {
     this.editorPromise = new Promise((resolve) => {
       this.resolveEditorPromise = resolve;
     });
+
+    this.editorElement = await this.editorPromise;
   }
 
   #installResizeObserver() {
@@ -5017,10 +5032,14 @@ class LexicalToolbarElement extends HTMLElement {
   }
 
   #bindButtons() {
-    this.addEventListener("click", this.#handleButtonClicked.bind(this));
+    this.addEventListener("click", this.#handleButtonClicked);
+  }
+
+  #unbindButtons() {
+    this.removeEventListener("click", this.#handleButtonClicked);
   }
 
-  #handleButtonClicked(event) {
+  #handleButtonClicked = (event) => {
     this.#handleTargetClicked(event, "[data-command]", this.#dispatchButtonCommand.bind(this));
   }
 
@@ -5080,8 +5099,8 @@ class LexicalToolbarElement extends HTMLElement {
   }
 
   #unbindFocusListeners() {
-    this.editorElement.removeEventListener("lexxy:focus", this.#handleEditorFocus);
-    this.editorElement.removeEventListener("lexxy:blur", this.#handleEditorBlur);
+    this.editorElement?.removeEventListener("lexxy:focus", this.#handleEditorFocus);
+    this.editorElement?.removeEventListener("lexxy:blur", this.#handleEditorBlur);
     this.removeEventListener("keydown", this.#handleKeydown);
   }
 
@@ -5105,7 +5124,7 @@ class LexicalToolbarElement extends HTMLElement {
   }
 
   #monitorSelectionChanges() {
-    this.editor.registerUpdateListener(() => {
+    this.unregisterSelectionListener = this.editor.registerUpdateListener(() => {
       this.editor.getEditorState().read(() => {
         this.#updateButtonStates();
         this.#closeDropdowns();
@@ -5114,7 +5133,7 @@ class LexicalToolbarElement extends HTMLElement {
   }
 
   #monitorHistoryChanges() {
-    this.editor.registerUpdateListener(() => {
+    this.unregisterHistoryListener = this.editor.registerUpdateListener(() => {
       this.#updateUndoRedoButtonStates();
     });
   }
@@ -5266,13 +5285,13 @@ class LexicalToolbarElement extends HTMLElement {
 
   static get defaultTemplate() {
     return `
-    <button class="lexxy-editor__toolbar-button" type="button" name="image" data-command="uploadAttachments" data-prevent-overflow="true" title="Add images">
-      ${ToolbarIcons.image}
-    </button>
+      <button class="lexxy-editor__toolbar-button" type="button" name="image" data-command="uploadImage" data-prevent-overflow="true" title="Add images and video">
+        ${ToolbarIcons.image}
+      </button>
 
-    <button class="lexxy-editor__toolbar-button lexxy-editor__toolbar-group-end" type="button" name="file" data-command="uploadAttachments" title="Upload files">
-      ${ToolbarIcons.attachment}
-    </button>
+      <button class="lexxy-editor__toolbar-button lexxy-editor__toolbar-group-end" type="button" name="file" data-command="uploadFile" title="Upload files">
+        ${ToolbarIcons.attachment}
+      </button>
 
       <button class="lexxy-editor__toolbar-button" type="button" name="bold" data-command="bold" title="Bold">
         ${ToolbarIcons.bold}
@@ -5296,10 +5315,10 @@ class LexicalToolbarElement extends HTMLElement {
           <button type="button" name="heading-medium" data-command="setFormatHeadingMedium" title="Medium heading">
             ${ToolbarIcons.h3} <span>Medium Heading</span>
           </button>
-          <button type="button" name="heading-small" data-command="setFormatHeadingSmall" title="Small heading">
+          <button class="lexxy-editor__toolbar-group-end" type="button" name="heading-small" data-command="setFormatHeadingSmall" title="Small heading">
             ${ToolbarIcons.h4} <span>Small Heading</span>
           </button>
-          <div class="separator" role="separator"></div>
+          <div class="lexxy-editor__toolbar-separator" role="separator"></div>
           <button type="button" name="strikethrough" data-command="strikethrough" title="Strikethrough">
             ${ToolbarIcons.strikethrough} <span>Strikethrough</span>
           </button>
@@ -5309,21 +5328,6 @@ class LexicalToolbarElement extends HTMLElement {
         </div>
       </details>
 
-
-      <details class="lexxy-editor__toolbar-dropdown lexxy-editor__toolbar-dropdown--chevron" name="lexxy-dropdown">
-        <summary class="lexxy-editor__toolbar-button" name="lists" title="Lists">
-          ${ToolbarIcons.ul}
-        </summary>
-        <div class="lexxy-editor__toolbar-dropdown-list">
-          <button type="button" name="unordered-list" data-command="insertUnorderedList" title="Bullet list">
-            ${ToolbarIcons.ul} <span>Bullets</span>
-          </button>
-          <button type="button" name="ordered-list" data-command="insertOrderedList" title="Numbered list">
-            ${ToolbarIcons.ol} <span>Numbers</span>
-          </button>
-        </div>
-      </details>
-
       <details class="lexxy-editor__toolbar-dropdown lexxy-editor__toolbar-dropdown--chevron" name="lexxy-dropdown">
         <summary class="lexxy-editor__toolbar-button" name="highlight" title="Color highlight">
           ${ToolbarIcons.highlight}
@@ -5335,7 +5339,7 @@ class LexicalToolbarElement extends HTMLElement {
       </details>
 
       <details class="lexxy-editor__toolbar-dropdown" name="lexxy-dropdown">
-        <summary class="lexxy-editor__toolbar-button" name="link" title="Link" data-hotkey="cmd+k ctrl+k">
+        <summary class="lexxy-editor__toolbar-button lexxy-editor__toolbar-group-end" name="link" title="Link" data-hotkey="cmd+k ctrl+k">
           ${ToolbarIcons.link}
         </summary>
         <lexxy-link-dropdown class="lexxy-editor__toolbar-dropdown-content">
@@ -5353,10 +5357,17 @@ class LexicalToolbarElement extends HTMLElement {
         ${ToolbarIcons.quote}
       </button>
 
-      <button class="lexxy-editor__toolbar-button lexxy-editor__toolbar-group-end" type="button" name="code" data-command="insertCodeBlock" title="Code">
+      <button class="lexxy-editor__toolbar-button" type="button" name="code" data-command="insertCodeBlock" title="Code">
         ${ToolbarIcons.code}
       </button>
 
+      <button class="lexxy-editor__toolbar-button" type="button" name="unordered-list" data-command="insertUnorderedList" title="Bullet list">
+        ${ToolbarIcons.ul}
+      </button>
+      <button class="lexxy-editor__toolbar-button lexxy-editor__toolbar-group-end" type="button" name="ordered-list" data-command="insertOrderedList" title="Numbered list">
+        ${ToolbarIcons.ol}
+      </button>
+
       <button class="lexxy-editor__toolbar-button" type="button" name="table" data-command="insertTable" title="Insert a table">
         ${ToolbarIcons.table}
       </button>
@@ -8240,7 +8251,8 @@ const COMMANDS = [
   "insertQuoteBlock",
   "insertCodeBlock",
   "insertHorizontalDivider",
-  "uploadAttachments",
+  "uploadImage",
+  "uploadFile",
 
   "insertTable",
 
@@ -8250,9 +8262,10 @@ const COMMANDS = [
 
 class CommandDispatcher {
   #selectionBeforeDrag = null
+  #unregister = []
 
   static configureFor(editorElement) {
-    new CommandDispatcher(editorElement);
+    return new CommandDispatcher(editorElement)
   }
 
   constructor(editorElement) {
@@ -8424,15 +8437,27 @@ class CommandDispatcher {
     this.contents.applyParagraphFormat();
   }
 
-  dispatchUploadAttachments() {
-    const input = createElement("input", {
+  dispatchUploadImage() {
+    this.#dispatchUploadAttachment("image/*,video/*");
+  }
+
+  dispatchUploadFile() {
+    this.#dispatchUploadAttachment();
+  }
+
+  #dispatchUploadAttachment(accept = null) {
+    const attributes = {
       type: "file",
       multiple: true,
       style: "display: none;",
       onchange: ({ target: { files } }) => {
         this.contents.uploadFiles(files, { selectLast: true });
       }
-    });
+    };
+
+    if (accept) attributes.accept = accept;
+
+    const input = createElement("input", attributes);
 
     // Append and remove to make testable
     this.editorElement.appendChild(input);
@@ -8452,6 +8477,13 @@ class CommandDispatcher {
     this.editor.dispatchCommand(Ce$1, undefined);
   }
 
+  dispose() {
+    while (this.#unregister.length) {
+      const unregister = this.#unregister.pop();
+      unregister();
+    }
+  }
+
   #registerCommands() {
     for (const command of COMMANDS) {
       const methodName = `dispatch${capitalize(command)}`;
@@ -8462,12 +8494,12 @@ class CommandDispatcher {
   }
 
   #registerCommandHandler(command, priority, handler) {
-    this.editor.registerCommand(command, handler, priority);
+    this.#unregister.push(this.editor.registerCommand(command, handler, priority));
   }
 
   #registerKeyboardCommands() {
-    this.editor.registerCommand(ve$1, this.#handleArrowRightKey.bind(this), Gi);
-    this.editor.registerCommand(De$2, this.#handleTabKey.bind(this), Gi);
+    this.#registerCommandHandler(ve$1, Gi, this.#handleArrowRightKey.bind(this));
+    this.#registerCommandHandler(De$2, Gi, this.#handleTabKey.bind(this));
   }
 
   #handleArrowRightKey(event) {
@@ -8953,6 +8985,8 @@ function $isActionTextAttachmentNode(node) {
 }
 
 class Selection {
+  #unregister = []
+
   constructor(editorElement) {
     this.editorElement = editorElement;
     this.editorContentElement = editorElement.editorContentElement;
@@ -9209,6 +9243,18 @@ class Selection {
     return this.#findPreviousSiblingUp(anchorNode)
   }
 
+  dispose() {
+    this.editorElement = null;
+    this.editorContentElement = null;
+    this.editor = null;
+    this.previouslySelectedKeys = null;
+
+    while (this.#unregister.length) {
+      const unregister = this.#unregister.pop();
+      unregister();
+    }
+  }
+
   // When all inline code text is deleted, Lexical's selection retains the stale
   // code format flag. Verify the flag is backed by actual code-formatted content:
   // a code block ancestor or a text node that carries the code format.
@@ -9224,7 +9270,7 @@ class Selection {
   // detects that stale state and clears it so newly typed text won't be
   // code-formatted.
   #clearStaleInlineCodeFormat() {
-    this.editor.registerUpdateListener(({ editorState, tags }) => {
+    this.#unregister.push(this.editor.registerUpdateListener(({ editorState, tags }) => {
       if (tags.has("history-merge") || tags.has("skip-dom-selection")) return
 
       let isStale = false;
@@ -9253,7 +9299,7 @@ class Selection {
           });
         }, 0);
       }
-    });
+    }));
   }
 
   get #currentlySelectedKeys() {
@@ -9272,29 +9318,32 @@ class Selection {
   }
 
   #processSelectionChangeCommands() {
-    this.editor.registerCommand(ke$3, this.#selectPreviousNode.bind(this), Hi);
-    this.editor.registerCommand(ve$1, this.#selectNextNode.bind(this), Hi);
-    this.editor.registerCommand(be$2, this.#selectPreviousTopLevelNode.bind(this), Hi);
-    this.editor.registerCommand(we$1, this.#selectNextTopLevelNode.bind(this), Hi);
+    this.#unregister.push(ec(
+      this.editor.registerCommand(ke$3, this.#selectPreviousNode.bind(this), Hi),
+      this.editor.registerCommand(ve$1, this.#selectNextNode.bind(this), Hi),
+      this.editor.registerCommand(be$2, this.#selectPreviousTopLevelNode.bind(this), Hi),
+      this.editor.registerCommand(we$1, this.#selectNextTopLevelNode.bind(this), Hi),
 
-    this.editor.registerCommand(ue$2, this.#selectDecoratorNodeBeforeDeletion.bind(this), Hi);
+      this.editor.registerCommand(ue$2, this.#selectDecoratorNodeBeforeDeletion.bind(this), Hi),
 
-    this.editor.registerCommand(re$2, () => {
-      this.current = $r();
-    }, Hi);
+      this.editor.registerCommand(re$2, () => {
+        this.current = $r();
+      }, Hi)
+    ));
   }
 
   #listenForNodeSelections() {
-    this.editor.registerCommand(oe$4, ({ target }) => {
+    this.#unregister.push(this.editor.registerCommand(oe$4, ({ target }) => {
       if (!As(target)) return false
 
       const targetNode = Do(target);
       return Li(targetNode) && this.#selectInLexical(targetNode)
-    }, Hi);
+    }, Hi));
 
-    this.editor.getRootElement().addEventListener("lexxy:internal:move-to-next-line", (event) => {
-      this.#selectOrAppendNextLine();
-    });
+    const moveNextLineHandler = () => this.#selectOrAppendNextLine();
+    const rootElement = this.editor.getRootElement();
+    rootElement.addEventListener("lexxy:internal:move-to-next-line", moveNextLineHandler);
+    this.#unregister.push(() => rootElement.removeEventListener("lexxy:internal:move-to-next-line", moveNextLineHandler));
   }
 
   #containEditorFocus() {
@@ -10429,7 +10478,11 @@ class Contents {
   constructor(editorElement) {
     this.editorElement = editorElement;
     this.editor = editorElement.editor;
+  }
 
+  dispose() {
+    this.editorElement = null;
+    this.editor = null;
   }
 
   insertHtml(html, { tag } = {}) {
@@ -11532,11 +11585,12 @@ class TablesExtension extends LexxyExtension {
         ze$1
       ],
       register(editor) {
+        Cn(editor);
+
         return ec(
           // Register Lexical table plugins
           Kn(editor),
           An(editor, true),
-          Cn(editor),
 
           // Bug fix: Prevent hardcoded background color (Lexical #8089)
           editor.registerNodeTransform(Ke$1, (node) => {
@@ -12263,6 +12317,7 @@ class LexicalEditorElement extends HTMLElement {
 
   #initialValue = ""
   #validationTextArea = document.createElement("textarea")
+  #disposables = []
 
   constructor() {
     super();
@@ -12276,12 +12331,19 @@ class LexicalEditorElement extends HTMLElement {
     this.extensions = new Extensions(this);
 
     this.editor = this.#createEditor();
+    this.#disposables.push(this.editor);
 
     this.contents = new Contents(this);
+    this.#disposables.push(this.contents);
+
     this.selection = new Selection(this);
+    this.#disposables.push(this.selection);
+
     this.clipboard = new Clipboard(this);
 
-    CommandDispatcher.configureFor(this);
+    const commandDispatcher = CommandDispatcher.configureFor(this);
+    this.#disposables.push(commandDispatcher);
+
     this.#initialize();
 
     requestAnimationFrame(() => dispatch(this, "lexxy:initialize"));
@@ -12334,7 +12396,7 @@ class LexicalEditorElement extends HTMLElement {
   get toolbarElement() {
     if (!this.#hasToolbar) return null
 
-    this.toolbar = this.toolbar || this.#findOrCreateDefaultToolbar();
+    this.toolbar ??= this.#findOrCreateDefaultToolbar();
     return this.toolbar
   }
 
@@ -12470,6 +12532,7 @@ class LexicalEditorElement extends HTMLElement {
 
   #createEditor() {
     this.editorContentElement ||= this.#createEditorContentElement();
+    this.appendChild(this.editorContentElement);
 
     const editor = Qt$2({
       name: "lexxy/core",
@@ -12519,7 +12582,6 @@ class LexicalEditorElement extends HTMLElement {
     });
     editorContentElement.id = `${this.id}-content`;
     this.#ariaAttributes.forEach(attribute => editorContentElement.setAttribute(attribute.name, attribute.value));
-    this.appendChild(editorContentElement);
 
     if (this.getAttribute("tabindex")) {
       editorContentElement.setAttribute("tabindex", this.getAttribute("tabindex"));
@@ -12595,36 +12657,48 @@ class LexicalEditorElement extends HTMLElement {
   }
 
   #registerComponents() {
+    const registered = [];
+
     if (this.supportsRichText) {
-      Jt$2(this.editor);
-      Le$2(this.editor);
+      registered.push(
+        Jt$2(this.editor),
+        Le$2(this.editor)
+      );
       this.#registerTableComponents();
       this.#registerCodeHiglightingComponents();
       if (this.supportsMarkdown) {
-        Yt$1(this.editor, Jt$1);
-        registerMarkdownLeadingTagHandler(this.editor, Jt$1);
+          registered.push(
+            Yt$1(this.editor, Jt$1),
+            registerMarkdownLeadingTagHandler(this.editor, Jt$1)
+        );
       }
     } else {
-      z$1(this.editor);
+      registered.push(z$1(this.editor));
     }
     this.historyState = H();
-    E$1(this.editor, this.historyState, 20);
+    registered.push(E$1(this.editor, this.historyState, 20));
+
+    this.#addUnregisterHandler(ec(...registered));
   }
 
   #registerTableComponents() {
-    this.tableTools = createElement("lexxy-table-tools");
-    this.append(this.tableTools);
+    let tableTools = this.querySelector("lexxy-table-tools");
+    tableTools ??= createElement("lexxy-table-tools");
+    this.append(tableTools);
+    this.#disposables.push(tableTools);
   }
 
   #registerCodeHiglightingComponents() {
     zt$2(this.editor);
-    this.codeLanguagePicker = createElement("lexxy-code-language-picker");
-    this.append(this.codeLanguagePicker);
+    let codeLanguagePicker = this.querySelector("lexxy-code-language-picker");
+    codeLanguagePicker ??= createElement("lexxy-code-language-picker");
+    this.append(codeLanguagePicker);
+    this.#disposables.push(codeLanguagePicker);
   }
 
   #handleEnter() {
     // We can't prevent these externally using regular keydown because Lexical handles it first.
-    this.editor.registerCommand(
+    this.#addUnregisterHandler(this.editor.registerCommand(
       Ee$2,
       (event) => {
         // Prevent CTRL+ENTER
@@ -12642,12 +12716,17 @@ class LexicalEditorElement extends HTMLElement {
         return false
       },
       Gi
-    );
+    ));
   }
 
   #registerFocusEvents() {
     this.addEventListener("focusin", this.#handleFocusIn);
     this.addEventListener("focusout", this.#handleFocusOut);
+
+    this.#addUnregisterHandler(() => {
+      this.removeEventListener("focusin", this.#handleFocusIn);
+      this.removeEventListener("focusout", this.#handleFocusOut);
+    });
   }
 
   #handleFocusIn(event) {
@@ -12690,6 +12769,10 @@ class LexicalEditorElement extends HTMLElement {
   #attachToolbar() {
     if (this.#hasToolbar) {
       this.toolbarElement.setEditor(this);
+      if (typeof this.toolbarElement.dispose === "function") {
+        this.#disposables.push(this.toolbarElement);
+      }
+
       this.extensions.initializeToolbars();
     }
   }
@@ -12699,7 +12782,7 @@ class LexicalEditorElement extends HTMLElement {
     if (typeof toolbarConfig === "string") {
       return document.getElementById(toolbarConfig)
     } else {
-      return this.#createDefaultToolbar()
+      return this.querySelector("lexxy-toolbar") ?? this.#createDefaultToolbar()
     }
   }
 
@@ -12729,34 +12812,22 @@ class LexicalEditorElement extends HTMLElement {
   }
 
   #reset() {
-    this.#unregisterHandlers();
-
-    if (this.editorContentElement) {
-      this.editorContentElement.remove();
-      this.editorContentElement = null;
-    }
-
-    this.contents = null;
-    this.editor = null;
+    this.#dispose();
+    this.editorContentElement?.remove();
+    this.editorContentElement = null;
 
-    if (this.toolbar) {
-      if (!this.getAttribute("toolbar")) { this.toolbar.remove(); }
-      this.toolbar = null;
-    }
+    // Prevents issues with turbo morphing receiving an empty <lexxy-editor> which wipes
+    // out the DOM for the tools, and the old toolbar reference will cause issues
+    this.toolbar = null;
+  }
 
-    if (this.codeLanguagePicker) {
-      this.codeLanguagePicker.remove();
-      this.codeLanguagePicker = null;
-    }
+  #dispose() {
+    this.#unregisterHandlers();
+    document.removeEventListener("turbo:before-cache", this.#handleTurboBeforeCache);
 
-    if (this.tableHandler) {
-      this.tableHandler.remove();
-      this.tableHandler = null;
+    while (this.#disposables.length) {
+      this.#disposables.pop().dispose();
     }
-
-    this.selection = null;
-
-    document.removeEventListener("turbo:before-cache", this.#handleTurboBeforeCache);
   }
 
   #reconnect() {
@@ -12797,14 +12868,15 @@ class ToolbarDropdown extends HTMLElement {
   connectedCallback() {
     this.container = this.closest("details");
 
-    this.container.addEventListener("toggle", this.#handleToggle.bind(this));
-    this.container.addEventListener("keydown", this.#handleKeyDown.bind(this));
+    this.container.addEventListener("toggle", this.#handleToggle);
+    this.container.addEventListener("keydown", this.#handleKeyDown);
 
     this.#onToolbarEditor(this.initialize.bind(this));
   }
 
   disconnectedCallback() {
-    this.container.removeEventListener("keydown", this.#handleKeyDown.bind(this));
+    this.container?.removeEventListener("toggle", this.#handleToggle);
+    this.container?.removeEventListener("keydown", this.#handleKeyDown);
   }
 
   get toolbar() {
@@ -12829,11 +12901,11 @@ class ToolbarDropdown extends HTMLElement {
   }
 
   async #onToolbarEditor(callback) {
-    await this.toolbar.editorConnected;
+    await this.toolbar.editorElement;
     callback();
   }
 
-  #handleToggle() {
+  #handleToggle = () => {
     if (this.container.open) {
       this.#handleOpen();
     }
@@ -12844,7 +12916,7 @@ class ToolbarDropdown extends HTMLElement {
     this.#resetTabIndexValues();
   }
 
-  #handleKeyDown(event) {
+  #handleKeyDown = (event) => {
     if (event.key === "Escape") {
       event.stopPropagation();
       this.close();
@@ -12872,27 +12944,30 @@ class LinkDropdown extends ToolbarDropdown {
     super.connectedCallback();
     this.input = this.querySelector("input");
 
-    this.#registerHandlers();
+    this.container.addEventListener("toggle", this.#handleToggle);
+    this.addEventListener("submit", this.#handleSubmit);
+    this.querySelector("[value='unlink']").addEventListener("click", this.#handleUnlink);
   }
 
-  #registerHandlers() {
-    this.container.addEventListener("toggle", this.#handleToggle.bind(this));
-    this.addEventListener("submit", this.#handleSubmit.bind(this));
-    this.querySelector("[value='unlink']").addEventListener("click", this.#handleUnlink.bind(this));
+  disconnectedCallback() {
+    this.container?.removeEventListener("toggle", this.#handleToggle);
+    this.removeEventListener("submit", this.#handleSubmit);
+    this.querySelector("[value='unlink']")?.removeEventListener("click", this.#handleUnlink);
+    super.disconnectedCallback();
   }
 
-  #handleToggle({ newState }) {
+  #handleToggle = ({ newState }) => {
     this.input.value = this.#selectedLinkUrl;
     this.input.required = newState === "open";
   }
 
-  #handleSubmit(event) {
+  #handleSubmit = (event) => {
     const command = event.submitter?.value;
     this.editor.dispatchCommand(command, this.input.value);
     this.close();
   }
 
-  #handleUnlink() {
+  #handleUnlink = () => {
     this.editor.dispatchCommand("unlink");
     this.close();
   }
@@ -12927,26 +13002,35 @@ const REMOVE_HIGHLIGHT_SELECTOR = "[data-command='removeHighlight']";
 const NO_STYLE = Symbol("no_style");
 
 class HighlightDropdown extends ToolbarDropdown {
-  connectedCallback() {
-    super.connectedCallback();
-    this.#registerToggleHandler();
-  }
-
   initialize() {
     this.#setUpButtons();
     this.#registerButtonHandlers();
   }
 
-  #registerToggleHandler() {
-    this.container.addEventListener("toggle", this.#handleToggle.bind(this));
+  connectedCallback() {
+    super.connectedCallback();
+    this.container.addEventListener("toggle", this.#handleToggle);
+  }
+
+  disconnectedCallback() {
+    this.container?.removeEventListener("toggle", this.#handleToggle);
+    this.#removeButtonHandlers();
+    super.disconnectedCallback();
   }
 
   #registerButtonHandlers() {
-    this.#colorButtons.forEach(button => button.addEventListener("click", this.#handleColorButtonClick.bind(this)));
-    this.querySelector(REMOVE_HIGHLIGHT_SELECTOR).addEventListener("click", this.#handleRemoveHighlightClick.bind(this));
+    this.#colorButtons.forEach(button => button.addEventListener("click", this.#handleColorButtonClick));
+    this.querySelector(REMOVE_HIGHLIGHT_SELECTOR).addEventListener("click", this.#handleRemoveHighlightClick);
+  }
+
+  #removeButtonHandlers() {
+    this.#colorButtons.forEach(button => button.removeEventListener("click", this.#handleColorButtonClick));
+    this.querySelector(REMOVE_HIGHLIGHT_SELECTOR)?.removeEventListener("click", this.#handleRemoveHighlightClick);
   }
 
   #setUpButtons() {
+    this.#buttonContainer.innerHTML = "";
+
     const colorGroups = this.editorElement.config.get("highlight.buttons");
 
     this.#populateButtonGroup("color", colorGroups.color);
@@ -12972,7 +13056,7 @@ class HighlightDropdown extends ToolbarDropdown {
     return button
   }
 
-  #handleToggle({ newState }) {
+  #handleToggle = ({ newState }) => {
     if (newState === "open") {
       this.editor.getEditorState().read(() => {
         this.#updateColorButtonStates($r());
@@ -12980,7 +13064,7 @@ class HighlightDropdown extends ToolbarDropdown {
     }
   }
 
-  #handleColorButtonClick(event) {
+  #handleColorButtonClick = (event) => {
     event.preventDefault();
 
     const button = event.target.closest(APPLY_HIGHLIGHT_SELECTOR);
@@ -12993,7 +13077,7 @@ class HighlightDropdown extends ToolbarDropdown {
     this.close();
   }
 
-  #handleRemoveHighlightClick(event) {
+  #handleRemoveHighlightClick = (event) => {
     event.preventDefault();
 
     this.editor.dispatchCommand("removeHighlight");
@@ -13655,19 +13739,21 @@ class CodeLanguagePicker extends HTMLElement {
   }
 
   disconnectedCallback() {
+    this.dispose();
+  }
+
+  dispose() {
     this.unregisterUpdateListener?.();
     this.unregisterUpdateListener = null;
   }
 
   #attachLanguagePicker() {
-    this.languagePickerElement = this.#createLanguagePicker();
-
-    this.languagePickerElement.addEventListener("change", () => {
-      this.#updateCodeBlockLanguage(this.languagePickerElement.value);
-    });
+    this.languagePickerElement = this.#findLanguagePicker() ?? this.#createLanguagePicker();
+    this.append(this.languagePickerElement);
+  }
 
-    this.languagePickerElement.setAttribute("nonce", getNonce());
-    this.appendChild(this.languagePickerElement);
+  #findLanguagePicker() {
+    return this.querySelector("select")
   }
 
   #createLanguagePicker() {
@@ -13680,6 +13766,12 @@ class CodeLanguagePicker extends HTMLElement {
       selectElement.appendChild(option);
     }
 
+    selectElement.addEventListener("change", () => {
+      this.#updateCodeBlockLanguage(this.languagePickerElement.value);
+    });
+
+    selectElement.setAttribute("nonce", getNonce());
+
     return selectElement
   }
 
@@ -14240,6 +14332,10 @@ class TableTools extends HTMLElement {
   }
 
   disconnectedCallback() {
+    this.dispose();
+  }
+
+  dispose() {
     this.#unregisterKeyboardShortcuts();
 
     this.unregisterUpdateListener?.();
@@ -14264,6 +14360,8 @@ class TableTools extends HTMLElement {
   }
 
   #setUpButtons() {
+    this.innerHTML = "";
+
     this.appendChild(this.#createRowButtonsContainer());
     this.appendChild(this.#createColumnButtonsContainer());