Update sample

pixiv · Nov 26, 2024 · e7cf4a0 · e7cf4a0
1 parent 55fc4b1
commit e7cf4a0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/CharcoalSwiftUISample/Sources/CharcoalSwiftUISample/HintsView.swift b/CharcoalSwiftUISample/Sources/CharcoalSwiftUISample/HintsView.swift
@@ -7,6 +7,8 @@ public struct HintsView: View {
     @State var isPresented2 = true
 
     @State var isPresented3 = true
+
+    @State var isPresented4 = true
 
     public var body: some View {
         ScrollView {
@@ -17,7 +19,11 @@ public struct HintsView: View {
 
                 CharcoalHint(text: "ヒントテキストヒントテキスト", isPresenting: $isPresented2)
 
-                CharcoalHint(text: "ヒントテキストヒントテキスト", maxWidth: .infinity, isPresenting: $isPresented3)
+                CharcoalHint(text: "ヒントテキストヒントテキスト", maxWidth: .infinity, isPresenting: $isPresented3, alignment: .leading)
+
+                CharcoalHint(text: "ヒントテキストヒントテキスト", maxWidth: .infinity, isPresenting: $isPresented4, buttonStyle: .default, action: CharcoalAction(title: "Button") {
+                    isPresented = false
+                })
             }
             .padding()
         }

diff --git a/Sources/CharcoalSwiftUI/Components/Hint/CharcoalHint.swift b/Sources/CharcoalSwiftUI/Components/Hint/CharcoalHint.swift
@@ -29,9 +29,9 @@ public struct CharcoalHint: View {
         subtitle: String? = nil,
         maxWidth: CGFloat? = nil,
         isPresenting: Binding<Bool>,
-        action: CharcoalAction? = nil,
         alignment: Alignment = .center,
-        buttonStyle: CharcoalButtonStyle = .primary(Color(CharcoalAsset.ColorPaletteGenerated.brand.color))
+        buttonStyle: CharcoalButtonStyle = .primary(Color(CharcoalAsset.ColorPaletteGenerated.brand.color)),
+        action: CharcoalAction? = nil
     ) {
         self.text = text
         self.subtitle = subtitle
@@ -85,9 +85,9 @@ public struct CharcoalHint: View {
                 isPresenting = false
             }))
 
-            CharcoalHint(text: "ヒントテキストヒントテキスト", isPresenting: $isPresenting2, action: CharcoalAction(title: "Button", actionCallback: {
+            CharcoalHint(text: "ヒントテキストヒントテキスト", isPresenting: $isPresenting2, buttonStyle: .default, action: CharcoalAction(title: "Button", actionCallback: {
                 isPresenting2 = false
-            }), buttonStyle: .default)
+            }))
 
             CharcoalHint(text: "ヒントテキストヒントテキスト", isPresenting: $isPresenting3)