From 04753c61960ece9cd83fa0111fba113038a0d6b1 Mon Sep 17 00:00:00 2001
From: grml <grml@grml.grml>
Date: Mon, 8 Jun 2026 00:53:00 +0800
Subject: [PATCH 1/2] fix: corrected handling and resolution of theme colors
 for tab instead of using the hardcoded items

---
 src/components/TabSystem/TabSystem.vue | 12 ++++++++++--
 src/libs/project/BedrockProject.ts     | 19 +++++++++++++++++++
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/src/components/TabSystem/TabSystem.vue b/src/components/TabSystem/TabSystem.vue
index 7aea14d71..fdd820868 100644
--- a/src/components/TabSystem/TabSystem.vue
+++ b/src/components/TabSystem/TabSystem.vue
@@ -55,6 +55,13 @@ const contextMenu: Ref<typeof FreeContextMenu | null> = ref(null)
 const contextMenuTab: ShallowRef<Tab | null> = shallowRef(null)
 const contextMenuTabActions: Ref<string[]> = ref([])
 
+function tabColor(tab: Tab): string {
+	if (!(tab instanceof FileTab)) return 'text'
+	if (!(ProjectManager.currentProject instanceof BedrockProject)) return 'text'
+
+	return ProjectManager.currentProject.getPackFromPath(tab.path)?.color ?? 'text'
+}
+
 function getTabFromTarget(target: HTMLElement): HTMLElement | null {
 	if (target.dataset.tab === 'tab') return target
 
@@ -204,8 +211,9 @@ function dragEnd(event: DragEvent) {
 					<div class="relative">
 						<div
 							v-if="tab instanceof FileTab && tab.modified.value"
-							class="bg-behaviorPack border-2 border-[var(--border-color)] w-3 h-3 rounded-full absolute right-[-0.25rem] top-1"
+							class="border-2 border-[var(--border-color)] w-3 h-3 rounded-full absolute right-[-0.25rem] top-1"
 							:style="{
+								backgroundColor: `var(--theme-color-${tabColor(tab)})`,
 								'--border-color':
 									instance.selectedTab.value == tab
 										? 'var(--theme-color-backgroundSecondary)'
@@ -213,7 +221,7 @@ function dragEnd(event: DragEvent) {
 							}"
 						></div>
 
-						<Icon v-if="tab.icon" :icon="tab.icon.value ?? 'help'" class="text-base text-behaviorPack" />
+						<Icon v-if="tab.icon" :icon="tab.icon.value ?? 'help'" :color="tabColor(tab)" class="text-base" />
 					</div>
 
 					<p
diff --git a/src/libs/project/BedrockProject.ts b/src/libs/project/BedrockProject.ts
index 48877b161..a37d99fa3 100644
--- a/src/libs/project/BedrockProject.ts
+++ b/src/libs/project/BedrockProject.ts
@@ -82,4 +82,23 @@ export class BedrockProject extends Project {
 	public async build() {
 		await this.dashService.build()
 	}
+
+	/**
+	 * Resolves the pack a file path belongs to. Uses the longest matching pack root so nested packs resolve correctly.
+	 */
+	public getPackFromPath(path: string): IPackType | null {
+		let bestPackId: string | null = null
+		let bestLength = -1
+
+		for (const [packId, packPath] of Object.entries(this.packs)) {
+			if ((path === packPath || path.startsWith(packPath + '/')) && packPath.length > bestLength) {
+				bestPackId = packId
+				bestLength = packPath.length
+			}
+		}
+
+		if (bestPackId === null) return null
+
+		return this.packDefinitions.find((packDefinition) => packDefinition.id === bestPackId) ?? null
+	}
 }

From cfefcd53b861f377020927efb1ddba7a5cef594f Mon Sep 17 00:00:00 2001
From: Outer Cloud <outercloudstudio@gmail.com>
Date: Sat, 27 Jun 2026 19:46:10 -0400
Subject: [PATCH 2/2] cleanup tab coloring

---
 src/components/TabSystem/TabSystem.vue | 38 +++++++++++++++++++-------
 src/libs/project/BedrockProject.ts     | 19 -------------
 src/libs/project/Project.ts            | 12 ++++++++
 3 files changed, 40 insertions(+), 29 deletions(-)

diff --git a/src/components/TabSystem/TabSystem.vue b/src/components/TabSystem/TabSystem.vue
index fdd820868..83806bd16 100644
--- a/src/components/TabSystem/TabSystem.vue
+++ b/src/components/TabSystem/TabSystem.vue
@@ -13,12 +13,13 @@ import { FileTab } from './FileTab'
 import { Settings } from '@/libs/settings/Settings'
 import { TabManager } from './TabManager'
 import { computed, ComputedRef, Ref, ref, ShallowRef, shallowRef } from 'vue'
-import { ProjectManager } from '@/libs/project/ProjectManager'
+import { ProjectManager, useCurrentProject } from '@/libs/project/ProjectManager'
 import { BedrockProject } from '@/libs/project/BedrockProject'
 import { useTabActions } from '@/libs/actions/tab/TabActionManager'
 import { ActionManager } from '@/libs/actions/ActionManager'
 import { useTranslate } from '@/libs/locales/Locales'
 import { Tab } from './Tab'
+import { IPackType } from 'mc-project-core'
 
 const props = defineProps({
 	instance: {
@@ -55,13 +56,6 @@ const contextMenu: Ref<typeof FreeContextMenu | null> = ref(null)
 const contextMenuTab: ShallowRef<Tab | null> = shallowRef(null)
 const contextMenuTabActions: Ref<string[]> = ref([])
 
-function tabColor(tab: Tab): string {
-	if (!(tab instanceof FileTab)) return 'text'
-	if (!(ProjectManager.currentProject instanceof BedrockProject)) return 'text'
-
-	return ProjectManager.currentProject.getPackFromPath(tab.path)?.color ?? 'text'
-}
-
 function getTabFromTarget(target: HTMLElement): HTMLElement | null {
 	if (target.dataset.tab === 'tab') return target
 
@@ -144,6 +138,30 @@ function dragEnd(event: DragEvent) {
 	TabSystem.draggingTab.value = null
 	dragLevel = 0
 }
+
+const currentProject = useCurrentProject()
+
+const currentProjectPackDefinitions: Ref<IPackType[]> = computed(() => {
+	if (!currentProject.value) return []
+	if (!(currentProject.value instanceof BedrockProject)) return []
+
+	return currentProject.value.packDefinitions.filter((pack: IPackType) => {
+		if (!currentProject.value) return false
+		if (!currentProject.value.config) return false
+
+		return Object.keys(currentProject.value.config.packs).includes(pack.id)
+	})
+})
+
+function useTabColor(path: string | null) {
+    return computed(() => {
+        if(!currentProject.value) return 'text'
+
+        const packId = currentProject.value.getPackFromPath(path)
+
+        return currentProjectPackDefinitions.value.find(pack => pack.id === packId)?.color ?? 'text'
+    })
+}
 </script>
 
 <template>
@@ -213,7 +231,7 @@ function dragEnd(event: DragEvent) {
 							v-if="tab instanceof FileTab && tab.modified.value"
 							class="border-2 border-[var(--border-color)] w-3 h-3 rounded-full absolute right-[-0.25rem] top-1"
 							:style="{
-								backgroundColor: `var(--theme-color-${tabColor(tab)})`,
+								backgroundColor: `var(--theme-color-${useTabColor(tab.path).value})`,
 								'--border-color':
 									instance.selectedTab.value == tab
 										? 'var(--theme-color-backgroundSecondary)'
@@ -221,7 +239,7 @@ function dragEnd(event: DragEvent) {
 							}"
 						></div>
 
-						<Icon v-if="tab.icon" :icon="tab.icon.value ?? 'help'" :color="tabColor(tab)" class="text-base" />
+						<Icon v-if="tab.icon" :icon="tab.icon.value ?? 'help'" :color="useTabColor(tab instanceof FileTab ? tab.path : null).value" class="text-base" />
 					</div>
 
 					<p
diff --git a/src/libs/project/BedrockProject.ts b/src/libs/project/BedrockProject.ts
index a37d99fa3..48877b161 100644
--- a/src/libs/project/BedrockProject.ts
+++ b/src/libs/project/BedrockProject.ts
@@ -82,23 +82,4 @@ export class BedrockProject extends Project {
 	public async build() {
 		await this.dashService.build()
 	}
-
-	/**
-	 * Resolves the pack a file path belongs to. Uses the longest matching pack root so nested packs resolve correctly.
-	 */
-	public getPackFromPath(path: string): IPackType | null {
-		let bestPackId: string | null = null
-		let bestLength = -1
-
-		for (const [packId, packPath] of Object.entries(this.packs)) {
-			if ((path === packPath || path.startsWith(packPath + '/')) && packPath.length > bestLength) {
-				bestPackId = packId
-				bestLength = packPath.length
-			}
-		}
-
-		if (bestPackId === null) return null
-
-		return this.packDefinitions.find((packDefinition) => packDefinition.id === bestPackId) ?? null
-	}
 }
diff --git a/src/libs/project/Project.ts b/src/libs/project/Project.ts
index b548fe299..2cb5ca782 100644
--- a/src/libs/project/Project.ts
+++ b/src/libs/project/Project.ts
@@ -94,6 +94,18 @@ export class Project implements AsyncDisposable {
 		return join(this.path ?? '', (<any>this.config.packs)[packId], path)
 	}
 
+    public getPackFromPath(path: string | null): string | null {
+        if(!path) return null
+
+		for(const pack of Object.keys(this.packs)) {
+            const packPath = this.packs[pack]
+            
+            if(path.startsWith(packPath)) return pack
+        }
+
+        return null
+	}
+
 	public async saveTabManagerState(state: any) {
 		await set(`tabManagerState-${this.name}`, JSON.stringify(state))
 	}