fix: empty context portals are injected to DOM

dapplets · Jul 30, 2024 · ba8950f · ba8950f
1 parent 4bc9d42
commit ba8950f
Showing 1 changed file with 34 additions and 35 deletions.
diff --git a/libs/engine/src/app/components/context-manager.tsx b/libs/engine/src/app/components/context-manager.tsx
@@ -163,29 +163,10 @@ const ContextHandler: FC<{ context: IContextNode; insPoints: InsertionPointWithE
   return (
     <>
       {insPoints.map((ip) => (
-        <ContextPortal key={ip.name} context={context} injectTo={ip.name}>
-          <InsPointHandler
-            insPointName={ip.name}
-            bosLayoutManager={ip.bosLayoutManager}
-            context={context}
-            transferableContext={transferableContext}
-            allUserLinks={links}
-            apps={apps}
-            isEditMode={isEditMode}
-            onContextQuery={handleContextQuery}
-            onCreateUserLink={createUserLink}
-            onDeleteUserLink={deleteUserLink}
-            onEnableEditMode={handleEnableEditMode}
-            onDisableEditMode={handleDisableEditMode}
-            onAttachContextRef={attachContextRef}
-            onGetLinkDataCurry={handleGetLinkDataCurry}
-            onSetLinkDataCurry={handleSetLinkDataCurry}
-          />
-        </ContextPortal>
-      ))}
-      {/* For OverlayTrigger */}
-      <ContextPortal context={context}>
         <InsPointHandler
+          key={ip.name}
+          insPointName={ip.name}
+          bosLayoutManager={ip.bosLayoutManager}
           context={context}
           transferableContext={transferableContext}
           allUserLinks={links}
@@ -200,7 +181,23 @@ const ContextHandler: FC<{ context: IContextNode; insPoints: InsertionPointWithE
           onGetLinkDataCurry={handleGetLinkDataCurry}
           onSetLinkDataCurry={handleSetLinkDataCurry}
         />
-      </ContextPortal>
+      ))}
+      {/* For OverlayTrigger */}
+      <InsPointHandler
+        context={context}
+        transferableContext={transferableContext}
+        allUserLinks={links}
+        apps={apps}
+        isEditMode={isEditMode}
+        onContextQuery={handleContextQuery}
+        onCreateUserLink={createUserLink}
+        onDeleteUserLink={deleteUserLink}
+        onEnableEditMode={handleEnableEditMode}
+        onDisableEditMode={handleDisableEditMode}
+        onAttachContextRef={attachContextRef}
+        onGetLinkDataCurry={handleGetLinkDataCurry}
+        onSetLinkDataCurry={handleSetLinkDataCurry}
+      />
 
       {controllers.map((c) => (
         <ControllerHandler
@@ -371,18 +368,20 @@ const InsPointHandler: FC<{
     config.layoutManagers.ear === layoutManagerId ? { position: 'relative' } : undefined
 
   return (
-    <ShadowDomWrapper
-      className="mweb-layout-manager"
-      style={shadowDomHostStyles}
-      stylesheetSrc={engine.config.bosElementStyleSrc}
-    >
-      <Widget
-        src={layoutManagerId ?? config.layoutManagers.horizontal}
-        props={props}
-        loading={<></>}
-        config={{ redirectMap }}
-      />
-    </ShadowDomWrapper>
+    <ContextPortal context={context} injectTo={insPointName}>
+      <ShadowDomWrapper
+        className="mweb-layout-manager"
+        style={shadowDomHostStyles}
+        stylesheetSrc={engine.config.bosElementStyleSrc}
+      >
+        <Widget
+          src={layoutManagerId ?? config.layoutManagers.horizontal}
+          props={props}
+          loading={<></>}
+          config={{ redirectMap }}
+        />
+      </ShadowDomWrapper>
+    </ContextPortal>
   )
 }