fix dismiss button

Author: KC-2001MS

Sample/Sample/ContentView.swift

@@ -116,19 +116,19 @@ struct ContentView: View {
             .navigationTitle("OnboardingUI")
             .formStyle(.grouped)
         }
-        .sheet(isPresented: $appVersionManager.isTheFirstLaunch) {
+        .sheet(isPresented: $appVersionManager.isTheFirstActivation) {
             WelcomeOnboardingSheetView(action: {
-                appVersionManager.isTheFirstLaunch = false
+                appVersionManager.isTheFirstActivation = false
             })
         }
         .sheet(isPresented: $appVersionManager.isMajorVersionUpdated) {
             NewFeatureOnboardingSheetView(action: {
                 appVersionManager.isMajorVersionUpdated = false
             })
         }
-        .sheet(isPresented: $appVersionManager.isMinorVersionUpdated) {
+        .sheet(isPresented: $appVersionManager.isMinorOrPatchVersionUpdated) {
             NewFeatureOnboardingSheetView(action: {
-                appVersionManager.isMinorVersionUpdated = false
+                appVersionManager.isMinorOrPatchVersionUpdated = false
             })
         }
         .onboardingSheet(isPresented: $isOpenSheet, WelcomeOnboarding())

Sources/OnboardingUI/Processing/Onboarding.swift

@@ -175,48 +175,3 @@ public struct Feature: Identifiable, Sendable {
         .init(title: self.title, image: self.image, message: Text(key, tableName: tableName, bundle: bundle, comment: comment))
     }
 }
-/// Result builder that allows you to freely build Feature structures
-@available(iOS 17.0,macOS 14.0,tvOS 17.0,visionOS 1.0,*)
-/// A result builder to construct onboarding features.
-@resultBuilder
-public struct FeatureBuilder {
-    /// Required in resultBuilder
-    /// Combines multiple Features into an array.
-    /// - Parameter parts: A variadic list of Features.
-    /// - Returns: An array of Features.
-    public static func buildBlock(_ parts: Feature...) -> Array<Feature> {
-        parts
-    }
-    /// Enable if
-    /// Handles optional Feature arrays.
-    /// - Parameter parts: An optional array of Features.
-    /// - Returns: The first Feature or a default Feature.
-    public static func buildOptional(_ parts: [Feature]?) -> Feature {
-        parts?.first ?? Feature()
-    }
-    /// Enable if-else (first branch)
-    /// - Parameter parts: An array of Features.
-    /// - Returns: The first Feature or a default Feature.
-    public static func buildEither(first parts: [Feature]) -> Feature {
-        parts.first ?? Feature()
-    }
-    /// Enable if-else (second branch)
-    /// - Parameter parts: An array of Features.
-    /// - Returns: The first Feature or a default Feature.
-    public static func buildEither(second parts: [Feature]) -> Feature {
-        parts.first ?? Feature()
-    }
-    /// Enable for-in
-    /// - Parameter parts: An array of Feature arrays.
-    /// - Returns: The first Feature from the first array or a default Feature.
-    public static func buildArray(_ parts: [[Feature]]) -> Feature {
-        parts.first?.first ?? Feature()
-    }
-    /// Enable #if
-    /// - Parameter parts: An array of Features.
-    /// - Returns: The array of Features.
-    public static func buildLimitedAvailability(_ parts: [Feature]) -> Array<Feature> {
-        parts
-    }
-}
-

Sources/OnboardingUI/UI/Style/OnboardingViewStyle.swift

@@ -45,20 +45,20 @@ public struct OnboardingViewStyleConfiguration: Sendable {
 
     var footer: Footer
 
-    var dismissButton: DismissButton
+    var dismissLabel: DismissLabel
 
     init(
         dynamicTypeSize: DynamicTypeSize,
         title: Title,
         content: Content,
         footer: Footer ,
-        dismissButton: DismissButton
+        dismissLabel: DismissLabel
     ) {
         self.dynamicTypeSize = dynamicTypeSize
         self.title = title
         self.content = content
         self.footer = footer
-        self.dismissButton = dismissButton
+        self.dismissLabel = dismissLabel
     }
 
     struct Title: View, Sendable {
@@ -157,7 +157,7 @@ public struct OnboardingViewStyleConfiguration: Sendable {
         }
     }
 
-    @preconcurrency public struct DismissButton: View, Sendable {
+    @preconcurrency public struct DismissLabel: View, Sendable {
         @Environment(\.dismiss) var dismiss
 
         var text: Text
@@ -167,21 +167,7 @@ public struct OnboardingViewStyleConfiguration: Sendable {
         }
 
         public var body: some View {
-            Button {
-                dismiss()
-            } label: {
-                text
-            }
-        }
-
-        public func callAsFunction<V: View>(
-            @ViewBuilder content: (Text) -> V
-        ) -> some View {
-            Button {
-                dismiss()
-            } label: {
-                content(text)
-            }
+            text
         }
     }
 }

Sources/OnboardingUI/UI/Style/OnboardingViewStyle/BasicOnboardingViewStyle.swift

@@ -87,12 +87,13 @@ public struct BasicOnboardingViewStyle: OnboardingViewStyle {
                     if configuration.dynamicTypeSize > .xxxLarge {
                         configuration.footer
 
-                        configuration.dismissButton { text in
-                            text
+                        DismissButton {
+                            configuration.dismissLabel
                                 .frame(maxWidth: .infinity)
                                 .padding(.vertical, 10)
                         }
                         .buttonStyle(.borderedProminent)
+                        .padding(.horizontal, 40)
                     }
                 }
                 .frame(maxWidth: .infinity, maxHeight: .infinity)
@@ -104,8 +105,8 @@ public struct BasicOnboardingViewStyle: OnboardingViewStyle {
                 VStack(alignment: .center, spacing: 25) {
                     configuration.footer
 
-                    configuration.dismissButton { text in
-                        text
+                    DismissButton {
+                        configuration.dismissLabel
                             .frame(maxWidth: .infinity)
                             .padding(.vertical, 10)
                     }

Sources/OnboardingUI/UI/Style/OnboardingViewStyle/ClassicOnboardingViewStyle.swift

@@ -71,7 +71,9 @@ public struct ClassicOnboardingViewStyle: OnboardingViewStyle {
                         if configuration.dynamicTypeSize > .xxxLarge {
                             configuration.footer
 
-                            configuration.dismissButton
+                            DismissButton {
+                                configuration.dismissLabel
+                            }
                                 .buttonStyle(ColorButtonStyle())
 #if os(iOS)
                                 .padding(
@@ -106,7 +108,9 @@ public struct ClassicOnboardingViewStyle: OnboardingViewStyle {
 #endif
 #endif
 
-                    configuration.dismissButton
+                    DismissButton {
+                        configuration.dismissLabel
+                    }
                         .buttonStyle(ColorButtonStyle())
 #if os(iOS)
                         .padding(

Sources/OnboardingUI/UI/Style/OnboardingViewStyle/ColoredGlassOnboardingViewStyle.swift

@@ -87,12 +87,13 @@ public struct ColoredGlassOnboardingViewStyle: OnboardingViewStyle {
                     if configuration.dynamicTypeSize > .xxxLarge {
                         configuration.footer
 
-                        configuration.dismissButton { text in
-                            text
+                        DismissButton {
+                            configuration.dismissLabel
                                 .frame(maxWidth: .infinity)
                                 .padding(.vertical, 10)
                         }
                         .buttonStyle(.glassProminent)
+                        .padding(.horizontal, 40)
                     }
                 }
                 .frame(maxWidth: .infinity, maxHeight: .infinity)
@@ -104,8 +105,8 @@ public struct ColoredGlassOnboardingViewStyle: OnboardingViewStyle {
                 VStack(alignment: .center, spacing: 25) {
                     configuration.footer
 
-                    configuration.dismissButton { text in
-                        text
+                    DismissButton {
+                        configuration.dismissLabel
                             .frame(maxWidth: .infinity)
                             .padding(.vertical, 10)
                     }

Sources/OnboardingUI/UI/Style/OnboardingViewStyle/GlassOnboardingViewStyle.swift

@@ -86,13 +86,13 @@ public struct GlassOnboardingViewStyle: OnboardingViewStyle {
 
                     if configuration.dynamicTypeSize > .xxxLarge {
                         configuration.footer
-                        
-                        configuration.dismissButton { text in
-                            text
+                        DismissButton {
+                            configuration.dismissLabel
                                 .frame(maxWidth: .infinity)
                                 .padding(.vertical, 10)
                         }
                         .buttonStyle(.glass)
+                        .padding(.horizontal, 40)
                     }
                 }
                 .frame(maxWidth: .infinity, maxHeight: .infinity)
@@ -104,8 +104,8 @@ public struct GlassOnboardingViewStyle: OnboardingViewStyle {
                 VStack(alignment: .center, spacing: 25) {
                     configuration.footer
 
-                    configuration.dismissButton { text in
-                        text
+                    DismissButton {
+                        configuration.dismissLabel
                             .frame(maxWidth: .infinity)
                             .padding(.vertical, 10)
                     }

Sources/OnboardingUI/UI/View/OnboardingView.swift

@@ -34,7 +34,7 @@ public struct OnboardingView<O: Onboarding>: View {
                             link
                         }
                     },
-                    dismissButton: .init(text: Text("Continue", bundle: .module))
+                    dismissLabel: .init(text: Text("Continue", bundle: .module))
                 )
             )
     }

Sources/OnboardingUI/UI/View/Parts/DismissButton.swift

@@ -0,0 +1,26 @@
+//
+//  DismissButton.swift
+//  OnboardingUI
+//
+//  Created by 茅根 啓介 on 2025/07/30.
+//
+
+import SwiftUI
+
+public struct DismissButton<V: View>: View {
+    @Environment(\.dismiss) private var dismiss
+    
+    var label: V
+    
+    init(@ViewBuilder label: () -> V) {
+        self.label = label()
+    }
+    
+    public var body: some View {
+        Button {
+            dismiss()
+        } label: {
+            label
+        }
+    }
+}