Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

prefix extension properties #211

Merged
merged 2 commits into from
Aug 22, 2024
Merged

prefix extension properties #211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c1b21b6
prefix extension properties
yliu342 Aug 22, 2024
0d7c829
fix tests
yliu342 Aug 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Examples/CaseStudiesTests/NavigationStackTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ final class NavigationStackTests: XCTestCase {
ChildViewController(number: number)
}
try await setUp(controller: nav)
await assertEventuallyEqual(nav.hasViewAppeared, true)
await assertEventuallyEqual(nav._UIKitNavigation_hasViewAppeared, true)

withUITransaction(\.uiKit.disablesAnimations, true) {
path.append(1)
Expand Down
6 changes: 3 additions & 3 deletions Sources/UIKitNavigation/Navigation/Presentation.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@
item.wrappedValue = nil
}
}
childController.onDismiss = onDismiss
childController._UIKitNavigation_onDismiss = onDismiss
if #available(iOS 17, macOS 14, tvOS 17, watchOS 10, *) {
childController.traitOverrides.dismiss = UIDismissAction { _ in
onDismiss()
Expand All @@ -368,10 +368,10 @@
present(childController, transaction)
}
}
if hasViewAppeared {
if _UIKitNavigation_hasViewAppeared {
work()
} else {
onViewAppear.append(work)
_UIKitNavigation_onViewAppear.append(work)
}
} else if let presented = presentedByID[key] {
if let controller = presented.controller {
Expand Down
6 changes: 3 additions & 3 deletions Sources/UIKitNavigationShim/include/shim.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@

@interface UIViewController (UIKitNavigation)

@property BOOL hasViewAppeared;
@property (nullable) void (^onDismiss)();
@property NSArray<void(^)()> *onViewAppear;
@property BOOL _UIKitNavigation_hasViewAppeared;
@property (nullable) void (^_UIKitNavigation_onDismiss)();
@property NSArray<void(^)()> *_UIKitNavigation_onViewAppear;

@end

Expand Down
30 changes: 15 additions & 15 deletions Sources/UIKitNavigationShim/shim.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,56 +37,56 @@ + (void)load {
- (void)UIKitNavigation_viewDidAppear:(BOOL)animated {
[self UIKitNavigation_viewDidAppear:animated];

if (self.hasViewAppeared) {
if (self._UIKitNavigation_hasViewAppeared) {
return;
}
self.hasViewAppeared = YES;
for (void (^work)() in self.onViewAppear) {
self._UIKitNavigation_hasViewAppeared = YES;
for (void (^work)() in self._UIKitNavigation_onViewAppear) {
work();
}
self.onViewAppear = @[];
self._UIKitNavigation_onViewAppear = @[];
}

- (void)UIKitNavigation_viewDidDisappear:(BOOL)animated {
[self UIKitNavigation_viewDidDisappear:animated];

if ((self.isBeingDismissed || self.isMovingFromParentViewController) && self.onDismiss != NULL) {
if ((self.isBeingDismissed || self.isMovingFromParentViewController) && self._UIKitNavigation_onDismiss != NULL) {
if ([self isKindOfClass:UIAlertController.class]) {
dispatch_async(dispatch_get_main_queue(), ^{
self.onDismiss();
self.onDismiss = nil;
self._UIKitNavigation_onDismiss();
self._UIKitNavigation_onDismiss = nil;
});
} else {
self.onDismiss();
self.onDismiss = nil;
self._UIKitNavigation_onDismiss();
self._UIKitNavigation_onDismiss = nil;
}
}
}

- (BOOL)hasViewAppeared {
- (BOOL)_UIKitNavigation_hasViewAppeared {
return [objc_getAssociatedObject(self, hasViewAppearedKey) boolValue];
}

- (void)setHasViewAppeared:(BOOL)hasViewAppeared {
- (void)set_UIKitNavigation_hasViewAppeared:(BOOL)hasViewAppeared {
objc_setAssociatedObject(
self, hasViewAppearedKey, @(hasViewAppeared), OBJC_ASSOCIATION_COPY_NONATOMIC
);
}

- (void (^)())onDismiss {
- (void (^)())_UIKitNavigation_onDismiss {
return objc_getAssociatedObject(self, onDismissKey);
}

- (void)setOnDismiss:(void (^)())onDismiss {
- (void)set_UIKitNavigation_onDismiss:(void (^)())onDismiss {
objc_setAssociatedObject(self, onDismissKey, [onDismiss copy], OBJC_ASSOCIATION_COPY_NONATOMIC);
}

- (NSMutableArray<void (^)()> *)onViewAppear {
- (NSMutableArray<void (^)()> *)_UIKitNavigation_onViewAppear {
id onViewAppear = objc_getAssociatedObject(self, onViewAppearKey);
return onViewAppear == nil ? @[] : onViewAppear;
}

- (void)setOnViewAppear:(NSMutableArray<void (^)()> *)onViewAppear {
- (void)set_UIKitNavigation_onViewAppear:(NSMutableArray<void (^)()> *)onViewAppear {
objc_setAssociatedObject(self, onViewAppearKey, onViewAppear, OBJC_ASSOCIATION_COPY_NONATOMIC);
}

Expand Down