@paykka/card-checkout-ui 0.13.1 → 0.13.2

package/dist/es/components/internal/icons/IconError.js

@@ -14,20 +14,23 @@ function IconError({ size, style, className }) {
       viewBox: "0 0 16 16",
       fill: "none",
       xmlns: "http://www.w3.org/2000/svg",
-      style,
+      style: {
+        ...style,
+        marginBottom: "-2px"
+      },
       className: normalizedClass(COMMON_CLASS_NAME, className),
       children: [
-        /* @__PURE__ */ u("g", { id: "icon-error", "clip-path": "url(#clip0_21_2165)", children: /* @__PURE__ */ u("g", { id: "tips/exclamation-circle-fill", children: /* @__PURE__ */ u(
+        /* @__PURE__ */ u("g", { id: "icon-Error", "clip-path": "url(#clip0_765_422)", children: /* @__PURE__ */ u("g", { id: "tips/exclamation-circle-fill", children: /* @__PURE__ */ u(
           "path",
           {
             id: "Vector",
             "fill-rule": "evenodd",
             "clip-rule": "evenodd",
-            d: "M1.33301 8.00004C1.33301 4.31814 4.31778 1.33337 7.99967 1.33337C11.6816 1.33337 14.6663 4.31814 14.6663 8.00004C14.6663 11.6819 11.6816 14.6667 7.99967 14.6667C4.31778 14.6667 1.33301 11.6819 1.33301 8.00004ZM7.33301 10V11.3334H8.66634V10H7.33301ZM8.66634 9.33337L8.66634 4.66671H7.33301L7.33301 9.33337H8.66634Z",
+            d: "M1.33398 7.99992C1.33398 4.31802 4.31875 1.33325 8.00065 1.33325C11.6826 1.33325 14.6673 4.31802 14.6673 7.99992C14.6673 11.6818 11.6826 14.6666 8.00065 14.6666C4.31875 14.6666 1.33398 11.6818 1.33398 7.99992ZM7.33398 9.99992V11.3333H8.66732V9.99992H7.33398ZM8.66732 9.33325L8.66732 4.66659H7.33399L7.33398 9.33325H8.66732Z",
             fill: "#F53F3F"
           }
         ) }) }),
-        /* @__PURE__ */ u("defs", { children: /* @__PURE__ */ u("clipPath", { id: "clip0_21_2165", children: /* @__PURE__ */ u("rect", { width: "16", height: "16", fill: "white" }) }) })
+        /* @__PURE__ */ u("defs", { children: /* @__PURE__ */ u("clipPath", { id: "clip0_765_422", children: /* @__PURE__ */ u("rect", { width: "16", height: "16", fill: "white" }) }) })
       ]
     }
   );

package/dist/es/components/wallets/GCash/GCash.js

@@ -4,7 +4,7 @@ import { CoreContext } from "../../../core/context.js";
 import "../../../utils/card-brand/brands.js";
 import "../../../utils/system-info/get-browser-info.js";
 import { isMobile } from "../../../utils/system-info/get-system-info.js";
-import { cssVarPrefix, normalizedClass, formatAmount } from "../../../utils/format.js";
+import { normalizedClass, formatAmount } from "../../../utils/format.js";
 import { redirectToPayment } from "../../../utils/redirect.js";
 import { formatPaymentResult } from "../../../utils/payment.js";
 import { isTimeoutError } from "../../../api/http.js";
@@ -29,7 +29,7 @@ import "./g-cash.js";
 const { bem } = useBEM("gcash");
 const fieldClassNames = bem("field");
 const GCash = w((props, ref) => {
-  var _a, _b, _c, _d, _e, _f, _g;
+  var _a;
   const {
     session,
     showEmail = false,
@@ -110,9 +110,9 @@ const GCash = w((props, ref) => {
     setFieldStatus({ ...field });
   };
   const processOnSuccess = (res) => {
-    var _a2, _b2;
+    var _a2, _b;
     setSubmitButtonStatus("success");
-    (_b2 = props.onSuccess) == null ? void 0 : _b2.call(props, formatPaymentResult({
+    (_b = props.onSuccess) == null ? void 0 : _b.call(props, formatPaymentResult({
       ...res,
       returnUrl: (_a2 = session == null ? void 0 : session.checkout) == null ? void 0 : _a2.returnUrl
     }));
@@ -180,12 +180,12 @@ const GCash = w((props, ref) => {
     };
   };
   const pay = async (search = false, timeout) => {
-    var _a2, _b2, _c2, _d2, _e2, _f2, _g2;
+    var _a2, _b, _c, _d, _e, _f, _g;
     try {
       const requestOptions = { locale: i18n.locale, timeout };
       let res = null;
       if (search) {
-        const extraParams = (_b2 = (_a2 = core.config)._getExtraParams) == null ? void 0 : _b2.call(_a2, "query", PaymentMethod.GCASH);
+        const extraParams = (_b = (_a2 = core.config)._getExtraParams) == null ? void 0 : _b.call(_a2, "query", PaymentMethod.GCASH);
         res = await getGcashPayInfo(
           {
             sessionId: session.sessionId,
@@ -196,10 +196,10 @@ const GCash = w((props, ref) => {
           requestOptions
         );
       } else {
-        const extraParams = (_d2 = (_c2 = core.config)._getExtraParams) == null ? void 0 : _d2.call(_c2, "payment", PaymentMethod.GCASH);
+        const extraParams = (_d = (_c = core.config)._getExtraParams) == null ? void 0 : _d.call(_c, "payment", PaymentMethod.GCASH);
         res = await gcashPay(await getPaymentParams(), extraParams, requestOptions);
       }
-      !search && ((_e2 = props.onSubmitResponse) == null ? void 0 : _e2.call(props, res));
+      !search && ((_e = props.onSubmitResponse) == null ? void 0 : _e.call(props, res));
       const { status, orderStatus, errorMessage, errorCode, payInfo = {}, sessionId } = res;
       const { paymentExpiredAt } = payInfo;
       sessionId && (session.sessionId = sessionId);
@@ -237,7 +237,7 @@ const GCash = w((props, ref) => {
           return { end: false };
         } else if (orderStatus === "CANCELED") {
           setSubmitButtonStatus("unSubmit");
-          (_f2 = props.onTimeout) == null ? void 0 : _f2.call(props);
+          (_f = props.onTimeout) == null ? void 0 : _f.call(props);
           core.resetEnablePaymentMethod();
           return { end: true };
         }
@@ -248,7 +248,7 @@ const GCash = w((props, ref) => {
       } else if (status === "EXPIRED") {
         setShowQRCodeModal(false);
         setSubmitButtonStatus("unSubmit");
-        (_g2 = props.onExpired) == null ? void 0 : _g2.call(props);
+        (_g = props.onExpired) == null ? void 0 : _g.call(props);
         return { end: true };
       }
       setSubmitButtonStatus("unSubmit");
@@ -337,24 +337,17 @@ const GCash = w((props, ref) => {
       }
     ) }) });
   };
-  const formStyle = {
-    [cssVarPrefix("button-bg-color")]: (_a = session == null ? void 0 : session.colors) == null ? void 0 : _a.primary,
-    [cssVarPrefix("button-bg-color-hover")]: (_b = session == null ? void 0 : session.colors) == null ? void 0 : _b.primaryHover,
-    [cssVarPrefix("button-bg-color-active")]: (_c = session == null ? void 0 : session.colors) == null ? void 0 : _c.primaryActive,
-    [cssVarPrefix("button-text-color")]: (_e = (_d = session == null ? void 0 : session.checkout) == null ? void 0 : _d.theme) == null ? void 0 : _e.payButtonTextColor,
-    [cssVarPrefix("input-color")]: (_f = session == null ? void 0 : session.colors) == null ? void 0 : _f.primary
-  };
   const ErrorMessage = () => {
-    return /* @__PURE__ */ u(b, { children: !!errorMsg && /* @__PURE__ */ u(Info, { content: errorMsg, style: { marginTop: "12px" } }) });
+    return /* @__PURE__ */ u(b, { children: !!errorMsg && /* @__PURE__ */ u(Info, { content: errorMsg }) });
   };
   const Address = () => {
-    var _a2, _b2;
+    var _a2, _b;
     return /* @__PURE__ */ u(b, { children: (fieldStatus == null ? void 0 : fieldStatus.address.show) && /* @__PURE__ */ u("div", { className: fieldClassNames, children: /* @__PURE__ */ u(
       AddressField,
       {
         ref: addressFieldRef,
         value: form.address,
-        country: ((_a2 = session == null ? void 0 : session.checkout) == null ? void 0 : _a2.country) || ((_b2 = session == null ? void 0 : session.checkout) == null ? void 0 : _b2.bill.country),
+        country: ((_a2 = session == null ? void 0 : session.checkout) == null ? void 0 : _a2.country) || ((_b = session == null ? void 0 : session.checkout) == null ? void 0 : _b.bill.country),
         onAddressChange: (value) => setForm(Object.assign(form, { address: value }))
       }
     ) }) });
@@ -367,13 +360,15 @@ const GCash = w((props, ref) => {
         session,
         core
       },
-      children: isCheckoutEnabled && i18n.ready.value && /* @__PURE__ */ u(b, { children: [
+      children: isCheckoutEnabled && i18n.ready.value && /* @__PURE__ */ u("div", { className: core.theme.className, children: [
         showGuideCard && /* @__PURE__ */ u(GuideCard, { type: PaymentCategory.GCASH }),
-        /* @__PURE__ */ u(Form, { form, ref: setFormRef, onFormChange: (form2) => setForm(form2), children: /* @__PURE__ */ u("div", { className: normalizedClass(COMMON_CLASS_NAME, bem()), style: formStyle, children: [
+        /* @__PURE__ */ u(Form, { form, ref: setFormRef, onFormChange: (form2) => setForm(form2), children: /* @__PURE__ */ u("div", { className: normalizedClass(COMMON_CLASS_NAME, bem()), children: [
           Email(),
           Address(),
-          ErrorMessage(),
-          !hidePaymentButton && Button()
+          /* @__PURE__ */ u("div", { className: bem("footer-wrapper"), children: [
+            ErrorMessage(),
+            !hidePaymentButton && Button()
+          ] })
         ] }) }),
         showQRCodeModal && /* @__PURE__ */ u(
           QRCodeModal,
@@ -383,7 +378,7 @@ const GCash = w((props, ref) => {
             textColor: "#FFFFFF",
             qrCode: qrCodeInfo.qrCode,
             icon: /* @__PURE__ */ u(IconGcashComplete, { size: 22 }),
-            amount: (_g = session == null ? void 0 : session.checkout) == null ? void 0 : _g.transAmount,
+            amount: (_a = session == null ? void 0 : session.checkout) == null ? void 0 : _a.transAmount,
             expiredTime: qrCodeInfo.expiredTime,
             onClose: handleCloseQRCodeModal
           }

package/dist/es/components/wallets/Paymaya/Paymaya.js

@@ -3,7 +3,7 @@ import { useBEM } from "../../../hooks/useBEM.js";
 import { CoreContext } from "../../../core/context.js";
 import "../../../utils/card-brand/brands.js";
 import "../../../utils/system-info/get-browser-info.js";
-import { cssVarPrefix, normalizedClass, formatAmount } from "../../../utils/format.js";
+import { normalizedClass, formatAmount } from "../../../utils/format.js";
 import { redirectToPayment } from "../../../utils/redirect.js";
 import { formatPaymentResult } from "../../../utils/payment.js";
 import { isTimeoutError } from "../../../api/http.js";
@@ -26,7 +26,6 @@ import "./paymaya2.js";
 const { bem } = useBEM("paymaya");
 const fieldClassNames = bem("field");
 const Paymaya = w((props, ref) => {
-  var _a, _b, _c, _d, _e, _f;
   const {
     session,
     showEmail = false,
@@ -47,21 +46,21 @@ const Paymaya = w((props, ref) => {
       startReFetchPayInfo({ timeout });
     },
     updateAddress: () => {
-      var _a2;
+      var _a;
       if (!(fieldStatus == null ? void 0 : fieldStatus.address.show))
         return;
       const newForm = Object.assign(form, { address: addressCore.getAddressState() });
       setForm(newForm);
-      (_a2 = addressFieldRef.current) == null ? void 0 : _a2.update(addressCore.getAddressState());
+      (_a = addressFieldRef.current) == null ? void 0 : _a.update(addressCore.getAddressState());
       validateForm();
     },
     updateEmail: () => {
-      var _a2;
+      var _a;
       if (!(fieldStatus == null ? void 0 : fieldStatus.email.show))
         return;
       const newForm = Object.assign(form, { email: emailState.email });
       setForm(newForm);
-      (_a2 = emailFieldRef.current) == null ? void 0 : _a2.update(emailState.email);
+      (_a = emailFieldRef.current) == null ? void 0 : _a.update(emailState.email);
       validateForm();
     },
     payment: () => {
@@ -104,11 +103,11 @@ const Paymaya = w((props, ref) => {
     setFieldStatus({ ...field });
   };
   const processOnSuccess = (res) => {
-    var _a2, _b2;
+    var _a, _b;
     setSubmitButtonStatus("success");
-    (_b2 = props.onSuccess) == null ? void 0 : _b2.call(props, formatPaymentResult({
+    (_b = props.onSuccess) == null ? void 0 : _b.call(props, formatPaymentResult({
       ...res,
-      returnUrl: (_a2 = session == null ? void 0 : session.checkout) == null ? void 0 : _a2.returnUrl
+      returnUrl: (_a = session == null ? void 0 : session.checkout) == null ? void 0 : _a.returnUrl
     }));
   };
   y(() => {
@@ -130,16 +129,16 @@ const Paymaya = w((props, ref) => {
     }
   }, [sessionReady]);
   const processOnError = (error) => {
-    var _a2;
-    (_a2 = props.onError) == null ? void 0 : _a2.call(props, error);
+    var _a;
+    (_a = props.onError) == null ? void 0 : _a.call(props, error);
     core.resetEnablePaymentMethod();
   };
   const onTimeout = q(
     (message) => {
-      var _a2;
+      var _a;
       setErrorMsg(message || i18n.get("common.payTimeout"));
       setSubmitButtonStatus("unSubmit");
-      (_a2 = props.onTimeout) == null ? void 0 : _a2.call(props);
+      (_a = props.onTimeout) == null ? void 0 : _a.call(props);
       core.resetEnablePaymentMethod();
     },
     [i18n, props.onTimeout]
@@ -169,12 +168,12 @@ const Paymaya = w((props, ref) => {
     };
   };
   const pay = async (search = false, timeout) => {
-    var _a2, _b2, _c2, _d2, _e2, _f2, _g;
+    var _a, _b, _c, _d, _e, _f, _g;
     try {
       const requestOptions = { locale: i18n.locale, timeout };
       let res = null;
       if (search) {
-        const extraParams = (_b2 = (_a2 = core.config)._getExtraParams) == null ? void 0 : _b2.call(_a2, "query", PaymentMethod.PAYMAYA);
+        const extraParams = (_b = (_a = core.config)._getExtraParams) == null ? void 0 : _b.call(_a, "query", PaymentMethod.PAYMAYA);
         res = await getPaymayaPayInfo(
           {
             sessionId: session.sessionId,
@@ -185,10 +184,10 @@ const Paymaya = w((props, ref) => {
           requestOptions
         );
       } else {
-        const extraParams = (_d2 = (_c2 = core.config)._getExtraParams) == null ? void 0 : _d2.call(_c2, "payment", PaymentMethod.PAYMAYA);
+        const extraParams = (_d = (_c = core.config)._getExtraParams) == null ? void 0 : _d.call(_c, "payment", PaymentMethod.PAYMAYA);
         res = await paymayaPay(await getPaymentParams(), extraParams, requestOptions);
       }
-      !search && ((_e2 = props.onSubmitResponse) == null ? void 0 : _e2.call(props, res));
+      !search && ((_e = props.onSubmitResponse) == null ? void 0 : _e.call(props, res));
       const { status, orderStatus, errorMessage, errorCode, payInfo, sessionId } = res;
       sessionId && (session.sessionId = sessionId);
       if (status === "PROCESSING") {
@@ -215,7 +214,7 @@ const Paymaya = w((props, ref) => {
           return { end: false };
         } else if (orderStatus === "CANCELED") {
           setSubmitButtonStatus("unSubmit");
-          (_f2 = props.onTimeout) == null ? void 0 : _f2.call(props);
+          (_f = props.onTimeout) == null ? void 0 : _f.call(props);
           core.resetEnablePaymentMethod();
           return { end: true };
         }
@@ -247,8 +246,8 @@ const Paymaya = w((props, ref) => {
     }
   };
   const validateForm = () => {
-    var _a2;
-    (_a2 = formRef.current) == null ? void 0 : _a2.validate(void 0, false).then(() => {
+    var _a;
+    (_a = formRef.current) == null ? void 0 : _a.validate(void 0, false).then(() => {
       setValidated(true);
     }).catch(() => {
       setValidated(false);
@@ -258,12 +257,12 @@ const Paymaya = w((props, ref) => {
     validateForm();
   }, [form]);
   const onSubmit = async () => {
-    var _a2;
+    var _a;
     setErrorMsg("");
-    (_a2 = formRef.current) == null ? void 0 : _a2.validate(async (errors) => {
-      var _a3;
+    (_a = formRef.current) == null ? void 0 : _a.validate(async (errors) => {
+      var _a2;
       (fieldStatus == null ? void 0 : fieldStatus.address.show) && addressCore.setValidateAllFields(true);
-      (_a3 = props.onSubmit) == null ? void 0 : _a3.call(props, errors);
+      (_a2 = props.onSubmit) == null ? void 0 : _a2.call(props, errors);
       if (errors) {
         setSubmitButtonStatus("unSubmit");
         return;
@@ -278,8 +277,8 @@ const Paymaya = w((props, ref) => {
     dom && validateForm();
   };
   const Button = () => {
-    var _a2;
-    const transAmount = (_a2 = session == null ? void 0 : session.checkout) == null ? void 0 : _a2.transAmount;
+    var _a;
+    const transAmount = (_a = session == null ? void 0 : session.checkout) == null ? void 0 : _a.transAmount;
     const amountText = (transAmount == null ? void 0 : transAmount.amount) ? formatAmount(transAmount).jointSymbol() : "";
     const text = i18n.get("common.pay") + (amountText ? ` ${amountText}` : "");
     return /* @__PURE__ */ u(
@@ -305,24 +304,17 @@ const Paymaya = w((props, ref) => {
       }
     ) }) });
   };
-  const formStyle = {
-    [cssVarPrefix("button-bg-color")]: (_a = session == null ? void 0 : session.colors) == null ? void 0 : _a.primary,
-    [cssVarPrefix("button-bg-color-hover")]: (_b = session == null ? void 0 : session.colors) == null ? void 0 : _b.primaryHover,
-    [cssVarPrefix("button-bg-color-active")]: (_c = session == null ? void 0 : session.colors) == null ? void 0 : _c.primaryActive,
-    [cssVarPrefix("button-text-color")]: (_e = (_d = session == null ? void 0 : session.checkout) == null ? void 0 : _d.theme) == null ? void 0 : _e.payButtonTextColor,
-    [cssVarPrefix("input-color")]: (_f = session == null ? void 0 : session.colors) == null ? void 0 : _f.primary
-  };
   const ErrorMessage = () => {
-    return /* @__PURE__ */ u(b, { children: !!errorMsg && /* @__PURE__ */ u(Info, { content: errorMsg, style: { marginTop: "12px" } }) });
+    return /* @__PURE__ */ u(b, { children: !!errorMsg && /* @__PURE__ */ u(Info, { content: errorMsg }) });
   };
   const Address = () => {
-    var _a2, _b2;
+    var _a, _b;
     return /* @__PURE__ */ u(b, { children: (fieldStatus == null ? void 0 : fieldStatus.address.show) && /* @__PURE__ */ u("div", { className: fieldClassNames, children: /* @__PURE__ */ u(
       AddressField,
       {
         ref: addressFieldRef,
         value: form.address,
-        country: ((_a2 = session == null ? void 0 : session.checkout) == null ? void 0 : _a2.country) || ((_b2 = session == null ? void 0 : session.checkout) == null ? void 0 : _b2.bill.country),
+        country: ((_a = session == null ? void 0 : session.checkout) == null ? void 0 : _a.country) || ((_b = session == null ? void 0 : session.checkout) == null ? void 0 : _b.bill.country),
         onAddressChange: (value) => setForm(Object.assign(form, { address: value }))
       }
     ) }) });
@@ -335,13 +327,15 @@ const Paymaya = w((props, ref) => {
         session,
         core
       },
-      children: isCheckoutEnabled && i18n.ready.value && /* @__PURE__ */ u(b, { children: [
+      children: isCheckoutEnabled && i18n.ready.value && /* @__PURE__ */ u("div", { className: core.theme.className, children: [
         showGuideCard && /* @__PURE__ */ u(GuideCard, { type: PaymentCategory.PAYMAYA }),
-        /* @__PURE__ */ u(Form, { form, ref: setFormRef, onFormChange: (form2) => setForm(form2), children: /* @__PURE__ */ u("div", { className: normalizedClass(COMMON_CLASS_NAME, bem()), style: formStyle, children: [
+        /* @__PURE__ */ u(Form, { form, ref: setFormRef, onFormChange: (form2) => setForm(form2), children: /* @__PURE__ */ u("div", { className: normalizedClass(COMMON_CLASS_NAME, bem()), children: [
           Email(),
           Address(),
-          ErrorMessage(),
-          !hidePaymentButton && Button()
+          /* @__PURE__ */ u("div", { className: bem("footer-wrapper"), children: [
+            ErrorMessage(),
+            !hidePaymentButton && Button()
+          ] })
         ] }) })
       ] })
     }

package/dist/es/components/wallets/Zalopay/Zalopay.js

@@ -4,7 +4,7 @@ import { CoreContext } from "../../../core/context.js";
 import "../../../utils/card-brand/brands.js";
 import "../../../utils/system-info/get-browser-info.js";
 import { isMobile } from "../../../utils/system-info/get-system-info.js";
-import { cssVarPrefix, normalizedClass, formatAmount } from "../../../utils/format.js";
+import { normalizedClass, formatAmount } from "../../../utils/format.js";
 import { redirectToPayment } from "../../../utils/redirect.js";
 import { processPaymentStatus } from "../../../utils/payment.js";
 import { isTimeoutError } from "../../../api/http.js";
@@ -30,7 +30,7 @@ import "./zalopay2.js";
 const { bem } = useBEM("zalopay");
 const fieldClassNames = bem("field");
 const Zalopay = w((props, ref) => {
-  var _a, _b, _c, _d, _e, _f, _g;
+  var _a;
   const {
     session,
     showEmail = false,
@@ -173,12 +173,12 @@ const Zalopay = w((props, ref) => {
     };
   };
   const pay = async (search = false, timeout) => {
-    var _a2, _b2, _c2, _d2, _e2;
+    var _a2, _b, _c, _d, _e;
     try {
       const requestOptions = { locale: i18n.locale, timeout };
       let res = null;
       if (search) {
-        const extraParams = (_b2 = (_a2 = core.config)._getExtraParams) == null ? void 0 : _b2.call(_a2, "query", PaymentMethod.ZALOPAY);
+        const extraParams = (_b = (_a2 = core.config)._getExtraParams) == null ? void 0 : _b.call(_a2, "query", PaymentMethod.ZALOPAY);
         res = await getZalopayPayInfo(
           {
             sessionId: session.sessionId,
@@ -189,10 +189,10 @@ const Zalopay = w((props, ref) => {
           requestOptions
         );
       } else {
-        const extraParams = (_d2 = (_c2 = core.config)._getExtraParams) == null ? void 0 : _d2.call(_c2, "payment", PaymentMethod.ZALOPAY);
+        const extraParams = (_d = (_c = core.config)._getExtraParams) == null ? void 0 : _d.call(_c, "payment", PaymentMethod.ZALOPAY);
         res = await zalopayPay(await getPaymentParams(), extraParams, requestOptions);
       }
-      !search && ((_e2 = props.onSubmitResponse) == null ? void 0 : _e2.call(props, res));
+      !search && ((_e = props.onSubmitResponse) == null ? void 0 : _e.call(props, res));
       const { errorMessage, errorCode, payInfo = {}, sessionId } = res;
       sessionId && (session.sessionId = sessionId);
       const { paymentExpiredAt } = payInfo;
@@ -328,24 +328,17 @@ const Zalopay = w((props, ref) => {
       }
     ) }) });
   };
-  const formStyle = {
-    [cssVarPrefix("button-bg-color")]: (_a = session == null ? void 0 : session.colors) == null ? void 0 : _a.primary,
-    [cssVarPrefix("button-bg-color-hover")]: (_b = session == null ? void 0 : session.colors) == null ? void 0 : _b.primaryHover,
-    [cssVarPrefix("button-bg-color-active")]: (_c = session == null ? void 0 : session.colors) == null ? void 0 : _c.primaryActive,
-    [cssVarPrefix("button-text-color")]: (_e = (_d = session == null ? void 0 : session.checkout) == null ? void 0 : _d.theme) == null ? void 0 : _e.payButtonTextColor,
-    [cssVarPrefix("input-color")]: (_f = session == null ? void 0 : session.colors) == null ? void 0 : _f.primary
-  };
   const ErrorMessage = () => {
-    return /* @__PURE__ */ u(b, { children: !!errorMsg && /* @__PURE__ */ u(Info, { content: errorMsg, style: { marginTop: "12px" } }) });
+    return /* @__PURE__ */ u(b, { children: !!errorMsg && /* @__PURE__ */ u(Info, { content: errorMsg }) });
   };
   const Address = () => {
-    var _a2, _b2;
+    var _a2, _b;
     return /* @__PURE__ */ u(b, { children: (fieldStatus == null ? void 0 : fieldStatus.address.show) && /* @__PURE__ */ u("div", { className: fieldClassNames, children: /* @__PURE__ */ u(
       AddressField,
       {
         ref: addressFieldRef,
         value: form.address,
-        country: ((_a2 = session == null ? void 0 : session.checkout) == null ? void 0 : _a2.country) || ((_b2 = session == null ? void 0 : session.checkout) == null ? void 0 : _b2.bill.country),
+        country: ((_a2 = session == null ? void 0 : session.checkout) == null ? void 0 : _a2.country) || ((_b = session == null ? void 0 : session.checkout) == null ? void 0 : _b.bill.country),
         onAddressChange: (value) => setForm(Object.assign(form, { address: value }))
       }
     ) }) });
@@ -358,13 +351,15 @@ const Zalopay = w((props, ref) => {
         session,
         core
       },
-      children: isCheckoutEnabled && i18n.ready.value && /* @__PURE__ */ u(b, { children: [
+      children: isCheckoutEnabled && i18n.ready.value && /* @__PURE__ */ u("div", { className: core.theme.className, children: [
         showGuideCard && /* @__PURE__ */ u(GuideCard, { type: PaymentCategory.ZALOPAY }),
-        /* @__PURE__ */ u(Form, { form, ref: setFormRef, onFormChange: (form2) => setForm(form2), children: /* @__PURE__ */ u("div", { className: normalizedClass(COMMON_CLASS_NAME, bem()), style: formStyle, children: [
+        /* @__PURE__ */ u(Form, { form, ref: setFormRef, onFormChange: (form2) => setForm(form2), children: /* @__PURE__ */ u("div", { className: normalizedClass(COMMON_CLASS_NAME, bem()), children: [
           Email(),
           Address(),
-          ErrorMessage(),
-          !hidePaymentButton && PaymentButton()
+          /* @__PURE__ */ u("div", { className: bem("footer-wrapper"), children: [
+            ErrorMessage(),
+            !hidePaymentButton && PaymentButton()
+          ] })
         ] }) }),
         showQRCodeModal && /* @__PURE__ */ u(
           QRCodeModal,
@@ -372,7 +367,7 @@ const Zalopay = w((props, ref) => {
             title: i18n.get("qrCode.scanByZalopay"),
             qrCode: qrCodeInfo.qrCode,
             icon: /* @__PURE__ */ u(IconZalopayComplete, { size: 22 }),
-            amount: (_g = session == null ? void 0 : session.checkout) == null ? void 0 : _g.transAmount,
+            amount: (_a = session == null ? void 0 : session.checkout) == null ? void 0 : _a.transAmount,
             expiredTime: qrCodeInfo.expiredTime,
             onClose: handleCloseQRCodeModal
           }

package/dist/es/core/checkout.js

@@ -26,7 +26,7 @@ var __privateMethod = (obj, member, method) => {
   __accessCheck(obj, member, "access private method");
   return method;
 };
-var _config, _envConfig, _session, _componentInsts, _addressCore, _initPromise, _doInit, doInit_fn;
+var _id, _config, _envConfig, _session, _theme, _componentInsts, _addressCore, _initPromise, _doInit, doInit_fn;
 import { create } from "./create.js";
 import { Session } from "./session.js";
 import { setApiPrefix, setApiUrl, setCDNUrl, setFraudDetectionEnv, setCustomLocale } from "../config.js";
@@ -38,8 +38,10 @@ import "../utils/card-brand/brands.js";
 import "../utils/system-info/get-browser-info.js";
 import { getUrlParam } from "../utils/location.js";
 import { deepMerge } from "../utils/object.js";
+import { genShortId } from "../utils/string.js";
 import { d } from "../core.js";
 import { AddressCore } from "./address.js";
+import { PayKKaTheme } from "./theme.js";
 const PROCESSING_PARAM_NAME = "m";
 const DEFAULT_CHECKOUT_CONFIG = {
   enableInitValidation: true,
@@ -49,9 +51,15 @@ const DEFAULT_CHECKOUT_CONFIG = {
 class PayKKaCheckout {
   constructor(config) {
     __privateAdd(this, _doInit);
+    /**
+     * 收银台实例 ID
+     * 用于标识收银台实例，防止主题样式、iframe 通信数据等在不同收银台之间相互影响
+     */
+    __privateAdd(this, _id, void 0);
     __privateAdd(this, _config, void 0);
     __privateAdd(this, _envConfig, void 0);
     __privateAdd(this, _session, void 0);
+    __privateAdd(this, _theme, void 0);
     __privateAdd(this, _componentInsts, []);
     /**
      * 地址处理
@@ -68,6 +76,7 @@ class PayKKaCheckout {
      * 在 DropIn 且有正在处理的支付方式时，会设置为当前支付方式，并把其他支付方式设为禁用
      */
     __publicField(this, "enablePaymentMethod", d(null));
+    __privateSet(this, _id, genShortId(6));
     __privateSet(this, _config, config);
     this.init();
   }
@@ -138,6 +147,11 @@ class PayKKaCheckout {
     const { locale } = __privateGet(this, _config);
     locale && setCustomLocale(locale);
   }
+  initTheme() {
+    var _a;
+    __privateSet(this, _theme, new PayKKaTheme(__privateGet(this, _id)));
+    __privateGet(this, _theme).init((_a = __privateGet(this, _session).checkout) == null ? void 0 : _a.theme);
+  }
   initOtherData() {
     const res = getUrlParam(PROCESSING_PARAM_NAME);
     if (res) {
@@ -147,12 +161,18 @@ class PayKKaCheckout {
   get session() {
     return __privateGet(this, _session);
   }
+  get theme() {
+    return __privateGet(this, _theme);
+  }
   get envConfig() {
     return __privateGet(this, _envConfig);
   }
   get config() {
     return __privateGet(this, _config);
   }
+  get id() {
+    return __privateGet(this, _id);
+  }
   /** 创建组件，把 session 作为组件的 props 传递 */
   create(component, props) {
     var _a;
@@ -188,9 +208,11 @@ class PayKKaCheckout {
     return __privateGet(this, _addressCore);
   }
 }
+_id = new WeakMap();
 _config = new WeakMap();
 _envConfig = new WeakMap();
 _session = new WeakMap();
+_theme = new WeakMap();
 _componentInsts = new WeakMap();
 _addressCore = new WeakMap();
 _initPromise = new WeakMap();
@@ -200,6 +222,7 @@ doInit_fn = async function() {
   this.initEnv();
   this.initLocale();
   await this.initSession();
+  this.initTheme();
   this.initOtherData();
 };
 export {

package/dist/es/core/create.js

@@ -2,7 +2,7 @@ import { _, B } from "../core.js";
 import { isString } from "../utils/is.js";
 import "../utils/card-brand/brands.js";
 import "../utils/system-info/get-browser-info.js";
-import { deepFreeze } from "../utils/deep-freeze.js";
+import { deepFreeze } from "../utils/object.js";
 const internalInstMap = /* @__PURE__ */ new WeakMap();
 const setInternalInst = (inst, internalInst) => {
   const _internalInst = Object.assign(

package/dist/es/core/session.js

@@ -22,12 +22,11 @@ var __privateMethod = (obj, member, method) => {
   return method;
 };
 var _readyPromise, _init, init_fn, _initCheckout, initCheckout_fn;
+import { d } from "../core.js";
 import { isTimeoutError } from "../api/http.js";
 import "../utils/card-brand/brands.js";
 import "../utils/system-info/get-browser-info.js";
-import { generateColors } from "../utils/colors.js";
 import { createPromise } from "../utils/create-promise.js";
-import "../core.js";
 import { PayKKaError } from "./error.js";
 import { querySession } from "./query.js";
 class Session {
@@ -37,7 +36,7 @@ class Session {
     __publicField(this, "sessionId");
     __publicField(this, "clientKey");
     __publicField(this, "checkout");
-    __publicField(this, "colors", null);
+    __publicField(this, "theme", d({}));
     __publicField(this, "extraParams", {});
     __privateAdd(this, _readyPromise, createPromise());
     const { sessionId, clientKey } = params;
@@ -46,25 +45,6 @@ class Session {
     this.extraParams = extraParams;
     __privateMethod(this, _init, init_fn).call(this);
   }
-  /**
-   * 设置主题
-   * 目前的主题仅仅包含按钮背景和字体色
-   */
-  initTheme() {
-    var _a;
-    const { payButtonBackgroundColor } = ((_a = this.checkout) == null ? void 0 : _a.theme) || {};
-    if (payButtonBackgroundColor) {
-      const colors = generateColors(payButtonBackgroundColor);
-      this.colors = {
-        primary: colors[5],
-        // 主色
-        primaryHover: colors[4],
-        // 浅一点的色，用于 hover
-        primaryActive: colors[6]
-        // 深一点的色，用于 active
-      };
-    }
-  }
   ready() {
     return __privateGet(this, _readyPromise);
   }
@@ -79,7 +59,6 @@ init_fn = async function() {
     const error = isTimeoutError(err) ? err : new PayKKaError("API_ERROR", err.message, { code: err.code });
     __privateGet(this, _readyPromise).reject(error);
   }
-  this.initTheme();
 };
 _initCheckout = new WeakSet();
 initCheckout_fn = async function() {