From 31b92c8a24e388c3795f43c2f2503625fa11142e Mon Sep 17 00:00:00 2001
From: Kyle <kyle201817146@gmail.com>
Date: Mon, 2 Jun 2025 17:19:29 +0800
Subject: [PATCH 1/9] Update Placement indent

---
 .../Layout/Geometry/Placement.swift           | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/Sources/OpenSwiftUICore/Layout/Geometry/Placement.swift b/Sources/OpenSwiftUICore/Layout/Geometry/Placement.swift
index cf197c06..394af06c 100644
--- a/Sources/OpenSwiftUICore/Layout/Geometry/Placement.swift
+++ b/Sources/OpenSwiftUICore/Layout/Geometry/Placement.swift
@@ -2,29 +2,29 @@
 //  Placement.swift
 //  OpenSwiftUICore
 //
-//  Audited for iOS 18.0
 //  Status: Complete
 
 public import Foundation
 
+// MARK: - Placement [6.4.41]
+
 /// The position and proposed size of a child view, as determined by a layout.
 public struct _Placement: Equatable {
-    
     public var proposedSize: CGSize {
         get { proposedSize_.fixingUnspecifiedDimensions() }
         set { proposedSize_ = _ProposedSize(newValue) }
     }
-        
+
     package var proposedSize_: _ProposedSize
-    
+
     /// The relative position in the child's actual size that will be placed at
     /// `anchorPosition`.
     public var anchor: UnitPoint
-    
+
     /// The location that the anchor will be given in the layout’s coordinate
     /// space.
     public var anchorPosition: CGPoint
-    
+
     /// Creates an instance with the given `proposedSize`, anchoring `anchor` at
     /// `anchorPosition`.
     public init(proposedSize: CGSize, anchoring anchor: UnitPoint = .topLeading, at anchorPosition: CGPoint) {
@@ -32,25 +32,25 @@ public struct _Placement: Equatable {
         self.anchor = anchor
         self.anchorPosition = anchorPosition
     }
-    
+
     package init(proposedSize: _ProposedSize, anchoring anchor: UnitPoint, at anchorPosition: CGPoint) {
         self.proposedSize_ = proposedSize
         self.anchor = anchor
         self.anchorPosition = anchorPosition
     }
-    
+
     package init(proposedSize: _ProposedSize, at anchorPosition: CGPoint) {
         self.proposedSize_ = proposedSize
         self.anchor = .topLeading
         self.anchorPosition = anchorPosition
     }
-    
+
     package init(proposedSize: CGSize, aligning anchor: UnitPoint, in area: CGSize) {
         self.proposedSize_ = _ProposedSize(proposedSize)
         self.anchor = anchor
         self.anchorPosition = anchor.in(area)
     }
-    
+
     package init(proposedSize: _ProposedSize, aligning anchor: UnitPoint, in area: CGSize) {
         self.proposedSize_ = proposedSize
         self.anchor = anchor

From f8b9cae82988dfca29f1b902129098f88fe52cfd Mon Sep 17 00:00:00 2001
From: Kyle <kyle201817146@gmail.com>
Date: Mon, 2 Jun 2025 18:04:24 +0800
Subject: [PATCH 2/9] Fix Animatable issue

---
 .../OpenSwiftUICore/View/Animation/Animation/Animatable.swift | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Sources/OpenSwiftUICore/View/Animation/Animation/Animatable.swift b/Sources/OpenSwiftUICore/View/Animation/Animation/Animatable.swift
index 3cec021a..2332167b 100644
--- a/Sources/OpenSwiftUICore/View/Animation/Animation/Animatable.swift
+++ b/Sources/OpenSwiftUICore/View/Animation/Animation/Animatable.swift
@@ -43,8 +43,10 @@ extension Animatable where AnimatableData == EmptyAnimatableData {
 }
 
 extension Animatable {
-    package static func makeAnimatable(value: inout _GraphValue<Self>, inputs: _GraphInputs) {
+    package static func makeAnimatable(value: _GraphValue<Self>, inputs: _GraphInputs) -> Attribute<Self> {
+        var value = value
         _makeAnimatable(value: &value, inputs: inputs)
+        return value.value
     }
 }
 

From bd4258914e6bed32b8c185c357e1737a13a34d0e Mon Sep 17 00:00:00 2001
From: Kyle <kyle201817146@gmail.com>
Date: Mon, 2 Jun 2025 19:41:12 +0800
Subject: [PATCH 3/9] Add FrameVelocityFilter

---
 .../View/Animation/Animation/Animation.swift  |  53 ------
 .../Animation/Animation/CustomAnimation.swift | 163 ++++++++++++++++++
 .../Animation/EmptyAnimatableData.swift       |   7 -
 .../View/Graph/ViewGraph.swift                |   6 +-
 4 files changed, 165 insertions(+), 64 deletions(-)
 create mode 100644 Sources/OpenSwiftUICore/View/Animation/Animation/CustomAnimation.swift
 delete mode 100644 Sources/OpenSwiftUICore/View/Animation/Animation/EmptyAnimatableData.swift

diff --git a/Sources/OpenSwiftUICore/View/Animation/Animation/Animation.swift b/Sources/OpenSwiftUICore/View/Animation/Animation/Animation.swift
index 95e280e8..3ffde245 100644
--- a/Sources/OpenSwiftUICore/View/Animation/Animation/Animation.swift
+++ b/Sources/OpenSwiftUICore/View/Animation/Animation/Animation.swift
@@ -1,5 +1,3 @@
-package import OpenGraphShims
-
 @frozen
 public struct Animation: Equatable {
 //    var box: AnimationBoxBase
@@ -10,54 +8,3 @@ public struct Animation: Equatable {
 
     public static var `default` = Animation()
 }
-
-// MARK: - AnimatableAttribute [6.4.41] [TODO]
-
-package struct AnimatableAttribute<Value>: StatefulRule, AsyncAttribute, ObservedAttribute, CustomStringConvertible where Value: Animatable {
-    @Attribute var source: Value
-    @Attribute var environment: EnvironmentValues
-    var helper: AnimatableAttributeHelper<Value>
-
-    package init(
-        source: Attribute<Value>,
-        phase: Attribute<_GraphInputs.Phase>,
-        time: Attribute<Time>,
-        transaction: Attribute<Transaction>,
-        environment: Attribute<EnvironmentValues>
-    ) {
-        _source = source
-        _environment = environment
-        helper = .init(phase: phase, time: time, transaction: transaction)
-    }
-
-    package mutating func updateValue() {
-        // TODO
-    }
-
-    package var description: String { "Animatable<\(Value.self)>" }
-
-    package mutating func destroy() {
-        // helper.animatorState?.removeListeners()
-    }
-}
-
-// MARK: - AnimatableAttributeHelper [FIXME]
-
-package struct AnimatableAttributeHelper<Value> where Value: Animatable {
-    @Attribute var phase: _GraphInputs.Phase
-    @Attribute var time: Time
-    @Attribute var transaction: Transaction
-    var previousModelData: Value.AnimatableData?
-    // var animatorState: AnimatorState<Value.AnimatableData>?
-    var resetSeed: UInt32 = 0
-
-    init(
-        phase: Attribute<_GraphInputs.Phase>,
-        time: Attribute<Time>,
-        transaction: Attribute<Transaction>
-    ) {
-        _phase = phase
-        _time = time
-        _transaction = transaction
-    }
-}
diff --git a/Sources/OpenSwiftUICore/View/Animation/Animation/CustomAnimation.swift b/Sources/OpenSwiftUICore/View/Animation/Animation/CustomAnimation.swift
new file mode 100644
index 00000000..a92472e8
--- /dev/null
+++ b/Sources/OpenSwiftUICore/View/Animation/Animation/CustomAnimation.swift
@@ -0,0 +1,163 @@
+//
+//  CustomAnimation.swift
+//  OpenSwiftUICore
+//
+//  Status: WIP
+//  ID: 35ADF281214A25133F1A6DF28858952D (SwiftUICore?)
+
+package import OpenGraphShims
+
+// MARK: - FrameVelocityFilter [6.4.41]
+
+private struct FrameVelocityFilter {
+    var currentVelocity: Double?
+    var previous: ((Time, CGRect.AnimatableData))?
+
+    mutating func addSample(_ rect: CGRect.AnimatableData, time: Time) {
+        guard let (previousTime, previousRect) = previous,
+              previousTime <= time else {
+            previous = (time, rect)
+            return
+        }
+        let deltaX = rect.first.first - previousRect.first.first
+        let deltaY = rect.first.second - previousRect.first.second
+        let deltaWidth = rect.second.first - previousRect.second.first
+        let deltaHeight = rect.second.second - previousRect.second.second
+
+        let timeFactor = 1.0 / (time - previousTime)
+
+        let velocityX = timeFactor * deltaX
+        let velocityY = timeFactor * deltaY
+        let velocityWidth = timeFactor * deltaWidth
+        let velocityHeight = timeFactor * deltaHeight
+
+        let velocityRect = CGRect(x: velocityX, y: velocityY, width: velocityWidth, height: velocityHeight)
+        let newVelocity = max(abs(velocityRect.minX), abs(velocityRect.maxX), abs(velocityRect.minY), abs(velocityRect.maxY))
+        if let existingVelocity = currentVelocity {
+            currentVelocity = mix(existingVelocity, newVelocity, by: 0.35)
+        } else {
+            currentVelocity = newVelocity
+        }
+        previous = (time, rect)
+    }
+}
+
+// MARK: - AnimatableAttribute [6.4.41] [TODO]
+
+package struct AnimatableAttribute<Value>: StatefulRule, AsyncAttribute, ObservedAttribute, CustomStringConvertible where Value: Animatable {
+    @Attribute var source: Value
+    @Attribute var environment: EnvironmentValues
+    var helper: AnimatableAttributeHelper<Value>
+
+    package init(
+        source: Attribute<Value>,
+        phase: Attribute<_GraphInputs.Phase>,
+        time: Attribute<Time>,
+        transaction: Attribute<Transaction>,
+        environment: Attribute<EnvironmentValues>
+    ) {
+        _source = source
+        _environment = environment
+        helper = .init(phase: phase, time: time, transaction: transaction)
+    }
+
+    package mutating func updateValue() {
+        // TODO
+        // Blocked by helper
+    }
+
+    package var description: String { "Animatable<\(Value.self)>" }
+
+    package mutating func destroy() {
+        // helper.animatorState?.removeListeners()
+    }
+}
+
+// MARK: - AnimatableFrameAttribute [6.4.41] [TODO]
+
+package struct AnimatableFrameAttribute: StatefulRule, AsyncAttribute, ObservedAttribute {
+    package typealias Value = ViewFrame
+
+    package init(
+        position: Attribute<ViewOrigin>,
+        size: Attribute<ViewSize>,
+        pixelLength: Attribute<CGFloat>,
+        environment: Attribute<EnvironmentValues>,
+        phase: Attribute<_GraphInputs.Phase>,
+        time: Attribute<Time>,
+        transaction: Attribute<Transaction>,
+        animationsDisabled: Bool
+    ) {
+        preconditionFailure("TODO")
+    }
+
+    package mutating func updateValue() {
+        preconditionFailure("TODO")
+    }
+
+    package mutating func destroy() {
+        preconditionFailure("TODO")
+    }
+}
+
+// MARK: - AnimatableFrameAttributeVFD [6.4.41] [TODO]
+
+package struct AnimatableFrameAttributeVFD: StatefulRule, AsyncAttribute, ObservedAttribute {
+    @Attribute var position: CGPoint
+
+    @Attribute var size: ViewSize
+
+    @Attribute var pixelLength: CGFloat
+
+    @Attribute var environment: EnvironmentValues
+
+    var helper: AnimatableAttributeHelper<ViewFrame>
+
+    private var velocityFilter: FrameVelocityFilter
+
+    let animationsDisabled: Bool
+
+    package init(
+        position: Attribute<ViewOrigin>,
+        size: Attribute<ViewSize>,
+        pixelLength: Attribute<CGFloat>,
+        environment: Attribute<EnvironmentValues>,
+        phase: Attribute<_GraphInputs.Phase>,
+        time: Attribute<Time>,
+        transaction: Attribute<Transaction>,
+        animationsDisabled: Bool
+    ) {
+        preconditionFailure("TODO")
+    }
+
+    package typealias Value = ViewFrame
+
+    package mutating func updateValue() {
+        preconditionFailure("TODO")
+    }
+
+    package mutating func destroy() {
+        preconditionFailure("TODO")
+    }
+}
+
+// MARK: - AnimatableAttributeHelper [FIXME]
+
+package struct AnimatableAttributeHelper<Value> where Value: Animatable {
+    @Attribute var phase: _GraphInputs.Phase
+    @Attribute var time: Time
+    @Attribute var transaction: Transaction
+    var previousModelData: Value.AnimatableData?
+    // var animatorState: AnimatorState<Value.AnimatableData>?
+    var resetSeed: UInt32 = 0
+
+    init(
+        phase: Attribute<_GraphInputs.Phase>,
+        time: Attribute<Time>,
+        transaction: Attribute<Transaction>
+    ) {
+        _phase = phase
+        _time = time
+        _transaction = transaction
+    }
+}
diff --git a/Sources/OpenSwiftUICore/View/Animation/Animation/EmptyAnimatableData.swift b/Sources/OpenSwiftUICore/View/Animation/Animation/EmptyAnimatableData.swift
deleted file mode 100644
index 23a85393..00000000
--- a/Sources/OpenSwiftUICore/View/Animation/Animation/EmptyAnimatableData.swift
+++ /dev/null
@@ -1,7 +0,0 @@
-//
-//  EmptyAnimatableData.swift
-//  OpenSwiftUICore
-//
-//  Audited for iOS 18.0
-//  Status: Complete
-
diff --git a/Sources/OpenSwiftUICore/View/Graph/ViewGraph.swift b/Sources/OpenSwiftUICore/View/Graph/ViewGraph.swift
index 43b0fb48..e488b8b2 100644
--- a/Sources/OpenSwiftUICore/View/Graph/ViewGraph.swift
+++ b/Sources/OpenSwiftUICore/View/Graph/ViewGraph.swift
@@ -213,14 +213,12 @@ package final class ViewGraph: GraphHost {
             }
             _ViewDebug.initialize(inputs: &inputs)
             if _VariableFrameDurationIsSupported() {
-                if !inputs.base.options.contains(.supportsVariableFrameDuration) {
-                    inputs.base.options.formUnion(.supportsVariableFrameDuration)
-                }
+                inputs.base.options.formUnion(.supportsVariableFrameDuration)
             }
             if let delegate {
                 delegate.modifyViewInputs(&inputs)
             }
-            if inputs.base.options.contains(.viewNeedsGeometry) {
+            if inputs.needsGeometry {
                 // inputs.makeRootMatchedGeometryScope()
             }
             inputs.base.pushStableType(rootViewType)

From 0e2175788646ad165c5db9ac1cf683b14781fde0 Mon Sep 17 00:00:00 2001
From: Kyle <kyle201817146@gmail.com>
Date: Mon, 2 Jun 2025 19:56:00 +0800
Subject: [PATCH 4/9] Remove ViewOrigin NTD in 6.4.41 Fix ViewOrigin issue

---
 .../UIKit/UIViewControllerRepresentable.swift |  4 +-
 .../Extension/CGPoint+Extension.swift         | 16 ++++++
 .../Layout/PlacementContext.swift             |  2 +-
 .../Layout/SafeAreaInsets.swift               |  2 +-
 .../Layout/View/ViewFrame.swift               |  4 +-
 .../Layout/View/ViewGeometry.swift            | 13 +----
 .../Layout/View/ViewOrigin.swift              | 53 -------------------
 .../Render/RendererLeafView.swift             |  2 +-
 .../Animation/Animation/CustomAnimation.swift | 49 ++++++++++++-----
 9 files changed, 61 insertions(+), 84 deletions(-)
 delete mode 100644 Sources/OpenSwiftUICore/Layout/View/ViewOrigin.swift

diff --git a/Sources/OpenSwiftUI/Integration/Representable/UIKit/UIViewControllerRepresentable.swift b/Sources/OpenSwiftUI/Integration/Representable/UIKit/UIViewControllerRepresentable.swift
index b6e63536..9d05abc5 100644
--- a/Sources/OpenSwiftUI/Integration/Representable/UIKit/UIViewControllerRepresentable.swift
+++ b/Sources/OpenSwiftUI/Integration/Representable/UIKit/UIViewControllerRepresentable.swift
@@ -205,8 +205,8 @@ private struct UnsupportedDisplayList: Rule {
     var value: DisplayList {
         let version = DisplayList.Version(forUpdate: ())
         let seed = DisplayList.Seed(version)
-        let position = position.value
-        let containerPosition = containerPosition.value
+        let position = position
+        let containerPosition = containerPosition
         let size = size.value
         preconditionFailure("TODO: EmptyViewFactory")
     }
diff --git a/Sources/OpenSwiftUICore/Extension/CGPoint+Extension.swift b/Sources/OpenSwiftUICore/Extension/CGPoint+Extension.swift
index d26a6c77..a0d7c163 100644
--- a/Sources/OpenSwiftUICore/Extension/CGPoint+Extension.swift
+++ b/Sources/OpenSwiftUICore/Extension/CGPoint+Extension.swift
@@ -150,3 +150,19 @@ extension CGPoint: ProtobufMessage {
         self.init(x: x, y: y)
     }
 }
+
+// MARK: - ViewOrigin [6.4.41]
+
+package typealias ViewOrigin = CGPoint
+
+extension ViewOrigin {
+    @inline(__always)
+    package static var invalidValue: Self {
+        Self(x: Double.nan, y: Double.nan)
+    }
+
+    @inline(__always)
+    package init(_ value: CGPoint) {
+        self = value
+    }
+}
diff --git a/Sources/OpenSwiftUICore/Layout/PlacementContext.swift b/Sources/OpenSwiftUICore/Layout/PlacementContext.swift
index 2fae9911..a4595218 100644
--- a/Sources/OpenSwiftUICore/Layout/PlacementContext.swift
+++ b/Sources/OpenSwiftUICore/Layout/PlacementContext.swift
@@ -203,7 +203,7 @@ package struct _PositionAwarePlacementContext {
     }
 
     package var transform: ViewTransform {
-        context[_transform].withPosition(context[_position].value)
+        context[_transform].withPosition(context[_position])
     }
 
     package subscript<T>(dynamicMember keyPath: KeyPath<EnvironmentValues, T>) -> T {
diff --git a/Sources/OpenSwiftUICore/Layout/SafeAreaInsets.swift b/Sources/OpenSwiftUICore/Layout/SafeAreaInsets.swift
index e351a65f..591b629a 100644
--- a/Sources/OpenSwiftUICore/Layout/SafeAreaInsets.swift
+++ b/Sources/OpenSwiftUICore/Layout/SafeAreaInsets.swift
@@ -157,7 +157,7 @@ package struct _SafeAreaInsetsModifier: MultiViewModifier, PrimitiveViewModifier
 
         var value: ViewTransform {
             var transform = transform
-            transform.appendPosition(position.value)
+            transform.appendPosition(position)
             transform.appendSizedSpace(id: space, size: size.value)
             return transform
         }
diff --git a/Sources/OpenSwiftUICore/Layout/View/ViewFrame.swift b/Sources/OpenSwiftUICore/Layout/View/ViewFrame.swift
index 878f2cf2..105a2670 100644
--- a/Sources/OpenSwiftUICore/Layout/View/ViewFrame.swift
+++ b/Sources/OpenSwiftUICore/Layout/View/ViewFrame.swift
@@ -28,7 +28,7 @@ extension ViewFrame {
     package mutating func round(toMultipleOf m: CGFloat) {
         var rect = CGRect(self)
         rect.roundCoordinatesToNearestOrUp(toMultipleOf: m)
-        origin.value = rect.origin
+        origin = rect.origin
         size.value = rect.size
     }
 }
@@ -42,6 +42,6 @@ extension ViewFrame: Animatable {
 
 extension CGRect {
     package init(_ frame: ViewFrame) {
-        self.init(origin: frame.origin.value, size: frame.size.value)
+        self.init(origin: frame.origin, size: frame.size.value)
     }
 }
diff --git a/Sources/OpenSwiftUICore/Layout/View/ViewGeometry.swift b/Sources/OpenSwiftUICore/Layout/View/ViewGeometry.swift
index 0bab2c1a..d33b5a84 100644
--- a/Sources/OpenSwiftUICore/Layout/View/ViewGeometry.swift
+++ b/Sources/OpenSwiftUICore/Layout/View/ViewGeometry.swift
@@ -36,15 +36,6 @@ package struct ViewGeometry: Equatable {
         self.init(origin: ViewOrigin(), dimensions: dimensions)
     }
 
-    /// Creates a view geometry with the specified CGPoint origin and dimensions.
-    ///
-    /// - Parameters:
-    ///   - origin: The position of the view as a CGPoint.
-    ///   - dimensions: The size and alignment information of the view.
-    package init(origin: CGPoint, dimensions: ViewDimensions) {
-        self.init(origin: ViewOrigin(origin), dimensions: dimensions)
-    }
-
     /// Creates a view geometry using placement and dimensions information.
     ///
     /// - Parameters:
@@ -98,13 +89,13 @@ extension ViewGeometry {
     ///
     /// This property combines the origin and size information into a CGRect.
     package var frame: CGRect {
-        CGRect(origin: origin.value, size: dimensions.size.value)
+        CGRect(origin: origin, size: dimensions.size.value)
     }
 
     /// A view geometry value representing an invalid state.
     ///
     /// This value is used to indicate errors or uninitialized states.
-    package static let invalidValue = ViewGeometry(origin: ViewOrigin(invalid: ()), dimensions: .invalidValue)
+    package static let invalidValue = ViewGeometry(origin: .invalidValue, dimensions: .invalidValue)
 
     /// Indicates whether this view geometry is in an invalid state.
     package var isInvalid: Bool { origin.x.isNaN }
diff --git a/Sources/OpenSwiftUICore/Layout/View/ViewOrigin.swift b/Sources/OpenSwiftUICore/Layout/View/ViewOrigin.swift
deleted file mode 100644
index 5aa97591..00000000
--- a/Sources/OpenSwiftUICore/Layout/View/ViewOrigin.swift
+++ /dev/null
@@ -1,53 +0,0 @@
-//
-//  ViewOrigin.swift
-//  OpenSwiftUICore
-//
-//  Audited for iOS 18.0
-//  Status: Complete
-
-package import Foundation
-
-package struct ViewOrigin: Equatable {
-    package var value: CGPoint
-    
-    @inlinable
-    package init(invalid: Void) {
-        self.init(CGPoint(x: Double.nan, y: Double.nan))
-    }
-    
-    @inlinable
-    package init(_ value: CGPoint) {
-        self.value = value
-    }
-    
-    @inlinable
-    package init() {
-        self.init(.zero)
-    }
-    
-    @inlinable
-    package var x: CGFloat {
-        get { value.x }
-        set { value.x = newValue }
-    }
-    
-    @inlinable
-    package var y: CGFloat {
-        get { value.y }
-        set { value.y = newValue }
-    }
-}
-
-extension ViewOrigin {
-    package subscript(d: Axis) -> CGFloat {
-        get { d == .horizontal ? x : y }
-        set { if d == .horizontal { x = newValue } else { y = newValue } }
-    }
-}
-
-extension ViewOrigin: Animatable {
-    package var animatableData: CGPoint.AnimatableData {
-        get { value.animatableData }
-        set { value.animatableData = newValue }
-    }
-}
diff --git a/Sources/OpenSwiftUICore/Render/RendererLeafView.swift b/Sources/OpenSwiftUICore/Render/RendererLeafView.swift
index efe1ebf0..ebae3b0d 100644
--- a/Sources/OpenSwiftUICore/Render/RendererLeafView.swift
+++ b/Sources/OpenSwiftUICore/Render/RendererLeafView.swift
@@ -131,7 +131,7 @@ private struct LeafDisplayList<V>: StatefulRule, CustomStringConvertible where V
         var item = DisplayList.Item(
             .content(DisplayList.Content(content, seed: contentSeed)),
             frame: CGRect(
-                origin: CGPoint(position.value - containerPosition.value),
+                origin: CGPoint(position - containerPosition),
                 size: size
             ),
             identity: identity,
diff --git a/Sources/OpenSwiftUICore/View/Animation/Animation/CustomAnimation.swift b/Sources/OpenSwiftUICore/View/Animation/Animation/CustomAnimation.swift
index a92472e8..3ac7a553 100644
--- a/Sources/OpenSwiftUICore/View/Animation/Animation/CustomAnimation.swift
+++ b/Sources/OpenSwiftUICore/View/Animation/Animation/CustomAnimation.swift
@@ -76,10 +76,20 @@ package struct AnimatableAttribute<Value>: StatefulRule, AsyncAttribute, Observe
 // MARK: - AnimatableFrameAttribute [6.4.41] [TODO]
 
 package struct AnimatableFrameAttribute: StatefulRule, AsyncAttribute, ObservedAttribute {
-    package typealias Value = ViewFrame
+    @Attribute private var position: CGPoint
+
+    @Attribute private var size: ViewSize
+
+    @Attribute private var pixelLength: CGFloat
+
+    @Attribute private var environment: EnvironmentValues
+
+    private var helper: AnimatableAttributeHelper<ViewFrame>
+
+    let animationsDisabled: Bool
 
     package init(
-        position: Attribute<ViewOrigin>,
+        position: Attribute<CGPoint>,
         size: Attribute<ViewSize>,
         pixelLength: Attribute<CGFloat>,
         environment: Attribute<EnvironmentValues>,
@@ -88,30 +98,37 @@ package struct AnimatableFrameAttribute: StatefulRule, AsyncAttribute, ObservedA
         transaction: Attribute<Transaction>,
         animationsDisabled: Bool
     ) {
-        preconditionFailure("TODO")
+        _position = position
+        _size = size
+        _pixelLength = pixelLength
+        _environment = environment
+        helper = .init(phase: phase, time: time, transaction: transaction)
+        self.animationsDisabled = animationsDisabled
     }
 
+    package typealias Value = ViewFrame
+
     package mutating func updateValue() {
-        preconditionFailure("TODO")
+        // preconditionFailure("TODO")
     }
 
     package mutating func destroy() {
-        preconditionFailure("TODO")
+        // helper.animatorState?.removeListeners()
     }
 }
 
 // MARK: - AnimatableFrameAttributeVFD [6.4.41] [TODO]
 
 package struct AnimatableFrameAttributeVFD: StatefulRule, AsyncAttribute, ObservedAttribute {
-    @Attribute var position: CGPoint
+    @Attribute private var position: ViewOrigin
 
-    @Attribute var size: ViewSize
+    @Attribute private var size: ViewSize
 
-    @Attribute var pixelLength: CGFloat
+    @Attribute private var pixelLength: CGFloat
 
-    @Attribute var environment: EnvironmentValues
+    @Attribute private var environment: EnvironmentValues
 
-    var helper: AnimatableAttributeHelper<ViewFrame>
+    private var helper: AnimatableAttributeHelper<ViewFrame>
 
     private var velocityFilter: FrameVelocityFilter
 
@@ -127,17 +144,23 @@ package struct AnimatableFrameAttributeVFD: StatefulRule, AsyncAttribute, Observ
         transaction: Attribute<Transaction>,
         animationsDisabled: Bool
     ) {
-        preconditionFailure("TODO")
+        _position = position
+        _size = size
+        _pixelLength = pixelLength
+        _environment = environment
+        helper = .init(phase: phase, time: time, transaction: transaction)
+        velocityFilter = FrameVelocityFilter()
+        self.animationsDisabled = animationsDisabled
     }
 
     package typealias Value = ViewFrame
 
     package mutating func updateValue() {
-        preconditionFailure("TODO")
+        // preconditionFailure("TODO")
     }
 
     package mutating func destroy() {
-        preconditionFailure("TODO")
+        // helper.animatorState?.removeListeners()
     }
 }
 

From b29de235b01b79cb716128787cde15a70a565961 Mon Sep 17 00:00:00 2001
From: Kyle <kyle201817146@gmail.com>
Date: Mon, 2 Jun 2025 20:36:57 +0800
Subject: [PATCH 5/9] Add EnvironmentValues + Display

---
 .../Environment/EnvironmentAdditions.swift    | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/Sources/OpenSwiftUICore/Data/Environment/EnvironmentAdditions.swift b/Sources/OpenSwiftUICore/Data/Environment/EnvironmentAdditions.swift
index e7614de7..94a19030 100644
--- a/Sources/OpenSwiftUICore/Data/Environment/EnvironmentAdditions.swift
+++ b/Sources/OpenSwiftUICore/Data/Environment/EnvironmentAdditions.swift
@@ -6,6 +6,39 @@
 //  Status: WIP
 //  ID: 1B17C64D9E901A0054B49B69A4A2439D (SwiftUICore)
 
+public import Foundation
+
+// MARK: - EnvironmentValues + Display [6.4.41]
+
+private struct DisplayScaleKey: EnvironmentKey {
+    static var defaultValue: CGFloat { 1.0 }
+}
+
+private struct DefaultPixelLengthKey: EnvironmentKey {
+    static var defaultValue: CGFloat? { nil }
+}
+
+extension EnvironmentValues {
+    /// The display scale of this environment.
+    public var displayScale: CGFloat {
+        get { self[DisplayScaleKey.self] }
+        set { self[DisplayScaleKey.self] = newValue }
+    }
+
+    /// The size of a pixel on the screen.
+    ///
+    /// This value is usually equal to `1` divided by
+    /// ``EnvironmentValues/displayScale``.
+    public var pixelLength: CGFloat {
+        defaultPixelLength ?? (1.0 / displayScale)
+    }
+
+    package var defaultPixelLength: CGFloat? {
+        get { self[DefaultPixelLengthKey.self] }
+        set { self[DefaultPixelLengthKey.self] = newValue }
+    }
+}
+
 private struct DisplayGamutKey: EnvironmentKey {
     static var defaultValue: DisplayGamut { .sRGB }
 }

From 19fbc449f627c9f56e7bc03463cd97a29266b5dd Mon Sep 17 00:00:00 2001
From: Kyle <kyle201817146@gmail.com>
Date: Mon, 2 Jun 2025 21:08:24 +0800
Subject: [PATCH 6/9] Update interface for CachedEnvironment

---
 .../Data/Environment/CachedEnvironment.swift  | 308 +++++++++++-------
 .../OpenSwiftUICore/Graph/GraphInputs.swift   |  12 +-
 .../View/Graph/ViewGraph.swift                |   2 +-
 .../View/Input/ViewInputs.swift               |   4 +-
 4 files changed, 197 insertions(+), 129 deletions(-)

diff --git a/Sources/OpenSwiftUICore/Data/Environment/CachedEnvironment.swift b/Sources/OpenSwiftUICore/Data/Environment/CachedEnvironment.swift
index 11c25ef9..aa42db14 100644
--- a/Sources/OpenSwiftUICore/Data/Environment/CachedEnvironment.swift
+++ b/Sources/OpenSwiftUICore/Data/Environment/CachedEnvironment.swift
@@ -1,62 +1,63 @@
 //
 //  CachedEnvironment.swift
-//  OpenSwiftUI
+//  OpenSwiftUICore
 //
-//  Audited for iOS 15.5
 //  Status: WIP
-//  ID: C424ABD9FC88B2DFD0B7B2319F2E7987
+//  ID: C424ABD9FC88B2DFD0B7B2319F2E7987 (SwiftUI)
+//  ID: B62A4B04AF9F1325924A089D63071424 (SwiftUICore)
 
 import Foundation
 package import OpenGraphShims
 
+// MARK: - CachedEnvironment [6.4.41]
+
 package struct CachedEnvironment {
-    package var environment: Attribute<EnvironmentValues>
-    private var items: [Item]
-    private var constants: [HashableConstant: AnyAttribute]
-//    private var animatedFrame: AnimatedFrame?
-    // private var resolvedFgStyles: [ResolvedFgStyle : Swift<_ShapeStyle_Resolved.ResolvedFg>]
-    
-    package init(_ environment: Attribute<EnvironmentValues>) {
-        self.environment = environment
-        items = []
-        constants = [:]
-//        animatedFrame = nil
-        // resolvedFgStyles = [:] FIXME: 0x100: ?
-    }
-    
-    package mutating func attribute<Value>(keyPath: KeyPath<EnvironmentValues, Value>) -> Attribute<Value> {
-        if let item = items.first(where: { $0.key == keyPath }) {
-            return Attribute(identifier: item.value)
-        } else {
-            let value = environment[keyPath: keyPath]
-            items.append(Item(key: keyPath, value: value.identifier))
-            return value
-        }
-    }
-    
-    package mutating func intern<Value>(_ value: Value, id: Int) -> Attribute<Value> {
-        let constant = HashableConstant(value, id: id)
-        if let identifier = constants[constant] {
-            return Attribute(identifier: identifier)
-        } else {
-            let attribute = Attribute(value: value)
-            constants[constant] = attribute.identifier
-            return attribute
+    package private(set) var environment: Attribute<EnvironmentValues>
+
+    package struct ID: Hashable { // FIXME
+        package var base: UniqueID
+
+        package init() {
+            self.base = .init()
         }
+
+        static let pixelLength: ID = .init()
+        static let layoutDirection: ID = .init()
+
     }
-    
-    func animatedPosition(for inputs: _ViewInputs) -> Attribute<ViewOrigin> {
-        preconditionFailure("TODO")
+
+    private struct MapItem {
+        var key: CachedEnvironment.ID
+        var value: AnyAttribute
     }
-    
-    func animatedSize(for inputs: _ViewInputs) -> Attribute<ViewSize> {
-        preconditionFailure("TODO")
+
+    private var mapItems: [MapItem]
+
+    private var animatedFrame: AnimatedFrame?
+
+    private var resolvedShapeStyles: [ResolvedShapeStyles: Attribute<ShapeStyle.Pack>]
+
+    struct PlatformCache {}
+
+    private var platformCache: PlatformCache
+
+    @inline(__always)
+    init(_ environment: Attribute<EnvironmentValues>) {
+        self.environment = environment
+        self.mapItems = []
+        self.animatedFrame = nil
+        self.resolvedShapeStyles = [:]
+        self.platformCache = PlatformCache()
     }
-    
-    func animatedCGSize(for inputs: _ViewInputs) -> Attribute<CGSize> {
-        preconditionFailure("TODO")
+
+    package mutating func attribute<T>(id: CachedEnvironment.ID, _ body: (EnvironmentValues) -> T) -> Attribute<T> {
+        guard let item = mapItems.first(where: { $0.key == id }) else {
+            // Blocked by OG's Map
+            preconditionFailure("TODO")
+        }
+        return item.value.unsafeCast(to: T.self)
     }
-    
+
     // func resolvedForegroundStyle() {}
 
     func resolvedShapeStyles(
@@ -69,87 +70,156 @@ package struct CachedEnvironment {
 }
 
 extension CachedEnvironment {
-    private struct Item {
-        var key: PartialKeyPath<EnvironmentValues>
-        var value: AnyAttribute
-    }
-}
+    package mutating func animatedPosition(for inputs: _ViewInputs) -> Attribute<ViewOrigin> {
+        guard inputs.needsGeometry else {
+            return inputs.position
+        }
+        let transaction = inputs.geometryTransaction()
+        let pixelLength = attribute(id: .pixelLength) { $0.pixelLength }
 
-private protocol _Constant {
-    func hash(into hasher: inout Hasher)
-    func isEqual(to other: _Constant) -> Bool
-}
+        if let animatedFrame,
+           animatedFrame.position == inputs.position,
+           animatedFrame.size == inputs.size,
+           animatedFrame.pixelLength == pixelLength,
+           animatedFrame.time == inputs.time,
+           animatedFrame.transaction == transaction,
+           animatedFrame.viewPhase == inputs.viewPhase {
 
-private struct Constant<Value>: _Constant {
-    let value: Value
-    let id: Int
-    
-    init(_ value: Value, id: Int) {
-        self.value = value
-        self.id = id
+        } else {
+            animatedFrame = AnimatedFrame(
+                inputs: inputs,
+                pixelLength: pixelLength,
+                environment: environment
+            )
+        }
+        preconditionFailure("TODO")
     }
-    
-    func hash(into hasher: inout Hasher) {
-        hasher.combine(ObjectIdentifier(Value.self))
-        hasher.combine(id)
+
+    package mutating func animatedSize(for inputs: _ViewInputs) -> Attribute<ViewSize> {
+        preconditionFailure("TODO")
     }
-    
-    func isEqual(to other: _Constant) -> Bool {
-        let otherConstant = other as? Constant<Value>
-        return otherConstant.map { id == $0.id } ?? false
+
+    package mutating func animatedCGSize(for inputs: _ViewInputs) -> Attribute<CGSize> {
+        preconditionFailure("TODO")
     }
 }
 
-private struct HashableConstant: Hashable {
-    let value: _Constant
-    
-    init<Value>(_ value: Value, id: Int) {
-        self.value = Constant(value, id: id)
-    }
-    
-    func hash(into hasher: inout Hasher) {
-        value.hash(into: &hasher)
-    }
-    
-    static func == (lhs: HashableConstant, rhs: HashableConstant) -> Bool {
-        lhs.value.isEqual(to: rhs.value)
+// MARK: - ResolvedShapeStyles [6.4.41] [WIP]
+
+private struct ResolvedShapeStyles: Hashable {
+    let environment: Attribute<EnvironmentValues>
+    let time: Attribute<Time>
+    let transaction: Attribute<Transaction>
+    let viewPhase: Attribute<_GraphInputs.Phase>
+    let mode: OptionalAttribute<_ShapeStyle_ResolverMode>
+    let role: ShapeRole
+    let animationsDisabled: Bool
+}
+
+// MARK: - CachedEnvironment.AnimatedFrame [6.4.41]
+
+extension CachedEnvironment.AnimatedFrame {
+    package init(
+        inputs: _ViewInputs,
+        pixelLength: Attribute<CGFloat>,
+        environment: Attribute<EnvironmentValues>
+    ) {
+        let frameAttribute: Attribute<ViewFrame>
+        if inputs.supportsVFD {
+            let attribute = AnimatableFrameAttributeVFD(
+                position: inputs.position,
+                size: inputs.size,
+                pixelLength: pixelLength,
+                environment: environment,
+                phase: inputs.viewPhase,
+                time: inputs.time,
+                transaction: inputs.transaction,
+                animationsDisabled: inputs.base.animationsDisabled
+            )
+            frameAttribute = Attribute(attribute)
+        } else {
+            let attribute = AnimatableFrameAttribute(
+                position: inputs.position,
+                size: inputs.size,
+                pixelLength: pixelLength,
+                environment: environment,
+                phase: inputs.viewPhase,
+                time: inputs.time,
+                transaction: inputs.transaction,
+                animationsDisabled: inputs.base.animationsDisabled
+            )
+            frameAttribute = Attribute(attribute)
+        }
+        frameAttribute.flags = .active
+        self.init(
+            inputs: inputs.base,
+            position: inputs.position,
+            size: inputs.size,
+            pixelLength: pixelLength,
+            animatedFrame: frameAttribute,
+            environment: environment
+        )
     }
 }
 
-//private struct AnimatedFrame {
-//    let position: Attribute<ViewOrigin>
-//    let size: Attribute<ViewSize>
-//    let pixelLength: Attribute<CGFloat>
-//    let time: Attribute<Time>
-//    let transaction: Attribute<Transaction>
-//    let viewPhase: Attribute<_GraphInputs.Phase>
-//    let animatedFrame: Attribute<ViewFrame>
-//    private var _animatedPosition: Attribute<ViewOrigin>?
-//    private var _animatedSize: Attribute<ViewSize>?
-//    
-//    mutating func animatePosition() -> Attribute<ViewOrigin> {
-//        guard let _animatedPosition else {
-//            // FIXME
-//            let animatePosition = animatedFrame.unsafeOffset(
-//                at: 0,
-//                as:ViewOrigin.self
-//            )
-//            _animatedPosition = animatePosition
-//            return animatePosition
-//        }
-//        return _animatedPosition
-//    }
-//    
-//    mutating func animateSize() -> Attribute<ViewSize> {
-//        guard let _animatedSize else {
-//            // FIXME
-//            let animatedSize = animatedFrame.unsafeOffset(
-//                at: MemoryLayout<ViewOrigin>.size,
-//                as: ViewSize.self
-//            )
-//            _animatedSize = animatedSize
-//            return animatedSize
-//        }
-//        return _animatedSize
-//    }
-//}
+extension CachedEnvironment {
+    package struct AnimatedFrame {
+        package let position: Attribute<ViewOrigin>
+        package let size: Attribute<ViewSize>
+        package let pixelLength: Attribute<CGFloat>
+        package let time: Attribute<Time>
+        package let transaction: Attribute<Transaction>
+        package let viewPhase: Attribute<_GraphInputs.Phase>
+        package let animatedFrame: Attribute<ViewFrame>
+        private var _animatedPosition: Attribute<ViewOrigin>?
+        private var _animatedSize: Attribute<ViewSize>?
+        private var _animatedCGSize: Attribute<CGSize>?
+
+        package init(
+            inputs: _GraphInputs,
+            position: Attribute<ViewOrigin>,
+            size: Attribute<ViewSize>,
+            pixelLength: Attribute<CGFloat>,
+            animatedFrame: Attribute<ViewFrame>,
+            environment: Attribute<EnvironmentValues>
+        ) {
+            self.position = position
+            self.size = size
+            self.pixelLength = pixelLength
+            self.time = inputs.time
+            self.transaction = inputs.transaction
+            self.viewPhase = inputs.phase
+            self.animatedFrame = animatedFrame
+        }
+
+        package mutating func animatedPosition() -> Attribute<ViewOrigin> {
+            if let _animatedPosition {
+                return _animatedPosition
+            } else {
+                let animatedPosition = animatedFrame[keyPath: \.origin]
+                _animatedPosition = animatedPosition
+                return animatedPosition
+            }
+        }
+
+        package mutating func animatedSize() -> Attribute<ViewSize> {
+            if let _animatedSize {
+                return _animatedSize
+            } else {
+                let animatedSize = animatedFrame[keyPath: \.size]
+                _animatedSize = animatedSize
+                return animatedSize
+            }
+        }
+
+        package mutating func animatedCGSize() -> Attribute<CGSize> {
+            if let _animatedCGSize {
+                return _animatedCGSize
+            } else {
+                let animatedCGSize = animatedFrame[keyPath: \.size.cgSize]
+                _animatedCGSize = animatedCGSize
+                return animatedCGSize
+            }
+        }
+    }
+}
diff --git a/Sources/OpenSwiftUICore/Graph/GraphInputs.swift b/Sources/OpenSwiftUICore/Graph/GraphInputs.swift
index a0ce656b..6a540db0 100644
--- a/Sources/OpenSwiftUICore/Graph/GraphInputs.swift
+++ b/Sources/OpenSwiftUICore/Graph/GraphInputs.swift
@@ -128,10 +128,8 @@ public struct _GraphInputs {
     package var environment: Attribute<EnvironmentValues> {
         get { cachedEnvironment.wrappedValue.environment }
         set {
-            cachedEnvironment.wrappedValue = CachedEnvironment(newValue)
-            if !changedDebugProperties.contains(.environment) {
-                changedDebugProperties.formUnion(.environment)
-            }
+            cachedEnvironment = MutableBox(CachedEnvironment(newValue))
+            changedDebugProperties.formUnion(.environment)
         }
     }
     
@@ -155,9 +153,9 @@ public struct _GraphInputs {
     package mutating func merge(_ src: _GraphInputs, ignoringPhase: Bool) {
         preconditionFailure("TODO")
     }
-    
-    package func mapEnvironment<T>(_ keyPath: KeyPath<EnvironmentValues, T>) -> Attribute<T> {
-        cachedEnvironment.wrappedValue.attribute(keyPath: keyPath)
+
+    package func mapEnvironment<T>(id: CachedEnvironment.ID, _ body: (EnvironmentValues) -> T) -> Attribute<T> {
+        cachedEnvironment.wrappedValue.attribute(id: id, body)
     }
     
     package mutating func copyCaches() {
diff --git a/Sources/OpenSwiftUICore/View/Graph/ViewGraph.swift b/Sources/OpenSwiftUICore/View/Graph/ViewGraph.swift
index e488b8b2..8808e577 100644
--- a/Sources/OpenSwiftUICore/View/Graph/ViewGraph.swift
+++ b/Sources/OpenSwiftUICore/View/Graph/ViewGraph.swift
@@ -226,7 +226,7 @@ package final class ViewGraph: GraphHost {
                 as: RootGeometry.self,
                 invalidating: true
             ) { rootGeometry in
-                rootGeometry.$layoutDirection = inputs.mapEnvironment(\.layoutDirection)
+                rootGeometry.$layoutDirection = inputs.mapEnvironment(id: .layoutDirection) { $0.layoutDirection }
             }
             for feature in features {
                 feature.modifyViewInputs(inputs: &inputs, graph: self)
diff --git a/Sources/OpenSwiftUICore/View/Input/ViewInputs.swift b/Sources/OpenSwiftUICore/View/Input/ViewInputs.swift
index d62df6c6..97ab1930 100644
--- a/Sources/OpenSwiftUICore/View/Input/ViewInputs.swift
+++ b/Sources/OpenSwiftUICore/View/Input/ViewInputs.swift
@@ -170,8 +170,8 @@ public struct _ViewInputs {
         )
     }
     
-    package func mapEnvironment<T>(_ keyPath: KeyPath<EnvironmentValues, T>) -> Attribute<T> {
-        base.mapEnvironment(keyPath)
+    package func mapEnvironment<T>(id: CachedEnvironment.ID, _ body: (EnvironmentValues) -> T) -> Attribute<T> {
+        base.mapEnvironment(id: id, body)
     }
     
     package func animatedPosition() -> Attribute<ViewOrigin> {

From a47ebd9eccb6e5441525294f642bf2074a00d2a9 Mon Sep 17 00:00:00 2001
From: Kyle <kyle201817146@gmail.com>
Date: Mon, 2 Jun 2025 21:21:59 +0800
Subject: [PATCH 7/9] Update withAnimatedFrame

---
 .../Data/Environment/CachedEnvironment.swift  | 27 ++++++++++++-------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/Sources/OpenSwiftUICore/Data/Environment/CachedEnvironment.swift b/Sources/OpenSwiftUICore/Data/Environment/CachedEnvironment.swift
index aa42db14..7e90a2f9 100644
--- a/Sources/OpenSwiftUICore/Data/Environment/CachedEnvironment.swift
+++ b/Sources/OpenSwiftUICore/Data/Environment/CachedEnvironment.swift
@@ -70,13 +70,9 @@ package struct CachedEnvironment {
 }
 
 extension CachedEnvironment {
-    package mutating func animatedPosition(for inputs: _ViewInputs) -> Attribute<ViewOrigin> {
-        guard inputs.needsGeometry else {
-            return inputs.position
-        }
+    private mutating func withAnimatedFrame<T>(for inputs: _ViewInputs, body: (inout AnimatedFrame) -> T) -> T {
         let transaction = inputs.geometryTransaction()
         let pixelLength = attribute(id: .pixelLength) { $0.pixelLength }
-
         if let animatedFrame,
            animatedFrame.position == inputs.position,
            animatedFrame.size == inputs.size,
@@ -84,7 +80,7 @@ extension CachedEnvironment {
            animatedFrame.time == inputs.time,
            animatedFrame.transaction == transaction,
            animatedFrame.viewPhase == inputs.viewPhase {
-
+            // Reuse existing animated frame
         } else {
             animatedFrame = AnimatedFrame(
                 inputs: inputs,
@@ -92,15 +88,28 @@ extension CachedEnvironment {
                 environment: environment
             )
         }
-        preconditionFailure("TODO")
+        return body(&animatedFrame!)
+    }
+
+    package mutating func animatedPosition(for inputs: _ViewInputs) -> Attribute<ViewOrigin> {
+        guard inputs.needsGeometry else {
+            return inputs.position
+        }
+        return withAnimatedFrame(for: inputs) { $0.animatedPosition() }
     }
 
     package mutating func animatedSize(for inputs: _ViewInputs) -> Attribute<ViewSize> {
-        preconditionFailure("TODO")
+        guard inputs.needsGeometry else {
+            return inputs.size
+        }
+        return withAnimatedFrame(for: inputs) { $0.animatedSize() }
     }
 
     package mutating func animatedCGSize(for inputs: _ViewInputs) -> Attribute<CGSize> {
-        preconditionFailure("TODO")
+        guard inputs.needsGeometry else {
+            return inputs.size.cgSize
+        }
+        return withAnimatedFrame(for: inputs) { $0.animatedCGSize() }
     }
 }
 

From cc0df1064498d0dd4d0db8e2f0a3e40cfc0f550a Mon Sep 17 00:00:00 2001
From: Kyle <kyle201817146@gmail.com>
Date: Mon, 2 Jun 2025 21:46:29 +0800
Subject: [PATCH 8/9] Add layoutDirection API in Inputs

---
 .../Data/Environment/CachedEnvironment.swift  |  6 +-----
 .../Environment/EnvironmentAdditions.swift    |  4 ++++
 .../Layout/Direction/LayoutDirection.swift    | 21 ++++++++++++++++++-
 .../Animation/Animation/CustomAnimation.swift |  1 +
 4 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/Sources/OpenSwiftUICore/Data/Environment/CachedEnvironment.swift b/Sources/OpenSwiftUICore/Data/Environment/CachedEnvironment.swift
index 7e90a2f9..1251d0f4 100644
--- a/Sources/OpenSwiftUICore/Data/Environment/CachedEnvironment.swift
+++ b/Sources/OpenSwiftUICore/Data/Environment/CachedEnvironment.swift
@@ -6,7 +6,7 @@
 //  ID: C424ABD9FC88B2DFD0B7B2319F2E7987 (SwiftUI)
 //  ID: B62A4B04AF9F1325924A089D63071424 (SwiftUICore)
 
-import Foundation
+package import Foundation
 package import OpenGraphShims
 
 // MARK: - CachedEnvironment [6.4.41]
@@ -20,10 +20,6 @@ package struct CachedEnvironment {
         package init() {
             self.base = .init()
         }
-
-        static let pixelLength: ID = .init()
-        static let layoutDirection: ID = .init()
-
     }
 
     private struct MapItem {
diff --git a/Sources/OpenSwiftUICore/Data/Environment/EnvironmentAdditions.swift b/Sources/OpenSwiftUICore/Data/Environment/EnvironmentAdditions.swift
index 94a19030..65d616b8 100644
--- a/Sources/OpenSwiftUICore/Data/Environment/EnvironmentAdditions.swift
+++ b/Sources/OpenSwiftUICore/Data/Environment/EnvironmentAdditions.swift
@@ -39,6 +39,10 @@ extension EnvironmentValues {
     }
 }
 
+extension CachedEnvironment.ID {
+    static let pixelLength: CachedEnvironment.ID = .init()
+}
+
 private struct DisplayGamutKey: EnvironmentKey {
     static var defaultValue: DisplayGamut { .sRGB }
 }
diff --git a/Sources/OpenSwiftUICore/Layout/Direction/LayoutDirection.swift b/Sources/OpenSwiftUICore/Layout/Direction/LayoutDirection.swift
index f1872f76..701dd595 100644
--- a/Sources/OpenSwiftUICore/Layout/Direction/LayoutDirection.swift
+++ b/Sources/OpenSwiftUICore/Layout/Direction/LayoutDirection.swift
@@ -8,6 +8,7 @@
 //  ID: 54C853EF26D00A0E6B1785C3902A74F4 (SwiftUICore)
 
 package import Foundation
+package import OpenGraphShims
 
 // MARK: - LayoutDirection
 
@@ -52,7 +53,7 @@ public enum LayoutDirection: Hashable, CaseIterable, Sendable {
 
 // MARK: - LayoutDirectionKey
 
-private struct LayoutDirectionKey: EnvironmentKey {
+struct LayoutDirectionKey: EnvironmentKey {
     static let defaultValue: LayoutDirection = .leftToRight
 }
 
@@ -104,3 +105,21 @@ package struct CodableLayoutDirection: CodableProxy {
         }
     }
 }
+
+// MARK: - LayoutDirection + CachedEnvironment [6.4.41]
+
+extension CachedEnvironment.ID {
+    static let layoutDirection: CachedEnvironment.ID = .init()
+}
+
+extension _GraphInputs {
+    package var layoutDirection: Attribute<LayoutDirection> {
+        mapEnvironment(id: .layoutDirection) { $0.layoutDirection }
+    }
+}
+
+extension _ViewInputs {
+    package var layoutDirection: Attribute<LayoutDirection> {
+        mapEnvironment(id: .layoutDirection) { $0.layoutDirection }
+    }
+}
diff --git a/Sources/OpenSwiftUICore/View/Animation/Animation/CustomAnimation.swift b/Sources/OpenSwiftUICore/View/Animation/Animation/CustomAnimation.swift
index 3ac7a553..6f8d79a6 100644
--- a/Sources/OpenSwiftUICore/View/Animation/Animation/CustomAnimation.swift
+++ b/Sources/OpenSwiftUICore/View/Animation/Animation/CustomAnimation.swift
@@ -5,6 +5,7 @@
 //  Status: WIP
 //  ID: 35ADF281214A25133F1A6DF28858952D (SwiftUICore?)
 
+package import Foundation
 package import OpenGraphShims
 
 // MARK: - FrameVelocityFilter [6.4.41]

From a24b2cd26e2729c904d2c2d8c6a0d2cf5a7b759f Mon Sep 17 00:00:00 2001
From: Kyle <kyle201817146@gmail.com>
Date: Mon, 2 Jun 2025 22:15:29 +0800
Subject: [PATCH 9/9] Fix test case issue

---
 .../OpenSwiftUICore/Data/Environment/CachedEnvironment.swift   | 3 ++-
 .../SwiftUICore/Layout/Geometry/AngleTests.swift               | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Sources/OpenSwiftUICore/Data/Environment/CachedEnvironment.swift b/Sources/OpenSwiftUICore/Data/Environment/CachedEnvironment.swift
index 1251d0f4..5028f149 100644
--- a/Sources/OpenSwiftUICore/Data/Environment/CachedEnvironment.swift
+++ b/Sources/OpenSwiftUICore/Data/Environment/CachedEnvironment.swift
@@ -49,7 +49,8 @@ package struct CachedEnvironment {
     package mutating func attribute<T>(id: CachedEnvironment.ID, _ body: (EnvironmentValues) -> T) -> Attribute<T> {
         guard let item = mapItems.first(where: { $0.key == id }) else {
             // Blocked by OG's Map
-            preconditionFailure("TODO")
+            // preconditionFailure("TODO")
+            return Attribute(value: body(environment.value))
         }
         return item.value.unsafeCast(to: T.self)
     }
diff --git a/Tests/OpenSwiftUICompatibilityTests/SwiftUICore/Layout/Geometry/AngleTests.swift b/Tests/OpenSwiftUICompatibilityTests/SwiftUICore/Layout/Geometry/AngleTests.swift
index e07672c1..a7c91dc4 100644
--- a/Tests/OpenSwiftUICompatibilityTests/SwiftUICore/Layout/Geometry/AngleTests.swift
+++ b/Tests/OpenSwiftUICompatibilityTests/SwiftUICore/Layout/Geometry/AngleTests.swift
@@ -37,6 +37,7 @@ struct AngleTests {
         helper(radians: .pi, degrees: 180)
     }
 
+    @Test
     func circle() {
         helper(radians: .pi * 2, degrees: 360)
     }