[BUGFIX] Allow adding multiple files / folders via element browser

This prevents the element browser from closing
as soon as one file or folder was added. This
restores previous behaviour, allowing the user
to add multiple references without having to
open the browser again and again.

Resolves: #103369
Releases: main, 12.4
Change-Id: Id57ebe3ed115c0929beb06fd7dd136fe0f08e415
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/83434
Reviewed-by: Jochen Roth <rothjochen@gmail.com>
Tested-by: Andreas Kienast <a.fernandez@scripting-base.de>
Reviewed-by: Andreas Kienast <a.fernandez@scripting-base.de>
Tested-by: Oliver Bartsch <bo@cedev.de>
Tested-by: core-ci <typo3@b13.com>
Tested-by: Jochen Roth <rothjochen@gmail.com>
Reviewed-by: Oliver Bartsch <bo@cedev.de>

Build/Sources/TypeScript/filelist/browse-files.ts

@@ -29,6 +29,7 @@ class BrowseFiles {
     new RegularEvent(FileListActionEvent.primary, (event: CustomEvent): void => {
       event.preventDefault();
       const detail: FileListActionDetail = event.detail;
+      detail.originalAction = FileListActionEvent.primary;
       detail.action = FileListActionEvent.select;
       document.dispatchEvent(new CustomEvent(FileListActionEvent.select, { detail: detail }));
     }).bindTo(document);
@@ -38,7 +39,7 @@ class BrowseFiles {
       const detail: FileListActionDetail = event.detail;
       const resource = detail.resources[0];
       if (resource.type === 'file') {
-        BrowseFiles.insertElement(resource.name, resource.uid, true);
+        BrowseFiles.insertElement(resource.name, resource.uid, detail.originalAction === FileListActionEvent.primary);
       }
       if (resource.type === 'folder') {
         this.loadContent(resource);

Build/Sources/TypeScript/filelist/browse-folders.ts

@@ -29,6 +29,7 @@ class BrowseFolders {
     new RegularEvent(FileListActionEvent.primary, (event: CustomEvent): void => {
       event.preventDefault();
       const detail: FileListActionDetail = event.detail;
+      detail.originalAction = FileListActionEvent.primary;
       detail.action = FileListActionEvent.select;
       document.dispatchEvent(new CustomEvent(FileListActionEvent.select, { detail: detail }));
     }).bindTo(document);
@@ -38,7 +39,7 @@ class BrowseFolders {
       const detail: FileListActionDetail = event.detail;
       const resource = detail.resources[0];
       if (resource.type === 'folder') {
-        BrowseFolders.insertElement(resource.identifier, true);
+        BrowseFolders.insertElement(resource.identifier, detail.originalAction === FileListActionEvent.primary);
       }
     }).bindTo(document);
 

Build/Sources/TypeScript/filelist/context-menu-actions.ts

@@ -54,7 +54,8 @@ class ContextMenuActions {
         trigger: null,
         action: FileListActionEvent.rename,
         resources: [resource],
-        url: null
+        url: null,
+        originalAction: null
       };
       document.dispatchEvent(new CustomEvent(FileListActionEvent.rename, { detail: detail }));
     })();

Build/Sources/TypeScript/filelist/file-list-actions.ts

@@ -20,6 +20,7 @@ export interface FileListActionDetail {
   resources: [ResourceInterface, ...ResourceInterface[]];
   trigger: HTMLElement | null;
   url: string | null;
+  originalAction: string | null;
 }
 
 export enum FileListActionEvent {
@@ -120,6 +121,7 @@ class FileListActions {
       action: action,
       resources: [resource],
       url: target.dataset.filelistActionUrl ?? null,
+      originalAction: null
     };
     return detail;
   }