Skip to content

Commit c405714

Browse files
authored
Add GestureDebug.ChildrenBox and implement GesturePhase.descriptionWithoutValue (#375)
1 parent 10f48dc commit c405714

File tree

3 files changed

+26
-12
lines changed

3 files changed

+26
-12
lines changed

Sources/OpenSwiftUICore/Event/Gesture/GestureDebug.swift

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ package enum GestureDebug {
2020
case combiner
2121
}
2222

23+
private enum ChildrenBox {
24+
indirect case value(Data.Children)
25+
}
26+
2327
package struct Data {
2428
package var kind: GestureDebug.Kind
2529
package var type: any Any.Type
@@ -28,7 +32,7 @@ package enum GestureDebug {
2832
package var resetSeed: UInt32
2933
package var frame: CGRect
3034
package var properties: GestureDebug.Properties
31-
// private var childrenBox: GestureDebug.ChildrenBox
35+
private var childrenBox: GestureDebug.ChildrenBox
3236

3337
package typealias Children = ArrayWith2Inline<GestureDebug.Data>
3438

@@ -45,6 +49,7 @@ package enum GestureDebug {
4549
resetSeed = 0
4650
frame = .zero
4751
properties = .init()
52+
childrenBox = .value([]) // FIXME
4853
}
4954

5055
package init(
@@ -169,17 +174,26 @@ extension _GestureOutputs {
169174
}
170175
}
171176

172-
@_spi(ForSwiftUIOnly)
177+
@_spi(ForOpenSwiftUIOnly)
173178
extension GesturePhase {
174-
@_spi(ForSwiftUIOnly)
175179
package var descriptionWithoutValue: String {
176-
@_spi(ForSwiftUIOnly)
177-
get { _openSwiftUIUnimplementedFailure() }
180+
switch self {
181+
case let .possible(value): value == nil ? "" : "possible(some)"
182+
case .active: "active"
183+
case .ended: "ended"
184+
case .failed: "failed"
185+
}
178186
}
179187
}
180188

181189
extension GestureDebug.Data {
182190
package func printTree() {
183191
_openSwiftUIUnimplementedFailure()
184192
}
193+
194+
private typealias Indent = String
195+
196+
private func printSubtree(parent: GestureDebug.Data?, indent: Indent) {
197+
_openSwiftUIUnimplementedFailure()
198+
}
185199
}

Sources/OpenSwiftUICore/Event/Gesture/GesturePhase.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
// MARK: - GesturePhase [6.5.4]
88

9-
@_spi(ForOnlySwiftUIOnly)
9+
@_spi(ForOpenSwiftUIOnly)
1010
@available(OpenSwiftUI_v6_0, *)
1111
public enum GesturePhase<Wrapped> {
1212
case possible(Wrapped?)
@@ -15,14 +15,14 @@ public enum GesturePhase<Wrapped> {
1515
case failed
1616
}
1717

18-
@_spi(ForOnlySwiftUIOnly)
18+
@_spi(ForOpenSwiftUIOnly)
1919
@available(*, unavailable)
2020
extension GesturePhase: Sendable {}
2121

22-
@_spi(ForOnlySwiftUIOnly)
22+
@_spi(ForOpenSwiftUIOnly)
2323
extension GesturePhase: Equatable where Wrapped: Equatable {}
2424

25-
@_spi(ForOnlySwiftUIOnly)
25+
@_spi(ForOpenSwiftUIOnly)
2626
extension GesturePhase {
2727
package var unwrapped: Wrapped? {
2828
switch self {
@@ -84,14 +84,14 @@ extension GesturePhase {
8484

8585
// MARK: - GesturePhase + Defaultable [6.5.4]
8686

87-
@_spi(ForOnlySwiftUIOnly)
87+
@_spi(ForOpenSwiftUIOnly)
8888
extension GesturePhase: Defaultable {
8989
package static var defaultValue: GesturePhase<Wrapped> { .failed }
9090
}
9191

9292
// MARK: - GestureCategory + Defaultable [6.5.4]
9393

94-
@_spi(ForOnlySwiftUIOnly)
94+
@_spi(ForOpenSwiftUIOnly)
9595
extension GestureCategory: Defaultable {
9696
package static var defaultValue: GestureCategory { .magnify }
9797
}

Sources/OpenSwiftUICore/Event/Responder/ViewResponder.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ open class ViewResponder: ResponderNode, CustomStringConvertible/*, CustomRecurs
5151

5252
final package weak var parent: ViewResponder? = nil {
5353
willSet {
54-
guard let parent, newValue == nil else {
54+
guard parent != nil, newValue == nil else {
5555
return
5656
}
5757
guard let host, let eventGraphHost = host.as(EventGraphHost.self) else {

0 commit comments

Comments
 (0)