Skip to content

Fix crash using ForEach within a TabView #241

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 1 commit into from
Aug 1, 2025
Merged

Fix crash using ForEach within a TabView #241

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
4 changes: 2 additions & 2 deletions Sources/SkipUI/SkipUI/Compose/ComposeBuilder.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ public struct ComposeBuilder: View {
let renderables: kotlin.collections.MutableList<Renderable> = mutableListOf()
let isKeepNonModified = EvaluateOptions(options).isKeepNonModified
let evalContext = context.content(composer: Composer { view, context in
// This logic is also in `ModifiedContent`, but we need to check here as well in case no modifiers are used
if isKeepNonModified && !(view is ModifiedContent) {
// Note: this logic is also in `ModifiedContent`, but we need to check here as well in case no modifiers are used
if isKeepNonModified && !(view is ModifiedContent) && !(view is ForEach) && !(view is Group) {
renderables.add(view.asRenderable())
} else {
renderables.addAll(view.Evaluate(context: context(false), options: options))
Expand Down
3 changes: 2 additions & 1 deletion Sources/SkipUI/SkipUI/View/ModifiedContent.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,8 @@ final class ModifiedContent: View, Renderable {
/// Helper for modifiers to use internally to evaluate views, respecting the `EvaluateOptions.isKeepNonModified` option.
@Composable static func Evaluate(content: View, context: ComposeContext, options: Int) -> kotlin.collections.List<Renderable> {
let isKeepNonModified = EvaluateOptions(options).isKeepNonModified
if isKeepNonModified && !(content is ModifiedContent) {
// Note: this logic is also in `ComposeBuilder` for cases when there are no modifiers
if isKeepNonModified && !(content is ModifiedContent) && !(content is ForEach) && !(content is Group) {
return listOf(content.asRenderable())
} else {
return content.Evaluate(context: context, options: options)
Expand Down