Implement configuration updates, dynamic height sizing, applePayLabel, widen iOS support, refactor context providers, derive checkout kit config from app config

Author: markmur

modules/@shopify/checkout-sheet-kit/RNShopifyCheckoutSheetKit.podspec

@@ -20,8 +20,8 @@ Pod::Spec.new do |s|
   s.source_files = "ios/*.{h,m,mm,swift}"
 
 	s.dependency "React-Core"
-	s.dependency "ShopifyCheckoutSheetKit", "~> 3.4.0-rc.2"
-	s.dependency "ShopifyCheckoutSheetKit/AcceleratedCheckouts", "~> 3.4.0-rc.2"
+	s.dependency "ShopifyCheckoutSheetKit", "~> 3.4.0-rc.5"
+	s.dependency "ShopifyCheckoutSheetKit/AcceleratedCheckouts", "~> 3.4.0-rc.5"
 
   if fabric_enabled
 		install_modules_dependencies(s)

modules/@shopify/checkout-sheet-kit/ios/AcceleratedCheckoutButtons+Extensions.swift

@@ -0,0 +1,77 @@
+/*
+ MIT License
+
+ Copyright 2023 - Present, Shopify Inc.
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in all
+ copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+import _PassKit_SwiftUI
+import Foundation
+import PassKit
+import SwiftUI
+
+@available(iOS 16.0, *)
+extension PayWithApplePayButtonLabel {
+    static func from(_ string: String?, fallback: PayWithApplePayButtonLabel = .plain) -> PayWithApplePayButtonLabel {
+        guard let string else {
+            return fallback
+        }
+        return map[string] ?? .plain
+    }
+
+    init?(fromString string: String?) {
+        guard let string,
+              let label = Self.map[string]
+        else {
+            return nil
+        }
+        self = label
+    }
+
+    private static let map: [String: PayWithApplePayButtonLabel] = [
+        "addMoney": .addMoney,
+        "book": .book,
+        "buy": .buy,
+        "checkout": .checkout,
+        "continue": .continue,
+        "contribute": .contribute,
+        "donate": .donate,
+        "inStore": .inStore,
+        "order": .order,
+        "plain": .plain,
+        "reload": .reload,
+        "rent": .rent,
+        "setUp": .setUp,
+        "subscribe": .subscribe,
+        "support": .support,
+        "tip": .tip,
+        "topUp": .topUp
+    ]
+}
+
+extension View {
+    @ViewBuilder
+    func conditionalEnvironmentObject(_ object: (some ObservableObject)?) -> some View {
+        if let object {
+            environmentObject(object)
+        } else {
+            self
+        }
+    }
+}

modules/@shopify/checkout-sheet-kit/ios/AcceleratedCheckoutButtons.swift

@@ -30,33 +30,34 @@ import UIKit
 
 // MARK: - AcceleratedCheckout Components
 
-@available(iOS 17.0, *)
+@available(iOS 16.0, *)
 class AcceleratedCheckoutConfiguration {
     static let shared = AcceleratedCheckoutConfiguration()
     var configuration: ShopifyAcceleratedCheckouts.Configuration?
+    var applePayConfiguration: ShopifyAcceleratedCheckouts.ApplePayConfiguration?
     var wallets: [Wallet] = [Wallet.shopPay, Wallet.applePay]
 
-    private init() {
-        setupApplePay()
+    var available: Bool {
+        if #available(iOS 16.0, *) {
+            return configuration != nil
+        } else {
+            return false
+        }
     }
 
-    private func setupApplePay() {
-        // Configure Apple Pay environment
-        // This should be called during app initialization
-        if let merchantID = Bundle.main.object(forInfoDictionaryKey: "ApplePayMerchantID") as? String {
-            // Apple Pay is configured via merchant ID in Info.plist
-            // The actual Apple Pay setup is handled by the ShopifyAcceleratedCheckouts framework
-            print("✅ Apple Pay configured with Merchant ID: \(merchantID)")
+    var applePayAvailable: Bool {
+        if #available(iOS 16.0, *) {
+            return applePayConfiguration != nil
         } else {
-            print("⚠️ Apple Pay Merchant ID not found in Info.plist. Add 'ApplePayMerchantID' key to enable Apple Pay.")
+            return false
         }
     }
 }
 
 @objc(RCTAcceleratedCheckoutButtonsManager)
 class RCTAcceleratedCheckoutButtonsManager: RCTViewManager {
     override func view() -> UIView! {
-        if #available(iOS 17.0, *) {
+        if #available(iOS 16.0, *) {
             return RCTAcceleratedCheckoutButtonsView()
         }
 
@@ -73,12 +74,16 @@ class RCTAcceleratedCheckoutButtonsManager: RCTViewManager {
     }
 }
 
-@available(iOS 17.0, *)
+@available(iOS 16.0, *)
 class RCTAcceleratedCheckoutButtonsView: UIView {
     private var hostingController: UIHostingController<AnyView>?
     private var configuration: ShopifyAcceleratedCheckouts.Configuration?
     private weak var parentViewController: UIViewController?
 
+    @objc var onSizeChange: RCTDirectEventBlock?
+
+    // MARK: - Props
+
     @objc var cartId: String? {
         didSet {
             updateView()
@@ -104,6 +109,16 @@ class RCTAcceleratedCheckoutButtonsView: UIView {
     }
 
     @objc var wallets: [String]? {
+        didSet {
+            let height = calculateRequiredHeight()
+            onSizeChange?(["height": height])
+            invalidateIntrinsicContentSize()
+            setNeedsLayout()
+            updateView()
+        }
+    }
+
+    @objc var applePayLabel: String? {
         didSet {
             updateView()
         }
@@ -128,6 +143,16 @@ class RCTAcceleratedCheckoutButtonsView: UIView {
         setupView()
     }
 
+    override func layoutSubviews() {
+        super.layoutSubviews()
+        hostingController?.view.frame = bounds
+    }
+
+    override var intrinsicContentSize: CGSize {
+        let height = calculateRequiredHeight()
+        return CGSize(width: UIView.noIntrinsicMetric, height: height)
+    }
+
     private func setupView() {
         // Configuration will be set via a static method from the main module
         configuration = AcceleratedCheckoutConfiguration.shared.configuration
@@ -146,6 +171,20 @@ class RCTAcceleratedCheckoutButtonsView: UIView {
             name: Notification.Name("AcceleratedCheckoutConfigurationUpdated"),
             object: nil
         )
+
+        NotificationCenter.default.addObserver(
+            self,
+            selector: #selector(configurationUpdated),
+            name: Notification.Name("CheckoutKitConfigurationUpdated"),
+            object: nil
+        )
+
+        // Fire initial size change event
+        DispatchQueue.main.async { [weak self] in
+            guard let self else { return }
+            let height = self.calculateRequiredHeight()
+            self.onSizeChange?(["height": height])
+        }
     }
 
     private func findViewController() -> UIViewController? {
@@ -167,8 +206,9 @@ class RCTAcceleratedCheckoutButtonsView: UIView {
     private func createCartButtons(
         cartId: String,
         wallets: [Wallet],
+        applePayLabel: PayWithApplePayButtonLabel?,
         config: ShopifyAcceleratedCheckouts.Configuration,
-        applePayConfig: ShopifyAcceleratedCheckouts.ApplePayConfiguration
+        applePayConfig: ShopifyAcceleratedCheckouts.ApplePayConfiguration?
     ) -> some View {
         AcceleratedCheckoutButtons(cartID: cartId)
             .wallets(wallets)
@@ -190,17 +230,19 @@ class RCTAcceleratedCheckoutButtonsView: UIView {
             .onWebPixelEvent { [weak self] event in
                 self?.handleWebPixelEvent(event)
             }
+            .applePayLabel(applePayLabel ?? .plain)
             .cornerRadius(CGFloat(cornerRadius.doubleValue))
-            .environment(config)
-            .environment(applePayConfig)
+            .environmentObject(config)
+            .conditionalEnvironmentObject(applePayConfig)
     }
 
     private func createVariantButtons(
         variantId: String,
         quantity: Int,
         wallets: [Wallet],
+        applePayLabel: PayWithApplePayButtonLabel?,
         config: ShopifyAcceleratedCheckouts.Configuration,
-        applePayConfig: ShopifyAcceleratedCheckouts.ApplePayConfiguration
+        applePayConfig: ShopifyAcceleratedCheckouts.ApplePayConfiguration?
     ) -> some View {
         AcceleratedCheckoutButtons(variantID: variantId, quantity: quantity)
             .wallets(wallets)
@@ -222,9 +264,10 @@ class RCTAcceleratedCheckoutButtonsView: UIView {
             .onWebPixelEvent { [weak self] event in
                 self?.handleWebPixelEvent(event)
             }
+            .applePayLabel(applePayLabel ?? .plain)
             .cornerRadius(CGFloat(cornerRadius.doubleValue))
-            .environment(config)
-            .environment(applePayConfig)
+            .environmentObject(config)
+            .conditionalEnvironmentObject(applePayConfig)
     }
 
     private func updateView() {
@@ -240,29 +283,24 @@ class RCTAcceleratedCheckoutButtonsView: UIView {
         // Use wallets from props, or fallback to default
         let shopifyWallets = wallets.map(convertToShopifyWallets) ?? AcceleratedCheckoutConfiguration.shared.wallets
 
-        // Create Apple Pay configuration
-        let applePayConfig = ShopifyAcceleratedCheckouts.ApplePayConfiguration(
-            merchantIdentifier: Bundle.main.object(
-                forInfoDictionaryKey: "ApplePayMerchantID") as? String ?? "merchant.com.shopify",
-            contactFields: [.email, .phone]
-        )
-
         let swiftUIView: AnyView
 
         if let cartId {
             swiftUIView = AnyView(createCartButtons(
                 cartId: cartId,
                 wallets: shopifyWallets,
+                applePayLabel: PayWithApplePayButtonLabel.from(applePayLabel),
                 config: config,
-                applePayConfig: applePayConfig
+                applePayConfig: AcceleratedCheckoutConfiguration.shared.applePayConfiguration
             ))
         } else if let variantId {
             swiftUIView = AnyView(createVariantButtons(
                 variantId: variantId,
                 quantity: quantity.intValue,
                 wallets: shopifyWallets,
+                applePayLabel: PayWithApplePayButtonLabel.from(applePayLabel),
                 config: config,
-                applePayConfig: applePayConfig
+                applePayConfig: AcceleratedCheckoutConfiguration.shared.applePayConfiguration
             ))
         } else {
             // Empty view if no cart or variant ID is provided
@@ -331,13 +369,13 @@ class RCTAcceleratedCheckoutButtonsView: UIView {
         onClickLink?(ShopifyEventSerialization.serialize(clickEvent: url))
     }
 
-    override func layoutSubviews() {
-        super.layoutSubviews()
-        hostingController?.view.frame = bounds
-    }
+    private func calculateRequiredHeight() -> CGFloat {
+        let shopifyWallets = wallets.map(convertToShopifyWallets) ?? AcceleratedCheckoutConfiguration.shared.wallets
+        let numberOfWallets = max(shopifyWallets.count, 1)
+        let buttonHeight: CGFloat = 48
+        let gapHeight: CGFloat = 8
+        let totalHeight = (CGFloat(numberOfWallets) * buttonHeight) + (CGFloat(numberOfWallets - 1) * gapHeight)
 
-    override var intrinsicContentSize: CGSize {
-        // Provide a default size for the button
-        return CGSize(width: UIView.noIntrinsicMetric, height: 50)
+        return totalHeight
     }
 }

modules/@shopify/checkout-sheet-kit/ios/ShopifyCheckoutSheetKit.mm

@@ -48,17 +48,23 @@ @interface RCT_EXTERN_MODULE (RCTShopifyCheckoutSheetKit, NSObject)
 
 /// Configure AcceleratedCheckouts
 RCT_EXTERN_METHOD(
-    configureAcceleratedCheckouts : (NSString *)
-        storefrontDomain storefrontAccessToken : (NSString *)
-            storefrontAccessToken customerEmail : (NSString *)
-                customerEmail customerPhoneNumber : (NSString *)
-                    customerPhoneNumber resolve : (RCTPromiseResolveBlock)
+    configureAcceleratedCheckouts : (
+        NSString *)storefrontDomain storefrontAccessToken : (NSString *)
+        storefrontAccessToken customerEmail : (
+            NSString *)customerEmail customerPhoneNumber : (NSString *)
+            customerPhoneNumber applePayMerchantIdentifier : (NSString *)
+                applePayMerchantIdentifier applyPayContactFields : (NSArray *)
+                    applyPayContactFields resolve : (RCTPromiseResolveBlock)
                         resolve reject : (RCTPromiseRejectBlock)reject);
 
 /// Check if accelerated checkout is available
 RCT_EXTERN_METHOD(isAcceleratedCheckoutAvailable : (RCTPromiseResolveBlock)
                       resolve reject : (RCTPromiseRejectBlock)reject);
 
+/// Check if Apple Pay is available
+RCT_EXTERN_METHOD(isApplePayAvailable : (RCTPromiseResolveBlock)
+                      resolve reject : (RCTPromiseRejectBlock)reject);
+
 @end
 
 // AcceleratedCheckoutButtons View Manager
@@ -70,6 +76,7 @@ @interface RCT_EXTERN_MODULE (RCTAcceleratedCheckoutButtonsManager,
 RCT_EXPORT_VIEW_PROPERTY(quantity, NSNumber *)
 RCT_EXPORT_VIEW_PROPERTY(cornerRadius, NSNumber *)
 RCT_EXPORT_VIEW_PROPERTY(wallets, NSArray *)
+RCT_EXPORT_VIEW_PROPERTY(applePayLabel, NSString *)
 RCT_EXPORT_VIEW_PROPERTY(onPress, RCTBubblingEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onFail, RCTBubblingEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onComplete, RCTBubblingEventBlock)
@@ -78,5 +85,6 @@ @interface RCT_EXTERN_MODULE (RCTAcceleratedCheckoutButtonsManager,
 RCT_EXPORT_VIEW_PROPERTY(onShouldRecoverFromError, RCTDirectEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onWebPixelEvent, RCTBubblingEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onClickLink, RCTBubblingEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onSizeChange, RCTDirectEventBlock)
 
 @end