lexxy 0.9.2.beta → 0.9.3.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8ee9866b0433459ec013e80632d58c956e8183ac5fe33b42d046195714e943e
-  data.tar.gz: f7801f5dec0979471d9b6e079632ed8b17b23564b13b3cebd5ea85609366f871
+  metadata.gz: 3ca2c3eeb9fff2ac0a2a3db6b68fc9bda7868fde5a36158ea77ac61d0eaea40d
+  data.tar.gz: c0390bfc97b15a212dd6cc07b273c21da5d641c37232fc039c2fde9c5c772d43
 SHA512:
-  metadata.gz: fd915f18f31b55b22500c2c9d7a749fcb9cbe7cba02ec835f773ea697853d5c9a90617e1509bf5802664285adb4c31bc716fc70c99bcbf701a8fb79167ccbaf9
-  data.tar.gz: 43e49d501e92e3fca8338ab1f09a9ae449f4e6ad733d4a6b4542ec9e3be3676cdc20780a87f476e0c804b61fea2be88220c888ea4b13bf49ca1b1eb3322891c9
+  metadata.gz: ab64196f9538299e4c731b4d0be010455f14b705b3fe2f3936091f9c33387957b8d74ac2f7a3aa03a7044224ebb32574a26dae33c563a878a77f00b8c6e79c58
+  data.tar.gz: 790f9af92cb872bdc45b68e55976e54f23b75a83f1cb95ac93218294cd5f44415fde9d8d53e02f752577d74c648e73dd86d3799bf40fbab2524b77fa32d00e7d

data/app/assets/javascript/lexxy.js

@@ -7688,6 +7688,24 @@ function isSelectionHighlighted(selection) {
   }
 }
 
+function getHighlightStyles(selection) {
+  if (!wr(selection)) return null
+
+  let styles = b$3(selection.style);
+  if (!styles.color && !styles["background-color"]) {
+    const anchorNode = selection.anchor.getNode();
+    if (yr(anchorNode)) {
+      styles = b$3(anchorNode.getStyle());
+    }
+  }
+
+  const color = styles.color || null;
+  const backgroundColor = styles["background-color"] || null;
+  if (!color && !backgroundColor) return null
+
+  return { color, backgroundColor }
+}
+
 function hasHighlightStyles(cssOrStyles) {
   const styles = typeof cssOrStyles === "string" ? b$3(cssOrStyles) : cssOrStyles;
   return !!(styles.color || styles["background-color"])
@@ -8250,6 +8268,7 @@ const COMMANDS = [
   "insertOrderedList",
   "insertQuoteBlock",
   "insertCodeBlock",
+  "setCodeLanguage",
   "insertHorizontalDivider",
   "uploadImage",
   "uploadFile",
@@ -8325,7 +8344,14 @@ class CommandDispatcher {
   }
 
   dispatchUnlink() {
-    this.#toggleLink(null);
+    this.editor.update(() => {
+      // Let adapters signal whether unlink should target a frozen link key.
+      if (this.editorElement.adapter.unlinkFrozenNode?.()) {
+        return
+      }
+
+      Z$1(null);
+    });
   }
 
   dispatchInsertUnorderedList() {
@@ -8416,6 +8442,17 @@ class CommandDispatcher {
     }
   }
 
+  dispatchSetCodeLanguage(language) {
+    this.editor.update(() => {
+      if (!this.selection.isInsideCodeBlock) return
+
+      const codeNode = this.selection.nearestNodeOfType(U$1);
+      if (!codeNode) return
+
+      codeNode.setLanguage(language);
+    });
+  }
+
   dispatchInsertHorizontalDivider() {
     this.contents.insertAtCursorEnsuringLineBelow(new HorizontalDividerNode());
     this.editor.focus();
@@ -8614,16 +8651,6 @@ class CommandDispatcher {
     return wr(selection) && selection.isCollapsed()
   }
 
-  // Not using TOGGLE_LINK_COMMAND because it's not handled unless you use React/LinkPlugin
-  #toggleLink(url) {
-    this.editor.update(() => {
-      if (url === null) {
-        Z$1(null);
-      } else {
-        Z$1(url);
-      }
-    });
-  }
 }
 
 function capitalize(str) {
@@ -8850,8 +8877,8 @@ class ActionTextAttachmentNode extends Fi {
     return null
   }
 
-  createAttachmentFigure() {
-    const figure = createAttachmentFigure(this.contentType, this.isPreviewableAttachment, this.fileName);
+  createAttachmentFigure(previewable = this.isPreviewableAttachment) {
+    const figure = createAttachmentFigure(this.contentType, previewable, this.fileName);
     figure.draggable = true;
     figure.dataset.lexicalNodeKey = this.__key;
 
@@ -9936,9 +9963,12 @@ class ActionTextAttachmentUploadNode extends ActionTextAttachmentNode {
     // node is reloaded from saved state such as from history.
     this.#startUploadIfNeeded();
 
-    const figure = this.createAttachmentFigure();
+    // Bridge-managed uploads (uploadUrl is null) don't have file data to show
+    // an image preview, so always show the file icon during upload.
+    const canPreviewFile = this.isPreviewableAttachment && this.uploadUrl != null;
+    const figure = this.createAttachmentFigure(canPreviewFile);
 
-    if (this.isPreviewableAttachment) {
+    if (canPreviewFile) {
       const img = figure.appendChild(this.#createDOMForImage());
 
       // load file locally to set dimensions and prevent vertical shifting
@@ -10038,6 +10068,7 @@ class ActionTextAttachmentUploadNode extends ActionTextAttachmentNode {
 
   async #startUploadIfNeeded() {
     if (this.#uploadStarted) return
+    if (!this.uploadUrl) return // Bridge-managed upload — skip DirectUpload
 
     this.#setUploadStarted();
 
@@ -10054,7 +10085,9 @@ class ActionTextAttachmentUploadNode extends ActionTextAttachmentNode {
         this.#handleUploadError(error);
       } else {
         this.#dispatchEvent("lexxy:upload-end", { file: this.file, error: null });
-        this.#showUploadedAttachment(blob);
+        this.editor.update(() => {
+          this.showUploadedAttachment(blob);
+        }, { tag: this.#backgroundUpdateTags });
       }
     });
   }
@@ -10098,17 +10131,15 @@ class ActionTextAttachmentUploadNode extends ActionTextAttachmentNode {
     }, { tag: this.#backgroundUpdateTags });
   }
 
-  #showUploadedAttachment(blob) {
-    const editorHasFocus = this.#editorHasFocus;
+  showUploadedAttachment(blob) {
+    const replacementNode = this.#toActionTextAttachmentNodeWith(blob);
+    this.replace(replacementNode);
 
-    this.editor.update(() => {
-      const replacementNode = this.#toActionTextAttachmentNodeWith(blob);
-      this.replace(replacementNode);
+    if (xs(replacementNode.getParent())) {
+      replacementNode.selectNext();
+    }
 
-      if (editorHasFocus && xs(replacementNode.getParent())) {
-        replacementNode.selectNext();
-      }
-    }, { tag: this.#backgroundUpdateTags });
+    return replacementNode.getKey()
   }
 
   // Upload lifecycle methods (progress, completion, errors) run asynchronously and may
@@ -10710,6 +10741,53 @@ class Contents {
     });
   }
 
+  insertPendingAttachment(file) {
+    if (!this.editorElement.supportsAttachments) return null
+
+    let nodeKey = null;
+    this.editor.update(() => {
+      const uploadNode = new ActionTextAttachmentUploadNode({
+        file,
+        uploadUrl: null,
+        blobUrlTemplate: this.editorElement.blobUrlTemplate,
+        editor: this.editor
+      });
+      this.insertAtCursor(uploadNode);
+      nodeKey = uploadNode.getKey();
+    }, { tag: Wn });
+
+    if (!nodeKey) return null
+
+    const editor = this.editor;
+    return {
+      setAttributes(blob) {
+        editor.update(() => {
+          const node = Mo(nodeKey);
+          if (!(node instanceof ActionTextAttachmentUploadNode)) return
+
+          const replacementNodeKey = node.showUploadedAttachment(blob);
+          if (replacementNodeKey) {
+            nodeKey = replacementNodeKey;
+          }
+        }, { tag: Wn });
+      },
+      setUploadProgress(progress) {
+        editor.update(() => {
+          const node = Mo(nodeKey);
+          if (!(node instanceof ActionTextAttachmentUploadNode)) return
+
+          node.getWritable().progress = progress;
+        }, { tag: Wn });
+      },
+      remove() {
+        editor.update(() => {
+          const node = Mo(nodeKey);
+          if (node) node.remove();
+        });
+      }
+    }
+  }
+
   replaceNodeWithHTML(nodeKey, html, options = {}) {
     this.editor.update(() => {
       const node = Mo(nodeKey);
@@ -11266,6 +11344,18 @@ class Extensions {
   }
 }
 
+class BrowserAdapter {
+  frozenLinkKey = null
+
+  dispatchAttributesChange(attributes, linkHref, highlight, headingTag) {}
+  dispatchEditorInitialized(detail) {}
+  freeze() {}
+  thaw() {}
+  unlinkFrozenNode() {
+    return false
+  }
+}
+
 // Custom TextNode exportDOM that avoids redundant bold/italic wrapping.
 //
 // Lexical's built-in TextNode.exportDOM() calls createDOM() which produces semantic tags
@@ -12317,6 +12407,7 @@ class LexicalEditorElement extends HTMLElement {
 
   #initialValue = ""
   #validationTextArea = document.createElement("textarea")
+  #editorInitializedRafId = null
   #disposables = []
 
   constructor() {
@@ -12326,7 +12417,7 @@ class LexicalEditorElement extends HTMLElement {
   }
 
   connectedCallback() {
-    this.id ??= generateDomId("lexxy-editor");
+    this.id ||= generateDomId("lexxy-editor");
     this.config = new EditorConfiguration(this);
     this.extensions = new Extensions(this);
 
@@ -12340,13 +12431,14 @@ class LexicalEditorElement extends HTMLElement {
     this.#disposables.push(this.selection);
 
     this.clipboard = new Clipboard(this);
+    this.adapter = new BrowserAdapter();
 
     const commandDispatcher = CommandDispatcher.configureFor(this);
     this.#disposables.push(commandDispatcher);
 
     this.#initialize();
 
-    requestAnimationFrame(() => dispatch(this, "lexxy:initialize"));
+    this.#scheduleEditorInitializedDispatch();
     this.toggleAttribute("connected", true);
 
     this.#handleAutofocus();
@@ -12355,6 +12447,7 @@ class LexicalEditorElement extends HTMLElement {
   }
 
   disconnectedCallback() {
+    this.#cancelEditorInitializedDispatch();
     this.valueBeforeDisconnect = this.value;
     this.#reset(); // Prevent hangs with Safari when morphing
   }
@@ -12451,6 +12544,32 @@ class LexicalEditorElement extends HTMLElement {
     return this.config.get("richText")
   }
 
+  registerAdapter(adapter) {
+    this.adapter = adapter;
+
+    if (!this.editor) return
+
+    this.#cancelEditorInitializedDispatch();
+    this.#dispatchEditorInitialized();
+    this.#dispatchAttributesChange();
+  }
+
+  freezeSelection() {
+    this.adapter.freeze();
+  }
+
+  thawSelection() {
+    this.adapter.thaw();
+  }
+
+  dispatchAttributesChange() {
+    this.#dispatchAttributesChange();
+  }
+
+  dispatchEditorInitialized() {
+    this.#dispatchEditorInitialized();
+  }
+
   // TODO: Deprecate `single-line` attribute
   get isSingleLineMode() {
     return this.hasAttribute("single-line")
@@ -12575,6 +12694,7 @@ class LexicalEditorElement extends HTMLElement {
     const editorContentElement = createElement("div", {
       classList: "lexxy-editor__content",
       contenteditable: true,
+      autocapitalize: "none",
       role: "textbox",
       "aria-multiline": true,
       "aria-label": this.#labelText,
@@ -12636,6 +12756,7 @@ class LexicalEditorElement extends HTMLElement {
       this.#internalFormValue = this.value;
       this.#toggleEmptyStatus();
       this.#setValidity();
+      this.#dispatchAttributesChange();
     }));
   }
 
@@ -12731,6 +12852,7 @@ class LexicalEditorElement extends HTMLElement {
 
   #handleFocusIn(event) {
     if (this.#elementInEditorOrToolbar(event.target) && !this.currentlyFocused) {
+      this.#dispatchAttributesChange();
       dispatch(this, "lexxy:focus");
       this.currentlyFocused = true;
     }
@@ -12811,7 +12933,112 @@ class LexicalEditorElement extends HTMLElement {
     }
   }
 
+  #dispatchAttributesChange() {
+    let attributes = null;
+    let linkHref = null;
+    let highlight = null;
+    let headingTag = null;
+
+    this.editor.getEditorState().read(() => {
+      const selection = $r();
+      if (!wr(selection)) return
+
+      const format = this.selection.getFormat();
+      if (Object.keys(format).length === 0) return
+
+      const anchorNode = selection.anchor.getNode();
+      const linkNode = vt$4(anchorNode, E$3);
+
+      attributes = {
+        bold: { active: format.isBold, enabled: true },
+        italic: { active: format.isItalic, enabled: true },
+        strikethrough: { active: format.isStrikethrough, enabled: true },
+        code: { active: format.isInCode, enabled: true },
+        highlight: { active: format.isHighlight, enabled: true },
+        link: { active: format.isInLink, enabled: true },
+        quote: { active: format.isInQuote, enabled: true },
+        heading: { active: format.isInHeading, enabled: true },
+        "unordered-list": { active: format.isInList && format.listType === "bullet", enabled: true },
+        "ordered-list": { active: format.isInList && format.listType === "number", enabled: true },
+        undo: { active: false, enabled: this.historyState?.undoStack.length > 0 },
+        redo: { active: false, enabled: this.historyState?.redoStack.length > 0 }
+      };
+
+      linkHref = linkNode ? linkNode.getURL() : null;
+      highlight = format.isHighlight ? getHighlightStyles(selection) : null;
+      headingTag = format.headingTag ?? null;
+    });
+
+    if (attributes) {
+      this.adapter.dispatchAttributesChange(attributes, linkHref, highlight, headingTag);
+    }
+  }
+
+  #dispatchEditorInitialized() {
+    if (!this.adapter) return
+
+    this.adapter.dispatchEditorInitialized({
+      highlightColors: this.#resolvedHighlightColors,
+      headingFormats: this.#supportedHeadingFormats
+    });
+  }
+
+  #scheduleEditorInitializedDispatch() {
+    this.#cancelEditorInitializedDispatch();
+    this.#editorInitializedRafId = requestAnimationFrame(() => {
+      this.#editorInitializedRafId = null;
+      if (!this.isConnected || !this.adapter) return
+
+      dispatch(this, "lexxy:initialize");
+      this.#dispatchEditorInitialized();
+    });
+  }
+
+  #cancelEditorInitializedDispatch() {
+    if (this.#editorInitializedRafId == null) return
+
+    cancelAnimationFrame(this.#editorInitializedRafId);
+    this.#editorInitializedRafId = null;
+  }
+
+  get #resolvedHighlightColors() {
+    const buttons = this.config.get("highlight.buttons");
+    if (!buttons) return null
+
+    const colors = this.#resolveColors("color", buttons.color || []);
+    const backgroundColors = this.#resolveColors("background-color", buttons["background-color"] || []);
+    return { colors, backgroundColors }
+  }
+
+  get #supportedHeadingFormats() {
+    if (!this.supportsRichText) return []
+
+    return [
+      { label: "Normal", command: "setFormatParagraph", tag: null },
+      { label: "Large heading", command: "setFormatHeadingLarge", tag: "h2" },
+      { label: "Medium heading", command: "setFormatHeadingMedium", tag: "h3" },
+      { label: "Small heading", command: "setFormatHeadingSmall", tag: "h4" },
+    ]
+  }
+
+  #resolveColors(property, cssValues) {
+    const resolver = document.createElement("span");
+    resolver.style.display = "none";
+    this.appendChild(resolver);
+
+    const resolved = cssValues.map(cssValue => {
+      resolver.style.setProperty(property, cssValue);
+      const value = window.getComputedStyle(resolver).getPropertyValue(property);
+      resolver.style.removeProperty(property);
+      return { name: cssValue, value }
+    });
+
+    resolver.remove();
+    return resolved
+  }
+
   #reset() {
+    this.#cancelEditorInitializedDispatch();
     this.#dispose();
     this.editorContentElement?.remove();
     this.editorContentElement = null;
@@ -12823,6 +13050,7 @@ class LexicalEditorElement extends HTMLElement {
 
   #dispose() {
     this.#unregisterHandlers();
+    this.adapter = null;
     document.removeEventListener("turbo:before-cache", this.#handleTurboBeforeCache);
 
     while (this.#disposables.length) {
@@ -13728,10 +13956,13 @@ class LexicalPromptElement extends HTMLElement {
 }
 
 class CodeLanguagePicker extends HTMLElement {
+  #abortController = null
+
   connectedCallback() {
     this.editorElement = this.closest("lexxy-editor");
     this.editor = this.editorElement.editor;
     this.classList.add("lexxy-floating-controls");
+    this.#abortController = new AbortController();
 
     this.#attachLanguagePicker();
     this.#hide();
@@ -13743,13 +13974,27 @@ class CodeLanguagePicker extends HTMLElement {
   }
 
   dispose() {
+    this.#abortController?.abort();
+    this.#abortController = null;
     this.unregisterUpdateListener?.();
     this.unregisterUpdateListener = null;
   }
 
   #attachLanguagePicker() {
     this.languagePickerElement = this.#findLanguagePicker() ?? this.#createLanguagePicker();
-    this.append(this.languagePickerElement);
+
+    const signal = this.#abortController.signal;
+
+    this.languagePickerElement.addEventListener("change", () => {
+      this.#updateCodeBlockLanguage(this.languagePickerElement.value);
+    }, { signal });
+
+    this.languagePickerElement.addEventListener("mousedown", (event) => {
+      this.#dispatchOpenEvent(event);
+    }, { signal });
+
+    this.languagePickerElement.setAttribute("nonce", getNonce());
+    this.appendChild(this.languagePickerElement);
   }
 
   #findLanguagePicker() {
@@ -13766,12 +14011,6 @@ class CodeLanguagePicker extends HTMLElement {
       selectElement.appendChild(option);
     }
 
-    selectElement.addEventListener("change", () => {
-      this.#updateCodeBlockLanguage(this.languagePickerElement.value);
-    });
-
-    selectElement.setAttribute("nonce", getNonce());
-
     return selectElement
   }
 
@@ -13794,6 +14033,21 @@ class CodeLanguagePicker extends HTMLElement {
     return Object.fromEntries([ plainEntry, ...sortedEntries ])
   }
 
+  #dispatchOpenEvent(event) {
+    const handled = !dispatch(this.editorElement, "lexxy:code-language-picker-open", {
+      languages: this.#bridgeLanguages,
+      currentLanguage: this.languagePickerElement.value
+    }, true);
+
+    if (handled) {
+      event.preventDefault();
+    }
+  }
+
+  get #bridgeLanguages() {
+    return Object.entries(this.#languages).map(([ key, name ]) => ({ key, name }))
+  }
+
   #updateCodeBlockLanguage(language) {
     this.editor.update(() => {
       const codeNode = this.#getCurrentCodeNode();
@@ -14789,10 +15043,108 @@ function collectTextNodes(root) {
   return nodes
 }
 
+class NativeAdapter {
+  frozenLinkKey = null
+
+  constructor(editorElement) {
+    this.editorElement = editorElement;
+    this.editorContentElement = editorElement.editorContentElement;
+  }
+
+  dispatchAttributesChange(attributes, linkHref, highlight, headingTag) {
+    dispatch(this.editorElement, "lexxy:attributes-change", {
+      attributes,
+      link: linkHref ? { href: linkHref } : null,
+      highlight,
+      headingTag
+    });
+  }
+
+  dispatchEditorInitialized(detail) {
+    dispatch(this.editorElement, "lexxy:editor-initialized", detail);
+  }
+
+  freeze() {
+    let frozenLinkKey = null;
+    this.editorElement.editor?.getEditorState().read(() => {
+      const selection = $r();
+      if (!wr(selection)) return
+
+      const linkNode = vt$4(selection.anchor.getNode(), E$3);
+      if (linkNode) {
+        frozenLinkKey = linkNode.getKey();
+      }
+    });
+
+    this.frozenLinkKey = frozenLinkKey;
+    this.editorContentElement.contentEditable = "false";
+  }
+
+  thaw() {
+    this.editorContentElement.contentEditable = "true";
+  }
+
+  unlinkFrozenNode() {
+    const key = this.frozenLinkKey;
+    if (!key) return false
+
+    const linkNode = Mo(key);
+    if (!B$2(linkNode)) {
+      this.frozenLinkKey = null;
+      return false
+    }
+
+    const children = linkNode.getChildren();
+    for (const child of children) {
+      linkNode.insertBefore(child);
+    }
+    linkNode.remove();
+
+    // Select the former link text so a follow-up createLink can re-wrap it.
+    const firstText = this.#findFirstTextDescendant(children);
+    const lastText = this.#findLastTextDescendant(children);
+    if (firstText && lastText) {
+      const selection = $r();
+      if (wr(selection)) {
+        selection.anchor.set(firstText.getKey(), 0, "text");
+        selection.focus.set(lastText.getKey(), lastText.getTextContent().length, "text");
+      }
+    }
+
+    this.frozenLinkKey = null;
+    return true
+  }
+
+  #findFirstTextDescendant(nodes) {
+    for (const node of nodes) {
+      if (yr(node)) return node
+      if (Pi(node)) {
+        const nestedTextNode = this.#findFirstTextDescendant(node.getChildren());
+        if (nestedTextNode) return nestedTextNode
+      }
+    }
+
+    return null
+  }
+
+  #findLastTextDescendant(nodes) {
+    for (let index = nodes.length - 1; index >= 0; index--) {
+      const node = nodes[index];
+      if (yr(node)) return node
+      if (Pi(node)) {
+        const nestedTextNode = this.#findLastTextDescendant(node.getChildren());
+        if (nestedTextNode) return nestedTextNode
+      }
+    }
+
+    return null
+  }
+}
+
 const configure = Lexxy.configure;
 
 // Pushing elements definition to after the current call stack to allow global configuration to take place first
 setTimeout(defineElements, 0);
 
-export { $createActionTextAttachmentNode, $createActionTextAttachmentUploadNode, $isActionTextAttachmentNode, ActionTextAttachmentNode, ActionTextAttachmentUploadNode, CustomActionTextAttachmentNode, LexxyExtension as Extension, HorizontalDividerNode, configure, highlightCode as highlightAll, highlightCode };
+export { $createActionTextAttachmentNode, $createActionTextAttachmentUploadNode, $isActionTextAttachmentNode, ActionTextAttachmentNode, ActionTextAttachmentUploadNode, CustomActionTextAttachmentNode, LexxyExtension as Extension, HorizontalDividerNode, NativeAdapter, configure, highlightCode as highlightAll, highlightCode };
 //# sourceMappingURL=lexxy.js.map