From af330f983ec38a49969283073a534eb271c3b199 Mon Sep 17 00:00:00 2001
From: Ariver <shanghai3168@gmail.com>
Date: Tue, 19 May 2026 01:45:21 +0800
Subject: [PATCH] Fix icon grid identity reset rendering

---
 AppStore_Submission.md     |    1 +
 Apptag/AppGridItem.swift   |    2 +-
 Apptag/ContentView.swift   |    4 ++--
 AppStore_TODO_7.3.5_744.md |    2 +-
 CHANGELOG.md               |    1 +
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/AppStore_Submission.md b/AppStore_Submission.md
index 6676582..f0f4b6c 100644
--- a/AppStore_Submission.md
+++ b/AppStore_Submission.md
@@ -203,6 +203,7 @@
 - Improved tag-list reordering feedback by replacing persistent wiggle animation with clearer opacity-based drag state
 - Fixed the Smart Start apply confirmation in Settings so the warning stays above the Settings window with clearer readable controls
 - Fixed right-side tag navigation getting stuck in a dimmed drag visual state after a tag click
+- Fixed an icon grid rendering issue that could make many app icons disappear after drag-state resets
 - Version updated to 7.3.5, Build updated to 744
 ```
 
diff --git a/AppStore_TODO_7.3.5_744.md b/AppStore_TODO_7.3.5_744.md
index b8ecf55..3dbb0e2 100644
--- a/AppStore_TODO_7.3.5_744.md
+++ b/AppStore_TODO_7.3.5_744.md
@@ -53,7 +53,7 @@
 - 退出旧版 TagLauncher,再启动新版。
 - 如果菜单栏图标不可见,检查 Thaw / Bartender / Ice / Hidden Bar / Dozer 等菜单栏管理工具是否隐藏了 TagLauncher。
 - 确认 `⌥⇧空格` 能呼出应用列表。
-- 确认主列表 Flat / Colored Grid / Container 模式均能显示。
+- 确认主列表 Flat / Colored Grid / Container / Grid 模式均能完整显示图标。
 - 确认设置按钮和编辑按钮都能从浮层右上角打开。
 - 确认设置页语言切换正常。
 - 确认标签拖拽排序、右侧标签点击切换、App 拖入标签、拖到未分类确认面板正常。
diff --git a/Apptag/AppGridItem.swift b/Apptag/AppGridItem.swift
index 5a9a61b..72dc1fb 100644
--- a/Apptag/AppGridItem.swift
+++ b/Apptag/AppGridItem.swift
@@ -98,7 +98,7 @@
         }
         .opacity(dragModeActive ? 0.92 : 1)
         .animation(.easeOut(duration: 0.08), value: dragModeActive)
-        .id(dragResetToken)
+        .id("\(itemID)|reset-\(dragResetToken)")
         .onChange(of: dragModeActive) { _, active in
             if active {
                 setHoverState(false)
diff --git a/Apptag/ContentView.swift b/Apptag/ContentView.swift
index 0b877a7..fd8ffa8 100644
--- a/Apptag/ContentView.swift
+++ b/Apptag/ContentView.swift
@@ -227,7 +227,7 @@
             .opacity(dragModeActive ? (isDragging ? 1.0 : 0.62) : 1.0)
             .animation(.easeOut(duration: 0.08), value: isDragging)
             .animation(.easeOut(duration: 0.08), value: dragModeActive)
-            .id(dragResetToken)
+            .id("\(name)|reset-\(dragResetToken)")
             .contentShape(RoundedRectangle(cornerRadius: 7))
             .onTapGesture {
                 action()
@@ -264,7 +264,7 @@
             .opacity(dragModeActive ? (isDragging ? 1.0 : 0.62) : 1.0)
             .animation(.easeOut(duration: 0.08), value: isDragging)
             .animation(.easeOut(duration: 0.08), value: dragModeActive)
-            .id(dragResetToken)
+            .id("\(name)|reset-\(dragResetToken)")
             .contentShape(RoundedRectangle(cornerRadius: 6))
             .onTapGesture {
                 action()
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 40e1e5d..a1293c4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
 - 优化标签列表拖拽排序反馈:移除标签无限抖动,改为拖拽时其他标签降透明度,并缩短长按响应时间
 - 修复设置页“应用系统智能化初始分类”确认提示可能跑到设置窗口背后、被遮挡的问题,并优化为更清晰的实底确认框
 - 修复右侧标签列表点击后可能停留在拖拽视觉状态,导致后续标签无法正常点击切换的问题
+- 修复拖拽状态重置后 App 图标网格可能大量不渲染的问题,确保平铺、容器、网格视图切换后图标完整显示
 - 版本号更新为 `7.3.5`,Build 更新为 `744`
 
 ## [7.3.4] — 2026-05-18

--
Gitblit v1.9.3