Fix Color.foregroundStyle recursive loop

Kyle-Ye · Kyle-Ye · commit 796a62456239 · 2026-01-18T02:40:37.000+08:00
diff --git a/Sources/OpenSwiftUICore/Shape/ShapeStyle/ForegroundStyle.swift b/Sources/OpenSwiftUICore/Shape/ShapeStyle/ForegroundStyle.swift
@@ -76,6 +76,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
@@ -104,7 +104,7 @@ public struct _ShapeStyle_Shape {
     }
     
     package var effectiveForegroundStyle: AnyShapeStyle {
-        environment._effectiveForegroundStyle
+        foregroundStyle ?? environment._effectiveForegroundStyle
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -76,6 +76,7 @@ extension ForegroundStyle {`
`76`	`76`	`if shape.activeRecursiveStyles.contains(.foreground) {`
`77`	`77`	`LegacyContentStyle.sharedPrimary._apply(to: &shape)`
`78`	`78`	`} else {`
	`79`	`+ shape.activeRecursiveStyles.formUnion(.foreground)`
`79`	`80`	`shape.effectiveForegroundStyle._apply(to: &shape)`
`80`	`81`	`shape.activeRecursiveStyles.subtract(.foreground)`
`81`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ public struct _ShapeStyle_Shape {`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`package var effectiveForegroundStyle: AnyShapeStyle {`
`107`		`- environment._effectiveForegroundStyle`
	`107`	`+ foregroundStyle ?? environment._effectiveForegroundStyle`
`108`	`108`	`}`
`109`	`109`	`}`
`110`	`110`