From fd9cf3b4257767733da8d386c67562f3651ca6b6 Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland73@gmail.com>
Date: Sat, 4 Apr 2026 08:52:55 +0200
Subject: [PATCH 1/2] Fixes "files/folders/files or folders" selections for the
 various media picker components, re-allowing folder selection from a media
 picker.

---
 .../media/media/components/input-media/input-media.context.ts   | 2 +-
 .../media/media/components/input-media/input-media.element.ts   | 2 +-
 .../link-picker-modal/link-picker-modal.element.ts              | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/components/input-media/input-media.context.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/components/input-media/input-media.context.ts
index b39ec810ba44..ddeab07cd284 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/media/media/components/input-media/input-media.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/components/input-media/input-media.context.ts
@@ -84,7 +84,7 @@ export class UmbMediaPickerInputContext extends UmbPickerInputContext<
 	#pickableFilter = (
 		item: UmbMediaItemModel | UmbMediaTreeItemModel,
 		allowedContentTypes?: Array<{ unique: string; entityType: UmbMediaTypeEntityType }>,
-		folderFilter: UmbMediaPickerFolderFilter = UmbMediaPickerFolderFilter.FILES_ONLY,
+		folderFilter: UmbMediaPickerFolderFilter = UmbMediaPickerFolderFilter.FILES_AND_FOLDERS,
 	): boolean => {
 		// Check if the user has no access to this item (tree items only)
 		if (isMediaTreeItem(item) && item.noAccess) {
diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/components/input-media/input-media.element.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/components/input-media/input-media.element.ts
index 29e78c3fff01..1589fb553074 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/media/media/components/input-media/input-media.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/components/input-media/input-media.element.ts
@@ -117,7 +117,7 @@ export class UmbInputMediaElement extends UmbFormControlMixin<string | undefined
 	includeTrashed = false;
 
 	@property({ type: String, attribute: 'folder-filter' })
-	folderFilter: UmbMediaPickerFolderFilter = UmbMediaPickerFolderFilter.FILES_ONLY;
+	folderFilter: UmbMediaPickerFolderFilter = UmbMediaPickerFolderFilter.FILES_AND_FOLDERS;
 
 	@property({ type: Object, attribute: false })
 	startNode?: UmbTreeStartNode;
diff --git a/src/Umbraco.Web.UI.Client/src/packages/multi-url-picker/link-picker-modal/link-picker-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/multi-url-picker/link-picker-modal/link-picker-modal.element.ts
index ccddfbffd3c8..d3d81e2a6409 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/multi-url-picker/link-picker-modal/link-picker-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/multi-url-picker/link-picker-modal/link-picker-modal.element.ts
@@ -406,6 +406,7 @@ export class UmbLinkPickerModalElement extends UmbModalBaseElement<UmbLinkPicker
 				<umb-input-media
 					slot="editor"
 					.max=${1}
+					folder-filter="filesOnly"
 					.value=${this.value.link.unique && this.value.link.type === 'media' ? this.value.link.unique : ''}
 					@change=${(e: UmbInputPickerEvent) => this.#onPickerSelection(e, 'media')}></umb-input-media>
 			</umb-property-layout>

From 8309a9e9a1661813656120885787deb337208445 Mon Sep 17 00:00:00 2001
From: kjac <kja@umbraco.dk>
Date: Tue, 7 Apr 2026 08:45:40 +0200
Subject: [PATCH 2/2] Import and use enim instead of hardcoded enum value

---
 .../link-picker-modal/link-picker-modal.element.ts            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/multi-url-picker/link-picker-modal/link-picker-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/multi-url-picker/link-picker-modal/link-picker-modal.element.ts
index d3d81e2a6409..849f225b30d5 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/multi-url-picker/link-picker-modal/link-picker-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/multi-url-picker/link-picker-modal/link-picker-modal.element.ts
@@ -19,7 +19,7 @@ import {
 	UmbDocumentUrlsDataResolver,
 	type UmbDocumentItemModel,
 } from '@umbraco-cms/backoffice/document';
-import { UmbMediaItemRepository, UmbMediaUrlRepository } from '@umbraco-cms/backoffice/media';
+import { UmbMediaItemRepository, UmbMediaPickerFolderFilter, UmbMediaUrlRepository } from '@umbraco-cms/backoffice/media';
 import type { UmbInputMediaElement } from '@umbraco-cms/backoffice/media';
 import type { UUIBooleanInputEvent, UUIInputEvent } from '@umbraco-cms/backoffice/external/uui';
 import { umbFocus } from '@umbraco-cms/backoffice/lit-element';
@@ -406,7 +406,7 @@ export class UmbLinkPickerModalElement extends UmbModalBaseElement<UmbLinkPicker
 				<umb-input-media
 					slot="editor"
 					.max=${1}
-					folder-filter="filesOnly"
+					folder-filter=${UmbMediaPickerFolderFilter.FILES_ONLY}
 					.value=${this.value.link.unique && this.value.link.type === 'media' ? this.value.link.unique : ''}
 					@change=${(e: UmbInputPickerEvent) => this.#onPickerSelection(e, 'media')}></umb-input-media>
 			</umb-property-layout>