Skip to content

Commit 392d1e8

Browse files
committed
[fix] #171 overlay, background 모디파이어 수정
1 parent 3da92c6 commit 392d1e8

File tree

4 files changed

+29
-35
lines changed

4 files changed

+29
-35
lines changed

Projects/DSKit/Sources/Components/PokitList.swift

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -83,15 +83,13 @@ public struct PokitList<Item: PokitSelectItem>: View {
8383
}
8484
.padding(.vertical, 12)
8585
.padding(.horizontal, 20)
86-
.background {
87-
if isSelected {
88-
Color.pokit(.bg(.primary))
89-
.matchedGeometryEffect(id: "SELECT", in: heroEffect)
90-
} else {
91-
isDisabled
92-
? Color.pokit(.bg(.disable))
93-
: Color.pokit(.bg(.base))
94-
}
86+
.background(if: isSelected) {
87+
Color.pokit(.bg(.primary))
88+
.matchedGeometryEffect(id: "SELECT", in: heroEffect)
89+
} else: {
90+
isDisabled
91+
? Color.pokit(.bg(.disable))
92+
: Color.pokit(.bg(.base))
9593
}
9694
}
9795
.animation(.pokitDissolve, value: isSelected)

Projects/Feature/FeatureContentCardTests/Sources/FeatureContentCardTests.swift

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ import ComposableArchitecture
22
import XCTest
33
import Domain
44
import CoreKit
5-
import DSKit
6-
import Util
75

86
@testable import FeatureContentCard
97

@@ -36,7 +34,7 @@ final class SendTests: XCTestCase {
3634
let store = TestStore(initialState: ContentCardFeature.State(
3735
content: ContentBaseResponse.mock(id: 0).toDomain()
3836
)) {
39-
ContentCardFeature()
37+
ContentCardFeature()._printChanges(.actionLabels)
4038
} withDependencies: {
4139
$0[ContentClient.self] = .testValue
4240
let parseOGImageURL: @Sendable (
@@ -62,7 +60,7 @@ final class SendTests: XCTestCase {
6260
let store = TestStore(initialState: LegacyContentCardFeature.State(
6361
content: ContentBaseResponse.mock(id: 0).toDomain()
6462
)) {
65-
LegacyContentCardFeature()
63+
LegacyContentCardFeature()._printChanges(.actionLabels)
6664
} withDependencies: {
6765
$0[ContentClient.self] = .testValue
6866
let parseOGImageURL: @Sendable (

Projects/Feature/FeatureRemind/Sources/Remind/RemindView.swift

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -155,12 +155,10 @@ extension RemindView {
155155
.padding(12)
156156
}
157157
.frame(width: 216, height: 194)
158-
.background {
159-
if let url = URL(string: content.thumbNail) {
160-
recommendedContentCellImage(url: url, contentId: content.id)
161-
} else {
162-
imagePlaceholder
163-
}
158+
.background(ifLet: URL(string: content.thumbNail)) { url in
159+
recommendedContentCellImage(url: url, contentId: content.id)
160+
} else: {
161+
imagePlaceholder
164162
}
165163
.clipShape(RoundedRectangle(cornerRadius: 12, style: .continuous))
166164
.clipped()

Projects/Util/Sources/Extension/View+Extension.swift

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@ public extension View {
4141
}
4242

4343
@ViewBuilder
44-
func overlay<V>(
44+
func overlay(
4545
`if` condition: Bool,
4646
alignment: Alignment = .center,
47-
@ViewBuilder content: () -> V,
48-
@ViewBuilder `else`: () -> V? = { nil }
49-
) -> some View where V : View {
47+
@ViewBuilder content: () -> some View,
48+
@ViewBuilder `else`: () -> some View = { EmptyView() }
49+
) -> some View {
5050
self
5151
.overlay(alignment: alignment) {
5252
if condition {
@@ -58,12 +58,12 @@ public extension View {
5858
}
5959

6060
@ViewBuilder
61-
func overlay<V, T>(
61+
func overlay<T>(
6262
ifLet optional: T?,
6363
alignment: Alignment = .center,
64-
@ViewBuilder content: (T) -> V,
65-
@ViewBuilder `else`: () -> V? = { nil }
66-
) -> some View where V : View {
64+
@ViewBuilder content: (T) -> some View,
65+
@ViewBuilder `else`: () -> some View = { EmptyView() }
66+
) -> some View {
6767
self
6868
.overlay(alignment: alignment) {
6969
if let optional {
@@ -75,12 +75,12 @@ public extension View {
7575
}
7676

7777
@ViewBuilder
78-
func background<V>(
78+
func background(
7979
`if` condition: Bool,
8080
alignment: Alignment = .center,
81-
@ViewBuilder content: () -> V,
82-
@ViewBuilder `else`: () -> V? = { nil }
83-
) -> some View where V : View {
81+
@ViewBuilder content: () -> some View,
82+
@ViewBuilder `else`: () -> some View = { EmptyView() }
83+
) -> some View {
8484
self
8585
.background(alignment: alignment) {
8686
if condition {
@@ -92,12 +92,12 @@ public extension View {
9292
}
9393

9494
@ViewBuilder
95-
func background<V, T>(
95+
func background<T>(
9696
ifLet optional: T?,
9797
alignment: Alignment = .center,
98-
@ViewBuilder content: (T) -> V,
99-
@ViewBuilder `else`: () -> V? = { nil }
100-
) -> some View where V : View {
98+
@ViewBuilder content: (T) -> some View,
99+
@ViewBuilder `else`: () -> some View = { EmptyView() }
100+
) -> some View {
101101
self
102102
.background(alignment: alignment) {
103103
if let optional {

0 commit comments

Comments
 (0)