xmlui 0.9.7 → 0.9.9

package/dist/{apiInterceptorWorker-DJ9I-JAW.mjs → apiInterceptorWorker-DmE-x8Au.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-CmAO1zjU.mjs";
 import Dexie from "dexie";
 var POSITIONALS_EXP = /(%?)(%([sdijo]))/g;
 function serializePositional(positional, flag) {

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

@@ -7,7 +7,7 @@ import { useQuery, useInfiniteQuery, QueryClientProvider, QueryClient } from "@t
 import produce, { createDraft, finishDraft, enableMapSet } from "immer";
 import { throttle, get, isNil, omitBy, isUndefined, noop as noop$2, isPlainObject, isEqual, union, uniq, orderBy as orderBy$1, isEmpty, isObject, isArray, groupBy, sortBy, omit, isNumber, isString, cloneDeep, merge, defaultTo, capitalize, unset, setWith, keyBy, pick } from "lodash-es";
 import { formatDistanceToNow, parse, format, parseISO, isValid, isTomorrow, isYesterday, isToday, isThisWeek, formatRelative, isThisYear, isSameDay, differenceInMinutes } from "date-fns";
-import { v as validationStatusMd, l as labelPositionMd, o as orientationOptionMd, a as alignmentOptionValues, L as LinkTargetMd, b as alignmentOptionMd, i as iconPositionMd, c as buttonTypesMd, s as sizeMd, d as buttonThemeMd, e as buttonVariantMd, P as Parser, T as T_CALCULATED_MEMBER_ACCESS_EXPRESSION, f as T_MEMBER_ACCESS_EXPRESSION, g as T_IDENTIFIER, h as T_PREFIX_OP_EXPRESSION, j as T_FUNCTION_DECLARATION, k as T_ARROW_EXPRESSION, m as createXmlUiTreeNodeId, n as T_EMPTY_STATEMENT, p as T_SWITCH_STATEMENT, q as T_TRY_STATEMENT, r as T_THROW_STATEMENT, t as T_FOR_OF_STATEMENT, u as T_FOR_IN_STATEMENT, w as T_FOR_STATEMENT, x as T_EXPRESSION_STATEMENT, y as T_BREAK_STATEMENT, z as T_CONTINUE_STATEMENT, A as T_DO_WHILE_STATEMENT, B as T_WHILE_STATEMENT, C as T_RETURN_STATEMENT, D as T_IF_STATEMENT, E as T_CONST_STATEMENT, F as T_LET_STATEMENT, G as T_ARROW_EXPRESSION_STATEMENT, H as T_BLOCK_STATEMENT, I as T_VAR_STATEMENT, J as T_ASSIGNMENT_EXPRESSION, K as T_LITERAL, M as T_SPREAD_EXPRESSION, N as T_FUNCTION_INVOCATION_EXPRESSION, O as T_POSTFIX_OP_EXPRESSION, Q as T_CONDITIONAL_EXPRESSION, R as T_BINARY_EXPRESSION, S as T_UNARY_EXPRESSION, U as T_OBJECT_LITERAL, V as T_ARRAY_LITERAL, W as T_SEQUENCE_EXPRESSION, X as T_TEMPLATE_LITERAL_EXPRESSION, Y as T_VAR_DECLARATION, Z as T_DESTRUCTURE, _ as TextVariantElement, $ as VariantPropsKeys, a0 as variantOptionsMd, a1 as scrollAnchoringValues, a2 as buttonThemeNames, a3 as iconPositionNames, a4 as buttonVariantNames, a5 as nodeToComponentDef, a6 as triggerPositionNames, a7 as statusColorMd, a8 as placementMd, a9 as httpMethodNames, aa as PARSED_MARK_PROP, ab as layoutOptionKeys, ac as viewportSizeNames, ad as componentFileExtension, ae as codeBehindFileExtension, af as getLintSeverity, ag as LintSeverity, ah as lintApp, ai as printComponentLints, aj as lintErrorsComponent, ak as collectCodeBehindFromSource, al as removeCodeBehindTokensFromTree } from "./lint-B9tKGcOX.mjs";
+import { v as validationStatusMd, l as labelPositionMd, o as orientationOptionMd, a as alignmentOptionValues, L as LinkTargetMd, b as alignmentOptionMd, i as iconPositionMd, c as buttonTypesMd, s as sizeMd, d as buttonThemeMd, e as buttonVariantMd, P as Parser, T as T_CALCULATED_MEMBER_ACCESS_EXPRESSION, f as T_MEMBER_ACCESS_EXPRESSION, g as T_IDENTIFIER, h as T_PREFIX_OP_EXPRESSION, j as T_FUNCTION_DECLARATION, k as T_ARROW_EXPRESSION, m as createXmlUiTreeNodeId, n as T_EMPTY_STATEMENT, p as T_SWITCH_STATEMENT, q as T_TRY_STATEMENT, r as T_THROW_STATEMENT, t as T_FOR_OF_STATEMENT, u as T_FOR_IN_STATEMENT, w as T_FOR_STATEMENT, x as T_EXPRESSION_STATEMENT, y as T_BREAK_STATEMENT, z as T_CONTINUE_STATEMENT, A as T_DO_WHILE_STATEMENT, B as T_WHILE_STATEMENT, C as T_RETURN_STATEMENT, D as T_IF_STATEMENT, E as T_CONST_STATEMENT, F as T_LET_STATEMENT, G as T_ARROW_EXPRESSION_STATEMENT, H as T_BLOCK_STATEMENT, I as T_VAR_STATEMENT, J as T_ASSIGNMENT_EXPRESSION, K as T_LITERAL, M as T_SPREAD_EXPRESSION, N as T_FUNCTION_INVOCATION_EXPRESSION, O as T_POSTFIX_OP_EXPRESSION, Q as T_CONDITIONAL_EXPRESSION, R as T_BINARY_EXPRESSION, S as T_UNARY_EXPRESSION, U as T_OBJECT_LITERAL, V as T_ARRAY_LITERAL, W as T_SEQUENCE_EXPRESSION, X as T_TEMPLATE_LITERAL_EXPRESSION, Y as T_VAR_DECLARATION, Z as T_DESTRUCTURE, _ as TextVariantElement, $ as VariantPropsKeys, a0 as variantOptionsMd, a1 as scrollAnchoringValues, a2 as buttonThemeNames, a3 as iconPositionNames, a4 as buttonVariantNames, a5 as nodeToComponentDef, a6 as triggerPositionNames, a7 as statusColorMd, a8 as placementMd, a9 as httpMethodNames, aa as PARSED_MARK_PROP, ab as layoutOptionKeys, ac as viewportSizeNames, ad as componentFileExtension, ae as codeBehindFileExtension, af as getLintSeverity, ag as LintSeverity, ah as lintApp, ai as printComponentLints, aj as lintErrorsComponent, ak as collectCodeBehindFromSource, al as removeCodeBehindTokensFromTree } from "./lint-DmJOJSJa.mjs";
 import classnames from "classnames";
 import Color from "color";
 import TextareaAutosize from "react-textarea-autosize";
@@ -8207,7 +8207,7 @@ function generateBorderSegments(theme2) {
   }
   const result = { ...theme2 };
   Object.entries(theme2).forEach(([key, value]) => {
-    var _a, _b;
+    var _a, _b, _c;
     let match = borderRegEx.exec(key);
     if (match) {
       const remainder = match[1];
@@ -8216,9 +8216,9 @@ function generateBorderSegments(theme2) {
       result[`borderTop-${remainder}`] = value;
       result[`borderBottom-${remainder}`] = value;
       const border = getBorderSegments(value);
-      result[`borderWidth-${remainder}`] = border.thickness;
-      result[_a = `borderStyle-${remainder}`] ?? (result[_a] = border.style);
-      result[_b = `borderColor-${remainder}`] ?? (result[_b] = border.color);
+      result[_a = `borderWidth-${remainder}`] ?? (result[_a] = border.thickness);
+      result[_b = `borderStyle-${remainder}`] ?? (result[_b] = border.style);
+      result[_c = `borderColor-${remainder}`] ?? (result[_c] = border.color);
     }
     match = thicknessBorderRegEx.exec(key);
     if (match) {
@@ -14556,6 +14556,7 @@ const TextBox = forwardRef(function TextBox2({
   labelBreak: labelBreak2,
   required: required2
 }, ref) {
+  id = id || useId();
   const inputRef = useRef(null);
   useEffect(() => {
     if (autoFocus) {
@@ -14608,6 +14609,7 @@ const TextBox = forwardRef(function TextBox2({
   return /* @__PURE__ */ jsx(
     ItemWithLabel,
     {
+      id,
       labelPosition,
       label: label2,
       labelWidth,
@@ -24487,7 +24489,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 +24597,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 +31677,7 @@ function IconProvider({ children }) {
     /* @__PURE__ */ jsx("svg", { style: { display: "none" }, ref: spriteRootRef })
   ] });
 }
-const version = "0.9.7";
+const version = "0.9.9";
 const ApiInterceptorContext = createContext(null);
 function useApiInterceptorContext() {
   return useContext(ApiInterceptorContext);
@@ -33433,7 +33439,8 @@ const Container = memo(
     parentRenderContext,
     memoedVarsRef,
     isImplicit,
-    uidInfoRef: parentUidInfoRef
+    uidInfoRef: parentUidInfoRef,
+    children
   }, ref) {
     var _a;
     const { apiBoundContainer } = node;
@@ -33782,12 +33789,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 +33882,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 +33997,9 @@ const StateContainer = memo(
     parentRenderContext,
     layoutContextRef,
     uidInfoRef,
-    isImplicit
+    isImplicit,
+    children,
+    ...rest
   }, ref) {
     const [version2, setVersion] = useState(0);
     const routingParams = useRoutingParams();
@@ -34130,7 +34139,9 @@ const StateContainer = memo(
         memoedVarsRef: memoedVars,
         isImplicit,
         ref,
-        uidInfoRef
+        uidInfoRef,
+        ...rest,
+        children
       }
     ) });
   })
@@ -34335,7 +34346,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 +34364,9 @@ const ContainerWrapper = memo(
         layoutContextRef,
         uidInfoRef,
         isImplicit: node.type !== "Container" && containerizedNode.uses === void 0,
-        ref
+        ref,
+        ...rest,
+        children
       }
     ) });
   })
@@ -34715,6 +34730,7 @@ const ComponentAdapter = forwardRef(function ComponentAdapter2({
   memoedVarsRef,
   onUnmount,
   uidInfoRef,
+  children,
   ...rest
 }, ref) {
   var _a;
@@ -34766,9 +34782,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 +34922,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 +35029,7 @@ const ComponentWrapper = memo(
     memoedVarsRef,
     cleanup,
     uidInfoRef,
+    children,
     ...rest
   }, ref) {
     var _a;
@@ -35052,7 +35070,9 @@ const ComponentWrapper = memo(
           parentStatePartChanged: statePartChanged,
           parentRegisterComponentApi: registerComponentApi,
           uidInfoRef,
-          ref
+          ref,
+          ...rest,
+          children
         }
       );
     } else {
@@ -35073,7 +35093,8 @@ const ComponentWrapper = memo(
           layoutContextRef: stableLayoutContext,
           ref,
           uidInfoRef,
-          ...rest
+          ...rest,
+          children
         }
       );
     }
@@ -35552,10 +35573,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 +35717,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-DmE-x8Au.mjs");
           if (interceptor) {
             interceptorWorker = await createApiInterceptorWorker(interceptor, apiWorker);
             if (!apiWorker) {
@@ -36315,6 +36333,7 @@ async function parseCodeBehindResponse(response) {
   try {
     parser.parseStatements();
   } catch (e) {
+    console.error("Error parsing code behind", e);
     if (parser.errors.length > 0) {
       return {
         component: errReportScriptError(parser.errors[0], response.url),
@@ -36323,19 +36342,23 @@ async function parseCodeBehindResponse(response) {
       };
     }
   }
-  const codeBehind = collectCodeBehindFromSource("Main", code2);
-  if (Object.keys(codeBehind.moduleErrors ?? {}).length > 0) {
+  try {
+    const codeBehind = collectCodeBehindFromSource("Main", code2);
+    if (Object.keys(codeBehind.moduleErrors ?? {}).length > 0) {
+      return {
+        component: errReportModuleErrors(codeBehind.moduleErrors, response.url),
+        file: response.url,
+        hasError: true
+      };
+    }
+    removeCodeBehindTokensFromTree(codeBehind);
     return {
-      component: errReportModuleErrors(codeBehind.moduleErrors, response.url),
-      file: response.url,
-      hasError: true
+      codeBehind,
+      file: response.url
     };
+  } catch (e) {
+    console.error("Error collecting code behind", e);
   }
-  removeCodeBehindTokensFromTree(codeBehind);
-  return {
-    codeBehind,
-    file: response.url
-  };
 }
 function matchesFileName(path, fileName) {
   return path.endsWith(`/${fileName}.ts`) || path.endsWith(`/${fileName}.js`) || path.endsWith(`/${fileName}.${componentFileExtension}`) || path.endsWith(`/${fileName}.${codeBehindFileExtension}`);
@@ -36627,9 +36650,10 @@ function useStandalone(standaloneAppDef, runtime = EMPTY_OBJECT, extensionManage
             );
             const componentCodeBehindPromise = new Promise(async (resolve) => {
               try {
-                const codeBehindWrapper = await parseCodeBehindResponse(
-                  await fetchWithoutCache(`components/${componentPath}.${codeBehindFileExtension}`)
+                const codeBehind = await fetchWithoutCache(
+                  `components/${componentPath}.${codeBehindFileExtension}`
                 );
+                const codeBehindWrapper = await parseCodeBehindResponse(codeBehind);
                 if (codeBehindWrapper.hasError) {
                   errorComponents.push(codeBehindWrapper.component);
                 }

package/dist/{lint-B9tKGcOX.mjs → lint-DmJOJSJa.mjs}

@@ -4811,7 +4811,6 @@ function parseScriptModule(moduleName, source) {
     const parsedModule2 = {
       type: "ScriptModule",
       name: moduleName2,
-      exports,
       functions,
       statements,
       sources: /* @__PURE__ */ new Map()

package/dist/scripts/src/components/TextBox/TextBoxNative.js

@@ -47,6 +47,7 @@ const misc_1 = require("../../components-core/utils/misc");
 const InputAdornment_1 = require("../Input/InputAdornment");
 const ItemWithLabel_1 = require("../FormItem/ItemWithLabel");
 exports.TextBox = (0, react_1.forwardRef)(function TextBox({ id, type = "text", value = "", updateState = constants_1.noop, initialValue = "", style, maxLength, enabled = true, placeholder, validationStatus = "none", onDidChange = constants_1.noop, onFocus = constants_1.noop, onBlur = constants_1.noop, registerComponentApi, startText, startIcon, endText, endIcon, autoFocus, readOnly, tabIndex, label, labelPosition, labelWidth, labelBreak, required, }, ref) {
+    id = id || (0, react_1.useId)();
     const inputRef = (0, react_2.useRef)(null);
     (0, react_2.useEffect)(() => {
         if (autoFocus) {
@@ -96,7 +97,7 @@ exports.TextBox = (0, react_1.forwardRef)(function TextBox({ id, type = "text",
             setValue,
         });
     }, [focus, registerComponentApi, setValue]);
-    return ((0, jsx_runtime_1.jsx)(ItemWithLabel_1.ItemWithLabel, { labelPosition: labelPosition, label: label, labelWidth: labelWidth, labelBreak: labelBreak, required: required, enabled: enabled, style: style, ref: ref, children: (0, jsx_runtime_1.jsxs)("div", { className: (0, classnames_1.default)(TextBox_module_scss_1.default.inputRoot, {
+    return ((0, jsx_runtime_1.jsx)(ItemWithLabel_1.ItemWithLabel, { id: id, labelPosition: labelPosition, label: label, labelWidth: labelWidth, labelBreak: labelBreak, required: required, enabled: enabled, style: style, ref: ref, children: (0, jsx_runtime_1.jsxs)("div", { className: (0, classnames_1.default)(TextBox_module_scss_1.default.inputRoot, {
                 [TextBox_module_scss_1.default.disabled]: !enabled,
                 [TextBox_module_scss_1.default.readOnly]: readOnly,
                 [TextBox_module_scss_1.default.error]: validationStatus === "error",

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/scripts/src/components-core/theming/transformThemeVars.js

@@ -246,8 +246,8 @@ function generateBorderSegments(theme) {
     const result = Object.assign({}, theme);
     // --- Iterate through theme variables and split border values
     Object.entries(theme).forEach(([key, value]) => {
-        var _a, _b;
-        var _c, _d;
+        var _a, _b, _c;
+        var _d, _e, _f;
         // --- Check "border-" theme variables
         let match = borderRegEx.exec(key);
         if (match) {
@@ -259,9 +259,9 @@ function generateBorderSegments(theme) {
             result[`borderBottom-${remainder}`] = value;
             // --- We have a border value to segment
             const border = getBorderSegments(value);
-            result[`borderWidth-${remainder}`] = border.thickness;
-            (_a = result[_c = `borderStyle-${remainder}`]) !== null && _a !== void 0 ? _a : (result[_c] = border.style);
-            (_b = result[_d = `borderColor-${remainder}`]) !== null && _b !== void 0 ? _b : (result[_d] = border.color);
+            (_a = result[_d = `borderWidth-${remainder}`]) !== null && _a !== void 0 ? _a : (result[_d] = border.thickness);
+            (_b = result[_e = `borderStyle-${remainder}`]) !== null && _b !== void 0 ? _b : (result[_e] = border.style);
+            (_c = result[_f = `borderColor-${remainder}`]) !== null && _c !== void 0 ? _c : (result[_f] = border.color);
         }
         // --- Check "borderWidth-" theme variables
         match = thicknessBorderRegEx.exec(key);

package/dist/scripts/src/parsers/scripting/modules.js

@@ -74,7 +74,6 @@ function parseScriptModule(moduleName, source) {
         const parsedModule = {
             type: "ScriptModule",
             name: moduleName,
-            exports,
             functions,
             statements: statements,
             sources: new Map(),

package/dist/xmlui-metadata.mjs

@@ -1822,6 +1822,7 @@ const TextBox = forwardRef(function TextBox2({
   labelBreak: labelBreak2,
   required: required2
 }, ref) {
+  id = id || useId();
   const inputRef = useRef(null);
   useEffect(() => {
     if (autoFocus) {
@@ -1874,6 +1875,7 @@ const TextBox = forwardRef(function TextBox2({
   return /* @__PURE__ */ jsx(
     ItemWithLabel,
     {
+      id,
       labelPosition,
       label: label2,
       labelWidth,
@@ -18902,7 +18904,6 @@ function parseScriptModule(moduleName, source) {
     const parsedModule2 = {
       type: "ScriptModule",
       name: moduleName2,
-      exports,
       functions,
       statements,
       sources: /* @__PURE__ */ new Map()

package/dist/xmlui-metadata.umd.js

@@ -1821,6 +1821,7 @@
     labelBreak: labelBreak2,
     required: required2
   }, ref) {
+    id = id || React.useId();
     const inputRef = React.useRef(null);
     React.useEffect(() => {
       if (autoFocus) {
@@ -1873,6 +1874,7 @@
     return /* @__PURE__ */ jsxRuntime.jsx(
       ItemWithLabel,
       {
+        id,
         labelPosition,
         label: label2,
         labelWidth,
@@ -18901,7 +18903,6 @@
       const parsedModule2 = {
         type: "ScriptModule",
         name: moduleName2,
-        exports: exports2,
         functions,
         statements,
         sources: /* @__PURE__ */ new Map()

package/dist/xmlui-parser.mjs

@@ -1,6 +1,6 @@
 import { C, o, k, i, n, h, l, a, m, j, f, e, g, b, D, E, S, q, c, d, x, u, r, t, s, p, w, v } from "./parser-B3m9ZEAK.mjs";
-import { am as COMPOUND_COMP_ID } from "./lint-B9tKGcOX.mjs";
-import { au, ao, ag, aq, as, ae, ad, ar, af, ap, ah, aj, an, a5, at, ai } from "./lint-B9tKGcOX.mjs";
+import { am as COMPOUND_COMP_ID } from "./lint-DmJOJSJa.mjs";
+import { au, ao, ag, aq, as, ae, ad, ar, af, ap, ah, aj, an, a5, at, ai } from "./lint-DmJOJSJa.mjs";
 const attrBreakRegex = /[\r\n<>'"&]/;
 class XmlUiHelper {
   /**

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.9 (built 4/8/2025)" };
   class Mutation extends Removable {
     constructor(config2) {
       super();
@@ -49553,7 +49553,7 @@ ${error2.errorObject}`;
     }
     const result = { ...theme2 };
     Object.entries(theme2).forEach(([key, value]) => {
-      var _a3, _b2;
+      var _a3, _b2, _c2;
       let match2 = borderRegEx.exec(key);
       if (match2) {
         const remainder = match2[1];
@@ -49562,9 +49562,9 @@ ${error2.errorObject}`;
         result[`borderTop-${remainder}`] = value;
         result[`borderBottom-${remainder}`] = value;
         const border = getBorderSegments(value);
-        result[`borderWidth-${remainder}`] = border.thickness;
-        result[_a3 = `borderStyle-${remainder}`] ?? (result[_a3] = border.style);
-        result[_b2 = `borderColor-${remainder}`] ?? (result[_b2] = border.color);
+        result[_a3 = `borderWidth-${remainder}`] ?? (result[_a3] = border.thickness);
+        result[_b2 = `borderStyle-${remainder}`] ?? (result[_b2] = border.style);
+        result[_c2 = `borderColor-${remainder}`] ?? (result[_c2] = border.color);
       }
       match2 = thicknessBorderRegEx.exec(key);
       if (match2) {
@@ -58727,6 +58727,7 @@ to {
     labelBreak: labelBreak2,
     required: required2
   }, ref) {
+    id2 = id2 || reactExports.useId();
     const inputRef = reactExports.useRef(null);
     reactExports.useEffect(() => {
       if (autoFocus) {
@@ -58779,6 +58780,7 @@ to {
     return /* @__PURE__ */ jsxRuntimeExports.jsx(
       ItemWithLabel,
       {
+        id: id2,
         labelPosition,
         label: label2,
         labelWidth,
@@ -124896,7 +124898,6 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
       const parsedModule2 = {
         type: "ScriptModule",
         name: moduleName2,
-        exports,
         functions,
         statements,
         sources: /* @__PURE__ */ new Map()
@@ -134853,7 +134854,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 +134962,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 +144772,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.9";
   const ApiInterceptorContext = reactExports.createContext(null);
   function useApiInterceptorContext() {
     return reactExports.useContext(ApiInterceptorContext);
@@ -146529,7 +146534,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 +146884,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 +146977,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 +147092,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 +147234,9 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
           memoedVarsRef: memoedVars,
           isImplicit,
           ref,
-          uidInfoRef
+          uidInfoRef,
+          ...rest,
+          children
         }
       ) });
     })
@@ -147431,7 +147441,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 +147459,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 +147907,7 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
     memoedVarsRef,
     onUnmount,
     uidInfoRef,
+    children,
     ...rest
   }, ref) {
     var _a3;
@@ -147944,9 +147959,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 +148099,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 +148206,7 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
       memoedVarsRef,
       cleanup,
       uidInfoRef,
+      children,
       ...rest
     }, ref) {
       var _a3;
@@ -148230,7 +148247,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 +148270,8 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
             layoutContextRef: stableLayoutContext,
             ref,
             uidInfoRef,
-            ...rest
+            ...rest,
+            children
           }
         );
       }
@@ -148730,10 +148750,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 +149583,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.9 (built 4/8/2025)" };
   const MAIN_FILE = "Main." + componentFileExtension;
   const MAIN_CODE_BEHIND_FILE = "Main." + codeBehindFileExtension;
   const CONFIG_FILE = "config.json";
@@ -149657,6 +149674,7 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
     try {
       parser.parseStatements();
     } catch (e2) {
+      console.error("Error parsing code behind", e2);
       if (parser.errors.length > 0) {
         return {
           component: errReportScriptError(parser.errors[0], response.url),
@@ -149665,19 +149683,23 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
         };
       }
     }
-    const codeBehind = collectCodeBehindFromSource("Main", code2);
-    if (Object.keys(codeBehind.moduleErrors ?? {}).length > 0) {
+    try {
+      const codeBehind = collectCodeBehindFromSource("Main", code2);
+      if (Object.keys(codeBehind.moduleErrors ?? {}).length > 0) {
+        return {
+          component: errReportModuleErrors(codeBehind.moduleErrors, response.url),
+          file: response.url,
+          hasError: true
+        };
+      }
+      removeCodeBehindTokensFromTree(codeBehind);
       return {
-        component: errReportModuleErrors(codeBehind.moduleErrors, response.url),
-        file: response.url,
-        hasError: true
+        codeBehind,
+        file: response.url
       };
+    } catch (e2) {
+      console.error("Error collecting code behind", e2);
     }
-    removeCodeBehindTokensFromTree(codeBehind);
-    return {
-      codeBehind,
-      file: response.url
-    };
   }
   function matchesFileName(path2, fileName) {
     return path2.endsWith(`/${fileName}.ts`) || path2.endsWith(`/${fileName}.js`) || path2.endsWith(`/${fileName}.${componentFileExtension}`) || path2.endsWith(`/${fileName}.${codeBehindFileExtension}`);
@@ -149969,9 +149991,10 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
               );
               const componentCodeBehindPromise = new Promise(async (resolve) => {
                 try {
-                  const codeBehindWrapper = await parseCodeBehindResponse(
-                    await fetchWithoutCache(`components/${componentPath}.${codeBehindFileExtension}`)
+                  const codeBehind = await fetchWithoutCache(
+                    `components/${componentPath}.${codeBehindFileExtension}`
                   );
+                  const codeBehindWrapper = await parseCodeBehindResponse(codeBehind);
                   if (codeBehindWrapper.hasError) {
                     errorComponents.push(codeBehindWrapper.component);
                   }
@@ -153888,7 +153911,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.9 (built 4/8/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-CmAO1zjU.mjs";
 export {
   A as AppRoot,
   B as Button,

package/package.json

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