@easypayment/medusa-paypal-ui 1.0.50 → 1.0.51

package/dist/index.d.cts

@@ -1,4 +1,3 @@
-import * as react_jsx_runtime from 'react/jsx-runtime';
 import React from 'react';
 
 type PayPalConfig = {
@@ -38,15 +37,7 @@ type HttpOptions = {
     publishableApiKey?: string;
 };
 
-/**
- * True when an error is a Next.js navigation signal (`redirect()` / `notFound()`
- * from a server action). These MUST be re-thrown / ignored, never shown as an
- * error — a successful `placeOrder()` redirect surfaces as one of these.
- */
-declare function isNextRedirectError(e: unknown): boolean;
-declare function markPaymentComplete(baseUrl: string, cartId: string, publishableApiKey?: string): Promise<{
-    ok: boolean;
-} & Record<string, any>>;
+declare function markPaymentComplete(baseUrl: string, cartId: string, publishableApiKey?: string): Promise<Record<string, any>>;
 declare function createPayPalStoreApi(opts: HttpOptions): {
     getConfig(cartId?: string, signal?: AbortSignal): Promise<PayPalConfig>;
     getSettings(): Promise<PayPalSettingsResponse>;
@@ -73,11 +64,11 @@ declare function PayPalProvider(props: {
     intent?: "capture" | "authorize";
     disableFunding?: string;
     children: React.ReactNode;
-}): react_jsx_runtime.JSX.Element;
+}): React.JSX.Element;
 
 declare function PayPalCurrencyNotice({ config }: {
     config: PayPalConfig;
-}): react_jsx_runtime.JSX.Element | null;
+}): React.JSX.Element | null;
 
 declare function PayPalSmartButtons(props: {
     baseUrl: string;
@@ -86,7 +77,7 @@ declare function PayPalSmartButtons(props: {
     config: PayPalConfig;
     onPaid?: (result: Record<string, unknown>) => void;
     onError?: (message: string) => void;
-}): react_jsx_runtime.JSX.Element | null;
+}): React.JSX.Element | null;
 
 declare function PayPalAdvancedCard(props: {
     baseUrl: string;
@@ -95,7 +86,7 @@ declare function PayPalAdvancedCard(props: {
     config: PayPalConfig;
     onPaid?: (result: Record<string, unknown>) => void;
     onError?: (message: string) => void;
-}): react_jsx_runtime.JSX.Element | null;
+}): React.JSX.Element | null;
 
 type MedusaNextPayPalAdapterProps = {
     cartId: string;
@@ -110,7 +101,7 @@ type MedusaNextPayPalAdapterProps = {
     onError?: (message: string) => void;
     onPaid?: (result: unknown) => void;
 };
-declare function MedusaNextPayPalAdapter(props: MedusaNextPayPalAdapterProps): react_jsx_runtime.JSX.Element | null;
+declare function MedusaNextPayPalAdapter(props: MedusaNextPayPalAdapterProps): React.JSX.Element | null;
 
 declare const PAYPAL_WALLET_PROVIDER_ID: "pp_paypal_paypal";
 declare const PAYPAL_CARD_PROVIDER_ID: "pp_paypal_card_paypal_card";
@@ -125,7 +116,7 @@ type PayPalPaymentSectionProps = {
     onError?: (message: string) => void;
     onPaid?: (result: unknown) => void;
 };
-declare function PayPalPaymentSection({ cartId, selectedProviderId, baseUrl, publishableApiKey, sessionLoading, onSuccess, onError, onPaid, }: PayPalPaymentSectionProps): react_jsx_runtime.JSX.Element | null;
+declare function PayPalPaymentSection({ cartId, selectedProviderId, baseUrl, publishableApiKey, sessionLoading, onSuccess, onError, onPaid, }: PayPalPaymentSectionProps): React.JSX.Element | null;
 
 type Args = {
     baseUrl: string;
@@ -142,4 +133,4 @@ type Result = {
 };
 declare function usePayPalPaymentMethods({ baseUrl, publishableApiKey, cartId, enabled, }: Args): Result;
 
-export { MedusaNextPayPalAdapter, type MedusaNextPayPalAdapterProps, PAYPAL_CARD_PROVIDER_ID, PAYPAL_WALLET_PROVIDER_ID, PayPalAdvancedCard, type PayPalConfig, PayPalCurrencyNotice, PayPalPaymentSection, type PayPalPaymentSectionProps, PayPalProvider, type PayPalSettingsResponse, PayPalSmartButtons, createPayPalStoreApi, isNextRedirectError, isPayPalProviderId, markPaymentComplete, usePayPalConfig, usePayPalPaymentMethods };
+export { MedusaNextPayPalAdapter, type MedusaNextPayPalAdapterProps, PAYPAL_CARD_PROVIDER_ID, PAYPAL_WALLET_PROVIDER_ID, PayPalAdvancedCard, type PayPalConfig, PayPalCurrencyNotice, PayPalPaymentSection, type PayPalPaymentSectionProps, PayPalProvider, type PayPalSettingsResponse, PayPalSmartButtons, createPayPalStoreApi, isPayPalProviderId, markPaymentComplete, usePayPalConfig, usePayPalPaymentMethods };

package/dist/index.d.ts

@@ -1,4 +1,3 @@
-import * as react_jsx_runtime from 'react/jsx-runtime';
 import React from 'react';
 
 type PayPalConfig = {
@@ -38,15 +37,7 @@ type HttpOptions = {
     publishableApiKey?: string;
 };
 
-/**
- * True when an error is a Next.js navigation signal (`redirect()` / `notFound()`
- * from a server action). These MUST be re-thrown / ignored, never shown as an
- * error — a successful `placeOrder()` redirect surfaces as one of these.
- */
-declare function isNextRedirectError(e: unknown): boolean;
-declare function markPaymentComplete(baseUrl: string, cartId: string, publishableApiKey?: string): Promise<{
-    ok: boolean;
-} & Record<string, any>>;
+declare function markPaymentComplete(baseUrl: string, cartId: string, publishableApiKey?: string): Promise<Record<string, any>>;
 declare function createPayPalStoreApi(opts: HttpOptions): {
     getConfig(cartId?: string, signal?: AbortSignal): Promise<PayPalConfig>;
     getSettings(): Promise<PayPalSettingsResponse>;
@@ -73,11 +64,11 @@ declare function PayPalProvider(props: {
     intent?: "capture" | "authorize";
     disableFunding?: string;
     children: React.ReactNode;
-}): react_jsx_runtime.JSX.Element;
+}): React.JSX.Element;
 
 declare function PayPalCurrencyNotice({ config }: {
     config: PayPalConfig;
-}): react_jsx_runtime.JSX.Element | null;
+}): React.JSX.Element | null;
 
 declare function PayPalSmartButtons(props: {
     baseUrl: string;
@@ -86,7 +77,7 @@ declare function PayPalSmartButtons(props: {
     config: PayPalConfig;
     onPaid?: (result: Record<string, unknown>) => void;
     onError?: (message: string) => void;
-}): react_jsx_runtime.JSX.Element | null;
+}): React.JSX.Element | null;
 
 declare function PayPalAdvancedCard(props: {
     baseUrl: string;
@@ -95,7 +86,7 @@ declare function PayPalAdvancedCard(props: {
     config: PayPalConfig;
     onPaid?: (result: Record<string, unknown>) => void;
     onError?: (message: string) => void;
-}): react_jsx_runtime.JSX.Element | null;
+}): React.JSX.Element | null;
 
 type MedusaNextPayPalAdapterProps = {
     cartId: string;
@@ -110,7 +101,7 @@ type MedusaNextPayPalAdapterProps = {
     onError?: (message: string) => void;
     onPaid?: (result: unknown) => void;
 };
-declare function MedusaNextPayPalAdapter(props: MedusaNextPayPalAdapterProps): react_jsx_runtime.JSX.Element | null;
+declare function MedusaNextPayPalAdapter(props: MedusaNextPayPalAdapterProps): React.JSX.Element | null;
 
 declare const PAYPAL_WALLET_PROVIDER_ID: "pp_paypal_paypal";
 declare const PAYPAL_CARD_PROVIDER_ID: "pp_paypal_card_paypal_card";
@@ -125,7 +116,7 @@ type PayPalPaymentSectionProps = {
     onError?: (message: string) => void;
     onPaid?: (result: unknown) => void;
 };
-declare function PayPalPaymentSection({ cartId, selectedProviderId, baseUrl, publishableApiKey, sessionLoading, onSuccess, onError, onPaid, }: PayPalPaymentSectionProps): react_jsx_runtime.JSX.Element | null;
+declare function PayPalPaymentSection({ cartId, selectedProviderId, baseUrl, publishableApiKey, sessionLoading, onSuccess, onError, onPaid, }: PayPalPaymentSectionProps): React.JSX.Element | null;
 
 type Args = {
     baseUrl: string;
@@ -142,4 +133,4 @@ type Result = {
 };
 declare function usePayPalPaymentMethods({ baseUrl, publishableApiKey, cartId, enabled, }: Args): Result;
 
-export { MedusaNextPayPalAdapter, type MedusaNextPayPalAdapterProps, PAYPAL_CARD_PROVIDER_ID, PAYPAL_WALLET_PROVIDER_ID, PayPalAdvancedCard, type PayPalConfig, PayPalCurrencyNotice, PayPalPaymentSection, type PayPalPaymentSectionProps, PayPalProvider, type PayPalSettingsResponse, PayPalSmartButtons, createPayPalStoreApi, isNextRedirectError, isPayPalProviderId, markPaymentComplete, usePayPalConfig, usePayPalPaymentMethods };
+export { MedusaNextPayPalAdapter, type MedusaNextPayPalAdapterProps, PAYPAL_CARD_PROVIDER_ID, PAYPAL_WALLET_PROVIDER_ID, PayPalAdvancedCard, type PayPalConfig, PayPalCurrencyNotice, PayPalPaymentSection, type PayPalPaymentSectionProps, PayPalProvider, type PayPalSettingsResponse, PayPalSmartButtons, createPayPalStoreApi, isPayPalProviderId, markPaymentComplete, usePayPalConfig, usePayPalPaymentMethods };

package/dist/index.mjs

@@ -13,7 +13,6 @@ function toHeaderRecord(headers) {
   }
   return { ...headers };
 }
-var DEFAULT_TIMEOUT_MS = 3e4;
 function createHttpClient(opts) {
   const base = opts.baseUrl.replace(/\/+$/, "");
   async function request(path, init) {
@@ -25,33 +24,8 @@ function createHttpClient(opts) {
     if (opts.publishableApiKey) {
       headers["x-publishable-api-key"] = opts.publishableApiKey;
     }
-    const controller = new AbortController();
-    let timedOut = false;
-    const timer = setTimeout(() => {
-      timedOut = true;
-      controller.abort();
-    }, DEFAULT_TIMEOUT_MS);
-    const callerSignal = init?.signal;
-    if (callerSignal) {
-      if (callerSignal.aborted) {
-        controller.abort();
-      } else {
-        callerSignal.addEventListener("abort", () => controller.abort(), { once: true });
-      }
-    }
-    let res;
-    let text;
-    try {
-      res = await fetch(url, { ...init, headers, credentials: "include", signal: controller.signal });
-      text = await res.text().catch(() => "");
-    } catch (e) {
-      if (timedOut) {
-        throw new Error("[PayPal] Request timed out. Please check your connection and try again.");
-      }
-      throw e;
-    } finally {
-      clearTimeout(timer);
-    }
+    const res = await fetch(url, { ...init, headers, credentials: "include" });
+    const text = await res.text().catch(() => "");
     if (!res.ok) {
       if (res.status === 401) {
         throw new Error(
@@ -63,21 +37,9 @@ function createHttpClient(opts) {
           "[PayPal] Forbidden (403) \u2014 this request is not allowed. Check your CORS and API key settings."
         );
       }
-      let parsed = null;
-      try {
-        parsed = text ? JSON.parse(text) : null;
-      } catch {
-        parsed = null;
-      }
-      const backendMessage = typeof parsed?.message === "string" ? parsed.message : "";
-      const requestId = typeof parsed?.request_id === "string" ? parsed.request_id : "";
-      if (res.status >= 500) {
-        console.error(`[PayPal] ${path} failed (${res.status})`, text.slice(0, 1e3));
-        throw new Error(
-          `Payment service error${requestId ? ` (ref ${requestId})` : ""}. Please try again or contact support.`
-        );
-      }
-      throw new Error(backendMessage || `Request failed (${res.status})`);
+      throw new Error(
+        text.slice(0, 500).replace(/<[^>]*>/g, "") || `Request failed (${res.status})`
+      );
     }
     if (!text) {
       throw new Error(`[PayPal] Empty response body from ${path} (${res.status})`);
@@ -98,13 +60,6 @@ function createHttpClient(opts) {
 }
 
 // src/client/paypal.ts
-function isNextRedirectError(e) {
-  if (!e || typeof e !== "object") {
-    return false;
-  }
-  const digest = e.digest;
-  return typeof digest === "string" && (digest.startsWith("NEXT_REDIRECT") || digest === "NEXT_NOT_FOUND");
-}
 async function markPaymentComplete(baseUrl, cartId, publishableApiKey) {
   try {
     const resp = await fetch(`${baseUrl.replace(/\/$/, "")}/store/paypal-complete`, {
@@ -117,14 +72,10 @@ async function markPaymentComplete(baseUrl, cartId, publishableApiKey) {
       credentials: "include"
     });
     const data = await resp.json().catch(() => ({}));
-    if (!resp.ok) {
-      console.warn("[PayPal] paypal-complete returned", resp.status, data);
-      return { ok: false, ...data || {} };
-    }
-    return { ok: true, ...data || {} };
+    return data || {};
   } catch (e) {
     console.warn("[PayPal] paypal-complete call failed:", e);
-    return { ok: false };
+    return {};
   }
 }
 function createPayPalStoreApi(opts) {
@@ -259,7 +210,7 @@ function PayPalCurrencyNotice({ config }) {
 
 // src/components/PayPalSmartButtons.tsx
 import { useMemo as useMemo3, useState as useState2 } from "react";
-import { PayPalButtons } from "@paypal/react-paypal-js";
+import { PayPalButtons, usePayPalScriptReducer } from "@paypal/react-paypal-js";
 import { jsx as jsx3, jsxs as jsxs2 } from "react/jsx-runtime";
 var SPIN_STYLE = `@keyframes _pp_spin { to { transform: rotate(360deg) } }`;
 var BUTTON_WIDTH_MAP = {
@@ -276,6 +227,7 @@ function PayPalSmartButtons(props) {
   );
   const [error, setError] = useState2(null);
   const [processing, setProcessing] = useState2(false);
+  const [{ isPending, isResolved }] = usePayPalScriptReducer();
   if (!config.currency_supported) return null;
   const containerWidth = BUTTON_WIDTH_MAP[config.button_width ?? "responsive"] ?? "100%";
   return /* @__PURE__ */ jsxs2("div", { style: { width: containerWidth, position: "relative" }, children: [
@@ -317,7 +269,40 @@ function PayPalSmartButtons(props) {
         ]
       }
     ),
-    config.environment === "sandbox" && /* @__PURE__ */ jsxs2(
+    isPending && /* @__PURE__ */ jsxs2(
+      "div",
+      {
+        style: {
+          display: "flex",
+          alignItems: "center",
+          justifyContent: "center",
+          gap: 10,
+          padding: "18px 16px",
+          background: "#f9fafb",
+          border: "1px solid #e5e7eb",
+          borderRadius: 8,
+          minHeight: 55
+        },
+        children: [
+          /* @__PURE__ */ jsx3(
+            "div",
+            {
+              style: {
+                width: 22,
+                height: 22,
+                borderRadius: "50%",
+                border: "2.5px solid #e5e7eb",
+                borderTopColor: "#0070ba",
+                animation: "_pp_spin .7s linear infinite",
+                flexShrink: 0
+              }
+            }
+          ),
+          /* @__PURE__ */ jsx3("div", { style: { fontSize: 13, fontWeight: 500, color: "#6b7280" }, children: "Loading PayPal\u2026" })
+        ]
+      }
+    ),
+    config.environment === "sandbox" && isResolved && /* @__PURE__ */ jsxs2(
       "div",
       {
         style: {
@@ -355,9 +340,10 @@ function PayPalSmartButtons(props) {
         ]
       }
     ),
-    /* @__PURE__ */ jsx3(
+    isResolved && /* @__PURE__ */ jsx3(
       PayPalButtons,
       {
+        forceReRender: [config.currency, config.intent, cartId],
         style: {
           layout: "vertical",
           color: config.button_color,
@@ -478,8 +464,7 @@ var labelStyle = {
 function SubmitButton({
   disabled,
   label,
-  onSubmit,
-  onSubmitError
+  onSubmit
 }) {
   const { cardFieldsForm } = usePayPalCardFields();
   const isDisabled = disabled || !cardFieldsForm;
@@ -490,14 +475,7 @@ function SubmitButton({
       disabled: isDisabled,
       onClick: () => {
         onSubmit();
-        const submitted = cardFieldsForm?.submit();
-        if (submitted && typeof submitted.catch === "function") {
-          submitted.catch((e) => {
-            onSubmitError(
-              e instanceof Error ? e.message : "Card payment failed. Please try again."
-            );
-          });
-        }
+        cardFieldsForm?.submit();
       },
       style: {
         width: "100%",
@@ -729,11 +707,6 @@ function PayPalAdvancedCard(props) {
                   onSubmit: () => {
                     setError(null);
                     setSubmitting(true);
-                  },
-                  onSubmitError: (msg) => {
-                    setError(msg);
-                    onError?.(msg);
-                    setSubmitting(false);
                   }
                 }
               ),
@@ -848,14 +821,9 @@ function MedusaNextPayPalAdapter(props) {
   const handlePaid = useCallback(
     (captureResult) => {
       onPaid?.(captureResult);
-      Promise.resolve(onSuccess?.(cartId)).catch((e) => {
-        if (isNextRedirectError(e)) return;
-        onError?.(
-          e instanceof Error ? e.message : "Your payment was taken but the order could not be finalized. Please contact support before paying again."
-        );
-      });
+      onSuccess?.(cartId);
     },
-    [cartId, onPaid, onSuccess, onError]
+    [cartId, onPaid, onSuccess]
   );
   if (!shouldRender) return null;
   if (loading) return /* @__PURE__ */ jsx5(PayPalLoadingCard, {});
@@ -1021,14 +989,9 @@ function PayPalPaymentSection({
   const handlePaid = useCallback2(
     (captureResult) => {
       onPaid?.(captureResult);
-      Promise.resolve(onSuccess?.(cartId)).catch((e) => {
-        if (isNextRedirectError(e)) return;
-        onError?.(
-          e instanceof Error ? e.message : "Your payment was taken but the order could not be finalized. Please contact support before paying again."
-        );
-      });
+      onSuccess?.(cartId);
     },
-    [cartId, onPaid, onSuccess, onError]
+    [cartId, onPaid, onSuccess]
   );
   if (!shouldRender) return null;
   if (sessionLoading) return /* @__PURE__ */ jsx6(SessionInitCard, {});
@@ -1165,7 +1128,6 @@ export {
   PayPalProvider,
   PayPalSmartButtons,
   createPayPalStoreApi,
-  isNextRedirectError,
   isPayPalProviderId,
   markPaymentComplete,
   usePayPalConfig,