Merge branch 'main' into feat/textSelectionEnabled

Author: MiaKoring

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

@@ -80,12 +80,14 @@ jobs:
 
     - name: Build
       run: |
-        set -uexo pipefail
+        set -uxo pipefail
         device_type=${{ matrix.device-type }}
         set +e
         deviceid=$(xcrun simctl list devices $device_type available | grep -v -- -- | tail -n 1 | grep -oE '[0-9A-F\-]{36}')
         if [ $? -eq 0 ]; then
           (
+            set -e
+
             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 "id=$deviceid" build | xcbeautify --renderer github-actions
@@ -116,6 +118,7 @@ jobs:
           )
         else
           echo "No $device_type simulators found" >&2
+          false
         fi
 
     - name: Extract UIKitBackend symbol graphs

Examples/Package.resolved

@@ -13,9 +13,9 @@ struct HoverExample: App {
         WindowGroup("Hover Example") {
             #hotReloadable {
                 VStack(spacing: 0) {
-                    ForEach([Bool](repeating: false, count: 18)) { _ in
+                    ForEach(1...18) { _ in
                         HStack(spacing: 0) {
-                            ForEach([Bool](repeating: false, count: 30)) { _ in
+                            ForEach(1...30) { _ in
                                 CellView()
                             }
                         }

Examples/Sources/HoverExample/HoverApp.swift

@@ -100,15 +100,15 @@ let package = Package(
         ),
         .package(
             url: "https://github.com/stackotter/swift-windowsappsdk",
-            branch: "ed938db0b9790b36391dc91b20cee81f2410309f"
+            revision: "ba6f0ec377b70d8be835d253102ff665a0e47d99"
         ),
         .package(
-            url: "https://github.com/thebrowsercompany/swift-windowsfoundation",
-            branch: "main"
+            url: "https://github.com/stackotter/swift-windowsfoundation",
+            revision: "4ad57d20553514bcb23724bdae9121569b19f172"
         ),
         .package(
             url: "https://github.com/stackotter/swift-winui",
-            branch: "927e2c46430cfb1b6c195590b9e65a30a8fd98a2"
+            revision: "1695ee3ea2b7a249f6504c7f1759e7ec7a38eb86"
         ),
         // .package(
         //     url: "https://github.com/stackotter/TermKit",

Package.resolved

@@ -18,6 +18,28 @@ extension ForEach where Child == [MenuItem] {
     }
 }
 
+extension ForEach where Items == [Int] {
+    /// Creates a view that creates child views on demand based on a given ClosedRange
+    @_disfavoredOverload
+    public init(
+        _ range: ClosedRange<Int>,
+        child: @escaping (Int) -> Child
+    ) {
+        self.elements = Array(range)
+        self.child = child
+    }
+    
+    /// Creates a view that creates child views on demand based on a given Range
+    @_disfavoredOverload
+    public init(
+        _ range: Range<Int>,
+        child: @escaping (Int) -> Child
+    ) {
+        self.elements = Array(range)
+        self.child = child
+    }
+}
+
 extension ForEach: TypeSafeView, View where Child: View {
     typealias Children = ForEachViewChildren<Items, Child>
 

Package.swift

@@ -1,5 +1,6 @@
 import Foundation
 
+@available(tvOS, unavailable)
 public struct WebView: ElementaryView {
     @State var currentURL: URL?
     @Binding var url: URL

Sources/SwiftCrossUI/Views/ForEach.swift

@@ -59,6 +59,17 @@ final class TextFieldWidget: WrapperWidget<UITextField>, UITextFieldDelegate {
 
 final class TextEditorWidget: WrapperWidget<UITextView>, UITextViewDelegate {
     var onChange: ((String) -> Void)?
+    var isEditable: Bool = true {
+        didSet {
+            #if os(tvOS)
+                if !isEditable {
+                    child.resignFirstResponder()
+                }
+            #else
+                child.isEditable = isEditable
+            #endif
+        }
+    }
 
     init() {
         super.init(child: UITextView())
@@ -68,6 +79,10 @@ final class TextEditorWidget: WrapperWidget<UITextView>, UITextViewDelegate {
     func textViewDidChange(_: UITextView) {
         onChange?(child.text ?? "")
     }
+
+    func textViewShouldBeginEditing(_: UITextView) -> Bool {
+        return isEditable
+    }
 }
 
 #if os(tvOS)
@@ -332,10 +347,8 @@ extension UIKitBackend {
         onChange: @escaping (String) -> Void
     ) {
         let textEditorWidget = textEditor as! TextEditorWidget
-        //remove on merge, replace with beberka's solution
-        #if !os(tvOS)
-            textEditorWidget.child.isEditable = environment.isEnabled
-        #endif
+
+        textEditorWidget.isEditable = environment.isEnabled
         textEditorWidget.child.font = environment.resolvedFont.uiFont
         textEditorWidget.child.textColor = UIColor(color: environment.suggestedForegroundColor)
         textEditorWidget.onChange = onChange
@@ -451,7 +464,7 @@ extension UIKitBackend {
         }
     }
 
-    #if !os(tvOS)
+    #if os(iOS) || os(visionOS) || targetEnvironment(macCatalyst)
         public func createHoverTarget(wrapping child: Widget) -> Widget {
             HoverableWidget(child: child)
         }
@@ -464,9 +477,7 @@ extension UIKitBackend {
             let wrapper = hoverTarget as! HoverableWidget
             wrapper.hoverChangesHandler = action
         }
-    #endif
 
-    #if os(iOS) || os(visionOS) || targetEnvironment(macCatalyst)
         public func createSlider() -> Widget {
             SliderWidget()
         }