@xihan-ui/vue 4.2.0 → 5.0.0

package/dist/components/menu/menu.d.ts

@@ -1,7 +1,7 @@
 import { PayloadOf } from "../../runtime/payload.js";
-import { PropType, SlotsType, VNode } from "vue";
-import { Direction, Placement, Size, Tone } from "@xihan-ui/core";
 import { MenuApi, MenuNode, MenuNodeMeta, MenuRadioValue, MenuSchema, MenuTranslations } from "@xihan-ui/headless";
+import { PropType, SlotsType, VNode } from "vue";
+import { Direction, IconRecord, Placement, Size, Tone } from "@xihan-ui/core";
 //#region src/components/menu/menu.d.ts
 type MenuProps = MenuSchema['props'];
 /** 默认插槽的载荷：展开态与修改展开的动作。 */
@@ -27,6 +27,10 @@ declare const XhMenuRoot: import("vue").DefineComponent<import("vue").ExtractPro
     default: undefined;
   };
   defaultOpen: BooleanConstructor;
+  /** 外部锚点：给了就锚在它上面、收起时焦点归还到它，不再取 trigger；按数据铺设时不铺触发按钮。 */
+  anchor: {
+    type: PropType<HTMLElement | null>;
+  };
   placement: {
     type: PropType<Placement>;
   };
@@ -46,6 +50,10 @@ declare const XhMenuRoot: import("vue").DefineComponent<import("vue").ExtractPro
   size: {
     type: PropType<Size>;
   };
+  fitAvailableHeight: {
+    type: BooleanConstructor;
+    default: undefined;
+  };
   typeahead: {
     type: BooleanConstructor;
     default: undefined;
@@ -72,11 +80,15 @@ declare const XhMenuRoot: import("vue").DefineComponent<import("vue").ExtractPro
    * 放置部件的写法有 XhMenuTrigger 自己的 asChild，该 prop 是自动铺设路径的同一能力。
    */
   triggerAsChild: BooleanConstructor;
+  /** 按数据铺设时触发按钮的文字；trigger 插槽有内容时以插槽为准。 */
+  label: {
+    type: StringConstructor;
+  };
 }>, () => VNode<import("vue").RendererNode, import("vue").RendererElement, {
   [key: string]: any;
 }>[], {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
   'open-change': (_details: PayloadOf<MenuProps, "onOpenChange">) => true;
-  select: (_details: PayloadOf<MenuProps, "onSelect">) => true;
+  'item-select': (_details: PayloadOf<MenuProps, "onItemSelect">) => true;
   'checkbox-value-change': (_details: PayloadOf<MenuProps, "onCheckboxValueChange">) => true;
   'radio-value-change': (_details: PayloadOf<MenuProps, "onRadioValueChange">) => true;
   'update:open': (_open: PayloadOf<MenuProps, "onOpenChange">["open"]) => true;
@@ -101,6 +113,10 @@ declare const XhMenuRoot: import("vue").DefineComponent<import("vue").ExtractPro
     default: undefined;
   };
   defaultOpen: BooleanConstructor;
+  /** 外部锚点：给了就锚在它上面、收起时焦点归还到它，不再取 trigger；按数据铺设时不铺触发按钮。 */
+  anchor: {
+    type: PropType<HTMLElement | null>;
+  };
   placement: {
     type: PropType<Placement>;
   };
@@ -120,6 +136,10 @@ declare const XhMenuRoot: import("vue").DefineComponent<import("vue").ExtractPro
   size: {
     type: PropType<Size>;
   };
+  fitAvailableHeight: {
+    type: BooleanConstructor;
+    default: undefined;
+  };
   typeahead: {
     type: BooleanConstructor;
     default: undefined;
@@ -146,10 +166,14 @@ declare const XhMenuRoot: import("vue").DefineComponent<import("vue").ExtractPro
    * 放置部件的写法有 XhMenuTrigger 自己的 asChild，该 prop 是自动铺设路径的同一能力。
    */
   triggerAsChild: BooleanConstructor;
+  /** 按数据铺设时触发按钮的文字；trigger 插槽有内容时以插槽为准。 */
+  label: {
+    type: StringConstructor;
+  };
 }>> & Readonly<{
-  onSelect?: ((_details: import("@xihan-ui/headless").MenuSelectDetails) => any) | undefined;
   "onOpen-change"?: ((_details: import("@xihan-ui/headless").MenuOpenChangeDetails) => any) | undefined;
   "onUpdate:open"?: ((_open: boolean) => any) | undefined;
+  "onItem-select"?: ((_details: import("@xihan-ui/headless").MenuItemSelectDetails) => any) | undefined;
   "onCheckbox-value-change"?: ((_details: import("@xihan-ui/headless").ContextMenuCheckboxValueChangeDetails) => any) | undefined;
   "onRadio-value-change"?: ((_details: import("@xihan-ui/headless").ContextMenuRadioValueChangeDetails) => any) | undefined;
 }>, {
@@ -160,6 +184,7 @@ declare const XhMenuRoot: import("vue").DefineComponent<import("vue").ExtractPro
   typeahead: boolean;
   openOnHover: boolean;
   triggerAsChild: boolean;
+  fitAvailableHeight: boolean;
 }, SlotsType<{
   default?: (props: MenuRootSlotProps) => VNode[];
   trigger?: () => VNode[];
@@ -205,6 +230,7 @@ type MenuSubSlotProps = Pick<MenuApi, 'open' | 'setOpen'>;
 /**
  * 子菜单：内部再运行一台 menu 状态机（submenu 模式），触发条目由 XhMenuSubTrigger
  * 渲染为父菜单条目与本子菜单触发器的双重身份。本身不渲染节点。
+ * 不写默认插槽时照标准结构铺自己那一层：触发条目、定位层与按 collection 铺的条目。
  */
 declare const XhMenuSub: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
   /** 它在父菜单中的条目身份。 */
@@ -212,6 +238,14 @@ declare const XhMenuSub: import("vue").DefineComponent<import("vue").ExtractProp
     type: StringConstructor;
     required: true;
   };
+  /** 按数据铺设时触发条目的文字；缺省取父菜单 collection 里这一条的 label。 */
+  label: {
+    type: StringConstructor;
+  };
+  /** 按数据铺设时触发条目的图标；缺省取父菜单 collection 里这一条的 icon。 */
+  icon: {
+    type: PropType<IconRecord>;
+  };
   disabled: {
     type: BooleanConstructor;
     default: undefined;
@@ -260,12 +294,17 @@ declare const XhMenuSub: import("vue").DefineComponent<import("vue").ExtractProp
   size: {
     type: PropType<Size>;
   };
+  /** 只按可用高度封顶；默认继承父层，理由同 tone。 */
+  fitAvailableHeight: {
+    type: BooleanConstructor;
+    default: undefined;
+  };
   hoverCloseDelay: {
     type: NumberConstructor;
   };
 }>, () => VNode<import("vue").RendererNode, import("vue").RendererElement, {
   [key: string]: any;
-}>[] | undefined, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
+}>[], {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
   'checkbox-value-change': (_details: PayloadOf<MenuProps, "onCheckboxValueChange">) => true;
   'radio-value-change': (_details: PayloadOf<MenuProps, "onRadioValueChange">) => true;
 }, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
@@ -274,6 +313,14 @@ declare const XhMenuSub: import("vue").DefineComponent<import("vue").ExtractProp
     type: StringConstructor;
     required: true;
   };
+  /** 按数据铺设时触发条目的文字；缺省取父菜单 collection 里这一条的 label。 */
+  label: {
+    type: StringConstructor;
+  };
+  /** 按数据铺设时触发条目的图标；缺省取父菜单 collection 里这一条的 icon。 */
+  icon: {
+    type: PropType<IconRecord>;
+  };
   disabled: {
     type: BooleanConstructor;
     default: undefined;
@@ -322,6 +369,11 @@ declare const XhMenuSub: import("vue").DefineComponent<import("vue").ExtractProp
   size: {
     type: PropType<Size>;
   };
+  /** 只按可用高度封顶；默认继承父层，理由同 tone。 */
+  fitAvailableHeight: {
+    type: BooleanConstructor;
+    default: undefined;
+  };
   hoverCloseDelay: {
     type: NumberConstructor;
   };
@@ -332,6 +384,7 @@ declare const XhMenuSub: import("vue").DefineComponent<import("vue").ExtractProp
   loop: boolean;
   disabled: boolean;
   openOnHover: boolean;
+  fitAvailableHeight: boolean;
 }, SlotsType<{
   default?: (props: MenuSubSlotProps) => VNode[];
 }>, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
@@ -342,7 +395,7 @@ declare const XhMenuSubTrigger: import("vue").DefineComponent<{}, () => VNode<im
 declare const XhMenuItemText: import("vue").DefineComponent<{}, () => VNode<import("vue").RendererNode, import("vue").RendererElement, {
   [key: string]: any;
 }>, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
-/** 条目中的标记位（勾选、图标），纯装饰 */
+/** 勾选与单选条目的对号，排在条目最后，纯装饰；行首的图标写在 XhMenuItemIcon 里 */
 declare const XhMenuItemIndicator: import("vue").DefineComponent<{}, () => VNode<import("vue").RendererNode, import("vue").RendererElement, {
   [key: string]: any;
 }>, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
@@ -350,6 +403,10 @@ declare const XhMenuItemIndicator: import("vue").DefineComponent<{}, () => VNode
 declare const XhMenuItemDescription: import("vue").DefineComponent<{}, () => VNode<import("vue").RendererNode, import("vue").RendererElement, {
   [key: string]: any;
 }>, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
+/** 条目文字之前的图标格；装饰态，读屏从条目文字取意 */
+declare const XhMenuItemIcon: import("vue").DefineComponent<{}, () => VNode<import("vue").RendererNode, import("vue").RendererElement, {
+  [key: string]: any;
+}>, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 /** 条目中的快捷键提示，贴行尾；纯装饰，读屏从条目文字取意 */
 declare const XhMenuItemShortcut: import("vue").DefineComponent<{}, () => VNode<import("vue").RendererNode, import("vue").RendererElement, {
   [key: string]: any;
@@ -394,5 +451,5 @@ declare const XhMenuArrow: import("vue").DefineComponent<{}, () => VNode<import(
   [key: string]: any;
 }>, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 //#endregion
-export { MenuRootSlotProps, MenuSubSlotProps, XhMenuArrow, XhMenuCheckboxItem, XhMenuContent, XhMenuGroup, XhMenuGroupLabel, XhMenuItem, XhMenuItemDescription, XhMenuItemIndicator, XhMenuItemShortcut, XhMenuItemSuffix, XhMenuItemText, XhMenuPositioner, XhMenuRadioGroup, XhMenuRadioItem, XhMenuRoot, XhMenuSeparator, XhMenuSub, XhMenuSubTrigger, XhMenuTrigger };
+export { MenuRootSlotProps, MenuSubSlotProps, XhMenuArrow, XhMenuCheckboxItem, XhMenuContent, XhMenuGroup, XhMenuGroupLabel, XhMenuItem, XhMenuItemDescription, XhMenuItemIcon, XhMenuItemIndicator, XhMenuItemShortcut, XhMenuItemSuffix, XhMenuItemText, XhMenuPositioner, XhMenuRadioGroup, XhMenuRadioItem, XhMenuRoot, XhMenuSeparator, XhMenuSub, XhMenuSubTrigger, XhMenuTrigger };
 //# sourceMappingURL=menu.d.ts.map

package/dist/components/menu/menu.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"menu.d.ts","names":[],"sources":["../../../src/components/menu/menu.ts"],"mappings":"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"}
+{"version":3,"file":"menu.d.ts","names":[],"sources":["../../../src/components/menu/menu.ts"],"mappings":"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"}

package/dist/components/menu/menu.js

@@ -1,13 +1,19 @@
+import { renderStructure } from "../../runtime/structure.js";
 import { withXhConfig } from "../../config/config.js";
 import { mergePartProps } from "../../runtime/merge-props.js";
 import { mergeIntoChild } from "../../runtime/as-child.js";
 import { XhPortal } from "../../runtime/portal.js";
 import { useScrollbars } from "../../runtime/use-scrollbars.js";
+import { liveProps } from "../../runtime/live-props.js";
+import { XhIcon } from "../icon/icon.js";
 import { provideMenu, provideMenuGroup, provideMenuItem, provideMenuSub, useMenuContext, useMenuGroupContext, useMenuItemContext, useMenuSubContext } from "./context.js";
 import { useMenu, useMenuWithParent } from "./use-menu.js";
-import { computed, defineComponent, h, mergeProps, onBeforeUnmount, ref, watch } from "vue";
-import { groupAdjacentRuns, mergeProps as mergeProps$1 } from "@xihan-ui/core";
+import { menuNodesStructure, menuStructure } from "@xihan-ui/headless";
+import { computed, defineComponent, h, inject, mergeProps, onBeforeUnmount, provide, ref, watch } from "vue";
+import { mergeProps as mergeProps$1 } from "@xihan-ui/core";
 //#region src/components/menu/menu.ts
+/** 根菜单铺给各层子菜单的条目插槽。 */
+const MENU_ITEM_SLOTS = Symbol("XhMenuItemSlots");
 const XhMenuRoot = /* @__PURE__ */ defineComponent({
 	name: "XhMenuRoot",
 	props: {
@@ -21,6 +27,8 @@ const XhMenuRoot = /* @__PURE__ */ defineComponent({
 			default: void 0
 		},
 		defaultOpen: Boolean,
+		/** 外部锚点：给了就锚在它上面、收起时焦点归还到它，不再取 trigger；按数据铺设时不铺触发按钮。 */
+		anchor: { type: Object },
 		placement: { type: String },
 		offset: { type: Number },
 		loop: {
@@ -30,6 +38,10 @@ const XhMenuRoot = /* @__PURE__ */ defineComponent({
 		dir: { type: String },
 		tone: { type: String },
 		size: { type: String },
+		fitAvailableHeight: {
+			type: Boolean,
+			default: void 0
+		},
 		typeahead: {
 			type: Boolean,
 			default: void 0
@@ -49,11 +61,13 @@ const XhMenuRoot = /* @__PURE__ */ defineComponent({
 		* 只提供 collection 时，触发器插槽给出的节点直接作为触发器使用，不再外包一个 <button>。
 		* 放置部件的写法有 XhMenuTrigger 自己的 asChild，该 prop 是自动铺设路径的同一能力。
 		*/
-		triggerAsChild: Boolean
+		triggerAsChild: Boolean,
+		/** 按数据铺设时触发按钮的文字；trigger 插槽有内容时以插槽为准。 */
+		label: { type: String }
 	},
 	emits: {
 		"open-change": (_details) => true,
-		"select": (_details) => true,
+		"item-select": (_details) => true,
 		"checkbox-value-change": (_details) => true,
 		"radio-value-change": (_details) => true,
 		"update:open": (_open) => true
@@ -64,11 +78,16 @@ const XhMenuRoot = /* @__PURE__ */ defineComponent({
 			emit("open-change", details);
 			emit("update:open", details.open);
 		};
-		const notifySelect = (details) => emit("select", details);
+		const notifyItemSelect = (details) => emit("item-select", details);
 		const notifyCheckboxValue = (details) => emit("checkbox-value-change", details);
 		const notifyRadioValue = (details) => emit("radio-value-change", details);
-		const ctx = useMenu(withXhConfig("menu", props), notifyOpen, notifySelect, notifyCheckboxValue, notifyRadioValue);
+		const ctx = useMenu(withXhConfig("menu", props), notifyOpen, notifyItemSelect, notifyCheckboxValue, notifyRadioValue);
 		provideMenu(ctx);
+		provide(MENU_ITEM_SLOTS, {
+			"item": slots.item,
+			"item-prefix": slots["item-prefix"],
+			"item-suffix": slots["item-suffix"]
+		});
 		return () => slots.default ? slots.default({
 			open: ctx.api.value.open,
 			setOpen: ctx.api.value.setOpen,
@@ -76,11 +95,16 @@ const XhMenuRoot = /* @__PURE__ */ defineComponent({
 			radioValue: ctx.api.value.radioValue,
 			setCheckboxValue: ctx.api.value.setCheckboxValue,
 			setRadioValue: ctx.api.value.setRadioValue
-		}) : props.collection ? renderDefaultTree(ctx.api.value.collection, slots.trigger?.() ?? null, {
+		}) : renderDefaultStructure(ctx.api.value, {
 			"item": slots.item,
 			"item-prefix": slots["item-prefix"],
 			"item-suffix": slots["item-suffix"]
-		}, props.triggerAsChild) : [];
+		}, {
+			label: props.label,
+			trigger: slots.trigger,
+			triggerAsChild: props.triggerAsChild,
+			anchored: props.anchor !== void 0
+		});
 	}
 });
 const XhMenuTrigger = /* @__PURE__ */ defineComponent({
@@ -121,7 +145,7 @@ container: { type: Object } },
 		});
 		return () => h(XhPortal, {
 			to: props.container ?? ctx.portalTarget.value,
-			source: ctx.triggerRef,
+			source: ctx.portalSource.value,
 			present: ctx.visible.value
 		}, () => [h("div", {
 			...mergeProps(ctx.api.value.getPositionerProps(), attrs),
@@ -208,15 +232,21 @@ const XhMenuRadioItem = /* @__PURE__ */ createMenuItemComponent("XhMenuRadioItem
 /**
 * 子菜单：内部再运行一台 menu 状态机（submenu 模式），触发条目由 XhMenuSubTrigger
 * 渲染为父菜单条目与本子菜单触发器的双重身份。本身不渲染节点。
+* 不写默认插槽时照标准结构铺自己那一层：触发条目、定位层与按 collection 铺的条目。
 */
 const XhMenuSub = /* @__PURE__ */ defineComponent({
 	name: "XhMenuSub",
+	inheritAttrs: false,
 	props: {
 		/** 它在父菜单中的条目身份。 */
 		value: {
 			type: String,
 			required: true
 		},
+		/** 按数据铺设时触发条目的文字；缺省取父菜单 collection 里这一条的 label。 */
+		label: { type: String },
+		/** 按数据铺设时触发条目的图标；缺省取父菜单 collection 里这一条的 icon。 */
+		icon: { type: Object },
 		disabled: {
 			type: Boolean,
 			default: void 0
@@ -243,6 +273,11 @@ const XhMenuSub = /* @__PURE__ */ defineComponent({
 		tone: { type: String },
 		/** 尺寸；默认继承父层，理由同 tone。 */
 		size: { type: String },
+		/** 只按可用高度封顶；默认继承父层，理由同 tone。 */
+		fitAvailableHeight: {
+			type: Boolean,
+			default: void 0
+		},
 		hoverCloseDelay: { type: Number }
 	},
 	emits: {
@@ -252,13 +287,14 @@ const XhMenuSub = /* @__PURE__ */ defineComponent({
 	slots: Object,
 	setup(props, { slots, emit }) {
 		const parent = useMenuContext();
-		const ctx = useMenuWithParent({
+		const ctx = useMenuWithParent(liveProps(() => ({
 			...props,
 			submenu: true,
 			dir: props.dir ?? parent.service.prop("dir"),
 			tone: props.tone ?? parent.service.prop("tone"),
-			size: props.size ?? parent.service.prop("size")
-		}, void 0, parent.tree, (details) => emit("checkbox-value-change", details), (details) => emit("radio-value-change", details));
+			size: props.size ?? parent.service.prop("size"),
+			fitAvailableHeight: props.fitAvailableHeight ?? parent.service.prop("fitAvailableHeight")
+		})), void 0, parent.tree, (details) => emit("checkbox-value-change", details), (details) => emit("radio-value-change", details));
 		provideMenu(ctx);
 		provideMenuSub({
 			parent,
@@ -268,10 +304,14 @@ const XhMenuSub = /* @__PURE__ */ defineComponent({
 		watch(() => parent.api.value.open, (open) => {
 			if (!open) ctx.api.value.setOpen(false);
 		});
-		return () => slots.default?.({
+		const itemSlots = inject(MENU_ITEM_SLOTS, {});
+		return () => slots.default ? slots.default({
 			open: ctx.api.value.open,
 			setOpen: ctx.api.value.setOpen
-		});
+		}) : renderSubStructure(ctx.api.value, parent.api.value, props.value, {
+			label: props.label,
+			icon: props.icon
+		}, itemSlots);
 	}
 });
 const XhMenuSubTrigger = /* @__PURE__ */ defineComponent({
@@ -279,6 +319,10 @@ const XhMenuSubTrigger = /* @__PURE__ */ defineComponent({
 	setup(_, { slots }) {
 		const sub = useMenuSubContext();
 		const ctx = useMenuContext();
+		provideMenuItem({ item: computed(() => ({
+			value: sub.value,
+			disabled: sub.disabled
+		})) });
 		return () => h("div", {
 			...mergeProps$1(sub.parent.api.value.getItemProps({
 				value: sub.value,
@@ -302,7 +346,7 @@ const XhMenuItemText = /* @__PURE__ */ defineComponent({
 		return () => h("span", ctx.api.value.getItemTextProps(item.value), slots.default?.());
 	}
 });
-/** 条目中的标记位（勾选、图标），纯装饰 */
+/** 勾选与单选条目的对号，排在条目最后，纯装饰；行首的图标写在 XhMenuItemIcon 里 */
 const XhMenuItemIndicator = /* @__PURE__ */ defineComponent({
 	name: "XhMenuItemIndicator",
 	setup(_, { slots }) {
@@ -320,6 +364,15 @@ const XhMenuItemDescription = /* @__PURE__ */ defineComponent({
 		return () => h("span", ctx.api.value.getItemDescriptionProps(item.value), slots.default?.());
 	}
 });
+/** 条目文字之前的图标格；装饰态，读屏从条目文字取意 */
+const XhMenuItemIcon = /* @__PURE__ */ defineComponent({
+	name: "XhMenuItemIcon",
+	setup(_, { slots }) {
+		const ctx = useMenuContext();
+		const { item } = useMenuItemContext();
+		return () => h("span", ctx.api.value.getItemIconProps(item.value), slots.default?.());
+	}
+});
 /** 条目中的快捷键提示，贴行尾；纯装饰，读屏从条目文字取意 */
 const XhMenuItemShortcut = /* @__PURE__ */ defineComponent({
 	name: "XhMenuItemShortcut",
@@ -386,55 +439,122 @@ const XhMenuArrow = /* @__PURE__ */ defineComponent({
 		return () => h("div", ctx.api.value.getArrowProps());
 	}
 });
-/**
-* 未写默认插槽时按 collection 铺开的整套结构，作者只提供数据。
-* 与手写部件产出的 DOM 完全一致，需要修改结构时写默认插槽，行为不变。
-* 触发器内容归作者，由 trigger 插槽承载；条目内容默认是 label，可由 item 插槽接管。
-*/
-function renderDefaultTree(collection, trigger, itemSlots, triggerAsChild) {
-	return [h(XhMenuTrigger, { asChild: triggerAsChild }, () => trigger ?? []), h(XhMenuPositioner, null, () => [h(XhMenuContent, null, () => renderNodes(collection, itemSlots))])];
+/** 按数据铺的条目：kind 取 collection 里这一条，勾选与单选条目各用自己的部件组件。 */
+const MenuStructureItem = /* @__PURE__ */ defineComponent({
+	name: "MenuStructureItem",
+	props: { value: {
+		type: String,
+		required: true
+	} },
+	setup(props, { slots }) {
+		const ctx = useMenuContext();
+		return () => {
+			const meta = ctx.api.value.collection.find((node) => node.value === props.value);
+			return h(meta?.kind === "checkbox" ? XhMenuCheckboxItem : meta?.kind === "radio" ? XhMenuRadioItem : XhMenuItem, {
+				value: props.value,
+				closeOnSelect: meta?.closeOnSelect
+			}, slots);
+		};
+	}
+});
+/** 按数据铺的分组：组里有单选条目时是单选组。 */
+const MenuStructureGroup = /* @__PURE__ */ defineComponent({
+	name: "MenuStructureGroup",
+	props: { value: {
+		type: String,
+		required: true
+	} },
+	setup(props, { slots }) {
+		const ctx = useMenuContext();
+		return () => {
+			return h(ctx.api.value.collection.some((node) => node.kind === "radio" && node.group === props.value) ? XhMenuRadioGroup : XhMenuGroup, { value: props.value }, slots);
+		};
+	}
+});
+/** 根菜单借作者节点当触发器（triggerAsChild）。 */
+const MenuAsChildTrigger = /* @__PURE__ */ defineComponent({
+	name: "MenuAsChildTrigger",
+	setup(_, { slots }) {
+		return () => h(XhMenuTrigger, { asChild: true }, slots);
+	}
+});
+/** 子菜单的触发条目：身份取子菜单上下文，结构写在节点上的 value 不落到 DOM。 */
+const MenuStructureSubTrigger = /* @__PURE__ */ defineComponent({
+	name: "MenuStructureSubTrigger",
+	inheritAttrs: false,
+	setup(_, { slots }) {
+		return () => h(XhMenuSubTrigger, null, slots);
+	}
+});
+/** 标准结构里各部件对应的组件。 */
+const MENU_PARTS = {
+	"trigger": XhMenuTrigger,
+	"positioner": XhMenuPositioner,
+	"content": XhMenuContent,
+	"item": MenuStructureItem,
+	"item-icon": XhMenuItemIcon,
+	"item-text": XhMenuItemText,
+	"item-indicator": XhMenuItemIndicator,
+	"item-description": XhMenuItemDescription,
+	"item-shortcut": XhMenuItemShortcut,
+	"item-suffix": XhMenuItemSuffix,
+	"separator": XhMenuSeparator,
+	"group": MenuStructureGroup,
+	"group-label": XhMenuGroupLabel
+};
+/** 结构里组合进来的组件：带 children 的条目是嵌套的子菜单。 */
+const MENU_INSTANCES = {
+	menu: XhMenuSub,
+	icon: XhIcon
+};
+/** 条目三个插槽的接管：item 整条、item-prefix 行首、item-suffix 行尾，载荷是这一条的元信息。 */
+function itemContent(slots, lookup) {
+	return (node) => {
+		const name = node.slot?.name;
+		if (name !== "item" && name !== "item-prefix" && name !== "item-suffix") return void 0;
+		const meta = node.data ?? lookup(node.slot.key ?? "");
+		return meta ? slots[name]?.(meta) : void 0;
+	};
 }
-/** content 的内容：分组段铺为 group，段首的分隔线落在 group 外面。 */
-function renderNodes(collection, itemSlots) {
-	return groupAdjacentRuns(collection, (node) => node.group).flatMap((run, runIndex) => {
-		const head = run[0];
-		const lead = runIndex > 0 && head.separatorBefore ? [h(XhMenuSeparator, { key: `separator:${head.value}` })] : [];
-		if (head.group == null) return [...lead, renderItem(head, itemSlots)];
-		const groupLabel = run.find((node) => node.groupLabel != null)?.groupLabel ?? null;
-		return [...lead, h(head.kind === "radio" ? XhMenuRadioGroup : XhMenuGroup, {
-			key: `group:${head.group}`,
-			value: head.group
-		}, () => [...groupLabel != null ? [h(XhMenuGroupLabel, null, () => groupLabel)] : [], ...run.flatMap((node, index) => [...index > 0 && node.separatorBefore ? [h(XhMenuSeparator, { key: `separator:${node.value}` })] : [], renderItem(node, itemSlots)])])];
-	});
+function slottedBy(slots) {
+	return (name) => slots[name] != null;
 }
 /**
-* 单个条目：按数据铺标记位、文字、说明与快捷键，未提供的那几个不铺对应部件。
-*
-* 三个插槽各管一段，不必为了改一处把整条重搭：
-* - `item-prefix` / `item-suffix` 只接管行首与行尾那一格，其余槽照旧由数据铺。
-*   行首那一格与数据里的 `indicator` 同一个部件，插槽在场时以它为准。
-* - `item` 是整条的接管口：写了它，上面几格一概不铺，作者自己放置 XhMenuItemText 等部件
-*   （与 ContextMenu 的 item 插槽语义不同，那边填的是文字槽）。
+* 未写默认插槽时照 menuStructure 铺开的整套结构，与 Web Components 不写部件时元素生成的节点出自同一份。
+* 触发按钮的内容归作者（trigger 插槽），没写时取 label；条目内容默认按数据铺，可由 item 系插槽逐槽接管。
 */
-function renderItem(meta, itemSlots) {
-	if (meta.children) return renderSubmenu(meta, itemSlots);
-	const prefix = itemSlots["item-prefix"];
-	const suffix = itemSlots["item-suffix"];
-	return h(meta.kind === "checkbox" ? XhMenuCheckboxItem : meta.kind === "radio" ? XhMenuRadioItem : XhMenuItem, {
-		key: meta.value,
-		value: meta.value,
-		closeOnSelect: meta.closeOnSelect
-	}, () => itemSlots.item?.(meta) ?? [
-		...prefix ? [h(XhMenuItemIndicator, null, () => prefix(meta))] : meta.indicator != null ? [h(XhMenuItemIndicator, null, () => meta.indicator)] : meta.kind !== "item" ? [h(XhMenuItemIndicator)] : [],
-		h(XhMenuItemText, null, () => meta.label),
-		...meta.description != null ? [h(XhMenuItemDescription, null, () => meta.description)] : [],
-		...meta.shortcut != null ? [h(XhMenuItemShortcut, null, () => meta.shortcut)] : [],
-		...suffix ? [h(XhMenuItemSuffix, null, () => suffix(meta))] : []
-	]);
+function renderDefaultStructure(api, itemSlots, trigger) {
+	const slotted = slottedBy(itemSlots);
+	const nodes = menuStructure(api, {
+		...trigger.label === void 0 ? {} : { label: trigger.label },
+		anchored: trigger.anchored ?? false,
+		slotted: (name) => name === "trigger" ? trigger.trigger != null : slotted(name)
+	});
+	const items = itemContent(itemSlots, (value) => api.collection.find((node) => node.value === value));
+	return renderStructure(nodes, trigger.triggerAsChild ? {
+		...MENU_PARTS,
+		trigger: MenuAsChildTrigger
+	} : MENU_PARTS, (node) => node.slot?.name === "trigger" ? trigger.trigger?.() : items(node), MENU_INSTANCES);
+}
+/** 子菜单那一层照 menuStructure 铺：触发条目的文字与 item 插槽的载荷取父菜单里这一条。 */
+function renderSubStructure(api, parent, value, entry, itemSlots) {
+	const meta = parent.collection.find((node) => node.value === value);
+	const nodes = menuStructure(api, {
+		submenu: true,
+		value,
+		label: entry.label ?? meta?.label ?? value,
+		icon: entry.icon ?? meta?.icon ?? null,
+		slotted: slottedBy(itemSlots)
+	});
+	const lookup = (key) => key === value ? meta : api.collection.find((node) => node.value === key);
+	return renderStructure(nodes, {
+		...MENU_PARTS,
+		trigger: MenuStructureSubTrigger
+	}, itemContent(itemSlots, lookup), MENU_INSTANCES);
 }
 /**
-* 子菜单那一层的条目：从本层机器的 collection 现铺，条目带 children 的再往下一层。
-* 默认树内部用；Menubar 与 ContextMenu 按数据铺子层时也用它。不作为公开组件导出。
+* 子菜单那一层的条目：从本层机器的 collection 照 menuNodesStructure 现铺，条目带 children 的再往下一层。
+* Menubar 与 ContextMenu 按数据铺子层时用它。不作为公开组件导出。
 */
 const MenuDefaultNodes = /* @__PURE__ */ defineComponent({
 	name: "MenuDefaultNodes",
@@ -444,22 +564,14 @@ const MenuDefaultNodes = /* @__PURE__ */ defineComponent({
 	} },
 	setup(props) {
 		const ctx = useMenuContext();
-		return () => renderNodes(ctx.api.value.collection, props.itemSlots);
+		provide(MENU_ITEM_SLOTS, props.itemSlots);
+		return () => {
+			const api = ctx.api.value;
+			return renderStructure(menuNodesStructure(api.collection, slottedBy(props.itemSlots)), MENU_PARTS, itemContent(props.itemSlots, (value) => api.collection.find((node) => node.value === value)), MENU_INSTANCES);
+		};
 	}
 });
-/**
-* 带 children 的条目铺成子菜单：本条是入口，下一层交给子菜单机器的 collection 现铺，深度不限。
-* 子层与本层同用这几个插槽，载荷是子层自己的条目元信息。
-*/
-function renderSubmenu(meta, itemSlots) {
-	return h(XhMenuSub, {
-		key: meta.value,
-		value: meta.value,
-		disabled: meta.disabled || void 0,
-		collection: meta.children
-	}, () => [h(XhMenuSubTrigger, null, () => itemSlots.item?.(meta) ?? [meta.label]), h(XhMenuPositioner, null, () => [h(XhMenuContent, null, () => [h(MenuDefaultNodes, { itemSlots })])])]);
-}
 //#endregion
-export { MenuDefaultNodes, XhMenuArrow, XhMenuCheckboxItem, XhMenuContent, XhMenuGroup, XhMenuGroupLabel, XhMenuItem, XhMenuItemDescription, XhMenuItemIndicator, XhMenuItemShortcut, XhMenuItemSuffix, XhMenuItemText, XhMenuPositioner, XhMenuRadioGroup, XhMenuRadioItem, XhMenuRoot, XhMenuSeparator, XhMenuSub, XhMenuSubTrigger, XhMenuTrigger };
+export { MenuDefaultNodes, XhMenuArrow, XhMenuCheckboxItem, XhMenuContent, XhMenuGroup, XhMenuGroupLabel, XhMenuItem, XhMenuItemDescription, XhMenuItemIcon, XhMenuItemIndicator, XhMenuItemShortcut, XhMenuItemSuffix, XhMenuItemText, XhMenuPositioner, XhMenuRadioGroup, XhMenuRadioItem, XhMenuRoot, XhMenuSeparator, XhMenuSub, XhMenuSubTrigger, XhMenuTrigger };
 
 //# sourceMappingURL=menu.js.map