FIX: Closure Issue

OpenToss · Jul 16, 2023 · a0730a9 · a0730a9
1 parent c1e530c
commit a0730a9
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/Sources/OpenTDS/Component/ScrollView/ScrollView+Ext.swift b/Sources/OpenTDS/Component/ScrollView/ScrollView+Ext.swift
@@ -6,13 +6,11 @@ extension TossScrollView {
     public func showDismiss() -> TossScrollView {
         self.backButton()
     }
-
-    public func backButton(action: @escaping () -> () = {
-        let presentationMode = Environment(\.presentationMode).wrappedValue
-        presentationMode.wrappedValue.dismiss()
-    }) -> TossScrollView {
+
+    public func backButton(action: (() -> ())? = nil) -> TossScrollView {
         TossScrollView(self.title,
                        showsIndicators: self.showsIndicators,
+                       backButtonExists: true,
                        backButtonAction: action) {
             self.content
         }

diff --git a/Sources/OpenTDS/Component/ScrollView/ScrollView.swift b/Sources/OpenTDS/Component/ScrollView/ScrollView.swift
@@ -9,12 +9,13 @@ import SwiftUI
  */
 @available(macOS 11, iOS 14, *)
 public struct TossScrollView<Content: View>: View {
-    
+
     @Environment(\.presentationMode) var presentationMode
     @State var shrink: Bool = false
 
     let title: String
     let showsIndicators: Bool
+    let backButtonExists: Bool
     let backButtonAction: (() -> ())?
     let content: Content
 
@@ -25,10 +26,12 @@ public struct TossScrollView<Content: View>: View {
      */
     public init(_ title: String,
                 showsIndicators: Bool = true,
+                backButtonExists: Bool = false,
                 backButtonAction: (() -> ())? = nil,
                 @ViewBuilder content: @escaping () -> Content) {
         self.title = title
         self.showsIndicators = showsIndicators
+        self.backButtonExists = backButtonExists
         self.backButtonAction = backButtonAction
         self.content = content()
     }
@@ -37,8 +40,14 @@ public struct TossScrollView<Content: View>: View {
         VStack {
             ZStack {
                 HStack {
-                    if let backButtonAction = backButtonAction {
-                        Button(action: backButtonAction) {
+                    if backButtonExists {
+                        Button(action: {
+                            if let backButtonAction = backButtonAction {
+                                backButtonAction()
+                            } else {
+                                presentationMode.wrappedValue.dismiss()
+                            }
+                        }) {
                             TossIcon.chevron
                                 .resizable()
                                 .frame(width: 10.14, height: 17.77)