Add and use EquatableObject

Co-Authored-By: Caleb Rasmussen <crasmussen@esri.com>

Author: dfeinzimer

Sources/ArcGISToolkit/Common/EquatableObject.swift

@@ -0,0 +1,24 @@
+// Copyright 2025 Esri
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//   https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+/// An equatable wrapper for an object.
+///
+/// Equality is determined by object identity.
+struct EquatableObject<Object: AnyObject & Sendable>: Equatable {
+    let object: Object
+    
+    static func == (lhs: Self, rhs: Self) -> Bool {
+        lhs.object === rhs.object
+    }
+}

Sources/ArcGISToolkit/Components/FeatureFormView/EmbeddedFeatureFormView.swift

@@ -82,7 +82,7 @@ struct EmbeddedFeatureFormView: View {
         .padding([.horizontal])
         .preference(
             key: PresentedFeatureFormPreferenceKey.self,
-            value: .init(featureForm: embeddedFeatureFormViewModel.featureForm)
+            value: .init(object: embeddedFeatureFormViewModel.featureForm)
         )
         .task {
             await embeddedFeatureFormViewModel.initialEvaluation()

Sources/ArcGISToolkit/Components/FeatureFormView/FeatureFormView.swift

@@ -145,7 +145,7 @@ public struct FeatureFormView: View {
                             .navigationTitle(result.filter.title, subtitle: embeddedFeatureFormViewModel.title)
                             .preference(
                                 key: PresentedFeatureFormPreferenceKey.self,
-                                value: .init(featureForm: embeddedFeatureFormViewModel.featureForm)
+                                value: .init(object: embeddedFeatureFormViewModel.featureForm)
                             )
                         case let .utilityAssociationGroupResultView(result, embeddedFeatureFormViewModel):
                             UtilityAssociationGroupResultView(
@@ -269,7 +269,7 @@ public struct FeatureFormView: View {
             .environment(\.validationErrorVisibilityInternal, $validationErrorVisibilityInternal)
             .onPreferenceChange(PresentedFeatureFormPreferenceKey.self) { wrappedFeatureForm in
                 guard let wrappedFeatureForm else { return }
-                formChangedAction(wrappedFeatureForm.featureForm)
+                formChangedAction(wrappedFeatureForm.object)
             }
         }
     }

Sources/ArcGISToolkit/Components/FeatureFormView/PresentedFeatureFormPreferenceKey.swift

@@ -17,20 +17,12 @@ import SwiftUI
 
 /// A preference key that specifies the feature form currently presented in the `FeatureFormView` navigation stack.
 struct PresentedFeatureFormPreferenceKey: PreferenceKey {
-    /// A wrapper for making a feature form equatable.
-    struct EquatableFeatureForm: Equatable {
-        let featureForm: FeatureForm
-        
-        static func == (lhs: Self, rhs: Self) -> Bool {
-            lhs.featureForm === rhs.featureForm
-        }
-    }
-    
-    // MARK: PreferenceKey Conformance
-    
-    static let defaultValue: EquatableFeatureForm? = nil
+    static let defaultValue: EquatableObject<FeatureForm>? = nil
 
-    static func reduce(value: inout EquatableFeatureForm?, nextValue: () -> EquatableFeatureForm?) {
+    static func reduce(
+        value: inout EquatableObject<FeatureForm>?,
+        nextValue: () -> EquatableObject<FeatureForm>?
+    ) {
         guard let nextValue = nextValue() else { return }
         value = nextValue
     }

Sources/ArcGISToolkit/Components/Popups/EmbeddedPopupView.swift

@@ -60,7 +60,7 @@ struct EmbeddedPopupView: View {
         .frame(maxWidth: .infinity, maxHeight: .infinity)
         .background(Color(.systemBackground))
 #endif
-        .preference(key: PresentedPopupPreferenceKey.self, value: .init(popup: popup))
+        .preference(key: PresentedPopupPreferenceKey.self, value: .init(object: popup))
         .popupViewHeader(title: popup.title)
         .task(id: ObjectIdentifier(popup)) {
             // Initial evaluation for a newly assigned popup.

Sources/ArcGISToolkit/Components/Popups/PopupView.swift

@@ -91,7 +91,7 @@ public struct PopupView: View {
         .environment(\.deprecatedProperties, deprecatedProperties)
         .onPreferenceChange(PresentedPopupPreferenceKey.self) { wrappedPopup in
             guard let wrappedPopup else { return }
-            onPopupChanged?(wrappedPopup.popup)
+            onPopupChanged?(wrappedPopup.object)
         }
     }
 }
@@ -111,20 +111,9 @@ public extension PopupView {
 
 /// A preference key that specifies the popup currently presented in the `PopupView` navigation stack.
 struct PresentedPopupPreferenceKey: PreferenceKey {
-    /// A wrapper for making a popup equatable.
-    struct EquatablePopup: Equatable {
-        let popup: Popup
-        
-        static func == (lhs: Self, rhs: Self) -> Bool {
-            lhs.popup === rhs.popup
-        }
-    }
-    
-    // MARK: PreferenceKey Conformance
-    
-    static let defaultValue: EquatablePopup? = nil
+    static let defaultValue: EquatableObject<Popup>? = nil
 
-    static func reduce(value: inout EquatablePopup?, nextValue: () -> EquatablePopup?) {
+    static func reduce(value: inout EquatableObject<Popup>?, nextValue: () -> EquatableObject<Popup>?) {
         guard let nextValue = nextValue() else { return }
         value = nextValue
     }