@fangxinyan/lumina 0.7.0 → 0.9.0

package/dist/{chunk-FKCPSVC4.cjs → chunk-ADPXWCTK.cjs}

@@ -1,8 +1,8 @@
 'use strict';
 
-var chunk2AUXUZ3Z_cjs = require('./chunk-2AUXUZ3Z.cjs');
-var chunkNRJXZPZR_cjs = require('./chunk-NRJXZPZR.cjs');
-require('./tokens-CEJVVA3G.css');
+var chunkVDVKY2IX_cjs = require('./chunk-VDVKY2IX.cjs');
+var chunkV6BLBIY6_cjs = require('./chunk-V6BLBIY6.cjs');
+require('./tokens-223RYVVS.css');
 require('./shared-NJHRNLRH.css');
 require('./AppShell-OWJRJ4ZD.css');
 var React = require('react');
@@ -66,12 +66,12 @@ var WindowControlsBase = React__namespace.forwardRef(({
   ] });
 });
 WindowControlsBase.displayName = "WindowControls";
-var WindowControls = chunkNRJXZPZR_cjs.withComponentTheme(
+var WindowControls = chunkV6BLBIY6_cjs.withComponentTheme(
   WindowControlsBase,
   "WindowControls",
   "app-shell"
 );
-var InternalWindowControls = chunkNRJXZPZR_cjs.withInternalComponentThemePart(
+var InternalWindowControls = chunkV6BLBIY6_cjs.withInternalComponentThemePart(
   WindowControls,
   "WindowControls"
 );
@@ -103,7 +103,7 @@ var TitleBarBase = React__namespace.forwardRef(({
   ] });
 });
 TitleBarBase.displayName = "TitleBar";
-var TitleBar = chunkNRJXZPZR_cjs.withComponentTheme(TitleBarBase, "TitleBar", "app-shell");
+var TitleBar = chunkV6BLBIY6_cjs.withComponentTheme(TitleBarBase, "TitleBar", "app-shell");
 var collectExpandableSidebarKeys = (items) => items.flatMap((item) => [
   ...item.children?.length ? [item.key] : [],
   ...item.children ? collectExpandableSidebarKeys(item.children) : []
@@ -157,7 +157,7 @@ var SidebarBase = React__namespace.forwardRef(({
             item.icon && /* @__PURE__ */ jsxRuntime.jsx("span", { className: "sidebar-icon", "aria-hidden": collapsed && !!textLabel, children: item.icon }),
             !collapsed && /* @__PURE__ */ jsxRuntime.jsx("span", { className: "sidebar-label", children: item.label }),
             !collapsed && item.badge != null && /* @__PURE__ */ jsxRuntime.jsx("span", { className: "sidebar-badge", children: item.badge }),
-            !collapsed && hasChildren && /* @__PURE__ */ jsxRuntime.jsx("span", { className: `sidebar-expand ${expanded ? "open" : ""}`, "aria-hidden": true, children: /* @__PURE__ */ jsxRuntime.jsx(chunk2AUXUZ3Z_cjs.Icon, { name: "chevDown", size: 13 }) })
+            !collapsed && hasChildren && /* @__PURE__ */ jsxRuntime.jsx("span", { className: `sidebar-expand ${expanded ? "open" : ""}`, "aria-hidden": true, children: /* @__PURE__ */ jsxRuntime.jsx(chunkVDVKY2IX_cjs.Icon, { name: "chevDown", size: 13 }) })
           ]
         }
       ),
@@ -171,7 +171,7 @@ var SidebarBase = React__namespace.forwardRef(({
   ] });
 });
 SidebarBase.displayName = "Sidebar";
-var Sidebar = chunkNRJXZPZR_cjs.withComponentTheme(SidebarBase, "Sidebar", "app-shell");
+var Sidebar = chunkV6BLBIY6_cjs.withComponentTheme(SidebarBase, "Sidebar", "app-shell");
 var AppShellBase = React__namespace.forwardRef(({ sidebar, titleBar, children, className = "", ...rest }, ref) => /* @__PURE__ */ jsxRuntime.jsxs("div", { ref, className: `app-shell ${className}`, ...rest, children: [
   titleBar,
   /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "app-shell-body", children: [
@@ -180,7 +180,7 @@ var AppShellBase = React__namespace.forwardRef(({ sidebar, titleBar, children, c
   ] })
 ] }));
 AppShellBase.displayName = "AppShell";
-var AppShell = chunkNRJXZPZR_cjs.withComponentTheme(AppShellBase, "AppShell", "app-shell");
+var AppShell = chunkV6BLBIY6_cjs.withComponentTheme(AppShellBase, "AppShell", "app-shell");
 
 exports.AppShell = AppShell;
 exports.Sidebar = Sidebar;

package/dist/{chunk-QDCPVI3S.cjs → chunk-AE5XWZ24.cjs}

@@ -1,12 +1,12 @@
 'use strict';
 
 var chunkFJB3243S_cjs = require('./chunk-FJB3243S.cjs');
-var chunkSTQDKMS5_cjs = require('./chunk-STQDKMS5.cjs');
+var chunkGFGMGJ5A_cjs = require('./chunk-GFGMGJ5A.cjs');
 var chunkHSDMJUB6_cjs = require('./chunk-HSDMJUB6.cjs');
-var chunk2AUXUZ3Z_cjs = require('./chunk-2AUXUZ3Z.cjs');
-var chunkNRJXZPZR_cjs = require('./chunk-NRJXZPZR.cjs');
-var chunkEE5KXDRK_cjs = require('./chunk-EE5KXDRK.cjs');
-require('./tokens-CEJVVA3G.css');
+var chunkVDVKY2IX_cjs = require('./chunk-VDVKY2IX.cjs');
+var chunkV6BLBIY6_cjs = require('./chunk-V6BLBIY6.cjs');
+var chunkI4GJZLJU_cjs = require('./chunk-I4GJZLJU.cjs');
+require('./tokens-223RYVVS.css');
 require('./shared-NJHRNLRH.css');
 require('./Cascader-YBVDK6DC.css');
 var React = require('react');
@@ -87,8 +87,8 @@ var CascaderBase = React__namespace.forwardRef(({
   const [path, setPath] = React__namespace.useState(cur);
   const [query, setQuery] = React__namespace.useState("");
   const searchRef = React__namespace.useRef(null);
-  const portalContainer = chunkEE5KXDRK_cjs.usePortalContainer();
-  const portalTheme = chunkNRJXZPZR_cjs.useComponentPortalTheme("Cascader");
+  const portalContainer = chunkI4GJZLJU_cjs.usePortalContainer();
+  const portalTheme = chunkV6BLBIY6_cjs.useComponentPortalTheme("Cascader");
   const panelId = React__namespace.useId();
   const searchConfig = typeof showSearch === "object" ? showSearch : {};
   const searchable = !!showSearch;
@@ -247,10 +247,10 @@ var CascaderBase = React__namespace.forwardRef(({
               "aria-label": "Clear",
               "aria-hidden": "true",
               onClick: clear,
-              children: /* @__PURE__ */ jsxRuntime.jsx(chunk2AUXUZ3Z_cjs.Icon, { name: "x", size: 12 })
+              children: /* @__PURE__ */ jsxRuntime.jsx(chunkVDVKY2IX_cjs.Icon, { name: "x", size: 12 })
             }
           ),
-          /* @__PURE__ */ jsxRuntime.jsx("span", { style: { position: "absolute", right: 12, color: "var(--lmn-cascader-fg-subtle, var(--fg-subtle))" }, children: /* @__PURE__ */ jsxRuntime.jsx(chunk2AUXUZ3Z_cjs.Icon, { name: "chevDown", size: 14 }) })
+          /* @__PURE__ */ jsxRuntime.jsx("span", { style: { position: "absolute", right: 12, color: "var(--lmn-cascader-fg-subtle, var(--fg-subtle))" }, children: /* @__PURE__ */ jsxRuntime.jsx(chunkVDVKY2IX_cjs.Icon, { name: "chevDown", size: 14 }) })
         ]
       }
     ),
@@ -266,8 +266,8 @@ var CascaderBase = React__namespace.forwardRef(({
           ...portalTheme.dataAttributes,
           style: panelStyle,
           children: [
-            searchable && /* @__PURE__ */ jsxRuntime.jsx("div", { className: "cascader-search", children: /* @__PURE__ */ jsxRuntime.jsx(chunkNRJXZPZR_cjs.InternalComponentThemePart, { components: "Input", children: /* @__PURE__ */ jsxRuntime.jsx(
-              chunkSTQDKMS5_cjs.Input,
+            searchable && /* @__PURE__ */ jsxRuntime.jsx("div", { className: "cascader-search", children: /* @__PURE__ */ jsxRuntime.jsx(chunkV6BLBIY6_cjs.InternalComponentThemePart, { components: "Input", children: /* @__PURE__ */ jsxRuntime.jsx(
+              chunkGFGMGJ5A_cjs.Input,
               {
                 ref: searchRef,
                 size: "sm",
@@ -307,10 +307,10 @@ var CascaderBase = React__namespace.forwardRef(({
                   onClick: () => pick(depth, o.value, hasChildren),
                   children: [
                     optionRender ? /* @__PURE__ */ jsxRuntime.jsx("span", { className: "cascader-item-custom", children: optionRender(o, { depth, selected: isActive, hasChildren }) }) : /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
-                      chunk2AUXUZ3Z_cjs.renderIconSlot(o.icon, { size: 13, className: "cascader-icon" }),
+                      chunkVDVKY2IX_cjs.renderIconSlot(o.icon, { size: 13, className: "cascader-icon" }),
                       /* @__PURE__ */ jsxRuntime.jsx("span", { className: "cascader-item-label", children: o.label })
                     ] }),
-                    hasChildren && /* @__PURE__ */ jsxRuntime.jsx("span", { className: "chev", children: /* @__PURE__ */ jsxRuntime.jsx(chunk2AUXUZ3Z_cjs.Icon, { name: "chevRight", size: 12 }) })
+                    hasChildren && /* @__PURE__ */ jsxRuntime.jsx("span", { className: "chev", children: /* @__PURE__ */ jsxRuntime.jsx(chunkVDVKY2IX_cjs.Icon, { name: "chevRight", size: 12 }) })
                   ]
                 },
                 o.value
@@ -324,7 +324,7 @@ var CascaderBase = React__namespace.forwardRef(({
   ] });
 });
 CascaderBase.displayName = "Cascader";
-var Cascader = chunkNRJXZPZR_cjs.withComponentTheme(
+var Cascader = chunkV6BLBIY6_cjs.withComponentTheme(
   CascaderBase,
   "Cascader",
   ["cascader", "input"]

package/dist/{chunk-XZXY3XCL.cjs → chunk-AEY76EAH.cjs}

@@ -1,9 +1,9 @@
 'use strict';
 
-var chunkNRJXZPZR_cjs = require('./chunk-NRJXZPZR.cjs');
-require('./tokens-CEJVVA3G.css');
+var chunkV6BLBIY6_cjs = require('./chunk-V6BLBIY6.cjs');
+require('./tokens-223RYVVS.css');
 require('./shared-NJHRNLRH.css');
-require('./Tabs-A3IG6UZ6.css');
+require('./Tabs-FB2AMBWL.css');
 var React = require('react');
 var jsxRuntime = require('react/jsx-runtime');
 
@@ -35,6 +35,9 @@ var TabsBase = React__namespace.forwardRef(({
   onChange,
   variant = "line",
   centered,
+  tabBarClassName = "",
+  contentClassName = "",
+  fill = false,
   className = "",
   ...rest
 }, ref) => {
@@ -64,42 +67,56 @@ var TabsBase = React__namespace.forwardRef(({
   };
   const active = items.find((i) => i.key === current);
   const activeIndex = items.findIndex((item) => item.key === current);
-  return /* @__PURE__ */ jsxRuntime.jsxs("div", { ref, className: `tabs ${variant} ${centered ? "centered" : ""} ${className}`, ...rest, children: [
-    /* @__PURE__ */ jsxRuntime.jsx("div", { className: "tabs-nav", role: "tablist", children: items.map((it, index) => /* @__PURE__ */ jsxRuntime.jsx(
-      "button",
-      {
-        ref: (node) => {
-          if (node) tabRefs.current.set(it.key, node);
-          else tabRefs.current.delete(it.key);
-        },
-        type: "button",
-        role: "tab",
-        id: `${baseId}-tab-${index}`,
-        "aria-selected": current === it.key,
-        "aria-controls": it.content !== void 0 ? `${baseId}-panel-${index}` : void 0,
-        tabIndex: current === it.key ? 0 : -1,
-        disabled: it.disabled,
-        className: `tab ${current === it.key ? "active" : ""}`,
-        onClick: () => select(it.key),
-        onKeyDown: handleTabKeyDown,
-        children: it.label
-      },
-      it.key
-    )) }),
-    active?.content !== void 0 && /* @__PURE__ */ jsxRuntime.jsx(
-      "div",
-      {
-        id: `${baseId}-panel-${activeIndex}`,
-        className: "tabs-content",
-        role: "tabpanel",
-        "aria-labelledby": `${baseId}-tab-${activeIndex}`,
-        tabIndex: 0,
-        children: active.content
-      }
-    )
-  ] });
+  return /* @__PURE__ */ jsxRuntime.jsxs(
+    "div",
+    {
+      ref,
+      className: [
+        "tabs",
+        variant,
+        centered ? "centered" : "",
+        fill ? "fill" : "",
+        className
+      ].filter(Boolean).join(" "),
+      ...rest,
+      children: [
+        /* @__PURE__ */ jsxRuntime.jsx("div", { className: ["tabs-nav", tabBarClassName].filter(Boolean).join(" "), role: "tablist", children: items.map((it, index) => /* @__PURE__ */ jsxRuntime.jsx(
+          "button",
+          {
+            ref: (node) => {
+              if (node) tabRefs.current.set(it.key, node);
+              else tabRefs.current.delete(it.key);
+            },
+            type: "button",
+            role: "tab",
+            id: `${baseId}-tab-${index}`,
+            "aria-selected": current === it.key,
+            "aria-controls": it.content !== void 0 ? `${baseId}-panel-${index}` : void 0,
+            tabIndex: current === it.key ? 0 : -1,
+            disabled: it.disabled,
+            className: `tab ${current === it.key ? "active" : ""}`,
+            onClick: () => select(it.key),
+            onKeyDown: handleTabKeyDown,
+            children: it.label
+          },
+          it.key
+        )) }),
+        active?.content !== void 0 && /* @__PURE__ */ jsxRuntime.jsx(
+          "div",
+          {
+            id: `${baseId}-panel-${activeIndex}`,
+            className: ["tabs-content", contentClassName].filter(Boolean).join(" "),
+            role: "tabpanel",
+            "aria-labelledby": `${baseId}-tab-${activeIndex}`,
+            tabIndex: 0,
+            children: active.content
+          }
+        )
+      ]
+    }
+  );
 });
 TabsBase.displayName = "Tabs";
-var Tabs = chunkNRJXZPZR_cjs.withComponentTheme(TabsBase, "Tabs", "tabs");
+var Tabs = chunkV6BLBIY6_cjs.withComponentTheme(TabsBase, "Tabs", "tabs");
 
 exports.Tabs = Tabs;

package/dist/{chunk-3EHJ5QI3.js → chunk-AL2PYVVP.js}

@@ -1,19 +1,28 @@
-import { Tag } from './chunk-62VV5COT.js';
+import { Tag } from './chunk-OGMI3TO5.js';
 import { useFloating } from './chunk-3QXP2ZNP.js';
-import { Input } from './chunk-UE4HFGJ6.js';
+import { Input } from './chunk-TUXF2G2O.js';
 import { useOverlayLayer } from './chunk-2A4GYSN4.js';
-import { Icon, renderIconSlot } from './chunk-LQMOYVQF.js';
-import { withComponentTheme, useComponentPortalTheme, InternalComponentThemePart } from './chunk-DRDDQCDD.js';
-import { usePortalContainer } from './chunk-ULTDRMGN.js';
-import './tokens-CEJVVA3G.css';
+import { Icon, renderIconSlot } from './chunk-2BM65ITV.js';
+import { withComponentTheme, useComponentPortalTheme, InternalComponentThemePart } from './chunk-5HLNFDV4.js';
+import { usePortalContainer } from './chunk-CPVUDSIY.js';
+import './tokens-223RYVVS.css';
 import './shared-NJHRNLRH.css';
-import './Select-TU37MAHZ.css';
+import './Select-QPBB73KA.css';
 import * as React from 'react';
 import { createPortal } from 'react-dom';
 import { jsxs, jsx, Fragment } from 'react/jsx-runtime';
 
 var isGroup = (it) => Array.isArray(it.options);
 var flatten = (items) => items.flatMap((it) => isGroup(it) ? it.options : [it]);
+var prioritizePinnedGroups = (items) => {
+  const pinnedGroups = [];
+  const remainingItems = [];
+  items.forEach((item) => {
+    if (isGroup(item) && item.pinned) pinnedGroups.push(item);
+    else remainingItems.push(item);
+  });
+  return pinnedGroups.length > 0 ? [...pinnedGroups, ...remainingItems] : items;
+};
 var defaultFilter = (input, opt, optionFilterProp) => {
   const q = input.toLowerCase();
   const propValue = optionFilterProp ? opt[optionFilterProp] : void 0;
@@ -43,9 +52,11 @@ var SelectInner = (props, forwardedRef) => {
     loading,
     emptyContent,
     optionRender,
+    optionExtraRender,
     selectedRender,
     listHeight = 260,
     popupStyle,
+    getOptionDisabled,
     open: openProp,
     defaultOpen,
     onOpenChange,
@@ -67,7 +78,8 @@ var SelectInner = (props, forwardedRef) => {
     defaultValue: _defaultValue,
     onChange: _selectionChange,
     onClear: _onClear,
-    maxTagCount: _maxTagCount,
+    maxTagCount,
+    maxCount,
     ...rest
   } = props;
   const isMulti = multiple === true;
@@ -141,6 +153,15 @@ var SelectInner = (props, forwardedRef) => {
   const singleValue = singleControlled ? props.value : innerSingle;
   const controlledMultiValue = props.value;
   const multiValue = multiControlled ? Array.isArray(controlledMultiValue) ? controlledMultiValue : [] : innerMulti;
+  const selectedValues = React.useMemo(
+    () => isMulti ? multiValue : singleValue !== void 0 ? [singleValue] : [],
+    [isMulti, multiValue, singleValue]
+  );
+  const selectionLimit = maxCount !== void 0 && Number.isFinite(maxCount) ? Math.max(0, Math.floor(maxCount)) : void 0;
+  const isOptionDisabled = React.useCallback((option) => {
+    const selected = selectedValues.includes(option.value);
+    return !!option.disabled || !!getOptionDisabled?.(option, selectedValues) || isMulti && !selected && selectionLimit !== void 0 && selectedValues.length >= selectionLimit;
+  }, [getOptionDisabled, isMulti, selectedValues, selectionLimit]);
   React.useEffect(() => {
     if (!open) return;
     const h = (e) => {
@@ -158,7 +179,11 @@ var SelectInner = (props, forwardedRef) => {
     }
     if (!open) setActiveIdx(-1);
   }, [open, mergedSearchable]);
-  const allFlat = React.useMemo(() => flatten(options), [options]);
+  const orderedItems = React.useMemo(
+    () => prioritizePinnedGroups(options),
+    [options]
+  );
+  const allFlat = React.useMemo(() => flatten(orderedItems), [orderedItems]);
   const filteredFlat = React.useMemo(() => {
     if (!query.trim()) return allFlat;
     if (filterOption === false) return allFlat;
@@ -166,31 +191,33 @@ var SelectInner = (props, forwardedRef) => {
     return allFlat.filter((o) => f(query, o));
   }, [allFlat, query, filterOption, optionFilterProp]);
   const filteredItems = React.useMemo(() => {
-    if (!query.trim()) return options;
-    return options.map((it) => {
+    if (!query.trim()) {
+      return orderedItems.filter((item) => !isGroup(item) || item.options.length > 0);
+    }
+    return orderedItems.map((it) => {
       if (!isGroup(it)) {
         return filteredFlat.includes(it) ? it : null;
       }
       const kept = it.options.filter((o) => filteredFlat.includes(o));
-      return kept.length ? { label: it.label, options: kept } : null;
+      return kept.length ? { ...it, options: kept } : null;
     }).filter((x) => x !== null);
-  }, [options, filteredFlat, query]);
+  }, [orderedItems, filteredFlat, query]);
   React.useEffect(() => {
     setActiveIdx((current) => {
-      if (current >= 0 && current < filteredFlat.length && !filteredFlat[current].disabled) {
+      if (current >= 0 && current < filteredFlat.length && !isOptionDisabled(filteredFlat[current])) {
         return current;
       }
-      return filteredFlat.findIndex((option) => !option.disabled);
+      return filteredFlat.findIndex((option) => !isOptionDisabled(option));
     });
-  }, [filteredFlat]);
+  }, [filteredFlat, isOptionDisabled]);
   const pickSingle = (opt) => {
-    if (disabled || opt.disabled) return;
+    if (disabled || isOptionDisabled(opt)) return;
     if (!singleControlled) setInnerSingle(opt.value);
     props.onChange?.(opt.value);
     setOpen(false);
   };
   const toggleMulti = (opt) => {
-    if (disabled || opt.disabled) return;
+    if (disabled || isOptionDisabled(opt)) return;
     const cur = multiValue ?? [];
     const next = cur.includes(opt.value) ? cur.filter((v) => v !== opt.value) : [...cur, opt.value];
     if (!multiControlled) setInnerMulti(next);
@@ -232,7 +259,7 @@ var SelectInner = (props, forwardedRef) => {
       setActiveIdx((i) => {
         for (let step = 1; step <= filteredFlat.length; step++) {
           const next = (Math.max(i, -1) + step) % filteredFlat.length;
-          if (!filteredFlat[next]?.disabled) return next;
+          if (filteredFlat[next] && !isOptionDisabled(filteredFlat[next])) return next;
         }
         return i;
       });
@@ -243,7 +270,7 @@ var SelectInner = (props, forwardedRef) => {
       setActiveIdx((i) => {
         for (let step = 1; step <= filteredFlat.length; step++) {
           const next = (i - step + filteredFlat.length) % filteredFlat.length;
-          if (!filteredFlat[next]?.disabled) return next;
+          if (filteredFlat[next] && !isOptionDisabled(filteredFlat[next])) return next;
         }
         return i;
       });
@@ -252,7 +279,7 @@ var SelectInner = (props, forwardedRef) => {
     if (e.key === "Enter") {
       e.preventDefault();
       const opt = filteredFlat[activeIdx];
-      if (opt && !opt.disabled) {
+      if (opt && !isOptionDisabled(opt)) {
         if (isMulti) toggleMulti(opt);
         else pickSingle(opt);
       }
@@ -262,7 +289,7 @@ var SelectInner = (props, forwardedRef) => {
   const renderTrigger = () => {
     if (isMulti) {
       const selected = (multiValue ?? []).map((v) => allFlat.find((o) => o.value === v)).filter((o) => !!o);
-      const max = props.maxTagCount;
+      const max = maxTagCount;
       const shown = max != null ? selected.slice(0, max) : selected;
       const overflow = selected.length - shown.length;
       if (selected.length === 0) {
@@ -304,38 +331,66 @@ var SelectInner = (props, forwardedRef) => {
   const hasSelection = isMulti ? multiValue.length > 0 : singleValue != null;
   const showClear = mergedClearable && hasSelection && !disabled;
   let renderIdx = -1;
-  const renderOption = (o) => {
+  const renderOption = (o, groupPinned = false) => {
     renderIdx += 1;
     const idx = renderIdx;
     const sel = isSelected(o.value);
     const active = idx === activeIdx;
+    const optionDisabled = isOptionDisabled(o);
+    const renderInfo = {
+      index: idx,
+      selected: sel,
+      active,
+      disabled: optionDisabled,
+      groupPinned
+    };
+    const extraContent = optionExtraRender ? optionExtraRender(o, renderInfo) : o.extra;
+    const hasExtra = extraContent !== null && extraContent !== void 0 && extraContent !== false;
     return /* @__PURE__ */ jsxs(
-      "button",
+      "div",
       {
-        id: `${listboxId}-option-${idx}`,
-        type: "button",
-        role: "option",
-        "aria-selected": sel,
-        "aria-label": getOptionAriaLabel(o),
-        disabled: o.disabled,
-        className: `menu-item ${sel ? "active" : ""} ${active ? "highlight" : ""}`,
-        onMouseEnter: () => setActiveIdx(idx),
-        onClick: () => isMulti ? toggleMulti(o) : pickSingle(o),
+        role: "presentation",
+        className: `menu-item-row ${sel ? "active" : ""} ${active ? "highlight" : ""} ${optionDisabled ? "disabled" : ""}`,
+        onMouseEnter: () => {
+          if (!optionDisabled) setActiveIdx(idx);
+        },
         children: [
-          isMulti && /* @__PURE__ */ jsx("span", { className: `menu-check ${sel ? "on" : ""}`, "aria-hidden": true, children: sel && /* @__PURE__ */ jsx(Icon, { name: "check", size: 11, stroke: 3 }) }),
-          optionRender ? /* @__PURE__ */ jsx("span", { className: "menu-item-custom", children: optionRender(o, { index: idx, selected: sel, active }) }) : /* @__PURE__ */ jsxs(Fragment, { children: [
-            renderIconSlot(o.icon, { size: 14, className: "menu-item-icon" }),
-            /* @__PURE__ */ jsxs("span", { className: "menu-item-body", children: [
-              /* @__PURE__ */ jsx("span", { className: "menu-item-label", children: o.label }),
-              o.description && /* @__PURE__ */ jsx("span", { className: "menu-item-desc", children: o.description })
-            ] })
-          ] }),
-          !isMulti && /* @__PURE__ */ jsx("span", { className: "tick", children: /* @__PURE__ */ jsx(Icon, { name: "check", size: 12, stroke: 3 }) })
+          /* @__PURE__ */ jsxs(
+            "button",
+            {
+              id: `${listboxId}-option-${idx}`,
+              type: "button",
+              role: "option",
+              "aria-selected": sel,
+              "aria-label": getOptionAriaLabel(o),
+              disabled: optionDisabled,
+              className: `menu-item ${sel ? "active" : ""} ${active ? "highlight" : ""}`,
+              onClick: () => isMulti ? toggleMulti(o) : pickSingle(o),
+              children: [
+                isMulti && /* @__PURE__ */ jsx("span", { className: `menu-check ${sel ? "on" : ""}`, "aria-hidden": true, children: sel && /* @__PURE__ */ jsx(Icon, { name: "check", size: 11, stroke: 3 }) }),
+                optionRender ? /* @__PURE__ */ jsx("span", { className: "menu-item-custom", children: optionRender(o, renderInfo) }) : /* @__PURE__ */ jsxs(Fragment, { children: [
+                  renderIconSlot(o.icon, { size: 14, className: "menu-item-icon" }),
+                  /* @__PURE__ */ jsxs("span", { className: "menu-item-body", children: [
+                    /* @__PURE__ */ jsx("span", { className: "menu-item-label", children: o.label }),
+                    o.description && /* @__PURE__ */ jsx("span", { className: "menu-item-desc", children: o.description })
+                  ] })
+                ] }),
+                !isMulti && /* @__PURE__ */ jsx("span", { className: "tick", children: /* @__PURE__ */ jsx(Icon, { name: "check", size: 12, stroke: 3 }) })
+              ]
+            }
+          ),
+          hasExtra && /* @__PURE__ */ jsx("span", { className: "menu-item-extra", children: extraContent })
         ]
       },
       String(o.value)
     );
   };
+  const renderMenuItems = (items) => items.map(
+    (item, groupIndex) => isGroup(item) ? /* @__PURE__ */ jsxs(React.Fragment, { children: [
+      /* @__PURE__ */ jsx("div", { className: "menu-group-label", children: item.label }),
+      item.options.map((option) => renderOption(option, !!item.pinned))
+    ] }, `g-${groupIndex}-${item.pinned ? "pinned" : "regular"}`) : renderOption(item)
+  );
   return /* @__PURE__ */ jsxs(
     "div",
     {
@@ -451,15 +506,10 @@ var SelectInner = (props, forwardedRef) => {
                     children: loading ? /* @__PURE__ */ jsxs("div", { className: "menu-state", children: [
                       /* @__PURE__ */ jsx("span", { className: "menu-state-ico", children: /* @__PURE__ */ jsx("span", { className: "spinner" }) }),
                       /* @__PURE__ */ jsx("span", { children: "\u52A0\u8F7D\u4E2D..." })
-                    ] }) : filteredItems.length === 0 ? /* @__PURE__ */ jsxs("div", { className: "menu-state", children: [
+                    ] }) : filteredFlat.length === 0 ? /* @__PURE__ */ jsxs("div", { className: "menu-state", children: [
                       /* @__PURE__ */ jsx("span", { className: "menu-state-ico", children: /* @__PURE__ */ jsx(Icon, { name: "search", size: 16 }) }),
                       /* @__PURE__ */ jsx("span", { children: emptyContent ?? "\u6682\u65E0\u5339\u914D\u9879" })
-                    ] }) : filteredItems.map(
-                      (it, gi) => isGroup(it) ? /* @__PURE__ */ jsxs(React.Fragment, { children: [
-                        /* @__PURE__ */ jsx("div", { className: "menu-group-label", children: it.label }),
-                        it.options.map(renderOption)
-                      ] }, `g-${gi}`) : renderOption(it)
-                    )
+                    ] }) : renderMenuItems(filteredItems)
                   }
                 )
               ]