Consolidate presentation logic to ensure style configuration is applied

mats-stripe · mats-stripe · commit dba79ce65f68 · 2025-01-30T15:48:58.000-05:00
diff --git a/StripeFinancialConnections/StripeFinancialConnections.xcodeproj/project.pbxproj b/StripeFinancialConnections/StripeFinancialConnections.xcodeproj/project.pbxproj
@@ -63,6 +63,8 @@
 		492651682C25C0C2001DDBCA /* info@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 492651672C25C0C2001DDBCA /* info@3x.png */; };
 		49424EB02D48050A0088F3D9 /* WebPrefillDetails.swift in Sources */ = {isa = PBXBuildFile; fileRef = 49424EAF2D48050A0088F3D9 /* WebPrefillDetails.swift */; };
 		494D62072C45B9B700106519 /* link_logo@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 494D62062C45B9B700106519 /* link_logo@3x.png */; };
+		4964F13A2D4C114800EE6BC9 /* PresentationManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4964F1392D4C114800EE6BC9 /* PresentationManager.swift */; };
+		4964F13C2D4C14D100EE6BC9 /* PresentationManagerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4964F13B2D4C14D100EE6BC9 /* PresentationManagerTests.swift */; };
 		496A6AE72C29E0BB00D34F8E /* testmode@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 496A6AE62C29E0BB00D34F8E /* testmode@3x.png */; };
 		497142BC2C514B08000DFA64 /* FlowRouterTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 497142BB2C514B08000DFA64 /* FlowRouterTests.swift */; };
 		499EEAFD2D3E948B00E1BE85 /* FinancialConnectionsAPIClientLogger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 499EEAFC2D3E948B00E1BE85 /* FinancialConnectionsAPIClientLogger.swift */; };
@@ -330,6 +332,8 @@
 		492651672C25C0C2001DDBCA /* info@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "info@3x.png"; sourceTree = "<group>"; };
 		49424EAF2D48050A0088F3D9 /* WebPrefillDetails.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebPrefillDetails.swift; sourceTree = "<group>"; };
 		494D62062C45B9B700106519 /* link_logo@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "link_logo@3x.png"; sourceTree = "<group>"; };
+		4964F1392D4C114800EE6BC9 /* PresentationManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PresentationManager.swift; sourceTree = "<group>"; };
+		4964F13B2D4C14D100EE6BC9 /* PresentationManagerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PresentationManagerTests.swift; sourceTree = "<group>"; };
 		496A6AE62C29E0BB00D34F8E /* testmode@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "testmode@3x.png"; sourceTree = "<group>"; };
 		497142BB2C514B08000DFA64 /* FlowRouterTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FlowRouterTests.swift; sourceTree = "<group>"; };
 		499EEAFC2D3E948B00E1BE85 /* FinancialConnectionsAPIClientLogger.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FinancialConnectionsAPIClientLogger.swift; sourceTree = "<group>"; };
@@ -1044,6 +1048,7 @@
 				49F047522C63B430006BAD3E /* StripeSchemeAddress.swift */,
 				49424EAF2D48050A0088F3D9 /* WebPrefillDetails.swift */,
 				49F883F72D496D7A00A104B0 /* ExperimentStore.swift */,
+				4964F1392D4C114800EE6BC9 /* PresentationManager.swift */,
 			);
 			path = Shared;
 			sourceTree = "<group>";
@@ -1098,6 +1103,7 @@
 				CF731140836AE438C7F4F6AB /* StringExtensionsTests.swift */,
 				497142BB2C514B08000DFA64 /* FlowRouterTests.swift */,
 				492039942CA4972B00CE2072 /* FinancialConnectionsWebFlowTests.swift */,
+				4964F13B2D4C14D100EE6BC9 /* PresentationManagerTests.swift */,
 			);
 			path = StripeFinancialConnectionsTests;
 			sourceTree = "<group>";
@@ -1481,6 +1487,7 @@
 				6A78141C2B462D5D00168992 /* LegalDetailsNoticeViewController.swift in Sources */,
 				6A7814112B32462100168992 /* CloseConfirmationViewController.swift in Sources */,
 				AB7C9A26484953762FFBB4A5 /* FinancialConnectionsWebFlowViewController.swift in Sources */,
+				4964F13A2D4C114800EE6BC9 /* PresentationManager.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1500,6 +1507,7 @@
 				846D1D7429B9E414744DEC99 /* FinancialConnectionsSheetTests.swift in Sources */,
 				C19996D0AC7E046DA87B6B32 /* ManualEntryValidatorTests.swift in Sources */,
 				779C729BB49FD4B99DCD517B /* MarkdownBoldAttributedStringTests.swift in Sources */,
+				4964F13C2D4C14D100EE6BC9 /* PresentationManagerTests.swift in Sources */,
 				49A0B5862C5D2F3C00D697D9 /* FinancialConnectionsAPIClientTests.swift in Sources */,
 				BF5F964E1CA6312755D4161E /* SessionFetcherTests.swift in Sources */,
 				ED818E10F37230678B9B73CC /* SoftLinkTests.swift in Sources */,
diff --git a/StripeFinancialConnections/StripeFinancialConnections/Source/FinancialConnectionsSheet.swift b/StripeFinancialConnections/StripeFinancialConnections/Source/FinancialConnectionsSheet.swift
@@ -118,7 +118,11 @@ final public class FinancialConnectionsSheet {
     private var wrapperViewController: ModalPresentationWrapperViewController?
 
     /// Contains all configurable properties of Financial Connections.
-    @_spi(STP) public var configuration: FinancialConnectionsSheet.Configuration = .init()
+    @_spi(STP) public var configuration: FinancialConnectionsSheet.Configuration = .init() {
+        didSet {
+            PresentationManager.shared.configuration = configuration
+        }
+    }
 
     /// Any additional Elements context useful for the Financial Connections SDK.
     @_spi(STP) public var elementsSessionContext: StripeCore.ElementsSessionContext?
@@ -303,7 +307,7 @@ final public class FinancialConnectionsSheet {
             toPresent = wrapperViewController!
             animated = false
         }
-        presentingViewController.present(toPresent, animated: animated, completion: nil)
+        PresentationManager.shared.present(toPresent, from: presentingViewController, animated: animated)
     }
 }
 
diff --git a/StripeFinancialConnections/StripeFinancialConnections/Source/Native/Shared/ExperimentStore.swift b/StripeFinancialConnections/StripeFinancialConnections/Source/Native/Shared/ExperimentStore.swift
@@ -16,4 +16,9 @@ import Foundation
 
     @_spi(STP) public var useAsyncAPIClient: Bool = false
     @_spi(STP) public var supportsDynamicStyle: Bool = false
+
+    @_spi(STP) public func reset() {
+        useAsyncAPIClient = false
+        supportsDynamicStyle = false
+    }
 }
diff --git a/StripeFinancialConnections/StripeFinancialConnections/Source/Native/Shared/PresentationManager.swift b/StripeFinancialConnections/StripeFinancialConnections/Source/Native/Shared/PresentationManager.swift
@@ -0,0 +1,25 @@
+//
+//  PresentationManager.swift
+//  StripeFinancialConnections
+//
+//  Created by Mat Schmid on 2025-01-30.
+//
+
+import UIKit
+
+/// Handles applying the current style configuration to each view controller presented.
+class PresentationManager {
+    static let shared = PresentationManager()
+
+    var configuration: FinancialConnectionsSheet.Configuration = .init()
+
+    func present(
+        _ viewControllerToPresent: UIViewController,
+        from presentingViewController: UIViewController,
+        animated: Bool = true,
+        completion: (() -> Void)? = nil
+    ) {
+        configuration.style.configure(viewControllerToPresent)
+        presentingViewController.present(viewControllerToPresent, animated: animated, completion: completion)
+    }
+}
diff --git a/StripeFinancialConnections/StripeFinancialConnections/Source/Native/Shared/SFSafariViewController+Extensions.swift b/StripeFinancialConnections/StripeFinancialConnections/Source/Native/Shared/SFSafariViewController+Extensions.swift
@@ -19,6 +19,6 @@ extension SFSafariViewController {
             return
         }
         let safariViewController = SFSafariViewController(url: url)
-        topMostViewController.present(safariViewController, animated: true, completion: nil)
+        PresentationManager.shared.present(safariViewController, from: topMostViewController)
     }
 }
diff --git a/StripeFinancialConnections/StripeFinancialConnections/Source/Native/Shared/SheetViewController.swift b/StripeFinancialConnections/StripeFinancialConnections/Source/Native/Shared/SheetViewController.swift
@@ -386,7 +386,7 @@ class SheetViewController: UIViewController {
     func present(on viewController: UIViewController) {
         modalPresentationStyle = .custom
         transitioningDelegate = transitionDelegate
-        viewController.present(self, animated: true)
+        PresentationManager.shared.present(self, from: viewController)
     }
 }
 
diff --git a/StripeFinancialConnections/StripeFinancialConnectionsTests/PresentationManagerTests.swift b/StripeFinancialConnections/StripeFinancialConnectionsTests/PresentationManagerTests.swift
@@ -0,0 +1,40 @@
+//
+//  PresentationManagerTests.swift
+//  StripeFinancialConnections
+//
+//  Created by Mat Schmid on 2025-01-30.
+//
+
+@testable @_spi(STP) import StripeFinancialConnections
+import UIKit
+import XCTest
+
+class PresentationManagerTests: XCTestCase {
+    override func setUp() {
+        super.setUp()
+        ExperimentStore.shared.supportsDynamicStyle = true
+    }
+
+    override func tearDown() {
+        super.tearDown()
+        ExperimentStore.shared.reset()
+        PresentationManager.shared.configuration = .init()
+    }
+
+    func testConfigurationIsApplied() {
+        let toViewController = UIViewController()
+
+        // Start the user interface style as `.light`
+        toViewController.overrideUserInterfaceStyle = .light
+        XCTAssertEqual(toViewController.traitCollection.userInterfaceStyle, .light)
+
+        // Create an `.alwaysDark` configuration
+        var configuration = FinancialConnectionsSheet.Configuration()
+        configuration.style = .alwaysDark
+        PresentationManager.shared.configuration = configuration
+
+        // Expect that the presentation manager sets the user interface style as `.dark`
+        PresentationManager.shared.present(toViewController, from: UIViewController())
+        XCTAssertEqual(toViewController.traitCollection.userInterfaceStyle, .dark)
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,11 @@ final public class FinancialConnectionsSheet {`
`118`	`118`	`private var wrapperViewController: ModalPresentationWrapperViewController?`
`119`	`119`
`120`	`120`	`/// Contains all configurable properties of Financial Connections.`
`121`		`- @_spi(STP) public var configuration: FinancialConnectionsSheet.Configuration = .init()`
	`121`	`+ @_spi(STP) public var configuration: FinancialConnectionsSheet.Configuration = .init() {`
	`122`	`+ didSet {`
	`123`	`+ PresentationManager.shared.configuration = configuration`
	`124`	`+ }`
	`125`	`+ }`
`122`	`126`
`123`	`127`	`/// Any additional Elements context useful for the Financial Connections SDK.`
`124`	`128`	`@_spi(STP) public var elementsSessionContext: StripeCore.ElementsSessionContext?`
`@@ -303,7 +307,7 @@ final public class FinancialConnectionsSheet {`
`303`	`307`	`toPresent = wrapperViewController!`
`304`	`308`	`animated = false`
`305`	`309`	`}`
`306`		`- presentingViewController.present(toPresent, animated: animated, completion: nil)`
	`310`	`+ PresentationManager.shared.present(toPresent, from: presentingViewController, animated: animated)`
`307`	`311`	`}`
`308`	`312`	`}`
`309`	`313`
Original file line number	Diff line number	Diff line change
`@@ -16,4 +16,9 @@ import Foundation`
`16`	`16`
`17`	`17`	`@_spi(STP) public var useAsyncAPIClient: Bool = false`
`18`	`18`	`@_spi(STP) public var supportsDynamicStyle: Bool = false`
	`19`	`+`
	`20`	`+ @_spi(STP) public func reset() {`
	`21`	`+ useAsyncAPIClient = false`
	`22`	`+ supportsDynamicStyle = false`
	`23`	`+ }`
`19`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,6 @@ extension SFSafariViewController {`
`19`	`19`	`return`
`20`	`20`	`}`
`21`	`21`	`let safariViewController = SFSafariViewController(url: url)`
`22`		`- topMostViewController.present(safariViewController, animated: true, completion: nil)`
	`22`	`+ PresentationManager.shared.present(safariViewController, from: topMostViewController)`
`23`	`23`	`}`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -386,7 +386,7 @@ class SheetViewController: UIViewController {`
`386`	`386`	`func present(on viewController: UIViewController) {`
`387`	`387`	`modalPresentationStyle = .custom`
`388`	`388`	`transitioningDelegate = transitionDelegate`
`389`		`- viewController.present(self, animated: true)`
	`389`	`+ PresentationManager.shared.present(self, from: viewController)`
`390`	`390`	`}`
`391`	`391`	`}`
`392`	`392`