Remove conditional modifier

pixiv · Jul 23, 2024 · fa577b1 · fa577b1
1 parent e823b5b
commit fa577b1
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 32 deletions.
diff --git a/Sources/CharcoalSwiftUI/Components/Tooltip/CharcoalTooltip.swift b/Sources/CharcoalSwiftUI/Components/Tooltip/CharcoalTooltip.swift
@@ -85,22 +85,24 @@ struct CharcoalTooltip: CharcoalPopupProtocol {
 
     var body: some View {
         ZStack {
-            Color.clear
-                .if(dismissOnTouchOutside && isPresenting) { view in
-                    view.contentShape(Rectangle())
-                        .simultaneousGesture(
-                            TapGesture()
-                                .onEnded { _ in
-                                    isPresenting = false
-                                }
-                        )
-                        .simultaneousGesture(
-                            DragGesture()
-                                .onChanged { _ in
-                                    isPresenting = false
-                                }
-                        )
-                }
+            if dismissOnTouchOutside && isPresenting {
+                Color.clear
+                        .contentShape(Rectangle())
+                            .simultaneousGesture(
+                                TapGesture()
+                                    .onEnded { _ in
+                                        isPresenting = false
+                                    }
+                            )
+                            .simultaneousGesture(
+                                DragGesture()
+                                    .onChanged { _ in
+                                        isPresenting = false
+                                    }
+                            )
+            } else {
+                Color.clear
+            }
             if isPresenting {
                 GeometryReader(content: { canvasGeometry in
                     VStack {

diff --git a/Sources/CharcoalSwiftUI/Extensions/ConditionalViewModifier.swift b/Sources/CharcoalSwiftUI/Extensions/ConditionalViewModifier.swift