From d1455c5e0f0dbd88792f7a34e028220d0578de57 Mon Sep 17 00:00:00 2001
From: Quan Tran <quan@shousio.com>
Date: Sat, 10 Aug 2024 10:08:51 -0700
Subject: [PATCH 1/5] Update everything

---
 .../xcshareddata/xcschemes/ToastUI.xcscheme   |   2 +-
 CHANGELOG.md                                  |  31 +-
 Package.swift                                 |   8 +-
 Sources/ToastUI/DefaultToastViewStyle.swift   |  41 +-
 Sources/ToastUI/Introspection.swift           |  74 ---
 .../ToastUI/ToastPresentationAnimator.swift   | 112 -----
 Sources/ToastUI/ToastUI.docc/About.md         | 154 ++++---
 .../ToastUI/ToastUI.docc/GettingStarted.md    | 170 ++++---
 Sources/ToastUI/ToastUI.docc/Info.plist       |   2 +-
 Sources/ToastUI/ToastUI.docc/ToastUI.md       |  23 +-
 Sources/ToastUI/ToastUI.docc/ToastUISample.md |  15 +-
 Sources/ToastUI/ToastUI.swift                 |  26 +-
 Sources/ToastUI/ToastView.swift               |  23 +-
 Sources/ToastUI/ToastViewBridge.swift         |  61 +++
 Sources/ToastUI/ToastViewController.swift     | 240 ++++++++++
 .../ToastUI/ToastViewHostingController.swift  |  23 +-
 Sources/ToastUI/ToastViewModifier.swift       | 425 ------------------
 Sources/ToastUI/ToastViewStyle.swift          |  10 +-
 .../ToastUISample.xcodeproj/project.pbxproj   |  27 +-
 .../xcschemes/ToastUISample-iOS.xcscheme      |   2 +-
 .../xcschemes/ToastUISample-macOS.xcscheme    |   2 +-
 .../xcschemes/ToastUISample-tvOS.xcscheme     |   2 +-
 .../xcschemes/ToastUITests.xcscheme           |  55 +++
 .../ToastUISample/AdvancedExamples.swift      |  12 +-
 ToastUISample/ToastUISample/Auxiliaries.swift |  14 +-
 .../ToastUISample/BasicExamples.swift         |   8 +-
 toastui                                       |  13 +-
 27 files changed, 706 insertions(+), 869 deletions(-)
 delete mode 100644 Sources/ToastUI/Introspection.swift
 delete mode 100644 Sources/ToastUI/ToastPresentationAnimator.swift
 create mode 100644 Sources/ToastUI/ToastViewBridge.swift
 create mode 100644 Sources/ToastUI/ToastViewController.swift
 delete mode 100644 Sources/ToastUI/ToastViewModifier.swift
 create mode 100644 ToastUISample/ToastUISample.xcodeproj/xcshareddata/xcschemes/ToastUITests.xcscheme

diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/ToastUI.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/ToastUI.xcscheme
index 78e3973..1bedd2e 100644
--- a/.swiftpm/xcode/xcshareddata/xcschemes/ToastUI.xcscheme
+++ b/.swiftpm/xcode/xcshareddata/xcschemes/ToastUI.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1230"
+   LastUpgradeVersion = "1530"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 63ec005..e7cd0a1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file. `ToastUI` adheres to [Semantic Versioning](https://semver.org/).
 
+#### 4.x Releases
+
+* `4.0.x` Releases - [4.0.0](#400))
+
 #### 3.x Releases
 
 * `3.0.x` Releases - [3.0.0](#300) | [3.0.1](#301)
@@ -19,6 +23,27 @@ All notable changes to this project will be documented in this file. `ToastUI` a
 
 ---
 
+## [4.0.0](https://github.com/quanshousio/ToastUI/releases/tag/4.0.0)
+
+Released on 2024-06-01.
+
+#### Changed
+
+* Minimum required version for Swift is 5.7.
+
+#### Added
+
+* Support for visionOS. Minimum required version for visionOS is 1.0.
+
+#### Updated
+
+* Refactor the core implementation.
+* Toasts now dismiss immediately, even during transitions.
+* Documentation to use new DocC version.
+* Remove padding from the background in DefaultToastView.
+
+---
+
 ## [3.0.1](https://github.com/quanshousio/ToastUI/releases/tag/3.0.1)
 
 Released on 2022-07-19.
@@ -26,14 +51,14 @@ Released on 2022-07-19.
 #### Updated
 
 * Remove `fixedSize` modifier from `Label` in `DefaultToastView`.
-* Add new AppIcon.
+* Add a new AppIcon.
 
 ## [3.0.0](https://github.com/quanshousio/ToastUI/releases/tag/3.0.0)
 
 Released on 2022-04-11.
 
 #### Changed
-
+  
 * Minimum required version for Swift is 5.5.
 * Visual changes:
   * ToastUI shows a dimmed background when presenting a toast instead of a blurred background. This replicates the behavior of a normal `UIAlertController`.
@@ -57,7 +82,7 @@ Released on 2022-04-11.
 
 #### Added
 
-* Support for watchOS. Minimum required version for watchOS is 7.0
+* Support for watchOS. Minimum required version for watchOS is 7.0.
 * Static property/function for all built-in styles to leverage the new static member lookup functionality.
 * `toastDimmedBackground` modifier for enabling or disabling the dimmed background.
 * `IconToastViewStyle` style for showing a toast with an icon and a headline text label.
diff --git a/Package.swift b/Package.swift
index ae0ddb0..529527e 100644
--- a/Package.swift
+++ b/Package.swift
@@ -1,16 +1,16 @@
-// swift-tools-version:5.5
+// swift-tools-version:5.7
 
 import PackageDescription
 
 let package = Package(
   name: "ToastUI",
   platforms: [
-    .iOS(.v14), .tvOS(.v14), .watchOS(.v7), .macOS(.v11)
+    .iOS(.v14), .tvOS(.v14), .watchOS(.v7), .macOS(.v11),
   ],
   products: [
-    .library(name: "ToastUI", targets: ["ToastUI"])
+    .library(name: "ToastUI", targets: ["ToastUI"]),
   ],
   targets: [
-    .target(name: "ToastUI")
+    .target(name: "ToastUI"),
   ]
 )
diff --git a/Sources/ToastUI/DefaultToastViewStyle.swift b/Sources/ToastUI/DefaultToastViewStyle.swift
index 84903fe..64bf1f6 100644
--- a/Sources/ToastUI/DefaultToastViewStyle.swift
+++ b/Sources/ToastUI/DefaultToastViewStyle.swift
@@ -12,7 +12,7 @@ struct AnyToastViewStyle: ToastViewStyle {
   private let _makeBody: (Configuration) -> AnyView
 
   /// Creates a ``AnyToastViewStyle``.
-  init<Style>(_ style: Style) where Style: ToastViewStyle {
+  init(_ style: some ToastViewStyle) {
     _makeBody = { configuration in
       AnyView(style.makeBody(configuration: configuration))
     }
@@ -29,7 +29,7 @@ struct AnyToastViewStyle: ToastViewStyle {
 /// The default style of ``ToastView``.
 ///
 /// Use this style to customize ``ToastView``.
-@available(iOS 14.0, macOS 11.0, tvOS 14.0, watchOS 7.0, *)
+@available(iOS 14.0, macOS 11.0, tvOS 14.0, watchOS 7.0, visionOS 1.0, *)
 public struct DefaultToastViewStyle: ToastViewStyle {
   /// Creates a ``DefaultToastViewStyle``.
   public init() {}
@@ -48,7 +48,7 @@ public struct DefaultToastViewStyle: ToastViewStyle {
   }
 }
 
-@available(iOS 14.0, macOS 11.0, tvOS 14.0, watchOS 7.0, *)
+@available(iOS 14.0, macOS 11.0, tvOS 14.0, watchOS 7.0, visionOS 1.0, *)
 public extension ToastViewStyle where Self == DefaultToastViewStyle {
   /// The default style of ``ToastView``.
   ///
@@ -60,7 +60,7 @@ public extension ToastViewStyle where Self == DefaultToastViewStyle {
 
 /// A ``ToastView`` represents as an indeterminate circular progress indicator,
 /// also informally known as a spinner.
-@available(iOS 14.0, macOS 11.0, tvOS 14.0, watchOS 7.0, *)
+@available(iOS 14.0, macOS 11.0, tvOS 14.0, watchOS 7.0, visionOS 1.0, *)
 public struct IndeterminateProgressToastViewStyle: ToastViewStyle {
   /// Creates an ``IndeterminateProgressToastViewStyle``.
   public init() {}
@@ -78,7 +78,7 @@ public struct IndeterminateProgressToastViewStyle: ToastViewStyle {
     @ScaledMetric private var iconSize: Double = 36
     @ScaledMetric private var strokeSize: Double = 3
 
-    @State private var animating: Bool = false
+    @State private var animating = false
 
     var body: some View {
       DefaultToastView {
@@ -96,7 +96,10 @@ public struct IndeterminateProgressToastViewStyle: ToastViewStyle {
           .frame(width: iconSize, height: iconSize)
           .rotationEffect(.degrees(-90))
           .rotationEffect(.degrees(animating ? 360 : 0))
-          .animation(.linear(duration: 1.0).repeatForever(autoreverses: false), value: animating)
+          .animation(
+            .linear(duration: 1.0).repeatForever(autoreverses: false),
+            value: animating
+          )
           .onAppear {
             // fix #2
             DispatchQueue.main.async {
@@ -114,7 +117,7 @@ public struct IndeterminateProgressToastViewStyle: ToastViewStyle {
   }
 }
 
-@available(iOS 14.0, macOS 11.0, tvOS 14.0, watchOS 7.0, *)
+@available(iOS 14.0, macOS 11.0, tvOS 14.0, watchOS 7.0, visionOS 1.0, *)
 public extension ToastViewStyle where Self == IndeterminateProgressToastViewStyle {
   /// A ``ToastView`` represents as an indeterminate circular progress indicator,
   /// also informally known as a spinner.
@@ -126,7 +129,7 @@ public extension ToastViewStyle where Self == IndeterminateProgressToastViewStyl
 /// A ``ToastView`` represents as a determinate circular progress indicator.
 /// This style is visually similar to the ``IndeterminateProgressToastViewStyle``,
 /// but shows determinate progress instead.
-@available(iOS 14.0, macOS 11.0, tvOS 14.0, watchOS 7.0, *)
+@available(iOS 14.0, macOS 11.0, tvOS 14.0, watchOS 7.0, visionOS 1.0, *)
 public struct DeterminateProgressToastViewStyle<Value>: ToastViewStyle
 where Value: BinaryFloatingPoint {
   @Binding private var value: Value
@@ -187,7 +190,7 @@ where Value: BinaryFloatingPoint {
   }
 }
 
-@available(iOS 14.0, macOS 11.0, tvOS 14.0, watchOS 7.0, *)
+@available(iOS 14.0, macOS 11.0, tvOS 14.0, watchOS 7.0, visionOS 1.0, *)
 public extension ToastViewStyle {
   /// A ``ToastView`` represents as a determinate circular progress indicator.
   /// This style is similar to the ``IndeterminateProgressToastViewStyle``,
@@ -206,7 +209,7 @@ public extension ToastViewStyle {
 }
 
 /// A ``ToastView`` represents as a toast consists of an icon and a headline text label.
-@available(iOS 14.0, macOS 11.0, tvOS 14.0, watchOS 7.0, *)
+@available(iOS 14.0, macOS 11.0, tvOS 14.0, watchOS 7.0, visionOS 1.0, *)
 public struct IconToastViewStyle<Content>: ToastViewStyle where Content: View {
   private var content: Content
 
@@ -246,7 +249,7 @@ public struct IconToastViewStyle<Content>: ToastViewStyle where Content: View {
   }
 }
 
-@available(iOS 14.0, macOS 11.0, tvOS 14.0, watchOS 7.0, *)
+@available(iOS 14.0, macOS 11.0, tvOS 14.0, watchOS 7.0, visionOS 1.0, *)
 public extension ToastViewStyle {
   /// A ``ToastView`` represents as a toast consists of an icon and a headline text label.
   ///
@@ -259,7 +262,7 @@ public extension ToastViewStyle {
 }
 
 /// A ``ToastView`` represents as a success toast.
-@available(iOS 14.0, macOS 11.0, tvOS 14.0, watchOS 7.0, *)
+@available(iOS 14.0, macOS 11.0, tvOS 14.0, watchOS 7.0, visionOS 1.0, *)
 public struct SuccessToastViewStyle: ToastViewStyle {
   /// Creates a ``SuccessToastViewStyle``.
   public init() {}
@@ -276,7 +279,7 @@ public struct SuccessToastViewStyle: ToastViewStyle {
   }
 }
 
-@available(iOS 14.0, macOS 11.0, tvOS 14.0, watchOS 7.0, *)
+@available(iOS 14.0, macOS 11.0, tvOS 14.0, watchOS 7.0, visionOS 1.0, *)
 public extension ToastViewStyle where Self == SuccessToastViewStyle {
   /// A ``ToastView`` represents as a success toast.
   static var success: Self {
@@ -285,7 +288,7 @@ public extension ToastViewStyle where Self == SuccessToastViewStyle {
 }
 
 /// A ``ToastView`` represents as a failure toast.
-@available(iOS 14.0, macOS 11.0, tvOS 14.0, watchOS 7.0, *)
+@available(iOS 14.0, macOS 11.0, tvOS 14.0, watchOS 7.0, visionOS 1.0, *)
 public struct FailureToastViewStyle: ToastViewStyle {
   /// Creates a ``FailureToastViewStyle``.
   public init() {}
@@ -302,7 +305,7 @@ public struct FailureToastViewStyle: ToastViewStyle {
   }
 }
 
-@available(iOS 14.0, macOS 11.0, tvOS 14.0, watchOS 7.0, *)
+@available(iOS 14.0, macOS 11.0, tvOS 14.0, watchOS 7.0, visionOS 1.0, *)
 public extension ToastViewStyle where Self == FailureToastViewStyle {
   /// A ``ToastView`` represents as a failure toast.
   static var failure: Self {
@@ -311,7 +314,7 @@ public extension ToastViewStyle where Self == FailureToastViewStyle {
 }
 
 /// A ``ToastView`` represents as a warning toast.
-@available(iOS 14.0, macOS 11.0, tvOS 14.0, watchOS 7.0, *)
+@available(iOS 14.0, macOS 11.0, tvOS 14.0, watchOS 7.0, visionOS 1.0, *)
 public struct WarningToastViewStyle: ToastViewStyle {
   /// Creates a ``WarningToastViewStyle``.
   public init() {}
@@ -328,7 +331,7 @@ public struct WarningToastViewStyle: ToastViewStyle {
   }
 }
 
-@available(iOS 14.0, macOS 11.0, tvOS 14.0, watchOS 7.0, *)
+@available(iOS 14.0, macOS 11.0, tvOS 14.0, watchOS 7.0, visionOS 1.0, *)
 public extension ToastViewStyle where Self == WarningToastViewStyle {
   /// A ``ToastView`` represents as a warning toast.
   static var warning: Self {
@@ -337,7 +340,7 @@ public extension ToastViewStyle where Self == WarningToastViewStyle {
 }
 
 /// A ``ToastView`` represents as an information toast.
-@available(iOS 14.0, macOS 11.0, tvOS 14.0, watchOS 7.0, *)
+@available(iOS 14.0, macOS 11.0, tvOS 14.0, watchOS 7.0, visionOS 1.0, *)
 public struct InformationToastViewStyle: ToastViewStyle {
   /// Creates an ``InformationToastViewStyle``.
   public init() {}
@@ -354,7 +357,7 @@ public struct InformationToastViewStyle: ToastViewStyle {
   }
 }
 
-@available(iOS 14.0, macOS 11.0, tvOS 14.0, watchOS 7.0, *)
+@available(iOS 14.0, macOS 11.0, tvOS 14.0, watchOS 7.0, visionOS 1.0, *)
 public extension ToastViewStyle where Self == InformationToastViewStyle {
   /// A ``ToastView`` represents as an information toast.
   static var information: Self {
diff --git a/Sources/ToastUI/Introspection.swift b/Sources/ToastUI/Introspection.swift
deleted file mode 100644
index 405ad8b..0000000
--- a/Sources/ToastUI/Introspection.swift
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-//  Introspection.swift
-//  ToastUI
-//
-//  Created by Quan Tran on 8/13/21.
-//
-
-import SwiftUI
-
-#if os(iOS) || os(tvOS)
-struct IntrospectionViewController: UIViewControllerRepresentable {
-  let targetViewController: (UIViewController) -> Void
-
-  init(targetViewController: @escaping (UIViewController) -> Void) {
-    self.targetViewController = targetViewController
-  }
-
-  func makeUIViewController(context _: Context) -> UIViewController {
-    UIViewController()
-  }
-
-  func updateUIViewController(_ uiViewController: UIViewController, context _: Context) {
-    DispatchQueue.main.async {
-      targetViewController(uiViewController)
-    }
-  }
-}
-
-extension View {
-  func introspectViewController(
-    targetViewController: @escaping (UIViewController) -> Void
-  ) -> some View {
-    background(
-      IntrospectionViewController(targetViewController: targetViewController)
-        .frame(width: 0, height: 0)
-        .disabled(true)
-    )
-  }
-}
-#endif
-
-#if os(macOS)
-struct IntrospectionViewController: NSViewControllerRepresentable {
-  let targetViewController: (NSViewController) -> Void
-
-  init(targetViewController: @escaping (NSViewController) -> Void) {
-    self.targetViewController = targetViewController
-  }
-
-  func makeNSViewController(context _: Context) -> NSViewController {
-    let viewController = NSViewController()
-    viewController.view = NSView()
-    return viewController
-  }
-
-  func updateNSViewController(_ nsViewController: NSViewController, context _: Context) {
-    DispatchQueue.main.async {
-      targetViewController(nsViewController)
-    }
-  }
-}
-
-extension View {
-  func introspectViewController(
-    targetViewController: @escaping (NSViewController) -> Void
-  ) -> some View {
-    background(
-      IntrospectionViewController(targetViewController: targetViewController)
-        .frame(width: 0, height: 0)
-        .disabled(true)
-    )
-  }
-}
-#endif
diff --git a/Sources/ToastUI/ToastPresentationAnimator.swift b/Sources/ToastUI/ToastPresentationAnimator.swift
deleted file mode 100644
index 6e0beb8..0000000
--- a/Sources/ToastUI/ToastPresentationAnimator.swift
+++ /dev/null
@@ -1,112 +0,0 @@
-//
-//  ToastPresentationAnimator.swift
-//  ToastUI
-//
-//  Created by Quan Tran on 9/30/21.
-//
-
-#if os(macOS)
-import CoreImage.CIFilterBuiltins
-import SwiftUI
-
-class ToastContainerView: NSView {}
-
-class ToastDimmingView: NSView {
-  var dimmedBackground = true
-
-  override func hitTest(_ point: NSPoint) -> NSView? {
-    super.hitTest(point)?.superview
-  }
-
-  override var wantsUpdateLayer: Bool {
-    true
-  }
-
-  override func updateLayer() {
-    let dimmedBackgroundColor = NSColor(name: nil) { appearance in
-      appearance.name == .aqua
-        ? .lightGray.withAlphaComponent(0.6)
-        : .init(deviceWhite: 0.075, alpha: 0.6)
-    }.cgColor
-    layer?.backgroundColor = dimmedBackground ? dimmedBackgroundColor : .clear
-
-    let filter = CIFilter.colorControls()
-    filter.saturation = 0
-    layer?.backgroundFilters = [filter]
-  }
-}
-
-class ToastPresentationAnimator: NSObject, NSViewControllerPresentationAnimator {
-  var dimmedBackground = true
-
-  private var fromView: NSView!
-  private var dimmingView: ToastDimmingView!
-
-  func animatePresentation(
-    of viewController: NSViewController,
-    from fromViewController: NSViewController
-  ) {
-    /*
-     expected view hierarchy after presentation
-     NSHostingController
-     + ToastContainerView
-     | + NSHostingView<RootView>
-     | + ToastDimmingView
-     | + ToastViewHostingController
-     | | + NSHostingView<ToastView>
-     */
-    fromView = fromViewController.view
-
-    let containerView = ToastContainerView()
-    containerView.frame = fromView.bounds
-    containerView.autoresizingMask = [.width, .height]
-
-    dimmingView = ToastDimmingView()
-    dimmingView.frame = containerView.bounds
-    dimmingView.autoresizingMask = [.width, .height]
-    dimmingView.alphaValue = 0
-    dimmingView.dimmedBackground = dimmedBackground
-
-    viewController.view.frame = containerView.bounds
-    viewController.view.autoresizingMask = [.width, .height]
-    viewController.view.alphaValue = 0
-
-    fromViewController.addChild(viewController)
-    fromViewController.view = containerView
-
-    containerView.addSubview(fromView)
-    containerView.addSubview(dimmingView)
-    containerView.addSubview(viewController.view)
-
-    NSAnimationContext.runAnimationGroup { context in
-      context.duration = 0.4
-      dimmingView.animator().alphaValue = 1
-      viewController.view.animator().alphaValue = 1
-    }
-  }
-
-  func animateDismissal(
-    of viewController: NSViewController,
-    from fromViewController: NSViewController
-  ) {
-    /*
-     expected view hierarchy after dismissal
-     NSHostingController
-     + NSHostingView<RootView>
-     */
-    NSAnimationContext.runAnimationGroup { context in
-      context.duration = 0.4
-      fromView.animator().alphaValue = 1
-      dimmingView.animator().alphaValue = 0
-      dimmingView.animator().layer?.backgroundFilters = []
-      viewController.view.animator().alphaValue = 0
-    } completionHandler: {
-      fromViewController.view.subviews.forEach { view in
-        view.removeFromSuperview()
-      }
-      viewController.removeFromParent()
-      fromViewController.view = self.fromView
-    }
-  }
-}
-#endif
diff --git a/Sources/ToastUI/ToastUI.docc/About.md b/Sources/ToastUI/ToastUI.docc/About.md
index ebfc081..0438ed5 100644
--- a/Sources/ToastUI/ToastUI.docc/About.md
+++ b/Sources/ToastUI/ToastUI.docc/About.md
@@ -21,61 +21,53 @@ Function | Description
 
 ### ToastView
 
-``ToastView`` is visually represented as a rounded rectangle shape that contains your provided views.
+<doc:ToastView> is visually represented as a rounded rectangle shape that contains your provided views.
 
-![Default Toast View](toastview-default.png)
-
-```swift
-.toast(isPresented: $presentingToast, dismissAfter: 2.0) {
-  ToastView("Hello from ToastUI")
+@Row {
+  @Column(size: 2) {
+    ```swift
+    .toast(isPresented: $presentingToast, dismissAfter: 2.0) {
+      ToastView("Hello from ToastUI")
+    }
+    ```
+  }
+  
+  @Column {
+    @Image(source: "toastview-default.png", alt: "Default Toast View")
+  }
 }
-```
-
-``ToastView`` consists of three different views: `Background`, `Label` and `Content`. All three views are optional and can be empty.
 
-```swift
-╭─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─╮
-│ <Background>          │
-│                       │
-│     ╭─ ─ ─ ─ ─ ─╮     │
-│     │ <Content> │     │
-│     │           │     │
-│     │           │     │
-│     │  <Label>  │     │
-│     ╰─ ─ ─ ─ ─ ─╯     │
-╰─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─╯
-
-ToastView {
-  <Content>
-} label: {
-  <Label>
-} background: {
-  <Background>
-}
-```
-
-![Toast View initialized with all three views](toastview-all.png)
-
-```swift
-.toast(isPresented: $presentingToast, dismissAfter: 2.0) {
-  ToastView {
-    Text("Content")
-  } label: {
-    Text("Label")
-  } background: {
-    ZStack {
-      Color.accentColor
-        .opacity(0.5)
-        .ignoresSafeArea()
-
-      VStack {
-        Text("Background")
-        Spacer()
+<doc:ToastView> consists of three different views: `Background`, `Label` and `Content`. All three views are optional and can be empty.
+
+@Row {
+  @Column(size: 2) {
+    ```swift
+    .toast(isPresented: $presentingToast, dismissAfter: 2.0) {
+      ToastView {
+        Text("Content")
+      } label: {
+        Text("Label")
+      } background: {
+        ZStack {
+          Color.accentColor
+            .opacity(0.5)
+            .ignoresSafeArea()
+
+          VStack {
+            Text("Background")
+            Spacer()
+          }
+        }
       }
     }
+    ```
+  }
+  
+  @Column {
+    @Image(source: "toastview-all.png", alt: "Toast View initialized with all three views")
   }
 }
-```
+
 
 By default, `ToastView` resolves to a `DefaultToastView` internally. `DefaultToastView` has a fixed-size, center-aligned label with content and background provided when initializing.
 
@@ -115,38 +107,56 @@ ToastUI includes various built-in ``ToastViewStyle`` for common purposes such as
 Styles | Shorthand | Description
 --- | --- | ---
 ``DefaultToastViewStyle`` | ``ToastViewStyle/default`` | An empty toast if user does not provide anything. `ToastView` uses this style by default.
-``IndeterminateProgressToastViewStyle`` | ``ToastViewStyle/indeterminate`` | An indefinite circular progress indicator.
-``DeterminateProgressToastViewStyle`` | ``ToastViewStyle/determinate(value:total:)`` | A definite circular progress indicator from `value` to `total`.
+``IndeterminateProgressToastViewStyle`` | ``ToastViewStyle/indeterminate`` | An indeterminate circular progress indicator.
+``DeterminateProgressToastViewStyle`` | ``ToastViewStyle/determinate(value:total:)`` | A determinate circular progress indicator that runs from `value` to `total`.
 ``IconToastViewStyle`` | ``ToastViewStyle/icon(content:)`` | An icon toast.
 ``SuccessToastViewStyle`` | ``ToastViewStyle/success`` | A success toast.
 ``FailureToastViewStyle`` | ``ToastViewStyle/failure`` | A failure toast.
 ``WarningToastViewStyle`` | ``ToastViewStyle/warning`` | A warning toast.
 ``InformationToastViewStyle`` | ``ToastViewStyle/information`` | An information toast.
 
-![Indeterminate Toast View](indeterminate-style.png)
-
-```swift
-.toast(isPresented: $presentingToast, dismissAfter: 2.0) {
-  ToastView("Loading...")
-    .toastViewStyle(.indefinite)
-}
-```
-
-![Icon Toast View](icon-style.png)
-
-```swift
-.toast(isPresented: $presentingToast, dismissAfter: 2.0) {
-  ToastView("Saved")
-    .toastViewStyle(.icon {
-      Image(systemName: "arrow.down.doc.fill")
-        .foregroundColor(.green)
-    })
+@TabNavigator {
+  @Tab("Indeterminate") {
+    @Row {
+      @Column(size: 2) {
+        ```swift
+        .toast(isPresented: $presentingToast, dismissAfter: 2.0) {
+          ToastView("Loading...")
+            .toastViewStyle(.indeterminate)
+        }
+        ```
+      }
+      
+      @Column {
+        @Image(source: "indeterminate-style.png", alt: "Indeterminate Toast View")
+      }
+    }
+  }
+  
+  @Tab("Icon") {
+    @Row {
+      @Column(size: 2) {
+        ```swift
+        .toast(isPresented: $presentingToast, dismissAfter: 2.0) {
+          ToastView("Saved")
+            .toastViewStyle(.icon {
+              Image(systemName: "arrow.down.doc.fill")
+                .foregroundColor(.green)
+            })
+        }
+        ```
+      }
+      
+      @Column {
+        @Image(source: "icon-style.png", alt: "Icon Toast View")
+      }
+    }
+  }
 }
-```
 
-You can also create a custom style by conforming to the `ToastViewStyle` protocol.
+You can also create a custom style by conforming to the ``ToastViewStyle`` protocol.
 
-![Custom Toast View Style](custom-style.png)
+@Image(source: "custom-style.png", alt: "Custom Toast View Style")
 
 ```swift
 struct CustomToastViewStyle: ToastViewStyle {
@@ -216,7 +226,7 @@ struct ContentView: View {
 
 ToastUI shows a dimmed background when presenting a toast by default. You can disable it by using ``ToastView/toastDimmedBackground(_:)`` modifier.
 
-![Toast Dimmed Background](dimmed-background.png)
+@Image(source: "dimmed-background.png", alt: "Toast Dimmed Background")
 
 ```swift
 .toast(isPresented: $presentingToast, dismissAfter: 2.0) {
diff --git a/Sources/ToastUI/ToastUI.docc/GettingStarted.md b/Sources/ToastUI/ToastUI.docc/GettingStarted.md
index 55ea9cd..de8a566 100644
--- a/Sources/ToastUI/ToastUI.docc/GettingStarted.md
+++ b/Sources/ToastUI/ToastUI.docc/GettingStarted.md
@@ -4,13 +4,13 @@ Present a toast in SwiftUI in no time.
 
 ### Requirements
 
-ToastUI supports iOS 14.0, tvOS 14.0, watchOS 7.0 and macOS 11.0 and later. ToastUI requires Xcode 13.1 and Swift 5.5 and later.
+ToastUI supports iOS 14.0, tvOS 14.0, watchOS 7.0 and macOS 11.0 and later. ToastUI requires Xcode 14.0 and Swift 5.7 and later.
 
 ### Installation
 
 ToastUI is available through [Swift Package Manager](https://swift.org/package-manager/).
 
-![Xcode Add Package](xcode-add-package.png)
+@Image(source: "xcode-add-package.png", alt: "Xcode Add Package")
 
 For app integration, add ToastUI to an existing Xcode project as a package dependency:
 
@@ -27,87 +27,115 @@ dependencies: [
 
 ### Presenting a toast
 
-To present an indeterminate progress indicator toast and dismiss it after 2 seconds:
-
-![Indeterminate Toast View](indeterminate-style.png)
-
-```swift
-struct ContentView: View {
-  @State private var presentingToast: Bool = false
-
-  var body: some View {
-    Button("Tap me") {
-      presentingToast = true
-    }
-    .toast(isPresented: $presentingToast, dismissAfter: 2.0) {
-      ToastView("Loading...")
-        .toastViewStyle(.indeterminate)
+@TabNavigator {
+  @Tab("Progress Indicator") {
+    Present an indeterminate progress indicator toast and dismiss it after 2 seconds:
+
+    @Row {
+      @Column(size: 2) {
+        ```swift
+        struct ContentView: View {
+          @State private var presentingToast: Bool = false
+
+          var body: some View {
+            Button("Tap me") {
+              presentingToast = true
+            }
+            .toast(isPresented: $presentingToast, dismissAfter: 2.0) {
+              ToastView("Loading...")
+                .toastViewStyle(.indeterminate)
+            }
+          }
+        }
+        ```
+      }
+      
+      @Column {
+        @Image(source: "indeterminate-style.png", alt: "Indeterminate Toast View")
+      }
     }
   }
-}
-```
-
-You can also present custom alerts or any SwiftUI views of your choice:
-
-![Custom Toast View 1](custom-toast-1.png)
-
-```swift
-struct ContentView: View {
-  @State private var presentingToast: Bool = false
 
-  var body: some View {
-    Button("Tap me") {
-      presentingToast = true
-    }
-    .toast(isPresented: $presentingToast) {
-      ToastView {
-        VStack {
-          Text("You can create a custom alert with ToastView")
-            .multilineTextAlignment(.center)
-
-          Divider()
-
-          Button("OK") {
-            presentingToast = false
+  @Tab("Alert") {
+    You can also present custom alerts:
+
+    @Row {
+      @Column(size: 2) {
+        ```swift
+        struct ContentView: View {
+          @State private var presentingToast: Bool = false
+
+          var body: some View {
+            Button("Tap me") {
+              presentingToast = true
+            }
+            .toast(isPresented: $presentingToast) {
+              ToastView {
+                VStack {
+                  Text("You can create a custom alert with ToastView")
+                    .multilineTextAlignment(.center)
+
+                  Divider()
+
+                  Button("OK") {
+                    presentingToast = false
+                  }
+                }
+              }
+              .padding()
+            }
           }
         }
+        ```
+      }
+
+      @Column {
+        @Image(source: "custom-toast-1.png", alt: "Custom Toast View 1")
       }
-      .padding()
     }
   }
-}
-```
-
-![Custom Toast View 2](custom-toast-2.png)
 
-```swift
-struct ContentView: View {
-  @State private var presentingToast: Bool = false
-
-  var body: some View {
-    Button("Tap me") {
-      presentingToast = true
-    }
-    .toast(isPresented: $presentingToast, dismissAfter: 2.0) {
-      print("Toast dismissed")
-    } content: {
-      VStack {
-        Text("You can present any SwiftUI views")
-          .bold()
-          .foregroundColor(.white)
-          .padding()
-          .frame(maxWidth: .infinity)
-          .background(Color.accentColor)
-          .cornerRadius(8.0)
-          .shadow(radius: 4.0)
-        Spacer()
+  @Tab("Banner") {
+    You can also present any custom SwiftUI views of your choice:
+
+    @Row {
+      @Column(size: 2) {
+        ```swift
+        struct ContentView: View {
+          @State private var presentingToast: Bool = false
+
+          var body: some View {
+            Button("Tap me") {
+              presentingToast = true
+            }
+            .toast(isPresented: $presentingToast, dismissAfter: 2.0) {
+              print("Toast dismissed")
+            } content: {
+              VStack {
+                Text("You can present any SwiftUI views")
+                  .bold()
+                  .foregroundColor(.white)
+                  .padding()
+                  .frame(maxWidth: .infinity)
+                  .background(Color.accentColor)
+                  .cornerRadius(8.0)
+                  .shadow(radius: 4.0)
+                Spacer()
+              }
+              .padding()
+            }
+            .toastDimmedBackground(false)
+          }
+        }
+        ```
+      }
+        
+      @Column {
+        @Image(source: "custom-toast-2.png", alt: "Custom Toast View 2")
       }
-      .padding()
     }
-    .toastDimmedBackground(false)
   }
 }
-```
 
 ### Documentation
 
@@ -117,7 +145,7 @@ ToastUI consists a helper script `toastui` in the root directory for building th
 
 To build and preview the documentation:
 
-```bash
+```shell
 ./toastui docc setup
 ./toastui docc preview
 ```
diff --git a/Sources/ToastUI/ToastUI.docc/Info.plist b/Sources/ToastUI/ToastUI.docc/Info.plist
index c57e8f3..5ac9916 100644
--- a/Sources/ToastUI/ToastUI.docc/Info.plist
+++ b/Sources/ToastUI/ToastUI.docc/Info.plist
@@ -7,6 +7,6 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.quanshousio.ToastUI</string>
 	<key>CFBundleVersion</key>
-	<string>3.0.1</string>
+	<string>4.0.0</string>
 </dict>
 </plist>
diff --git a/Sources/ToastUI/ToastUI.docc/ToastUI.md b/Sources/ToastUI/ToastUI.docc/ToastUI.md
index 592cfb1..3d70438 100644
--- a/Sources/ToastUI/ToastUI.docc/ToastUI.md
+++ b/Sources/ToastUI/ToastUI.docc/ToastUI.md
@@ -2,18 +2,33 @@
 
 A simple way to show toast in SwiftUI.
 
+@Metadata {
+  @Available(iOS, introduced: "14.0")
+  @Available(macOS, introduced: "11.0")
+  @Available(tvOS, introduced: "14.0")
+  @Available(watchOS, introduced: "7.0")
+}
+
 ## Overview
 
 ToastUI provides you a simple way to present toast, head-up display (HUD), custom alert, or any SwiftUI views on top of everything in SwiftUI.
 
+## Essentials
+
+@Links(visualStyle: detailedGrid) {
+  - <doc:GettingStarted>
+  - <doc:About>
+  - <doc:ToastUISample>
+  - <doc:ToastView>
+}
+
 ## Topics
 
-### Essentials
+### Articles
 
 - <doc:GettingStarted>
 - <doc:About>
 - <doc:ToastUISample>
-- ``ToastView``
 
 ### Presenting
 
@@ -36,3 +51,7 @@ ToastUI provides you a simple way to present toast, head-up display (HUD), custo
 - ``FailureToastViewStyle``
 - ``WarningToastViewStyle``
 - ``InformationToastViewStyle``
+
+### Views
+
+- ``ToastView``
diff --git a/Sources/ToastUI/ToastUI.docc/ToastUISample.md b/Sources/ToastUI/ToastUI.docc/ToastUISample.md
index 2b10567..a9b5977 100644
--- a/Sources/ToastUI/ToastUI.docc/ToastUISample.md
+++ b/Sources/ToastUI/ToastUI.docc/ToastUISample.md
@@ -1,16 +1,25 @@
 # Sample code for ToastUI
 
-Expressive examples from ToastUISample.
+Demonstrative examples from ToastUISample.
+
+@Metadata {
+  @PageKind(sampleCode)
+  @CallToAction(url: "https://github.com/quanshousio/ToastUI/archive/refs/heads/main.zip", purpose: download)
+  @Available(iOS, introduced: "14.0")
+  @Available(macOS, introduced: "11.0")
+  @Available(tvOS, introduced: "14.0")
+  @Available(Xcode, introduced: "14.0")
+}
 
 ## Overview
 
-ToastUISample project provides you with numerous detailed examples of how to use ToastUI. ToastUISample requires iOS 14.0, tvOS 14.0 and macOS 11.0. watchOS target is currently not available, but the usage still applies.
+ToastUISample project provides you with numerous detailed examples of how to use ToastUI. watchOS target is not available, but usage still applies.
 
 Examples are split into two parts. Basic examples will guide you on the essential functionalities of ToastUI:
 
 * Presenting a toast using built-in ``ToastViewStyle`` with ``ToastView/toastViewStyle(_:)``.
 * Presenting a toast using ``ToastView`` with a custom `Content`.
-* Presenting a toast using `ToastView` with a custom `Background`.
+* Presenting a toast using ``ToastView`` with a custom `Background`.
 
 Advanced examples demonstrate the powerful ability and flexibility that ToastUI provides:
 
diff --git a/Sources/ToastUI/ToastUI.swift b/Sources/ToastUI/ToastUI.swift
index 3927162..db293ed 100644
--- a/Sources/ToastUI/ToastUI.swift
+++ b/Sources/ToastUI/ToastUI.swift
@@ -7,7 +7,7 @@
 
 import SwiftUI
 
-@available(iOS 14.0, macOS 11.0, tvOS 14.0, watchOS 7.0, *)
+@available(iOS 14.0, macOS 11.0, tvOS 14.0, watchOS 7.0, visionOS 1.0, *)
 public extension View {
   /// Presents a toast when the given binding to a Boolean value is true.
   ///
@@ -22,14 +22,20 @@ public extension View {
     onDismiss: (() -> Void)? = nil,
     @ViewBuilder content: @escaping () -> Content
   ) -> some View where Content: View {
-    modifier(
-      ToastViewIsPresentedModifier<Content>(
+    #if os(iOS) || os(tvOS) || os(visionOS)
+    background(
+      ToastViewIsPresentedBridge(
         isPresented: isPresented,
         dismissAfter: dismissAfter,
         onDismiss: onDismiss,
         content: content
       )
+      .frame(width: 0, height: 0)
+      .disabled(true)
     )
+    #elseif os(macOS) || os(watchOS)
+    sheet(isPresented: isPresented, onDismiss: onDismiss, content: content)
+    #endif
   }
 
   /// Presents a toast when using the given item as a data source
@@ -49,21 +55,27 @@ public extension View {
     dismissAfter: Double? = nil,
     onDismiss: (() -> Void)? = nil,
     @ViewBuilder content: @escaping (Item) -> Content
-  ) -> some View where Item: Identifiable & Equatable, Content: View {
-    modifier(
-      ToastViewItemModifier<Item, Content>(
+  ) -> some View where Item: Identifiable, Content: View {
+    #if os(iOS) || os(tvOS) || os(visionOS)
+    background(
+      ToastViewItemBridge(
         item: item,
         dismissAfter: dismissAfter,
         onDismiss: onDismiss,
         content: content
       )
+      .frame(width: 0, height: 0)
+      .disabled(true)
     )
+    #elseif os(macOS) || os(watchOS)
+    sheet(item: item, onDismiss: onDismiss, content: content)
+    #endif
   }
 
   /// Sets the style for ``ToastView`` within this view.
   ///
   /// - Parameter style: The ``ToastViewStyle`` to use for this view.
-  func toastViewStyle<Style>(_ style: Style) -> some View where Style: ToastViewStyle {
+  func toastViewStyle(_ style: some ToastViewStyle) -> some View {
     environment(\.toastViewStyle, AnyToastViewStyle(style))
   }
 
diff --git a/Sources/ToastUI/ToastView.swift b/Sources/ToastUI/ToastView.swift
index 61825bf..9a0ab8d 100644
--- a/Sources/ToastUI/ToastView.swift
+++ b/Sources/ToastUI/ToastView.swift
@@ -14,7 +14,7 @@ import SwiftUI
 /// By default, it has an empty background with a fixed-size, center-aligned label and no content.
 ///
 /// This view supports styling by using ``ToastView/toastViewStyle(_:)``.
-@available(iOS 14.0, macOS 11.0, tvOS 14.0, watchOS 7.0, *)
+@available(iOS 14.0, macOS 11.0, tvOS 14.0, watchOS 7.0, visionOS 1.0, *)
 public struct ToastView<Background, Label, Content>: View
 where Background: View, Label: View, Content: View {
   @Environment(\.toastViewStyle) private var style
@@ -27,7 +27,7 @@ where Background: View, Label: View, Content: View {
   }
 }
 
-@available(iOS 14.0, macOS 11.0, tvOS 14.0, watchOS 7.0, *)
+@available(iOS 14.0, macOS 11.0, tvOS 14.0, watchOS 7.0, visionOS 1.0, *)
 public extension ToastView {
   /// Creates an empty ``ToastView``.
   init()
@@ -39,8 +39,8 @@ public extension ToastView {
   ///
   /// - Parameter title: A string that describes the text label.
   @_disfavoredOverload
-  init<S>(_ title: S)
-  where S: StringProtocol, Background == EmptyView, Label == Text, Content == EmptyView {
+  init(_ title: some StringProtocol)
+  where Background == EmptyView, Label == Text, Content == EmptyView {
     configuration = ToastViewStyleConfiguration(
       label: .init(content: Text(title))
     )
@@ -62,8 +62,8 @@ public extension ToastView {
   ///   - title: A string that describes the text label.
   ///   - content: A view builder that creates a view for the content.
   @_disfavoredOverload
-  init<S>(_ title: S, @ViewBuilder content: () -> Content)
-  where S: StringProtocol, Background == EmptyView, Label == Text {
+  init(_ title: some StringProtocol, @ViewBuilder content: () -> Content)
+  where Background == EmptyView, Label == Text {
     configuration = ToastViewStyleConfiguration(
       label: .init(content: Text(title)),
       content: .init(content: content())
@@ -91,11 +91,11 @@ public extension ToastView {
   ///   - content: A view builder that creates a view for the content.
   ///   - background: A view builder that creates a view for the background.
   @_disfavoredOverload
-  init<S>(
-    _ title: S,
+  init(
+    _ title: some StringProtocol,
     @ViewBuilder content: () -> Content,
     @ViewBuilder background: () -> Background
-  ) where S: StringProtocol, Label == Text {
+  ) where Label == Text {
     configuration = ToastViewStyleConfiguration(
       background: .init(content: background()),
       label: .init(content: Text(title)),
@@ -212,13 +212,12 @@ where Background: View, Label: View, Content: View {
     .cornerRadius(cornerSize)
     .frame(maxWidth: .infinity, maxHeight: .infinity)
     .background(background)
-    .padding()
   }
 }
 
 extension Color {
   static let background = {
-    #if os(iOS)
+    #if os(iOS) || os(visionOS)
     return Color(.secondarySystemBackground)
     #elseif os(tvOS)
     return Color(.darkGray)
@@ -230,7 +229,7 @@ extension Color {
   }()
 
   static let label = {
-    #if os(iOS) || os(tvOS)
+    #if os(iOS) || os(tvOS) || os(visionOS)
     return Color(.label)
     #elseif os(watchOS)
     return Color(.darkGray)
diff --git a/Sources/ToastUI/ToastViewBridge.swift b/Sources/ToastUI/ToastViewBridge.swift
new file mode 100644
index 0000000..2ad57d9
--- /dev/null
+++ b/Sources/ToastUI/ToastViewBridge.swift
@@ -0,0 +1,61 @@
+//
+//  ToastViewBridge.swift
+//  ToastUI
+//
+//  Created by Quan Tran on 4/20/24.
+//
+
+import SwiftUI
+
+#if os(iOS) || os(tvOS) || os(visionOS)
+struct ToastViewIsPresentedBridge<Content>: UIViewControllerRepresentable where Content: View {
+  @Binding var isPresented: Bool
+  let dismissAfter: Double?
+  let onDismiss: (() -> Void)?
+  let content: () -> Content
+
+  func makeUIViewController(context _: Context) -> ToastViewIsPresentedController<Content> {
+    let _ = isPresented // BUG: Need this for SwiftUI to update the view appropriately.
+    return ToastViewIsPresentedController()
+  }
+
+  func updateUIViewController(
+    _ toastViewController: ToastViewIsPresentedController<Content>,
+    context: Context
+  ) {
+    toastViewController.update(
+      $isPresented,
+      dismissAfter,
+      onDismiss,
+      content,
+      context.environment
+    )
+  }
+}
+
+struct ToastViewItemBridge<Item, Content>: UIViewControllerRepresentable
+where Item: Identifiable, Content: View {
+  @Binding var item: Item?
+  let dismissAfter: Double?
+  let onDismiss: (() -> Void)?
+  let content: (Item) -> Content
+
+  func makeUIViewController(context _: Context) -> ToastViewItemController<Item, Content> {
+    let _ = item // BUG: Need this for SwiftUI to update the view appropriately.
+    return ToastViewItemController()
+  }
+
+  func updateUIViewController(
+    _ toastViewController: ToastViewItemController<Item, Content>,
+    context: Context
+  ) {
+    toastViewController.update(
+      $item,
+      dismissAfter,
+      onDismiss,
+      content,
+      context.environment
+    )
+  }
+}
+#endif
diff --git a/Sources/ToastUI/ToastViewController.swift b/Sources/ToastUI/ToastViewController.swift
new file mode 100644
index 0000000..6a4412e
--- /dev/null
+++ b/Sources/ToastUI/ToastViewController.swift
@@ -0,0 +1,240 @@
+//
+//  ToastViewController.swift
+//  ToastUI
+//
+//  Created by Quan Tran on 4/20/24.
+//
+
+// swiftlint:disable function_body_length
+
+import os
+import SwiftUI
+
+let logger = Logger(subsystem: "com.quanshousio.ToastUI", category: "ToastUI")
+
+#if os(iOS) || os(tvOS) || os(visionOS)
+final class ToastViewIsPresentedController<Content>: UIViewController where Content: View {
+  var toastWindow: UIWindow!
+  var currentState = false
+  var transitioning = false
+
+  func update(
+    _ isPresented: Binding<Bool>,
+    _ dismissAfter: Double?,
+    _ onDismiss: (() -> Void)?,
+    _ content: () -> Content,
+    _ environment: EnvironmentValues
+  ) {
+    if currentState == isPresented.wrappedValue {
+      return
+    }
+    
+    defer {
+      currentState = isPresented.wrappedValue
+    }
+    
+    if transitioning && isPresented.wrappedValue {
+      logger.fault("Attempted to present the toast view while a presentation is in progress.")
+      DispatchQueue.main.async {
+        isPresented.wrappedValue = false
+      }
+      return
+    }
+
+    guard let windowScene = view.window?.windowScene else {
+      return
+    }
+
+    if toastWindow == nil {
+      let window = UIWindow()
+      window.rootViewController = UIViewController()
+      window.backgroundColor = .clear
+      window.windowLevel = .alert
+      window.windowScene = windowScene
+
+      toastWindow = window
+    }
+
+    let rootViewController = toastWindow.rootViewController!
+
+    let toastAlreadyPresented =
+      rootViewController.presentedViewController is ToastViewHostingController<Content>
+
+    let anotherToastAlreadyPresented = windowScene
+      .windows
+      .compactMap { window in
+        String(describing: window.rootViewController?.presentedViewController)
+      }
+      .contains(where: "ToastViewHostingController".contains)
+
+    if isPresented.wrappedValue {
+      if toastAlreadyPresented {
+        logger.fault("Attempted to present the toast view while it is already presented.")
+        DispatchQueue.main.async {
+          isPresented.wrappedValue = false
+        }
+        return
+      }
+
+      if anotherToastAlreadyPresented {
+        logger.fault("Attempted to present the toast view while another one is presenting.")
+        DispatchQueue.main.async {
+          isPresented.wrappedValue = false
+        }
+        return
+      }
+
+      transitioning = true
+      
+      toastWindow.makeKeyAndVisible()
+      
+      let toastViewController = ToastViewHostingController(
+        rootView: content(),
+        environment: environment
+      )
+      
+      DispatchQueue.main.async {
+        rootViewController.present(toastViewController, animated: true) {
+          self.transitioning = false
+        }
+      }
+
+      if let dismissAfter = dismissAfter {
+        DispatchQueue.main.asyncAfter(deadline: .now() + dismissAfter) {
+          isPresented.wrappedValue = false
+        }
+      }
+    } else {
+      if !toastAlreadyPresented, !anotherToastAlreadyPresented {
+        return
+      }
+
+      transitioning = true
+      
+      DispatchQueue.main.async {
+        rootViewController.dismiss(animated: true) { [self] in
+          onDismiss?()
+          if toastWindow != nil {
+            toastWindow.windowScene = nil
+          }
+          toastWindow = nil
+          transitioning = false
+        }
+      }
+    }
+  }
+}
+
+final class ToastViewItemController<Item, Content>: UIViewController
+where Item: Identifiable, Content: View {
+  var toastWindow: UIWindow!
+  var currentState: Item.ID?
+  var transitioning = false
+
+  func update(
+    _ item: Binding<Item?>,
+    _ dismissAfter: Double?,
+    _ onDismiss: (() -> Void)?,
+    _ content: (Item) -> Content,
+    _ environment: EnvironmentValues
+  ) {
+    if currentState == item.wrappedValue?.id {
+      return
+    }
+    
+    defer {
+      currentState = item.wrappedValue?.id
+    }
+    
+    if transitioning && item.wrappedValue != nil {
+      logger.fault("Attempted to present the toast view while a presentation is in progress.")
+      DispatchQueue.main.async {
+        item.wrappedValue = nil
+      }
+      return
+    }
+
+    guard let windowScene = view.window?.windowScene else {
+      return
+    }
+
+    if toastWindow == nil {
+      let window = UIWindow()
+      window.rootViewController = UIViewController()
+      window.backgroundColor = .clear
+      window.windowLevel = .alert
+      window.windowScene = windowScene
+
+      toastWindow = window
+    }
+
+    let rootViewController = toastWindow.rootViewController!
+
+    let toastAlreadyPresented =
+      rootViewController.presentedViewController is ToastViewHostingController<Content>
+
+    let anotherToastAlreadyPresented = windowScene
+      .windows
+      .compactMap { window in
+        String(describing: window.rootViewController?.presentedViewController)
+      }
+      .contains(where: "ToastViewHostingController".contains)
+
+    if let value = item.wrappedValue {
+      if toastAlreadyPresented {
+        logger.fault("Attempted to present the toast view while it is already presented.")
+        DispatchQueue.main.async {
+          item.wrappedValue = nil
+        }
+        return
+      }
+
+      if anotherToastAlreadyPresented {
+        logger.fault("Attempted to present the toast view while another toast view is presenting.")
+        DispatchQueue.main.async {
+          item.wrappedValue = nil
+        }
+        return
+      }
+
+      transitioning = true
+      
+      toastWindow.makeKeyAndVisible()
+      
+      let toastViewController = ToastViewHostingController(
+        rootView: content(value),
+        environment: environment
+      )
+      
+      DispatchQueue.main.async {
+        rootViewController.present(toastViewController, animated: true) {
+          self.transitioning = false
+        }
+      }
+
+      if let dismissAfter = dismissAfter {
+        DispatchQueue.main.asyncAfter(deadline: .now() + dismissAfter) {
+          item.wrappedValue = nil
+        }
+      }
+    } else {
+      if !toastAlreadyPresented, !anotherToastAlreadyPresented {
+        return
+      }
+
+      transitioning = true
+      
+      DispatchQueue.main.async {
+        rootViewController.dismiss(animated: true) { [self] in
+          onDismiss?()
+          if toastWindow != nil {
+            toastWindow.windowScene = nil
+          }
+          toastWindow = nil
+          transitioning = false
+        }
+      }
+    }
+  }
+}
+#endif
diff --git a/Sources/ToastUI/ToastViewHostingController.swift b/Sources/ToastUI/ToastViewHostingController.swift
index e04127a..367e1c0 100644
--- a/Sources/ToastUI/ToastViewHostingController.swift
+++ b/Sources/ToastUI/ToastViewHostingController.swift
@@ -7,9 +7,9 @@
 
 import SwiftUI
 
-#if os(iOS) || os(tvOS)
+#if os(iOS) || os(tvOS) || os(visionOS)
 final class ToastViewHostingController<Content>: UIHostingController<Content> where Content: View {
-  init(rootView: Content, dimmedBackground: Bool) {
+  init(rootView: Content, environment: EnvironmentValues) {
     super.init(rootView: rootView)
 
     modalPresentationStyle = .overFullScreen
@@ -18,7 +18,7 @@ final class ToastViewHostingController<Content>: UIHostingController<Content> wh
     let dimmedBackgroundColor = UIColor { traitCollection in
       .black.withAlphaComponent(traitCollection.userInterfaceStyle == .light ? 0.2 : 0.48)
     }
-    view.backgroundColor = dimmedBackground ? dimmedBackgroundColor : .clear
+    view.backgroundColor = environment.toastDimmedBackground ? dimmedBackgroundColor : .clear
   }
 
   @available(*, unavailable)
@@ -27,20 +27,3 @@ final class ToastViewHostingController<Content>: UIHostingController<Content> wh
   }
 }
 #endif
-
-#if os(macOS)
-final class ToastViewHostingController<Content>: NSHostingController<Content> where Content: View {
-  var onPresent: (() -> Void)?
-  var onDismiss: (() -> Void)?
-
-  override func viewDidAppear() {
-    super.viewDidAppear()
-    onPresent?()
-  }
-
-  override func viewDidDisappear() {
-    super.viewDidDisappear()
-    onDismiss?()
-  }
-}
-#endif
diff --git a/Sources/ToastUI/ToastViewModifier.swift b/Sources/ToastUI/ToastViewModifier.swift
deleted file mode 100644
index 77ec987..0000000
--- a/Sources/ToastUI/ToastViewModifier.swift
+++ /dev/null
@@ -1,425 +0,0 @@
-//
-//  ToastViewModifier.swift
-//  ToastUI
-//
-//  Created by Quan Tran on 7/17/20.
-//
-
-// swiftlint:disable file_length
-// swiftlint:disable function_body_length
-
-import os
-import SwiftUI
-
-let logger = Logger(subsystem: "com.quanshousio.ToastUI", category: "ToastUI")
-
-#if os(iOS) || os(tvOS)
-struct ToastViewIsPresentedModifier<ToastContent>: ViewModifier where ToastContent: View {
-  @Binding var isPresented: Bool
-  let dismissAfter: Double?
-  let onDismiss: (() -> Void)?
-  let content: () -> ToastContent
-
-  @State private var toastWindow: UIWindow!
-  @State private var viewController: UIViewController!
-  @State private var transitioning: Bool = false
-
-  @Environment(\.toastDimmedBackground) private var dimmedBackground
-
-  private func present() {
-    if transitioning {
-      let what = isPresented ? "present" : "dismiss"
-      logger.error("Attempted to \(what) the toast view while it is in transition")
-      return
-    }
-
-    guard let windowScene = viewController?.view.window?.windowScene else {
-      logger.error("Failed to get the scene containing the window in the current view")
-      return
-    }
-
-    if toastWindow == nil {
-      let window = UIWindow()
-      window.rootViewController = UIViewController()
-      window.backgroundColor = .clear
-      window.windowLevel = .alert
-      window.windowScene = windowScene
-      toastWindow = window
-    }
-
-    let rootViewController = toastWindow.rootViewController!
-
-    let toastAlreadyPresented =
-      rootViewController.presentedViewController is ToastViewHostingController<ToastContent>
-
-    let anotherToastAlreadyPresented = windowScene
-      .windows
-      .compactMap { window in
-        String(describing: window.rootViewController?.presentedViewController)
-      }
-      .contains(where: "ToastViewHostingController".contains)
-
-    if isPresented {
-      if toastAlreadyPresented {
-        logger.error("Attempted to present the toast view while it is already presented")
-        return
-      }
-
-      if anotherToastAlreadyPresented {
-        logger.error("Attempted to present the toast view while another toast view is presenting")
-        return
-      }
-
-      transitioning = true
-      toastWindow.makeKeyAndVisible()
-      let toastViewController = ToastViewHostingController(
-        rootView: content(),
-        dimmedBackground: dimmedBackground
-      )
-      rootViewController.present(toastViewController, animated: true) {
-        transitioning = false
-      }
-
-      if let dismissAfter = dismissAfter {
-        DispatchQueue.main.asyncAfter(deadline: .now() + dismissAfter) {
-          isPresented = false
-        }
-      }
-    } else {
-      if !toastAlreadyPresented, !anotherToastAlreadyPresented {
-        logger.error("Attempted to dismiss the toast view while it is not presenting")
-        return
-      }
-
-      transitioning = true
-      rootViewController.dismiss(animated: true) {
-        onDismiss?()
-        toastWindow.windowScene = nil
-        toastWindow = nil
-        transitioning = false
-      }
-    }
-  }
-
-  func body(content: Content) -> some View {
-    content
-      .introspectViewController { viewController in
-        self.viewController = viewController
-      }
-      .onChange(of: isPresented) { _ in
-        present()
-      }
-  }
-}
-
-struct ToastViewItemModifier<Item, ToastContent>: ViewModifier
-where Item: Identifiable & Equatable, ToastContent: View {
-  @Binding var item: Item?
-  let dismissAfter: Double?
-  let onDismiss: (() -> Void)?
-  let content: (Item) -> ToastContent
-
-  @State private var toastWindow: UIWindow!
-  @State private var viewController: UIViewController!
-  @State private var transitioning: Bool = false
-
-  @Environment(\.toastDimmedBackground) private var dimmedBackground
-
-  private func present(previousItem: Item?) {
-    if transitioning {
-      let what = item != nil ? "present" : "dismiss"
-      logger.error("Attempted to \(what) a toast view while it is in transition")
-      return
-    }
-
-    guard let windowScene = viewController?.view.window?.windowScene else {
-      logger.error("Failed to get the scene containing the window in the current view")
-      return
-    }
-
-    if toastWindow == nil {
-      let window = UIWindow()
-      window.rootViewController = UIViewController()
-      window.backgroundColor = .clear
-      window.windowLevel = .alert
-      window.windowScene = windowScene
-      toastWindow = window
-    }
-
-    let rootViewController = toastWindow.rootViewController!
-
-    let toastAlreadyPresented =
-      rootViewController.presentedViewController is ToastViewHostingController<ToastContent>
-
-    let anotherToastAlreadyPresented = windowScene
-      .windows
-      .compactMap { window in
-        String(describing: window.rootViewController?.presentedViewController)
-      }
-      .contains(where: "ToastViewHostingController".contains)
-
-    if let item = item {
-      if anotherToastAlreadyPresented || previousItem != nil {
-        logger.error("Attempted to present the toast view while another toast view is presenting")
-        return
-      }
-
-      if toastAlreadyPresented {
-        logger.error("Attempted to present the toast view while it is already presented")
-        return
-      }
-
-      transitioning = true
-      toastWindow.makeKeyAndVisible()
-      let toastViewController = ToastViewHostingController(
-        rootView: content(item),
-        dimmedBackground: dimmedBackground
-      )
-      rootViewController.present(toastViewController, animated: true) {
-        transitioning = false
-      }
-
-      if let dismissAfter = dismissAfter {
-        DispatchQueue.main.asyncAfter(deadline: .now() + dismissAfter) {
-          self.item = nil
-        }
-      }
-    } else {
-      if !toastAlreadyPresented, !anotherToastAlreadyPresented {
-        logger.error("Attempted to dismiss the toast view while it is not presenting")
-        return
-      }
-
-      transitioning = true
-      rootViewController.dismiss(animated: true) {
-        onDismiss?()
-        toastWindow.windowScene = nil
-        toastWindow = nil
-        transitioning = false
-      }
-    }
-  }
-
-  func body(content: Content) -> some View {
-    content
-      .introspectViewController { viewController in
-        self.viewController = viewController
-      }
-      .onChange(of: item) { [item] _ in
-        present(previousItem: item)
-      }
-  }
-}
-#endif
-
-#if os(macOS)
-struct ToastViewIsPresentedModifier<ToastContent>: ViewModifier where ToastContent: View {
-  @Binding var isPresented: Bool
-  let dismissAfter: Double?
-  let onDismiss: (() -> Void)?
-  let content: () -> ToastContent
-
-  @State private var keyWindow: NSWindow!
-  @State private var viewController: NSViewController!
-  @State private var transitioning: Bool = false
-
-  @Environment(\.toastDimmedBackground) private var dimmedBackground
-
-  private func present() {
-    if transitioning {
-      let what = isPresented ? "present" : "dismiss"
-      logger.error("Attempted to \(what) a toast view while it is in transition")
-      return
-    }
-
-    if keyWindow == nil {
-      keyWindow = viewController?.view.window
-    }
-
-    guard let rootViewController = keyWindow?.contentViewController else {
-      logger.error("Failed to get the main content view controller of the key window: \(keyWindow)")
-      return
-    }
-
-    let presentedToastViewController = rootViewController
-      .presentedViewControllers?
-      .compactMap { viewController in
-        viewController as? ToastViewHostingController<ToastContent>
-      }
-      .first
-
-    let anotherToastAlreadyPresented = rootViewController.view is ToastContainerView
-
-    if isPresented {
-      if presentedToastViewController != nil {
-        logger.error("Attempted to present the toast view while it is already presented")
-        return
-      }
-
-      if anotherToastAlreadyPresented {
-        logger.error("Attempted to present the toast view while another toast view is presenting")
-        return
-      }
-
-      transitioning = true
-      let toastViewController = ToastViewHostingController(rootView: content())
-      toastViewController.onPresent = {
-        transitioning = false
-      }
-      let toastPresentationAnimator = ToastPresentationAnimator()
-      toastPresentationAnimator.dimmedBackground = dimmedBackground
-      rootViewController.present(toastViewController, animator: toastPresentationAnimator)
-
-      if let dismissAfter = dismissAfter {
-        DispatchQueue.main.asyncAfter(deadline: .now() + dismissAfter) {
-          isPresented = false
-        }
-      }
-    } else {
-      guard let toastViewController = presentedToastViewController,
-            anotherToastAlreadyPresented
-      else {
-        logger.error("Attempted to dismiss the toast view while it is not presenting")
-        return
-      }
-
-      transitioning = true
-      toastViewController.onDismiss = {
-        onDismiss?()
-        keyWindow = nil
-        transitioning = false
-      }
-      rootViewController.dismiss(toastViewController)
-    }
-  }
-
-  func body(content: Content) -> some View {
-    content
-      .introspectViewController { viewController in
-        self.viewController = viewController
-      }
-      .onChange(of: isPresented) { _ in
-        present()
-      }
-  }
-}
-
-struct ToastViewItemModifier<Item, ToastContent>: ViewModifier
-where Item: Identifiable & Equatable, ToastContent: View {
-  @Binding var item: Item?
-  let dismissAfter: Double?
-  let onDismiss: (() -> Void)?
-  let content: (Item) -> ToastContent
-
-  @State private var keyWindow: NSWindow!
-  @State private var viewController: NSViewController!
-  @State private var transitioning: Bool = false
-
-  @Environment(\.toastDimmedBackground) private var dimmedBackground
-
-  private func present(previousItem: Item?) {
-    if transitioning {
-      let what = item != nil ? "present" : "dismiss"
-      logger.error("Attempted to \(what) a toast view while it is in transition")
-      return
-    }
-
-    if keyWindow == nil {
-      keyWindow = viewController?.view.window
-    }
-
-    guard let rootViewController = keyWindow?.contentViewController else {
-      logger.error("Failed to get the main content view controller of the key window: \(keyWindow)")
-      return
-    }
-
-    let presentedToastViewController = rootViewController
-      .presentedViewControllers?
-      .compactMap { viewController in
-        viewController as? ToastViewHostingController<ToastContent>
-      }
-      .first
-
-    let anotherToastAlreadyPresented = rootViewController.view is ToastContainerView
-
-    if let item = item {
-      if anotherToastAlreadyPresented || previousItem != nil {
-        logger.error("Attempted to present the toast view while another toast view is presenting")
-        return
-      }
-
-      if presentedToastViewController != nil {
-        logger.error("Attempted to present the toast view while it is already presented")
-        return
-      }
-
-      transitioning = true
-      let toastViewController = ToastViewHostingController(rootView: content(item))
-      toastViewController.onPresent = {
-        transitioning = false
-      }
-      let toastPresentationAnimator = ToastPresentationAnimator()
-      toastPresentationAnimator.dimmedBackground = dimmedBackground
-      rootViewController.present(toastViewController, animator: toastPresentationAnimator)
-
-      if let dismissAfter = dismissAfter {
-        DispatchQueue.main.asyncAfter(deadline: .now() + dismissAfter) {
-          self.item = nil
-        }
-      }
-    } else {
-      guard let toastViewController = presentedToastViewController,
-            anotherToastAlreadyPresented
-      else {
-        logger.error("Attempted to dismiss the toast view while it is not presenting")
-        return
-      }
-
-      transitioning = true
-      toastViewController.onDismiss = {
-        onDismiss?()
-        keyWindow = nil
-        transitioning = false
-      }
-      rootViewController.dismiss(toastViewController)
-    }
-  }
-
-  func body(content: Content) -> some View {
-    content
-      .introspectViewController { viewController in
-        self.viewController = viewController
-      }
-      .onChange(of: item) { [item] _ in
-        present(previousItem: item)
-      }
-  }
-}
-#endif
-
-#if os(watchOS)
-struct ToastViewIsPresentedModifier<ToastContent>: ViewModifier where ToastContent: View {
-  @Binding var isPresented: Bool
-  let dismissAfter: Double?
-  let onDismiss: (() -> Void)?
-  let content: () -> ToastContent
-
-  func body(content view: Content) -> some View {
-    view
-      .sheet(isPresented: $isPresented, onDismiss: onDismiss, content: content)
-  }
-}
-
-struct ToastViewItemModifier<Item, ToastContent>: ViewModifier
-where Item: Identifiable & Equatable, ToastContent: View {
-  @Binding var item: Item?
-  let dismissAfter: Double?
-  let onDismiss: (() -> Void)?
-  let content: (Item) -> ToastContent
-
-  func body(content view: Content) -> some View {
-    view
-      .sheet(item: $item, onDismiss: onDismiss, content: content)
-  }
-}
-#endif
diff --git a/Sources/ToastUI/ToastViewStyle.swift b/Sources/ToastUI/ToastViewStyle.swift
index 7655e28..9f78417 100644
--- a/Sources/ToastUI/ToastViewStyle.swift
+++ b/Sources/ToastUI/ToastViewStyle.swift
@@ -12,7 +12,7 @@ import SwiftUI
 ///
 /// To configure the current ``ToastViewStyle`` for a view hiearchy, use the
 /// ``ToastView/toastViewStyle(_:)`` modifier.
-@available(iOS 14.0, macOS 11.0, tvOS 14.0, watchOS 7.0, *)
+@available(iOS 14.0, macOS 11.0, tvOS 14.0, watchOS 7.0, visionOS 1.0, *)
 public protocol ToastViewStyle {
   /// A view that represents the body of a ``ToastView``.
   associatedtype Body: View
@@ -27,11 +27,11 @@ public protocol ToastViewStyle {
 }
 
 /// The properties of a ``ToastView``.
-@available(iOS 14.0, macOS 11.0, tvOS 14.0, watchOS 7.0, *)
+@available(iOS 14.0, macOS 11.0, tvOS 14.0, watchOS 7.0, visionOS 1.0, *)
 public struct ToastViewStyleConfiguration {
   /// A type-erased background of a ``ToastView``.
   public struct Background: View {
-    init<Content>(content: Content) where Content: View {
+    init(content: some View) {
       body = AnyView(content)
     }
 
@@ -41,7 +41,7 @@ public struct ToastViewStyleConfiguration {
 
   /// A type-erased label of a ``ToastView``.
   public struct Label: View {
-    init<Content>(content: Content) where Content: View {
+    init(content: some View) {
       body = AnyView(content)
     }
 
@@ -51,7 +51,7 @@ public struct ToastViewStyleConfiguration {
 
   /// A type-erased content of a ``ToastView``.
   public struct Content: View {
-    init<Content>(content: Content) where Content: View {
+    init(content: some View) {
       body = AnyView(content)
     }
 
diff --git a/ToastUISample/ToastUISample.xcodeproj/project.pbxproj b/ToastUISample/ToastUISample.xcodeproj/project.pbxproj
index c6cad5e..527d9ef 100644
--- a/ToastUISample/ToastUISample.xcodeproj/project.pbxproj
+++ b/ToastUISample/ToastUISample.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 55;
+	objectVersion = 56;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -186,8 +186,9 @@
 		337A102B24CAC3D200362CBE /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastSwiftUpdateCheck = 1220;
-				LastUpgradeCheck = 1230;
+				BuildIndependentTargetsInParallel = YES;
+				LastSwiftUpdateCheck = 1530;
+				LastUpgradeCheck = 1530;
 				TargetAttributes = {
 					337A107624CAC97900362CBE = {
 						CreatedOnToolsVersion = 12.0;
@@ -201,7 +202,7 @@
 				};
 			};
 			buildConfigurationList = 337A102E24CAC3D200362CBE /* Build configuration list for PBXProject "ToastUISample" */;
-			compatibilityVersion = "Xcode 13.0";
+			compatibilityVersion = "Xcode 14.0";
 			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
@@ -209,6 +210,8 @@
 				Base,
 			);
 			mainGroup = 337A102A24CAC3D200362CBE;
+			packageReferences = (
+			);
 			productRefGroup = 337A103424CAC3D200362CBE /* Products */;
 			projectDirPath = "";
 			projectRoot = "";
@@ -250,6 +253,7 @@
 /* Begin PBXShellScriptBuildPhase section */
 		33167E43252BB9DA00F6DC1E /* SwiftLint */ = {
 			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
@@ -268,6 +272,7 @@
 		};
 		3392DD0A2502F82F003C7183 /* SwiftLint */ = {
 			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
@@ -330,6 +335,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
@@ -364,6 +370,7 @@
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -378,7 +385,6 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				MARKETING_VERSION = 1.0;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
@@ -393,6 +399,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
@@ -427,6 +434,7 @@
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -435,7 +443,6 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				MARKETING_VERSION = 1.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
@@ -453,6 +460,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = A469LS65YX;
 				ENABLE_PREVIEWS = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GENERATE_INFOPLIST_FILE = YES;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -475,6 +483,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = A469LS65YX;
 				ENABLE_PREVIEWS = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GENERATE_INFOPLIST_FILE = YES;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -501,6 +510,7 @@
 				DEVELOPMENT_ASSET_PATHS = "";
 				DEVELOPMENT_TEAM = A469LS65YX;
 				ENABLE_PREVIEWS = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
@@ -532,6 +542,7 @@
 				DEVELOPMENT_ASSET_PATHS = "";
 				DEVELOPMENT_TEAM = A469LS65YX;
 				ENABLE_PREVIEWS = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
@@ -561,8 +572,10 @@
 				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
+				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = A469LS65YX;
 				ENABLE_PREVIEWS = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GENERATE_INFOPLIST_FILE = YES;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -585,8 +598,10 @@
 				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
+				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = A469LS65YX;
 				ENABLE_PREVIEWS = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GENERATE_INFOPLIST_FILE = YES;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
diff --git a/ToastUISample/ToastUISample.xcodeproj/xcshareddata/xcschemes/ToastUISample-iOS.xcscheme b/ToastUISample/ToastUISample.xcodeproj/xcshareddata/xcschemes/ToastUISample-iOS.xcscheme
index 69e0fb6..034e637 100644
--- a/ToastUISample/ToastUISample.xcodeproj/xcshareddata/xcschemes/ToastUISample-iOS.xcscheme
+++ b/ToastUISample/ToastUISample.xcodeproj/xcshareddata/xcschemes/ToastUISample-iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1230"
+   LastUpgradeVersion = "1530"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/ToastUISample/ToastUISample.xcodeproj/xcshareddata/xcschemes/ToastUISample-macOS.xcscheme b/ToastUISample/ToastUISample.xcodeproj/xcshareddata/xcschemes/ToastUISample-macOS.xcscheme
index 97cf12b..d7cef35 100644
--- a/ToastUISample/ToastUISample.xcodeproj/xcshareddata/xcschemes/ToastUISample-macOS.xcscheme
+++ b/ToastUISample/ToastUISample.xcodeproj/xcshareddata/xcschemes/ToastUISample-macOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1230"
+   LastUpgradeVersion = "1530"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/ToastUISample/ToastUISample.xcodeproj/xcshareddata/xcschemes/ToastUISample-tvOS.xcscheme b/ToastUISample/ToastUISample.xcodeproj/xcshareddata/xcschemes/ToastUISample-tvOS.xcscheme
index 8590c14..d7ac9cf 100644
--- a/ToastUISample/ToastUISample.xcodeproj/xcshareddata/xcschemes/ToastUISample-tvOS.xcscheme
+++ b/ToastUISample/ToastUISample.xcodeproj/xcshareddata/xcschemes/ToastUISample-tvOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1230"
+   LastUpgradeVersion = "1530"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/ToastUISample/ToastUISample.xcodeproj/xcshareddata/xcschemes/ToastUITests.xcscheme b/ToastUISample/ToastUISample.xcodeproj/xcshareddata/xcschemes/ToastUITests.xcscheme
new file mode 100644
index 0000000..ddd89e8
--- /dev/null
+++ b/ToastUISample/ToastUISample.xcodeproj/xcshareddata/xcschemes/ToastUITests.xcscheme
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1530"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES"
+      buildArchitectures = "Automatic">
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO"
+            parallelizable = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "33AB137A2BDD769300AE4CB4"
+               BuildableName = "ToastUITests.xctest"
+               BlueprintName = "ToastUITests"
+               ReferencedContainer = "container:ToastUISample.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/ToastUISample/ToastUISample/AdvancedExamples.swift b/ToastUISample/ToastUISample/AdvancedExamples.swift
index b179b61..bedc8cd 100644
--- a/ToastUISample/ToastUISample/AdvancedExamples.swift
+++ b/ToastUISample/ToastUISample/AdvancedExamples.swift
@@ -99,7 +99,7 @@ struct CustomToastUsingToastViewStyleExample: View {
           HStack {
             Text("Brightness")
 
-            #if os(iOS) || os(macOS)
+            #if os(iOS) || os(macOS) || os(visionOS)
             Slider(value: $brightness, in: 0 ... 1)
             #elseif os(tvOS)
             Button {
@@ -165,18 +165,14 @@ struct CustomToastUsingItemExample: View {
     case second = "Second"
   }
 
-  struct ToastItem: Identifiable, Equatable {
+  struct ToastItem: Identifiable {
     let id = UUID()
 
     var content: AnyView
 
-    init<Content: View>(_ content: Content) {
+    init(_ content: some View) {
       self.content = AnyView(content)
     }
-
-    static func == (lhs: ToastItem, rhs: ToastItem) -> Bool {
-      lhs.id == rhs.id
-    }
   }
 
   @State private var selectedToast: Toast = .first
@@ -232,7 +228,7 @@ struct CustomToastUsingItemExample: View {
       Text("Create a new account")
         .bold()
 
-      #if os(iOS)
+      #if os(iOS) || os(visionOS)
       TextField("Username", text: $username)
         .frame(height: 44)
         .textFieldStyle(.plain)
diff --git a/ToastUISample/ToastUISample/Auxiliaries.swift b/ToastUISample/ToastUISample/Auxiliaries.swift
index c10baa3..012ae99 100644
--- a/ToastUISample/ToastUISample/Auxiliaries.swift
+++ b/ToastUISample/ToastUISample/Auxiliaries.swift
@@ -14,9 +14,9 @@ struct ExampleItem<Destination>: View where Destination: View {
   var body: some View {
     NavigationLink {
       destination
-      #if !os(macOS)
-      .navigationBarTitleDisplayMode(.inline)
-      #endif
+        #if !os(macOS)
+        .navigationBarTitleDisplayMode(.inline)
+        #endif
     } label: {
       Text(description)
     }
@@ -41,17 +41,17 @@ struct CustomButton: View {
     self.action = action
   }
 
-  @ViewBuilder var body: some View {
+  var body: some View {
     Button(action: action) {
       Text(text)
-      #if os(iOS)
+        #if os(iOS) || os(visionOS)
         .bold()
         .foregroundColor(.white)
-        .frame(maxWidth: maxWidth, maxHeight: maxHeight)
+        .frame(minWidth: maxWidth, minHeight: maxHeight)
         .padding()
         .background(Color.accentColor)
         .cornerRadius(12.0)
-      #endif
+        #endif
     }
   }
 }
diff --git a/ToastUISample/ToastUISample/BasicExamples.swift b/ToastUISample/ToastUISample/BasicExamples.swift
index af0cac9..24b3d6f 100644
--- a/ToastUISample/ToastUISample/BasicExamples.swift
+++ b/ToastUISample/ToastUISample/BasicExamples.swift
@@ -34,12 +34,12 @@ struct BuiltInToastViewStyleExample: View {
             .tag(style)
         }
       }
-      #if os(iOS)
-        .pickerStyle(.wheel)
+      #if os(iOS) || os(visionOS)
+      .pickerStyle(.wheel)
       #elseif os(tvOS)
-        .pickerStyle(.segmented)
+      .pickerStyle(.segmented)
       #elseif os(macOS)
-        .pickerStyle(.radioGroup)
+      .pickerStyle(.radioGroup)
       #endif
 
       Toggle("Dimmed background", isOn: $dimmedBackground)
diff --git a/toastui b/toastui
index d860224..ef1b4d8 100755
--- a/toastui
+++ b/toastui
@@ -32,6 +32,7 @@ INFO_PLIST=$(find "$(pwd)" -name "Info.plist" -type f)
 export VUE_APP_VERSION=$(plutil -convert json -o - "$INFO_PLIST" | jq -r ".CFBundleVersion // empty")
 export VUE_APP_UPDATED_DATE=$(date -u +%F)
 export VUE_APP_TITLE=ToastUI
+export VUE_APP_HLJS_LANGUAGE=shell,swift
 
 if [[ -z $VUE_APP_VERSION ]]; then
   err "CFBundleVersion in the $INFO_PLIST is not valid"
@@ -201,7 +202,7 @@ setup_docc() {
   info "Setting up the environment for documentation development"
 
   if [[ -d $SWIFT_DOCC_DIR || -d $SWIFT_DOCC_RENDER_DIR ]]; then
-    read -p "$(warn "Found existing installation. Are you sure you want to reinstall (y/n)? ")" -n 1 -r
+    read -p "$(warn "Found existing installation. Continue will delete the existing installation. Are you sure you want to reinstall (y/n)? ")" -n 1 -r
     echo
     [[ ! $REPLY =~ ^[Yy]$ ]] && return
   fi
@@ -224,7 +225,7 @@ setup_docc() {
 
 check_prereqs() {
   if [[ ! -d "$SYMBOLS_DIR" ]]; then
-    warn "Failed to locate the build directory"
+    warn "Failed to locate the package build artifact, rebuilding"
     build_pkg
   else
     [[ $REBUILD_PKG = 1 ]] && build_pkg
@@ -268,14 +269,6 @@ build_docc() {
 
   info "Patching the documentation archive"
 
-  # convert the Sample Code for ToastUI article into a sampleCode article
-  TOASTUISAMPLE_JSON="$DOCC_ARCHIVE/data/documentation/toastui/toastuisample.json"
-  perl -i -pe 's/\"metadata\":\{.+?\},\"/"metadata":{"roleHeading":"Sample Code","title":"Sample code for ToastUI","role":"sampleCode","modules":[{"name":"ToastUI"}],"platforms":[{"name":"iOS","introducedAt":"14.0"},{"name":"macOS","introducedAt":"14.0"},{"name":"tvOS","introducedAt":"14.0"},{"name":"watchOS","introducedAt":"7.0"},{"name":"Xcode","introducedAt":"13.1"}]},"/g' "$TOASTUISAMPLE_JSON"
-  perl -i -pe 's/\"hierarchy\":\{.+?\},\K/"sampleCodeDownload":{"action":{"overridingTitle":"Download","type":"reference","isActive":true,"identifier":"https:\/\/github.com\/quanshousio\/ToastUI\/archive\/refs\/heads\/main.zip"}},/g' "$TOASTUISAMPLE_JSON"
-  perl -i -pe 's/\"references\":\{\K/"https:\/\/github.com\/quanshousio\/ToastUI\/archive\/refs\/heads\/main.zip":{"type":"download","identifier":"https:\/\/github.com\/quanshousio\/ToastUI\/archive\/refs\/heads\/main.zip","url":"https:\/\/github.com\/quanshousio\/ToastUI\/archive\/refs\/heads\/main.zip"},/g' "$TOASTUISAMPLE_JSON"
-  perl -i -pe 's/ToastUI\/ToastUISample\":\{\"role\":\"\Karticle/sampleCode/g' "$DOCC_ARCHIVE/data/documentation/toastui.json"
-  perl -i -pe 's/\"title\":\"Sample code for ToastUI\",\"type\":\"\Karticle/sampleCode/g' "$DOCC_ARCHIVE/index/index.json"
-
   # replace /index.html
   export INDEX_CSS=$(cd $DOCC_ARCHIVE && find . -name "index*.css" -type f)
   perl -pe "s/INDEX_CSS/\$ENV{INDEX_CSS}/g" "$DOCC_DIR/homepage.html" >"$DOCC_ARCHIVE/index.html"

From f0c13378b7a90a9876ac25ba96ac41e519723fb6 Mon Sep 17 00:00:00 2001
From: Quan Tran <quan@shousio.com>
Date: Sat, 10 Aug 2024 11:37:06 -0700
Subject: [PATCH 2/5] Add swiftformat and code formatting

---
 .swiftformat                                  | 112 +++++++++++++
 .../xcshareddata/xcschemes/ToastUI.xcscheme   |   2 +-
 Sources/ToastUI/DefaultToastViewStyle.swift   | 147 +++++++++---------
 Sources/ToastUI/EnvironmentValues.swift       |   2 +-
 Sources/ToastUI/ToastUI.docc/About.md         |   8 +-
 .../ToastUI/ToastUI.docc/GettingStarted.md    |   6 +-
 Sources/ToastUI/ToastUI.swift                 |  16 +-
 Sources/ToastUI/ToastView.swift               |  66 ++++----
 Sources/ToastUI/ToastViewBridge.swift         |   2 +-
 Sources/ToastUI/ToastViewController.swift     |  34 ++--
 .../ToastUI/ToastViewHostingController.swift  |   3 +-
 Sources/ToastUI/ToastViewStyle.swift          |  24 +--
 .../ToastUISample.xcodeproj/project.pbxproj   |   2 +-
 .../xcschemes/ToastUISample-iOS.xcscheme      |   2 +-
 .../xcschemes/ToastUISample-macOS.xcscheme    |   2 +-
 .../xcschemes/ToastUISample-tvOS.xcscheme     |   2 +-
 .../xcschemes/ToastUITests.xcscheme           |   2 +-
 .../ToastUISample/AdvancedExamples.swift      |  12 +-
 ToastUISample/ToastUISample/Auxiliaries.swift |  16 +-
 .../ToastUISample/BasicExamples.swift         |  12 +-
 20 files changed, 294 insertions(+), 178 deletions(-)
 create mode 100644 .swiftformat

diff --git a/.swiftformat b/.swiftformat
new file mode 100644
index 0000000..898ab40
--- /dev/null
+++ b/.swiftformat
@@ -0,0 +1,112 @@
+# SwiftFormat config compliant with Google Swift Guideline
+# https://google.github.io/swift/#control-flow-statements
+
+# Specify version used in a project
+
+--swiftversion 5.10
+
+# Rules explicitly required by the guideline
+
+--rules                           \
+blankLinesAroundMark,             \
+blankLinesAtEndOfScope,           \
+blankLinesAtStartOfScope,         \
+blankLinesBetweenScopes,          \
+braces,                           \
+consecutiveBlankLines,            \
+consecutiveSpaces,                \
+duplicateImports,                 \
+elseOnSameLine,                   \
+emptyBraces,                      \
+enumNamespaces,                   \
+extensionAccessControl,           \
+hoistPatternLet,                  \
+indent,                           \
+leadingDelimiters,                \
+linebreakAtEndOfFile,             \
+markTypes,                        \
+organizeDeclarations,             \
+redundantInit,                    \
+redundantParens,                  \
+redundantPattern,                 \
+redundantRawValues,               \
+redundantType,                    \
+redundantVoidReturnType,          \
+semicolons,                       \
+sortImports,                      \
+sortSwitchCases,                  \
+spaceAroundBraces,                \
+spaceAroundBrackets,              \
+spaceAroundComments,              \
+spaceAroundGenerics,              \
+spaceAroundOperators,             \
+spaceAroundParens,                \
+spaceInsideBraces,                \
+spaceInsideBrackets,              \
+spaceInsideComments,              \
+spaceInsideGenerics,              \
+spaceInsideParens,                \
+todos,                            \
+trailingClosures,                 \
+trailingCommas,                   \
+trailingSpace,                    \
+typeSugar,                        \
+void,                             \
+wrap,                             \
+wrapArguments,                    \
+wrapAttributes,                   \
+#
+#
+# Additional rules not mentioned in the guideline, but helping to keep the codebase clean 
+# Quoting the guideline: 
+# Common themes among the rules in this section are: 
+# avoid redundancy, avoid ambiguity, and prefer implicitness over explicitness
+# unless being explicit improves readability and/or reduces ambiguity.
+#
+#
+andOperator,                      \
+isEmpty,                          \
+redundantBackticks,               \
+redundantBreak,                   \
+redundantExtensionACL,            \
+redundantGet,                     \
+redundantLetError,                \
+redundantNilInit,                 \
+redundantObjc,                    \
+redundantOptionalBinding,         \
+redundantReturn,                  \
+redundantSelf,                    \
+strongifiedSelf
+
+# Options for basic rules
+
+--extensionacl on-declarations
+--funcattributes prev-line
+--indent 2
+--maxwidth 100
+--typeattributes prev-line
+--funcattributes prev-line
+--storedvarattrs same-line
+--computedvarattrs prev-line
+--complexattrs prev-line
+--voidtype void
+--wraparguments before-first
+--wrapparameters before-first
+--wrapcollections before-first
+--wrapreturntype if-multiline
+--wrapconditions after-first 
+
+# Option for additional rules
+
+--self init-only
+
+--organizationmode type
+--markcategories false
+--marktypes never
+--markextensions never
+
+# Excluded folders
+
+--exclude Pods,**/UNTESTED_TODO,vendor,fastlane
+
+# https://github.com/NoemiRozpara/Google-SwiftFormat-Config
diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/ToastUI.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/ToastUI.xcscheme
index 1bedd2e..54774a0 100644
--- a/.swiftpm/xcode/xcshareddata/xcschemes/ToastUI.xcscheme
+++ b/.swiftpm/xcode/xcshareddata/xcschemes/ToastUI.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1530"
+   LastUpgradeVersion = "1600"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Sources/ToastUI/DefaultToastViewStyle.swift b/Sources/ToastUI/DefaultToastViewStyle.swift
index 64bf1f6..9166adf 100644
--- a/Sources/ToastUI/DefaultToastViewStyle.swift
+++ b/Sources/ToastUI/DefaultToastViewStyle.swift
@@ -13,7 +13,7 @@ struct AnyToastViewStyle: ToastViewStyle {
 
   /// Creates a ``AnyToastViewStyle``.
   init(_ style: some ToastViewStyle) {
-    _makeBody = { configuration in
+    self._makeBody = { configuration in
       AnyView(style.makeBody(configuration: configuration))
     }
   }
@@ -49,11 +49,11 @@ public struct DefaultToastViewStyle: ToastViewStyle {
 }
 
 @available(iOS 14.0, macOS 11.0, tvOS 14.0, watchOS 7.0, visionOS 1.0, *)
-public extension ToastViewStyle where Self == DefaultToastViewStyle {
+extension ToastViewStyle where Self == DefaultToastViewStyle {
   /// The default style of ``ToastView``.
   ///
   /// Use this style to customize ``ToastView``.
-  static var `default`: Self {
+  public static var `default`: Self {
     .init()
   }
 }
@@ -62,21 +62,11 @@ public extension ToastViewStyle where Self == DefaultToastViewStyle {
 /// also informally known as a spinner.
 @available(iOS 14.0, macOS 11.0, tvOS 14.0, watchOS 7.0, visionOS 1.0, *)
 public struct IndeterminateProgressToastViewStyle: ToastViewStyle {
-  /// Creates an ``IndeterminateProgressToastViewStyle``.
-  public init() {}
-
-  /// Creates a view representing the body of a ``ToastView``.
-  ///
-  /// - Parameter configuration: The properties of the ``ToastView`` being created.
-  public func makeBody(configuration: Configuration) -> some View {
-    IndeterminateProgressToastView(configuration: configuration)
-  }
-
   struct IndeterminateProgressToastView: View {
     let configuration: Configuration
 
-    @ScaledMetric private var iconSize: Double = 36
-    @ScaledMetric private var strokeSize: Double = 3
+    @ScaledMetric private var iconSize = 36.0
+    @ScaledMetric private var strokeSize = 3.0
 
     @State private var animating = false
 
@@ -115,13 +105,23 @@ public struct IndeterminateProgressToastViewStyle: ToastViewStyle {
       }
     }
   }
+
+  /// Creates an ``IndeterminateProgressToastViewStyle``.
+  public init() {}
+
+  /// Creates a view representing the body of a ``ToastView``.
+  ///
+  /// - Parameter configuration: The properties of the ``ToastView`` being created.
+  public func makeBody(configuration: Configuration) -> some View {
+    IndeterminateProgressToastView(configuration: configuration)
+  }
 }
 
 @available(iOS 14.0, macOS 11.0, tvOS 14.0, watchOS 7.0, visionOS 1.0, *)
-public extension ToastViewStyle where Self == IndeterminateProgressToastViewStyle {
+extension ToastViewStyle where Self == IndeterminateProgressToastViewStyle {
   /// A ``ToastView`` represents as an indeterminate circular progress indicator,
   /// also informally known as a spinner.
-  static var indeterminate: Self {
+  public static var indeterminate: Self {
     .init()
   }
 }
@@ -131,37 +131,16 @@ public extension ToastViewStyle where Self == IndeterminateProgressToastViewStyl
 /// but shows determinate progress instead.
 @available(iOS 14.0, macOS 11.0, tvOS 14.0, watchOS 7.0, visionOS 1.0, *)
 public struct DeterminateProgressToastViewStyle<Value>: ToastViewStyle
-where Value: BinaryFloatingPoint {
-  @Binding private var value: Value
-  @Binding private var total: Value
-
-  /// Creates a ``DeterminateProgressToastViewStyle``.
-  ///
-  /// - Parameters:
-  ///   - value: The completed amount of the task, ranging from `0.0` to `total`.
-  ///   - total: The fully completed amount of the task, meaning the task is completed if
-  ///            `value` equals `total`. Default value is `1.0`.
-  public init(value: Binding<Value>, total: Binding<Value> = .constant(1.0)) {
-    _value = value
-    _total = total
-  }
-
-  /// Creates a view representing the body of a ``ToastView``.
-  ///
-  /// - Parameter configuration: The properties of the ``ToastView`` being created.
-  public func makeBody(configuration: Configuration) -> some View {
-    DeterminateProgressToastView(configuration: configuration, value: $value, total: $total)
-  }
-
+  where Value: BinaryFloatingPoint {
   struct DeterminateProgressToastView: View {
     let configuration: Configuration
     @Binding var value: Value
     @Binding var total: Value
 
-    @ScaledMetric private var iconSize: Double = 36
-    @ScaledMetric private var strokeSize: Double = 3
+    @ScaledMetric private var iconSize = 36.0
+    @ScaledMetric private var strokeSize = 3.0
 
-    @State private var isAnimating: Bool = false
+    @State private var isAnimating = false
 
     var body: some View {
       DefaultToastView {
@@ -188,10 +167,31 @@ where Value: BinaryFloatingPoint {
       }
     }
   }
+
+  @Binding private var value: Value
+  @Binding private var total: Value
+
+  /// Creates a ``DeterminateProgressToastViewStyle``.
+  ///
+  /// - Parameters:
+  ///   - value: The completed amount of the task, ranging from `0.0` to `total`.
+  ///   - total: The fully completed amount of the task, meaning the task is completed if
+  ///            `value` equals `total`. Default value is `1.0`.
+  public init(value: Binding<Value>, total: Binding<Value> = .constant(1.0)) {
+    _value = value
+    _total = total
+  }
+
+  /// Creates a view representing the body of a ``ToastView``.
+  ///
+  /// - Parameter configuration: The properties of the ``ToastView`` being created.
+  public func makeBody(configuration: Configuration) -> some View {
+    DeterminateProgressToastView(configuration: configuration, value: $value, total: $total)
+  }
 }
 
 @available(iOS 14.0, macOS 11.0, tvOS 14.0, watchOS 7.0, visionOS 1.0, *)
-public extension ToastViewStyle {
+extension ToastViewStyle {
   /// A ``ToastView`` represents as a determinate circular progress indicator.
   /// This style is similar to the ``IndeterminateProgressToastViewStyle``,
   /// but shows determinate progress instead.
@@ -200,10 +200,11 @@ public extension ToastViewStyle {
   ///   - value: The completed amount of the task, ranging from `0.0` to `total`.
   ///   - total: The fully completed amount of the task, meaning the task is completed if
   ///            `value` equals `total`. Default value is `1.0`.
-  static func determinate<Value>(
+  public static func determinate<Value>(
     value: Binding<Value>,
     total: Binding<Value> = .constant(1.0)
-  ) -> Self where Value: BinaryFloatingPoint, Self == DeterminateProgressToastViewStyle<Value> {
+  )
+    -> Self where Value: BinaryFloatingPoint, Self == DeterminateProgressToastViewStyle<Value> {
     .init(value: value, total: total)
   }
 }
@@ -211,23 +212,6 @@ public extension ToastViewStyle {
 /// A ``ToastView`` represents as a toast consists of an icon and a headline text label.
 @available(iOS 14.0, macOS 11.0, tvOS 14.0, watchOS 7.0, visionOS 1.0, *)
 public struct IconToastViewStyle<Content>: ToastViewStyle where Content: View {
-  private var content: Content
-
-  /// Creates an ``IconToastViewStyle``.
-  ///
-  /// - Parameters:
-  ///   - content: The content of the icon.
-  public init(content: () -> Content) {
-    self.content = content()
-  }
-
-  /// Creates a view representing the body of a ``ToastView``.
-  ///
-  /// - Parameter configuration: The properties of the ``ToastView`` being created.
-  public func makeBody(configuration: Configuration) -> some View {
-    IconToastView(configuration: configuration, content: content)
-  }
-
   struct IconToastView: View {
     let configuration: Configuration
     let content: Content
@@ -247,16 +231,33 @@ public struct IconToastViewStyle<Content>: ToastViewStyle where Content: View {
       }
     }
   }
+
+  private var content: Content
+
+  /// Creates an ``IconToastViewStyle``.
+  ///
+  /// - Parameters:
+  ///   - content: The content of the icon.
+  public init(content: () -> Content) {
+    self.content = content()
+  }
+
+  /// Creates a view representing the body of a ``ToastView``.
+  ///
+  /// - Parameter configuration: The properties of the ``ToastView`` being created.
+  public func makeBody(configuration: Configuration) -> some View {
+    IconToastView(configuration: configuration, content: content)
+  }
 }
 
 @available(iOS 14.0, macOS 11.0, tvOS 14.0, watchOS 7.0, visionOS 1.0, *)
-public extension ToastViewStyle {
+extension ToastViewStyle {
   /// A ``ToastView`` represents as a toast consists of an icon and a headline text label.
   ///
   /// - Parameters:
   ///   - content: The content of the icon.
-  static func icon<Content>(content: () -> Content) -> Self
-  where Self == IconToastViewStyle<Content> {
+  public static func icon<Content>(content: () -> Content) -> Self
+    where Self == IconToastViewStyle<Content> {
     .init(content: content)
   }
 }
@@ -280,9 +281,9 @@ public struct SuccessToastViewStyle: ToastViewStyle {
 }
 
 @available(iOS 14.0, macOS 11.0, tvOS 14.0, watchOS 7.0, visionOS 1.0, *)
-public extension ToastViewStyle where Self == SuccessToastViewStyle {
+extension ToastViewStyle where Self == SuccessToastViewStyle {
   /// A ``ToastView`` represents as a success toast.
-  static var success: Self {
+  public static var success: Self {
     .init()
   }
 }
@@ -306,9 +307,9 @@ public struct FailureToastViewStyle: ToastViewStyle {
 }
 
 @available(iOS 14.0, macOS 11.0, tvOS 14.0, watchOS 7.0, visionOS 1.0, *)
-public extension ToastViewStyle where Self == FailureToastViewStyle {
+extension ToastViewStyle where Self == FailureToastViewStyle {
   /// A ``ToastView`` represents as a failure toast.
-  static var failure: Self {
+  public static var failure: Self {
     .init()
   }
 }
@@ -332,9 +333,9 @@ public struct WarningToastViewStyle: ToastViewStyle {
 }
 
 @available(iOS 14.0, macOS 11.0, tvOS 14.0, watchOS 7.0, visionOS 1.0, *)
-public extension ToastViewStyle where Self == WarningToastViewStyle {
+extension ToastViewStyle where Self == WarningToastViewStyle {
   /// A ``ToastView`` represents as a warning toast.
-  static var warning: Self {
+  public static var warning: Self {
     .init()
   }
 }
@@ -358,9 +359,9 @@ public struct InformationToastViewStyle: ToastViewStyle {
 }
 
 @available(iOS 14.0, macOS 11.0, tvOS 14.0, watchOS 7.0, visionOS 1.0, *)
-public extension ToastViewStyle where Self == InformationToastViewStyle {
+extension ToastViewStyle where Self == InformationToastViewStyle {
   /// A ``ToastView`` represents as an information toast.
-  static var information: Self {
+  public static var information: Self {
     .init()
   }
 }
diff --git a/Sources/ToastUI/EnvironmentValues.swift b/Sources/ToastUI/EnvironmentValues.swift
index ded1131..7ea96a1 100644
--- a/Sources/ToastUI/EnvironmentValues.swift
+++ b/Sources/ToastUI/EnvironmentValues.swift
@@ -32,5 +32,5 @@ struct ToastViewStyleEnvironmentKey: EnvironmentKey {
 }
 
 struct ToastDimmedBackgroundEnvironmentKey: EnvironmentKey {
-  static let defaultValue: Bool = true
+  static let defaultValue = true
 }
diff --git a/Sources/ToastUI/ToastUI.docc/About.md b/Sources/ToastUI/ToastUI.docc/About.md
index 0438ed5..228dbad 100644
--- a/Sources/ToastUI/ToastUI.docc/About.md
+++ b/Sources/ToastUI/ToastUI.docc/About.md
@@ -78,8 +78,8 @@ where Background: View, Label: View, Content: View {
   private var label: Label
   private var content: Content
   
-  @ScaledMetric private var paddingSize: Double = 16
-  @ScaledMetric private var cornerSize: Double = 9
+  @ScaledMetric private var paddingSize = 16.0
+  @ScaledMetric private var cornerSize = 9.0
 
   /* initializer omitted */
 
@@ -193,8 +193,8 @@ extension ToastViewStyle where Self == CustomToastViewStyle {
 }
 
 struct ContentView: View {
-  @State private var presentingToast: Bool = false
-  @State private var brightness: Double = 0.5
+  @State private var presentingToast = false
+  @State private var brightness = 0.5
 
   var body: some View {
     Button("Tap me") {
diff --git a/Sources/ToastUI/ToastUI.docc/GettingStarted.md b/Sources/ToastUI/ToastUI.docc/GettingStarted.md
index de8a566..794f779 100644
--- a/Sources/ToastUI/ToastUI.docc/GettingStarted.md
+++ b/Sources/ToastUI/ToastUI.docc/GettingStarted.md
@@ -35,7 +35,7 @@ dependencies: [
       @Column(size: 2) {
         ```swift
         struct ContentView: View {
-          @State private var presentingToast: Bool = false
+          @State private var presentingToast = false
 
           var body: some View {
             Button("Tap me") {
@@ -63,7 +63,7 @@ dependencies: [
       @Column(size: 2) {
         ```swift
         struct ContentView: View {
-          @State private var presentingToast: Bool = false
+          @State private var presentingToast = false
 
           var body: some View {
             Button("Tap me") {
@@ -102,7 +102,7 @@ dependencies: [
       @Column(size: 2) {
         ```swift
         struct ContentView: View {
-          @State private var presentingToast: Bool = false
+          @State private var presentingToast = false
 
           var body: some View {
             Button("Tap me") {
diff --git a/Sources/ToastUI/ToastUI.swift b/Sources/ToastUI/ToastUI.swift
index db293ed..83cdeb2 100644
--- a/Sources/ToastUI/ToastUI.swift
+++ b/Sources/ToastUI/ToastUI.swift
@@ -8,7 +8,7 @@
 import SwiftUI
 
 @available(iOS 14.0, macOS 11.0, tvOS 14.0, watchOS 7.0, visionOS 1.0, *)
-public extension View {
+extension View {
   /// Presents a toast when the given binding to a Boolean value is true.
   ///
   /// - Parameters:
@@ -16,12 +16,13 @@ public extension View {
   ///   - dismissAfter: An amount of time (in seconds) to dismiss the toast.
   ///   - onDismiss: A closure to execute when the toast is dismissed.
   ///   - content: A closure that returns the content of the toast.
-  func toast<Content>(
+  public func toast<Content>(
     isPresented: Binding<Bool>,
     dismissAfter: Double? = nil,
     onDismiss: (() -> Void)? = nil,
     @ViewBuilder content: @escaping () -> Content
-  ) -> some View where Content: View {
+  )
+    -> some View where Content: View {
     #if os(iOS) || os(tvOS) || os(visionOS)
     background(
       ToastViewIsPresentedBridge(
@@ -50,12 +51,13 @@ public extension View {
   ///   - dismissAfter: An amount of time (in seconds) to dismiss the toast.
   ///   - onDismiss: A closure to execute when the toast is dismissed.
   ///   - content: A closure that returns the content of the toast.
-  func toast<Item, Content>(
+  public func toast<Item, Content>(
     item: Binding<Item?>,
     dismissAfter: Double? = nil,
     onDismiss: (() -> Void)? = nil,
     @ViewBuilder content: @escaping (Item) -> Content
-  ) -> some View where Item: Identifiable, Content: View {
+  )
+    -> some View where Item: Identifiable, Content: View {
     #if os(iOS) || os(tvOS) || os(visionOS)
     background(
       ToastViewItemBridge(
@@ -75,14 +77,14 @@ public extension View {
   /// Sets the style for ``ToastView`` within this view.
   ///
   /// - Parameter style: The ``ToastViewStyle`` to use for this view.
-  func toastViewStyle(_ style: some ToastViewStyle) -> some View {
+  public func toastViewStyle(_ style: some ToastViewStyle) -> some View {
     environment(\.toastViewStyle, AnyToastViewStyle(style))
   }
 
   /// Sets the dimmed background when presenting the toast within this view.
   ///
   /// - Parameter enabled: Should enable the dimmed background for this view.
-  func toastDimmedBackground(_ enabled: Bool) -> some View {
+  public func toastDimmedBackground(_ enabled: Bool) -> some View {
     environment(\.toastDimmedBackground, enabled)
   }
 }
diff --git a/Sources/ToastUI/ToastView.swift b/Sources/ToastUI/ToastView.swift
index 9a0ab8d..1d0741a 100644
--- a/Sources/ToastUI/ToastView.swift
+++ b/Sources/ToastUI/ToastView.swift
@@ -16,7 +16,7 @@ import SwiftUI
 /// This view supports styling by using ``ToastView/toastViewStyle(_:)``.
 @available(iOS 14.0, macOS 11.0, tvOS 14.0, watchOS 7.0, visionOS 1.0, *)
 public struct ToastView<Background, Label, Content>: View
-where Background: View, Label: View, Content: View {
+  where Background: View, Label: View, Content: View {
   @Environment(\.toastViewStyle) private var style
 
   private var configuration: ToastViewStyleConfiguration
@@ -28,20 +28,20 @@ where Background: View, Label: View, Content: View {
 }
 
 @available(iOS 14.0, macOS 11.0, tvOS 14.0, watchOS 7.0, visionOS 1.0, *)
-public extension ToastView {
+extension ToastView {
   /// Creates an empty ``ToastView``.
-  init()
-  where Background == EmptyView, Label == EmptyView, Content == EmptyView {
-    configuration = ToastViewStyleConfiguration()
+  public init()
+    where Background == EmptyView, Label == EmptyView, Content == EmptyView {
+    self.configuration = ToastViewStyleConfiguration()
   }
 
   /// Creates an empty ``ToastView`` with text label from a string.
   ///
   /// - Parameter title: A string that describes the text label.
   @_disfavoredOverload
-  init(_ title: some StringProtocol)
-  where Background == EmptyView, Label == Text, Content == EmptyView {
-    configuration = ToastViewStyleConfiguration(
+  public init(_ title: some StringProtocol)
+    where Background == EmptyView, Label == Text, Content == EmptyView {
+    self.configuration = ToastViewStyleConfiguration(
       label: .init(content: Text(title))
     )
   }
@@ -49,9 +49,9 @@ public extension ToastView {
   /// Creates an empty ``ToastView`` with text label from a localized string.
   ///
   /// - Parameter titleKey: The key used to look up the localized title for the label.
-  init(_ titleKey: LocalizedStringKey)
-  where Background == EmptyView, Label == Text, Content == EmptyView {
-    configuration = ToastViewStyleConfiguration(
+  public init(_ titleKey: LocalizedStringKey)
+    where Background == EmptyView, Label == Text, Content == EmptyView {
+    self.configuration = ToastViewStyleConfiguration(
       label: .init(content: Text(titleKey))
     )
   }
@@ -62,9 +62,9 @@ public extension ToastView {
   ///   - title: A string that describes the text label.
   ///   - content: A view builder that creates a view for the content.
   @_disfavoredOverload
-  init(_ title: some StringProtocol, @ViewBuilder content: () -> Content)
-  where Background == EmptyView, Label == Text {
-    configuration = ToastViewStyleConfiguration(
+  public init(_ title: some StringProtocol, @ViewBuilder content: () -> Content)
+    where Background == EmptyView, Label == Text {
+    self.configuration = ToastViewStyleConfiguration(
       label: .init(content: Text(title)),
       content: .init(content: content())
     )
@@ -75,9 +75,9 @@ public extension ToastView {
   /// - Parameters:
   ///   - titleKey: The key used to look up the localized title for the label.
   ///   - content: A view builder that creates a view for the content.
-  init(_ titleKey: LocalizedStringKey, @ViewBuilder content: () -> Content)
-  where Background == EmptyView, Label == Text {
-    configuration = ToastViewStyleConfiguration(
+  public init(_ titleKey: LocalizedStringKey, @ViewBuilder content: () -> Content)
+    where Background == EmptyView, Label == Text {
+    self.configuration = ToastViewStyleConfiguration(
       label: .init(content: Text(titleKey)),
       content: .init(content: content())
     )
@@ -91,12 +91,12 @@ public extension ToastView {
   ///   - content: A view builder that creates a view for the content.
   ///   - background: A view builder that creates a view for the background.
   @_disfavoredOverload
-  init(
+  public init(
     _ title: some StringProtocol,
     @ViewBuilder content: () -> Content,
     @ViewBuilder background: () -> Background
   ) where Label == Text {
-    configuration = ToastViewStyleConfiguration(
+    self.configuration = ToastViewStyleConfiguration(
       background: .init(content: background()),
       label: .init(content: Text(title)),
       content: .init(content: content())
@@ -110,12 +110,12 @@ public extension ToastView {
   ///   - titleKey: The key used to look up the localized title for the label.
   ///   - content: A view builder that creates a view for the content.
   ///   - background: A view builder that creates a view for the background.
-  init(
+  public init(
     _ titleKey: LocalizedStringKey,
     @ViewBuilder content: () -> Content,
     @ViewBuilder background: () -> Background
   ) where Label == Text {
-    configuration = ToastViewStyleConfiguration(
+    self.configuration = ToastViewStyleConfiguration(
       background: .init(content: background()),
       label: .init(content: Text(titleKey)),
       content: .init(content: content())
@@ -125,9 +125,9 @@ public extension ToastView {
   /// Creates a ``ToastView`` with custom `content` view.
   ///
   /// - Parameter content: A view builder that creates a view for the content.
-  init(@ViewBuilder content: () -> Content)
-  where Background == EmptyView, Label == EmptyView {
-    configuration = ToastViewStyleConfiguration(
+  public init(@ViewBuilder content: () -> Content)
+    where Background == EmptyView, Label == EmptyView {
+    self.configuration = ToastViewStyleConfiguration(
       content: .init(content: content())
     )
   }
@@ -137,11 +137,11 @@ public extension ToastView {
   /// - Parameters:
   ///   - content: A view builder that creates a view for the content.
   ///   - background: A view builder that creates a view for the background.
-  init(
+  public init(
     @ViewBuilder content: () -> Content,
     @ViewBuilder background: () -> Background
   ) where Label == EmptyView {
-    configuration = ToastViewStyleConfiguration(
+    self.configuration = ToastViewStyleConfiguration(
       background: .init(content: background()),
       content: .init(content: content())
     )
@@ -152,11 +152,11 @@ public extension ToastView {
   /// - Parameters:
   ///   - content: A view builder that creates a view for the content.
   ///   - label: A view builder that creates a view for the label.
-  init(
+  public init(
     @ViewBuilder content: () -> Content,
     @ViewBuilder label: () -> Label
   ) where Background == EmptyView {
-    configuration = ToastViewStyleConfiguration(
+    self.configuration = ToastViewStyleConfiguration(
       label: .init(content: label()),
       content: .init(content: content())
     )
@@ -168,12 +168,12 @@ public extension ToastView {
   ///   - content: A view builder that creates a view for the content.
   ///   - label: A view builder that creates a view for the label.
   ///   - background: A view builder that creates a view for the background.
-  init(
+  public init(
     @ViewBuilder content: () -> Content,
     @ViewBuilder label: () -> Label,
     @ViewBuilder background: () -> Background
   ) {
-    configuration = ToastViewStyleConfiguration(
+    self.configuration = ToastViewStyleConfiguration(
       background: .init(content: background()),
       label: .init(content: label()),
       content: .init(content: content())
@@ -182,13 +182,13 @@ public extension ToastView {
 }
 
 struct DefaultToastView<Background, Label, Content>: View
-where Background: View, Label: View, Content: View {
+  where Background: View, Label: View, Content: View {
   private var background: Background
   private var label: Label
   private var content: Content
 
-  @ScaledMetric private var paddingSize: Double = 16
-  @ScaledMetric private var cornerSize: Double = 9
+  @ScaledMetric private var paddingSize = 16.0
+  @ScaledMetric private var cornerSize = 9.0
 
   init(
     @ViewBuilder content: () -> Content,
diff --git a/Sources/ToastUI/ToastViewBridge.swift b/Sources/ToastUI/ToastViewBridge.swift
index 2ad57d9..9f231e7 100644
--- a/Sources/ToastUI/ToastViewBridge.swift
+++ b/Sources/ToastUI/ToastViewBridge.swift
@@ -34,7 +34,7 @@ struct ToastViewIsPresentedBridge<Content>: UIViewControllerRepresentable where
 }
 
 struct ToastViewItemBridge<Item, Content>: UIViewControllerRepresentable
-where Item: Identifiable, Content: View {
+  where Item: Identifiable, Content: View {
   @Binding var item: Item?
   let dismissAfter: Double?
   let onDismiss: (() -> Void)?
diff --git a/Sources/ToastUI/ToastViewController.swift b/Sources/ToastUI/ToastViewController.swift
index 6a4412e..726f2aa 100644
--- a/Sources/ToastUI/ToastViewController.swift
+++ b/Sources/ToastUI/ToastViewController.swift
@@ -28,12 +28,12 @@ final class ToastViewIsPresentedController<Content>: UIViewController where Cont
     if currentState == isPresented.wrappedValue {
       return
     }
-    
+
     defer {
       currentState = isPresented.wrappedValue
     }
-    
-    if transitioning && isPresented.wrappedValue {
+
+    if transitioning, isPresented.wrappedValue {
       logger.fault("Attempted to present the toast view while a presentation is in progress.")
       DispatchQueue.main.async {
         isPresented.wrappedValue = false
@@ -85,21 +85,21 @@ final class ToastViewIsPresentedController<Content>: UIViewController where Cont
       }
 
       transitioning = true
-      
+
       toastWindow.makeKeyAndVisible()
-      
+
       let toastViewController = ToastViewHostingController(
         rootView: content(),
         environment: environment
       )
-      
+
       DispatchQueue.main.async {
         rootViewController.present(toastViewController, animated: true) {
           self.transitioning = false
         }
       }
 
-      if let dismissAfter = dismissAfter {
+      if let dismissAfter {
         DispatchQueue.main.asyncAfter(deadline: .now() + dismissAfter) {
           isPresented.wrappedValue = false
         }
@@ -110,7 +110,7 @@ final class ToastViewIsPresentedController<Content>: UIViewController where Cont
       }
 
       transitioning = true
-      
+
       DispatchQueue.main.async {
         rootViewController.dismiss(animated: true) { [self] in
           onDismiss?()
@@ -126,7 +126,7 @@ final class ToastViewIsPresentedController<Content>: UIViewController where Cont
 }
 
 final class ToastViewItemController<Item, Content>: UIViewController
-where Item: Identifiable, Content: View {
+  where Item: Identifiable, Content: View {
   var toastWindow: UIWindow!
   var currentState: Item.ID?
   var transitioning = false
@@ -141,12 +141,12 @@ where Item: Identifiable, Content: View {
     if currentState == item.wrappedValue?.id {
       return
     }
-    
+
     defer {
       currentState = item.wrappedValue?.id
     }
-    
-    if transitioning && item.wrappedValue != nil {
+
+    if transitioning, item.wrappedValue != nil {
       logger.fault("Attempted to present the toast view while a presentation is in progress.")
       DispatchQueue.main.async {
         item.wrappedValue = nil
@@ -198,21 +198,21 @@ where Item: Identifiable, Content: View {
       }
 
       transitioning = true
-      
+
       toastWindow.makeKeyAndVisible()
-      
+
       let toastViewController = ToastViewHostingController(
         rootView: content(value),
         environment: environment
       )
-      
+
       DispatchQueue.main.async {
         rootViewController.present(toastViewController, animated: true) {
           self.transitioning = false
         }
       }
 
-      if let dismissAfter = dismissAfter {
+      if let dismissAfter {
         DispatchQueue.main.asyncAfter(deadline: .now() + dismissAfter) {
           item.wrappedValue = nil
         }
@@ -223,7 +223,7 @@ where Item: Identifiable, Content: View {
       }
 
       transitioning = true
-      
+
       DispatchQueue.main.async {
         rootViewController.dismiss(animated: true) { [self] in
           onDismiss?()
diff --git a/Sources/ToastUI/ToastViewHostingController.swift b/Sources/ToastUI/ToastViewHostingController.swift
index 367e1c0..d3003eb 100644
--- a/Sources/ToastUI/ToastViewHostingController.swift
+++ b/Sources/ToastUI/ToastViewHostingController.swift
@@ -22,7 +22,8 @@ final class ToastViewHostingController<Content>: UIHostingController<Content> wh
   }
 
   @available(*, unavailable)
-  @objc dynamic required init?(coder _: NSCoder) {
+  @objc
+  dynamic required init?(coder _: NSCoder) {
     fatalError("init(coder:) has not been implemented")
   }
 }
diff --git a/Sources/ToastUI/ToastViewStyle.swift b/Sources/ToastUI/ToastViewStyle.swift
index 9f78417..8e0f7ff 100644
--- a/Sources/ToastUI/ToastViewStyle.swift
+++ b/Sources/ToastUI/ToastViewStyle.swift
@@ -31,32 +31,32 @@ public protocol ToastViewStyle {
 public struct ToastViewStyleConfiguration {
   /// A type-erased background of a ``ToastView``.
   public struct Background: View {
-    init(content: some View) {
-      body = AnyView(content)
-    }
-
     /// The body of this view.
     public var body: AnyView
-  }
 
-  /// A type-erased label of a ``ToastView``.
-  public struct Label: View {
     init(content: some View) {
-      body = AnyView(content)
+      self.body = AnyView(content)
     }
+  }
 
+  /// A type-erased label of a ``ToastView``.
+  public struct Label: View {
     /// The body of this view.
     public var body: AnyView
-  }
 
-  /// A type-erased content of a ``ToastView``.
-  public struct Content: View {
     init(content: some View) {
-      body = AnyView(content)
+      self.body = AnyView(content)
     }
+  }
 
+  /// A type-erased content of a ``ToastView``.
+  public struct Content: View {
     /// The body of this view.
     public var body: AnyView
+
+    init(content: some View) {
+      self.body = AnyView(content)
+    }
   }
 
   /// A view describes the background of a ``ToastView``.
diff --git a/ToastUISample/ToastUISample.xcodeproj/project.pbxproj b/ToastUISample/ToastUISample.xcodeproj/project.pbxproj
index 527d9ef..bd79797 100644
--- a/ToastUISample/ToastUISample.xcodeproj/project.pbxproj
+++ b/ToastUISample/ToastUISample.xcodeproj/project.pbxproj
@@ -188,7 +188,7 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = YES;
 				LastSwiftUpdateCheck = 1530;
-				LastUpgradeCheck = 1530;
+				LastUpgradeCheck = 1600;
 				TargetAttributes = {
 					337A107624CAC97900362CBE = {
 						CreatedOnToolsVersion = 12.0;
diff --git a/ToastUISample/ToastUISample.xcodeproj/xcshareddata/xcschemes/ToastUISample-iOS.xcscheme b/ToastUISample/ToastUISample.xcodeproj/xcshareddata/xcschemes/ToastUISample-iOS.xcscheme
index 034e637..7e0938f 100644
--- a/ToastUISample/ToastUISample.xcodeproj/xcshareddata/xcschemes/ToastUISample-iOS.xcscheme
+++ b/ToastUISample/ToastUISample.xcodeproj/xcshareddata/xcschemes/ToastUISample-iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1530"
+   LastUpgradeVersion = "1600"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/ToastUISample/ToastUISample.xcodeproj/xcshareddata/xcschemes/ToastUISample-macOS.xcscheme b/ToastUISample/ToastUISample.xcodeproj/xcshareddata/xcschemes/ToastUISample-macOS.xcscheme
index d7cef35..82441ab 100644
--- a/ToastUISample/ToastUISample.xcodeproj/xcshareddata/xcschemes/ToastUISample-macOS.xcscheme
+++ b/ToastUISample/ToastUISample.xcodeproj/xcshareddata/xcschemes/ToastUISample-macOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1530"
+   LastUpgradeVersion = "1600"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/ToastUISample/ToastUISample.xcodeproj/xcshareddata/xcschemes/ToastUISample-tvOS.xcscheme b/ToastUISample/ToastUISample.xcodeproj/xcshareddata/xcschemes/ToastUISample-tvOS.xcscheme
index d7ac9cf..e053831 100644
--- a/ToastUISample/ToastUISample.xcodeproj/xcshareddata/xcschemes/ToastUISample-tvOS.xcscheme
+++ b/ToastUISample/ToastUISample.xcodeproj/xcshareddata/xcschemes/ToastUISample-tvOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1530"
+   LastUpgradeVersion = "1600"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/ToastUISample/ToastUISample.xcodeproj/xcshareddata/xcschemes/ToastUITests.xcscheme b/ToastUISample/ToastUISample.xcodeproj/xcshareddata/xcschemes/ToastUITests.xcscheme
index ddd89e8..143e983 100644
--- a/ToastUISample/ToastUISample.xcodeproj/xcshareddata/xcschemes/ToastUITests.xcscheme
+++ b/ToastUISample/ToastUISample.xcodeproj/xcshareddata/xcschemes/ToastUITests.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1530"
+   LastUpgradeVersion = "1600"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/ToastUISample/ToastUISample/AdvancedExamples.swift b/ToastUISample/ToastUISample/AdvancedExamples.swift
index bedc8cd..0527e7e 100644
--- a/ToastUISample/ToastUISample/AdvancedExamples.swift
+++ b/ToastUISample/ToastUISample/AdvancedExamples.swift
@@ -46,12 +46,6 @@ struct PresentSuccessToastAfterCompletedExample: View {
 }
 
 struct CustomToastViewStyle: ToastViewStyle {
-  @Binding var brightness: Double
-
-  func makeBody(configuration: Configuration) -> some View {
-    CustomToastView(configuration: configuration, brightness: $brightness)
-  }
-
   struct CustomToastView: View {
     let configuration: Configuration
     @Binding var brightness: Double
@@ -76,6 +70,12 @@ struct CustomToastViewStyle: ToastViewStyle {
       .fixedSize()
     }
   }
+
+  @Binding var brightness: Double
+
+  func makeBody(configuration: Configuration) -> some View {
+    CustomToastView(configuration: configuration, brightness: $brightness)
+  }
 }
 
 extension ToastViewStyle where Self == CustomToastViewStyle {
diff --git a/ToastUISample/ToastUISample/Auxiliaries.swift b/ToastUISample/ToastUISample/Auxiliaries.swift
index 012ae99..f645afd 100644
--- a/ToastUISample/ToastUISample/Auxiliaries.swift
+++ b/ToastUISample/ToastUISample/Auxiliaries.swift
@@ -14,9 +14,9 @@ struct ExampleItem<Destination>: View where Destination: View {
   var body: some View {
     NavigationLink {
       destination
-        #if !os(macOS)
-        .navigationBarTitleDisplayMode(.inline)
-        #endif
+      #if !os(macOS)
+      .navigationBarTitleDisplayMode(.inline)
+      #endif
     } label: {
       Text(description)
     }
@@ -31,8 +31,8 @@ struct CustomButton: View {
 
   init(
     _ text: String,
-    maxWidth: Double = 100,
-    maxHeight: Double = 10,
+    maxWidth: Double = 100.0,
+    maxHeight: Double = 10.0,
     _ action: @escaping () -> Void
   ) {
     self.text = text
@@ -44,14 +44,14 @@ struct CustomButton: View {
   var body: some View {
     Button(action: action) {
       Text(text)
-        #if os(iOS) || os(visionOS)
+      #if os(iOS) || os(visionOS)
         .bold()
         .foregroundColor(.white)
-        .frame(minWidth: maxWidth, minHeight: maxHeight)
+        .frame(maxWidth: maxWidth, maxHeight: maxHeight)
         .padding()
         .background(Color.accentColor)
         .cornerRadius(12.0)
-        #endif
+      #endif
     }
   }
 }
diff --git a/ToastUISample/ToastUISample/BasicExamples.swift b/ToastUISample/ToastUISample/BasicExamples.swift
index 24b3d6f..8d03d54 100644
--- a/ToastUISample/ToastUISample/BasicExamples.swift
+++ b/ToastUISample/ToastUISample/BasicExamples.swift
@@ -21,10 +21,10 @@ struct BuiltInToastViewStyleExample: View {
 
   @State private var style: Style = .indeterminate
 
-  @State private var presentingToast: Bool = false
-  @State private var dimmedBackground: Bool = true
+  @State private var presentingToast = false
+  @State private var dimmedBackground = true
 
-  @State private var value: Double = 0 // for .definite style
+  @State private var value = 0.0 // for .definite style
 
   var body: some View {
     VStack {
@@ -106,7 +106,7 @@ struct BuiltInToastViewStyleExample: View {
 }
 
 struct CustomAlertExample: View {
-  @State private var presentingToast: Bool = false
+  @State private var presentingToast = false
 
   var body: some View {
     CustomButton("Tap me") {
@@ -131,8 +131,8 @@ struct CustomAlertExample: View {
 }
 
 struct CustomBackgroundExample: View {
-  @State private var presentingToast: Bool = false
-  @State private var customBackground: Bool = false
+  @State private var presentingToast = false
+  @State private var customBackground = false
 
   private let gradient = AngularGradient(
     gradient: Gradient(colors: [.red, .yellow, .green, .blue, .purple, .red]),

From 15293ea397df0b3d297aeda30eb5247915c1ba9b Mon Sep 17 00:00:00 2001
From: Quan Tran <quan@shousio.com>
Date: Sat, 10 Aug 2024 18:02:20 -0700
Subject: [PATCH 3/5] Update CHANGELOG

---
 CHANGELOG.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e7cd0a1..38b67b8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file. `ToastUI` a
 
 #### 4.x Releases
 
-* `4.0.x` Releases - [4.0.0](#400))
+* `4.0.x` Releases - [4.0.0](#400)
 
 #### 3.x Releases
 
@@ -25,7 +25,7 @@ All notable changes to this project will be documented in this file. `ToastUI` a
 
 ## [4.0.0](https://github.com/quanshousio/ToastUI/releases/tag/4.0.0)
 
-Released on 2024-06-01.
+Released on 2024-08-10.
 
 #### Changed
 
@@ -41,6 +41,7 @@ Released on 2024-06-01.
 * Toasts now dismiss immediately, even during transitions.
 * Documentation to use new DocC version.
 * Remove padding from the background in DefaultToastView.
+* Update GitHub actions.
 
 ---
 
@@ -58,7 +59,7 @@ Released on 2022-07-19.
 Released on 2022-04-11.
 
 #### Changed
-  
+
 * Minimum required version for Swift is 5.5.
 * Visual changes:
   * ToastUI shows a dimmed background when presenting a toast instead of a blurred background. This replicates the behavior of a normal `UIAlertController`.

From 9ad34a7fac575e547219b7c96b350d562215e4cd Mon Sep 17 00:00:00 2001
From: Quan Tran <quan@shousio.com>
Date: Sat, 10 Aug 2024 18:02:26 -0700
Subject: [PATCH 4/5] Update GitHub actions

---
 .github/workflows/build.yml | 23 ++++++++++++-----------
 .github/workflows/docc.yml  | 18 ++++++++++--------
 2 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index add3ce7..f7db21e 100755
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,4 +1,4 @@
-name: build
+name: Build
 
 on:
   push:
@@ -7,22 +7,23 @@ on:
     branches: [main]
 
 jobs:
-  swiftlint:
-    runs-on: ubuntu-latest
-    steps:
-      - name: checkout
-        uses: actions/checkout@v3
-      - name: swiftlint
-        uses: norio-nomura/action-swiftlint@3.2.1
   build:
     runs-on: macos-latest
+
     strategy:
       matrix:
         platform: [iOS, tvOS, watchOS, macOS, mac-catalyst]
+
     steps:
-      - name: checkout
-        uses: actions/checkout@v2
-      - name: build
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Run swiftlint
+        uses: cirruslabs/swiftlint-action@v1
+        with:
+          version: latest
+
+      - name: Run xcodebuild
         run: |
           PLATFORM=${{ matrix.platform }}
           if [[ $PLATFORM == iOS ]]; then
diff --git a/.github/workflows/docc.yml b/.github/workflows/docc.yml
index 755f895..8de15b3 100644
--- a/.github/workflows/docc.yml
+++ b/.github/workflows/docc.yml
@@ -1,17 +1,19 @@
-name: docc
+name: DocC documentation
 
 on:
- push:
-   tags:
-     - '*'
+  push:
+    tags:
+      - "*"
 
 jobs:
   docbuild:
     runs-on: macos-latest
+
     steps:
-      - name: checkout
-        uses: actions/checkout@v3
+      - name: Checkout repository
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - name: docc
-        run: ./toastui docc deploy
\ No newline at end of file
+
+      - name: Deploy documentation
+        run: ./toastui docc deploy

From 93c1689c9f7b992241d6e4949c636bb83e434763 Mon Sep 17 00:00:00 2001
From: Quan Tran <quan@shousio.com>
Date: Sat, 10 Aug 2024 18:08:54 -0700
Subject: [PATCH 5/5] Address SwiftLint

---
 Package.swift                             | 12 +++---------
 Sources/ToastUI/ToastViewBridge.swift     |  4 ++--
 Sources/ToastUI/ToastViewController.swift |  2 ++
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/Package.swift b/Package.swift
index 529527e..d573992 100644
--- a/Package.swift
+++ b/Package.swift
@@ -4,13 +4,7 @@ import PackageDescription
 
 let package = Package(
   name: "ToastUI",
-  platforms: [
-    .iOS(.v14), .tvOS(.v14), .watchOS(.v7), .macOS(.v11),
-  ],
-  products: [
-    .library(name: "ToastUI", targets: ["ToastUI"]),
-  ],
-  targets: [
-    .target(name: "ToastUI"),
-  ]
+  platforms: [.iOS(.v14), .tvOS(.v14), .watchOS(.v7), .macOS(.v11)],
+  products: [.library(name: "ToastUI", targets: ["ToastUI"])],
+  targets: [.target(name: "ToastUI")]
 )
diff --git a/Sources/ToastUI/ToastViewBridge.swift b/Sources/ToastUI/ToastViewBridge.swift
index 9f231e7..55961c8 100644
--- a/Sources/ToastUI/ToastViewBridge.swift
+++ b/Sources/ToastUI/ToastViewBridge.swift
@@ -15,7 +15,7 @@ struct ToastViewIsPresentedBridge<Content>: UIViewControllerRepresentable where
   let content: () -> Content
 
   func makeUIViewController(context _: Context) -> ToastViewIsPresentedController<Content> {
-    let _ = isPresented // BUG: Need this for SwiftUI to update the view appropriately.
+    _ = isPresented // BUG: Need this for SwiftUI to update the view appropriately.
     return ToastViewIsPresentedController()
   }
 
@@ -41,7 +41,7 @@ struct ToastViewItemBridge<Item, Content>: UIViewControllerRepresentable
   let content: (Item) -> Content
 
   func makeUIViewController(context _: Context) -> ToastViewItemController<Item, Content> {
-    let _ = item // BUG: Need this for SwiftUI to update the view appropriately.
+    _ = item // BUG: Need this for SwiftUI to update the view appropriately.
     return ToastViewItemController()
   }
 
diff --git a/Sources/ToastUI/ToastViewController.swift b/Sources/ToastUI/ToastViewController.swift
index 726f2aa..6391270 100644
--- a/Sources/ToastUI/ToastViewController.swift
+++ b/Sources/ToastUI/ToastViewController.swift
@@ -238,3 +238,5 @@ final class ToastViewItemController<Item, Content>: UIViewController
   }
 }
 #endif
+
+// swiftlint:enable function_body_length