From a86f8099a8dc9c2f5198f8db61b60873781ca6b4 Mon Sep 17 00:00:00 2001
From: iman <iman@syvlabs.com>
Date: Thu, 12 Dec 2024 09:36:04 +0900
Subject: [PATCH] fix

---
 packages/react/components/form.tsx | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/packages/react/components/form.tsx b/packages/react/components/form.tsx
index c52bb42..75fd0a8 100644
--- a/packages/react/components/form.tsx
+++ b/packages/react/components/form.tsx
@@ -9,7 +9,7 @@ import { usePaymentRequests } from '../hooks/use-payment-requests';
 const FORM_ID = 'op_ojs_form';
 
 const ElementsForm: FC<ElementsFormPropsReact> = (props) => {
-  const [opForm, setOpForm] = useState<OpenPayForm | null>(null);
+  const [opForm, setOpForm] = useState<OpenPayForm | null>();
   const [elementsContextValue, setElementsContextValue] = useState<ElementsContextValue | null>(null);
   const { paymentRequests, overridenOnPaymentRequestLoad } = usePaymentRequests(props.onPaymentRequestLoad);
 
@@ -20,16 +20,19 @@ const ElementsForm: FC<ElementsFormPropsReact> = (props) => {
 
   useEffect(() => {
     if (opForm) return;
+    const form =
+      OpenPayForm.getInstance() ??
+      new OpenPayForm({
+        checkoutSecureToken: props.checkoutSecureToken,
+        formTarget: `#${FORM_ID}`,
+        baseUrl: props.baseUrl,
+        customInitParams: props.customInitParams,
+        ...formCallbacks,
+      });
     // TODO: make this loading process more explicit?
-    const newForm = new OpenPayForm({
-      checkoutSecureToken: props.checkoutSecureToken,
-      formTarget: `#${FORM_ID}`,
-      baseUrl: props.baseUrl,
-      customInitParams: props.customInitParams,
-      ...formCallbacks,
-    });
-    setOpForm(newForm);
-    setElementsContextValue(getElementsContextValue(newForm));
+
+    setOpForm(form);
+    setElementsContextValue(getElementsContextValue(form));
     // Currently we initialize it once and only once
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
@@ -76,7 +79,7 @@ const getElementsContextValue = (opForm: OpenPayForm): ElementsContextValue => {
     formHeight: opForm.formProperties.height,
     referrer: opForm.referrer,
     checkoutSecureToken: opForm.checkoutSecureToken,
-    registerIframe: opForm.registerIframe,
+    registerIframe: opForm.registerIframe.bind(opForm),
     baseUrl: opForm.baseUrl,
   };
 };