From c3c6e44715e8fa799722def27e201702ffcd212d Mon Sep 17 00:00:00 2001 From: mrFq1 <1xxbx0il0@mozmail.com> Date: Fri, 11 Aug 2023 15:05:10 +0800 Subject: [PATCH] misc: Update SwiftUIIntrospect --- Package.resolved | 4 ++-- Package.swift | 4 ++-- .../ClashX Dashboard/Views/APISetting/APISettingView.swift | 4 ++-- .../Views/ContentTabs/Providers/ProvidersView.swift | 3 ++- .../Views/ContentTabs/Proxies/ProxiesView.swift | 4 ++-- .../ClashX Dashboard/Views/SidebarView/SidebarListView.swift | 4 ++-- 6 files changed, 12 insertions(+), 11 deletions(-) diff --git a/Package.resolved b/Package.resolved index 2b4b704..56729c3 100644 --- a/Package.resolved +++ b/Package.resolved @@ -68,8 +68,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/siteline/SwiftUI-Introspect.git", "state" : { - "revision" : "67e2a59be1cf1c6dc4bb7a861cbea888d423bb78", - "version" : "0.5.2" + "revision" : "ccb973cfff703cba53fb88197413485c060eb26b", + "version" : "0.10.0" } }, { diff --git a/Package.swift b/Package.swift index 21f99fd..34f6915 100644 --- a/Package.swift +++ b/Package.swift @@ -22,7 +22,7 @@ let package = Package( .package(url: "https://github.com/CocoaLumberjack/CocoaLumberjack.git", from: "3.0.0"), .package(url: "https://github.com/ra1028/DifferenceKit.git", from: "1.0.0"), .package(url: "https://github.com/dagronf/DSFSparkline.git", from: "4.0.0"), - .package(url: "https://github.com/siteline/SwiftUI-Introspect.git", from: "0.2.3"), + .package(url: "https://github.com/siteline/swiftui-introspect", from: "0.10.0"), ], targets: [ // Targets are the basic building blocks of a package. A target can define a module or a test suite. @@ -35,7 +35,7 @@ let package = Package( .product(name: "CocoaLumberjackSwift", package: "CocoaLumberjack"), "DifferenceKit", "DSFSparkline", - .product(name: "Introspect", package: "SwiftUI-Introspect"), + .product(name: "SwiftUIIntrospect", package: "swiftui-introspect"), "Starscream", "SwiftyJSON", diff --git a/Sources/ClashX Dashboard/Views/APISetting/APISettingView.swift b/Sources/ClashX Dashboard/Views/APISetting/APISettingView.swift index b7b86e8..86a7915 100644 --- a/Sources/ClashX Dashboard/Views/APISetting/APISettingView.swift +++ b/Sources/ClashX Dashboard/Views/APISetting/APISettingView.swift @@ -5,7 +5,7 @@ // import SwiftUI -import Introspect +import SwiftUIIntrospect struct APISettingView: View { @State var baseURL: String = "" @@ -62,7 +62,7 @@ struct APISettingView: View { } } } - .introspectTableView { + .introspect(.table, on: .macOS(.v12, .v13, .v14)) { $0.backgroundColor = NSColor.clear $0.enclosingScrollView?.drawsBackground = false } diff --git a/Sources/ClashX Dashboard/Views/ContentTabs/Providers/ProvidersView.swift b/Sources/ClashX Dashboard/Views/ContentTabs/Providers/ProvidersView.swift index 3ab574d..125dcb9 100644 --- a/Sources/ClashX Dashboard/Views/ContentTabs/Providers/ProvidersView.swift +++ b/Sources/ClashX Dashboard/Views/ContentTabs/Providers/ProvidersView.swift @@ -5,6 +5,7 @@ // import SwiftUI +import SwiftUIIntrospect struct ProvidersView: View { @ObservedObject var providerStorage = DBProviderStorage() @@ -71,7 +72,7 @@ struct ProvidersView: View { } } } - .introspectTableView { + .introspect(.table, on: .macOS(.v12, .v13, .v14)) { $0.refusesFirstResponder = true $0.doubleAction = nil } diff --git a/Sources/ClashX Dashboard/Views/ContentTabs/Proxies/ProxiesView.swift b/Sources/ClashX Dashboard/Views/ContentTabs/Proxies/ProxiesView.swift index 48790e1..6858a82 100644 --- a/Sources/ClashX Dashboard/Views/ContentTabs/Proxies/ProxiesView.swift +++ b/Sources/ClashX Dashboard/Views/ContentTabs/Proxies/ProxiesView.swift @@ -5,7 +5,7 @@ // import SwiftUI -import Introspect +import SwiftUIIntrospect class ProxiesSearchString: ObservableObject, Identifiable { let id = UUID().uuidString @@ -26,7 +26,7 @@ struct ProxiesView: View { List(proxyStorage.groups, id: \.id) { group in ProxyGroupRowView(proxyGroup: group) } - .introspectTableView { + .introspect(.table, on: .macOS(.v12, .v13, .v14)) { $0.refusesFirstResponder = true $0.doubleAction = nil } diff --git a/Sources/ClashX Dashboard/Views/SidebarView/SidebarListView.swift b/Sources/ClashX Dashboard/Views/SidebarView/SidebarListView.swift index 48bee37..92f0c3b 100644 --- a/Sources/ClashX Dashboard/Views/SidebarView/SidebarListView.swift +++ b/Sources/ClashX Dashboard/Views/SidebarView/SidebarListView.swift @@ -5,7 +5,7 @@ // import SwiftUI -import Introspect +import SwiftUIIntrospect struct SidebarListView: View { @@ -59,7 +59,7 @@ struct SidebarListView: View { } } - .introspectTableView { + .introspect(.table, on: .macOS(.v12, .v13, .v14)) { $0.refusesFirstResponder = true if selectionName == nil {