@alipay/ams-checkout 2.0.12 → 2.0.13

package/esm/component/popupWindow.style.js

@@ -120,8 +120,8 @@ export var createModal = function createModal(_ref2) {
           theme = _loadingConfig$theme === void 0 ? 'default' : _loadingConfig$theme,
           _loadingConfig$backgr = loadingConfig.backgroundPrimary,
           backgroundPrimary = _loadingConfig$backgr === void 0 ? '#ffffff' : _loadingConfig$backgr;
-        var mode = getCurrentTheme(theme);
-        renderPopupLoading(modal, mode);
+        // const mode = getCurrentTheme(theme);
+        // renderPopupLoading(modal, mode);
         modal.style.backgroundColor = backgroundPrimary;
         iframe.style.backgroundColor = backgroundPrimary;
       }

package/esm/foundation/service/container/popup.js

@@ -76,7 +76,10 @@ export var PopupManager = /*#__PURE__*/function () {
                 styleConfig: {
                   backgroundColor: (_data$loadingConfig = data.loadingConfig) === null || _data$loadingConfig === void 0 ? void 0 : _data$loadingConfig.backgroundPrimary
                 },
-                loadingConfig: undefined,
+                // 修复前
+                // loadingConfig: undefined,
+                // 修复后
+                loadingConfig: data.loadingConfig,
                 showCloseOnLoading: data.showCloseOnLoading,
                 onCloseOnLoading: data.onCloseOnLoading,
                 textDirection: data === null || data === void 0 ? void 0 : data.textDirection

package/esm/modern/index.js

@@ -15,7 +15,7 @@ import { createLoader } from '@antglobal/create-sdk-loader';
 
 import { stageName } from "./stageName";
 var SDKURL = {
-  DEV: "https://sdk-dev.marmot-cloud.com/package/ams-checkout/".concat("2.0.12", "/ams-checkout.js"),
+  DEV: "https://sdk-dev.marmot-cloud.com/package/ams-checkout/".concat("2.0.13", "/ams-checkout.js"),
   LOCAL: "http://localhost:3000/ams-checkout.min.js",
   PROD: 'https://js.antom.com/v2/ams-checkout.js'
 };

package/esm/plugin/paypal/index.js

@@ -108,7 +108,7 @@ export var PaypalBusSubscriber = /*#__PURE__*/function (_BusSubscriber) {
       var _paypalPluginProps$pa3, _paypalPluginProps$pa4, _paypalPluginProps$pa5, _paypalPluginProps$pa6;
       var channelMerchantAccountId = (_paypalPluginProps$pa3 = paypalPluginProps.paymentSessionFactor) === null || _paypalPluginProps$pa3 === void 0 || (_paypalPluginProps$pa3 = _paypalPluginProps$pa3.merchantInfo) === null || _paypalPluginProps$pa3 === void 0 ? void 0 : _paypalPluginProps$pa3.channelMerchantClientId;
       var accessToken = (_paypalPluginProps$pa4 = paypalPluginProps.paymentSessionFactor) === null || _paypalPluginProps$pa4 === void 0 || (_paypalPluginProps$pa4 = _paypalPluginProps$pa4.paypal) === null || _paypalPluginProps$pa4 === void 0 ? void 0 : _paypalPluginProps$pa4.accessToken;
-      var locale = paypalPluginProps.locale;
+      var locale = paypalPluginProps.locale || 'en_US';
       var currency = (_paypalPluginProps$pa5 = paypalPluginProps.paymentSessionFactor) === null || _paypalPluginProps$pa5 === void 0 || (_paypalPluginProps$pa5 = _paypalPluginProps$pa5.paymentAmount) === null || _paypalPluginProps$pa5 === void 0 ? void 0 : _paypalPluginProps$pa5.currency;
       var paymentMethodType = (_paypalPluginProps$pa6 = paypalPluginProps.paymentSessionFactor) === null || _paypalPluginProps$pa6 === void 0 || (_paypalPluginProps$pa6 = _paypalPluginProps$pa6.paymentMethodInfo) === null || _paypalPluginProps$pa6 === void 0 ? void 0 : _paypalPluginProps$pa6.paymentMethodType;
       var _ref2 = (paypalPluginProps === null || paypalPluginProps === void 0 ? void 0 : paypalPluginProps.paypalConfiguration) || {},
@@ -198,7 +198,7 @@ export var PaypalBusSubscriber = /*#__PURE__*/function (_BusSubscriber) {
               });
               _this.onEventCallback({
                 code: eventCodeEnum.SDK_PAYMENT_FAIL,
-                message: 'Create order failed.'
+                message: (queryPaymentInfoRes === null || queryPaymentInfoRes === void 0 ? void 0 : queryPaymentInfoRes.errorMessage) || 'Create order failed.'
               });
               return _context2.abrupt("return");
             case 7:

package/esm/tsdoc-metadata.json

@@ -5,7 +5,7 @@
   "toolPackages": [
     {
       "packageName": "@microsoft/api-extractor",
-      "packageVersion": "7.58.2"
+      "packageVersion": "7.58.7"
     }
   ]
 }

package/package.json

@@ -1,19 +1,19 @@
 {
   "name": "@alipay/ams-checkout",
-  "version": "2.0.12",
+  "version": "2.0.13",
   "description": "",
   "author": "",
   "exports": {
     ".": {
-      "import": "./esm/index.js",
       "types": "./esm/index.d.ts",
+      "import": "./esm/index.js",
       "require": "./ams-checkout.js"
     },
     "./types": "./types.d.ts",
     "./antom": "./antom.d.ts",
     "./react-js": {
-      "import": "./react-js.js",
       "types": "./react-js.d.ts",
+      "import": "./react-js.js",
       "require": "./react-js.cjs"
     },
     "./interface": "./types.untrimmed.d.ts"

package/types.d.ts

@@ -368,19 +368,6 @@ declare interface ApplePayProps {
     paymentRequest?: ApplePaymentModel;
 }
 
-/**
- * @public
- * @description onApprove callback parameter
- */
-export declare interface ApproveData {
-    /** Payment method identifier */
-    paymentMethod: string;
-    /** Raw data returned by payment method */
-    data?: Record<string, any>;
-    /** Shipping address (if collectShippingAddress is true) */
-    shippingAddress?: Record<string, any>;
-}
-
 /**
  * @description googlePay risk check
  */
@@ -595,11 +582,7 @@ declare type AxiosHeaderMatcher =
 | RegExp
 | ((this: AxiosHeaders, value: string, name: string) => boolean);
 
-declare type AxiosHeaderParser = (
-this: AxiosHeaders,
-value: AxiosHeaderValue,
-header: string,
-) => any;
+declare type AxiosHeaderParser = (this: AxiosHeaders, value: AxiosHeaderValue, header: string) => any;
 
 declare class AxiosHeaders {
     constructor(headers?: RawAxiosHeaders | AxiosHeaders | string);
@@ -609,12 +592,9 @@ declare class AxiosHeaders {
     set(
     headerName?: string,
     value?: AxiosHeaderValue,
-    rewrite?: boolean | AxiosHeaderMatcher,
-    ): AxiosHeaders;
-    set(
-    headers?: RawAxiosHeaders | AxiosHeaders | string,
-    rewrite?: boolean,
+    rewrite?: boolean | AxiosHeaderMatcher
     ): AxiosHeaders;
+    set(headers?: RawAxiosHeaders | AxiosHeaders | string, rewrite?: boolean): AxiosHeaders;
 
     get(headerName: string, parser: RegExp): RegExpExecArray | null;
     get(headerName: string, matcher?: true | AxiosHeaderParser): AxiosHeaderValue;
@@ -628,9 +608,7 @@ declare class AxiosHeaders {
     normalize(format: boolean): AxiosHeaders;
 
     concat(
-    ...targets: Array<
-    AxiosHeaders | RawAxiosHeaders | string | undefined | null
-    >
+    ...targets: Array<AxiosHeaders | RawAxiosHeaders | string | undefined | null>
     ): AxiosHeaders;
 
     toJSON(asStrings?: boolean): RawAxiosHeaders;
@@ -640,55 +618,35 @@ declare class AxiosHeaders {
     static accessor(header: string | string[]): AxiosHeaders;
 
     static concat(
-    ...targets: Array<
-    AxiosHeaders | RawAxiosHeaders | string | undefined | null
-    >
+    ...targets: Array<AxiosHeaders | RawAxiosHeaders | string | undefined | null>
     ): AxiosHeaders;
 
-    setContentType(
-    value: ContentType,
-    rewrite?: boolean | AxiosHeaderMatcher,
-    ): AxiosHeaders;
+    setContentType(value: ContentType, rewrite?: boolean | AxiosHeaderMatcher): AxiosHeaders;
     getContentType(parser?: RegExp): RegExpExecArray | null;
     getContentType(matcher?: AxiosHeaderMatcher): AxiosHeaderValue;
     hasContentType(matcher?: AxiosHeaderMatcher): boolean;
 
-    setContentLength(
-    value: AxiosHeaderValue,
-    rewrite?: boolean | AxiosHeaderMatcher,
-    ): AxiosHeaders;
+    setContentLength(value: AxiosHeaderValue, rewrite?: boolean | AxiosHeaderMatcher): AxiosHeaders;
     getContentLength(parser?: RegExp): RegExpExecArray | null;
     getContentLength(matcher?: AxiosHeaderMatcher): AxiosHeaderValue;
     hasContentLength(matcher?: AxiosHeaderMatcher): boolean;
 
-    setAccept(
-    value: AxiosHeaderValue,
-    rewrite?: boolean | AxiosHeaderMatcher,
-    ): AxiosHeaders;
+    setAccept(value: AxiosHeaderValue, rewrite?: boolean | AxiosHeaderMatcher): AxiosHeaders;
     getAccept(parser?: RegExp): RegExpExecArray | null;
     getAccept(matcher?: AxiosHeaderMatcher): AxiosHeaderValue;
     hasAccept(matcher?: AxiosHeaderMatcher): boolean;
 
-    setUserAgent(
-    value: AxiosHeaderValue,
-    rewrite?: boolean | AxiosHeaderMatcher,
-    ): AxiosHeaders;
+    setUserAgent(value: AxiosHeaderValue, rewrite?: boolean | AxiosHeaderMatcher): AxiosHeaders;
     getUserAgent(parser?: RegExp): RegExpExecArray | null;
     getUserAgent(matcher?: AxiosHeaderMatcher): AxiosHeaderValue;
     hasUserAgent(matcher?: AxiosHeaderMatcher): boolean;
 
-    setContentEncoding(
-    value: AxiosHeaderValue,
-    rewrite?: boolean | AxiosHeaderMatcher,
-    ): AxiosHeaders;
+    setContentEncoding(value: AxiosHeaderValue, rewrite?: boolean | AxiosHeaderMatcher): AxiosHeaders;
     getContentEncoding(parser?: RegExp): RegExpExecArray | null;
     getContentEncoding(matcher?: AxiosHeaderMatcher): AxiosHeaderValue;
     hasContentEncoding(matcher?: AxiosHeaderMatcher): boolean;
 
-    setAuthorization(
-    value: AxiosHeaderValue,
-    rewrite?: boolean | AxiosHeaderMatcher,
-    ): AxiosHeaders;
+    setAuthorization(value: AxiosHeaderValue, rewrite?: boolean | AxiosHeaderMatcher): AxiosHeaders;
     getAuthorization(parser?: RegExp): RegExpExecArray | null;
     getAuthorization(matcher?: AxiosHeaderMatcher): AxiosHeaderValue;
     hasAuthorization(matcher?: AxiosHeaderMatcher): boolean;
@@ -698,13 +656,7 @@ declare class AxiosHeaders {
     [Symbol.iterator](): IterableIterator<[string, AxiosHeaderValue]>;
 }
 
-declare type AxiosHeaderValue =
-| AxiosHeaders
-| string
-| string[]
-| number
-| boolean
-| null;
+declare type AxiosHeaderValue = AxiosHeaders | string | string[] | number | boolean | null;
 
 declare interface BankInfo {
     /**
@@ -1545,6 +1497,28 @@ declare interface ChargeInfo {
     chargeActualAmountView?: PaymentView;
 }
 
+/** click 事件 resolve 参数 */
+export declare interface ClickResolveOptions {
+    amount?: {
+        currency: string;
+        value: string;
+    };
+    shippingAddressRequired?: boolean;
+    allowedShippingCountries?: string[];
+    shippingRates?: Array<{
+        id: string;
+        displayName: string;
+        amount: string;
+    }>;
+    lineItems?: Array<{
+        name: string;
+        amount: string;
+    }>;
+    business?: {
+        name: string;
+    };
+}
+
 declare interface CodeFormView {
     /**
      * @description title
@@ -2157,12 +2131,12 @@ declare interface ConnectFactor {
 
 declare type ContentType =
 | AxiosHeaderValue
-| "text/html"
-| "text/plain"
-| "multipart/form-data"
-| "application/json"
-| "application/x-www-form-urlencoded"
-| "application/octet-stream";
+| 'text/html'
+| 'text/plain'
+| 'multipart/form-data'
+| 'application/json'
+| 'application/x-www-form-urlencoded'
+| 'application/octet-stream';
 
 declare namespace CSS_2 {
     export {
@@ -3219,8 +3193,8 @@ export declare interface ExpressAppConfig extends BaseAppearance<AppearanceSetti
         currency: string;
         value: string;
     };
-    /** PayPal payment configuration */
-    paypalConfig?: PayPalConfig;
+    /** PayPal 配置 */
+    paypal?: PayPalConfig;
     /**
      * Button text type (following Stripe Express Checkout Element design)
      * Each payment method can independently set the button display text
@@ -3249,21 +3223,34 @@ export declare interface ExpressAppConfig extends BaseAppearance<AppearanceSetti
      * @example ['paypal']
      */
     paymentMethods?: string[];
-    /** Lifecycle callbacks */
-    hooks?: ExpressHooks;
+    /* Excluded from this release type: setupError */
+    /**
+     * Locale for internationalization, passed from entry params (loadAntom), default to en_US
+     */
+    locale?: string;
 }
 
-/**
- * @public
- * @description onCancel callback parameter
- */
-export declare interface ExpressCancelInfo {
-    /** Payment method identifier */
-    paymentMethod: string;
-    /** Raw data returned by payment method (PayPal SDK return content, fully passed through) */
+/** cancel 事件负载 */
+export declare interface ExpressCancelEvent {
+    expressPaymentType: string;
     data?: any;
 }
 
+/** click 事件负载 */
+export declare interface ExpressClickEvent {
+    expressPaymentType: string;
+    resolve: (options: ClickResolveOptions) => void;
+}
+
+/** confirm 事件负载（统一终态，替代 approve） */
+export declare interface ExpressConfirmData {
+    expressPaymentType: string;
+    paymentData: any;
+    billingDetails?: any;
+    shippingAddress?: any;
+    sessionData?: string;
+}
+
 /**
  * @public
  * @description Express element - express checkout element, supports PayPal / Apple Pay / Google Pay
@@ -3302,62 +3289,55 @@ export declare interface ExpressElementConfig extends BaseElementConfig<ExpressA
  */
 export declare interface ExpressElementEvents extends AntomBridgeEventMap<ExpressAppConfig> {
     /**
-     * @description Element ready event
+     * @description Element ready event — 上报可用支付方式
      */
-    ready: ExpressReadyInfo;
+    ready: {
+        availablePaymentMethods: Record<string, boolean>;
+    };
     /**
-     * @description Payment authorization success event
+     * @description 用户点击按钮 — 商户必须调用 event.resolve() 后 sheet 才弹出
+     * 对 PayPal: resolve 为 no-op（PayPal 自行弹出 popup）
      */
-    approve: ApproveData;
+    click: ExpressClickEvent;
     /**
-     * @description Payment error event
+     * @description 统一支付完成事件（替代 approve）
+     * 用户授权完成后触发，通过 expressPaymentType 区分钱包类型
      */
-    paymentError: ExpressErrorData;
+    confirm: ExpressConfirmData;
     /**
-     * @description User cancelled payment event
+     * @description 支付错误事件（扩展基类 ErrorPayload，新增 expressPaymentType）
      */
-    cancel: ExpressCancelInfo;
+    error: ErrorPayload & {
+        expressPaymentType: string;
+    };
     /**
-     * @description Payment button click event
+     * @description 用户取消支付
      */
-    click: void;
-}
-
-/**
- * @public
- * @description onError callback parameter
- */
-export declare interface ExpressErrorData {
-    /** Payment method identifier */
-    paymentMethod: string;
-    /** Error code */
-    code: string;
-    /** Error message */
-    message: string;
-}
-
-/**
- * @public
- * @description Express Element lifecycle hooks
- */
-export declare interface ExpressHooks {
-    /** Element initialization ready callback */
-    onReady?: (info: ExpressReadyInfo) => void;
-    /** Payment authorization success callback */
-    onApprove?: (data: ApproveData) => void;
-    /** Payment error callback */
-    onError?: (error: ExpressErrorData) => void;
-    /** User cancelled payment callback */
-    onCancel?: (info: ExpressCancelInfo) => void;
-}
-
-/**
- * @public
- * @description onReady callback parameter
- */
-export declare interface ExpressReadyInfo {
-    /** List of currently available payment methods */
-    availablePaymentMethods: string[];
+    cancel: ExpressCancelEvent;
+    /**
+     * @description 用户在 sheet 内变更收货地址（AP/GP only，PayPal 不触发）
+     */
+    shippingaddresschange: {
+        expressPaymentType: string;
+        address: any;
+        resolve: (options: ShippingResolveOptions) => void;
+        reject: (reason: string) => void;
+    };
+    /**
+     * @description 用户在 sheet 内变更配送方式（AP/GP only，PayPal 不触发）
+     */
+    shippingratechange: {
+        expressPaymentType: string;
+        shippingRate: any;
+        resolve: (options: RateResolveOptions) => void;
+    };
+    /* Excluded from this release type: contentHeightChanged */
+    /* Excluded from this release type: "paypal:createOrder" */
+    /* Excluded from this release type: "paypal:createOrder:reply" */
+    /* Excluded from this release type: "paypal:onShippingAddressChange" */
+    /* Excluded from this release type: "paypal:onShippingAddressChange:reply" */
+    /* Excluded from this release type: "paypal:onShippingOptionsChange" */
+    /* Excluded from this release type: "paypal:onShippingOptionsChange:reply" */
 }
 
 declare interface ExpSupportBank {
@@ -9601,6 +9581,14 @@ declare interface RateInfo {
     rate?: Rate;
 }
 
+/** shippingratechange 事件 resolve 参数 */
+export declare interface RateResolveOptions {
+    lineItems?: Array<{
+        name: string;
+        amount: string;
+    }>;
+}
+
 declare interface RawAxiosHeaders {
     [key: string]: AxiosHeaderValue;
 }
@@ -9919,6 +9907,19 @@ declare interface ShippingInfo {
     deliveryEstimate?: DeliveryEstimate;
 }
 
+/** shippingaddresschange 事件 resolve 参数 */
+export declare interface ShippingResolveOptions {
+    shippingRates?: Array<{
+        id: string;
+        displayName: string;
+        amount: string;
+    }>;
+    lineItems?: Array<{
+        name: string;
+        amount: string;
+    }>;
+}
+
 declare type SimpleI18n = {
     get(id: GetI18nQueryParam, variable?: Record<string, any>, localeCode?: string): string;
 };