From a6a09520f68a18b5b41399542834bf080385453f Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <madsr@hey.com>
Date: Wed, 20 Mar 2024 13:08:07 +0100
Subject: [PATCH] dont set tree item to active if it is selectable

---
 .../tree-item/tree-item-base/tree-item-context-base.ts   | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item/tree-item-base/tree-item-context-base.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item/tree-item-base/tree-item-context-base.ts
index 82d17aba9d..76f46b3fc3 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item/tree-item-base/tree-item-context-base.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item/tree-item-base/tree-item-context-base.ts
@@ -252,6 +252,7 @@ export abstract class UmbTreeItemContextBase<TreeItemType extends UmbTreeItemMod
 				if (value === true) {
 					const isSelectable = this.treeContext?.selectableFilter?.(this.getTreeItem()!) ?? true;
 					this.#isSelectable.setValue(isSelectable);
+					this.#checkIsActive();
 				}
 			},
 			'observeIsSelectable',
@@ -355,6 +356,14 @@ export abstract class UmbTreeItemContextBase<TreeItemType extends UmbTreeItemMod
 	#debouncedCheckIsActive = debounce(() => this.#checkIsActive(), 100);
 
 	#checkIsActive() {
+		// don't set the active state if the item is selectable
+		const isSelectable = this.#isSelectable.getValue();
+
+		if (isSelectable) {
+			this.#isActive.setValue(false);
+			return;
+		}
+
 		const path = this.#path.getValue();
 		const location = window.location.pathname;
 		const isActive = location.includes(path);