From 782ee14232f006f02fbb01323dba487b9e351a4a Mon Sep 17 00:00:00 2001 From: Kyle Date: Sun, 18 Jan 2026 02:35:58 +0800 Subject: [PATCH] Fix Color.foregroundStyle recursive loop --- Sources/OpenSwiftUICore/Shape/ShapeStyle/ForegroundStyle.swift | 1 + Sources/OpenSwiftUICore/Shape/ShapeStyle/ShapeStyleShape.swift | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Sources/OpenSwiftUICore/Shape/ShapeStyle/ForegroundStyle.swift b/Sources/OpenSwiftUICore/Shape/ShapeStyle/ForegroundStyle.swift index 0bc111060..d9226edcc 100644 --- a/Sources/OpenSwiftUICore/Shape/ShapeStyle/ForegroundStyle.swift +++ b/Sources/OpenSwiftUICore/Shape/ShapeStyle/ForegroundStyle.swift @@ -88,6 +88,7 @@ extension ForegroundStyle { if shape.activeRecursiveStyles.contains(.foreground) { LegacyContentStyle.sharedPrimary._apply(to: &shape) } else { + shape.activeRecursiveStyles.formUnion(.foreground) shape.effectiveForegroundStyle._apply(to: &shape) shape.activeRecursiveStyles.subtract(.foreground) } diff --git a/Sources/OpenSwiftUICore/Shape/ShapeStyle/ShapeStyleShape.swift b/Sources/OpenSwiftUICore/Shape/ShapeStyle/ShapeStyleShape.swift index e4f71d1eb..58e9b209c 100644 --- a/Sources/OpenSwiftUICore/Shape/ShapeStyle/ShapeStyleShape.swift +++ b/Sources/OpenSwiftUICore/Shape/ShapeStyle/ShapeStyleShape.swift @@ -104,7 +104,7 @@ public struct _ShapeStyle_Shape { } package var effectiveForegroundStyle: AnyShapeStyle { - environment._effectiveForegroundStyle + foregroundStyle ?? environment._effectiveForegroundStyle } }