Merge branch '6.2' into 6.3

Author: dtdesign

com.woltlab.wcf/package.xml

@@ -5,8 +5,8 @@
 		<packagedescription>Free CMS and web-framework, designed for awesome websites and communities.</packagedescription>
 		<packagedescription language="de">Freies CMS und Web-Framework, das eindrucksvolle Websites und Communities ermöglicht.</packagedescription>
 		<isapplication>1</isapplication>
-		<version>6.2.2</version>
-		<date>2026-03-09</date>
+		<version>6.2.3</version>
+		<date>2026-04-20</date>
 	</packageinformation>
 
 	<authorinformation>
@@ -98,9 +98,13 @@ tar cvf com.woltlab.wcf/files_pre_check.tar -C wcfsetup/install/files/ \
 		<instruction type="script">acp/update_com.woltlab.wcf_6.2_cleanUpDsStore.php</instruction>
 	</instructions>
 
-	<instructions type="update" fromversion="6.2.1">
+	<instructions type="update" fromversion="6.2.2">
 		<instruction type="acpTemplate">acptemplates_update.tar</instruction>
 		<instruction type="file">files_update.tar</instruction>
+		<instruction type="template">templates_update.tar</instruction>
 		<instruction type="language"/>
 	</instructions>
+	<instructions type="update" fromversion="6.2.3 dev 3">
+		<instruction type="file">files_update.tar</instruction>
+	</instructions>
 </package>

com.woltlab.wcf/templates/contentInteraction.tpl

@@ -52,7 +52,7 @@
 
 				{if $__contentInteractionDropdownItems}
 					<div class="contentInteractionDropdown dropdown jsOnly">
-						<button type="button" class="button small dropdownToggle" aria-label="{lang}wcf.global.button.more{/lang}">{icon name='ellipsis'}</button>
+						<button type="button" class="button small jsTooltip dropdownToggle" title="{lang}wcf.global.button.moreOptions{/lang}">{icon name='ellipsis'}</button>
 
 						<ul class="contentInteractionDropdownItems dropdownMenu">
 							{unsafe:$__contentInteractionDropdownItems}

package-lock.json

@@ -27,7 +27,7 @@
     "@types/sortablejs": "^1.15.9",
     "@types/supercluster": "^7.1.3",
     "@types/twitter-for-web": "0.0.6",
-    "@woltlab/editor": "git+https://github.com/WoltLab/editor.git#be0fc99f19cdcdbaac62d02f3d4928b10249689c",
+    "@woltlab/editor": "git+https://github.com/WoltLab/editor.git#504c659b5867178a63717113ea6fd1721ae2837a",
     "@woltlab/visual-dom-diff": "git+https://github.com/WoltLab/visual-dom-diff.git#e5b51fce3157d1eda310566fc1f86101341d1fea",
     "@woltlab/zxcvbn": "git+https://github.com/WoltLab/zxcvbn.git#5b582b24e437f1883ccad3c37dae7c3c5f1e7da3",
     "cropperjs": "2.1.0",
@@ -52,4 +52,4 @@
       ]
     }
   }
-}
+}

package.json

@@ -17,7 +17,7 @@ export async function generateThumbnails(fileID: number): Promise<ApiResult<Resp
 
   let response: Response;
   try {
-    response = (await prepareRequest(url).post().fetchAsJson()) as Response;
+    response = (await prepareRequest(url).post().disableLoadingIndicator().fetchAsJson()) as Response;
   } catch (e) {
     return apiResultFromError(e);
   }

ts/WoltLabSuite/Core/Api/Files/GenerateThumbnails.ts

@@ -14,6 +14,7 @@ export async function upload(
   objectType: string,
   context: string,
   exifBytes: Exif | null = null,
+  ignoreExifRotation: boolean = false,
 ): Promise<ApiResult<Response>> {
   const url = new URL(`${window.WSC_RPC_API_URL}core/files/upload`);
 
@@ -32,6 +33,7 @@ export async function upload(
     objectType,
     context,
     exifData,
+    ignoreExifRotation,
   };
 
   let response: Response;

ts/WoltLabSuite/Core/Api/Files/Upload.ts

@@ -38,7 +38,11 @@ export function apiResultFromValue<T>(value: T): ApiResult<T> {
   };
 }
 
-export async function apiResultFromError(error: Error): Promise<ApiResult<never>> {
+export async function apiResultFromError(error: unknown): Promise<ApiResult<never>> {
+  if (!(error instanceof Error)) {
+    throw new TypeError("Refusing to handle errors that are not an error.");
+  }
+
   if (error instanceof StatusNotOk) {
     return apiResultFromStatusNotOk(error);
   }

ts/WoltLabSuite/Core/Api/Result.ts

@@ -11,6 +11,7 @@ import {
   trackUploadProgress,
   updateFileInformation,
 } from "WoltLabSuite/Core/Component/File/Helper";
+import { confirmationFactory } from "../Confirmation";
 
 export type FileProcessorData = {
   attachmentID: number;
@@ -108,7 +109,9 @@ function fileInitializationCompleted(element: HTMLElement, file: WoltlabCoreFile
   }
 
   const listItem = document.createElement("li");
-  listItem.append(getDeleteAttachButton(fileId, (data as FileProcessorData).attachmentID, editor, element));
+  listItem.append(
+    getDeleteAttachButton(fileId, (data as FileProcessorData).attachmentID, editor, element, file.filename),
+  );
   dropdownMenu.append(listItem);
 
   const moreOptions = document.createElement("button");
@@ -137,21 +140,25 @@ function getDeleteAttachButton(
   attachmentId: number,
   editor: HTMLElement,
   element: HTMLElement,
+  filename: string | undefined,
 ): HTMLButtonElement {
   const button = document.createElement("button");
   button.type = "button";
   button.textContent = getPhrase("wcf.global.button.delete");
 
-  button.addEventListener("click", () => {
-    void deleteFile(fileId).then((result) => {
-      result.unwrap();
+  button.addEventListener("click", async () => {
+    const confirmationResult = await confirmationFactory().delete(filename);
+    if (!confirmationResult) {
+      return;
+    }
 
-      dispatchToCkeditor(editor).removeAttachment({
-        attachmentId,
-      });
+    (await deleteFile(fileId)).unwrap();
 
-      element.remove();
+    dispatchToCkeditor(editor).removeAttachment({
+      attachmentId,
     });
+
+    element.remove();
   });
 
   return button;

ts/WoltLabSuite/Core/Component/Attachment/Entry.ts

@@ -34,10 +34,10 @@ import type { WoltlabSmileyItem } from "@woltlab/editor/plugins/ckeditor5-woltla
 const instances = new WeakMap<HTMLElement, CKEditor>();
 
 class Ckeditor {
-  readonly #editor: CKEditor5.ClassicEditor.ClassicEditor;
+  readonly #editor: CKEditor5.ClassicEditor;
   readonly #features: Features;
 
-  constructor(editor: CKEditor5.ClassicEditor.ClassicEditor, features: Features) {
+  constructor(editor: CKEditor5.ClassicEditor, features: Features) {
     this.#editor = editor;
     this.#features = features;
   }
@@ -165,16 +165,16 @@ class Ckeditor {
     return this.#editor.sourceElement!;
   }
 
-  get focusTracker(): CKEditor5.Utils.FocusTracker {
+  get focusTracker(): CKEditor5.FocusTracker {
     return this.#editor.ui.focusTracker;
   }
 }
 
 function* findModelForRemoval(
-  element: CKEditor5.Engine.ModelElement,
+  element: CKEditor5.ModelElement,
   model: string,
   attributes: Record<string, string | number | boolean>,
-): Generator<CKEditor5.Engine.ModelElement> {
+): Generator<CKEditor5.ModelElement> {
   if (element.is("element", model)) {
     const isMatch = Object.entries(attributes).every(([key, value]) => {
       if (!element.hasAttribute(key)) {
@@ -221,9 +221,9 @@ function initializeConfiguration(
   features: Features,
   bbcodes: WoltlabBbcodeItem[],
   smileys: WoltlabSmileyItem[],
-  codeBlockLanguages: CKEditor5.CodeBlock.CodeBlockConfig["languages"],
+  codeBlockLanguages: CKEditor5.CodeBlockConfig["languages"],
   modules: typeof CKEditor5,
-): CKEditor5.Core.EditorConfig {
+): CKEditor5.EditorConfig {
   const configuration = createConfigurationFor(features);
   configuration.codeBlock = {
     languages: codeBlockLanguages,
@@ -242,7 +242,7 @@ function initializeConfiguration(
     modules,
   });
 
-  const toolbar = configuration.toolbar as CKEditor5.Core.ToolbarConfigItem[];
+  const toolbar = configuration.toolbar as CKEditor5.ToolbarConfigItem[];
   for (let { name } of bbcodes) {
     name = `woltlabBbcode_${name}`;
 
@@ -256,7 +256,7 @@ function initializeConfiguration(
   return configuration;
 }
 
-function hasToolbarButton(items: CKEditor5.Core.ToolbarConfigItem[], name: string): boolean {
+function hasToolbarButton(items: CKEditor5.ToolbarConfigItem[], name: string): boolean {
   for (const item of items) {
     if (typeof item === "string") {
       if (item === name) {
@@ -270,7 +270,7 @@ function hasToolbarButton(items: CKEditor5.Core.ToolbarConfigItem[], name: strin
   return false;
 }
 
-function notifyOfDataChanges(editor: CKEditor5.ClassicEditor.ClassicEditor, element: HTMLElement): void {
+function notifyOfDataChanges(editor: CKEditor5.ClassicEditor, element: HTMLElement): void {
   editor.model.document.on("change:data", () => {
     dispatchToCkeditor(element).changeData();
   });
@@ -281,7 +281,7 @@ export async function setupCkeditor(
   features: Features,
   bbcodes: WoltlabBbcodeItem[],
   smileys: WoltlabSmileyItem[],
-  codeBlockLanguages: CKEditor5.CodeBlock.CodeBlockConfig["languages"],
+  codeBlockLanguages: CKEditor5.CodeBlockConfig["languages"],
   licenseKey: string,
 ): Promise<CKEditor> {
   if (instances.has(element)) {

ts/WoltLabSuite/Core/Component/Ckeditor.ts

@@ -92,7 +92,7 @@ function saveDraft(element: HTMLElement, identifier: string, html: string): void
   }
 }
 
-export function setupRestoreDraft(editor: CKEditor5.ClassicEditor.ClassicEditor, identifier: string): void {
+export function setupRestoreDraft(editor: CKEditor5.ClassicEditor, identifier: string): void {
   let value: AutosavePayload | undefined = undefined;
 
   try {
@@ -230,7 +230,7 @@ function removeExpiredDrafts(): void {
 
 export function initializeAutosave(
   element: HTMLElement,
-  configuration: CKEditor5.Core.EditorConfig,
+  configuration: CKEditor5.EditorConfig,
   identifier: string,
 ): void {
   removeExpiredDrafts();