@geomak/ui 7.6.3 → 7.7.1

package/dist/index.cjs

@@ -745,6 +745,8 @@ function Modal({
   onCancel,
   okText = "Ok",
   cancelText = "Cancel",
+  okVariant = "primary",
+  cancelVariant = "ghost",
   hasFooter = true,
   title,
   children,
@@ -801,6 +803,7 @@ function Modal({
               Button_default,
               {
                 style: { width: 90 },
+                variant: cancelVariant,
                 content: cancelText,
                 onClick: onCancel
               }
@@ -809,6 +812,7 @@ function Modal({
               Button_default,
               {
                 style: { width: 90 },
+                variant: okVariant,
                 content: okText,
                 onClick: onOk
               }
@@ -835,6 +839,8 @@ function Drawer({
   width,
   okText = "Ok",
   cancelText = "Cancel",
+  okVariant = "primary",
+  cancelVariant = "ghost",
   onOk,
   onCancel,
   title,
@@ -890,8 +896,8 @@ function Drawer({
           ] }),
           /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex-1 overflow-y-auto p-5", children }),
           hasFooter && /* @__PURE__ */ jsxRuntime.jsxs("div", { className: `flex flex-shrink-0 items-center gap-3 border-t border-border px-5 py-3 ${isRight ? "justify-start" : "justify-end"}`, children: [
-            /* @__PURE__ */ jsxRuntime.jsx(Button_default, { style: { width: 90 }, content: cancelText, onClick: onCancel }),
-            /* @__PURE__ */ jsxRuntime.jsx(Button_default, { style: { width: 90 }, content: okText, onClick: onOk })
+            /* @__PURE__ */ jsxRuntime.jsx(Button_default, { style: { width: 90 }, variant: cancelVariant, content: cancelText, onClick: onCancel }),
+            /* @__PURE__ */ jsxRuntime.jsx(Button_default, { style: { width: 90 }, variant: okVariant, content: okText, onClick: onOk })
           ] })
         ]
       }
@@ -1207,7 +1213,7 @@ function TabsTrigger({ value, icon, badge, closeable, onClose, disabled, classNa
     {
       value,
       disabled,
-      className: cx(base, sz.trigger, layoutCls, closeable ? "pr-8" : "", variantCls, className),
+      className: cx(base, sz.trigger, layoutCls, closeable ? "!pr-8" : "", variantCls, className),
       children: [
         variant === "segmented" && isActive && /* @__PURE__ */ jsxRuntime.jsx(
           framerMotion.motion.span,
@@ -1292,9 +1298,11 @@ function TreeNodeItem({
   item,
   onNodeClick,
   defaultExpandAll,
-  defaultExpandedKeys
+  defaultExpandedKeys,
+  leafIcon
 }) {
   if (!isParent(item)) {
+    const glyph = item.icon ?? leafIcon;
     return /* @__PURE__ */ jsxRuntime.jsxs(
       "button",
       {
@@ -1308,7 +1316,10 @@ function TreeNodeItem({
           parentLabel: item.parentLabel
         }),
         children: [
-          /* @__PURE__ */ jsxRuntime.jsx("span", { className: "w-1.5 h-1.5 rounded-full flex-shrink-0 bg-foreground-muted group-hover:bg-accent transition-colors duration-150" }),
+          glyph != null ? /* @__PURE__ */ jsxRuntime.jsx("span", { className: "flex h-4 w-4 flex-shrink-0 items-center justify-center text-foreground-muted group-hover:text-accent transition-colors duration-150", children: glyph }) : (
+            /* Default leaf bullet */
+            /* @__PURE__ */ jsxRuntime.jsx("span", { className: "w-1.5 h-1.5 rounded-full flex-shrink-0 bg-foreground-muted group-hover:bg-accent transition-colors duration-150" })
+          ),
           /* @__PURE__ */ jsxRuntime.jsx("span", { className: "text-sm text-foreground-secondary group-hover:text-foreground transition-colors duration-150", children: item.label })
         ]
       }
@@ -1316,48 +1327,53 @@ function TreeNodeItem({
   }
   const initialOpen = defaultExpandAll || defaultExpandedKeys.includes(item.key) ? [item.key] : [];
   return /* @__PURE__ */ jsxRuntime.jsx(AccordionPrimitive__namespace.Root, { type: "multiple", defaultValue: initialOpen, children: /* @__PURE__ */ jsxRuntime.jsxs(AccordionPrimitive__namespace.Item, { value: item.key, className: "border-none", children: [
-    /* @__PURE__ */ jsxRuntime.jsxs(
-      AccordionPrimitive__namespace.Trigger,
-      {
-        onClick: () => onNodeClick({
-          isParent: true,
-          key: item.key,
-          label: item.label,
-          data: item.nodeData,
-          parentLabel: item.parentLabel
-        }),
-        className: "flex items-center gap-2 cursor-pointer py-1.5 px-2 group focus:outline-none focus-visible:ring-2 focus-visible:ring-accent w-full text-left rounded-md hover:bg-surface-raised transition-colors duration-150",
-        children: [
-          /* @__PURE__ */ jsxRuntime.jsx(
+    /* @__PURE__ */ jsxRuntime.jsx(AccordionPrimitive__namespace.Header, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center rounded-md hover:bg-surface-raised transition-colors duration-150", children: [
+      /* @__PURE__ */ jsxRuntime.jsx(
+        AccordionPrimitive__namespace.Trigger,
+        {
+          "aria-label": `Toggle ${item.label}`,
+          className: "group flex flex-shrink-0 items-center justify-center rounded-md p-1.5 cursor-pointer text-foreground-muted hover:text-foreground focus:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-inset transition-colors duration-150",
+          children: /* @__PURE__ */ jsxRuntime.jsx(
             "svg",
             {
               viewBox: "0 0 24 24",
               fill: "none",
               stroke: "currentColor",
               strokeWidth: 2.5,
-              className: "h-3.5 w-3.5 flex-shrink-0 text-foreground-muted transition-transform duration-200 group-data-[state=open]:rotate-0 group-data-[state=closed]:-rotate-90",
+              className: "h-3.5 w-3.5 transition-transform duration-200 group-data-[state=open]:rotate-0 group-data-[state=closed]:-rotate-90",
               "aria-hidden": "true",
-              children: /* @__PURE__ */ jsxRuntime.jsx(
-                "path",
-                {
-                  strokeLinecap: "round",
-                  strokeLinejoin: "round",
-                  d: "M19 9l-7 7-7-7"
-                }
-              )
+              children: /* @__PURE__ */ jsxRuntime.jsx("path", { strokeLinecap: "round", strokeLinejoin: "round", d: "M19 9l-7 7-7-7" })
             }
-          ),
-          /* @__PURE__ */ jsxRuntime.jsx("span", { className: "text-sm font-semibold text-foreground select-none", children: item.label })
-        ]
-      }
-    ),
+          )
+        }
+      ),
+      /* @__PURE__ */ jsxRuntime.jsxs(
+        "button",
+        {
+          type: "button",
+          onClick: () => onNodeClick({
+            isParent: true,
+            key: item.key,
+            label: item.label,
+            data: item.nodeData,
+            parentLabel: item.parentLabel
+          }),
+          className: "flex flex-1 min-w-0 items-center gap-2 py-1.5 pr-2 text-left cursor-pointer rounded-md focus:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-inset",
+          children: [
+            item.icon != null && /* @__PURE__ */ jsxRuntime.jsx("span", { className: "flex h-4 w-4 flex-shrink-0 items-center justify-center text-foreground-muted", children: item.icon }),
+            /* @__PURE__ */ jsxRuntime.jsx("span", { className: "truncate text-sm font-semibold text-foreground select-none", children: item.label })
+          ]
+        }
+      )
+    ] }) }),
     /* @__PURE__ */ jsxRuntime.jsx(AccordionPrimitive__namespace.Content, { className: "overflow-hidden data-[state=open]:animate-accordion-down data-[state=closed]:animate-accordion-up", children: /* @__PURE__ */ jsxRuntime.jsx("div", { className: "ml-3.5 border-l border-border py-0.5", children: item.children.map((child) => /* @__PURE__ */ jsxRuntime.jsx(
       TreeNodeItem,
       {
         item: child,
         onNodeClick,
         defaultExpandAll,
-        defaultExpandedKeys
+        defaultExpandedKeys,
+        leafIcon
       },
       child.key
     )) }) })
@@ -1368,6 +1384,7 @@ function Tree({
   onNodeClick,
   defaultExpandAll = false,
   defaultExpandedKeys = [],
+  leafIcon,
   className = "",
   style
 }) {
@@ -1377,7 +1394,8 @@ function Tree({
       item,
       onNodeClick,
       defaultExpandAll,
-      defaultExpandedKeys
+      defaultExpandedKeys,
+      leafIcon
     },
     item.key
   )) });
@@ -4675,6 +4693,8 @@ var TOGGLE_POSITION_CLASS = {
 function ScalableContainer({
   width = "100%",
   height = "auto",
+  targetWidth,
+  targetHeight,
   expandedWidth = "100%",
   expandedHeight = "100%",
   expanded,
@@ -4684,100 +4704,40 @@ function ScalableContainer({
   expandIcon,
   collapseIcon,
   togglePosition = "top-right",
-  expandContainerRef,
-  expandRatio = 3,
   className = ""
 }) {
   const containerRef = React31.useRef(null);
   const [internalScaled, setInternalScaled] = React31.useState(false);
   const isScaled = expanded ?? internalScaled;
   const reduced = framerMotion.useReducedMotion();
-  const usePush = expandContainerRef != null;
-  const grownRef = React31.useRef([]);
   const prevScaled = React31.useRef(isScaled);
-  const kickResizeDuringTransition = () => {
+  const expandW = targetWidth ?? expandedWidth;
+  const expandH = targetHeight ?? expandedHeight;
+  React31.useEffect(() => {
+    if (isScaled === prevScaled.current) return;
+    prevScaled.current = isScaled;
     if (typeof window === "undefined") return;
     const kick = () => window.dispatchEvent(new Event("resize"));
     const interval = window.setInterval(kick, 80);
-    window.setTimeout(() => {
+    const stop = window.setTimeout(() => {
       window.clearInterval(interval);
       kick();
-    }, reduced ? 0 : 400);
-  };
-  const growAncestors = () => {
-    const bound = expandContainerRef?.current;
-    if (!bound || !containerRef.current) return;
-    const grown = [];
-    let el = containerRef.current.parentElement;
-    while (el && el !== bound && bound.contains(el)) {
-      const parent = el.parentElement;
-      const parentStyle = parent ? getComputedStyle(parent) : null;
-      if (parent && parentStyle && parentStyle.display.includes("flex")) {
-        grown.push({
-          el,
-          parent,
-          prev: {
-            flexGrow: el.style.flexGrow,
-            flexBasis: el.style.flexBasis,
-            height: el.style.height,
-            transition: el.style.transition,
-            parentFlexWrap: parent.style.flexWrap
-          }
-        });
-        const t = (prop) => `${prop} ${reduced ? 0 : 0.32}s cubic-bezier(0.16, 1, 0.3, 1)`;
-        const ours = `${t("flex-grow")}, ${t("flex-basis")}, ${t("height")}`;
-        el.style.transition = el.style.transition ? `${el.style.transition}, ${ours}` : ours;
-        if (parentStyle.flexDirection.startsWith("row")) {
-          parent.style.flexWrap = "wrap";
-          el.style.flexBasis = "100%";
-          el.style.height = `${expandRatio / (expandRatio + 1) * 100}%`;
-        } else {
-          el.style.flexBasis = "0%";
-          el.style.flexGrow = String(expandRatio);
-        }
-      }
-      el = parent;
-    }
-    grownRef.current = grown;
-  };
-  const restoreAncestors = () => {
-    for (const { el, parent, prev } of grownRef.current) {
-      el.style.flexGrow = prev.flexGrow;
-      el.style.flexBasis = prev.flexBasis;
-      el.style.height = prev.height;
-      window.setTimeout(() => {
-        el.style.transition = prev.transition;
-        parent.style.flexWrap = prev.parentFlexWrap;
-      }, reduced ? 0 : 360);
-    }
-    grownRef.current = [];
-  };
-  React31.useEffect(() => {
-    if (!usePush || isScaled === prevScaled.current) return;
-    prevScaled.current = isScaled;
-    if (isScaled) growAncestors();
-    else restoreAncestors();
-    kickResizeDuringTransition();
-  }, [isScaled, usePush]);
-  React31.useEffect(() => () => {
-    for (const { el, parent, prev } of grownRef.current) {
-      el.style.flexGrow = prev.flexGrow;
-      el.style.flexBasis = prev.flexBasis;
-      el.style.height = prev.height;
-      el.style.transition = prev.transition;
-      parent.style.flexWrap = prev.parentFlexWrap;
+    }, reduced ? 0 : 420);
+    if (isScaled) {
+      window.setTimeout(
+        () => containerRef.current?.scrollIntoView({ behavior: "smooth", block: "nearest" }),
+        reduced ? 0 : 360
+      );
     }
-  }, []);
+    return () => {
+      window.clearInterval(interval);
+      window.clearTimeout(stop);
+    };
+  }, [isScaled, reduced]);
   const onToggle = () => {
     const next = !isScaled;
     if (expanded === void 0) setInternalScaled(next);
     onExpandedChange?.(next);
-    if (next && !usePush) {
-      window.setTimeout(
-        () => containerRef.current?.scrollIntoView({ behavior: "smooth", block: "nearest" }),
-        reduced ? 0 : 340
-      );
-    }
   };
   const wrapperClass = isScaled ? assignClassOnClick : void 0;
   return /* @__PURE__ */ jsxRuntime.jsxs(
@@ -4785,24 +4745,20 @@ function ScalableContainer({
     {
       ref: containerRef,
       style: {
-        width: isScaled && !usePush ? expandedWidth : width,
-        height: isScaled && !usePush ? expandedHeight : height
-      },
-      animate: {
-        // Push mode keeps the container filling its (now growing)
-        // wrapper — the wrapper's flex-grow does the work.
-        width: isScaled && !usePush ? expandedWidth : width,
-        height: isScaled && !usePush ? expandedHeight : height
+        width: isScaled ? expandW : width,
+        height: isScaled ? expandH : height,
+        flex: isScaled ? "none" : void 0
       },
+      animate: { width: isScaled ? expandW : width, height: isScaled ? expandH : height },
       transition: reduced ? { duration: 0 } : {
         width: { type: "tween", duration: 0.32, ease: [0.16, 1, 0.3, 1] },
         height: { type: "tween", duration: 0.32, ease: [0.16, 1, 0.3, 1] }
       },
       className: cx(
         "relative rounded-lg overflow-hidden",
-        // OS-window aesthetic: subtle elevation at rest, lifted shadow
-        // when expanded. No background colour change.
-        isScaled ? "shadow-2xl" : "shadow-md",
+        // OS-window aesthetic: subtle elevation at rest, lifted shadow +
+        // raised stacking when expanded so it sits above neighbours.
+        isScaled ? "z-raised shadow-2xl" : "shadow-md",
         "transition-shadow duration-300",
         className
       ),