Skip to content

Commit 6de30e9

Browse files
committed
Revert prevented to preserved
1 parent a091be8 commit 6de30e9

File tree

10 files changed

+24
-24
lines changed

10 files changed

+24
-24
lines changed

Examples/BasicUsage/CounterPage.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ struct CounterPage: HookView {
66
let count = useState(0)
77
let isAutoIncrement = useState(false)
88

9-
useEffect(.prevented(by: isAutoIncrement.wrappedValue)) {
9+
useEffect(.preserved(by: isAutoIncrement.wrappedValue)) {
1010
guard isAutoIncrement.wrappedValue else { return nil }
1111

1212
let timer = Timer.scheduledTimer(withTimeInterval: 0.1, repeats: true) { _ in

Examples/BasicUsage/HookListPage.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ struct HookListPage: HookView {
6868
let isOn = useState(false)
6969
let count = useState(0)
7070

71-
useEffect(.prevented(by: isOn.wrappedValue)) {
71+
useEffect(.preserved(by: isOn.wrappedValue)) {
7272
guard isOn.wrappedValue else { return nil }
7373

7474
let timer = Timer.scheduledTimer(withTimeInterval: 0.3, repeats: true) { _ in
@@ -90,7 +90,7 @@ struct HookListPage: HookView {
9090
let flag = useState(false)
9191
let random = useState(0)
9292

93-
useLayoutEffect(.prevented(by: flag.wrappedValue)) {
93+
useLayoutEffect(.preserved(by: flag.wrappedValue)) {
9494
random.wrappedValue = Int.random(in: 0...100000)
9595
return nil
9696
}
@@ -106,7 +106,7 @@ struct HookListPage: HookView {
106106

107107
var useMemoRow: some View {
108108
let flag = useState(false)
109-
let randomColor = useMemo(.prevented(by: flag.wrappedValue)) {
109+
let randomColor = useMemo(.preserved(by: flag.wrappedValue)) {
110110
Color(hue: .random(in: 0...1), saturation: 1, brightness: 1)
111111
}
112112

@@ -125,7 +125,7 @@ struct HookListPage: HookView {
125125
let n2 = useRef(1)
126126
let fibonacci = useState(2)
127127

128-
useEffect(.prevented(by: flag.wrappedValue)) {
128+
useEffect(.preserved(by: flag.wrappedValue)) {
129129
n2.current = n1.current
130130
n1.current = fibonacci.wrappedValue
131131
fibonacci.wrappedValue = n1.current + n2.current

Examples/TheMovieDB-MVVM/CustomHooks/UseMovieImage.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import UIKit
44

55
func useMovieImage(for path: String?, size: NetworkImageSize) -> UIImage? {
66
let service = useContext(Context<Dependency>.self).service
7-
let phase = usePublisher(.prevented(by: [path, size.rawValue])) {
7+
let phase = usePublisher(.preserved(by: [path, size.rawValue])) {
88
service.getImage(path: path, size: size)
99
}
1010

Examples/TheMovieDB-MVVM/CustomHooks/UseTopRatedMoviesViewModel.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ func useTopRatedMoviesViewModel() -> TopRatedMoviesViewModel {
1616
let (loadNextPhase, loadNext) = useLoadMovies()
1717
let latestResponse = loadNextPhase.value ?? loadPhase.value
1818

19-
useLayoutEffect(.prevented(by: loadPhase.isSuccess)) {
19+
useLayoutEffect(.preserved(by: loadPhase.isSuccess)) {
2020
nextMovies.current = []
2121
return nil
2222
}
2323

24-
useLayoutEffect(.prevented(by: loadNextPhase.isSuccess)) {
24+
useLayoutEffect(.preserved(by: loadNextPhase.isSuccess)) {
2525
nextMovies.current += loadNextPhase.value?.results ?? []
2626
return nil
2727
}

Sources/Hooks/HookUpdateStrategy.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ public extension HookUpdateStrategy {
88
/// Returns a strategy that a hook will update its state when the given value is changed.
99
/// - Parameter value: The value to check against when determining whether to update a state of hook.
1010
/// - Returns: A strategy that a hook will update its state when the given value is changed.
11-
static func prevented<Value: Equatable>(by value: Value) -> Self {
11+
static func preserved<Value: Equatable>(by value: Value) -> Self {
1212
self.init(dependency: value)
1313
}
1414
}

Tests/HooksTests/Hook/UseEffectTests.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@ final class UseEffectTests: XCTestCase {
4646
XCTAssertEqual(effectCount, 1)
4747
}
4848

49-
func testEffectPrevented() {
49+
func testEffectPreserved() {
5050
var flag = false
5151
var effectCount = 0
5252

5353
let tester = HookTester {
54-
useEffect(.prevented(by: flag)) {
54+
useEffect(.preserved(by: flag)) {
5555
effectCount += 1
5656
return nil
5757
}
@@ -140,12 +140,12 @@ final class UseEffectTests: XCTestCase {
140140
XCTAssertEqual(effectCount, 1)
141141
}
142142

143-
func testLayoutEffectPrevented() {
143+
func testLayoutEffectPreserved() {
144144
var flag = false
145145
var effectCount = 0
146146

147147
let tester = HookTester {
148-
useLayoutEffect(.prevented(by: flag)) {
148+
useLayoutEffect(.preserved(by: flag)) {
149149
effectCount += 1
150150
return nil
151151
}

Tests/HooksTests/Hook/UseMemoTests.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ final class UseMemoTests: XCTestCase {
2525
XCTAssertEqual(tester.value, 0)
2626
}
2727

28-
func testPrevented() {
28+
func testPreserved() {
2929
var flag = false
3030
var value = 0
3131
let tester = HookTester {
32-
useMemo(.prevented(by: flag)) { () -> Int in
32+
useMemo(.preserved(by: flag)) { () -> Int in
3333
value
3434
}
3535
}

Tests/HooksTests/Hook/UsePublisherTests.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ final class UsePublisherTests: XCTestCase {
3030
XCTAssertEqual(tester.value.value, 0)
3131
}
3232

33-
func testUpdatePrevented() {
33+
func testUpdatePreserved() {
3434
let subject = PassthroughSubject<Void, Never>()
3535
let tester = HookTester((0, false)) { value, flag in
36-
usePublisher(.prevented(by: flag)) {
36+
usePublisher(.preserved(by: flag)) {
3737
subject.map { value }
3838
}
3939
}

Tests/HooksTests/HookUpdateStrategyTests.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ final class HookUpdateStrategyTests: XCTestCase {
1313
XCTAssertNotEqual(key.dependency, unexpected.dependency)
1414
}
1515

16-
func testPreventedByEquatable() {
17-
let key = HookUpdateStrategy.prevented(by: 100)
18-
let expected = HookUpdateStrategy.prevented(by: 100)
19-
let unexpected = HookUpdateStrategy.prevented(by: 1)
16+
func testPreservedByEquatable() {
17+
let key = HookUpdateStrategy.preserved(by: 100)
18+
let expected = HookUpdateStrategy.preserved(by: 100)
19+
let unexpected = HookUpdateStrategy.preserved(by: 1)
2020

2121
XCTAssertEqual(key.dependency, expected.dependency)
2222
XCTAssertNotEqual(key.dependency, unexpected.dependency)

Tests/HooksTests/Testing/HookTesterTests.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ final class HookTesterTests: XCTestCase {
1717

1818
func testValueHistory() {
1919
let tester = HookTester(0) { value in
20-
useMemo(.prevented(by: value)) {
20+
useMemo(.preserved(by: value)) {
2121
value
2222
}
2323
}
@@ -31,7 +31,7 @@ final class HookTesterTests: XCTestCase {
3131

3232
func testUpdateWithParameter() {
3333
let tester = HookTester(0) { value in
34-
useMemo(.prevented(by: value)) {
34+
useMemo(.preserved(by: value)) {
3535
value
3636
}
3737
}
@@ -52,7 +52,7 @@ final class HookTesterTests: XCTestCase {
5252
func testUpdate() {
5353
var value = 0
5454
let tester = HookTester {
55-
useMemo(.prevented(by: value)) {
55+
useMemo(.preserved(by: value)) {
5656
value
5757
}
5858
}

0 commit comments

Comments
 (0)