simpler in-place rename from the sidebar item

Author: l2fprod

Flitro/Editor/ContextDetailsView.swift

@@ -268,15 +268,6 @@ struct ContextDetailsView: View {
             }
         }
         .toolbar {
-            // Invisible, flexible item claims the center (principal) space
-            ToolbarItem(placement: .principal) {
-                Color.clear.frame(maxWidth: .infinity)
-            }
-            // Title anchored on the very left (navigation area), allowed to expand
-            ToolbarItem(placement: .navigation) {
-                ContextTitleView(context: context, contextManager: contextManager)
-                    .frame(maxWidth: .infinity, alignment: .leading)
-            }
             // Trailing actions stay on the right
             ToolbarItemGroup(placement: .primaryAction) {
                 // Add dropdown menu for adding items (unchanged)
@@ -293,10 +284,7 @@ struct ContextDetailsView: View {
                 ContextButton(context: context, contextManager: contextManager)
             }
         }
-        .navigationTitle("")
-        .onChange(of: context.id) { _, _ in
-            // Title editing state now managed by ContextTitleView
-        }
+        .navigationTitle(context.name)
     }
 
     private func onOpenAction(for item: ContextItem, contextIdx: Int) -> (() -> Void)? {

Flitro/Editor/ContextTitleView.swift

@@ -13,6 +13,9 @@ struct ContextCardView: View {
     @State private var iconRotation: Double = 0
     @State private var cardScale: CGFloat = 1.0
     @EnvironmentObject private var contextManager: ContextManager
+    @State private var isRenaming = false
+    @State private var draftName: String = ""
+    @FocusState private var renameFieldFocused: Bool
 
     private var itemCountText: String {
         let total = context.items.count
@@ -24,7 +27,7 @@ struct ContextCardView: View {
     }
 
     var body: some View {
-        HStack(alignment: .center, spacing: 12) {
+        HStack(alignment: .center, spacing: 8) {
             ContextIconView(
                 context: context,
                 size: 32,
@@ -33,28 +36,51 @@ struct ContextCardView: View {
             )
             .scaleEffect(cardScale)
             VStack(alignment: .leading, spacing: 2) {
-                Text(context.name)
-                    .font(.system(size: 16, weight: isSelected ? .semibold : .regular))
-                    .lineLimit(2)
-                    .truncationMode(.tail)
-                    .multilineTextAlignment(.leading)
-                    .frame(maxWidth: .infinity, alignment: .leading)
-                    .fixedSize(horizontal: false, vertical: true)
-                    .minimumScaleFactor(0.6)
+                if isRenaming {
+                    TextField("Rename Context", text: $draftName)
+                        .textFieldStyle(.plain)
+                        .focused($renameFieldFocused)
+                        .onSubmit { commitRename() }
+                        .onExitCommand { cancelRename() }
+                        .onChange(of: renameFieldFocused) { _, focused in
+                            if !focused { commitRename() }
+                        }
+                        .padding(.vertical, 6)
+                        .padding(.horizontal, 8)
+                        .background(
+                            RoundedRectangle(cornerRadius: 8)
+                                .fill(Color(NSColor.textBackgroundColor))
+                                .overlay(
+                                    RoundedRectangle(cornerRadius: 8).stroke(Color.gray.opacity(0.15))
+                                )
+                        )
+                        .frame(maxWidth: .infinity, alignment: .leading)
+                        .fixedSize(horizontal: false, vertical: true)
+                        .layoutPriority(2)
+                } else {
+                    Text(context.name)
+                        .font(.system(size: 16, weight: isSelected ? .semibold : .regular))
+                        .lineLimit(2)
+                        .truncationMode(.tail)
+                        .multilineTextAlignment(.leading)
+                        .frame(maxWidth: .infinity, alignment: .leading)
+                        .fixedSize(horizontal: false, vertical: true)
+                        .minimumScaleFactor(0.6)
+                }
             }
-            Spacer()
-            VStack(alignment: .trailing, spacing: 6) {
+            .frame(maxWidth: .infinity)
+            if !isRenaming {
                 Text(itemCountText)
                     .font(.footnote)
+                // // Dot indicator at top right
+                VStack(alignment: .trailing, spacing: 0) {
+                    Circle()
+                        .fill(isActive ? Color("ActiveContextColor") : Color.clear)
+                        .frame(width: 8, height: 8)
+                    Spacer()
+                }
+                .frame(height: 32) // Adjust to match row/icon height
             }
-            // // Dot indicator at top right
-            VStack(alignment: .trailing, spacing: 0) {
-                Circle()
-                    .fill(isActive ? Color("ActiveContextColor") : Color.clear)
-                    .frame(width: 8, height: 8)
-                Spacer()
-            }
-            .frame(height: 32) // Adjust to match row/icon height
         }
         .padding(8)
         .frame(maxWidth: .infinity, alignment: .leading)
@@ -68,6 +94,10 @@ struct ContextCardView: View {
                 contextManager.closeContext(contextID: context.id)
             }
             .disabled(!contextManager.isActive(contextID: context.id))
+            Button("Rename") {
+                draftName = context.name
+                isRenaming = true
+            }
             Button("Change Icon...") {
                 showIconSelector = true
             }
@@ -117,11 +147,31 @@ struct ContextCardView: View {
                 cardScale = 1.0
             }
         }
+        .onChange(of: isRenaming) { _, newValue in
+            if newValue {
+                // ensure field gets focus when entering rename mode
+                DispatchQueue.main.async { renameFieldFocused = true }
+            }
+        }
         .contentShape(Rectangle())
         .tag(context.id as UUID?)
         .help(analyticsTooltip(for: context.id))
     }
 
+    private func commitRename() {
+        let trimmed = draftName.trimmingCharacters(in: .whitespacesAndNewlines)
+        if !trimmed.isEmpty && trimmed != context.name {
+            context.name = trimmed
+            contextManager.saveContexts()
+        }
+        isRenaming = false
+    }
+    
+    private func cancelRename() {
+        draftName = context.name
+        isRenaming = false
+    }
+
     private func analyticsTooltip(for contextID: UUID) -> String {
         let analyticsManager = contextManager.analyticsManager
         let openCount = analyticsManager.getOpenCount(for: contextID)