Skip to content

Fix selector handling in Objective-C shims #956

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

Merged
Kyle-Ye merged 2 commits into from
Jul 28, 2026
+7 −14
Merged

Fix selector handling in Objective-C shims #956

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
572249f
Fix UIFoundation selectors
Kyle-Ye Jul 28, 2026
5eeaafd
Fix UIKit selector dispatch
Kyle-Ye Jul 28, 2026
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
15 changes: 4 additions & 11 deletions Sources/COpenSwiftUI/Overlay/UIKit/OpenSwiftUI+UIApplication.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,15 @@
// Status: Complete

#include "OpenSwiftUI+UIApplication.h"
#include "Shims/OpenSwiftUIShims.h"

#if OPENSWIFTUI_TARGET_OS_IOS || OPENSWIFTUI_TARGET_OS_VISION
#include <objc/runtime.h>

UIContentSizeCategory _UIApplicationDefaultContentSizeCategory() {
typedef UIContentSizeCategory (*Func)(Class, SEL);
SEL selector = NSSelectorFromString(@"_defaultContentSizeCategory");
Func func = nil;
if ([UIApplication resolveClassMethod:selector]) {
IMP impl = class_getMethodImplementation(UIApplication.class, selector);
func = (Func)impl;
}
if (func == nil) {
return UIContentSizeCategoryLarge;
}
return func(UIApplication.class, selector);
Class self = UIApplication.class;
OPENSWIFTUI_SAFE_WRAPPER_IMP(UIContentSizeCategory, @"_defaultContentSizeCategory", UIContentSizeCategoryLarge);
return func(self, selector);
}

#endif /* OPENSWIFTUI_TARGET_OS_IOS || OPENSWIFTUI_TARGET_OS_VISION */
2 changes: 1 addition & 1 deletion Sources/COpenSwiftUI/Overlay/UIKit/OpenSwiftUITesting_Swizzles+UIKit.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ - (BOOL)_OpenSwiftUITesting_wantsWideContentMargins {
@implementation UICollectionView (OpenSwiftUITesting_Swizzles)
+ (void)_performOpenSwiftUITestingOverrides {
#if !OPENSWIFTUI_TARGET_OS_VISION
_SwizzleMethods(UIScreen.class, @selector(_viewAnimationsForCurrentUpdateWithCollectionViewAnimator:), @selector(_OpenSwiftUITesting__viewAnimationsForCurrentUpdateWithCollectionViewAnimator:));
_SwizzleMethods(UICollectionView.class, @selector(_viewAnimationsForCurrentUpdateWithCollectionViewAnimator:), @selector(_OpenSwiftUITesting__viewAnimationsForCurrentUpdateWithCollectionViewAnimator:));
#endif
}

Expand Down
4 changes: 2 additions & 2 deletions Sources/OpenSwiftUI_SPI/Shims/UIFoundation/NSAttributedString.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ - (instancetype)initOpenSwiftUIAttributedStringWithFormat:(NSAttributedString *)
}

- (NSAttributedString *)_ui_attributedSubstringFromRange_openswiftui_safe_wrapper:(NSRange)range scaledByScaleFactor:(CGFloat)factor {
OPENSWIFTUI_SAFE_WRAPPER_IMP(NSAttributedString *, @"_ui_attributedSubstringFromRange:scaledByScaleFactor", nil, NSRange, CGFloat);
OPENSWIFTUI_SAFE_WRAPPER_IMP(NSAttributedString *, @"_ui_attributedSubstringFromRange:scaledByScaleFactor:", nil, NSRange, CGFloat);

@augmentcode augmentcode Bot Jul 28, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This PR changes several runtime selector/swizzle strings without an accompanying regression test; because the safe wrappers return defaults when a selector is misspelled, another delimiter or target-class typo can pass the build and only surface as missing dynamic behavior. Other locations where this applies: Sources/OpenSwiftUI_SPI/Shims/UIFoundation/NSAttributedString.m:34, Sources/COpenSwiftUI/Overlay/UIKit/OpenSwiftUI+UIApplication.m:13, Sources/COpenSwiftUI/Overlay/UIKit/OpenSwiftUITesting_Swizzles+UIKit.m:33.

Severity: medium

🤖 Was this useful? React with 👍 or 👎

return func(self, selector, range, factor);
}

Expand All @@ -31,7 +31,7 @@ - (NSAttributedString *)_ui_attributedSubstringFromRange_openswiftui_safe_wrappe
@implementation NSMutableAttributedString (OpenSwiftUI_SPI)

- (BOOL)isEmptyOrTerminatedByParagraphSeparator_openswiftui_safe_wrapper {
OPENSWIFTUI_SAFE_WRAPPER_IMP(BOOL, @"isEmptyOrTerminatedByParagraphSeparator:scaledByScaleFactor", false);
OPENSWIFTUI_SAFE_WRAPPER_IMP(BOOL, @"isEmptyOrTerminatedByParagraphSeparator", false);
return func(self, selector);
}

Expand Down
Loading