Fix UI glitches created by Xcode 15

intitni · intitni · commit 41c95ffe9d7c · 2023-09-29T16:20:25.000+08:00
diff --git a/Core/Sources/ChatGPTChatTab/ChatPanel.swift b/Core/Sources/ChatGPTChatTab/ChatPanel.swift
@@ -1,6 +1,6 @@
 import AppKit
-import OpenAIService
 import MarkdownUI
+import OpenAIService
 import SharedUIComponents
 import SwiftUI
 
@@ -68,6 +68,14 @@ struct ChatPanelMessages: View {
                 Instruction()
 
                 Spacer()
+                    
+            }
+            .modify { view in
+                if #available(macOS 13.0, *) {
+                    view.listRowSeparator(.hidden).listSectionSeparator(.hidden)
+                } else {
+                    view
+                }
             }
             .scaleEffect(x: -1, y: 1, anchor: .center)
         }
diff --git a/Core/Sources/HostApp/AccountSettings/APIKeyManagement/APIKeyManagementView.swift b/Core/Sources/HostApp/AccountSettings/APIKeyManagement/APIKeyManagementView.swift
@@ -1,4 +1,5 @@
 import ComposableArchitecture
+import SharedUIComponents
 import SwiftUI
 
 struct APIKeyManagementView: View {
@@ -49,6 +50,13 @@ struct APIKeyManagementView: View {
                             .buttonStyle(.plain)
                         }
                     }
+                    .modify { view in
+                        if #available(macOS 13.0, *) {
+                            view.listRowSeparator(.hidden).listSectionSeparator(.hidden)
+                        } else {
+                            view
+                        }
+                    }
                 }
             }
             .removeBackground()
diff --git a/Core/Sources/HostApp/AccountSettings/ChatModelManagement/ChatModelManagementView.swift b/Core/Sources/HostApp/AccountSettings/ChatModelManagement/ChatModelManagementView.swift
@@ -12,7 +12,7 @@ struct ChatModelManagementView: View {
                 action: ChatModelManagement.Action.chatModelItem
             )) { store in
                 ChatModelEditView(store: store)
-                    .frame(minWidth: 400)
+                    .frame(width: 800)
             }
     }
 }
diff --git a/Core/Sources/HostApp/AccountSettings/SharedModelManagement/AIModelManagementVIew.swift b/Core/Sources/HostApp/AccountSettings/SharedModelManagement/AIModelManagementVIew.swift
@@ -1,6 +1,7 @@
 import AIModel
 import ComposableArchitecture
 import PlusFeatureFlag
+import SharedUIComponents
 import SwiftUI
 
 protocol AIModelManagementAction {
@@ -54,7 +55,7 @@ struct AIModelManagementView<Management: AIModelManagement, Model: ManageableAIM
                             .foregroundColor(.secondary)
 
                         let disabled = viewStore.state >= 2
-                        
+
                         Button(disabled ? "Add More Model (Plus)" : "Add Model") {
                             store.send(.createModel)
                         }.disabled(disabled)
@@ -102,6 +103,13 @@ struct AIModelManagementView<Management: AIModelManagement, Model: ManageableAIM
                     .onMove(perform: { indices, newOffset in
                         viewStore.send(.moveModel(from: indices, to: newOffset))
                     })
+                    .modify { view in
+                        if #available(macOS 13.0, *) {
+                            view.listRowSeparator(.hidden).listSectionSeparator(.hidden)
+                        } else {
+                            view
+                        }
+                    }
                 }
                 .removeBackground()
                 .listStyle(.plain)
diff --git a/Core/Sources/HostApp/CustomCommandSettings/CustomCommandView.swift b/Core/Sources/HostApp/CustomCommandSettings/CustomCommandView.swift
@@ -3,6 +3,7 @@ import MarkdownUI
 import PlusFeatureFlag
 import Preferences
 import SwiftUI
+import SharedUIComponents
 
 extension List {
     @ViewBuilder
@@ -56,6 +57,13 @@ struct CustomCommandView: View {
             .onMove(perform: { indices, newOffset in
                 settings.customCommands.move(fromOffsets: indices, toOffset: newOffset)
             })
+            .modify { view in
+                if #available(macOS 13.0, *) {
+                    view.listRowSeparator(.hidden).listSectionSeparator(.hidden)
+                } else {
+                    view
+                }
+            }
         }
         .removeBackground()
         .padding(.vertical, 4)
diff --git a/Core/Sources/HostApp/FeatureSettings/SuggestionFeatureDisabledLanguageListView.swift b/Core/Sources/HostApp/FeatureSettings/SuggestionFeatureDisabledLanguageListView.swift
@@ -1,5 +1,6 @@
 import SuggestionModel
 import SwiftUI
+import SharedUIComponents
 
 struct SuggestionFeatureDisabledLanguageListView: View {
     final class Settings: ObservableObject {
@@ -68,6 +69,13 @@ struct SuggestionFeatureDisabledLanguageListView: View {
                         .buttonStyle(.plain)
                     }
                 }
+                .modify { view in
+                    if #available(macOS 13.0, *) {
+                        view.listRowSeparator(.hidden).listSectionSeparator(.hidden)
+                    } else {
+                        view
+                    }
+                }
             }
             .removeBackground()
             .overlay {
diff --git a/Core/Sources/HostApp/FeatureSettings/SuggestionFeatureEnabledProjectListView.swift b/Core/Sources/HostApp/FeatureSettings/SuggestionFeatureEnabledProjectListView.swift
@@ -1,3 +1,4 @@
+import SharedUIComponents
 import SwiftUI
 
 struct SuggestionFeatureEnabledProjectListView: View {
@@ -67,6 +68,13 @@ struct SuggestionFeatureEnabledProjectListView: View {
                         .buttonStyle(.plain)
                     }
                 }
+                .modify { view in
+                    if #available(macOS 13.0, *) {
+                        view.listRowSeparator(.hidden).listSectionSeparator(.hidden)
+                    } else {
+                        view
+                    }
+                }
             }
             .removeBackground()
             .overlay {
diff --git a/Pro b/Pro
@@ -1 +1 @@
-Subproject commit f4d8042af810ab9a0a8847d5f961ce10cb0a0e1e
+Subproject commit 326ddb767de17c6822af2f1a275796dff011f772
diff --git a/Tool/Sources/SharedUIComponents/CustomScrollView.swift b/Tool/Sources/SharedUIComponents/CustomScrollView.swift
@@ -43,6 +43,13 @@ public struct CustomScrollView<Content: View>: View {
                     .modifier(CustomScrollViewUpdateHeightModifier())
             }
             .listStyle(.plain)
+            .modify { view in
+                if #available(macOS 13.0, *) {
+                    view.listRowSeparator(.hidden).listSectionSeparator(.hidden)
+                } else {
+                    view
+                }
+            }
             .frame(idealHeight: max(10, height))
             .onPreferenceChange(CustomScrollViewHeightPreferenceKey.self) { newHeight in
                 Task { @MainActor in
diff --git a/Tool/Sources/SharedUIComponents/View+Modify.swift b/Tool/Sources/SharedUIComponents/View+Modify.swift
@@ -0,0 +1,10 @@
+import SwiftUI
+
+public extension View {
+    @ViewBuilder func modify<Content: View>(@ViewBuilder transform: (Self) -> Content)
+        -> some View
+    {
+        transform(self)
+    }
+}
+

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`import ComposableArchitecture`
	`2`	`+import SharedUIComponents`
`2`	`3`	`import SwiftUI`
`3`	`4`
`4`	`5`	`struct APIKeyManagementView: View {`
`@@ -49,6 +50,13 @@ struct APIKeyManagementView: View {`
`49`	`50`	`.buttonStyle(.plain)`
`50`	`51`	`}`
`51`	`52`	`}`
	`53`	`+ .modify { view in`
	`54`	`+ if #available(macOS 13.0, *) {`
	`55`	`+ view.listRowSeparator(.hidden).listSectionSeparator(.hidden)`
	`56`	`+ } else {`
	`57`	`+ view`
	`58`	`+ }`
	`59`	`+ }`
`52`	`60`	`}`
`53`	`61`	`}`
`54`	`62`	`.removeBackground()`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ struct ChatModelManagementView: View {`
`12`	`12`	`action: ChatModelManagement.Action.chatModelItem`
`13`	`13`	`)) { store in`
`14`	`14`	`ChatModelEditView(store: store)`
`15`		`- .frame(minWidth: 400)`
	`15`	`+ .frame(width: 800)`
`16`	`16`	`}`
`17`	`17`	`}`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`import SuggestionModel`
`2`	`2`	`import SwiftUI`
	`3`	`+import SharedUIComponents`
`3`	`4`
`4`	`5`	`struct SuggestionFeatureDisabledLanguageListView: View {`
`5`	`6`	`final class Settings: ObservableObject {`
`@@ -68,6 +69,13 @@ struct SuggestionFeatureDisabledLanguageListView: View {`
`68`	`69`	`.buttonStyle(.plain)`
`69`	`70`	`}`
`70`	`71`	`}`
	`72`	`+ .modify { view in`
	`73`	`+ if #available(macOS 13.0, *) {`
	`74`	`+ view.listRowSeparator(.hidden).listSectionSeparator(.hidden)`
	`75`	`+ } else {`
	`76`	`+ view`
	`77`	`+ }`
	`78`	`+ }`
`71`	`79`	`}`
`72`	`80`	`.removeBackground()`
`73`	`81`	`.overlay {`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+import SharedUIComponents`
`1`	`2`	`import SwiftUI`
`2`	`3`
`3`	`4`	`struct SuggestionFeatureEnabledProjectListView: View {`
`@@ -67,6 +68,13 @@ struct SuggestionFeatureEnabledProjectListView: View {`
`67`	`68`	`.buttonStyle(.plain)`
`68`	`69`	`}`
`69`	`70`	`}`
	`71`	`+ .modify { view in`
	`72`	`+ if #available(macOS 13.0, *) {`
	`73`	`+ view.listRowSeparator(.hidden).listSectionSeparator(.hidden)`
	`74`	`+ } else {`
	`75`	`+ view`
	`76`	`+ }`
	`77`	`+ }`
`70`	`78`	`}`
`71`	`79`	`.removeBackground()`
`72`	`80`	`.overlay {`