fix(view): update sidebar list based on filtered tasks in two-column views

Author: Quorafind

src/components/features/fluent/managers/FluentComponentManager.ts

@@ -644,22 +644,28 @@ export class FluentComponentManager extends Component {
 
 			// Set tasks on the component
 			if (typeof targetComponent.setTasks === "function") {
-				// Special handling for components that need only all tasks (single parameter)
-				// Review and tags views need all tasks to build their indices
-				if (viewId === "review" || viewId === "tags") {
+				// Special handling for components that need filtered + all tasks
+				// Tags view: uses filtered tasks for tag index (left sidebar), all tasks for tree view lookup
+				if (viewId === "tags") {
+					console.log(
+						`[FluentComponent] Calling setTasks for ${viewId} with FILTERED tasks (${filteredTasks.length}) and ALL tasks (${tasks.length})`,
+					);
+					targetComponent.setTasks(filteredTasks, tasks);
+				} else if (viewId === "review") {
+					// Review view still needs all tasks
 					console.log(
 						`[FluentComponent] Calling setTasks for ${viewId} with ALL tasks:`,
 						tasks.length,
 					);
 					targetComponent.setTasks(tasks);
 				} else if (viewId === "projects" && !project) {
-					// Projects overview mode: pass ALL tasks to build project index
-					// and FILTERED tasks to apply filter to project task lists
-					// This ensures: left sidebar shows all projects, right panel shows filtered tasks
+					// Projects overview mode: standardized semantics
+					// First param: filtered tasks (for building sidebar project index)
+					// Second param: all tasks (for tree view parent-child lookup)
 					console.log(
-						`[FluentComponent] Calling setTasks for projects with ALL tasks (${tasks.length}) and FILTERED tasks (${filteredTasks.length})`,
+						`[FluentComponent] Calling setTasks for projects with FILTERED tasks (${filteredTasks.length}) and ALL tasks (${tasks.length})`,
 					);
-					targetComponent.setTasks(tasks, filteredTasks);
+					targetComponent.setTasks(filteredTasks, tasks);
 				} else {
 					// Use filtered tasks
 					let filteredTasksLocal = [...filteredTasks];
@@ -890,7 +896,10 @@ export class FluentComponentManager extends Component {
 		if (target?.setTasks) {
 			if (viewId === "projects" || this.isContentBasedView(viewId)) {
 				target.setTasks(filteredTasks, tasks, true);
-			} else if (viewId === "review" || viewId === "tags") {
+			} else if (viewId === "tags") {
+				// Tags view: filtered tasks for tag index, all tasks for tree view lookup
+				target.setTasks(filteredTasks, tasks);
+			} else if (viewId === "review") {
 				target.setTasks(tasks);
 			} else {
 				target.setTasks(filteredTasks);

src/components/features/task/view/ProjectViewComponent.ts

@@ -43,13 +43,14 @@ export class ProjectViewComponent extends TwoColumnViewBase<string> {
 
 	/**
 	 * 重写基类中的索引构建方法，为项目创建索引
+	 * 使用 sourceTasks（筛选后的任务）构建索引，确保左侧栏只显示相关项目
 	 */
 	protected buildItemsIndex(): void {
 		// 清除现有索引
 		this.allProjectsMap.clear();
 
-		// 为每个任务的项目建立索引，使用 getEffectiveProject 统一获取项目名
-		this.allTasks.forEach((task) => {
+		// 使用 sourceTasks（筛选后的任务）为每个任务的项目建立索引
+		this.sourceTasks.forEach((task) => {
 			const projectName = getEffectiveProject(task);
 			if (projectName) {
 				if (!this.allProjectsMap.has(projectName)) {
@@ -59,9 +60,12 @@ export class ProjectViewComponent extends TwoColumnViewBase<string> {
 			}
 		});
 
-		// 构建项目树结构
+		// 构建项目树结构（同样使用 sourceTasks）
 		const separator = this.plugin.settings.projectPathSeparator || "/";
-		this.projectTree = buildProjectTreeFromTasks(this.allTasks, separator);
+		this.projectTree = buildProjectTreeFromTasks(
+			this.sourceTasks,
+			separator,
+		);
 
 		// 更新项目计数
 		if (this.countEl) {
@@ -244,11 +248,12 @@ export class ProjectViewComponent extends TwoColumnViewBase<string> {
 		}
 
 		// 根据视图模式使用不同的筛选逻辑
+		// 使用 sourceTasks 进行筛选，保持外部过滤状态
 		if (this.viewMode === "tree" && this.projectTree) {
 			// 树状模式：使用包含式筛选（选父含子）
 			const separator = this.plugin.settings.projectPathSeparator || "/";
 			this.filteredTasks = filterTasksByProjectPaths(
-				this.allTasks,
+				this.sourceTasks,
 				this.selectedItems.items,
 				separator,
 			);
@@ -265,8 +270,8 @@ export class ProjectViewComponent extends TwoColumnViewBase<string> {
 				}
 			});
 
-			// 将任务ID转换为实际任务对象
-			this.filteredTasks = this.allTasks.filter((task) =>
+			// 将任务ID转换为实际任务对象（从 sourceTasks 中筛选）
+			this.filteredTasks = this.sourceTasks.filter((task) =>
 				resultTaskIds.has(task.id),
 			);
 		}
@@ -358,6 +363,9 @@ export class ProjectViewComponent extends TwoColumnViewBase<string> {
 	 * 更新任务
 	 */
 	public updateTask(updatedTask: Task): void {
+		// 更新 allTasksMap
+		this.allTasksMap.set(updatedTask.id, updatedTask);
+
 		let needsFullRefresh = false;
 		const taskIndex = this.allTasks.findIndex(
 			(t) => t.id === updatedTask.id,
@@ -376,6 +384,14 @@ export class ProjectViewComponent extends TwoColumnViewBase<string> {
 			needsFullRefresh = true;
 		}
 
+		// 同时更新 sourceTasks（如果任务存在于其中）
+		const sourceIndex = this.sourceTasks.findIndex(
+			(t) => t.id === updatedTask.id,
+		);
+		if (sourceIndex !== -1) {
+			this.sourceTasks[sourceIndex] = updatedTask;
+		}
+
 		// 如果项目更改或任务是新的，重建索引并完全刷新UI
 		if (needsFullRefresh) {
 			this.buildItemsIndex();

src/components/features/task/view/TagViewComponent.ts

@@ -23,7 +23,7 @@ export class TagViewComponent extends TwoColumnViewBase<string> {
 	constructor(
 		parentEl: HTMLElement,
 		app: App,
-		plugin: TaskProgressBarPlugin
+		plugin: TaskProgressBarPlugin,
 	) {
 		// 配置基类需要的参数
 		const config: TwoColumnViewConfig = {
@@ -45,31 +45,32 @@ export class TagViewComponent extends TwoColumnViewBase<string> {
 	 * @returns Normalized tag with # prefix
 	 */
 	private normalizeTag(tag: string): string {
-		if (typeof tag !== 'string') {
+		if (typeof tag !== "string") {
 			return tag;
 		}
-		
+
 		// Trim whitespace
 		const trimmed = tag.trim();
-		
+
 		// If empty or already starts with #, return as is
-		if (!trimmed || trimmed.startsWith('#')) {
+		if (!trimmed || trimmed.startsWith("#")) {
 			return trimmed;
 		}
-		
+
 		// Add # prefix
 		return `#${trimmed}`;
 	}
 
 	/**
 	 * 重写基类中的索引构建方法，为标签创建索引
+	 * 使用 sourceTasks（筛选后的任务）构建索引，确保左侧栏只显示相关标签
 	 */
 	protected buildItemsIndex(): void {
 		// 清除已有索引
 		this.allTagsMap.clear();
 
-		// 为每个任务的标签建立索引
-		this.allTasks.forEach((task) => {
+		// 使用 sourceTasks（筛选后的任务）为每个任务的标签建立索引
+		this.sourceTasks.forEach((task) => {
 			if (task.metadata.tags && task.metadata.tags.length > 0) {
 				task.metadata.tags.forEach((tag) => {
 					// 跳过非字符串类型的标签
@@ -139,7 +140,7 @@ export class TagViewComponent extends TwoColumnViewBase<string> {
 	private renderTagHierarchy(
 		node: Record<string, any>,
 		parentEl: HTMLElement,
-		level: number
+		level: number,
 	) {
 		// 按字母排序键，但排除元数据属性
 		const keys = Object.keys(node)
@@ -212,7 +213,7 @@ export class TagViewComponent extends TwoColumnViewBase<string> {
 				this.renderTagHierarchy(
 					childNode,
 					childrenContainer,
-					level + 1
+					level + 1,
 				);
 			}
 		});
@@ -260,9 +261,9 @@ export class TagViewComponent extends TwoColumnViewBase<string> {
 				set.forEach((id) => resultTaskIds.add(id));
 			});
 
-			// 将任务ID转换为实际任务对象
-			this.filteredTasks = this.allTasks.filter((task) =>
-				resultTaskIds.has(task.id)
+			// 将任务ID转换为实际任务对象（从 sourceTasks 中筛选，保持外部过滤状态）
+			this.filteredTasks = this.sourceTasks.filter((task) =>
+				resultTaskIds.has(task.id),
 			);
 
 			// 按优先级和截止日期排序
@@ -313,7 +314,7 @@ export class TagViewComponent extends TwoColumnViewBase<string> {
 					(taskTag) =>
 						// 跳过非字符串类型的标签
 						typeof taskTag === "string" &&
-						(taskTag === tag || taskTag.startsWith(tag + "/"))
+						(taskTag === tag || taskTag.startsWith(tag + "/")),
 				);
 			});
 
@@ -346,7 +347,7 @@ export class TagViewComponent extends TwoColumnViewBase<string> {
 		let title = t(this.config.rightColumnDefaultTitle);
 		if (this.selectedItems.items.length > 1) {
 			title = `${this.selectedItems.items.length} ${t(
-				this.config.multiSelectText
+				this.config.multiSelectText,
 			)}`;
 		}
 		const countText = `${this.filteredTasks.length} ${t("tasks")}`;
@@ -364,7 +365,7 @@ export class TagViewComponent extends TwoColumnViewBase<string> {
 			const toggleEl = headerEl.createDiv({ cls: "section-toggle" });
 			setIcon(
 				toggleEl,
-				section.isExpanded ? "chevron-down" : "chevron-right"
+				section.isExpanded ? "chevron-down" : "chevron-right",
 			);
 			const titleEl = headerEl.createDiv({ cls: "section-title" });
 			titleEl.setText(`#${section.tag.replace("#", "")}`);
@@ -382,7 +383,7 @@ export class TagViewComponent extends TwoColumnViewBase<string> {
 				taskListEl,
 				this.plugin,
 				this.app,
-				this.config.rendererContext
+				this.config.rendererContext,
 			);
 			section.renderer.onTaskSelected = this.onTaskSelected;
 			section.renderer.onTaskCompleted = this.onTaskCompleted;
@@ -393,15 +394,15 @@ export class TagViewComponent extends TwoColumnViewBase<string> {
 				section.tasks,
 				this.isTreeView,
 				this.allTasksMap,
-				t("No tasks found for this tag.")
+				t("No tasks found for this tag."),
 			);
 
 			// 注册切换事件
 			this.registerDomEvent(headerEl, "click", () => {
 				section.isExpanded = !section.isExpanded;
 				setIcon(
 					toggleEl,
-					section.isExpanded ? "chevron-down" : "chevron-right"
+					section.isExpanded ? "chevron-down" : "chevron-right",
 				);
 				section.isExpanded ? taskListEl.show() : taskListEl.hide();
 			});
@@ -446,9 +447,12 @@ export class TagViewComponent extends TwoColumnViewBase<string> {
 	 * 更新任务
 	 */
 	public updateTask(updatedTask: Task): void {
+		// 更新 allTasksMap
+		this.allTasksMap.set(updatedTask.id, updatedTask);
+
 		let needsFullRefresh = false;
 		const taskIndex = this.allTasks.findIndex(
-			(t) => t.id === updatedTask.id
+			(t) => t.id === updatedTask.id,
 		);
 
 		if (taskIndex !== -1) {
@@ -469,6 +473,14 @@ export class TagViewComponent extends TwoColumnViewBase<string> {
 			needsFullRefresh = true; // 新任务，需要完全刷新
 		}
 
+		// 同时更新 sourceTasks（如果任务存在于其中）
+		const sourceIndex = this.sourceTasks.findIndex(
+			(t) => t.id === updatedTask.id,
+		);
+		if (sourceIndex !== -1) {
+			this.sourceTasks[sourceIndex] = updatedTask;
+		}
+
 		// 如果标签变化或任务是新的，重建索引并完全刷新UI
 		if (needsFullRefresh) {
 			this.buildItemsIndex();
@@ -477,7 +489,7 @@ export class TagViewComponent extends TwoColumnViewBase<string> {
 		} else {
 			// 否则，仅更新过滤列表中的任务
 			const filteredIndex = this.filteredTasks.findIndex(
-				(t) => t.id === updatedTask.id
+				(t) => t.id === updatedTask.id,
 			);
 			if (filteredIndex !== -1) {
 				this.filteredTasks[filteredIndex] = updatedTask;
@@ -495,13 +507,13 @@ export class TagViewComponent extends TwoColumnViewBase<string> {
 									// 跳过非字符串类型的标签
 									typeof taskTag === "string" &&
 									(taskTag === section.tag ||
-										taskTag.startsWith(section.tag + "/"))
+										taskTag.startsWith(section.tag + "/")),
 							)
 						) {
 							// 检查任务是否实际存在于此分区的列表中
 							if (
 								section.tasks.some(
-									(t) => t.id === updatedTask.id
+									(t) => t.id === updatedTask.id,
 								)
 							) {
 								section.renderer?.updateTask(updatedTask);