@jfdevelops/react-layout 1.1.0 → 1.2.0

package/dist/create-config/define-layout.cjs

@@ -178,7 +178,7 @@ function defineResourceLayoutImpl(options, inheritedStateScope) {
 				for (const [stateName, input] of Object.entries(renderStates)) if (input === source.input) return stateName === "default" ? Component : stateComponents[stateName];
 				let reference = referenceComponents.get(source.input);
 				if (!reference) {
-					reference = createStateComponent(source.name, source.input, false);
+					reference = createStateComponent(source.name, source.input, false, source.fallbackStateName);
 					referenceComponents.set(source.input, reference);
 				}
 				return reference;
@@ -271,7 +271,8 @@ function defineResourceLayoutImpl(options, inheritedStateScope) {
 					children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(require_state_composable.StateComposableContext.Provider, {
 						value: {
 							scope: stateScope,
-							props: layoutRenderProps
+							props: layoutRenderProps,
+							definitions: mergedResolvedInProps
 						},
 						children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(RenderDefaultState, { renderProps: layoutRenderProps })
 					})
@@ -293,12 +294,12 @@ function defineResourceLayoutImpl(options, inheritedStateScope) {
 			if (!compositionOptions.components) return {};
 			return { makeComposable: createComposableLayout(compositionOptions) };
 		}
-		function createStateComponent(stateName, input, validateStateName = true) {
+		function createStateComponent(stateName, input, validateStateName = true, fallbackStateName = stateName) {
 			if (require_render_state.isLazyRenderState(input)) {
 				const loadState = input[require_render_state.lazyRenderStateSymbol];
 				function createLazyState() {
 					return (0, react.lazy)(async () => {
-						const stateDefinition = require_render_state.findDefinedRenderState(await loadState().catch((error) => {
+						const stateDefinition = await require_render_state.findDefinedRenderState(await loadState().catch((error) => {
 							throw new require_resource_state_error.ResourceModuleLoadError(String(layoutContext.resource), error);
 						}));
 						if (validateStateName && stateDefinition.state !== void 0 && stateDefinition.state !== stateName) throw new require_layout_configuration_error.LayoutConfigurationError(`Lazy render state "${stateDefinition.state}" cannot be used as "${stateName}"`);
@@ -309,8 +310,8 @@ function defineResourceLayoutImpl(options, inheritedStateScope) {
 					const [, rerender] = (0, react.useReducer)((version) => version + 1, 0);
 					const LazyState = (0, react.useRef)(createLazyState());
 					const CurrentLazyState = LazyState.current;
-					const LoadingComponent = stateName === "Loading" ? void 0 : stateComponents.Loading;
-					const ErrorComponent = stateName === "Error" ? void 0 : stateComponents.Error;
+					const LoadingComponent = fallbackStateName === "Loading" ? void 0 : stateComponents.Loading;
+					const ErrorComponent = fallbackStateName === "Error" ? void 0 : stateComponents.Error;
 					function retry() {
 						LazyState.current = createLazyState();
 						rerender();
@@ -339,8 +340,8 @@ function defineResourceLayoutImpl(options, inheritedStateScope) {
 			if (!require_render_state.isDeferredRenderState(input)) return StateComponent;
 			const DeferredState = (0, react.lazy)(() => Promise.resolve({ default: StateComponent }));
 			function DeferredStateComponent(props) {
-				const LoadingComponent = stateName === "Loading" ? void 0 : stateComponents.Loading;
-				const ErrorComponent = stateName === "Error" ? void 0 : stateComponents.Error;
+				const LoadingComponent = fallbackStateName === "Loading" ? void 0 : stateComponents.Loading;
+				const ErrorComponent = fallbackStateName === "Error" ? void 0 : stateComponents.Error;
 				const rendered = /* @__PURE__ */ (0, react_jsx_runtime.jsx)(react.Suspense, {
 					fallback: LoadingComponent ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(LoadingComponent, {}) : null,
 					children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(DeferredState, { ...props })