Merge pull request #69 from sevenwestmedia-labs/feature/re-implement-…

…render-path Feature: Reimplement render path.
sevenwestmedia-labs · Apr 12, 2024 · 3d247b5 · 3d247b5
2 parents 42ceac5 + 72753da
commit 3d247b5
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 4 deletions.
diff --git a/.changeset/nine-mugs-laugh.md b/.changeset/nine-mugs-laugh.md
@@ -0,0 +1,5 @@
+---
+'json-react-layouts': minor
+---
+
+Reintroduce render path for middlewares. Refine types.
diff --git a/packages/json-react-layouts-data-loader/src/__snapshots__/data-loading.test.tsx.snap b/packages/json-react-layouts-data-loader/src/__snapshots__/data-loading.test.tsx.snap
@@ -2,7 +2,6 @@
 
 exports[`can load data for component 1`] = `
 Object {
-  "componentRenderPath": "[0]test-composition/main/[0]",
   "dataProps": Object {
     "data": Object {
       "dataDefinitionArgs": Object {
@@ -14,6 +13,7 @@ Object {
   },
   "layoutType": "test-with-data",
   "length": 3,
+  "renderPath": "[0]test-composition/main/[0]",
 }
 `;
 
@@ -65,5 +65,6 @@ Object {
     }
     services={Object {}}
   />,
+  "renderPath": "[0]test-with-data",
 }
 `;
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,