@bug-on/m3-expressive 1.3.5 → 1.3.6

package/dist/pickers.mjs

@@ -2954,45 +2954,64 @@ var DialogOverlay = React6.forwardRef((_a, ref) => {
   ) }));
 });
 DialogOverlay.displayName = "DialogOverlay";
-var DialogContent = React6.forwardRef((_a, ref) => {
-  var _b = _a, { className, children, hideCloseButton = false } = _b, props = __objRest(_b, ["className", "children", "hideCloseButton"]);
-  return /* @__PURE__ */ jsx(
-    RadixDialog.Content,
-    __spreadProps(__spreadValues({
-      ref,
-      asChild: true,
-      "aria-describedby": void 0
-    }, props), {
-      children: /* @__PURE__ */ jsxs(
-        m.div,
-        __spreadProps(__spreadValues({
-          className: cn(
-            "fixed left-1/2 top-1/2 z-50 -translate-x-1/2 -translate-y-1/2",
-            "w-[calc(100%-2rem)] max-w-140",
-            "rounded-[28px] bg-m3-surface-container-high p-6",
-            "shadow-lg outline-none focus-visible:ring-2 focus-visible:ring-m3-primary",
-            className
-          ),
-          role: "dialog"
-        }, MD3_CONTENT_ANIM), {
-          children: [
-            children,
-            !hideCloseButton && /* @__PURE__ */ jsx(RadixDialog.Close, { asChild: true, "aria-label": "Close dialog", children: /* @__PURE__ */ jsx(
-              IconButton,
-              {
-                size: "sm",
-                colorStyle: "filled",
-                className: "absolute right-4 top-4",
-                "aria-label": "Close",
-                children: /* @__PURE__ */ jsx(Icon, { name: "close", "aria-hidden": "true" })
-              }
-            ) })
-          ]
-        })
-      )
-    })
-  );
-});
+var DEFAULT_CLOSE_BTN_PROPS = {
+  size: "sm",
+  colorStyle: "standard",
+  className: "absolute right-4 top-4",
+  "aria-label": "Close"
+};
+var DialogContent = React6.forwardRef(
+  (_a, ref) => {
+    var _b = _a, {
+      className,
+      children,
+      hideCloseButton = false,
+      closeButtonProps,
+      closeButton
+    } = _b, props = __objRest(_b, [
+      "className",
+      "children",
+      "hideCloseButton",
+      "closeButtonProps",
+      "closeButton"
+    ]);
+    const closeAriaLabel = (() => {
+      var _a2, _b2, _c;
+      if (closeButton == null) {
+        return (_a2 = closeButtonProps == null ? void 0 : closeButtonProps["aria-label"]) != null ? _a2 : DEFAULT_CLOSE_BTN_PROPS["aria-label"];
+      }
+      const el = closeButton;
+      return (_c = (_b2 = el == null ? void 0 : el.props) == null ? void 0 : _b2["aria-label"]) != null ? _c : "Close";
+    })();
+    return /* @__PURE__ */ jsx(
+      RadixDialog.Content,
+      __spreadProps(__spreadValues({
+        ref,
+        asChild: true,
+        "aria-describedby": void 0
+      }, props), {
+        children: /* @__PURE__ */ jsxs(
+          m.div,
+          __spreadProps(__spreadValues({
+            className: cn(
+              "fixed left-1/2 top-1/2 z-50 -translate-x-1/2 -translate-y-1/2",
+              "w-[calc(100%-2rem)] max-w-140",
+              "rounded-[28px] bg-m3-surface-container-high p-6",
+              "shadow-lg outline-none focus-visible:ring-2 focus-visible:ring-m3-primary",
+              className
+            ),
+            role: "dialog"
+          }, MD3_CONTENT_ANIM), {
+            children: [
+              children,
+              closeButton != null ? /* @__PURE__ */ jsx(RadixDialog.Close, { asChild: true, "aria-label": closeAriaLabel, children: closeButton }) : !hideCloseButton ? /* @__PURE__ */ jsx(RadixDialog.Close, { asChild: true, "aria-label": closeAriaLabel, children: /* @__PURE__ */ jsx(IconButton, __spreadProps(__spreadValues(__spreadValues({}, DEFAULT_CLOSE_BTN_PROPS), closeButtonProps), { children: /* @__PURE__ */ jsx(Icon, { name: "close", "aria-hidden": "true" }) })) }) : null
+            ]
+          })
+        )
+      })
+    );
+  }
+);
 DialogContent.displayName = "DialogContent";
 var DialogIcon = React6.forwardRef((_a, ref) => {
   var _b = _a, { className, children } = _b, props = __objRest(_b, ["className", "children"]);
@@ -3059,6 +3078,8 @@ var DialogFullScreenContent = React6.forwardRef(
       title,
       actionLabel,
       onAction,
+      actionButtonProps,
+      closeButtonProps,
       showDivider
     } = _b, props = __objRest(_b, [
       "className",
@@ -3066,8 +3087,11 @@ var DialogFullScreenContent = React6.forwardRef(
       "title",
       "actionLabel",
       "onAction",
+      "actionButtonProps",
+      "closeButtonProps",
       "showDivider"
     ]);
+    var _a2;
     return /* @__PURE__ */ jsx(
       RadixDialog.Content,
       __spreadProps(__spreadValues({
@@ -3087,16 +3111,33 @@ var DialogFullScreenContent = React6.forwardRef(
           }, MD3_FULLSCREEN_ANIM), {
             children: [
               /* @__PURE__ */ jsxs("div", { className: "flex shrink-0 items-center px-4 h-14 gap-2 bg-m3-surface", children: [
-                /* @__PURE__ */ jsx(RadixDialog.Close, { asChild: true, "aria-label": "Close dialog", children: /* @__PURE__ */ jsx(IconButton, { size: "sm", colorStyle: "filled", "aria-label": "Close", children: /* @__PURE__ */ jsx(Icon, { name: "close", "aria-hidden": "true" }) }) }),
+                /* @__PURE__ */ jsx(
+                  RadixDialog.Close,
+                  {
+                    asChild: true,
+                    "aria-label": (_a2 = closeButtonProps == null ? void 0 : closeButtonProps["aria-label"]) != null ? _a2 : "Close",
+                    children: /* @__PURE__ */ jsx(
+                      IconButton,
+                      __spreadProps(__spreadValues({
+                        size: "sm",
+                        colorStyle: "standard",
+                        "aria-label": "Close"
+                      }, closeButtonProps), {
+                        children: /* @__PURE__ */ jsx(Icon, { name: "close", "aria-hidden": "true" })
+                      })
+                    )
+                  }
+                ),
                 title && /* @__PURE__ */ jsx(DialogTitle, { className: "flex-1 text-[22px] leading-7 font-medium truncate pr-2", children: title }),
                 actionLabel && onAction && /* @__PURE__ */ jsx(
                   "button",
-                  {
+                  __spreadProps(__spreadValues({
                     type: "button",
                     onClick: onAction,
-                    className: "text-sm font-medium text-m3-primary px-3 py-2 rounded-full hover:bg-m3-primary/8 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-m3-primary transition-colors whitespace-nowrap",
+                    className: "text-sm font-medium text-m3-primary px-3 py-2 rounded-full hover:bg-m3-primary/8 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-m3-primary transition-colors whitespace-nowrap disabled:opacity-[0.38] disabled:pointer-events-none"
+                  }, actionButtonProps), {
                     children: actionLabel
-                  }
+                  })
                 )
               ] }),
               showDivider && /* @__PURE__ */ jsx("hr", { className: "border-m3-outline-variant w-full shrink-0 m-0" }),
@@ -4092,21 +4133,13 @@ var normalizeAngle = (angle) => {
   return a;
 };
 var angleToHour12 = (angle) => {
-  const hourOffset = RADIANS_PER_HOUR / 2;
-  const totalOffset = hourOffset + QUARTER_CIRCLE;
-  const hour = Math.round((angle + totalOffset) / RADIANS_PER_HOUR) % 12;
+  const normalized = normalizeAngle(angle + QUARTER_CIRCLE);
+  const hour = Math.round(normalized / RADIANS_PER_HOUR) % 12;
   return hour === 0 ? 12 : hour;
 };
-var angleToMinute = (angle, snap = true) => {
-  if (snap) {
-    const minuteOffset = RADIANS_PER_MINUTE / 2;
-    const totalOffset = minuteOffset + QUARTER_CIRCLE;
-    const raw2 = Math.round((angle + totalOffset) / RADIANS_PER_MINUTE) % 60;
-    return raw2 < 0 ? raw2 + 60 : raw2;
-  }
+var angleToMinute = (angle, _snap = true) => {
   const normalized = normalizeAngle(angle + QUARTER_CIRCLE);
-  const raw = Math.round(normalized / FULL_CIRCLE * 60) % 60;
-  return raw < 0 ? raw + 60 : raw;
+  return Math.round(normalized / RADIANS_PER_MINUTE) % 60;
 };
 var getSelectorPosition = (angle, selection, is24hour, isPm) => {
   const useInner = is24hour && isPm && selection === "hour";