diff --git a/.changeset/nine-mugs-laugh.md b/.changeset/nine-mugs-laugh.md new file mode 100644 index 0000000..be147c0 --- /dev/null +++ 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 index 9abe7ca..83148b7 100644 --- 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 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 = ( 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 = ({ 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