From a1be5e1770253b5c04232a9d56c4fcda08828fcf Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Tue, 20 Jan 2026 00:11:46 +0100
Subject: [PATCH] review fixes for plugin wrapper blueprint

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 packages/frontend-plugin-api/src/alpha.ts     |  6 ------
 .../DefaultPluginWrapperApi.tsx               | 20 ++++++++++---------
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/packages/frontend-plugin-api/src/alpha.ts b/packages/frontend-plugin-api/src/alpha.ts
index 9d73b8cc84..2251bfafb7 100644
--- a/packages/frontend-plugin-api/src/alpha.ts
+++ b/packages/frontend-plugin-api/src/alpha.ts
@@ -14,12 +14,6 @@
  * limitations under the License.
  */
 
-/**
- * Alpha exports for plugin wrapper functionality.
- *
- * @alpha
- */
-
 export { PluginWrapperBlueprint } from './blueprints/PluginWrapperBlueprint';
 export {
   type PluginWrapperApi,
diff --git a/plugins/app/src/apis/PluginWrapperApi/DefaultPluginWrapperApi.tsx b/plugins/app/src/apis/PluginWrapperApi/DefaultPluginWrapperApi.tsx
index 65c41ee2e2..7e602ee23f 100644
--- a/plugins/app/src/apis/PluginWrapperApi/DefaultPluginWrapperApi.tsx
+++ b/plugins/app/src/apis/PluginWrapperApi/DefaultPluginWrapperApi.tsx
@@ -15,7 +15,7 @@
  */
 
 import { PluginWrapperApi } from '@backstage/frontend-plugin-api/alpha';
-import { ComponentType, ReactNode, useEffect, useState } from 'react';
+import { ComponentType, ReactNode, useEffect, useMemo, useState } from 'react';
 
 type WrapperInput = {
   loader: () => Promise<{ component: ComponentType<{ children: ReactNode }> }>;
@@ -86,17 +86,19 @@ export class DefaultPluginWrapperApi implements PluginWrapperApi {
           throw error;
         }
 
-        if (!loadedWrappers) {
-          return null;
-        }
+        return useMemo(() => {
+          if (!loadedWrappers) {
+            return null;
+          }
 
-        let content = props.children;
+          let current = props.children;
 
-        for (const Wrapper of loadedWrappers) {
-          content = <Wrapper>{content}</Wrapper>;
-        }
+          for (const Wrapper of loadedWrappers) {
+            current = <Wrapper>{current}</Wrapper>;
+          }
 
-        return <>{content}</>;
+          return current;
+        }, [loadedWrappers, props.children]);
       };
 
       composedWrappers.set(pluginId, ComposedWrapper);