sheet 关闭按钮

ming1016 · Jun 3, 2024 · 9390b17 · 9390b17
1 parent 9abd0e9
commit 9390b17
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 12 deletions.
diff --git a/SwiftPamphletApp/InfoOrganizer/Info/EditInfoView.swift b/SwiftPamphletApp/InfoOrganizer/Info/EditInfoView.swift
@@ -17,6 +17,7 @@ import SMUI
 
 struct EditInfoView: View {
     @Environment(\.modelContext) var modelContext
+    @Environment(\.dismiss) var dismiss
     @Bindable var info: IOInfo
     @Query(IOCategory.all) var categories: [IOCategory]
     @State private var showSheet = false
@@ -341,14 +342,15 @@ struct EditInfoView: View {
                             .padding(.leading, 1)
                         }
                         .padding(2)
-                        Button(action: {
-                            showSheet = false
-                        }, label: {
-                            Label("关闭", systemImage: "xmark.circle")
-                        })
-                        .padding(2)
                     }
                     .padding(20)
+                    .toolbar {
+                        ToolbarItem(placement: .cancellationAction) {
+                            Button("关闭", systemImage: "xmark") {
+                                showSheet = false
+                            }
+                        }
+                    }
                 })
                 .keyboardShortcut(KeyEquivalent("s"), modifiers: .command)
             }

diff --git a/SwiftPamphletApp/InfoOrganizer/Info/InfoListView.swift b/SwiftPamphletApp/InfoOrganizer/Info/InfoListView.swift
@@ -157,12 +157,13 @@ struct InfoListView: View {
                     .padding(.leading, 1)
                 }
                 .padding(2)
-                Button(action: {
-                    showSheet = false
-                }, label: {
-                    Label("关闭", systemImage: "xmark.circle")
-                })
-                .padding(2)
+            }
+            .toolbar {
+                ToolbarItem(placement: .cancellationAction) {
+                    Button("关闭", systemImage: "xmark") {
+                        showSheet = false
+                    }
+                }
             }
             .padding(20)
         })

diff --git a/SwiftPamphletApp/Resource/Guide/SwiftUI/浮层组件/Sheet(ap).md b/SwiftPamphletApp/Resource/Guide/SwiftUI/浮层组件/Sheet(ap).md
@@ -296,6 +296,18 @@ struct ShoppingCartDetailView: View {
 }
 ```
 
+## 添加工具栏按钮
+
+```swift
+.toolbar {
+    ToolbarItem(placement: .cancellationAction) {
+        Button("关闭", systemImage: "xmark") {
+            showSheet = false
+        }
+    }
+}
+```
+
 
 ## 多 Sheet