Update package

Author: vmanot

Sources/Intermodular/Helpers/SwiftUI/DynamicProperty+.swift

@@ -5,6 +5,35 @@
 import Swift
 import SwiftUI
 
+public func withInlineState<Value, Content: View>(
+    initialValue: Value,
+    @ViewBuilder content: @escaping (Binding<Value>) -> Content
+) -> some View {
+    WithInlineState(initialValue: initialValue, content: content)
+}
+
+public func withInlineObservedObject<Object: ObservableObject, Content: View>(
+    _ object: Object,
+    @ViewBuilder content: (Object) -> Content
+) -> some View {
+    WithInlineObservedObject(object: object, content: content(object))
+}
+
+public func withInlineObservedObject<Object: ObservableObject, Content: View>(
+    _ object: Object?,
+    @ViewBuilder content: (Object?) -> Content
+) -> some View {
+    WithOptionalInlineObservedObject(object: .init(wrappedValue: object), content: content(object))
+}
+
+@available(iOS 14.0, macOS 11.0, tvOS 14.0, watchOS 7.0,  *)
+public func withInlineStateObject<Object: ObservableObject, Content: View>(
+    _ object: @autoclosure @escaping () -> Object,
+    @ViewBuilder content: @escaping (Object) -> Content
+) -> some View {
+    WithInlineStateObject(object(), content: content)
+}
+
 private struct WithInlineState<Value, Content: View>: View {
     @State var value: Value
 
@@ -25,7 +54,17 @@ private struct WithInlineState<Value, Content: View>: View {
 
 private struct WithInlineObservedObject<Object: ObservableObject, Content: View>: View {
     @ObservedObject var object: Object
+    
+    let content: Content
+    
+    var body: some View {
+        content
+    }
+}
 
+private struct WithOptionalInlineObservedObject<Object: ObservableObject, Content: View>: View {
+    @OptionalObservedObject var object: Object?
+    
     let content: Content
 
     var body: some View {
@@ -51,25 +90,3 @@ private struct WithInlineStateObject<Object: ObservableObject, Content: View>: V
         content(object)
     }
 }
-
-public func withInlineState<Value, Content: View>(
-    initialValue: Value,
-    @ViewBuilder content: @escaping (Binding<Value>) -> Content
-) -> some View {
-    WithInlineState(initialValue: initialValue, content: content)
-}
-
-public func withInlineObservedObject<Object: ObservableObject, Content: View>(
-    _ object: Object,
-    @ViewBuilder content: (Object) -> Content
-) -> some View {
-    WithInlineObservedObject(object: object, content: content(object))
-}
-
-@available(iOS 14.0, macOS 11.0, tvOS 14.0, watchOS 7.0,  *)
-public func withInlineStateObject<Object: ObservableObject, Content: View>(
-    _ object: @autoclosure @escaping () -> Object,
-    @ViewBuilder content: @escaping (Object) -> Content
-) -> some View {
-    WithInlineStateObject(object(), content: content)
-}

Sources/Intramodular/Animation/PredicatedAnimation.swift

@@ -0,0 +1,34 @@
+//
+// Copyright (c) Vatsal Manot
+//
+
+import Swift
+import SwiftUI
+
+private struct PredicatedAnimateOnChange<Value: Equatable>: ViewModifier {
+    let animation: Animation?
+    let value: Value
+    let predicate: ((oldValue: Value, newValue: Value)) -> Bool
+    
+    @ViewStorage private var lastValue: Value?
+    
+    func body(content: Content) -> some View {
+        content.transaction { view in
+            if let oldValue = lastValue {
+                if predicate((oldValue, value)) {
+                    view.animation = animation
+                }
+            }
+        }
+    }
+}
+
+extension View {
+    public func predicatedAnimation<Value: Equatable>(
+        _ animation: Animation?,
+        value: Value,
+        predicate: @escaping ((oldValue: Value, newValue: Value)) -> Bool
+    ) -> some View {
+        modifier(PredicatedAnimateOnChange(animation: animation, value: value, predicate: predicate))
+    }
+}

Sources/Intramodular/Dynamic Properties/ObservedValue.swift

@@ -63,6 +63,13 @@ extension View {
         WithObservedValue(value: .init(storage), content: { transform(AnyView(self), $0) })
     }
 
+    public func modify<T, TransformedView: View>(
+        observing storage: ViewStorage<T>?,
+        transform: @escaping (AnyView, T?) -> TransformedView
+    ) -> some View {
+        WithOptionalObservableValue(value: .init(wrappedValue: storage.map(ObservedValue.init)?.base), content: { transform(AnyView(self), $0) })
+    }
+
     public func modify<T: Hashable, TransformedView: View>(
         observing storage: ViewStorage<T>,
         transform: @escaping (AnyView) -> TransformedView
@@ -71,6 +78,8 @@ extension View {
     }
 }
 
+// MARK: - Auxiliary Implementation -
+
 private struct WithObservedValue<T, Content: View>: View {
     @ObservedValue var value: T
 
@@ -80,3 +89,13 @@ private struct WithObservedValue<T, Content: View>: View {
         content(value)
     }
 }
+
+private struct WithOptionalObservableValue<T, Content: View>: View {
+    @OptionalObservedObject var value: ObservableValue<T>?
+    
+    let content: (T?) -> Content
+    
+    var body: some View {
+        content(value?.wrappedValue)
+    }
+}

Sources/Intramodular/Dynamic Properties/OptionalObservedObject.swift

@@ -25,14 +25,10 @@ public struct OptionalObservedObject<ObjectType: ObservableObject>: DynamicPrope
     }
 
     /// Initialize with the provided initial value.
-    public init(wrappedValue value: ObjectType?) {
+    public init(wrappedValue value: ObjectType? = nil) {
         self.base = value
     }
-    
-    public init() {
-        self.init(wrappedValue: nil)
-    }
-    
+        
     public mutating func update() {
         _observedContainer.update()
     }