Reintroduce renderPath to middlewares. Improve ComponentOrComposition…

…Props type.
sevenwestmedia-labs · Apr 12, 2024 · 2a0c711 · 2a0c711
1 parent 6fdfc22
commit 2a0c711
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/packages/json-react-layouts/src/middlewares.ts b/packages/json-react-layouts/src/middlewares.ts
@@ -17,7 +17,8 @@ export type MiddlwareHandler<TProps, TMiddlewareProps extends {}, LoadDataServic
 
 interface ComponentOrCompositionProps {
     layoutType: string
-    [props: string]: any
+    renderPath: string
+    [props: string]: unknown
 }
 
 export type RendererMiddleware<Services extends {}, MiddlewareProps extends {}> = (

diff --git a/packages/json-react-layouts/src/renderers/component-renderer.tsx b/packages/json-react-layouts/src/renderers/component-renderer.tsx
@@ -54,11 +54,11 @@ export const ComponentRenderer: React.FC<ComponentRendererProps> = ({
         return rendered
     }
 
-    const { componentType, ...rest } = componentProps
+    const { componentType, componentRenderPath, ...rest } = componentProps
 
     const middlewareRender =
         componentMiddleware(
-            { layoutType: componentType, ...rest },
+            { layoutType: componentType, renderPath: componentRenderPath, ...rest },
             middlewareProps,
             componentServices,
             render,

diff --git a/packages/json-react-layouts/src/renderers/composition-renderer.tsx b/packages/json-react-layouts/src/renderers/composition-renderer.tsx
@@ -98,6 +98,7 @@ export const CompositionRenderer: React.FunctionComponent<CompositionRendererPro
         compositionMiddleware(
             {
                 layoutType: composition.type,
+                renderPath: componentRenderPath,
                 ...composition.props,
             },
             middlewareProps,