Skip to content

Avoid force-unwrapping cached value in ForEachStore #1036

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jun 22, 2023
Merged

Avoid force-unwrapping cached value in ForEachStore #1036

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ab9d66f
Avoid force-unwrapping cached value in ForEachStore
ohitsdaniel Mar 23, 2022
a8921c5
ForEach closure based caching approach
ohitsdaniel Mar 25, 2022
98b39c7
Uses unnamed closure parameters
ohitsdaniel Mar 25, 2022
5f36457
Define custom remove duplicates to only reevaluate when IDs change
ohitsdaniel Apr 6, 2022
6f3e646
Merge branch 'main' into saferIfLetAndForEachStore
stephencelis Jun 21, 2023
7b28dbf
fix
stephencelis Jun 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 8 additions & 10 deletions Sources/ComposableArchitecture/SwiftUI/ForEachStore.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,22 +100,20 @@ public struct ForEachStore<
where
Data == IdentifiedArray<ID, EachState>,
Content == WithViewStore<
OrderedSet<ID>, (ID, EachAction), ForEach<OrderedSet<ID>, ID, EachContent>
IdentifiedArray<ID, EachState>, (ID, EachAction),
ForEach<IdentifiedArray<ID, EachState>, ID, EachContent>
>
{
self.data = store.state.value
self.content = WithViewStore(
store,
observe: { $0.ids },
removeDuplicates: areOrderedSetsDuplicates
observe: { $0 },
removeDuplicates: { areOrderedSetsDuplicates($0.ids, $1.ids) }
) { viewStore in
ForEach(viewStore.state, id: \.self) { id -> EachContent in
// NB: We cache elements here to avoid a potential crash where SwiftUI may re-evaluate
// views for elements no longer in the collection.
//
// Feedback filed: https://gist.github.com/stephencelis/cdf85ae8dab437adc998fb0204ed9a6b
var element = store.state.value[id: id]!
return content(
ForEach(viewStore.state, id: viewStore.state.id) { element in
var element = element
let id = element[keyPath: viewStore.state.id]
content(
store.scope(
state: {
element = $0[id: id] ?? element
Expand Down