fix(venmo): window name (#443)

* fix(venmo): window name * chore(venmo): refactor
krakenjs · Oct 30, 2023 · 02bcaab · 02bcaab
1 parent 3b6f24b
commit 02bcaab
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 7 deletions.
diff --git a/src/child/child.js b/src/child/child.js
@@ -35,6 +35,7 @@ import { normalizeChildProps } from "./props";
 export type ChildExportsType<P> = {|
   updateProps: CrossDomainFunctionType<[PropsType<P>], void>,
   close: CrossDomainFunctionType<[], void>,
+  name: string,
 |};
 
 export type ChildHelpers<P, X> = {|
@@ -302,11 +303,13 @@ export function childComponent<P, X, C>(
 
   const init = () => {
     return ZalgoPromise.try(() => {
+      let updatedChildName = "";
       if (isSameDomain(parentComponentWindow)) {
-        updateChildWindowNameWithRef({
-          componentName: options.name,
-          parentComponentWindow,
-        });
+        updatedChildName =
+          updateChildWindowNameWithRef({
+            componentName: options.name,
+            parentComponentWindow,
+          }) || "";
       }
 
       getGlobal(window).exports = options.exports({
@@ -317,7 +320,11 @@ export function childComponent<P, X, C>(
       markWindowKnown(parentComponentWindow);
       watchForClose();
 
-      return parentInit({ updateProps, close: destroy });
+      return parentInit({
+        name: updatedChildName,
+        updateProps,
+        close: destroy,
+      });
     })
       .then(() => {
         return watchForResize();

diff --git a/src/lib/window.js b/src/lib/window.js
@@ -185,7 +185,7 @@ type UpdateChildWindowNameWithRefOptions = {|
 export function updateChildWindowNameWithRef({
   componentName,
   parentComponentWindow,
-}: UpdateChildWindowNameWithRefOptions) {
+}: UpdateChildWindowNameWithRefOptions): ?string {
   const { serializedInitialPayload } = parseWindowName(window.name);
 
   const { data, sender, reference, metaData } = crossDomainDeserialize({
@@ -217,9 +217,12 @@ export function updateChildWindowNameWithRef({
       basic: true,
     });
 
-    window.name = buildChildWindowName({
+    const childWindowName = buildChildWindowName({
       name: componentName,
       serializedPayload,
     });
+
+    window.name = childWindowName;
+    return childWindowName;
   }
 }
diff --git a/src/parent/parent.js b/src/parent/parent.js
@@ -712,6 +712,7 @@ export function parentComponent<P, X, C>({
     return ZalgoPromise.try(() => {
       currentChildDomain = childDomain;
       childComponent = childExports;
+      currentProxyWin?.setName(childExports?.name);
       resolveInitPromise();
       clean.register(() => childExports.close.fireAndForget().catch(noop));
     });