Merge remote-tracking branch 'upstream/main' into better-concurrency

Author: bbrk24

.github/workflows/build-test-and-docs.yml

@@ -126,6 +126,44 @@ jobs:
         xcodebuild: true
         xcodebuild-device-type: ${{ matrix.device-type }}
 
+  uikit-catalyst:
+    runs-on: macos-14
+    steps:
+    - name: Force Xcode 15.4
+      run: sudo xcode-select -switch /Applications/Xcode_15.4.app
+
+    - name: Swift version
+      run: swift --version
+
+    - name: Install xcbeautify
+      run: brew install xcbeautify
+
+    - uses: actions/checkout@v3
+
+    - name: Build
+      run: |
+        set -uxo pipefail
+        buildtarget () {
+          # Use the same derived data path as DocC compilation so that we don't duplicate work.
+          xcodebuild -derivedDataPath /tmp/data -skipMacroValidation -scheme "$1" -destination "variant=Mac Catalyst,arch=arm64,platform=macOS" build | xcbeautify --renderer github-actions
+        }
+
+        buildtarget SwiftCrossUI
+        buildtarget UIKitBackend
+
+        cd Examples
+
+        buildtarget CounterExample
+        buildtarget GreetingGeneratorExample
+        buildtarget NavigationExample
+        buildtarget StressTestExample
+        buildtarget NotesExample
+        buildtarget PathsExample
+        buildtarget ControlsExample
+        buildtarget RandomNumberGeneratorExample
+        # TODO test whether this works on Catalyst
+        # buildtarget SplitExample
+
   windows:
     runs-on: windows-latest
     defaults:

Package.resolved

@@ -2,12 +2,12 @@
 /// as a writable reference to the value.
 @dynamicMemberLookup
 @propertyWrapper
-public class Binding<Value> {
+public struct Binding<Value> {
     public var wrappedValue: Value {
         get {
             getValue()
         }
-        set {
+        nonmutating set {
             setValue(newValue)
         }
     }
@@ -32,6 +32,21 @@ public class Binding<Value> {
         self.setValue = set
     }
 
+    public init?(_ other: Binding<Value?>) {
+        if let initialValue = other.wrappedValue {
+            self.init(
+                get: {
+                    other.wrappedValue ?? initialValue
+                },
+                set: { newValue in
+                    other.wrappedValue = newValue
+                }
+            )
+        } else {
+            return nil
+        }
+    }
+
     /// Projects a property of a binding.
     public subscript<T>(dynamicMember keyPath: WritableKeyPath<Value, T>) -> Binding<T> {
         get {

Sources/SwiftCrossUI/State/Binding.swift

@@ -28,6 +28,10 @@ public struct State<Value>: DynamicProperty, StateProperty {
             /// setting a new value. This isn't in a didSet property accessor
             /// because we want more granular control over when it does and
             /// doesn't trigger.
+            ///
+            /// Additionally updates the downstream observation if the
+            /// wrapped value is an Optional<some ObservableObject> and the
+            /// current case has toggled.
             func postSet() {
                 // If the wrapped value is an Optional<some ObservableObject>
                 // then we need to observe/unobserve whenever the optional

Sources/SwiftCrossUI/State/State.swift

@@ -3,12 +3,12 @@
 ## Overview
 
 SwiftCrossUI supports hot reloading when used together with Swift Bundler.
-Currently this is only support on macOS, but the macros work everywhere so
+Currently this is only supported on macOS, but the macros work everywhere so
 that you can safely leave them in even when unused.
 
 Use ``HotReloadable`` to enable hot reloading within your app. Use
 ``hotReloadable`` to define hot reloading boundaries; anything within a hot
-reloading boundary gets reloaded during hot loading (with state persisted),
+reloading boundary gets reloaded during hot reloading (with state persisted),
 and everything outside remains unchanged within any given hot reloading session.
 
 ## Topics

Sources/SwiftCrossUI/SwiftCrossUI.docc/Hot reloading.md

@@ -33,7 +33,7 @@ Running your new app with Swift Bundler is as simple as it gets!
 swift bundler run
 ```
 
-On macOS you can provide the `--device <device_name_or_id>` option to run the app on a connacted iOS or tvOS device, or the `--simulator <simulator_name_or_id>` option to run the app in a simulator.
+On macOS you can provide the `--device <device_name_or_id>` option to run the app on a connected iOS or tvOS device, or the `--simulator <simulator_name_or_id>` option to run the app in a simulator.
 
 ```sh
 # You can use any substring of the target device name. For example,

Sources/SwiftCrossUI/SwiftCrossUI.docc/Quick start.md

@@ -11,6 +11,24 @@ extension View {
             actions: actions()
         )
     }
+
+    public func alert(
+        _ title: Binding<String?>,
+        @AlertActionsBuilder actions: () -> [AlertAction]
+    ) -> some View {
+        AlertModifierView(
+            child: self,
+            title: title.wrappedValue ?? "",
+            isPresented: Binding {
+                title.wrappedValue != nil
+            } set: { newValue in
+                if !newValue {
+                    title.wrappedValue = nil
+                }
+            },
+            actions: actions()
+        )
+    }
 }
 
 struct AlertModifierView<Child: View>: TypeSafeView {

Sources/SwiftCrossUI/Views/Modifiers/AlertModifier.swift

@@ -104,11 +104,10 @@ public struct Slider: ElementaryView, View {
                 maximum: maximum,
                 decimalPlaces: decimalPlaces,
                 environment: environment
-            ) { [weak value] newValue in
-                guard let value = value else {
-                    return
+            ) { newValue in
+                if let value {
+                    value.wrappedValue = newValue
                 }
-                value.wrappedValue = newValue
             }
 
             if let value = value?.wrappedValue {

Sources/SwiftCrossUI/Views/Slider.swift

@@ -142,7 +142,7 @@ final class UITableViewPicker: WrapperWidget<UITableView>, Picker, UITableViewDe
 extension UIKitBackend {
     public func createPicker() -> Widget {
         #if targetEnvironment(macCatalyst)
-            if UIDevice.current.userInterfaceIdiom == .mac {
+            if #available(macCatalyst 14, *), UIDevice.current.userInterfaceIdiom == .mac {
                 return UITableViewPicker()
             } else {
                 return UIPickerViewPicker()