mirrors2/ClashX-Dashboard
1
0
Fork 0
mirror of https://github.com/yJason/ClashX-Dashboard.git synced 2026-02-04 10:02:26 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

misc: Update SwiftUIIntrospect

Browse Source
This commit is contained in:
mrFq1
2023-08-11 15:05:10 +08:00
parent 6810e6089b
commit c3c6e44715
6 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Package.resolved
View File

@@ -68,8 +68,8 @@
"kind" : "remoteSourceControl", "kind" : "remoteSourceControl",
"location" : "https://github.com/siteline/SwiftUI-Introspect.git", "location" : "https://github.com/siteline/SwiftUI-Introspect.git",
"state" : { "state" : {
"revision" : "67e2a59be1cf1c6dc4bb7a861cbea888d423bb78", "revision" : "ccb973cfff703cba53fb88197413485c060eb26b",
"version" : "0.5.2" "version" : "0.10.0"
} }
}, },
{ {

4
Package.swift
View File

@@ -22,7 +22,7 @@ let package = Package(
.package(url: "https://github.com/CocoaLumberjack/CocoaLumberjack.git", from: "3.0.0"), .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/ra1028/DifferenceKit.git", from: "1.0.0"),
.package(url: "https://github.com/dagronf/DSFSparkline.git", from: "4.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: [
// Targets are the basic building blocks of a package. A target can define a module or a test suite. // 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"), .product(name: "CocoaLumberjackSwift", package: "CocoaLumberjack"),
"DifferenceKit", "DifferenceKit",
"DSFSparkline", "DSFSparkline",
.product(name: "Introspect", package: "SwiftUI-Introspect"), .product(name: "SwiftUIIntrospect", package: "swiftui-introspect"),
"Starscream", "Starscream",
"SwiftyJSON", "SwiftyJSON",

4
Sources/ClashX Dashboard/Views/APISetting/APISettingView.swift
View File

@@ -5,7 +5,7 @@
// //
import SwiftUI import SwiftUI
import Introspect import SwiftUIIntrospect
struct APISettingView: View { struct APISettingView: View {
@State var baseURL: String = "" @State var baseURL: String = ""
@@ -62,7 +62,7 @@ struct APISettingView: View {
} }
} }
} }
.introspectTableView { .introspect(.table, on: .macOS(.v12, .v13, .v14)) {
$0.backgroundColor = NSColor.clear $0.backgroundColor = NSColor.clear
$0.enclosingScrollView?.drawsBackground = false $0.enclosingScrollView?.drawsBackground = false
} }

3
Sources/ClashX Dashboard/Views/ContentTabs/Providers/ProvidersView.swift
View File

@@ -5,6 +5,7 @@
// //
import SwiftUI import SwiftUI
import SwiftUIIntrospect
struct ProvidersView: View { struct ProvidersView: View {
@ObservedObject var providerStorage = DBProviderStorage() @ObservedObject var providerStorage = DBProviderStorage()
@@ -71,7 +72,7 @@ struct ProvidersView: View {
} }
} }
} }
.introspectTableView { .introspect(.table, on: .macOS(.v12, .v13, .v14)) {
$0.refusesFirstResponder = true $0.refusesFirstResponder = true
$0.doubleAction = nil $0.doubleAction = nil
} }

4
Sources/ClashX Dashboard/Views/ContentTabs/Proxies/ProxiesView.swift
View File

@@ -5,7 +5,7 @@
// //
import SwiftUI import SwiftUI
import Introspect import SwiftUIIntrospect
class ProxiesSearchString: ObservableObject, Identifiable { class ProxiesSearchString: ObservableObject, Identifiable {
let id = UUID().uuidString let id = UUID().uuidString
@@ -26,7 +26,7 @@ struct ProxiesView: View {
List(proxyStorage.groups, id: \.id) { group in List(proxyStorage.groups, id: \.id) { group in
ProxyGroupRowView(proxyGroup: group) ProxyGroupRowView(proxyGroup: group)
} }
.introspectTableView { .introspect(.table, on: .macOS(.v12, .v13, .v14)) {
$0.refusesFirstResponder = true $0.refusesFirstResponder = true
$0.doubleAction = nil $0.doubleAction = nil
} }

4
Sources/ClashX Dashboard/Views/SidebarView/SidebarListView.swift
View File

@@ -5,7 +5,7 @@
// //
import SwiftUI import SwiftUI
import Introspect import SwiftUIIntrospect
struct SidebarListView: View { struct SidebarListView: View {
@@ -59,7 +59,7 @@ struct SidebarListView: View {
} }
} }
.introspectTableView { .introspect(.table, on: .macOS(.v12, .v13, .v14)) {
$0.refusesFirstResponder = true $0.refusesFirstResponder = true
if selectionName == nil { if selectionName == nil {