Merge branch '6.0'

Author: dtdesign

app.ts

@@ -31,6 +31,7 @@ import {
   Table,
   Undo,
   WoltlabAttachment,
+  WoltlabAutoLink,
   WoltlabAutosave,
   WoltlabBbcode,
   WoltlabBlockQuote,
@@ -98,6 +99,7 @@ const defaultConfig: Core.EditorConfig = {
 
     // WoltLab
     WoltlabAttachment.WoltlabAttachment,
+    WoltlabAutoLink.WoltlabAutoLink,
     WoltlabAutosave.WoltlabAutosave,
     WoltlabBlockQuote.WoltlabBlockQuote,
     WoltlabBbcode.WoltlabBbcode,
@@ -174,13 +176,5 @@ export async function create(
     configuration,
   );
 
-  // Unconditionally disable the `AutoLink` plugin which interferes with our
-  // own link detection and all creates potentially invalid links.
-  // See https://github.com/ckeditor/ckeditor5/issues/14497
-  if (editor.plugins.has(Link.AutoLink)) {
-    const autoLink = editor.plugins.get(Link.AutoLink);
-    autoLink.forceDisabled("app.ts");
-  }
-
   return editor;
 }

modules.ts

@@ -17,6 +17,7 @@ export * as HorizontalLine from "@ckeditor/ckeditor5-horizontal-line";
 export * as HtmlEmbed from "@ckeditor/ckeditor5-html-embed";
 export * as Image from "@ckeditor/ckeditor5-image";
 export * as Indent from "@ckeditor/ckeditor5-indent";
+export * as Language from "@ckeditor/ckeditor5-language";
 export * as Link from "@ckeditor/ckeditor5-link";
 export * as List from "@ckeditor/ckeditor5-list";
 export * as Mention from "@ckeditor/ckeditor5-mention";
@@ -33,6 +34,7 @@ export * as Utils from "@ckeditor/ckeditor5-utils";
 export * as Widget from "@ckeditor/ckeditor5-widget";
 
 export * as WoltlabAttachment from "./plugins/ckeditor5-woltlab-attachment/src";
+export * as WoltlabAutoLink from "./plugins/ckeditor5-woltlab-autolink/src";
 export * as WoltlabAutosave from "./plugins/ckeditor5-woltlab-autosave/src";
 export * as WoltlabBbcode from "./plugins/ckeditor5-woltlab-bbcode/src";
 export * as WoltlabBlockQuote from "./plugins/ckeditor5-woltlab-block-quote/src";

plugins/ckeditor5-woltlab-autolink/package.json

@@ -0,0 +1,6 @@
+{
+  "author": "WoltLab GmbH",
+  "license": "LGPL-2.1-or-later",
+  "main": "src/index.ts",
+  "private": true
+}

plugins/ckeditor5-woltlab-autolink/src/index.ts

@@ -0,0 +1,8 @@
+/**
+ * @author Alexander Ebert
+ * @copyright 2001-2024 WoltLab GmbH
+ * @license LGPL-2.1-or-later
+ * @since 6.0
+ */
+
+export { WoltlabAutoLink } from "./woltlabautolink";

plugins/ckeditor5-woltlab-autolink/src/woltlabautolink.ts

@@ -0,0 +1,60 @@
+/**
+ * Disables the AutoLink plugin during the normal editing to prevent incorrect
+ * transformations and to defer the link detection to the server side. Pasting
+ * a link while having an active text selection is selectively enabled.
+ *
+ * @author Alexander Ebert
+ * @copyright 2001-2024 WoltLab GmbH
+ * @license LGPL-2.1-or-later
+ * @since 6.0
+ */
+
+import { Plugin } from "@ckeditor/ckeditor5-core";
+import { AutoLink } from "@ckeditor/ckeditor5-link";
+
+export class WoltlabAutoLink extends Plugin {
+  readonly #key = "WoltlabAutoLink";
+
+  static get pluginName() {
+    return "WoltlabAutoLink" as const;
+  }
+
+  static get requires() {
+    return [AutoLink] as const;
+  }
+
+  init() {
+    if (!this.editor.plugins.has(AutoLink)) {
+      return;
+    }
+
+    // Unconditionally disable the `AutoLink` plugin which interferes with our
+    // own link detection and all creates potentially invalid links.
+    // See https://github.com/ckeditor/ckeditor5/issues/14497
+    const autoLink = this.editor.plugins.get(AutoLink);
+    autoLink.forceDisabled(this.#key);
+
+    // Replacing text with a link from clipboard is provided by the `AutoLink`
+    // plugin, requiring us to enable the plugin for the duration of the paste.
+    //
+    // AutoLink’s event listener uses the "high" priority.
+    const clipboardPipeline = this.editor.plugins.get("ClipboardPipeline");
+    clipboardPipeline.on(
+      "inputTransformation",
+      () => {
+        autoLink.clearForceDisabled(this.#key);
+      },
+      { priority: "highest" },
+    );
+
+    clipboardPipeline.on(
+      "inputTransformation",
+      () => {
+        autoLink.forceDisabled(this.#key);
+      },
+      { priority: "normal" },
+    );
+  }
+}
+
+export default WoltlabAutoLink;

plugins/ckeditor5-woltlab-metacode/src/woltlabmetacode.ts

@@ -76,12 +76,16 @@ export class WoltlabMetacode extends Plugin {
             this.#serializedAttributesToString(attributes);
           const openingTag = writer.createText(`[${name}${attributeString}]`);
           const closingTag = writer.createText(`[/${name}]`);
+          const parent = modelCursor.parent;
 
           // Check if the BBCode appears to be a block element.
           let isBlockElement = false;
           const ancestors = modelCursor.getAncestors();
           if (ancestors[ancestors.length - 1].name === "$root") {
             isBlockElement = true;
+          } else if (parent.name === "blockQuote") {
+            // Text nodes may only appear inside block nodes.
+            isBlockElement = true;
           } else {
             for (const child of viewItem.getChildren()) {
               if (child.is("containerElement")) {

release.sh

@@ -0,0 +1,5 @@
+#!/bin/sh
+npm run build
+cp dist/ckeditor5.bundle.js ../WCF/wcfsetup/install/files/js/3rdParty/ckeditor/
+cp dist/ckeditor5.css ../WCF/wcfsetup/install/files/style/
+cp dist/translations/*.js ../WCF/wcfsetup/install/files/js/3rdParty/ckeditor/translations/