Add safe NSValue geometry wrappers #862
+86
−3
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| // | ||
| // UIGeometry.h | ||
| // OpenSwiftUI_SPI | ||
|
|
||
| #pragma once | ||
|
|
||
| #include "OpenSwiftUIBase.h" | ||
|
|
||
| #if OPENSWIFTUI_TARGET_OS_DARWIN | ||
|
|
||
| #import <CoreGraphics/CoreGraphics.h> | ||
| #import <Foundation/Foundation.h> | ||
|
|
||
| OPENSWIFTUI_ASSUME_NONNULL_BEGIN | ||
|
|
||
| @interface NSValue (OpenSwiftUI_UIGeometry) | ||
|
|
||
| + (NSValue *)valueWithCGPoint_openswiftui_safe_wrapper:(CGPoint)point OPENSWIFTUI_SWIFT_NAME(init(cgPoint:)); | ||
| + (NSValue *)valueWithCGSize_openswiftui_safe_wrapper:(CGSize)size OPENSWIFTUI_SWIFT_NAME(init(cgSize:)); | ||
| + (NSValue *)valueWithCGRect_openswiftui_safe_wrapper:(CGRect)rect OPENSWIFTUI_SWIFT_NAME(init(cgRect:)); | ||
|
|
||
| @end | ||
|
|
||
| OPENSWIFTUI_ASSUME_NONNULL_END | ||
|
|
||
| #endif /* OPENSWIFTUI_TARGET_OS_DARWIN */ | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| // | ||
| // UIGeometry.m | ||
| // OpenSwiftUI_SPI | ||
|
|
||
| #import "UIGeometry.h" | ||
|
|
||
| #if OPENSWIFTUI_TARGET_OS_DARWIN | ||
|
|
||
| #import <objc/runtime.h> | ||
|
|
||
| OPENSWIFTUI_ASSUME_NONNULL_BEGIN | ||
|
|
||
| @implementation NSValue (OpenSwiftUI_UIGeometry) | ||
|
|
||
| + (NSValue *)valueWithCGPoint_openswiftui_safe_wrapper:(CGPoint)point { | ||
| SEL selector = NSSelectorFromString(@"valueWithCGPoint:"); | ||
| if ([self respondsToSelector:selector]) { | ||
| typedef NSValue *(*Func)(id, SEL, CGPoint); | ||
| Func func = (Func)class_getMethodImplementation(object_getClass(self), selector); | ||
| if (func != nil) { | ||
| return func(self, selector, point); | ||
| } | ||
| } | ||
| return [self valueWithBytes:&point objCType:@encode(CGPoint)]; | ||
| } | ||
|
|
||
| + (NSValue *)valueWithCGSize_openswiftui_safe_wrapper:(CGSize)size { | ||
| SEL selector = NSSelectorFromString(@"valueWithCGSize:"); | ||
| if ([self respondsToSelector:selector]) { | ||
| typedef NSValue *(*Func)(id, SEL, CGSize); | ||
| Func func = (Func)class_getMethodImplementation(object_getClass(self), selector); | ||
| if (func != nil) { | ||
| return func(self, selector, size); | ||
| } | ||
| } | ||
| return [self valueWithBytes:&size objCType:@encode(CGSize)]; | ||
| } | ||
|
|
||
| + (NSValue *)valueWithCGRect_openswiftui_safe_wrapper:(CGRect)rect { | ||
| SEL selector = NSSelectorFromString(@"valueWithCGRect:"); | ||
| if ([self respondsToSelector:selector]) { | ||
| typedef NSValue *(*Func)(id, SEL, CGRect); | ||
| Func func = (Func)class_getMethodImplementation(object_getClass(self), selector); | ||
| if (func != nil) { | ||
| return func(self, selector, rect); | ||
| } | ||
| } | ||
| return [self valueWithBytes:&rect objCType:@encode(CGRect)]; | ||
| } | ||
|
|
||
| @end | ||
|
|
||
| OPENSWIFTUI_ASSUME_NONNULL_END | ||
|
|
||
| #endif /* OPENSWIFTUI_TARGET_OS_DARWIN */ |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
valueWithCGPoint_openswiftui_safe_wrapper/valueWithCGSize_openswiftui_safe_wrapper/valueWithCGRect_openswiftui_safe_wrapperlook like Swift-mapped initializers; consider returninginstancetypeinstead ofNSValue *so Swift imports them as returningSelf(and it stays correct ifNSValueis subclassed/class-clustered).Severity: low
🤖 Was this useful? React with 👍 or 👎, or 🚀 if it prevented an incident/outage.