From 2a0c7116d874e324c1e5448e7b620e78119ab728 Mon Sep 17 00:00:00 2001
From: Nathan Phillis <nathan.phillis@wanews.com.au>
Date: Fri, 12 Apr 2024 13:55:12 +0800
Subject: [PATCH] Reintroduce renderPath to middlewares. Improve
 ComponentOrCompositionProps type.

---
 packages/json-react-layouts/src/middlewares.ts                | 3 ++-
 .../json-react-layouts/src/renderers/component-renderer.tsx   | 4 ++--
 .../json-react-layouts/src/renderers/composition-renderer.tsx | 1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/json-react-layouts/src/middlewares.ts b/packages/json-react-layouts/src/middlewares.ts
index 55ae27a..49d56e2 100644
--- 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
index 77fcd66..9e73d5b 100644
--- 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
index 8b653b6..023f970 100644
--- 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,