From 39f4ac83f5017605b976536caff815aa19c52572 Mon Sep 17 00:00:00 2001 From: Stuart Breckenridge Date: Mon, 24 Oct 2022 22:18:46 +0800 Subject: [PATCH] Fixes #3721 - Disables Continue button until a selection is made. - Defaults to the first available extension point if one is available --- .../ExtensionPoints/EnableExtensionPointView.swift | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Mac/Preferences/ExtensionPoints/EnableExtensionPointView.swift b/Mac/Preferences/ExtensionPoints/EnableExtensionPointView.swift index 09b4ec3b3..5f8d0c113 100644 --- a/Mac/Preferences/ExtensionPoints/EnableExtensionPointView.swift +++ b/Mac/Preferences/ExtensionPoints/EnableExtensionPointView.swift @@ -15,10 +15,10 @@ struct EnableExtensionPointView: View { weak var parent: NSHostingController? // required because presentationMode.dismiss() doesn't work weak var enabler: ExtensionPointPreferencesEnabler? - @State private var extensionPointTypeName = String(describing: Self.sendToCommandExtensionPointTypes.first) + @State private var extensionPointTypeName = "" private var selectedType: ExtensionPoint.Type? - init(enabler: ExtensionPointPreferencesEnabler?, selectedType: ExtensionPoint.Type? ) { + init(enabler: ExtensionPointPreferencesEnabler?, selectedType: ExtensionPoint.Type?) { self.enabler = enabler self.selectedType = selectedType } @@ -99,6 +99,11 @@ struct EnableExtensionPointView: View { .foregroundColor(.gray) .font(.caption) .padding(.horizontal) + .onAppear { + if extensionPointTypeName.count == 0 { + self.extensionPointTypeName = extensionPointTypeNames.first! + } + } } } @@ -159,7 +164,7 @@ struct EnableExtensionPointView: View { } func disableContinue() -> Bool { - ExtensionPointManager.shared.availableExtensionPointTypes.count == 0 + ExtensionPointManager.shared.availableExtensionPointTypes.count == 0 || extensionPointTypeName.count == 0 } }