Fix SPM

Automatically discover `LNPopupImageView` views inside popup content controllers
Introduce `LNPopupTransitionView` protocol
Rename `LNPopupShadowedImageView` to `LNPopupImageView`

Author: LeoNatan

LNPCSwiftRefinements/SwiftRefinements.swift

@@ -16,7 +16,8 @@ import SwiftUI
 
 @_cdecl("__ln_doNotCall__fixUIHostingViewHitTest")
 @_spi(LNPopupControllerInternal)
-public func __ln_doNotCall__fixUIHostingViewHitTest() {
+public
+func __ln_doNotCall__fixUIHostingViewHitTest() {
 	DispatchQueue.main.async {
 		guard let view = UIHostingController(rootView: EmptyView()).view else {
 			return
@@ -50,14 +51,16 @@ public func __ln_doNotCall__fixUIHostingViewHitTest() {
 }
 #endif
 
-public extension Double {
+public
+extension Double {
 	/// The default popup snap percent. See `LNPopupInteractionStyle.customizedSnap(percent:)` for more information.
 	static var defaultPopupSnapPercent: Double {
 		return __LNSnapPercentDefault
 	}
 }
 
-public extension UIViewController {
+public
+extension UIViewController {
 	/// Available interaction styles with the popup bar and popup content view.
 	enum PopupInteractionStyle {
 		/// The default interaction style for the current environment.
@@ -121,7 +124,8 @@ public extension UIViewController {
 	}
 }
 
-public extension LNPopupItem {
+public
+extension LNPopupItem {
 	/// The popup item's attributed title.
 	///
 	/// If no title or subtitle is set, the system will use the view controller's title.
@@ -147,7 +151,8 @@ public extension LNPopupItem {
 	}
 }
 
-public extension LNPopupBarAppearance {
+public
+extension LNPopupBarAppearance {
 	/// Display attributes for the popup bar’s title text.
 	///
 	/// Only attributes from the UIKit scope are supported.
@@ -175,7 +180,8 @@ public extension LNPopupBarAppearance {
 	}
 }
 
-public extension UIViewController {
+public
+extension UIViewController {
 	/// Presents an interactive popup bar in the receiver's view hierarchy and optionally opens the popup in the same animation. The popup bar is attached to the receiver's docking view.
 	///
 	/// You may call this method multiple times with different controllers, triggering replacement to the popup content view and update to the popup bar, if popup is open or bar presented, respectively.

LNPopupController/LNPopupController.xcodeproj/project.pbxproj

@@ -11,7 +11,7 @@
 #import <LNPopupController/LNPopupItem.h>
 #import <LNPopupController/LNPopupCustomBarViewController.h>
 #import <LNPopupController/LNPopupBarAppearance.h>
-#import <LNPopupController/LNPopupShadowedImageView.h>
+#import <LNPopupController/LNPopupImageView.h>
 
 #define LN_UNAVAILABLE_PREVIEWING_MSG "Add context menu interaction or register for previewing directly on the popup bar view."
 
@@ -74,7 +74,7 @@ NS_SWIFT_UI_ACTOR
 @property (nullable, nonatomic, copy, readonly) NSArray<UIBarButtonItem*>* trailingBarButtonItems;
 
 /// An image view displayed when the bar style is prominent. (read-only)
-@property (nonatomic, strong, readonly) LNPopupShadowedImageView* imageView;
+@property (nonatomic, strong, readonly) LNPopupImageView* imageView;
 
 /// The popup bar style.
 @property (nonatomic, assign) LNPopupBarStyle barStyle UI_APPEARANCE_SELECTOR;

LNPopupController/LNPopupController/LNPopupBar.h

@@ -1,5 +1,5 @@
 //
-//  LNPopupShadowedImageView.h
+//  LNPopupImageView.h
 //  LNPopupController
 //
 //  Created by Léo Natan on 2025-03-24.
@@ -15,7 +15,7 @@ NS_ASSUME_NONNULL_BEGIN
 /// When used inside a popup content view, instances of this class are especially suited as image transition targets.
 ///
 /// See `UIViewController.viewForPopupTransition(from:to:)`.
-@interface LNPopupShadowedImageView : UIImageView
+@interface LNPopupImageView : UIImageView
 
 /// The corner radius of the image view.
 @property (nonatomic, assign) CGFloat cornerRadius;

LNPopupController/LNPopupController/LNPopupShadowedImageView.h renamed to LNPopupController/LNPopupController/LNPopupImageView.h

@@ -12,7 +12,7 @@
 #import "_LNPopupSwizzlingUtils.h"
 #import "_LNPopupBase64Utils.hh"
 #import "NSAttributedString+LNPopupSupport.h"
-#import "LNPopupShadowedImageView+Private.h"
+#import "LNPopupImageView+Private.h"
 #import "UIView+LNPopupSupportPrivate.h"
 
 #ifdef DEBUG
@@ -296,7 +296,7 @@ @implementation LNPopupBar
 {
 	BOOL _delaysBarButtonItemLayout;
 
-	LNPopupShadowedImageView* _imageView;
+	LNPopupImageView* _imageView;
 
 	_LNPopupBarTitlesView* _titlesView;
 	NSLayoutConstraint* _titlesViewLeadingConstraint;
@@ -518,7 +518,7 @@ - (nonnull instancetype)initWithFrame:(CGRect)frame
 
 		_needsLabelsLayout = YES;
 
-		_imageView = [[LNPopupShadowedImageView alloc] initWithContainingPopupBar:self];;
+		_imageView = [[LNPopupImageView alloc] initWithContainingPopupBar:self];;
 		_imageView.autoresizingMask = UIViewAutoresizingNone;
 		_imageView.contentMode = UIViewContentModeScaleAspectFit;
 		_imageView.accessibilityTraits = UIAccessibilityTraitImage;

LNPopupController/LNPopupController/Private/LNPopupBar.mm

@@ -383,9 +383,9 @@ - (void)animateOpenTransitionIfNeededWithAnimator:(UIViewPropertyAnimator*)anima
 	}
 
 	_LNPopupTransitionOpenAnimator* handler;
-	if([userView isKindOfClass:LNPopupShadowedImageView.class])
+	if([userView conformsToProtocol:@protocol(LNPopupTransitionView)])
 	{
-		handler = [[_LNPopupTransitionPreferredOpenAnimator alloc] initWithUserView:(LNPopupShadowedImageView*)userView popupBar:self.popupBar popupContentView:self.popupContentView];
+		handler = [[_LNPopupTransitionPreferredOpenAnimator alloc] initWithUserView:(LNPopupImageView*)userView popupBar:self.popupBar popupContentView:self.popupContentView];
 	}
 	else
 	{
@@ -404,7 +404,7 @@ - (void)animateCloseTransitionIfNeededWithAnimator:(UIViewPropertyAnimator*)anim
 
 	_LNPopupTransitionCloseAnimator* handler;
 
-	if([userView isKindOfClass:LNPopupShadowedImageView.class])
+	if([userView conformsToProtocol:@protocol(LNPopupTransitionView)])
 	{
 		handler = [[_LNPopupTransitionPreferredCloseAnimator alloc] initWithUserView:userView popupBar:self.popupBar popupContentView:self.popupContentView currentContentController:self.currentContentController containerController:self.containerController];
 	}

LNPopupController/LNPopupController/Private/LNPopupController.mm

@@ -1,17 +1,17 @@
 //
-//  LNPopupShadowedImageView+Private.h
+//  LNPopupImageView+Private.h
 //  LNPopupController
 //
 //  Created by Léo Natan on 2025-03-24.
 //  Copyright © 2015-2025 Léo Natan. All rights reserved.
 //
 
-#import "LNPopupShadowedImageView.h"
+#import <LNPopupController/LNPopupImageView.h>
 #import "LNPopupBar+Private.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface LNPopupShadowedImageView ()
+@interface LNPopupImageView ()
 
 - (instancetype)initWithContainingPopupBar:(LNPopupBar*)popupBar;
 

LNPopupController/LNPopupController/Private/LNPopupShadowedImageView+Private.h renamed to LNPopupController/LNPopupController/Private/LNPopupImageView+Private.h

@@ -1,12 +1,15 @@
 //
-//  LNPopupShadowedImageView.m
+//  LNPopupImageView.mm
 //  LNPopupController
 //
 //  Created by Léo Natan on 2025-03-24.
 //  Copyright © 2015-2025 Léo Natan. All rights reserved.
 //
 
-#import "LNPopupShadowedImageView+Private.h"
+#import "LNPopupImageView+Private.h"
+#import "_LNPopupBase64Utils.hh"
+#import "UIViewController+LNPopupSupportPrivate.h"
+#import <LNPopupController/UIViewController+LNPopupSupport.h>
 
 @interface _LNPopupBarImageContentLayer: CALayer @end
 @implementation _LNPopupBarImageContentLayer
@@ -36,12 +39,20 @@ - (instancetype)init
 		_imageContentsLayer = [_LNPopupBarImageContentLayer layer];
 		_imageContentsLayer.masksToBounds = YES;
 		_imageContentsLayer.cornerCurve = kCACornerCurveContinuous;
-		[self addSublayer:_imageContentsLayer];
+		[super addSublayer:_imageContentsLayer];
 	}
 
 	return self;
 }
 
+- (void)addSublayer:(CALayer *)layer
+{
+	layer.masksToBounds = YES;
+	layer.cornerCurve = kCACornerCurveContinuous;
+	layer.cornerRadius = _imageContentsLayer.cornerRadius;
+	[super addSublayer:layer];
+}
+
 - (void)layoutSublayers
 {
 	[super layoutSublayers];
@@ -50,28 +61,29 @@ - (void)layoutSublayers
 
 - (void)setCornerRadius:(CGFloat)cornerRadius
 {
-	[(LNPopupShadowedImageView*)self.delegate setCornerRadius:cornerRadius];
+	[(LNPopupImageView*)self.delegate setCornerRadius:cornerRadius];
 }
 
 - (void)setSuperCornerRadius:(CGFloat)cornerRadius
 {
-//	super.cornerRadius = cornerRadius;
 	_imageContentsLayer.cornerRadius = cornerRadius;
+	for(CALayer* sublayer in self.sublayers)
+	{
+		if(sublayer != _imageContentsLayer)
+		{
+			sublayer.cornerRadius = cornerRadius;
+		}
+	}
 }
 
 - (void)setContents:(id)contents
 {
 	[_imageContentsLayer setContents:contents];
 }
 
-//- (void)setMasksToBounds:(BOOL)masksToBounds
-//{
-//	NSLog(@"Fuck off!");
-//}
-
 @end
 
-@implementation LNPopupShadowedImageView
+@implementation LNPopupImageView
 {
 	__weak LNPopupBar* _containingBar;
 }
@@ -200,4 +212,24 @@ - (void)setImage:(UIImage *)image
 	}
 }
 
+- (void)didMoveToWindow
+{
+	if(self.window == nil || _containingBar != nil)
+	{
+		return;
+	}
+	
+	static NSString* vCFA = LNPopupHiddenString("_viewControllerForAncestor");
+	
+	UIViewController* candidate = [self valueForKey:vCFA];
+	candidate.ln_discoveredTransitionView = self;
+}
+
+- (NSString *)description
+{
+	return [NSString stringWithFormat:@"%@ cornerRadius: %@ shadow: %@", super.description, @(self.cornerRadius), self.shadow];
+}
+
 @end
+
+@implementation LNPopupImageView (TransitionSupport) @end

LNPopupController/LNPopupController/Private/LNPopupShadowedImageView.m renamed to LNPopupController/LNPopupController/Private/LNPopupImageView.mm

@@ -292,7 +292,6 @@ - (NSArray*)_ln_rSTTV
 	NSArray* rv = [self _ln_rSTTV];
 	NSMutableArray* popupRV = [NSMutableArray new];
 
-	//_viewControllerForAncestor
 	static NSString* vCFA = LNPopupHiddenString("_viewControllerForAncestor");
 
 	for(UIView* scrollToTopCandidate in rv)

LNPopupController/LNPopupController/Private/UIView+LNPopupSupportPrivate.mm

@@ -31,7 +31,7 @@
 #pragma clang diagnostic ignored "-Wincomplete-implementation"
 @implementation UIViewController (LNPopupSupportPrivate)
 
-@dynamic ln_popupController, popupPresentationContainerViewController, popupContentViewController, bottomBarSupport;
+@dynamic ln_popupController, popupPresentationContainerViewController, popupContentViewController, bottomBarSupport, ln_discoveredTransitionView;
 
 @end
 #pragma clang diagnostic pop
@@ -276,7 +276,7 @@ - (BOOL)positionPopupCloseButton:(LNPopupCloseButton*)popupCloseButton
 
 - (nullable UIView*)viewForPopupTransitionFromPresentationState:(LNPopupPresentationState)fromState toPresentationState:(LNPopupPresentationState)toState
 {
-	return nil;
+	return self._ln_discoveredTransitionView;
 }
 
 - (void)viewWillMoveToPopupContainerContentView:(LNPopupContentView *)popupContentView
@@ -346,6 +346,28 @@ - (void)setAllowPopupHapticFeedbackGeneration:(BOOL)allowPopupHapticFeedbackGene
 	self._ln_popupController.wantsFeedbackGeneration = allowPopupHapticFeedbackGeneration;
 }
 
+static const void* _LNPopupContentControllerDiscoveredTransitionView = &_LNPopupContentControllerDiscoveredTransitionView;
+
+- (void)_ln_setDiscoveredTransitionView:(LNPopupImageView *)ln_discoveredShadowedImageView
+{
+	id objToSet = nil;
+	if(ln_discoveredShadowedImageView != nil)
+	{
+		objToSet = [_LNWeakRef refWithObject:ln_discoveredShadowedImageView];
+	}
+	objc_setAssociatedObject(self, _LNPopupContentControllerDiscoveredTransitionView, objToSet, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+}
+
+- (LNPopupImageView *)_ln_discoveredTransitionView
+{
+	_LNWeakRef* rv = objc_getAssociatedObject(self, _LNPopupContentControllerDiscoveredTransitionView);
+	if(rv != nil && rv.object == nil)
+	{
+		[self _ln_setDiscoveredTransitionView:nil];
+	}
+	return rv.object;
+}
+
 @end
 
 @implementation UIViewController (LNCustomContainerPopupSupport)

LNPopupController/LNPopupController/Private/UIViewController+LNPopupSupport.mm

@@ -80,6 +80,7 @@ void _LNPopupSupportSetPopupInsetsForViewController(UIViewController* controller
 - (BOOL)_ln_isObjectFromSwiftUI;
 
 - (BOOL)_ln_shouldPopupContentViewFadeForTransition;
+@property (nullable, nonatomic, weak, setter=_ln_setDiscoveredTransitionView:, getter=_ln_discoveredTransitionView) LNPopupImageView* ln_discoveredTransitionView;
 
 @end
 

LNPopupController/LNPopupController/Private/UIViewController+LNPopupSupportPrivate.h

@@ -484,21 +484,6 @@ - (void)_ln_willTransitionToTraitCollection:(UITraitCollection *)newCollection w
 	}
 }
 
-- (UIViewController*)_findAncestorParentPopupContainerController
-{
-	if(self._ln_popupController_nocreate)
-	{
-		return self;
-	}
-	
-	if(self.parentViewController == nil)
-	{
-		return nil;
-	}
-	
-	return [self.parentViewController _findAncestorParentPopupContainerController];
-}
-
 - (UIViewController*)_findChildInPopupPresentation
 {
 	if(self._ln_popupController_nocreate)

LNPopupController/LNPopupController/Private/UIViewController+LNPopupSupportPrivate.mm

@@ -7,12 +7,13 @@
 //
 
 #import "_LNPopupTransitionCloseAnimator.h"
+#import <LNPopupController/UIViewController+LNPopupSupport.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
 @interface _LNPopupTransitionPreferredCloseAnimator : _LNPopupTransitionCloseAnimator
 
-@property (nonatomic, strong, readonly) LNPopupShadowedImageView* view;
+@property (nonatomic, strong, readonly) UIView<LNPopupTransitionView>* view;
 
 @end
 

LNPopupController/LNPopupController/Private/TransitionAnimators/_LNPopupTransitionAnimator.h renamed to LNPopupController/LNPopupController/Private/_LNPopupTransitionAnimator.h

@@ -7,13 +7,13 @@
 //
 
 #import "_LNPopupTransitionOpenAnimator.h"
-#import <LNPopupController/LNPopupShadowedImageView.h>
+#import <LNPopupController/UIViewController+LNPopupSupport.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
 @interface _LNPopupTransitionPreferredOpenAnimator : _LNPopupTransitionOpenAnimator
 
-@property (nonatomic, strong, readonly) LNPopupShadowedImageView* view;
+@property (nonatomic, strong, readonly) UIView<LNPopupTransitionView>* view;
 
 @end