F2 inline rename — RenameKit pkg, char filter auf beiden dialogs, SwiftUI TextField 120% breite, Esc/click-outside cancel, nav keys cancel too

senatov · senatov · commit d422657a6a59 · 2026-04-22T20:36:20.000+02:00
diff --git a/GUI/Resources/curr_version.asc b/GUI/Resources/curr_version.asc
@@ -1 +1 @@
-2026.04.22 03:48:05 at Host: NEVA
+2026.04.22 04:37:22 at Host: NEVA
diff --git a/GUI/Sources/ContextMenu/Dialogs/RenameDialog.swift b/GUI/Sources/ContextMenu/Dialogs/RenameDialog.swift
@@ -5,6 +5,7 @@
 //  Copyright © 2026 Senatov. All rights reserved.
 
 import FileModelKit
+import RenameKit
 import SwiftUI
 
 // MARK: - Rename Dialog
@@ -27,7 +28,7 @@ struct RenameDialog: View {
     }
 
     private var isValidName: Bool {
-        !newName.isEmpty && !newName.contains("/") && !newName.contains(":") && newName != "." && newName != ".."
+        FilenameCharacterFilter.validate(newName) == nil
     }
 
     private var hasChanges: Bool {
@@ -72,7 +73,13 @@ struct RenameDialog: View {
         .higDialogStyle()
         .higAutoFocusTextField()
         .onAppear { isTextFieldFocused = true }
-        .onChange(of: newName) { _, newValue in validateName(newValue) }
+        .onChange(of: newName) { _, newValue in
+            let filtered = FilenameCharacterFilter.sanitize(newValue)
+            if filtered != newValue {
+                newName = filtered
+            }
+            validateName(newValue)
+        }
         .alert("File already exists", isPresented: $showOverwriteAlert) {
             Button("Cancel", role: .cancel) {
                 isTextFieldFocused = true
@@ -103,14 +110,6 @@ struct RenameDialog: View {
 
     private func validateName(_ name: String) {
         log.debug(#function)
-        if name.isEmpty {
-            errorMessage = L10n.Error.nameEmpty
-        } else if name.contains("/") || name.contains(":") {
-            errorMessage = L10n.Error.nameInvalidChars
-        } else if name == "." || name == ".." {
-            errorMessage = L10n.Error.invalidNameGeneric
-        } else {
-            errorMessage = nil
-        }
+        errorMessage = FilenameCharacterFilter.validate(name)
     }
 }
diff --git a/GUI/Sources/Features/Panels/FileTable/Duo/DuoFilePanelView.swift b/GUI/Sources/Features/Panels/FileTable/Duo/DuoFilePanelView.swift
@@ -342,6 +342,16 @@ extension DuoFilePanelView {
         handler.onOpenSettings = {
             HotKeySettingsCoordinator.shared.showSettings()
         }
+        handler.onRenameFile = { [appState] in
+            let panel = appState.focusedPanel
+            let file = panel == .left ? appState.selectedLeftFile : appState.selectedRightFile
+            guard let file, !file.isParentEntry, file.nameStr != ".." else { return }
+            appState.inlineRename.begin(
+                fileID: AnyHashable(file.id),
+                fileName: file.nameStr,
+                panelTag: panel == .left ? 0 : 1
+            )
+        }
         handler.register()
         keyboardHandler = handler
         log.debug("\(#function) keyboard handler registered")
diff --git a/GUI/Sources/Features/Panels/FileTable/Duo/DuoPanelKbdHandler.swift b/GUI/Sources/Features/Panels/FileTable/Duo/DuoPanelKbdHandler.swift
@@ -29,6 +29,7 @@ final class DuoFilePanelKeyboardHandler {
     var onRefreshPanels: (() -> Void)?
     var onToggleHiddenFiles: (() -> Void)?
     var onOpenSettings: (() -> Void)?
+    var onRenameFile: (() -> Void)?
 
     init(appState: AppState) {
         self.appState = appState
@@ -146,6 +147,11 @@ final class DuoFilePanelKeyboardHandler {
                 onDelete?()
                 return nil
 
+            case .renameFile:
+                log.info("[KEY] → Rename (F2)")
+                onRenameFile?()
+                return nil
+
             // ── Clipboard ──
             case .clipboardCopy:
                 log.info("[KEY] → Clipboard Copy")
diff --git a/GUI/Sources/Features/Panels/FileTable/FileRows/FileRow.swift b/GUI/Sources/Features/Panels/FileTable/FileRows/FileRow.swift
@@ -6,6 +6,7 @@
 
 import AppKit
 import FileModelKit
+import RenameKit
 import SwiftUI
 import UniformTypeIdentifiers
 
@@ -318,18 +319,50 @@ struct FileRow: View, Equatable {
     // MARK: - Name column
     // Uses layout.nameWidth — same value as TableHeaderView nameColumnHeader.
     // This guarantees pixel-perfect alignment between header and rows.
+    private var isInlineRenaming: Bool {
+        appState.inlineRename.activeFileID == AnyHashable(file.id)
+    }
+
     @ViewBuilder
     private func nameColumnView() -> some View {
-        FileRowView(
-            file: file,
-            isSelected: isSelected,
-            isActivePanel: isActivePanel,
-            isMarked: isMarked
-        )
-        .frame(width: layout.nameWidth, alignment: .leading)
-        .clipped()
-        .padding(.vertical, 2)
-        .padding(.horizontal, 4)
+        if isInlineRenaming {
+            InlineRenameField(
+                text: Bindable(appState.inlineRename).editedName,
+                originalName: appState.inlineRename.originalName,
+                nameWidth: layout.nameWidth,
+                onCommit: { commitInlineRename() },
+                onCancel: { appState.inlineRename.cancel() }
+            )
+            .frame(width: layout.nameWidth, alignment: .leading)
+            .padding(.vertical, 2)
+            .padding(.horizontal, 4)
+        } else {
+            FileRowView(
+                file: file,
+                isSelected: isSelected,
+                isActivePanel: isActivePanel,
+                isMarked: isMarked
+            )
+            .frame(width: layout.nameWidth, alignment: .leading)
+            .clipped()
+            .padding(.vertical, 2)
+            .padding(.horizontal, 4)
+        }
+    }
+
+    private func commitInlineRename() {
+        guard let result = appState.inlineRename.commit() else { return }
+        let panel: FavPanelSide = result.panelTag == 0 ? .left : .right
+        // Find the original file by matching the name that was active
+        guard let selectedFile = panel == .left ? appState.selectedLeftFile : appState.selectedRightFile else { return }
+        Task {
+            await CntMenuCoord.shared.performRename(
+                file: selectedFile,
+                newName: result.newName,
+                panel: panel,
+                appState: appState
+            )
+        }
     }
 
     // MARK: - Parent Row View
diff --git a/GUI/Sources/Features/Panels/FileTable/FileTableViews/FileTableView+Keyboard.swift b/GUI/Sources/Features/Panels/FileTable/FileTableViews/FileTableView+Keyboard.swift
@@ -14,18 +14,21 @@ extension FileTableView {
     // MARK: - Keyboard Handling
     func handleUpArrow() -> KeyPress.Result {
         guard isFocused else { return .ignored }
+        appState.inlineRename.cancel()
         keyboardNav.moveUp()
         return .handled
     }
 
     func handleDownArrow() -> KeyPress.Result {
         guard isFocused else { return .ignored }
+        appState.inlineRename.cancel()
         keyboardNav.moveDown()
         return .handled
     }
 
     func handlePageUp() -> KeyPress.Result {
         guard isFocused else { return .ignored }
+        appState.inlineRename.cancel()
         if pageNavThrottle.allow() {
             keyboardNav.pageUp()
         }
@@ -34,6 +37,7 @@ extension FileTableView {
 
     func handlePageDown() -> KeyPress.Result {
         guard isFocused else { return .ignored }
+        appState.inlineRename.cancel()
         if pageNavThrottle.allow() {
             keyboardNav.pageDown()
         }
@@ -42,12 +46,14 @@ extension FileTableView {
 
     func handleHome() -> KeyPress.Result {
         guard isFocused else { return .ignored }
+        appState.inlineRename.cancel()
         keyboardNav.jumpToFirst()
         return .handled
     }
 
     func handleEnd() -> KeyPress.Result {
         guard isFocused else { return .ignored }
+        appState.inlineRename.cancel()
         keyboardNav.jumpToLast()
         return .handled
     }
diff --git a/GUI/Sources/HotKeys/HotKeyAction.swift b/GUI/Sources/HotKeys/HotKeyAction.swift
@@ -23,6 +23,7 @@ enum HotKeyAction: String, CaseIterable, Identifiable, Codable, Sendable {
     case unpackFiles = "unpackFiles"
     case compareContent = "compareContent"
     case syncDirectories = "syncDirectories"
+    case renameFile = "renameFile"
 
     // MARK: - Clipboard
     case clipboardCopy = "clipboardCopy"
@@ -84,6 +85,7 @@ enum HotKeyAction: String, CaseIterable, Identifiable, Codable, Sendable {
             case .unpackFiles: return "Unpack Files"
             case .compareContent: return "Compare by Content"
             case .syncDirectories: return "Synchronize Directories"
+            case .renameFile: return "Rename File"
             case .clipboardCopy: return "Copy to Clipboard"
             case .clipboardCut: return "Cut to Clipboard"
             case .clipboardPaste: return "Paste from Clipboard"
@@ -123,7 +125,7 @@ enum HotKeyAction: String, CaseIterable, Identifiable, Codable, Sendable {
         switch self {
             case .viewFile, .editFile, .copyFile, .moveFile, .newFolder, .deleteFile,
                  .packFiles, .unpackFiles, .compareContent, .syncDirectories,
-                 .clipboardCopy, .clipboardCut, .clipboardPaste:
+                 .clipboardCopy, .clipboardCut, .clipboardPaste, .renameFile:
                 return .fileOperations
             case .togglePanelFocus, .moveUp, .moveDown, .pageUp, .pageDown, .moveToTop, .moveToBottom, .openSelected, .parentDirectory, .refreshPanels,
                 .newTab, .closeTab, .nextTab, .prevTab:
diff --git a/GUI/Sources/HotKeys/HotKeyPresets.swift b/GUI/Sources/HotKeys/HotKeyPresets.swift
@@ -38,6 +38,7 @@ enum HotKeyPresets {
         HotKeyBinding(action: .moveFile,         keyCode: 0x61, modifiers: .none),         // F6
         HotKeyBinding(action: .newFolder,        keyCode: 0x62, modifiers: .none),         // F7
         HotKeyBinding(action: .deleteFile,       keyCode: 0x64, modifiers: .none),         // F8
+        HotKeyBinding(action: .renameFile,       keyCode: 0x78, modifiers: .none),         // F2
         HotKeyBinding(action: .packFiles,        keyCode: 0x60, modifiers: .option),       // ⌥F5
         HotKeyBinding(action: .unpackFiles,      keyCode: 0x65, modifiers: .option),       // ⌥F9
         HotKeyBinding(action: .compareContent,   keyCode: 0x08, modifiers: .control),      // ⌃C
@@ -100,6 +101,7 @@ enum HotKeyPresets {
         HotKeyBinding(action: .moveFile,         keyCode: 0x07, modifiers: .command),      // ⌘X (then paste = move)
         HotKeyBinding(action: .newFolder,        keyCode: 0x2D, modifiers: [.command, .shift]), // ⌘⇧N
         HotKeyBinding(action: .deleteFile,       keyCode: 0x33, modifiers: .command),      // ⌘Backspace
+        HotKeyBinding(action: .renameFile,       keyCode: 0x78, modifiers: .none),         // F2
         HotKeyBinding(action: .packFiles,        keyCode: 0x00, modifiers: .none),         // Not standard
         HotKeyBinding(action: .unpackFiles,      keyCode: 0x00, modifiers: .none),         // Not standard
         HotKeyBinding(action: .compareContent,   keyCode: 0x00, modifiers: .none),         // Not standard
diff --git a/GUI/Sources/States/AppState/AppState.swift b/GUI/Sources/States/AppState/AppState.swift
@@ -12,6 +12,7 @@
 import AppKit
 import FileModelKit
 import Foundation
+import RenameKit
 
 // MARK: - AppState
 @MainActor
@@ -201,6 +202,9 @@ final class AppState {
     }
     var navigationCallbacks: [FavPanelSide: PanelNavigationCallbacks] = [:]
 
+    /// TC-style inline rename state (F2)
+    var inlineRename = InlineRenameState()
+
     // MARK: - Search Results (bridge)
     var leftSearchResultsPath: String? {
         get { leftPanel.searchResultsPath }
diff --git a/MiMiNavigator.xcodeproj/project.pbxproj b/MiMiNavigator.xcodeproj/project.pbxproj
@@ -22,6 +22,7 @@
 		DD000003DD000003DD000003 /* (null) in Frameworks */ = {isa = PBXBuildFile; };
 		EE000003EE000003EE000003 /* (null) in Frameworks */ = {isa = PBXBuildFile; };
 		FF82030CE1584192AE6E4DEA /* NetworkKit in Frameworks */ = {isa = PBXBuildFile; productRef = 52D4533F441E4D78BD910304 /* NetworkKit */; };
+		DD000014DD000014DD000014 /* RenameKit in Frameworks */ = {isa = PBXBuildFile; productRef = DD000015DD000015DD000015 /* RenameKit */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -108,6 +109,7 @@
 				97B3D6382DCA54B9002F1DB7 /* SystemPackage in Frameworks */,
 				97D128762DB62DD400274684 /* FilesProvider in Frameworks */,
 				CC000003CC000003CC000003 /* Citadel in Frameworks */,
+				DD000014DD000014DD000014 /* RenameKit in Frameworks */,
 			);
 		};
 		97AD1A3E2C624E040045C38D /* Frameworks */ = {
@@ -184,6 +186,7 @@
 				BB000012BB000012BB000012 /* ScannerKit */,
 				BB000013BB000013BB000013 /* ArchiveKit */,
 				970978BD2F8C3BBB00C0BE9D /* VLC */,
+				DD000015DD000015DD000015 /* RenameKit */,
 			);
 			productName = MiMiNavigator;
 			productReference = 97AD1A2E2C624E020045C38D /* MiMiNavigator.app */;
@@ -268,6 +271,7 @@
 				BB000002BB000002BB000002 /* XCLocalSwiftPackageReference "Packages/ScannerKit" */,
 				BB000004BB000004BB000004 /* XCLocalSwiftPackageReference "Packages/ArchiveKit" */,
 				CC000001CC000001CC000001 /* XCRemoteSwiftPackageReference "Citadel" */,
+				DD000016DD000016DD000016 /* XCLocalSwiftPackageReference "Packages/RenameKit" */,
 				970978BB2F8C341800C0BE9D /* XCRemoteSwiftPackageReference "VLC" */,
 			);
 			preferredProjectObjectVersion = 90;
@@ -708,6 +712,10 @@
 			isa = XCLocalSwiftPackageReference;
 			relativePath = Packages/ArchiveKit;
 		};
+		DD000016DD000016DD000016 /* XCLocalSwiftPackageReference "Packages/RenameKit" */ = {
+			isa = XCLocalSwiftPackageReference;
+			relativePath = Packages/RenameKit;
+		};
 /* End XCLocalSwiftPackageReference section */
 
 /* Begin XCRemoteSwiftPackageReference section */
@@ -824,6 +832,11 @@
 			package = CC000001CC000001CC000001 /* XCRemoteSwiftPackageReference "Citadel" */;
 			productName = Citadel;
 		};
+		DD000015DD000015DD000015 /* RenameKit */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = DD000016DD000016DD000016 /* XCLocalSwiftPackageReference "Packages/RenameKit" */;
+			productName = RenameKit;
+		};
 /* End XCSwiftPackageProductDependency section */
 	};
 	rootObject = 97AD1A262C624E020045C38D /* Project object */;
diff --git a/Packages b/Packages
@@ -1 +1 @@
-Subproject commit ae6ffcbdbdb3a63548e0fa3c63ab473bee340cd8
+Subproject commit 3b4b17f9b249dfa52a82ddaf40113a864863e4ea

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-2026.04.22 03:48:05 at Host: NEVA`
	`1`	`+2026.04.22 04:37:22 at Host: NEVA`