xmlui 0.10.11 → 0.10.13

package/dist/scripts/src/components-core/RestApiProxy.js

@@ -245,7 +245,8 @@ class RestApiProxy {
             const includeClientTxId = method && method !== "get" && !!transactionId;
             const headersWithoutContentType = Object.assign(Object.assign({}, this.getHeaders()), { ["Content-Type"]: undefined });
             let url = this.generateFullApiUrl(relativePath, queryParams);
-            const aggregatedHeaders = (0, lodash_es_1.omitBy)(Object.assign(Object.assign({}, (body ? this.getHeaders() : headersWithoutContentType)), headers), lodash_es_1.isUndefined);
+            const hasBody = body !== undefined;
+            const aggregatedHeaders = (0, lodash_es_1.omitBy)(Object.assign(Object.assign({}, (hasBody ? this.getHeaders() : headersWithoutContentType)), headers), lodash_es_1.isUndefined);
             if (includeClientTxId) {
                 aggregatedHeaders["x-ue-client-tx-id"] = transactionId;
             }
@@ -256,7 +257,7 @@ class RestApiProxy {
                 }
             }
             let requestBody;
-            if (rawBody) {
+            if (rawBody !== undefined) {
                 requestBody = rawBody;
             }
             else {
@@ -277,7 +278,7 @@ class RestApiProxy {
                     }
                 }
                 else {
-                    requestBody = body ? JSON.stringify(body) : undefined;
+                    requestBody = hasBody ? JSON.stringify(body) : undefined;
                 }
             }
             const options = {

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

@@ -146,7 +146,7 @@ const ComponentAdapter = (0, react_1.forwardRef)(function ComponentAdapter(_a, r
         return lookupAction(action, uid, Object.assign({ eventName }, actionOptions));
     }, [lookupAction, safeNode.events, uid]);
     // --- Set up the mouse event handlers for the component
-    const mouseEventHandlers = (0, event_handlers_1.useMouseEventHandlers)(memoedLookupEventHandler, (descriptor === null || descriptor === void 0 ? void 0 : descriptor.nonVisual) || isApiBound);
+    const mouseEventHandlers = (0, event_handlers_1.useMouseEventHandlers)(memoedLookupEventHandler, (descriptor === null || descriptor === void 0 ? void 0 : descriptor.nonVisual) || isApiBound || isCompoundComponent);
     // --- Use the current theme to obtain resources and collect theme variables
     const { getResourceUrl } = (0, ThemeContext_1.useTheme)();
     // --- Obtain a function that can extract a resource URL from a logical URL

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

@@ -41,6 +41,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+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 };
 };
@@ -67,9 +78,11 @@ const ThemeContext_1 = require("../theming/ThemeContext");
 const LoaderComponent_1 = require("../LoaderComponent");
 const constants_1 = require("../constants");
 const useApiInterceptorContext_1 = require("../interception/useApiInterceptorContext");
+const mergeProps_1 = require("../utils/mergeProps");
 // 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, children, }, ref) {
-    var _a;
+exports.Container = (0, react_1.memo)((0, react_1.forwardRef)(function Container(_a, ref) {
+    var _b;
+    var { node, componentState, dispatch: containerDispatch, parentDispatch, resolvedKey, version, setVersion, statePartChanged, registerComponentApi: containerRegisterComponentApi, parentRegisterComponentApi, layoutContextRef, parentRenderContext, memoedVarsRef, isImplicit, uidInfoRef: parentUidInfoRef, children } = _a, rest = __rest(_a, ["node", "componentState", "dispatch", "parentDispatch", "resolvedKey", "version", "setVersion", "statePartChanged", "registerComponentApi", "parentRegisterComponentApi", "layoutContextRef", "parentRenderContext", "memoedVarsRef", "isImplicit", "uidInfoRef", "children"]);
     const { apiBoundContainer } = node;
     const dispatch = isImplicit ? parentDispatch : containerDispatch;
     const registerComponentApi = isImplicit
@@ -434,7 +447,7 @@ exports.Container = (0, react_1.memo)((0, react_1.forwardRef)(function Container
         delete fnsRef.current[uid];
     });
     // --- The container wraps the `renderChild` function to provide that to the child components
-    const stableRenderChild = (0, react_1.useCallback)((childNode, lc, pRenderContext, uidInfoRef, ref) => {
+    const stableRenderChild = (0, react_1.useCallback)((childNode, lc, pRenderContext, uidInfoRef, ref, rest) => {
         // TODO: Check if this is a valid use case
         if (typeof childNode === "string") {
             throw Error("should be resolved for now");
@@ -499,9 +512,7 @@ exports.Container = (0, react_1.memo)((0, react_1.forwardRef)(function Container
             // --- `ref` with the parent's `ref`. This allows the parent to access the child's
             // --- DOM node. Otherwise, we use the child as is.
             return ref && renderedChildren[0] && (0, react_1.isValidElement)(renderedChildren[0])
-                ? react_1.default.cloneElement(renderedChildren[0], {
-                    ref: (0, react_compose_refs_1.composeRefs)(ref, renderedChildren[0].ref),
-                })
+                ? react_1.default.cloneElement(renderedChildren[0], Object.assign({ ref: (0, react_compose_refs_1.composeRefs)(ref, renderedChildren[0].ref) }, (0, mergeProps_1.mergeProps)(renderedChildren[0].props, rest)))
                 : renderedChildren[0];
         }
         // --- Done.
@@ -518,7 +529,7 @@ exports.Container = (0, react_1.memo)((0, react_1.forwardRef)(function Container
         cleanup,
     ]);
     // --- Log the component state if you need it for debugging
-    if ((_a = node.props) === null || _a === void 0 ? void 0 : _a.debug) {
+    if ((_b = node.props) === null || _b === void 0 ? void 0 : _b.debug) {
         console.log(`Container: ${resolvedKey}`, {
             componentState,
             node,
@@ -530,7 +541,7 @@ exports.Container = (0, react_1.memo)((0, react_1.forwardRef)(function Container
     const uidInfo = {};
     const thisUidInfoRef = (0, react_1.useRef)({});
     const uidInfoRef = node.uses === undefined ? parentUidInfoRef : thisUidInfoRef;
-    const renderedChildren = stableRenderChild(node.children, layoutContextRef === null || layoutContextRef === void 0 ? void 0 : layoutContextRef.current, parentRenderContext, uidInfoRef, ref);
+    const renderedChildren = stableRenderChild(node.children, layoutContextRef === null || layoutContextRef === void 0 ? void 0 : layoutContextRef.current, parentRenderContext, uidInfoRef, ref, rest);
     const renderedLoaders = renderLoaders({
         uidInfo,
         uidInfoRef,

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

@@ -104,7 +104,7 @@ function createContainerReducer(debugView) {
                     (0, lodash_es_1.setWith)(state, path, value, (nsValue, key, nsObject) => {
                         tempValueInLocalVars = tempValueInLocalVars === null || tempValueInLocalVars === void 0 ? void 0 : tempValueInLocalVars[key];
                         if (nsValue === undefined &&
-                            tempValueInLocalVars === undefined &&
+                            (0, lodash_es_1.isPlainObject)(tempValueInLocalVars) &&
                             (0, lodash_es_1.isPlainObject)(target)) {
                             // if we are setting a new object's key, lodash defaults it to an array, if the key is a number.
                             // This way we can force it to be an object.

package/dist/scripts/src/components-core/theming/themes/root.js

@@ -145,7 +145,7 @@ exports.RootThemeDefinition = {
         "outlineStyle--focus": "solid",
         "outlineOffset--focus": "0",
         // --- The app's default font family
-        "fontFamily": "$fontFamily-sans-serif",
+        fontFamily: "$fontFamily-sans-serif",
         // --- Various font sizes (relative to the current context)
         "fontSize-tiny": "0.625rem",
         "fontSize-xs": "0.75rem",
@@ -162,23 +162,16 @@ exports.RootThemeDefinition = {
         "fontSize-7xl": "4.5rem",
         "fontSize-8xl": "6rem",
         "fontSize-9xl": "8rem",
-        // --- Various line height values
-        "lineHeight-tiny": "calc(0.85 / 0.625)", // 1.36
-        "lineHeight-xs": "calc(1 / 0.75)", // 1.33
-        "lineHeight-sm": "calc(1.25 / 0.875)", // 1.43
-        "lineHeight-base": "calc(1.5 / 1)", // 1.5
-        "lineHeight-lg": "calc(1.75 / 1.125)", // 1.56
-        "lineHeight-xl": "calc(1.75 / 1.25)", // 1.4
-        "lineHeight-2xl": "calc(2 / 1.5)", // 1.33
-        "lineHeight-3xl": "calc(2.25 / 1.875)", // 1.2
-        "lineHeight-4xl": "calc(2.5 / 2.25)", // 1.11
-        "lineHeight-5xl": "1",
-        "lineHeight-6xl": "1",
-        "lineHeight-7xl": "1",
-        "lineHeight-8xl": "1",
-        "lineHeight-9xl": "1",
         // --- The default font size
-        "fontSize": "$fontSize-base",
+        fontSize: "$fontSize-base",
+        // --- Various line height values
+        // --- Default line height values (relative to the base unit, "space-base")
+        "lineHeight-none": "1",
+        "lineHeight-tight": "1.25",
+        "lineHeight-snug": "1.375",
+        "lineHeight-normal": "1.5",
+        "lineHeight-relaxed": "1.625",
+        "lineHeight-loose": "2",
         // --- Predefined gap sizes
         "gap-none": "$space-0",
         "gap-tight": "$space-2",
@@ -195,7 +188,7 @@ exports.RootThemeDefinition = {
         "space-normal": "$space-4",
         "space-loose": "$space-8",
         // --- Font used for body
-        "fontWeight": "$fontWeight-normal",
+        fontWeight: "$fontWeight-normal",
         // --- Various default values (review them)
         "borderColor-dropdown-item": "$borderColor",
         // --- Various predefined shadow values
@@ -209,14 +202,14 @@ exports.RootThemeDefinition = {
         // --- The default maximum content width
         "maxWidth-content": "1320px",
         // --- Background colors
-        "backgroundColor": "$color-surface-subtle",
+        backgroundColor: "$color-surface-subtle",
         "backgroundColor-overlay": "rgba(0, 0, 0, 0.2)",
         "backgroundColor-dropdown-item--hover": $colorSurface50,
         "backgroundColor-dropdown-item--active": $colorSurface100,
         "backgroundColor-dropdown-item--active-hover": $colorSurface50,
         "backgroundColor-tree-row--selected--before": $colorPrimary50,
         // --- Border colors
-        "borderColor": "rgb(from $color-surface-900 r g b / 0.1)",
+        borderColor: "rgb(from $color-surface-900 r g b / 0.1)",
         "borderColor--disabled": $colorSurface100,
         // --- Text colors
         "textColor-secondary": $colorSurface600,

package/dist/scripts/src/parsers/xmlui-parser/syntax-kind.js

@@ -15,14 +15,23 @@ var SyntaxKind;
     SyntaxKind[SyntaxKind["WhitespaceTrivia"] = 4] = "WhitespaceTrivia";
     // Effective tokens
     SyntaxKind[SyntaxKind["Identifier"] = 5] = "Identifier";
+    /** < */
     SyntaxKind[SyntaxKind["OpenNodeStart"] = 6] = "OpenNodeStart";
+    /** </ */
     SyntaxKind[SyntaxKind["CloseNodeStart"] = 7] = "CloseNodeStart";
+    /** > */
     SyntaxKind[SyntaxKind["NodeEnd"] = 8] = "NodeEnd";
+    /** /> */
     SyntaxKind[SyntaxKind["NodeClose"] = 9] = "NodeClose";
+    /** : */
     SyntaxKind[SyntaxKind["Colon"] = 10] = "Colon";
+    /** = */
     SyntaxKind[SyntaxKind["Equal"] = 11] = "Equal";
+    /** string literal */
     SyntaxKind[SyntaxKind["StringLiteral"] = 12] = "StringLiteral";
+    /** <![CDATA[ ... ]]> */
     SyntaxKind[SyntaxKind["CData"] = 13] = "CData";
+    /** <script>...</script> */
     SyntaxKind[SyntaxKind["Script"] = 14] = "Script";
     // A token created by the parser which contains arbitrary text, but not the '<' character
     SyntaxKind[SyntaxKind["TextNode"] = 15] = "TextNode";

package/dist/scripts/src/parsers/xmlui-parser/transform.js

@@ -304,7 +304,8 @@ function nodeToComponentDef(node, originalGetText, fileId) {
         }
         catch (err) {
             if (parser.errors && parser.errors.length > 0) {
-                comp.scriptError = parser.errors;
+                const errMsg = parser.errors[0];
+                throw new ParserError_1.ParserError(`${errMsg.text} [${errMsg.line}: ${errMsg.column}]`, errMsg.code);
             }
             else {
                 comp.scriptError = err;

package/dist/standalone/xmlui-standalone.es.d.ts

@@ -828,6 +828,8 @@ declare interface IconBaseProps extends default_2.SVGAttributes<SVGElement> {
     fallback?: string;
     style?: CSSProperties;
     className?: string;
+    tabIndex?: number;
+    onKeyDown?: default_2.KeyboardEventHandler<any>;
 }
 
 declare type IconPosition = (typeof iconPositionValues)[number];
@@ -1190,7 +1192,7 @@ declare interface ReactiveVarDeclaration extends ExpressionBase {
 
 declare type RegisterComponentApiFn = (componentApi: ComponentApi) => void;
 
-declare type RenderChildFn<L extends ComponentDef = ComponentDef> = (children?: ComponentDef | ComponentDef[] | DynamicChildComponentDef | DynamicChildComponentDef[] | string, layoutContext?: LayoutContext<L>, parentRenderContext?: ParentRenderContext, uidInfoRef?: RefObject<Record<string, any>>, ref?: ForwardedRef<any>) => ReactNode | ReactNode[];
+declare type RenderChildFn<L extends ComponentDef = ComponentDef> = (children?: ComponentDef | ComponentDef[] | DynamicChildComponentDef | DynamicChildComponentDef[] | string, layoutContext?: LayoutContext<L>, parentRenderContext?: ParentRenderContext, uidInfoRef?: RefObject<Record<string, any>>, ref?: ForwardedRef<any>, rest?: Record<string, any>) => ReactNode | ReactNode[];
 
 declare interface RendererContext<TMd extends ComponentMetadata = ComponentMetadata> extends ComponentRendererContextBase<TMd> {
     uid: symbol;