Skip to content

Fixed init on AsyncLoadView, fixed CachedAsyncLoad item property #4

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
kaulex99 merged 1 commit into from
Sep 30, 2025
Merged

Fixed init on AsyncLoadView, fixed CachedAsyncLoad item property #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 17 additions & 2 deletions Sources/AsyncLoad/AsyncLoad/AsyncLoadView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,10 @@ public struct AsyncLoadView<
errorContent = error
}

public init(_ state: AsyncLoad<Item>, @ViewBuilder content: @escaping (Item?) -> Content)
where ErrorContent == Text {
public init(
_ state: AsyncLoad<Item>,
@ViewBuilder content: @escaping (Item) -> Content
) where ErrorContent == Text {
self.state = state
self.content = content

Expand All @@ -46,6 +48,7 @@ public struct AsyncLoadView<
case .loading, .none:
ProgressView()
.frame(maxHeight: .infinity)
.controlSize(.large)
case .loaded:
EmptyView()
case let .error(error):
Expand All @@ -54,4 +57,16 @@ public struct AsyncLoadView<
}
}
}

@available(iOS 17.0, macOS 14.0, watchOS 10.0, *)
#Preview {
@State
@Previewable
var state: AsyncLoad<String> = .loading

AsyncLoadView(state) { test in
Text(test)
}
}

#endif
6 changes: 5 additions & 1 deletion Sources/AsyncLoad/CachedAsyncLoad/CachedAsyncLoad.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,11 @@ public enum CachedAsyncLoad<T: Sendable>: Equatable, Sendable {
switch self {
case let .loaded(item):
item
default:
case let .error(item, _):
item
case let .loading(item):
item
case .none:
nil
}
}
Expand Down
1 change: 1 addition & 0 deletions Sources/AsyncLoad/CachedAsyncLoad/CachedAsyncLoadView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ fileprivate enum CustomError: Error {

ProgressView()
.frame(maxWidth: .infinity)
.controlSize(.large)
}
.padding()
} error: { item, error in
Expand Down