@pactor-app/ui 1.28.0 → 1.30.0

package/dist/{chunk-NQJLAELF.js → chunk-B5GFF7DZ.js}

@@ -153,7 +153,7 @@ import {
   DrawerContent,
   DrawerHeader,
   DrawerTitle
-} from "./chunk-XUHJ5YSG.js";
+} from "./chunk-HAOAXDTW.js";
 import {
   Accordion,
   AccordionContent,
@@ -2580,16 +2580,25 @@ function Drawer2({
     Drawer,
     {
       direction: placement,
+      modal: false,
       open: open ?? false,
       onOpenChange: (next) => {
         if (!next) {
           onClose?.();
         }
       },
-      children: /* @__PURE__ */ jsxs27(DrawerContent, { className, style, children: [
-        title ? /* @__PURE__ */ jsx36(DrawerHeader, { children: /* @__PURE__ */ jsx36(DrawerTitle, { children: title }) }) : null,
-        /* @__PURE__ */ jsx36("div", { className: "flex-1 overflow-auto p-4", children })
-      ] })
+      children: /* @__PURE__ */ jsxs27(
+        DrawerContent,
+        {
+          className,
+          style,
+          overlayProps: { onClick: () => onClose?.() },
+          children: [
+            title ? /* @__PURE__ */ jsx36(DrawerHeader, { children: /* @__PURE__ */ jsx36(DrawerTitle, { children: title }) }) : null,
+            /* @__PURE__ */ jsx36("div", { className: "flex-1 overflow-auto p-4", children })
+          ]
+        }
+      )
     }
   );
 }
@@ -4773,25 +4782,30 @@ function RadioGroup2({
       ),
       style: inForm ? void 0 : style,
       children: options.map((option, index) => {
-        const optionId = `${controlId}-${index}`;
-        const optionDisabled = disabled || option.disabled;
+        const textId = `${controlId}-${index}`;
+        const optionDisabled = disabled === true || option.disabled === true;
         return /* @__PURE__ */ jsxs52("span", { className: "inline-flex items-center gap-2", children: [
           /* @__PURE__ */ jsx74(
             RadioGroupItem,
             {
-              id: optionId,
               value: option.value,
-              disabled: option.disabled
+              disabled: option.disabled,
+              "aria-labelledby": textId
             }
           ),
           /* @__PURE__ */ jsx74(
-            "label",
+            "span",
             {
-              htmlFor: optionId,
+              id: textId,
               className: cn(
                 "text-sm leading-none font-medium",
                 optionDisabled ? "cursor-not-allowed opacity-50" : "cursor-pointer"
               ),
+              onClick: () => {
+                if (!optionDisabled) {
+                  handleChange(option.value);
+                }
+              },
               children: option.label
             }
           )

package/dist/{chunk-XUHJ5YSG.js → chunk-HAOAXDTW.js}

@@ -172,10 +172,21 @@ function DrawerOverlay({
 function DrawerContent({
   className,
   children,
+  overlayProps,
   ...props
 }) {
   return /* @__PURE__ */ jsxs2(DrawerPortal, { "data-slot": "drawer-portal", children: [
-    /* @__PURE__ */ jsx2(DrawerOverlay, {}),
+    /* @__PURE__ */ jsx2(
+      "div",
+      {
+        "data-slot": "drawer-overlay",
+        ...overlayProps,
+        className: cn(
+          "fixed inset-0 z-50 bg-(--overlay-background)",
+          overlayProps?.className
+        )
+      }
+    ),
     /* @__PURE__ */ jsxs2(
       DrawerPrimitive.Content,
       {

package/dist/{chunk-P3LRWCYF.js → chunk-U5EFJR5Z.js}

@@ -11,7 +11,7 @@ import {
   DrawerContent,
   DrawerHeader,
   DrawerTitle
-} from "./chunk-XUHJ5YSG.js";
+} from "./chunk-HAOAXDTW.js";
 import {
   Button,
   cn
@@ -430,6 +430,7 @@ function ShadcnDrawerView({
     Drawer,
     {
       direction: "right",
+      modal: false,
       open: true,
       onOpenChange: (open) => {
         if (!open) {
@@ -442,6 +443,7 @@ function ShadcnDrawerView({
           "data-slot": "drawer-panel",
           className: cn(entry.width !== void 0 && "sm:max-w-none"),
           style: panelStyle,
+          overlayProps: { onClick: onCancel },
           children: [
             /* @__PURE__ */ jsxs2(
               DrawerHeader,

package/dist/components/index.cjs

@@ -4240,26 +4240,24 @@ function DrawerPortal({
 }) {
   return /* @__PURE__ */ (0, import_jsx_runtime60.jsx)(import_vaul.Drawer.Portal, { "data-slot": "drawer-portal", ...props });
 }
-function DrawerOverlay({
-  className,
-  ...props
-}) {
-  return /* @__PURE__ */ (0, import_jsx_runtime60.jsx)(
-    import_vaul.Drawer.Overlay,
-    {
-      "data-slot": "drawer-overlay",
-      className: cn("fixed inset-0 z-50 bg-(--overlay-background)", className),
-      ...props
-    }
-  );
-}
 function DrawerContent({
   className,
   children,
+  overlayProps,
   ...props
 }) {
   return /* @__PURE__ */ (0, import_jsx_runtime60.jsxs)(DrawerPortal, { "data-slot": "drawer-portal", children: [
-    /* @__PURE__ */ (0, import_jsx_runtime60.jsx)(DrawerOverlay, {}),
+    /* @__PURE__ */ (0, import_jsx_runtime60.jsx)(
+      "div",
+      {
+        "data-slot": "drawer-overlay",
+        ...overlayProps,
+        className: cn(
+          "fixed inset-0 z-50 bg-(--overlay-background)",
+          overlayProps?.className
+        )
+      }
+    ),
     /* @__PURE__ */ (0, import_jsx_runtime60.jsxs)(
       import_vaul.Drawer.Content,
       {
@@ -4320,16 +4318,25 @@ function Drawer2({
     Drawer,
     {
       direction: placement,
+      modal: false,
       open: open ?? false,
       onOpenChange: (next) => {
         if (!next) {
           onClose?.();
         }
       },
-      children: /* @__PURE__ */ (0, import_jsx_runtime61.jsxs)(DrawerContent, { className, style, children: [
-        title ? /* @__PURE__ */ (0, import_jsx_runtime61.jsx)(DrawerHeader, { children: /* @__PURE__ */ (0, import_jsx_runtime61.jsx)(DrawerTitle, { children: title }) }) : null,
-        /* @__PURE__ */ (0, import_jsx_runtime61.jsx)("div", { className: "flex-1 overflow-auto p-4", children })
-      ] })
+      children: /* @__PURE__ */ (0, import_jsx_runtime61.jsxs)(
+        DrawerContent,
+        {
+          className,
+          style,
+          overlayProps: { onClick: () => onClose?.() },
+          children: [
+            title ? /* @__PURE__ */ (0, import_jsx_runtime61.jsx)(DrawerHeader, { children: /* @__PURE__ */ (0, import_jsx_runtime61.jsx)(DrawerTitle, { children: title }) }) : null,
+            /* @__PURE__ */ (0, import_jsx_runtime61.jsx)("div", { className: "flex-1 overflow-auto p-4", children })
+          ]
+        }
+      )
     }
   );
 }
@@ -8404,25 +8411,30 @@ function RadioGroup2({
       ),
       style: inForm ? void 0 : style,
       children: options.map((option, index) => {
-        const optionId = `${controlId}-${index}`;
-        const optionDisabled = disabled || option.disabled;
+        const textId = `${controlId}-${index}`;
+        const optionDisabled = disabled === true || option.disabled === true;
         return /* @__PURE__ */ (0, import_jsx_runtime122.jsxs)("span", { className: "inline-flex items-center gap-2", children: [
           /* @__PURE__ */ (0, import_jsx_runtime122.jsx)(
             RadioGroupItem,
             {
-              id: optionId,
               value: option.value,
-              disabled: option.disabled
+              disabled: option.disabled,
+              "aria-labelledby": textId
             }
           ),
           /* @__PURE__ */ (0, import_jsx_runtime122.jsx)(
-            "label",
+            "span",
             {
-              htmlFor: optionId,
+              id: textId,
               className: cn(
                 "text-sm leading-none font-medium",
                 optionDisabled ? "cursor-not-allowed opacity-50" : "cursor-pointer"
               ),
+              onClick: () => {
+                if (!optionDisabled) {
+                  handleChange(option.value);
+                }
+              },
               children: option.label
             }
           )

package/dist/components/index.js

@@ -154,7 +154,7 @@ import {
   inferKind,
   registerBuiltinComponents,
   useFormContext
-} from "../chunk-NQJLAELF.js";
+} from "../chunk-B5GFF7DZ.js";
 import {
   ICONS,
   Icon,
@@ -165,7 +165,7 @@ import {
   useSidebarDrawer
 } from "../chunk-44DAGWXZ.js";
 import "../chunk-JWZHJEUS.js";
-import "../chunk-XUHJ5YSG.js";
+import "../chunk-HAOAXDTW.js";
 import "../chunk-RB7RCKAX.js";
 import "../chunk-WKJUCGV4.js";
 export {

package/dist/index.cjs

@@ -4279,26 +4279,24 @@ function DrawerClose({
 }) {
   return /* @__PURE__ */ (0, import_jsx_runtime60.jsx)(import_vaul.Drawer.Close, { "data-slot": "drawer-close", ...props });
 }
-function DrawerOverlay({
-  className,
-  ...props
-}) {
-  return /* @__PURE__ */ (0, import_jsx_runtime60.jsx)(
-    import_vaul.Drawer.Overlay,
-    {
-      "data-slot": "drawer-overlay",
-      className: cn("fixed inset-0 z-50 bg-(--overlay-background)", className),
-      ...props
-    }
-  );
-}
 function DrawerContent({
   className,
   children,
+  overlayProps,
   ...props
 }) {
   return /* @__PURE__ */ (0, import_jsx_runtime60.jsxs)(DrawerPortal, { "data-slot": "drawer-portal", children: [
-    /* @__PURE__ */ (0, import_jsx_runtime60.jsx)(DrawerOverlay, {}),
+    /* @__PURE__ */ (0, import_jsx_runtime60.jsx)(
+      "div",
+      {
+        "data-slot": "drawer-overlay",
+        ...overlayProps,
+        className: cn(
+          "fixed inset-0 z-50 bg-(--overlay-background)",
+          overlayProps?.className
+        )
+      }
+    ),
     /* @__PURE__ */ (0, import_jsx_runtime60.jsxs)(
       import_vaul.Drawer.Content,
       {
@@ -4359,16 +4357,25 @@ function Drawer2({
     Drawer,
     {
       direction: placement,
+      modal: false,
       open: open ?? false,
       onOpenChange: (next) => {
         if (!next) {
           onClose?.();
         }
       },
-      children: /* @__PURE__ */ (0, import_jsx_runtime61.jsxs)(DrawerContent, { className, style, children: [
-        title ? /* @__PURE__ */ (0, import_jsx_runtime61.jsx)(DrawerHeader, { children: /* @__PURE__ */ (0, import_jsx_runtime61.jsx)(DrawerTitle, { children: title }) }) : null,
-        /* @__PURE__ */ (0, import_jsx_runtime61.jsx)("div", { className: "flex-1 overflow-auto p-4", children })
-      ] })
+      children: /* @__PURE__ */ (0, import_jsx_runtime61.jsxs)(
+        DrawerContent,
+        {
+          className,
+          style,
+          overlayProps: { onClick: () => onClose?.() },
+          children: [
+            title ? /* @__PURE__ */ (0, import_jsx_runtime61.jsx)(DrawerHeader, { children: /* @__PURE__ */ (0, import_jsx_runtime61.jsx)(DrawerTitle, { children: title }) }) : null,
+            /* @__PURE__ */ (0, import_jsx_runtime61.jsx)("div", { className: "flex-1 overflow-auto p-4", children })
+          ]
+        }
+      )
     }
   );
 }
@@ -8443,25 +8450,30 @@ function RadioGroup2({
       ),
       style: inForm ? void 0 : style,
       children: options.map((option, index) => {
-        const optionId = `${controlId}-${index}`;
-        const optionDisabled = disabled || option.disabled;
+        const textId = `${controlId}-${index}`;
+        const optionDisabled = disabled === true || option.disabled === true;
         return /* @__PURE__ */ (0, import_jsx_runtime122.jsxs)("span", { className: "inline-flex items-center gap-2", children: [
           /* @__PURE__ */ (0, import_jsx_runtime122.jsx)(
             RadioGroupItem,
             {
-              id: optionId,
               value: option.value,
-              disabled: option.disabled
+              disabled: option.disabled,
+              "aria-labelledby": textId
             }
           ),
           /* @__PURE__ */ (0, import_jsx_runtime122.jsx)(
-            "label",
+            "span",
             {
-              htmlFor: optionId,
+              id: textId,
               className: cn(
                 "text-sm leading-none font-medium",
                 optionDisabled ? "cursor-not-allowed opacity-50" : "cursor-pointer"
               ),
+              onClick: () => {
+                if (!optionDisabled) {
+                  handleChange(option.value);
+                }
+              },
               children: option.label
             }
           )
@@ -16967,6 +16979,7 @@ function ShadcnDrawerView({
     Drawer,
     {
       direction: "right",
+      modal: false,
       open: true,
       onOpenChange: (open) => {
         if (!open) {
@@ -16979,6 +16992,7 @@ function ShadcnDrawerView({
           "data-slot": "drawer-panel",
           className: cn(entry.width !== void 0 && "sm:max-w-none"),
           style: panelStyle,
+          overlayProps: { onClick: onCancel },
           children: [
             /* @__PURE__ */ (0, import_jsx_runtime215.jsxs)(
               DrawerHeader,

package/dist/index.js

@@ -154,7 +154,7 @@ import {
   inferKind,
   registerBuiltinComponents,
   useFormContext
-} from "./chunk-NQJLAELF.js";
+} from "./chunk-B5GFF7DZ.js";
 import {
   InteractionProvider,
   OVERLAY_CANCEL_PAYLOAD,
@@ -162,7 +162,7 @@ import {
   OverlayManager,
   createUiBridge,
   registerInteractionActions
-} from "./chunk-P3LRWCYF.js";
+} from "./chunk-U5EFJR5Z.js";
 import {
   AdminLayout,
   BlankLayout,
@@ -185,7 +185,7 @@ import {
   useSidebarDrawer
 } from "./chunk-44DAGWXZ.js";
 import "./chunk-JWZHJEUS.js";
-import "./chunk-XUHJ5YSG.js";
+import "./chunk-HAOAXDTW.js";
 import "./chunk-RB7RCKAX.js";
 import "./chunk-WKJUCGV4.js";
 export {

package/dist/interaction/index.cjs

@@ -550,26 +550,24 @@ function DrawerClose({
 }) {
   return /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(import_vaul.Drawer.Close, { "data-slot": "drawer-close", ...props });
 }
-function DrawerOverlay({
-  className,
-  ...props
-}) {
-  return /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(
-    import_vaul.Drawer.Overlay,
-    {
-      "data-slot": "drawer-overlay",
-      className: cn("fixed inset-0 z-50 bg-(--overlay-background)", className),
-      ...props
-    }
-  );
-}
 function DrawerContent({
   className,
   children,
+  overlayProps,
   ...props
 }) {
   return /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)(DrawerPortal, { "data-slot": "drawer-portal", children: [
-    /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(DrawerOverlay, {}),
+    /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(
+      "div",
+      {
+        "data-slot": "drawer-overlay",
+        ...overlayProps,
+        className: cn(
+          "fixed inset-0 z-50 bg-(--overlay-background)",
+          overlayProps?.className
+        )
+      }
+    ),
     /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)(
       import_vaul.Drawer.Content,
       {
@@ -731,6 +729,7 @@ function ShadcnDrawerView({
     Drawer,
     {
       direction: "right",
+      modal: false,
       open: true,
       onOpenChange: (open) => {
         if (!open) {
@@ -743,6 +742,7 @@ function ShadcnDrawerView({
           "data-slot": "drawer-panel",
           className: cn(entry.width !== void 0 && "sm:max-w-none"),
           style: panelStyle,
+          overlayProps: { onClick: onCancel },
           children: [
             /* @__PURE__ */ (0, import_jsx_runtime5.jsxs)(
               DrawerHeader,

package/dist/interaction/index.js

@@ -5,8 +5,8 @@ import {
   OverlayManager,
   createUiBridge,
   registerInteractionActions
-} from "../chunk-P3LRWCYF.js";
-import "../chunk-XUHJ5YSG.js";
+} from "../chunk-U5EFJR5Z.js";
+import "../chunk-HAOAXDTW.js";
 import "../chunk-WKJUCGV4.js";
 export {
   InteractionProvider,

package/dist/ui/index.cjs

@@ -1785,10 +1785,21 @@ function DrawerOverlay({
 function DrawerContent({
   className,
   children,
+  overlayProps,
   ...props
 }) {
   return /* @__PURE__ */ (0, import_jsx_runtime20.jsxs)(DrawerPortal, { "data-slot": "drawer-portal", children: [
-    /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(DrawerOverlay, {}),
+    /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(
+      "div",
+      {
+        "data-slot": "drawer-overlay",
+        ...overlayProps,
+        className: cn(
+          "fixed inset-0 z-50 bg-(--overlay-background)",
+          overlayProps?.className
+        )
+      }
+    ),
     /* @__PURE__ */ (0, import_jsx_runtime20.jsxs)(
       import_vaul.Drawer.Content,
       {

package/dist/ui/index.d.cts

@@ -289,7 +289,10 @@ declare function DrawerTrigger({ ...props }: React.ComponentProps<typeof Drawer$
 declare function DrawerPortal({ ...props }: React.ComponentProps<typeof Drawer$1.Portal>): React.JSX.Element;
 declare function DrawerClose({ ...props }: React.ComponentProps<typeof Drawer$1.Close>): React.JSX.Element;
 declare function DrawerOverlay({ className, ...props }: React.ComponentProps<typeof Drawer$1.Overlay>): React.JSX.Element;
-declare function DrawerContent({ className, children, ...props }: React.ComponentProps<typeof Drawer$1.Content>): React.JSX.Element;
+declare function DrawerContent({ className, children, overlayProps, ...props }: React.ComponentProps<typeof Drawer$1.Content> & {
+    /** 透传给遮罩（modal={false} 时由遮罩 onClick 承担点击关闭） */
+    overlayProps?: React.ComponentProps<'div'>;
+}): React.JSX.Element;
 declare function DrawerHeader({ className, ...props }: React.ComponentProps<'div'>): React.JSX.Element;
 declare function DrawerFooter({ className, ...props }: React.ComponentProps<'div'>): React.JSX.Element;
 declare function DrawerTitle({ className, ...props }: React.ComponentProps<typeof Drawer$1.Title>): React.JSX.Element;

package/dist/ui/index.d.ts

@@ -289,7 +289,10 @@ declare function DrawerTrigger({ ...props }: React.ComponentProps<typeof Drawer$
 declare function DrawerPortal({ ...props }: React.ComponentProps<typeof Drawer$1.Portal>): React.JSX.Element;
 declare function DrawerClose({ ...props }: React.ComponentProps<typeof Drawer$1.Close>): React.JSX.Element;
 declare function DrawerOverlay({ className, ...props }: React.ComponentProps<typeof Drawer$1.Overlay>): React.JSX.Element;
-declare function DrawerContent({ className, children, ...props }: React.ComponentProps<typeof Drawer$1.Content>): React.JSX.Element;
+declare function DrawerContent({ className, children, overlayProps, ...props }: React.ComponentProps<typeof Drawer$1.Content> & {
+    /** 透传给遮罩（modal={false} 时由遮罩 onClick 承担点击关闭） */
+    overlayProps?: React.ComponentProps<'div'>;
+}): React.JSX.Element;
 declare function DrawerHeader({ className, ...props }: React.ComponentProps<'div'>): React.JSX.Element;
 declare function DrawerFooter({ className, ...props }: React.ComponentProps<'div'>): React.JSX.Element;
 declare function DrawerTitle({ className, ...props }: React.ComponentProps<typeof Drawer$1.Title>): React.JSX.Element;

package/dist/ui/index.js

@@ -183,7 +183,7 @@ import {
   DrawerPortal,
   DrawerTitle,
   DrawerTrigger
-} from "../chunk-XUHJ5YSG.js";
+} from "../chunk-HAOAXDTW.js";
 import {
   Accordion,
   AccordionContent,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pactor-app/ui",
-  "version": "1.28.0",
+  "version": "1.30.0",
   "description": "Pactor UI kit (shadcn): the single built-in UI kit — vendored shadcn/ui components (Base UI primitives + cva + tailwind-merge + lucide-react), props contracts, interaction core (OverlayManager / UiBridge) and layouts, with build-time Tailwind v4 prebuilt styles.css (zero consumer-side Tailwind config)",
   "keywords": [
     "pactor",
@@ -107,11 +107,11 @@
     "react-resizable-panels": "^4.12.3",
     "tailwind-merge": "^3.6.0",
     "vaul": "^1.1.2",
-    "@pactor-app/markdown": "1.28.0",
-    "@pactor-app/core": "1.28.0",
-    "@pactor-app/router": "1.28.0",
-    "@pactor-app/runtime": "1.28.0",
-    "@pactor-app/permission": "1.28.0"
+    "@pactor-app/core": "1.30.0",
+    "@pactor-app/markdown": "1.30.0",
+    "@pactor-app/permission": "1.30.0",
+    "@pactor-app/router": "1.30.0",
+    "@pactor-app/runtime": "1.30.0"
   },
   "peerDependencies": {
     "react": ">=18",