Remove bad merge.

Author: maxg-square

BlueprintUI/Sources/BlueprintView/BlueprintView.swift

@@ -40,8 +40,6 @@ public final class BlueprintView: UIView {
 
     private var sizesThatFit: [SizeConstraint: CGSize] = [:]
 
-    private var cacheStorage = Environment.CacheStorageEnvironmentKey.defaultValue
-
     /// A base environment used when laying out and rendering the element tree.
     ///
     /// Some keys will be overridden with the traits from the view itself. Eg, `windowSize`, `safeAreaInsets`, etc.
@@ -54,13 +52,6 @@ public final class BlueprintView: UIView {
         didSet {
             // Shortcut: If both environments were empty, nothing changed.
             if oldValue.isEmpty && environment.isEmpty { return }
-            // Shortcut: If there are no changes to the environment, then, well, nothing changed.
-            if let layoutMode, layoutMode.options.skipUnneededSetNeedsViewHierarchyUpdates && oldValue.isEquivalent(
-                to: environment,
-                in: .all
-            ) {
-                return
-            }
 
             setNeedsViewHierarchyUpdate()
         }
@@ -95,13 +86,6 @@ public final class BlueprintView: UIView {
             if oldValue == nil && element == nil {
                 return
             }
-            if let layoutMode, layoutMode.options.skipUnneededSetNeedsViewHierarchyUpdates, let contextuallyEquivalent = element as? ContextuallyEquivalent, contextuallyEquivalent.isEquivalent(
-                to: oldValue as? ContextuallyEquivalent,
-                in: .all
-            ) {
-                return
-            }
-            cacheStorage = Environment.CacheStorageEnvironmentKey.defaultValue
 
             Logger.logElementAssigned(view: self)
 
@@ -164,7 +148,6 @@ public final class BlueprintView: UIView {
 
         self.element = element
         self.environment = environment
-        self.environment.cacheStorage = cacheStorage
 
         rootController = NativeViewController(
             node: NativeViewNode(
@@ -559,13 +542,9 @@ public final class BlueprintView: UIView {
             environment.layoutMode = layoutMode
         }
 
-        environment.cacheStorage = cacheStorage
-
         return environment
     }
 
-
-
     private func handleAppeared() {
         rootController.traverse { node in
             node.onAppear?()

BlueprintUI/Sources/Element/Accessibility.swift

@@ -205,49 +205,3 @@ extension AXCustomContent {
     }
 }
 
-extension Accessibility {
-    public static func frameSort(
-        direction: Environment.LayoutDirection,
-        root: UIView,
-        userInterfaceIdiom: UIUserInterfaceIdiom = UIDevice.current.userInterfaceIdiom
-    ) -> (NSObject, NSObject) -> Bool {
-        {
-            let first = root.convert($0.accessibilityFrame, from: nil)
-            let second = root.convert($1.accessibilityFrame, from: nil)
-
-            // Horizontal sorting logic - reusable for both center-aligned and fallback cases
-            let sortHorizontally = {
-                switch direction {
-                case .leftToRight:
-                    return first.minX < second.minX
-                case .rightToLeft:
-                    return first.maxX > second.maxX
-                }
-            }
-
-            // Check if elements are vertically aligned along their central axis first.
-            // While this check deviates from VoiceOver's behavior for UIKit, it covers one frequent
-            // use case of Blueprint Row where it contains a number of elements with their
-            // verticalAlignment set to .center. Since there's no view representation for Row,
-            // checking for midY alignment is a reasonable heuristic in its absence.
-            let centerYTolerance: CGFloat = 1.0
-            let centerYDelta = abs(first.midY - second.midY)
-
-            if centerYDelta <= centerYTolerance {
-                // Elements are center-aligned, sort horizontally.
-                return sortHorizontally()
-            }
-
-            // Derived through experimentation, this mimics the default sorting for UIKit.
-            // If frames differ by more than 8 points the top most element is preferred.
-            let minYTolerance = userInterfaceIdiom == .phone ? 8.0 : 13.0
-            let minYDelta = abs(first.minY - second.minY)
-            if minYDelta <= minYTolerance {
-                // Elements are within vertical tolerance, sort horizontally.
-                return sortHorizontally()
-            }
-
-            return first.minY < second.minY
-        }
-    }
-}

BlueprintUI/Sources/Element/ElementContent.swift

@@ -249,17 +249,6 @@ extension ElementContent {
         storage = MeasurableStorage(measurer: measureFunction)
     }
 
-    /// Initializes a new `ElementContent` with no children that delegates to the provided measure function.
-    ///
-    /// - parameter validationKey: If present, measureFunction will attempt to cache sizing based on the path of the node. validationKey will be evaluated to ensure that the result is valid.
-    /// - parameter measureFunction: How to measure the `ElementContent` in the given `SizeConstraint` and `Environment`.
-    public init(
-        validationKey: some ContextuallyEquivalent,
-        measureFunction: @escaping (SizeConstraint, Environment) -> CGSize
-    ) {
-        storage = MeasurableStorage(validationKey: validationKey, measurer: measureFunction)
-    }
-
     /// Initializes a new `ElementContent` with no children that uses the provided intrinsic size for measuring.
     public init(intrinsicSize: CGSize) {
         self = ElementContent(measureFunction: { _ in intrinsicSize })

BlueprintUI/Sources/Element/MeasurableStorage.swift

@@ -7,18 +7,7 @@ struct MeasurableStorage: ContentStorage {
 
     let childCount = 0
 
-    let validationKey: AnyContextuallyEquivalent?
     let measurer: (SizeConstraint, Environment) -> CGSize
-
-    init(validationKey: some ContextuallyEquivalent, measurer: @escaping (SizeConstraint, Environment) -> CGSize) {
-        self.validationKey = AnyContextuallyEquivalent(validationKey)
-        self.measurer = measurer
-    }
-
-    init(measurer: @escaping (SizeConstraint, Environment) -> CGSize) {
-        validationKey = nil
-        self.measurer = measurer
-    }
 }
 
 extension MeasurableStorage: CaffeinatedContentStorage {
@@ -28,19 +17,7 @@ extension MeasurableStorage: CaffeinatedContentStorage {
         environment: Environment,
         node: LayoutTreeNode
     ) -> CGSize {
-        guard environment.layoutMode.options.measureableStorageCache, let validationKey else {
-            return measurer(proposal, environment)
-        }
-
-        let key = MeasurableSizeKey(path: node.path, max: proposal.maximum)
-        return environment.cacheStorage.measurableStorageCache.retrieveOrCreate(
-            key: key,
-            environment: environment,
-            validationValue: validationKey,
-            context: .elementSizing,
-        ) { environment in
-            measurer(proposal, environment)
-        }
+        measurer(proposal, environment)
     }
 
     func performCaffeinatedLayout(
@@ -51,40 +28,3 @@ extension MeasurableStorage: CaffeinatedContentStorage {
         []
     }
 }
-
-extension MeasurableStorage {
-
-    fileprivate struct MeasurableSizeKey: Hashable {
-
-        let path: String
-        let max: CGSize
-
-        func hash(into hasher: inout Hasher) {
-            path.hash(into: &hasher)
-            max.hash(into: &hasher)
-        }
-
-    }
-
-}
-
-extension CacheStorage {
-
-    private struct MeasurableStorageCacheKey: CacheKey {
-        static var emptyValue = EnvironmentAndValueValidatingCache<
-            MeasurableStorage.MeasurableSizeKey,
-            CGSize,
-            AnyContextuallyEquivalent
-        >()
-    }
-
-    fileprivate var measurableStorageCache: EnvironmentAndValueValidatingCache<
-        MeasurableStorage.MeasurableSizeKey,
-        CGSize,
-        AnyContextuallyEquivalent
-    > {
-        get { self[MeasurableStorageCacheKey.self] }
-        set { self[MeasurableStorageCacheKey.self] = newValue }
-    }
-
-}

BlueprintUI/Sources/Layout/LayoutMode.swift

@@ -11,7 +11,7 @@ import Foundation
 /// Changing the default will cause all instances of ``BlueprintView`` to be invalidated, and re-
 /// render their contents.
 ///
-public struct LayoutMode: Hashable {
+public struct LayoutMode: Equatable {
     public static var `default`: Self = .caffeinated {
         didSet {
             guard oldValue != .default else { return }
@@ -41,29 +41,15 @@ public struct LayoutMode: Hashable {
 
 extension LayoutMode: CustomStringConvertible {
     public var description: String {
-        var optionsDescription: [String] = []
-        if options.hintRangeBoundaries {
-            optionsDescription.append("hint")
-        }
-        if options.searchUnconstrainedKeys {
-            optionsDescription.append("search")
-        }
-        if options.measureableStorageCache {
-            optionsDescription.append("measureableStorageCache")
-        }
-        if options.stringNormalizationCache {
-            optionsDescription.append("stringNormalizationCache")
-        }
-        if options.skipUnneededSetNeedsViewHierarchyUpdates {
-            optionsDescription.append("needsViewHierarchyUpdates")
-        }
-        if options.labelAttributedStringCache {
-            optionsDescription.append("labelAttributedStringCache")
-        }
-        if optionsDescription.isEmpty {
+        switch (options.hintRangeBoundaries, options.searchUnconstrainedKeys) {
+        case (true, true):
+            return "Caffeinated (hint+search)"
+        case (true, false):
+            return "Caffeinated (hint)"
+        case (false, true):
+            return "Caffeinated (search)"
+        case (false, false):
             return "Caffeinated"
-        } else {
-            return "Caffeinated \(optionsDescription.joined(separator: "+"))"
         }
     }
 }

BlueprintUI/Sources/Layout/LayoutOptions.swift

@@ -4,16 +4,12 @@ import Foundation
 ///
 /// Generally these are only useful for experimenting with the performance profile of different
 /// element compositions, and you should stick with ``default``.
-public struct LayoutOptions: Hashable {
+public struct LayoutOptions: Equatable {
 
     /// The default configuration.
     public static let `default` = LayoutOptions(
         hintRangeBoundaries: true,
-        searchUnconstrainedKeys: true,
-        measureableStorageCache: true,
-        stringNormalizationCache: true,
-        skipUnneededSetNeedsViewHierarchyUpdates: true,
-        labelAttributedStringCache: true
+        searchUnconstrainedKeys: true
     )
 
     /// Enables aggressive cache hinting along the boundaries of the range between constraints and
@@ -26,32 +22,8 @@ public struct LayoutOptions: Hashable {
     /// Layout contract for correct behavior.
     public var searchUnconstrainedKeys: Bool
 
-    /// Allows caching the results of `MeasurableStorage` `sizeThatFits`.
-    public var measureableStorageCache: Bool
-
-    /// Caches results of AttributedLabel normalization process.
-    public var stringNormalizationCache: Bool
-
-    /// Allows skipping calls to setNeedsViewHierarchyUpdates when updating Environment, if the environment is
-    /// equilvalent to the prior value.
-    public var skipUnneededSetNeedsViewHierarchyUpdates: Bool
-
-    /// Caches MarketLabel attributed string generation
-    public var labelAttributedStringCache: Bool
-
-    public init(
-        hintRangeBoundaries: Bool,
-        searchUnconstrainedKeys: Bool,
-        measureableStorageCache: Bool,
-        stringNormalizationCache: Bool,
-        skipUnneededSetNeedsViewHierarchyUpdates: Bool,
-        labelAttributedStringCache: Bool
-    ) {
+    public init(hintRangeBoundaries: Bool, searchUnconstrainedKeys: Bool) {
         self.hintRangeBoundaries = hintRangeBoundaries
         self.searchUnconstrainedKeys = searchUnconstrainedKeys
-        self.measureableStorageCache = measureableStorageCache
-        self.stringNormalizationCache = stringNormalizationCache
-        self.skipUnneededSetNeedsViewHierarchyUpdates = skipUnneededSetNeedsViewHierarchyUpdates
-        self.labelAttributedStringCache = labelAttributedStringCache
     }
 }