@alipay/ams-checkout 2.0.16 → 2.0.18

package/esm/component/popupWindow.style.js

@@ -1,4 +1,4 @@
-import { AMSPOPUP_PREFIX, ANIMATION_TIME, MOCKUP_ID, POPUPLOADING_ID } from "../constant";
+import { AMSPOPUP_PREFIX, ANIMATION_TIME, DEFAULT_IFRAME_COLOR_SCHEME, MOCKUP_ID, POPUPLOADING_ID } from "../constant";
 import { getDesignFontSize } from "../util";
 // CSS样式字符串
 var modalStyles = "\n  .".concat(AMSPOPUP_PREFIX, "modal {\n    /* \u6DFB\u52A0\u5F39\u7A97\u6837\u5F0F */\n    background-color: #fff;\n    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);\n    position: fixed;\n    top: 50%;\n    left: 50%;\n    transform: translate(-50%, -50%);\n    z-index: 9999; /* \u8BBE\u7F6E\u5F39\u7A97\u7684\u5C42\u7EA7\u4E3A 9999 */\n    overflow: hidden;\n  }\n  .").concat(AMSPOPUP_PREFIX, "modal-mobile{\n    background-color: #fff;\n    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);\n    position: fixed;\n    bottom: 0;\n    left: 0%;\n    z-index: 9999; /* \u8BBE\u7F6E\u5F39\u7A97\u7684\u5C42\u7EA7\u4E3A 9999 */\n    overflow: hidden;\n  }\n\n  .").concat(AMSPOPUP_PREFIX, "overlay {\n    /* \u6DFB\u52A0\u8499\u5C42\u6837\u5F0F */\n    position: fixed;\n    top: 0;\n    left: 0;\n    width: 100%;\n    height: 100%;\n    background-color: rgba(0, 0, 0, 0.4);\n    z-index: 999;\n  }\n\n  .").concat(AMSPOPUP_PREFIX, "fadeIn {\n    /* \u6DFB\u52A0\u6DE1\u5165\u52A8\u753B */\n    animation: fadeIn ").concat(ANIMATION_TIME, "ms;\n    animation-fill-mode: forwards;\n  }\n\n  .").concat(AMSPOPUP_PREFIX, "fadeOut {\n    /* \u6DFB\u52A0\u6DE1\u51FA\u52A8\u753B */\n    animation: fadeOut ").concat(ANIMATION_TIME, "ms;\n    animation-fill-mode: forwards;\n  }\n\n  .").concat(AMSPOPUP_PREFIX, "-drawer-enter {\n    animation: slideIn ").concat(ANIMATION_TIME, "ms forwards;\n  }\n\n  @keyframes slideIn {\n    from {\n        transform: translateY(100%); /* \u6ED1\u5165\u65F6\u5728\u89C6\u53E3\u5E95\u90E8\u5916 */\n        opacity: 0; /* \u521D\u59CB\u900F\u660E\u5EA6\u4E3A 0 */\n    }\n    to {\n        transform: translateY(0); /* \u6ED1\u5165\u7ED3\u675F\u65F6\u5728\u539F\u4F4D\u7F6E */\n        opacity: 1; /* \u7ED3\u675F\u65F6\u900F\u660E\u5EA6\u4E3A 1 */\n    }\n  }\n\n  /* \u62BD\u5C49\u4ECE\u5E95\u90E8\u6ED1\u51FA */\n  .").concat(AMSPOPUP_PREFIX, "-drawer-exit {\n      animation: slideOut ").concat(ANIMATION_TIME, "ms forwards;\n  }\n\n  @keyframes slideOut {\n      from {\n          transform: translateY(0); /* \u6ED1\u51FA\u65F6\u4ECE\u5F53\u524D\u4F4D\u7F6E\u5F00\u59CB */\n          opacity: 1; /* \u521D\u59CB\u900F\u660E\u5EA6\u4E3A 1 */\n      }\n      to {\n          transform: translateY(100%); /* \u6ED1\u51FA\u7ED3\u675F\u65F6\u5728\u89C6\u53E3\u5E95\u90E8\u5916 */\n          opacity: 0; /* \u7ED3\u675F\u65F6\u900F\u660E\u5EA6\u4E3A 0 */\n      }\n  }\n\n  /* \u5B9A\u4E49\u6DE1\u5165\u52A8\u753B */\n  @keyframes fadeIn {\n    0% {\n      opacity: 0;\n    }\n    100% {\n      opacity: 1;\n    }\n  }\n\n  @-webkit-keyframes fadeIn {\n    0% {\n      opacity: 0;\n    }\n    100% {\n      opacity: 1;\n    }\n  }\n\n  @-moz-keyframes fadeIn {\n    0% {\n      opacity: 0;\n    }\n    100% {\n      opacity: 1;\n    }\n  }\n\n  /* \u5B9A\u4E49\u6DE1\u51FA\u52A8\u753B */\n  @keyframes fadeOut {\n    0% {\n      opacity: 1;\n    }\n    100% {\n      opacity: 0;\n    }\n  }\n\n  @-webkit-keyframes fadeOut {\n    0% {\n      opacity: 1;\n    }\n    100% {\n      opacity: 0;\n    }\n  }\n\n  @-moz-keyframes fadeOut {\n    0% {\n      opacity: 1;\n    }\n    100% {\n      opacity: 0;\n    }\n  }\n\n\n.ams-component-popup-loading {\n  width: 0.8em;\n  height:0.8em;\n  border-radius: 8px;\n  position: fixed;\n  top: 50%;\n  left: 50%;\n  transform: translate(-50%, -50%);\n  z-index: 1001;\n  display: flex;\n  flex-direction: column;\n  justify-content: center;\n  align-items: center;\n}\n\n.ams-component-popup-loading .line {\n  width: 40px;\n  height: 40px;\n  position: absolute;\n  top: 50%;\n  left: 50%;\n  transform: translate(-50%, -50%);\n}\n.ams-component-popup-loading .line div {\n  position: absolute;\n  left: 17.67px;\n  top: 0;\n  width: 5.33px;\n  height: 40px;\n}\n\n.ams-component-popup-loading .line div:before,\n.ams-component-popup-loading .line div:after {\n  content: '';\n  display: block;\n  height: 13.33px;\n  background: black;\n  border-radius: 5.3px;\n}\n.ams-component-popup-loading .line div:after {\n  margin-top: 13.33px;\n}\n\n.ams-component-popup-loading .line div:nth-child(2) {\n  -webkit-transform: rotate(45deg);\n}\n\n.ams-component-popup-loading .line div:nth-child(3) {\n  -webkit-transform: rotate(90deg);\n}\n\n.ams-component-popup-loading .line div:nth-child(4) {\n  -webkit-transform: rotate(135deg);\n}\n\n/** \u52A0\u8F7D\u52A8\u753B **/\n@-webkit-keyframes load {\n  0% {\n      opacity: 0;\n  }\n\n  100% {\n      opacity: 1;\n  }\n}\n\n.ams-component-popup-loading .line div:nth-child(1):before {\n  -webkit-animation: load 1s linear 0s infinite;\n}\n\n.ams-component-popup-loading .line div:nth-child(2):before {\n  -webkit-animation: load 1s linear 0.125s infinite;\n}\n\n.ams-component-popup-loading .line div:nth-child(3):before {\n  -webkit-animation: load 1s linear 0.25s infinite;\n}\n\n.ams-component-popup-loading .line div:nth-child(4):before {\n  -webkit-animation: load 1s linear 0.375s infinite;\n}\n\n.ams-component-popup-loading .line div:nth-child(1):after {\n  -webkit-animation: load 1s linear 0.5s infinite;\n}\n\n.ams-component-popup-loading .line div:nth-child(2):after {\n  -webkit-animation: load 1s linear 0.675s infinite;\n}\n\n.ams-component-popup-loading .line div:nth-child(3):after {\n  -webkit-animation: load 1s linear 0.75s infinite;\n}\n\n.ams-component-popup-loading .line div:nth-child(4):after {\n  -webkit-animation: load 1s linear 0.875s infinite;\n}\n\n.ams-component-popup-loading-logo {\n  width: 0.44em;\n  height: 0.44em;\n  -webkit-transform:rotate(360deg);\n  transform:rotate(360deg);\n  -webkit-transition:-webkit-transform 1s linear;\n  transition:transform 1s linear;\n  animation: ams-component-loading-logo 1s linear infinite;\n}\n");
@@ -111,6 +111,7 @@ export var createModal = function createModal(_ref2) {
       iframe.style.border = 'none';
       iframe.style.width = '100%';
       iframe.style.height = '100%';
+      iframe.style.colorScheme = DEFAULT_IFRAME_COLOR_SCHEME;
       if (styleConfig) {
         modal.style.backgroundColor = styleConfig.backgroundColor;
         iframe.style.backgroundColor = styleConfig.backgroundColor;

package/esm/constant/index.d.ts

@@ -283,6 +283,9 @@ export declare const EVENT: {
     submitPromiseCallback: {
         name: string;
     };
+    beforeConfirm: {
+        name: string;
+    };
     validateFieldsResult: {
         name: string;
         forwardName: string;
@@ -310,6 +313,7 @@ export declare const LISTENER_PREFIX = "_ams_sdk_component_listener";
 export declare const INLINE_BASE_STYLE_ID = "ams-inline-component-style";
 export declare const INLINE_IMG_CLASSNAME = "inline-loading";
 export declare const AMSPOPUP_PREFIX = "ams-popup";
+export declare const DEFAULT_IFRAME_COLOR_SCHEME = "light dark";
 export declare const LOADTIME_LIMIT = 15000;
 export declare const POPUP_LOADTIME_LOG_LIMIT = 3000;
 export declare const ANIMATION_TIME = 300;

package/esm/constant/index.js

@@ -289,6 +289,10 @@ export var EVENT = {
   submitPromiseCallback: {
     name: 'onSubmitPayCallback'
   },
+  // After Apple Pay authorization, before charge: notify SDK layer to execute merchant's onBeforeConfirm callback
+  beforeConfirm: {
+    name: 'onBeforeConfirm'
+  },
   validateFieldsResult: {
     name: 'validateFieldsResult',
     forwardName: 'validateFieldsResultForward',
@@ -318,6 +322,7 @@ export var LISTENER_PREFIX = '_ams_sdk_component_listener';
 export var INLINE_BASE_STYLE_ID = 'ams-inline-component-style';
 export var INLINE_IMG_CLASSNAME = 'inline-loading';
 export var AMSPOPUP_PREFIX = 'ams-popup';
+export var DEFAULT_IFRAME_COLOR_SCHEME = 'light dark';
 export var LOADTIME_LIMIT = 15000;
 export var POPUP_LOADTIME_LOG_LIMIT = 3000;
 export var ANIMATION_TIME = 300;

package/esm/core/component/element/elementContainerService/containerService.js

@@ -5,7 +5,7 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-import { EVENT } from "../../../../constant";
+import { EVENT, DEFAULT_IFRAME_COLOR_SCHEME } from "../../../../constant";
 import { ServiceProvider } from "./../../../../foundation/service";
 import { isElementPC, isElementPad } from "../util";
 import { DisplayTypeEnum, PlatformEnum, ProductSceneEnum } from "./../../../../types";
@@ -49,7 +49,8 @@ export var ContainerController = /*#__PURE__*/function () {
       selector: selector,
       appendAliasContainerId: true,
       iframeStyle: {
-        display: 'block'
+        display: 'block',
+        colorScheme: DEFAULT_IFRAME_COLOR_SCHEME
       }
     }, processor.generateIframeSrc({
       link: iframesSrcLink,

package/esm/core/component/element/elementController/index.d.ts

@@ -10,6 +10,8 @@ declare class ElementController {
     private onStatusChangeCallback;
     private submitPayPromise;
     private elementEventCenter;
+    /** Current selected payment method type (e.g. 'APPLEPAY', 'CARD'), updated via paymentMethodChanged event */
+    private currentPaymentMethodType;
     constructor(options: IElementOptions);
     private initService;
     private initElementProcessors;

package/esm/core/component/element/elementController/index.js

@@ -37,11 +37,12 @@ import { ServiceProvider } from "../../../../foundation/service";
 import { convertPaymentSession } from "../../../../foundation/utils/payment_context_utils";
 import { ProductSceneEnum } from "../../../../types";
 import { ELEMENT_SPM_MAP } from "../../../../util/spm-map";
+import { executeWithTimeout, BEFORE_CONFIRM_TIMEOUT_MS } from "../../../../util/beforeConfirm";
 import { ElementContainerService } from "../elementContainerService"; // 引入 ElementContainerService
 import { IContainerStatus } from "../elementContainerService/containerService";
 import { EventCenter as ElementEventCenter } from "../EventCenter/index";
 import { oneAccountUpdate, sdkActionUpdate } from "../mock";
-import { ElementPaymentEvent, ElementPaymentMethod, ElementType, EventCallbackCode, EXPOSURE_API_EVENT, MountElementType, PaymentStatus } from "../type";
+import { ElementPaymentEvent, ElementPaymentMethod, ElementType, EventCallbackCode, EVENTNAME, EXPOSURE_API_EVENT, MountElementType, PaymentStatus } from "../type";
 import { checkCanMount, checkCanUpdate, handleRedirect, isLoadErrorPage, safeParse, safeStringify, showToast } from "../util";
 var TIMEOUT_DURATION = 16000;
 var ElementController = /*#__PURE__*/function () {
@@ -59,6 +60,8 @@ var ElementController = /*#__PURE__*/function () {
     // 新增变量
     _defineProperty(this, "submitPayPromise", void 0);
     _defineProperty(this, "elementEventCenter", void 0);
+    /** Current selected payment method type (e.g. 'APPLEPAY', 'CARD'), updated via paymentMethodChanged event */
+    _defineProperty(this, "currentPaymentMethodType", '');
     _defineProperty(this, "onValidateFunc", function (event, target) {
       return new Promise(function (resolve) {
         event.emitAndListen({
@@ -372,7 +375,7 @@ var ElementController = /*#__PURE__*/function () {
     value: function () {
       var _submitPayment = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(submitParams) {
         var _this3 = this;
-        var startEventId, res, logParams, recordResult, _recordResult, _recordResult2, _recordResult3, _recordResult4, _recordResult5, _logParams;
+        var startEventId, res, logParams, isApplePay, paymentMethodType, startTime, _yield$executeWithTim, shouldContinue, timedOut, recordResult, _recordResult, _recordResult2, _recordResult3, _recordResult4, _recordResult5, _logParams;
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
@@ -397,12 +400,113 @@ var ElementController = /*#__PURE__*/function () {
               return _context4.abrupt("return", Promise.resolve(res));
             case 6:
               this.changeLoading(true);
+
+              // Non-Apple Pay: execute onBeforeConfirm at SDK layer directly, abort on failure
+              isApplePay = this.currentPaymentMethodType === 'APPLEPAY';
+              paymentMethodType = this.currentPaymentMethodType || 'UNKNOWN';
+              if (!(submitParams !== null && submitParams !== void 0 && submitParams.onBeforeConfirm && !isApplePay)) {
+                _context4.next = 34;
+                break;
+              }
+              this.serviceMap.Log.logInfo({
+                title: 'sdk_before_confirm_start'
+              }, {
+                paymentMethodType: paymentMethodType,
+                path: 'nonApplePay_sync'
+              });
+              _context4.prev = 11;
+              startTime = Date.now();
+              _context4.next = 15;
+              return executeWithTimeout(function () {
+                return submitParams.onBeforeConfirm();
+              });
+            case 15:
+              _yield$executeWithTim = _context4.sent;
+              shouldContinue = _yield$executeWithTim.result;
+              timedOut = _yield$executeWithTim.timedOut;
+              if (!(timedOut || !shouldContinue || Date.now() - startTime >= BEFORE_CONFIRM_TIMEOUT_MS)) {
+                _context4.next = 23;
+                break;
+              }
+              if (timedOut) {
+                this.serviceMap.Log.logError({
+                  title: 'sdk_before_confirm_timeout'
+                }, {
+                  paymentMethodType: paymentMethodType,
+                  path: 'nonApplePay_sync'
+                });
+              } else {
+                this.serviceMap.Log.logInfo({
+                  title: 'sdk_before_confirm_abort'
+                }, {
+                  paymentMethodType: paymentMethodType,
+                  path: 'nonApplePay_sync'
+                });
+              }
+              this.changeLoading(false);
+              this.elementEventCenter.endEvent(startEventId, {
+                eventCode: PaymentStatus.FAIL,
+                errorName: 'MERCHANT_CONFIRM_ABORT'
+              });
+              return _context4.abrupt("return", {
+                status: PaymentStatus.FAIL,
+                error: {
+                  code: 'MERCHANT_CONFIRM_ABORT',
+                  message: 'Merchant canceled payment.',
+                  needChangeSessionForRetry: false
+                }
+              });
+            case 23:
+              this.serviceMap.Log.logInfo({
+                title: 'sdk_before_confirm_success'
+              }, {
+                paymentMethodType: paymentMethodType,
+                path: 'nonApplePay_sync'
+              });
+              _context4.next = 32;
+              break;
+            case 26:
+              _context4.prev = 26;
+              _context4.t0 = _context4["catch"](11);
+              this.serviceMap.Log.logError({
+                title: 'sdk_before_confirm_error'
+              }, {
+                paymentMethodType: paymentMethodType,
+                errorMessage: String((_context4.t0 === null || _context4.t0 === void 0 ? void 0 : _context4.t0.message) || _context4.t0).slice(0, 200),
+                path: 'nonApplePay_sync'
+              });
+              this.changeLoading(false);
+              this.elementEventCenter.endEvent(startEventId, {
+                eventCode: PaymentStatus.FAIL,
+                errorName: 'MERCHANT_CONFIRM_ABORT'
+              });
+              return _context4.abrupt("return", {
+                status: PaymentStatus.FAIL,
+                error: {
+                  code: 'MERCHANT_CONFIRM_ABORT',
+                  message: 'Merchant canceled payment.',
+                  needChangeSessionForRetry: false
+                }
+              });
+            case 32:
+              _context4.next = 35;
+              break;
+            case 34:
+              if (!(submitParams !== null && submitParams !== void 0 && submitParams.onBeforeConfirm)) {
+                this.serviceMap.Log.logInfo({
+                  title: 'sdk_before_confirm_skip'
+                }, {
+                  paymentMethodType: paymentMethodType,
+                  path: isApplePay ? 'applePay_eventBridge' : 'nonApplePay_sync'
+                });
+              }
+            case 35:
               recordResult = null;
-              _context4.prev = 8;
-              _context4.next = 11;
+              _context4.prev = 36;
+              _context4.next = 39;
               return new Promise( /*#__PURE__*/function () {
                 var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(resolve) {
-                  var that, recordResultCallback, params, processStep, _submitParams$handleA, _yield$_this3$onValid2, _data, errorString, errorResult;
+                  var that, recordResultCallback, params, processStep, hasBeforeConfirmForApplePay, hasAmount, hasCurrency, _yield$_this3$onValid2, _data, errorString, errorResult;
                   return _regeneratorRuntime().wrap(function _callee3$(_context3) {
                     while (1) switch (_context3.prev = _context3.next) {
                       case 0:
@@ -478,26 +582,58 @@ var ElementController = /*#__PURE__*/function () {
                         return _context3.abrupt("return");
                       case 14:
                         if (!_this3.elementProcessors[ElementType.payment]) {
-                          _context3.next = 21;
+                          _context3.next = 28;
                           break;
                         }
-                        _context3.next = 17;
-                        return _this3.onValidateAndSubmitPay(_this3.elementProcessors[ElementType.payment].eventCenter, ElementPaymentMethod.PAYMENT_ELEMENT, _objectSpread(_objectSpread({}, params), {}, {
-                          handleActions: (_submitParams$handleA = submitParams === null || submitParams === void 0 ? void 0 : submitParams.handleActions) !== null && _submitParams$handleA !== void 0 ? _submitParams$handleA : true,
-                          shipping: submitParams === null || submitParams === void 0 ? void 0 : submitParams.shippingInfo
-                        }));
-                      case 17:
+                        // Apple Pay: set onBeforeConfirm on paymentProcessor for event bridge callback after iframe authorization
+                        hasBeforeConfirmForApplePay = isApplePay && !!(submitParams !== null && submitParams !== void 0 && submitParams.onBeforeConfirm);
+                        _this3.serviceMap.Log.logInfo({
+                          title: 'sdk_element_submitPayment_setBeforeConfirm'
+                        }, {
+                          msg: safeStringify({
+                            hasBeforeConfirmForApplePay: hasBeforeConfirmForApplePay,
+                            isApplePay: isApplePay
+                          })
+                        });
+                        _this3.elementProcessors[ElementType.payment].setOnBeforeConfirm(hasBeforeConfirmForApplePay ? submitParams.onBeforeConfirm : null);
+                        hasAmount = !!(submitParams !== null && submitParams !== void 0 && submitParams.amount);
+                        hasCurrency = !!(submitParams !== null && submitParams !== void 0 && submitParams.currency);
+                        if ((hasAmount || hasCurrency) && !(hasAmount && hasCurrency)) {
+                          _this3.serviceMap.Log.logError({
+                            title: 'sdk_element_submitPayment_amountCurrencyMismatch'
+                          }, {
+                            msg: safeStringify({
+                              amount: submitParams === null || submitParams === void 0 ? void 0 : submitParams.amount,
+                              currency: submitParams === null || submitParams === void 0 ? void 0 : submitParams.currency,
+                              reason: 'amount and currency must be provided together, both ignored'
+                            })
+                          });
+                        }
+                        _this3.elementProcessors[ElementType.payment].setMerchantAmountOverride(hasAmount && hasCurrency ? submitParams.amount : null, hasAmount && hasCurrency ? submitParams.currency : null);
+                        _context3.next = 24;
+                        return _this3.onValidateAndSubmitPay(_this3.elementProcessors[ElementType.payment].eventCenter, ElementPaymentMethod.PAYMENT_ELEMENT, function (_submitParams$handleA) {
+                          return _objectSpread(_objectSpread(_objectSpread({}, params), {}, {
+                            handleActions: (_submitParams$handleA = submitParams === null || submitParams === void 0 ? void 0 : submitParams.handleActions) !== null && _submitParams$handleA !== void 0 ? _submitParams$handleA : true,
+                            shipping: submitParams === null || submitParams === void 0 ? void 0 : submitParams.shippingInfo
+                          }, hasAmount && hasCurrency ? {
+                            amount: submitParams.amount,
+                            currency: submitParams.currency
+                          } : {}), {}, {
+                            hasBeforeConfirm: hasBeforeConfirmForApplePay
+                          });
+                        }());
+                      case 24:
                         _yield$_this3$onValid2 = _context3.sent;
                         _data = _yield$_this3$onValid2.data;
                         // TODO 先快速修复类型, 这里结构和标准返回不一致 @马杰
                         // TODO checkout 返回的错误未包含 status 和 message @马杰 @薛浩
                         recordResult = _data;
                         recordResultCallback(recordResult);
-                      case 21:
-                        _context3.next = 30;
+                      case 28:
+                        _context3.next = 37;
                         break;
-                      case 23:
-                        _context3.prev = 23;
+                      case 30:
+                        _context3.prev = 30;
                         _context3.t0 = _context3["catch"](2);
                         // 修复error为{}空对象的问题，上报stack&message
                         errorString = JSON.stringify(_context3.t0, Object.getOwnPropertyNames(_context3.t0));
@@ -514,20 +650,20 @@ var ElementController = /*#__PURE__*/function () {
                         });
                         recordResult = errorResult;
                         recordResultCallback(errorResult);
-                      case 30:
+                      case 37:
                       case "end":
                         return _context3.stop();
                     }
-                  }, _callee3, null, [[2, 23]]);
+                  }, _callee3, null, [[2, 30]]);
                 }));
                 return function (_x2) {
                   return _ref3.apply(this, arguments);
                 };
               }());
-            case 11:
+            case 39:
               return _context4.abrupt("return", _context4.sent);
-            case 12:
-              _context4.prev = 12;
+            case 40:
+              _context4.prev = 40;
               _logParams = {
                 eventCode: (_recordResult = recordResult) === null || _recordResult === void 0 ? void 0 : _recordResult.status,
                 errorName: (_recordResult2 = recordResult) === null || _recordResult2 === void 0 || (_recordResult2 = _recordResult2.error) === null || _recordResult2 === void 0 ? void 0 : _recordResult2.code,
@@ -538,12 +674,12 @@ var ElementController = /*#__PURE__*/function () {
               };
               this.elementEventCenter.endEvent(startEventId, _logParams);
               this.changeLoading(false);
-              return _context4.finish(12);
-            case 17:
+              return _context4.finish(40);
+            case 45:
             case "end":
               return _context4.stop();
           }
-        }, _callee4, this, [[8,, 12, 17]]);
+        }, _callee4, this, [[11, 26], [36,, 40, 45]]);
       }));
       function submitPayment(_x) {
         return _submitPayment.apply(this, arguments);
@@ -628,6 +764,9 @@ var ElementController = /*#__PURE__*/function () {
         var _this4$submitPayPromi;
         (_this4$submitPayPromi = _this4.submitPayPromise) === null || _this4$submitPayPromi === void 0 || _this4$submitPayPromi.call(_this4, data);
       });
+      this.serviceMap.EventCenter.listen(EVENTNAME.PAYMENTMETHODCHANGED, function (data) {
+        _this4.currentPaymentMethodType = (data === null || data === void 0 ? void 0 : data.type) || '';
+      });
     }
   }, {
     key: "sendRequestAndWaitWebLaunch",

package/esm/core/component/element/elementProcessor/paymentProcessor.d.ts

@@ -2,6 +2,16 @@ import { LogService } from '../../../../foundation/service/log';
 import BaseElementProcessor from './baseElementProcessor';
 declare class PaymentProcessor extends BaseElementProcessor {
     private ApplePayService;
+    /**
+     * Merchant's onBeforeConfirm callback reference, used in Apple Pay scenario only.
+     * Set by elementController.submitPayment before payment,
+     * triggered via beforeConfirm event after Apple Pay authorization in iframe.
+     */
+    private _onBeforeConfirm;
+    private _merchantAmount;
+    private _merchantCurrency;
+    setOnBeforeConfirm(callback: (() => Promise<boolean>) | null): void;
+    setMerchantAmountOverride(amount: string | null, currency: string | null): void;
     onReady(extraParam: any): void;
     getLogger(): LogService;
     private addEventListener;