Skip to content

Commit 5442cee

Browse files
committed
WIP
1 parent 0f0d00c commit 5442cee

File tree

2 files changed

+24
-24
lines changed

2 files changed

+24
-24
lines changed

Examples/Showcase/Showcase.xcodeproj/project.pbxproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -203,8 +203,8 @@
203203
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
204204
GCC_WARN_UNUSED_FUNCTION = YES;
205205
GCC_WARN_UNUSED_VARIABLE = YES;
206-
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
207-
MACOSX_DEPLOYMENT_TARGET = 11.0;
206+
IPHONEOS_DEPLOYMENT_TARGET = 15.6;
207+
MACOSX_DEPLOYMENT_TARGET = 12.4;
208208
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
209209
MTL_FAST_MATH = YES;
210210
ONLY_ACTIVE_ARCH = YES;
@@ -215,8 +215,8 @@
215215
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
216216
SWIFT_STRICT_CONCURRENCY = complete;
217217
SWIFT_VERSION = 6.0;
218-
TVOS_DEPLOYMENT_TARGET = 13.0;
219-
XROS_DEPLOYMENT_TARGET = 1.0;
218+
TVOS_DEPLOYMENT_TARGET = 15.6;
219+
XROS_DEPLOYMENT_TARGET = 1.3;
220220
};
221221
name = Debug;
222222
};
@@ -265,8 +265,8 @@
265265
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
266266
GCC_WARN_UNUSED_FUNCTION = YES;
267267
GCC_WARN_UNUSED_VARIABLE = YES;
268-
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
269-
MACOSX_DEPLOYMENT_TARGET = 11.0;
268+
IPHONEOS_DEPLOYMENT_TARGET = 15.6;
269+
MACOSX_DEPLOYMENT_TARGET = 12.4;
270270
MTL_ENABLE_DEBUG_INFO = NO;
271271
MTL_FAST_MATH = YES;
272272
SDKROOT = iphoneos;
@@ -276,9 +276,9 @@
276276
SWIFT_OPTIMIZATION_LEVEL = "-O";
277277
SWIFT_STRICT_CONCURRENCY = complete;
278278
SWIFT_VERSION = 6.0;
279-
TVOS_DEPLOYMENT_TARGET = 13.0;
279+
TVOS_DEPLOYMENT_TARGET = 15.6;
280280
VALIDATE_PRODUCT = YES;
281-
XROS_DEPLOYMENT_TARGET = 1.0;
281+
XROS_DEPLOYMENT_TARGET = 1.3;
282282
};
283283
name = Release;
284284
};

Examples/Showcase/Showcase/ScrollView.swift

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import SwiftUI
22
import SwiftUIIntrospect
33

44
struct ScrollViewShowcase: View {
5-
@State var firstScrollViewFound: Bool = false
6-
@State var secondScrollViewFound: Bool = false
5+
@State var receiverScrollViewFound: Bool = false
6+
@State var ancestorScrollViewFound: Bool = false
77

88
var body: some View {
99
VStack(spacing: 40) {
@@ -23,23 +23,18 @@ struct ScrollViewShowcase: View {
2323
.padding(.horizontal, 12)
2424
.font(.system(.subheadline, design: .monospaced))
2525
}
26-
.background(Color(.cyan))
26+
.background {
27+
if receiverScrollViewFound {
28+
Color(.cyan)
29+
}
30+
}
2731
#if os(iOS) || os(tvOS) || os(visionOS)
2832
.introspect(
2933
.scrollView,
3034
on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18, .v26), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18, .v26), .visionOS(.v1, .v2, .v26)
31-
) { scrollView in
32-
scrollView.layer.backgroundColor = UIColor.cyan.cgColor
33-
scrollView.layer.cornerRadius = 12
34-
scrollView.clipsToBounds = true
35-
// scrollView.flashScrollIndicators()
36-
scrollView.bounces = false
35+
) { _ in
36+
receiverScrollViewFound = true
3737
}
38-
// .modifier {
39-
// if #available(iOS 16, tvOS 16, *) {
40-
// $0.scroll
41-
// }
42-
// }
4338
#elseif os(macOS)
4439
.introspect(.scrollView, on: .macOS(.v10_15, .v11, .v12, .v13, .v14, .v15, .v26)) { scrollView in
4540
scrollView.drawsBackground = true
@@ -59,8 +54,8 @@ struct ScrollViewShowcase: View {
5954
.scrollView,
6055
on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18, .v26), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18, .v26), .visionOS(.v1, .v2, .v26),
6156
scope: .ancestor
62-
) { scrollView in
63-
scrollView.layer.backgroundColor = UIColor.cyan.cgColor
57+
) { _ in
58+
ancestorScrollViewFound = true
6459
}
6560
#elseif os(macOS)
6661
.introspect(.scrollView, on: .macOS(.v10_15, .v11, .v12, .v13, .v14, .v15, .v26), scope: .ancestor) { scrollView in
@@ -69,6 +64,11 @@ struct ScrollViewShowcase: View {
6964
}
7065
#endif
7166
}
67+
.background {
68+
if ancestorScrollViewFound {
69+
Color(.cyan)
70+
}
71+
}
7272
}
7373
}
7474
}

0 commit comments

Comments
 (0)