Update private API usage on Darwin platform (#205)

* Update private header

* Update didMoveToWindow to UIHostingView

* Update shims private API wrapper

Author: Kyle-Ye

Sources/OpenSwiftUI/Integration/Hosting/UIKit/View/UIHostingView.swift

@@ -279,9 +279,28 @@ open class _UIHostingView<Content>: UIView, XcodeViewDebugDataProvider where Con
     }
 
     override dynamic open func didMoveToWindow() {
+        Update.begin()
+        if window != nil {
+            traitCollectionOverride = nil
+            initialInheritedEnvironment = nil
+            invalidateProperties(.transform)
+        }
+        // updateKeyboardAvoidance()
+        // eventBridge.hostingView(self, didMoveToWindow: window)
+        // TODO: rootViewDelegate
+        if window != nil {
+            updateRemovedState()
+            // updateEventBridge()
+        } else {
+            UIApplication.shared._performBlockAfterCATransactionCommits { [weak self] in
+                guard let self else { return }
+                updateRemovedState()
+            }
+        }
         // TODO
+        Update.end()
     }
-    
+
     override dynamic open func layoutSubviews() {
         super.layoutSubviews()
         guard window != nil else {

Sources/OpenSwiftUICore/Graph/GraphHost.swift

@@ -184,14 +184,7 @@ open class GraphHost: CustomReflectable {
             globalSubgraph.willInvalidate(isInserted: false)
             isInstantiated = false
         }
-        if let graph = data.graph {
-            Update.begin()
-            globalSubgraph.invalidate()
-            graph.context = nil
-            graph.invalidate()
-            data.graph = nil
-            Update.end()
-        }
+        data.invalidate()
     }
 
     package static var isUpdating: Bool {

Sources/OpenSwiftUI_SPI/README.md

@@ -1,3 +1,50 @@
 ## OpenSwiftUI_SPI
 
-TODO: module name - OpenSwiftUI_SPI
+### Shims
+
+For private Darwin ObjectiveC API, we use shims wrapped to replace the direct private API call to avoid breaking change.
+
+Below is an example of how to shim a private API call.
+
+```objectivec
+@interface UIApplication (OpenSwiftUI_SPI)
+- (void)_performBlockAfterCATransactionCommits_openswiftui_safe_wrapper:(void (^)(void))block OPENSWIFTUI_SWIFT_NAME(_performBlockAfterCATransactionCommits(_:));
+@end
+
+@implementation UIApplication (OpenSwiftUI_SPI)
+- (void)_performBlockAfterCATransactionCommits_openswiftui_safe_wrapper:(void (^)(void))block {
+    typedef void (*Func)(UIApplication *, SEL, void (^)(void));
+    SEL selector = NSSelectorFromString(@"_performBlockAfterCATransactionCommits:");
+    Func func = nil;
+    if ([self respondsToSelector:selector]) {
+        IMP impl = class_getMethodImplementation([self class], selector);
+        func = (Func)impl;
+    }
+    if (func != nil) {
+        func(self, selector, block);
+    }
+}
+@end
+```
+
+```swift
+extension UIApplication {
+    func _performBlockAfterCATransactionCommits(_ block: @escaping (Int) -> Void) {
+        typealias Function = @convention(c) (UIApplication, Selector, @escaping (Int) -> Void) -> Void
+
+        let selector = Selector(("_performBlockAfterCATransactionCommits:"))
+        guard responds(to: selector),
+              let implementation = class_getMethodImplementation(UIApplication.self, selector)
+        else {
+            return
+        }
+        let function = unsafeBitCast(implementation, to: Function.self)
+        return function(self, selector, block)
+    }
+}
+```
+
+TODO:
+- [ ] Add String concat helper macro to avoid selector name being detected.
+- [ ] Add static variable to avoid selector build.
+- [ ] Add static variable to avoid multiple method lookup.

Sources/OpenSwiftUI_SPI/Shims/AppKit/AppKit_Private.h

@@ -0,0 +1,28 @@
+//
+//  AppKit_Private.h
+//  OpenSwiftUI_SPI
+//
+//  Status: WIP
+
+#ifndef AppKit_Private_h
+#define AppKit_Private_h
+
+#include "OpenSwiftUIBase.h"
+
+#if __has_include(<AppKit/AppKit.h>)
+
+#import <AppKit/AppKit.h>
+
+OPENSWIFTUI_ASSUME_NONNULL_BEGIN
+
+@interface NSApplication (OpenSwiftUI_SPI)
+- (void)startedTest:(nullable NSString *)name;
+- (void)finishedTest:(nullable NSString *)name;
+- (void)failedTest:(nullable NSString *)name withFailure:(nullable NSError*)failure;
+@end
+
+OPENSWIFTUI_ASSUME_NONNULL_END
+
+#endif /* AppKit.h */
+
+#endif /* AppKit_Private_h */

Sources/OpenSwiftUI_SPI/Shims/AppKit/AppKit_Private.m

@@ -0,0 +1,8 @@
+//
+//  AppKit_Private.m
+//  OpenSwiftUI_SPI
+//
+//  Status: WIP
+
+#import "AppKit_Private.h"
+

Sources/OpenSwiftUI_SPI/Shims/CoreAnimation/CoreAnimation_Private.h

@@ -0,0 +1,26 @@
+//
+//  CoreAnimation_Private.h
+//  OpenSwiftUI_SPI
+//
+//  Status: WIP
+
+#ifndef CoreAnimation_Private_h
+#define CoreAnimation_Private_h
+
+#include "OpenSwiftUIBase.h"
+
+#if __has_include(<QuartzCore/CoreAnimation.h>)
+
+#import <QuartzCore/CoreAnimation.h>
+
+OPENSWIFTUI_ASSUME_NONNULL_BEGIN
+
+@interface CALayer (OpenSwiftUI_SPI)
+- (BOOL)hasBeenCommitted;
+@end
+
+OPENSWIFTUI_ASSUME_NONNULL_END
+
+#endif /* CoreAnimation.h */
+
+#endif /* CoreAnimation_Private_h */

Sources/OpenSwiftUI_SPI/Shims/CoreAnimation/CoreAnimation_Private.m

@@ -0,0 +1,7 @@
+//
+//  CoreAnimation_Private.m
+//  OpenSwiftUI_SPI
+//
+//  Status: WIP
+
+#import "CoreAnimation_Private.h"

Sources/OpenSwiftUI_SPI/Shims/UIKitAppKit_Private.h renamed to Sources/OpenSwiftUI_SPI/Shims/UIKit/UIKit_Private.h

@@ -1,40 +1,28 @@
 //
-//  UIKitAppKit_Private.h
+//  UIKit_Private.h
 //  OpenSwiftUI_SPI
 //
-//  Audited for iOS 15.5
 //  Status: WIP
 
-#ifndef UIKitAppKit_Private_h
-#define UIKitAppKit_Private_h
+#ifndef UIKit_Private_h
+#define UIKit_Private_h
 
 #include "OpenSwiftUIBase.h"
 
-#if __has_include(<QuartzCore/CoreAnimation.h>)
-
-#import <QuartzCore/CoreAnimation.h>
-
-OPENSWIFTUI_ASSUME_NONNULL_BEGIN
-
-@interface CALayer (OpenSwiftUI_SPI)
-- (BOOL)hasBeenCommitted;
-@end
-
-OPENSWIFTUI_ASSUME_NONNULL_END
-
-#endif /* CoreAnimation.h */
-
 #if __has_include(<UIKit/UIKit.h>)
 
 #import <UIKit/UIKit.h>
 
 OPENSWIFTUI_ASSUME_NONNULL_BEGIN
 
 @interface UIApplication (OpenSwiftUI_SPI)
+// Test API
 - (void)startedTest:(nullable NSString *)name;
 - (void)finishedTest:(nullable NSString *)name;
 - (void)failedTest:(nullable NSString *)name withFailure:(nullable NSError*)failure;
 - (nullable NSString *)_launchTestName;
+
+- (void)_performBlockAfterCATransactionCommits_openswiftui_safe_wrapper:(void (^)(void))block OPENSWIFTUI_SWIFT_NAME(_performBlockAfterCATransactionCommits(_:));
 @end
 
 @interface UIView (OpenSwiftUI_SPI)
@@ -53,20 +41,6 @@ double UIAnimationDragCoefficient(void);
 
 OPENSWIFTUI_ASSUME_NONNULL_END
 
-#elif __has_include(<AppKit/AppKit.h>)
-
-#import <AppKit/AppKit.h>
-
-OPENSWIFTUI_ASSUME_NONNULL_BEGIN
-
-@interface NSApplication (OpenSwiftUI_SPI)
-- (void)startedTest:(nullable NSString *)name;
-- (void)finishedTest:(nullable NSString *)name;
-- (void)failedTest:(nullable NSString *)name withFailure:(nullable NSError*)failure;
-@end
-
-OPENSWIFTUI_ASSUME_NONNULL_END
-
-#endif /* UIKit.h / AppKit.h */
+#endif /* UIKit.h */
 
-#endif /* UIKitAppKit_Private_h */
+#endif /* UIKit_Private_h */

Sources/OpenSwiftUI_SPI/Shims/UIKit/UIKit_Private.m

@@ -0,0 +1,28 @@
+//
+//  UIKit_Private.m
+//  OpenSwiftUI_SPI
+//
+//  Status: WIP
+
+#import "UIKit_Private.h"
+
+#if __has_include(<UIKit/UIKit.h>)
+
+#import <objc/runtime.h>
+
+@implementation UIApplication (OpenSwiftUI_SPI)
+- (void)_performBlockAfterCATransactionCommits_openswiftui_safe_wrapper:(void (^)(void))block {
+    typedef void (*Func)(UIApplication *, SEL, void (^)(void));
+    SEL selector = NSSelectorFromString(@"_performBlockAfterCATransactionCommits:");
+    Func func = nil;
+    if ([self respondsToSelector:selector]) {
+        IMP impl = class_getMethodImplementation([self class], selector);
+        func = (Func)impl;
+    }
+    if (func != nil) {
+        func(self, selector, block);
+    }
+}
+@end
+
+#endif /* UIKit.h */