@reevit/react 0.4.6 → 0.4.8

package/dist/index.mjs

@@ -360,6 +360,36 @@ function mapAvailableProviders(providers) {
     };
   }).filter((provider) => provider.methods.length > 0);
 }
+function normalizeBranding(branding) {
+  if (!branding) {
+    return {};
+  }
+  const raw = branding;
+  const theme = { ...raw };
+  const getString = (value) => typeof value === "string" ? value : void 0;
+  const getBoolean = (value) => typeof value === "boolean" ? value : void 0;
+  const setIf = (key, value) => {
+    if (value !== void 0) {
+      theme[key] = value;
+    }
+  };
+  setIf("logoUrl", getString(raw.logoUrl ?? raw.logo_url));
+  setIf("companyName", getString(raw.companyName ?? raw.company_name));
+  setIf("primaryColor", getString(raw.primaryColor ?? raw.primary_color));
+  setIf("primaryForegroundColor", getString(raw.primaryForegroundColor ?? raw.primary_foreground_color));
+  setIf("backgroundColor", getString(raw.backgroundColor ?? raw.background_color));
+  setIf("surfaceColor", getString(raw.surfaceColor ?? raw.surface_color));
+  setIf("textColor", getString(raw.textColor ?? raw.text_color));
+  setIf("mutedTextColor", getString(raw.mutedTextColor ?? raw.muted_text_color));
+  setIf("borderRadius", getString(raw.borderRadius ?? raw.border_radius));
+  setIf("fontFamily", getString(raw.fontFamily ?? raw.font_family));
+  setIf("darkMode", getBoolean(raw.darkMode ?? raw.dark_mode));
+  setIf("pspSelectorBgColor", getString(raw.pspSelectorBgColor ?? raw.psp_selector_bg_color));
+  setIf("pspSelectorTextColor", getString(raw.pspSelectorTextColor ?? raw.psp_selector_text_color));
+  setIf("pspSelectorBorderColor", getString(raw.pspSelectorBorderColor ?? raw.psp_selector_border_color));
+  setIf("pspSelectorUseBorder", getBoolean(raw.pspSelectorUseBorder ?? raw.psp_selector_use_border));
+  return theme;
+}
 function mapToPaymentIntent(response, config) {
   return {
     id: response.id,
@@ -379,7 +409,7 @@ function mapToPaymentIntent(response, config) {
     netAmount: response.net_amount,
     metadata: config.metadata,
     availableProviders: mapAvailableProviders(response.available_psps),
-    branding: response.branding
+    branding: normalizeBranding(response.branding)
   };
 }
 function useReevit(options) {
@@ -392,6 +422,7 @@ function useReevit(options) {
   });
   const apiClientRef = useRef(null);
   const initializingRef = useRef(!!config.initialPaymentIntent);
+  const initRequestIdRef = useRef(0);
   useEffect(() => {
     if (config.initialPaymentIntent) {
       if (!state.paymentIntent || state.paymentIntent.id !== config.initialPaymentIntent.id) {
@@ -415,11 +446,11 @@ function useReevit(options) {
         return;
       }
       initializingRef.current = true;
+      const requestId = ++initRequestIdRef.current;
       dispatch({ type: "INIT_START" });
       try {
         const apiClient = apiClientRef.current;
         if (!apiClient) {
-          initializingRef.current = false;
           throw new Error("API client not initialized");
         }
         const reference = config.reference || generateReference();
@@ -468,6 +499,9 @@ function useReevit(options) {
           data = result.data;
           error = result.error;
         }
+        if (requestId !== initRequestIdRef.current) {
+          return;
+        }
         if (error) {
           dispatch({ type: "INIT_ERROR", payload: error });
           onError?.(error);
@@ -487,6 +521,9 @@ function useReevit(options) {
         const paymentIntent = mapToPaymentIntent(data, { ...config, reference });
         dispatch({ type: "INIT_SUCCESS", payload: paymentIntent });
       } catch (err) {
+        if (requestId !== initRequestIdRef.current) {
+          return;
+        }
         const error = {
           code: "INIT_FAILED",
           message: err instanceof Error ? err.message : "Failed to initialize checkout",
@@ -568,6 +605,7 @@ function useReevit(options) {
   );
   const reset = useCallback(() => {
     initializingRef.current = false;
+    initRequestIdRef.current += 1;
     dispatch({ type: "RESET" });
   }, []);
   const close = useCallback(async () => {
@@ -2178,6 +2216,7 @@ function ReevitCheckout({
     };
   }, [paymentIntent?.branding, theme]);
   const themeStyles = resolvedTheme ? createThemeVariables(resolvedTheme) : {};
+  const brandName = resolvedTheme?.companyName;
   const themeMode = resolvedTheme?.darkMode;
   const dataTheme = useMemo(() => {
     if (typeof themeMode === "boolean") {
@@ -2420,7 +2459,17 @@ function ReevitCheckout({
         "aria-modal": "true",
         children: [
           /* @__PURE__ */ jsxs("div", { className: "reevit-modal__header", children: [
-            /* @__PURE__ */ jsx("div", { className: "reevit-modal__branding", children: /* @__PURE__ */ jsx("img", { src: resolvedTheme?.logoUrl || "https://i.imgur.com/bzUR5Lm.png", alt: "Checkout", className: "reevit-modal__logo" }) }),
+            /* @__PURE__ */ jsxs("div", { className: "reevit-modal__branding", children: [
+              /* @__PURE__ */ jsx(
+                "img",
+                {
+                  src: resolvedTheme?.logoUrl || "https://i.imgur.com/bzUR5Lm.png",
+                  alt: brandName || "Reevit",
+                  className: "reevit-modal__logo"
+                }
+              ),
+              brandName && /* @__PURE__ */ jsx("span", { className: "reevit-modal__brand-name", children: brandName })
+            ] }),
             /* @__PURE__ */ jsx("button", { className: "reevit-modal__close", onClick: handleClose, "aria-label": "Close", children: "\u2715" })
           ] }),
           /* @__PURE__ */ jsxs("div", { className: "reevit-modal__amount", children: [