xmlui 0.9.7 → 0.9.8

package/dist/{apiInterceptorWorker-DJ9I-JAW.mjs → apiInterceptorWorker-DOyaK_s_.mjs}

@@ -12,7 +12,7 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
 var _executor, _DeferredPromise_instances, decorate_fn, _a2;
 import { delay as delay$1, HttpResponse, http } from "msw";
 import { isArray, isObject as isObject$1, mapValues } from "lodash-es";
-import { r as runEventHandlerCode, g as getDate, d as delay, m as miscellaneousUtils, a as dateFunctions, o as orderBy, T as ThrowStatementError } from "./index-ohXvHX94.mjs";
+import { r as runEventHandlerCode, g as getDate, d as delay, m as miscellaneousUtils, a as dateFunctions, o as orderBy, T as ThrowStatementError } from "./index-CUYSE1U7.mjs";
 import Dexie from "dexie";
 var POSITIONALS_EXP = /(%?)(%([sdijo]))/g;
 function serializePositional(positional, flag) {

package/dist/{index-ohXvHX94.mjs → index-CUYSE1U7.mjs}

@@ -24487,7 +24487,8 @@ function Theme({
   tone,
   toastDuration = 5e3,
   themeVars: themeVars2 = EMPTY_OBJECT,
-  layoutContext
+  layoutContext,
+  children
 }) {
   const generatedId2 = useId();
   const { themes, resources, resourceMap, activeThemeId, setRoot, root: root2 } = useThemes();
@@ -24594,7 +24595,10 @@ function Theme({
             }
           },
           children: [
-            /* @__PURE__ */ jsx(ErrorBoundary, { node, location: "theme-root", children: renderChild2(node.children) }),
+            /* @__PURE__ */ jsxs(ErrorBoundary, { node, location: "theme-root", children: [
+              renderChild2(node.children),
+              children
+            ] }),
             /* @__PURE__ */ jsx(NotificationToast, { toastDuration })
           ]
         }
@@ -31671,7 +31675,7 @@ function IconProvider({ children }) {
     /* @__PURE__ */ jsx("svg", { style: { display: "none" }, ref: spriteRootRef })
   ] });
 }
-const version = "0.9.7";
+const version = "0.9.8";
 const ApiInterceptorContext = createContext(null);
 function useApiInterceptorContext() {
   return useContext(ApiInterceptorContext);
@@ -33433,7 +33437,8 @@ const Container = memo(
     parentRenderContext,
     memoedVarsRef,
     isImplicit,
-    uidInfoRef: parentUidInfoRef
+    uidInfoRef: parentUidInfoRef,
+    children
   }, ref) {
     var _a;
     const { apiBoundContainer } = node;
@@ -33782,12 +33787,12 @@ const Container = memo(
         if (typeof childNode === "string") {
           throw Error("should be resolved for now");
         }
-        const children = isArray(childNode) ? childNode : [childNode];
-        if (!children || !children.length) {
+        const children2 = isArray(childNode) ? childNode : [childNode];
+        if (!children2 || !children2.length) {
           return null;
         }
-        const wrapWithFragment = children.length > 1;
-        const renderedChildren2 = children.map((child, childIndex) => {
+        const wrapWithFragment = children2.length > 1;
+        const renderedChildren2 = children2.map((child, childIndex) => {
           if (!child) {
             return void 0;
           }
@@ -33875,7 +33880,7 @@ const Container = memo(
     });
     const containerContent = /* @__PURE__ */ jsxs(Fragment, { children: [
       renderedLoaders,
-      renderedChildren
+      !!children && isValidElement(renderedChildren) ? cloneElement(renderedChildren, null, children) : renderedChildren
     ] });
     return /* @__PURE__ */ jsxs(
       Fragment$1,
@@ -33990,7 +33995,9 @@ const StateContainer = memo(
     parentRenderContext,
     layoutContextRef,
     uidInfoRef,
-    isImplicit
+    isImplicit,
+    children,
+    ...rest
   }, ref) {
     const [version2, setVersion] = useState(0);
     const routingParams = useRoutingParams();
@@ -34130,7 +34137,9 @@ const StateContainer = memo(
         memoedVarsRef: memoedVars,
         isImplicit,
         ref,
-        uidInfoRef
+        uidInfoRef,
+        ...rest,
+        children
       }
     ) });
   })
@@ -34335,7 +34344,9 @@ const ContainerWrapper = memo(
     parentDispatch,
     parentRenderContext,
     layoutContextRef,
-    uidInfoRef
+    uidInfoRef,
+    children,
+    ...rest
   }, ref) {
     const containerizedNode = useMemo(() => getWrappedWithContainer(node), [node]);
     return /* @__PURE__ */ jsx(ErrorBoundary, { node, location: "container", children: /* @__PURE__ */ jsx(
@@ -34351,7 +34362,9 @@ const ContainerWrapper = memo(
         layoutContextRef,
         uidInfoRef,
         isImplicit: node.type !== "Container" && containerizedNode.uses === void 0,
-        ref
+        ref,
+        ...rest,
+        children
       }
     ) });
   })
@@ -34715,6 +34728,7 @@ const ComponentAdapter = forwardRef(function ComponentAdapter2({
   memoedVarsRef,
   onUnmount,
   uidInfoRef,
+  children,
   ...rest
 }, ref) {
   var _a;
@@ -34766,9 +34780,9 @@ const ComponentAdapter = forwardRef(function ComponentAdapter2({
     [lookupAction, uid]
   );
   const memoedRenderChild = useCallback(
-    (children, layoutContext, pRenderContext) => {
+    (children2, layoutContext, pRenderContext) => {
       return renderChild2(
-        children,
+        children2,
         layoutContext,
         pRenderContext || parentRenderContext,
         uidInfoRef
@@ -34906,12 +34920,13 @@ const ComponentAdapter = forwardRef(function ComponentAdapter2({
     return /* @__PURE__ */ jsx(InvalidComponent, { errors: [renderingError], node: safeNode, children: renderedNode });
   }
   if ((ref || !isEmpty(mouseEventHandlers)) && renderedNode && React__default.isValidElement(renderedNode)) {
+    const childrenArray = !children ? [] : Array.isArray(children) ? children : [children];
     return cloneElement(renderedNode, {
       ref: ref ? composeRefs(ref, renderedNode.ref) : renderedNode.ref,
       ...mergeProps({ ...renderedNode.props, ...mouseEventHandlers }, rest)
-    });
+    }, ...childrenArray);
   }
-  return React__default.isValidElement(renderedNode) ? renderedNode : /* @__PURE__ */ jsx(Fragment, { children: renderedNode });
+  return React__default.isValidElement(renderedNode) && !!children ? cloneElement(renderedNode, null, children) : renderedNode;
 });
 function slotRenderer({ node, extractValue, renderChild: renderChild2, lookupAction, layoutContext }, parentRenderContext) {
   const templateName = extractValue.asOptionalString(node.props.name);
@@ -35012,6 +35027,7 @@ const ComponentWrapper = memo(
     memoedVarsRef,
     cleanup,
     uidInfoRef,
+    children,
     ...rest
   }, ref) {
     var _a;
@@ -35052,7 +35068,9 @@ const ComponentWrapper = memo(
           parentStatePartChanged: statePartChanged,
           parentRegisterComponentApi: registerComponentApi,
           uidInfoRef,
-          ref
+          ref,
+          ...rest,
+          children
         }
       );
     } else {
@@ -35073,7 +35091,8 @@ const ComponentWrapper = memo(
           layoutContextRef: stableLayoutContext,
           ref,
           uidInfoRef,
-          ...rest
+          ...rest,
+          children
         }
       );
     }
@@ -35552,10 +35571,7 @@ function AppContent({
     cleanup: noop$1,
     memoedVarsRef
   });
-  return /* @__PURE__ */ jsx(AppContext.Provider, { value: appContextValue, children: /* @__PURE__ */ jsxs(AppStateContext.Provider, { value: appStateContextValue, children: [
-    renderedRoot,
-    children
-  ] }) });
+  return /* @__PURE__ */ jsx(AppContext.Provider, { value: appContextValue, children: /* @__PURE__ */ jsx(AppStateContext.Provider, { value: appStateContextValue, children: !!children && isValidElement(renderedRoot) ? cloneElement(renderedRoot, null, children) : renderedRoot }) });
 }
 function signError(error2) {
   toast.error(typeof error2 === "string" ? error2 : error2.message || "Something went wrong");
@@ -35699,7 +35715,7 @@ function ApiInterceptorProvider({
       let interceptorWorker;
       (async () => {
         if (process.env.VITE_MOCK_ENABLED) {
-          const { createApiInterceptorWorker } = await import("./apiInterceptorWorker-DJ9I-JAW.mjs");
+          const { createApiInterceptorWorker } = await import("./apiInterceptorWorker-DOyaK_s_.mjs");
           if (interceptor) {
             interceptorWorker = await createApiInterceptorWorker(interceptor, apiWorker);
             if (!apiWorker) {

package/dist/scripts/src/components/Theme/ThemeNative.js

@@ -31,7 +31,7 @@ function calculateHash(str) {
     }
     return hash;
 }
-function Theme({ id, isRoot = false, renderChild, node, tone, toastDuration = 5000, themeVars = constants_1.EMPTY_OBJECT, layoutContext, }) {
+function Theme({ id, isRoot = false, renderChild, node, tone, toastDuration = 5000, themeVars = constants_1.EMPTY_OBJECT, layoutContext, children }) {
     const generatedId = (0, react_1.useId)();
     const { themes, resources, resourceMap, activeThemeId, setRoot, root } = (0, ThemeContext_1.useThemes)();
     const { activeTheme, activeThemeTone } = (0, ThemeContext_1.useTheme)();
@@ -126,7 +126,7 @@ function Theme({ id, isRoot = false, renderChild, node, tone, toastDuration = 50
                         if (el) {
                             setRoot(el);
                         }
-                    }, children: [(0, jsx_runtime_1.jsx)(ErrorBoundary_1.ErrorBoundary, { node: node, location: "theme-root", children: renderChild(node.children) }), (0, jsx_runtime_1.jsx)(NotificationToast_1.NotificationToast, { toastDuration: toastDuration })] })] }));
+                    }, children: [(0, jsx_runtime_1.jsxs)(ErrorBoundary_1.ErrorBoundary, { node: node, location: "theme-root", children: [renderChild(node.children), children] }), (0, jsx_runtime_1.jsx)(NotificationToast_1.NotificationToast, { toastDuration: toastDuration })] })] }));
     }
     return ((0, jsx_runtime_1.jsxs)(ThemeContext_1.ThemeContext.Provider, { value: currentThemeContextValue, children: [(0, jsx_runtime_1.jsx)("style", { children: `.${rangeClassName} {${css}}` }), (0, jsx_runtime_1.jsx)("style", { children: `.${className} {${css}}` }), (0, jsx_runtime_1.jsx)("div", { className: (0, classnames_1.default)(Theme_module_scss_1.default.from, fromClass) }), renderChild(node.children, Object.assign(Object.assign({}, layoutContext), { themeClassName: className })), (0, jsx_runtime_1.jsx)("div", { className: (0, classnames_1.default)(Theme_module_scss_1.default.to, toClass) }), root &&
                 (0, react_dom_1.createPortal)((0, jsx_runtime_1.jsx)("div", { className: (0, classnames_1.default)(className), ref: (el) => {

package/dist/scripts/src/components-core/rendering/ComponentAdapter.js

@@ -78,7 +78,7 @@ const layout_resolver_1 = require("../theming/layout-resolver");
  */
 const ComponentAdapter = (0, react_1.forwardRef)(function ComponentAdapter(_a, ref) {
     var _b;
-    var { node, state, appContext, dispatch, lookupAction, lookupSyncCallback, renderChild, registerComponentApi, layoutContextRef, parentRenderContext, memoedVarsRef, onUnmount, uidInfoRef } = _a, rest = __rest(_a, ["node", "state", "appContext", "dispatch", "lookupAction", "lookupSyncCallback", "renderChild", "registerComponentApi", "layoutContextRef", "parentRenderContext", "memoedVarsRef", "onUnmount", "uidInfoRef"]);
+    var { node, state, appContext, dispatch, lookupAction, lookupSyncCallback, renderChild, registerComponentApi, layoutContextRef, parentRenderContext, memoedVarsRef, onUnmount, uidInfoRef, children } = _a, rest = __rest(_a, ["node", "state", "appContext", "dispatch", "lookupAction", "lookupSyncCallback", "renderChild", "registerComponentApi", "layoutContextRef", "parentRenderContext", "memoedVarsRef", "onUnmount", "uidInfoRef", "children"]);
     // --- Make sure the component definition has `props` and `events` properties
     // --- (even if they are empty)
     const safeNode = (0, react_1.useMemo)(() => {
@@ -247,10 +247,11 @@ const ComponentAdapter = (0, react_1.forwardRef)(function ComponentAdapter(_a, r
     if ((ref || !(0, lodash_es_1.isEmpty)(mouseEventHandlers)) && renderedNode && react_1.default.isValidElement(renderedNode)) {
         // --- For radix UI/accessibility, read more here:
         // --- https://www.radix-ui.com/primitives/docs/guides/composition
-        return (0, react_1.cloneElement)(renderedNode, Object.assign({ ref: ref ? (0, react_compose_refs_1.composeRefs)(ref, renderedNode.ref) : renderedNode.ref }, (0, mergeProps_1.mergeProps)(Object.assign(Object.assign({}, renderedNode.props), mouseEventHandlers), rest)));
+        const childrenArray = !children ? [] : Array.isArray(children) ? children : [children];
+        return (0, react_1.cloneElement)(renderedNode, Object.assign({ ref: ref ? (0, react_compose_refs_1.composeRefs)(ref, renderedNode.ref) : renderedNode.ref }, (0, mergeProps_1.mergeProps)(Object.assign(Object.assign({}, renderedNode.props), mouseEventHandlers), rest)), ...(childrenArray));
     }
     // --- If the rendering resulted in multiple React nodes, wrap them in a fragment.
-    return react_1.default.isValidElement(renderedNode) ? renderedNode : (0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: renderedNode });
+    return (react_1.default.isValidElement(renderedNode) && !!children) ? (0, react_1.cloneElement)(renderedNode, null, children) : renderedNode;
 });
 /**
  * This function renders the content of a slot. If the slot is named, it looks for a template

package/dist/scripts/src/components-core/rendering/ComponentWrapper.js

@@ -25,7 +25,7 @@ const ComponentAdapter_1 = __importDefault(require("./ComponentAdapter"));
  */
 exports.ComponentWrapper = (0, react_1.memo)((0, react_1.forwardRef)(function ComponentWrapper(_a, ref) {
     var _b;
-    var { node, resolvedKey, state, dispatch, appContext, lookupAction, lookupSyncCallback, registerComponentApi, renderChild, statePartChanged, layoutContext, parentRenderContext, memoedVarsRef, cleanup, uidInfoRef } = _a, rest = __rest(_a, ["node", "resolvedKey", "state", "dispatch", "appContext", "lookupAction", "lookupSyncCallback", "registerComponentApi", "renderChild", "statePartChanged", "layoutContext", "parentRenderContext", "memoedVarsRef", "cleanup", "uidInfoRef"]);
+    var { node, resolvedKey, state, dispatch, appContext, lookupAction, lookupSyncCallback, registerComponentApi, renderChild, statePartChanged, layoutContext, parentRenderContext, memoedVarsRef, cleanup, uidInfoRef, children } = _a, rest = __rest(_a, ["node", "resolvedKey", "state", "dispatch", "appContext", "lookupAction", "lookupSyncCallback", "registerComponentApi", "renderChild", "statePartChanged", "layoutContext", "parentRenderContext", "memoedVarsRef", "cleanup", "uidInfoRef", "children"]);
     // --- We pass the layout context to the child components, so we need to
     // --- make sure that it is stable
     const stableLayoutContext = (0, react_1.useRef)(layoutContext);
@@ -51,11 +51,11 @@ exports.ComponentWrapper = (0, react_1.memo)((0, react_1.forwardRef)(function Co
     }, [nodeWithTransformedLoaders, resolvedDataPropIsString, uidInfoRef]);
     if ((0, ContainerWrapper_1.isContainerLike)(nodeWithTransformedDatasourceProp)) {
         // --- This component should be rendered as a container
-        return ((0, jsx_runtime_1.jsx)(ContainerWrapper_1.ContainerWrapper, { resolvedKey: resolvedKey, node: nodeWithTransformedDatasourceProp, parentState: state, parentDispatch: dispatch, layoutContextRef: stableLayoutContext, parentRenderContext: parentRenderContext, parentStatePartChanged: statePartChanged, parentRegisterComponentApi: registerComponentApi, uidInfoRef: uidInfoRef, ref: ref }));
+        return ((0, jsx_runtime_1.jsx)(ContainerWrapper_1.ContainerWrapper, Object.assign({ resolvedKey: resolvedKey, node: nodeWithTransformedDatasourceProp, parentState: state, parentDispatch: dispatch, layoutContextRef: stableLayoutContext, parentRenderContext: parentRenderContext, parentStatePartChanged: statePartChanged, parentRegisterComponentApi: registerComponentApi, uidInfoRef: uidInfoRef, ref: ref }, rest, { children: children })));
     }
     else {
         // --- This component should be rendered as a regular component
-        return ((0, jsx_runtime_1.jsx)(ComponentAdapter_1.default, Object.assign({ onUnmount: cleanup, memoedVarsRef: memoedVarsRef, node: nodeWithTransformedDatasourceProp, state: state, dispatch: dispatch, appContext: appContext, lookupAction: lookupAction, lookupSyncCallback: lookupSyncCallback, registerComponentApi: registerComponentApi, renderChild: renderChild, parentRenderContext: parentRenderContext, layoutContextRef: stableLayoutContext, ref: ref, uidInfoRef: uidInfoRef }, rest)));
+        return ((0, jsx_runtime_1.jsx)(ComponentAdapter_1.default, Object.assign({ onUnmount: cleanup, memoedVarsRef: memoedVarsRef, node: nodeWithTransformedDatasourceProp, state: state, dispatch: dispatch, appContext: appContext, lookupAction: lookupAction, lookupSyncCallback: lookupSyncCallback, registerComponentApi: registerComponentApi, renderChild: renderChild, parentRenderContext: parentRenderContext, layoutContextRef: stableLayoutContext, ref: ref, uidInfoRef: uidInfoRef }, rest, { children: children })));
     }
 }));
 // --- Create a DataLoader component for each DataSource child within the

package/dist/scripts/src/components-core/rendering/Container.js

@@ -69,7 +69,7 @@ const ThemeContext_1 = require("../theming/ThemeContext");
 const LoaderComponent_1 = require("../LoaderComponent");
 const constants_1 = require("../constants");
 // React component to display a view container and implement its behavior
-exports.Container = (0, react_1.memo)((0, react_1.forwardRef)(function Container({ node, componentState, dispatch: containerDispatch, parentDispatch, resolvedKey, version, setVersion, statePartChanged, registerComponentApi: containerRegisterComponentApi, parentRegisterComponentApi, layoutContextRef, parentRenderContext, memoedVarsRef, isImplicit, uidInfoRef: parentUidInfoRef, }, ref) {
+exports.Container = (0, react_1.memo)((0, react_1.forwardRef)(function Container({ node, componentState, dispatch: containerDispatch, parentDispatch, resolvedKey, version, setVersion, statePartChanged, registerComponentApi: containerRegisterComponentApi, parentRegisterComponentApi, layoutContextRef, parentRenderContext, memoedVarsRef, isImplicit, uidInfoRef: parentUidInfoRef, children, }, ref) {
     var _a;
     const { apiBoundContainer } = node;
     const dispatch = isImplicit ? parentDispatch : containerDispatch;
@@ -544,7 +544,10 @@ exports.Container = (0, react_1.memo)((0, react_1.forwardRef)(function Container
         lookupSyncCallback,
         cleanup,
     });
-    const containerContent = ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [renderedLoaders, renderedChildren] }));
+    //TODO illesg
+    const containerContent = ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [renderedLoaders, !!children && (0, react_1.isValidElement)(renderedChildren)
+                ? (0, react_1.cloneElement)(renderedChildren, null, children)
+                : renderedChildren] }));
     return ((0, jsx_runtime_1.jsxs)(react_1.Fragment, { children: [showContainer && ((0, jsx_runtime_1.jsx)(StateViewerNative_1.StateViewer, { state: componentState, showBoundary: stateViewProps === null || stateViewProps === void 0 ? void 0 : stateViewProps.showBoundary, blink: stateViewProps === null || stateViewProps === void 0 ? void 0 : stateViewProps.blink, children: containerContent })), !showContainer && containerContent] }, node.uid
         ? `${resolvedKey}>${(0, extractParam_1.extractParam)(componentState, node.uid, appContext, true)}`
         : undefined));

package/dist/scripts/src/components-core/rendering/ContainerWrapper.js

@@ -1,4 +1,15 @@
 "use strict";
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ContainerWrapper = void 0;
 exports.isContainerLike = isContainerLike;
@@ -30,10 +41,11 @@ function isContainerLike(node) {
  * provides a context for the children to access the state and the API of the
  * parent component.
  */
-exports.ContainerWrapper = (0, react_1.memo)((0, react_1.forwardRef)(function ContainerWrapper({ node, resolvedKey, parentState, parentStatePartChanged, parentRegisterComponentApi, parentDispatch, parentRenderContext, layoutContextRef, uidInfoRef, }, ref) {
+exports.ContainerWrapper = (0, react_1.memo)((0, react_1.forwardRef)(function ContainerWrapper(_a, ref) {
+    var { node, resolvedKey, parentState, parentStatePartChanged, parentRegisterComponentApi, parentDispatch, parentRenderContext, layoutContextRef, uidInfoRef, children } = _a, rest = __rest(_a, ["node", "resolvedKey", "parentState", "parentStatePartChanged", "parentRegisterComponentApi", "parentDispatch", "parentRenderContext", "layoutContextRef", "uidInfoRef", "children"]);
     // --- Make sure the component node is wrapped with a container
     const containerizedNode = (0, react_1.useMemo)(() => getWrappedWithContainer(node), [node]);
-    return ((0, jsx_runtime_1.jsx)(ErrorBoundary_1.ErrorBoundary, { node: node, location: "container", children: (0, jsx_runtime_1.jsx)(StateContainer_1.StateContainer, { node: containerizedNode, resolvedKey: resolvedKey, parentState: parentState, parentStatePartChanged: parentStatePartChanged, parentRegisterComponentApi: parentRegisterComponentApi, parentDispatch: parentDispatch, parentRenderContext: parentRenderContext, layoutContextRef: layoutContextRef, uidInfoRef: uidInfoRef, isImplicit: node.type !== "Container" && containerizedNode.uses === undefined, ref: ref }) }));
+    return ((0, jsx_runtime_1.jsx)(ErrorBoundary_1.ErrorBoundary, { node: node, location: "container", children: (0, jsx_runtime_1.jsx)(StateContainer_1.StateContainer, Object.assign({ node: containerizedNode, resolvedKey: resolvedKey, parentState: parentState, parentStatePartChanged: parentStatePartChanged, parentRegisterComponentApi: parentRegisterComponentApi, parentDispatch: parentDispatch, parentRenderContext: parentRenderContext, layoutContextRef: layoutContextRef, uidInfoRef: uidInfoRef, isImplicit: node.type !== "Container" && containerizedNode.uses === undefined, ref: ref }, rest, { children: children })) }));
 }));
 /**
  * Wraps the specified component node with a container

package/dist/scripts/src/components-core/rendering/StateContainer.js

@@ -1,4 +1,15 @@
 "use strict";
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -28,7 +39,8 @@ const extractParam_1 = require("../utils/extractParam");
 const misc_1 = require("../utils/misc");
 // A React component that wraps a view container into an error boundary
 // (it's a named function inside the memo, this way it will be visible with that name in the react devtools)
-exports.StateContainer = (0, react_1.memo)((0, react_1.forwardRef)(function StateContainer({ node, resolvedKey, parentState, parentStatePartChanged, parentRegisterComponentApi, parentDispatch, parentRenderContext, layoutContextRef, uidInfoRef, isImplicit, }, ref) {
+exports.StateContainer = (0, react_1.memo)((0, react_1.forwardRef)(function StateContainer(_a, ref) {
+    var { node, resolvedKey, parentState, parentStatePartChanged, parentRegisterComponentApi, parentDispatch, parentRenderContext, layoutContextRef, uidInfoRef, isImplicit, children } = _a, rest = __rest(_a, ["node", "resolvedKey", "parentState", "parentStatePartChanged", "parentRegisterComponentApi", "parentDispatch", "parentRenderContext", "layoutContextRef", "uidInfoRef", "isImplicit", "children"]);
     const [version, setVersion] = (0, react_1.useState)(0);
     const routingParams = useRoutingParams();
     const memoedVars = (0, react_1.useRef)(new Map());
@@ -127,7 +139,7 @@ exports.StateContainer = (0, react_1.memo)((0, react_1.forwardRef)(function Stat
             }
         }
     }, [resolvedLocalVars, node.uses, parentStatePartChanged]);
-    return ((0, jsx_runtime_1.jsx)(ErrorBoundary_1.ErrorBoundary, { node: node, location: "container", children: (0, jsx_runtime_1.jsx)(Container_1.Container, { resolvedKey: resolvedKey, node: node, componentState: combinedState, dispatch: dispatch, parentDispatch: parentDispatch, setVersion: setVersion, version: version, statePartChanged: statePartChanged, registerComponentApi: registerComponentApi, parentRegisterComponentApi: parentRegisterComponentApi, layoutContextRef: layoutContextRef, parentRenderContext: parentRenderContext, memoedVarsRef: memoedVars, isImplicit: isImplicit, ref: ref, uidInfoRef: uidInfoRef }) }));
+    return ((0, jsx_runtime_1.jsx)(ErrorBoundary_1.ErrorBoundary, { node: node, location: "container", children: (0, jsx_runtime_1.jsx)(Container_1.Container, Object.assign({ resolvedKey: resolvedKey, node: node, componentState: combinedState, dispatch: dispatch, parentDispatch: parentDispatch, setVersion: setVersion, version: version, statePartChanged: statePartChanged, registerComponentApi: registerComponentApi, parentRegisterComponentApi: parentRegisterComponentApi, layoutContextRef: layoutContextRef, parentRenderContext: parentRenderContext, memoedVarsRef: memoedVars, isImplicit: isImplicit, ref: ref, uidInfoRef: uidInfoRef }, rest, { children: children })) }));
 }));
 const useRoutingParams = () => {
     const [queryParams] = (0, react_2.useSearchParams)();

package/dist/xmlui-standalone.umd.js

@@ -16008,7 +16008,7 @@ li ._htmlOl_1wzn5_205 {
       });
     }
   }
-  var define_process_env_default$9 = { NODE_ENV: "production", VITE_MOCK_ENABLED: true, VITE_MOCK_WORKER_LOCATION: "mockApi.js", VITE_USED_COMPONENTS_Pdf: "false", VITE_USED_COMPONENTS_Chart: "false", VITE_USER_COMPONENTS_XmluiCodeHightlighter: "false", VITE_USED_COMPONENTS_Tree: "false", VITE_XMLUI_VERSION: "0.9.7 (built 4/7/2025)" };
+  var define_process_env_default$9 = { NODE_ENV: "production", VITE_MOCK_ENABLED: true, VITE_MOCK_WORKER_LOCATION: "mockApi.js", VITE_USED_COMPONENTS_Pdf: "false", VITE_USED_COMPONENTS_Chart: "false", VITE_USER_COMPONENTS_XmluiCodeHightlighter: "false", VITE_USED_COMPONENTS_Tree: "false", VITE_XMLUI_VERSION: "0.9.8 (built 4/7/2025)" };
   class Mutation extends Removable {
     constructor(config2) {
       super();
@@ -134853,7 +134853,8 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
     tone,
     toastDuration = 5e3,
     themeVars: themeVars2 = EMPTY_OBJECT,
-    layoutContext
+    layoutContext,
+    children
   }) {
     const generatedId2 = reactExports.useId();
     const { themes, resources, resourceMap, activeThemeId, setRoot, root: root2 } = useThemes();
@@ -134960,7 +134961,10 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
               }
             },
             children: [
-              /* @__PURE__ */ jsxRuntimeExports.jsx(ErrorBoundary, { node: node2, location: "theme-root", children: renderChild2(node2.children) }),
+              /* @__PURE__ */ jsxRuntimeExports.jsxs(ErrorBoundary, { node: node2, location: "theme-root", children: [
+                renderChild2(node2.children),
+                children
+              ] }),
               /* @__PURE__ */ jsxRuntimeExports.jsx(NotificationToast, { toastDuration })
             ]
           }
@@ -144767,7 +144771,7 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
       /* @__PURE__ */ jsxRuntimeExports.jsx("svg", { style: { display: "none" }, ref: spriteRootRef })
     ] });
   }
-  const version = "0.9.7";
+  const version = "0.9.8";
   const ApiInterceptorContext = reactExports.createContext(null);
   function useApiInterceptorContext() {
     return reactExports.useContext(ApiInterceptorContext);
@@ -146529,7 +146533,8 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
       parentRenderContext,
       memoedVarsRef,
       isImplicit,
-      uidInfoRef: parentUidInfoRef
+      uidInfoRef: parentUidInfoRef,
+      children
     }, ref) {
       var _a3;
       const { apiBoundContainer } = node2;
@@ -146878,12 +146883,12 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
           if (typeof childNode === "string") {
             throw Error("should be resolved for now");
           }
-          const children = isArray$2(childNode) ? childNode : [childNode];
-          if (!children || !children.length) {
+          const children2 = isArray$2(childNode) ? childNode : [childNode];
+          if (!children2 || !children2.length) {
             return null;
           }
-          const wrapWithFragment2 = children.length > 1;
-          const renderedChildren2 = children.map((child, childIndex) => {
+          const wrapWithFragment2 = children2.length > 1;
+          const renderedChildren2 = children2.map((child, childIndex) => {
             if (!child) {
               return void 0;
             }
@@ -146971,7 +146976,7 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
       });
       const containerContent = /* @__PURE__ */ jsxRuntimeExports.jsxs(jsxRuntimeExports.Fragment, { children: [
         renderedLoaders,
-        renderedChildren
+        !!children && reactExports.isValidElement(renderedChildren) ? reactExports.cloneElement(renderedChildren, null, children) : renderedChildren
       ] });
       return /* @__PURE__ */ jsxRuntimeExports.jsxs(
         reactExports.Fragment,
@@ -147086,7 +147091,9 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
       parentRenderContext,
       layoutContextRef,
       uidInfoRef,
-      isImplicit
+      isImplicit,
+      children,
+      ...rest
     }, ref) {
       const [version2, setVersion] = reactExports.useState(0);
       const routingParams = useRoutingParams();
@@ -147226,7 +147233,9 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
           memoedVarsRef: memoedVars,
           isImplicit,
           ref,
-          uidInfoRef
+          uidInfoRef,
+          ...rest,
+          children
         }
       ) });
     })
@@ -147431,7 +147440,9 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
       parentDispatch,
       parentRenderContext,
       layoutContextRef,
-      uidInfoRef
+      uidInfoRef,
+      children,
+      ...rest
     }, ref) {
       const containerizedNode = reactExports.useMemo(() => getWrappedWithContainer(node2), [node2]);
       return /* @__PURE__ */ jsxRuntimeExports.jsx(ErrorBoundary, { node: node2, location: "container", children: /* @__PURE__ */ jsxRuntimeExports.jsx(
@@ -147447,7 +147458,9 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
           layoutContextRef,
           uidInfoRef,
           isImplicit: node2.type !== "Container" && containerizedNode.uses === void 0,
-          ref
+          ref,
+          ...rest,
+          children
         }
       ) });
     })
@@ -147893,6 +147906,7 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
     memoedVarsRef,
     onUnmount,
     uidInfoRef,
+    children,
     ...rest
   }, ref) {
     var _a3;
@@ -147944,9 +147958,9 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
       [lookupAction, uid]
     );
     const memoedRenderChild = reactExports.useCallback(
-      (children, layoutContext, pRenderContext) => {
+      (children2, layoutContext, pRenderContext) => {
         return renderChild2(
-          children,
+          children2,
           layoutContext,
           pRenderContext || parentRenderContext,
           uidInfoRef
@@ -148084,12 +148098,13 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
       return /* @__PURE__ */ jsxRuntimeExports.jsx(InvalidComponent, { errors: [renderingError], node: safeNode, children: renderedNode });
     }
     if ((ref || !isEmpty$1(mouseEventHandlers)) && renderedNode && React$1.isValidElement(renderedNode)) {
+      const childrenArray = !children ? [] : Array.isArray(children) ? children : [children];
       return reactExports.cloneElement(renderedNode, {
         ref: ref ? composeRefs$1(ref, renderedNode.ref) : renderedNode.ref,
         ...mergeProps$1({ ...renderedNode.props, ...mouseEventHandlers }, rest)
-      });
+      }, ...childrenArray);
     }
-    return React$1.isValidElement(renderedNode) ? renderedNode : /* @__PURE__ */ jsxRuntimeExports.jsx(jsxRuntimeExports.Fragment, { children: renderedNode });
+    return React$1.isValidElement(renderedNode) && !!children ? reactExports.cloneElement(renderedNode, null, children) : renderedNode;
   });
   function slotRenderer({ node: node2, extractValue, renderChild: renderChild2, lookupAction, layoutContext }, parentRenderContext) {
     const templateName = extractValue.asOptionalString(node2.props.name);
@@ -148190,6 +148205,7 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
       memoedVarsRef,
       cleanup,
       uidInfoRef,
+      children,
       ...rest
     }, ref) {
       var _a3;
@@ -148230,7 +148246,9 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
             parentStatePartChanged: statePartChanged,
             parentRegisterComponentApi: registerComponentApi,
             uidInfoRef,
-            ref
+            ref,
+            ...rest,
+            children
           }
         );
       } else {
@@ -148251,7 +148269,8 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
             layoutContextRef: stableLayoutContext,
             ref,
             uidInfoRef,
-            ...rest
+            ...rest,
+            children
           }
         );
       }
@@ -148730,10 +148749,7 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
       cleanup: noop$5,
       memoedVarsRef
     });
-    return /* @__PURE__ */ jsxRuntimeExports.jsx(AppContext.Provider, { value: appContextValue, children: /* @__PURE__ */ jsxRuntimeExports.jsxs(AppStateContext.Provider, { value: appStateContextValue, children: [
-      renderedRoot,
-      children
-    ] }) });
+    return /* @__PURE__ */ jsxRuntimeExports.jsx(AppContext.Provider, { value: appContextValue, children: /* @__PURE__ */ jsxRuntimeExports.jsx(AppStateContext.Provider, { value: appStateContextValue, children: !!children && reactExports.isValidElement(renderedRoot) ? reactExports.cloneElement(renderedRoot, null, children) : renderedRoot }) });
   }
   function signError(error2) {
     _t$1.error(typeof error2 === "string" ? error2 : error2.message || "Something went wrong");
@@ -149566,7 +149582,7 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
     ToneChangerButton: ToneChangerButtonMd,
     Tree: TreeMd
   };
-  var define_process_env_default$2 = { VITE_XMLUI_VERSION: "0.9.7 (built 4/7/2025)" };
+  var define_process_env_default$2 = { VITE_XMLUI_VERSION: "0.9.8 (built 4/7/2025)" };
   const MAIN_FILE = "Main." + componentFileExtension;
   const MAIN_CODE_BEHIND_FILE = "Main." + codeBehindFileExtension;
   const CONFIG_FILE = "config.json";
@@ -153888,7 +153904,7 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
   function isResponseWithoutBody(status) {
     return RESPONSE_STATUS_CODES_WITHOUT_BODY.has(status);
   }
-  var define_process_env_default$1 = { NODE_ENV: "production", VITE_MOCK_ENABLED: true, VITE_MOCK_WORKER_LOCATION: "mockApi.js", VITE_USED_COMPONENTS_Pdf: "false", VITE_USED_COMPONENTS_Chart: "false", VITE_USER_COMPONENTS_XmluiCodeHightlighter: "false", VITE_USED_COMPONENTS_Tree: "false", VITE_XMLUI_VERSION: "0.9.7 (built 4/7/2025)" };
+  var define_process_env_default$1 = { NODE_ENV: "production", VITE_MOCK_ENABLED: true, VITE_MOCK_WORKER_LOCATION: "mockApi.js", VITE_USED_COMPONENTS_Pdf: "false", VITE_USED_COMPONENTS_Chart: "false", VITE_USER_COMPONENTS_XmluiCodeHightlighter: "false", VITE_USED_COMPONENTS_Tree: "false", VITE_XMLUI_VERSION: "0.9.8 (built 4/7/2025)" };
   var __defProp$7 = Object.defineProperty;
   var __export = (target2, all2) => {
     for (var name2 in all2)

package/dist/xmlui.mjs

@@ -1,4 +1,4 @@
-import { A, B, E, I, i, h, S, b, c, e, f, j, p, s, t, k, u } from "./index-ohXvHX94.mjs";
+import { A, B, E, I, i, h, S, b, c, e, f, j, p, s, t, k, u } from "./index-CUYSE1U7.mjs";
 export {
   A as AppRoot,
   B as Button,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xmlui",
-  "version": "0.9.7",
+  "version": "0.9.8",
   "sideEffects": false,
   "scripts": {
     "start-test-bed": "cd src/testing/infrastructure && xmlui start",