- reverting back some changes

Author: georgetchelidze

Example/WelcomeWindowExample/WelcomeWindowExampleApp.swift

@@ -36,7 +36,7 @@ struct WelcomeWindowExampleApp: App {
                         action: {
                             NSDocumentController.shared.openDocumentWithDialog(
                                 configuration: .init(canChooseDirectories: true),
-                                onDialogPresented: { dismiss() },
+                                onCompletion: { dismiss() },
                                 onCancel: { openWindow(id: "welcome") }
                             )
                         }

Sources/WelcomeWindow/Model/DocumentSaveDialogConfiguration.swift

@@ -37,9 +37,6 @@ public struct DocumentSaveDialogConfiguration {
     /// The initial directory shown when the dialog appears.
     public var directoryURL: URL?
 
-    /// Should file be created with or without an extension.
-    public var includeExtension: Bool
-
     /// Creates a new `DocumentSaveDialogConfiguration` with the given parameters.
     ///
     /// - Parameters:
@@ -50,7 +47,6 @@ public struct DocumentSaveDialogConfiguration {
     ///   - defaultFileType: The content type that will be used to create the document. Defaults to `.plainText`.
     ///   - title: The title of the save dialog window. Default is `"Create a New Document"`.
     ///   - directoryURL: The default directory URL. Default is the user’s Documents folder.
-    ///   - includeExtension: Should include file extension.
     public init(
         prompt: String = "Create Document",
         nameFieldLabel: String = "File Name:",
@@ -68,6 +64,5 @@ public struct DocumentSaveDialogConfiguration {
         self.defaultFileType = defaultFileType
         self.title = title
         self.directoryURL = directoryURL
-        self.includeExtension = includeExtension
     }
 }

Sources/WelcomeWindow/Model/NSDocumentController+Extensions.swift

@@ -78,43 +78,41 @@ extension NSDocumentController {
         onCompletion: @escaping () -> Void,
         onCancel: @escaping () -> Void
     ) {
-        // Configure NSSavePanel
+
+        // 1. Configure NSSavePanel ------------------------------------------------
         let panel = NSSavePanel()
-        panel.prompt = configuration.prompt
-        panel.title = configuration.title
-        panel.nameFieldLabel = configuration.nameFieldLabel
+        panel.prompt               = configuration.prompt
+        panel.title                = configuration.title
+        panel.nameFieldLabel       = configuration.nameFieldLabel
         panel.canCreateDirectories = true
-        panel.directoryURL = configuration.directoryURL
-        panel.level = .modalPanel
+        panel.directoryURL         = configuration.directoryURL
+        panel.level                = .modalPanel
         panel.treatsFilePackagesAsDirectories = true
 
         switch mode {
         case .file:
             panel.nameFieldStringValue = configuration.defaultFileName
-            panel.allowedContentTypes = configuration.allowedContentTypes
+            panel.allowedContentTypes  = configuration.allowedContentTypes
         case .folder:
             panel.nameFieldStringValue =
-            URL(fileURLWithPath: configuration.defaultFileName)
-                .deletingPathExtension().lastPathComponent
-            panel.allowedContentTypes = [] // treat as folder
+                URL(fileURLWithPath: configuration.defaultFileName)
+                    .deletingPathExtension().lastPathComponent
+            panel.allowedContentTypes  = []                // treat as folder
         }
 
         DispatchQueue.main.async { onDialogPresented() }
         guard panel.runModal() == .OK,
               let baseURL = panel.url else { onCancel(); return }
 
-        // Derive the final document file URL
-        let finalURL: URL
-        if mode == .file && configuration.includeExtension {
-            let ext = configuration.defaultFileType.preferredFilenameExtension ?? "file"
-            finalURL = baseURL.appendingPathExtension(ext)
-        } else {
-            finalURL = baseURL
-        }
+        // 2. Derive the final document file URL ----------------------------------
+        let ext      = configuration.defaultFileType.preferredFilenameExtension ?? "file"
+        let finalURL = (mode == .folder)
+            ? baseURL.appendingPathComponent("\(baseURL.lastPathComponent).\(ext)")
+            : baseURL
 
-        // Create, write, and open the NSDocument
+        // 3. Create, write, and open the NSDocument ------------------------------
         do {
-            let document = try makeUntitledDocument(ofType: configuration.defaultFileType.identifier)
+            let document  = try makeUntitledDocument(ofType: configuration.defaultFileType.identifier)
             document.fileURL = finalURL
 
             try document.write(
@@ -147,7 +145,7 @@ extension NSDocumentController {
     ///   - onCancel: Called if the user cancels or an error occurs.
     @MainActor
     public func openDocumentWithDialog(
-        configuration: DocumentOpenDialogConfiguration = .init(),
+        configuration: DocumentOpenDialogConfiguration = DocumentOpenDialogConfiguration(),
         onDialogPresented: @escaping () -> Void = {},
         onCompletion: @escaping () -> Void = {},
         onCancel: @escaping () -> Void = {}