@alipay/ams-checkout 0.0.1732691889-dev.11 → 0.0.1732691889-dev.13

package/esm/foundation/core/index.js

@@ -21,7 +21,7 @@ import { parseWebAppMatchConfig } from "../utils/web_app_url_utils";
 import { redirect } from "../utils/redirect_utils";
 import { insertStyleSheet } from "../../component/popupWindow.style";
 import { hideMockup, createMockup, createRetentionPopup, hideRetentionPopup, showRetentionPopup, cleanMockup, removeRetentionPopup, handleDeclareInfo } from "../../component/component.popup.style";
-import { EVENT, LOADING_ID } from "../../constant";
+import { COMPONENT_CLOSE_MASK_BLOCK_ID, EVENT, LOADING_ID } from "../../constant";
 /**
  * @author 谦彧 <zhangmian.zm@alipay.com>
  * @date 2024/9/17
@@ -359,7 +359,8 @@ export var AntomSDKCore = /*#__PURE__*/function () {
     key: "cleanRender",
     value: function cleanRender() {
       var _this3 = this,
-        _document$getElementB;
+        _document$getElementB,
+        _document$getElementB2;
       var immediately = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
       var containerService = ServiceProvider.getInstance(this.instanceId).getService('Container');
       var cleanElement = function cleanElement() {
@@ -368,7 +369,8 @@ export var AntomSDKCore = /*#__PURE__*/function () {
         removeRetentionPopup();
         // TODO @/component this.removeEventListener();
       };
-      (_document$getElementB = document.getElementById(LOADING_ID)) === null || _document$getElementB === void 0 || _document$getElementB.remove();
+      (_document$getElementB = document.getElementById(COMPONENT_CLOSE_MASK_BLOCK_ID)) === null || _document$getElementB === void 0 || _document$getElementB.remove();
+      (_document$getElementB2 = document.getElementById(LOADING_ID)) === null || _document$getElementB2 === void 0 || _document$getElementB2.remove();
       containerService.startHideAnim();
       hideMockup();
       if (immediately) {

package/esm/foundation/service/event-center.d.ts

@@ -37,6 +37,7 @@ export declare class EventCenter implements Service {
      * @param e - The message event.
      */
     private handleAppMessage;
+    private checkEventCompliant;
     /**
      * Processes the application message and emits the associated event.
      * @param data - Parsed EventPayload from the app.

package/esm/foundation/service/event-center.js

@@ -109,7 +109,7 @@ export var EventCenter = /*#__PURE__*/function () {
       var isJson = isJsonString(e.data);
       if (isJson) {
         var eventPayload = JSON.parse(e.data);
-        if (eventPayload.name !== MessageName.APP_TO_SDK || eventPayload.instanceId !== this.instanceId) {
+        if (!this.checkEventCompliant(eventPayload)) {
           return;
         }
         this._handleAppMessage(eventPayload);
@@ -117,6 +117,26 @@ export var EventCenter = /*#__PURE__*/function () {
         console.error(ERRORMESSAGE.NOT_JSON_FORMAT);
       }
     }
+  }, {
+    key: "checkEventCompliant",
+    value: function checkEventCompliant(eventPayload) {
+      // connect element场景下，多子iframes共用AntomCore中生成的instanceId，此时将发送事件方instanceId与iframes中instanceId做比较看是否在其中
+      // 非connect场景下，直接将发送事件方instanceId与AntomCore的instanceId做比较
+      if (eventPayload.name !== MessageName.APP_TO_SDK) {
+        return false;
+      }
+      var iframesInstanceIds = this.iframes.map(function (iframe) {
+        var _iframe$ref;
+        if (!new URL((_iframe$ref = iframe.ref) === null || _iframe$ref === void 0 ? void 0 : _iframe$ref.src)) {
+          return;
+        }
+        return new URL(iframe.ref.src).searchParams.get('instanceId');
+      }).filter(Boolean);
+      if (eventPayload.instanceId !== this.instanceId && !iframesInstanceIds.includes(eventPayload.instanceId)) {
+        return false;
+      }
+      return true;
+    }
 
     /**
      * Processes the application message and emits the associated event.

package/esm/plugin/component/index.js

@@ -1827,9 +1827,11 @@ var ComponentApp = /*#__PURE__*/function () {
     key: "cleanContainer",
     value: function cleanContainer() {
       var _document$getElementB4,
+        _document$getElementB5,
         _this10 = this;
       var immediately = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
-      (_document$getElementB4 = document.getElementById(LOADING_ID)) === null || _document$getElementB4 === void 0 || _document$getElementB4.remove();
+      (_document$getElementB4 = document.getElementById(COMPONENT_CLOSE_MASK_BLOCK_ID)) === null || _document$getElementB4 === void 0 || _document$getElementB4.remove();
+      (_document$getElementB5 = document.getElementById(LOADING_ID)) === null || _document$getElementB5 === void 0 || _document$getElementB5.remove();
       this.hideComponentAnimation();
       var mockup = document.getElementById(MOCKUP_ID);
       mockup === null || mockup === void 0 || mockup.classList.add("".concat(MOCKUP_ID, "-hidden"));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alipay/ams-checkout",
-  "version": "0.0.1732691889-dev.11",
+  "version": "0.0.1732691889-dev.13",
   "description": "",
   "author": "",
   "main": "esm/index.js",