sellmate-design-system-react 0.5.0 → 0.6.1

package/dist/components/SGnb/SGnb.cjs

@@ -3255,15 +3255,30 @@ react.forwardRef(function SLayout2({
     },
     [isControlled, onFoldedChange]
   );
+  const [gnbState, setGnbState] = react.useState({ forceFull: false, menuVisible: true });
+  const reportGnbState = react.useCallback(
+    (next) => setGnbState(
+      (prev) => prev.forceFull === next.forceFull && prev.menuVisible === next.menuVisible ? prev : next
+    ),
+    []
+  );
+  const effectiveHeader = header === "full" || gnbState.forceFull ? "full" : "fix";
   const ctx = react.useMemo(
-    () => ({ type, header, useRail, folded: currentFolded, setFolded }),
-    [type, header, useRail, currentFolded, setFolded]
-  );
-  const isFullHeader = header === "full";
-  const gnbColumnWidth = useRail ? GNB_RAIL_WIDTH + GNB_MENU_WIDTH : GNB_MENU_WIDTH;
+    () => ({
+      type,
+      header: effectiveHeader,
+      useRail,
+      folded: currentFolded,
+      setFolded,
+      reportGnbState
+    }),
+    [type, effectiveHeader, useRail, currentFolded, setFolded, reportGnbState]
+  );
+  const isFullHeader = effectiveHeader === "full";
+  const gnbColumnWidth = (useRail ? GNB_RAIL_WIDTH : 0) + (gnbState.menuVisible ? GNB_MENU_WIDTH : 0);
   const frameStyle = isFullHeader ? {
     gridTemplateColumns: `${currentFolded ? 0 : gnbColumnWidth}px 1fr`,
-    gridTemplateRows: `${GNB_HEADER[header].topHeight} 1fr`,
+    gridTemplateRows: `${GNB_HEADER[effectiveHeader].topHeight} 1fr`,
     // 메뉴가 미끄러지는 동안 페이지 열도 같은 길이로 따라와야 한 덩어리로 읽힌다.
     // (fix 는 SGnb 가 제 폭을 직접 전환하므로 프레임이 손댈 게 없다)
     transition: `grid-template-columns ${GNB_FOLD_MS}ms ease-out`
@@ -3273,7 +3288,7 @@ react.forwardRef(function SLayout2({
     {
       ref,
       "data-type": type,
-      "data-header": header,
+      "data-header": effectiveHeader,
       className: cn(
         "box-border h-full overflow-hidden",
         isFullHeader ? "grid" : "flex flex-row",
@@ -3306,9 +3321,10 @@ var SGnb = react.forwardRef(function SGnb2({
 }, ref) {
   const layout = react.useContext(SLayoutContext);
   const type = typeProp ?? layout?.type ?? "box";
-  const header = headerProp ?? layout?.header ?? "fix";
   const folded = foldedProp ?? layout?.folded ?? false;
   const useRail = useRailProp ?? layout?.useRail ?? false;
+  const railHasLeaf = useRail && items.some((item) => !item.children || item.children.length === 0);
+  const header = railHasLeaf ? "full" : headerProp ?? layout?.header ?? "fix";
   const H = GNB_HEADER[header];
   const M = GNB_MENU[type];
   const C = GNB_COLORS[color];
@@ -3442,9 +3458,24 @@ var SGnb = react.forwardRef(function SGnb2({
             onMouseEnter: () => setHoveredKey(item.value),
             onMouseLeave: () => setHoveredKey((prev) => prev === item.value ? null : prev),
             children: [
-              depth === 1 && item.icon && /* @__PURE__ */ jsxRuntime.jsx(SIcon, { name: item.icon, size: M.depth1Icon, color: C.itemIcon, className: "shrink-0" }),
+              depth === 1 && item.icon && /* @__PURE__ */ jsxRuntime.jsx(
+                SIcon,
+                {
+                  name: item.icon,
+                  size: M.depth1Icon,
+                  color: isSelected ? C.itemColorActive : C.itemIcon,
+                  className: "shrink-0"
+                }
+              ),
               /* @__PURE__ */ jsxRuntime.jsxs("span", { className: "min-w-0 flex-1 overflow-hidden text-ellipsis whitespace-nowrap flex flex-no-wrap items-center", children: [
-                depth > 1 && iconBranch ? /* @__PURE__ */ jsxRuntime.jsx("div", { className: "w-[20px] h-[24px] flex items-center justify-center mr-[8px]", children: "-" }) : null,
+                depth > 1 && iconBranch ? /* @__PURE__ */ jsxRuntime.jsx(
+                  "div",
+                  {
+                    className: "w-[20px] flex items-center justify-center mr-[8px]",
+                    style: { height: M.itemLineHeight },
+                    children: "-"
+                  }
+                ) : null,
                 item.label
               ] }),
               item.tag !== void 0 && item.tag !== "" && /* @__PURE__ */ jsxRuntime.jsx(
@@ -3496,16 +3527,28 @@ var SGnb = react.forwardRef(function SGnb2({
   };
   const railItems = useRail ? items : [];
   const menuItems = useRail ? items.find((item) => item.value === activeRail)?.children ?? [] : items;
-  const bodyWidth = useRail ? GNB_RAIL_WIDTH + GNB_MENU_WIDTH : GNB_MENU_WIDTH;
+  const showMenu = !useRail || menuItems.length > 0;
+  const bodyWidth = (useRail ? GNB_RAIL_WIDTH : 0) + (showMenu ? GNB_MENU_WIDTH : 0);
+  react.useEffect(() => {
+    layout?.reportGnbState({ forceFull: railHasLeaf, menuVisible: showMenu });
+  }, [layout, railHasLeaf, showMenu]);
   const railFolded = folded && header === "fix";
   const rootWidth = header === "full" ? "100%" : folded ? GNB_COMMON.foldWidth : bodyWidth;
+  const rightBorder = color === "light" ? `1px solid ${C.topBorder}` : void 0;
   const rootStyle = {
     width: rootWidth,
     transition: `width ${GNB_FOLD_MS}ms ease-out`,
-    ...header === "full" ? { gridArea: "1 / 1 / -1 / -1", pointerEvents: "none" } : { backgroundColor: C.panelBg },
+    ...header === "full" ? { gridArea: "1 / 1 / -1 / -1", pointerEvents: "none" } : { backgroundColor: C.panelBg, borderRight: rightBorder },
     ...style
   };
   const hideAfterSlide = (hidden) => `visibility 0s linear ${hidden ? `${GNB_FOLD_MS}ms` : "0s"}`;
+  const foldInline = !!logo;
+  const sideFoldStyle = {
+    opacity: railFolded ? 0 : 1,
+    position: railFolded ? "absolute" : "static",
+    visibility: railFolded ? "hidden" : "visible",
+    transition: `opacity ${GNB_FOLD_MS}ms ease-out, ${hideAfterSlide(railFolded)}`
+  };
   return /* @__PURE__ */ jsxRuntime.jsxs(
     "div",
     {
@@ -3517,12 +3560,14 @@ var SGnb = react.forwardRef(function SGnb2({
       "data-color": color,
       ...rest,
       children: [
-        /* @__PURE__ */ jsxRuntime.jsxs(
+        /* @__PURE__ */ jsxRuntime.jsx(
           "div",
           {
             className: "relative box-border flex shrink-0 items-center overflow-hidden",
             style: {
               height: H.topHeight,
+              // 인라인 간격은 컨테이너 gap 대신 각 요소 margin 으로 준다 — 런처↔폴드(8px)와
+              // 폴드↔로고(top-gap)를 다르게 두기 위함. 접히면 런처·로고가 흐름에서 빠져 margin 도 무의미해진다.
               padding: `0 ${railFolded ? GNB_RAIL.padding : H.topPaddingX}`,
               borderBottom: `1px solid ${C.topBorder}`,
               backgroundColor: C.panelBg,
@@ -3531,49 +3576,90 @@ var SGnb = react.forwardRef(function SGnb2({
               // 아이콘 버튼은 자체 ghostButton 토큰을 쓰므로, 이 색은 logo 슬롯 상속용
               color: C.itemColorDefault
             },
-            children: [
-              (onLauncherClick || logo) && /* @__PURE__ */ jsxRuntime.jsxs(
-                "div",
-                {
-                  className: "absolute inset-y-0 flex items-center",
-                  style: {
-                    left: H.topPaddingX,
-                    gap: H.topGap,
-                    opacity: railFolded ? 0 : 1,
-                    transition: `opacity ${GNB_FOLD_MS}ms ease-out, ${hideAfterSlide(railFolded)}, transform ${GNB_FOLD_MS}ms ease-out`,
-                    // 메뉴와 같은 방향으로 빠지되, 좁은 레일 안에서 꼬리가 비치지 않게 페이드가 거리를 대신한다
-                    transform: railFolded ? `translateX(-${H.topPaddingX})` : "none",
-                    visibility: railFolded ? "hidden" : "visible"
-                  },
-                  children: [
-                    onLauncherClick && /* @__PURE__ */ jsxRuntime.jsx(
-                      SGhostButton,
-                      {
-                        icon: "launcher",
-                        size: "xs",
-                        intent: color === "dark" ? "inverse" : "default",
-                        ariaLabel: "app launcher",
-                        onClick: onLauncherClick,
-                        className: "shrink-0"
-                      }
-                    ),
-                    logo && /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex items-center", style: { height: H.logoHeight }, children: logo })
-                  ]
-                }
-              ),
-              /* @__PURE__ */ jsxRuntime.jsx(
-                SGhostButton,
-                {
-                  icon: "sidebar",
-                  size: "xs",
-                  intent: color === "dark" ? "inverse" : "default",
-                  ariaLabel: "toggle navigation",
-                  ariaPressed: folded,
-                  onClick: handleFoldToggle,
-                  className: "ml-auto shrink-0"
-                }
-              )
-            ]
+            children: foldInline ? (
+              // 런처(있을 때)·폴드·로고를 흐름에 나란히 둔다 → 폴드 버튼이 (런처와) 로고 사이에 선다.
+              // 접히면 런처·로고가 페이드하며 흐름에서 빠지고(sideFoldStyle), 폴드 버튼만 남아 레일 가운데에 선다.
+              /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
+                onLauncherClick && /* @__PURE__ */ jsxRuntime.jsx(
+                  SGhostButton,
+                  {
+                    icon: "launcher",
+                    size: "xs",
+                    intent: color === "dark" ? "inverse" : "default",
+                    ariaLabel: "app launcher",
+                    onClick: onLauncherClick,
+                    className: "shrink-0",
+                    style: { ...sideFoldStyle, marginRight: "8px" }
+                  }
+                ),
+                /* @__PURE__ */ jsxRuntime.jsx(
+                  SGhostButton,
+                  {
+                    icon: "sidebar",
+                    size: "xs",
+                    intent: color === "dark" ? "inverse" : "default",
+                    ariaLabel: "toggle navigation",
+                    ariaPressed: folded,
+                    onClick: handleFoldToggle,
+                    className: "shrink-0"
+                  }
+                ),
+                /* @__PURE__ */ jsxRuntime.jsx(
+                  "div",
+                  {
+                    className: "flex shrink-0 items-center",
+                    style: { height: H.logoHeight, marginLeft: H.topGap, ...sideFoldStyle },
+                    children: logo
+                  }
+                )
+              ] })
+            ) : (
+              // 런처·로고는 좌측 그룹(흐름에서 빼 폭 축소 중 폴드 버튼을 밀어내지 않는다),
+              // 폴드 버튼은 우측 끝(ml-auto)이라 폭·패딩이 줄면 저절로 레일 가운데에 선다.
+              /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
+                (onLauncherClick || logo) && /* @__PURE__ */ jsxRuntime.jsxs(
+                  "div",
+                  {
+                    className: "absolute inset-y-0 flex items-center",
+                    style: {
+                      left: H.topPaddingX,
+                      gap: H.topGap,
+                      opacity: railFolded ? 0 : 1,
+                      transition: `opacity ${GNB_FOLD_MS}ms ease-out, ${hideAfterSlide(railFolded)}, transform ${GNB_FOLD_MS}ms ease-out`,
+                      // 메뉴와 같은 방향으로 빠지되, 좁은 레일 안에서 꼬리가 비치지 않게 페이드가 거리를 대신한다
+                      transform: railFolded ? `translateX(-${H.topPaddingX})` : "none",
+                      visibility: railFolded ? "hidden" : "visible"
+                    },
+                    children: [
+                      onLauncherClick && /* @__PURE__ */ jsxRuntime.jsx(
+                        SGhostButton,
+                        {
+                          icon: "launcher",
+                          size: "xs",
+                          intent: color === "dark" ? "inverse" : "default",
+                          ariaLabel: "app launcher",
+                          onClick: onLauncherClick,
+                          className: "shrink-0"
+                        }
+                      ),
+                      logo && /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex items-center", style: { height: H.logoHeight }, children: logo })
+                    ]
+                  }
+                ),
+                /* @__PURE__ */ jsxRuntime.jsx(
+                  SGhostButton,
+                  {
+                    icon: "sidebar",
+                    size: "xs",
+                    intent: color === "dark" ? "inverse" : "default",
+                    ariaLabel: "toggle navigation",
+                    ariaPressed: folded,
+                    onClick: handleFoldToggle,
+                    className: "ml-auto shrink-0"
+                  }
+                )
+              ] })
+            )
           }
         ),
         /* @__PURE__ */ jsxRuntime.jsxs(
@@ -3609,7 +3695,7 @@ var SGnb = react.forwardRef(function SGnb2({
                   children: /* @__PURE__ */ jsxRuntime.jsx("ul", { className: "m-0 flex list-none flex-col p-0", style: { gap: GNB_RAIL.gap }, children: railItems.map(renderRailItem) })
                 }
               ),
-              /* @__PURE__ */ jsxRuntime.jsx(
+              showMenu && /* @__PURE__ */ jsxRuntime.jsx(
                 "nav",
                 {
                   "aria-label": ariaLabel,
@@ -3619,6 +3705,8 @@ var SGnb = react.forwardRef(function SGnb2({
                     paddingTop: M.bodyPaddingY,
                     paddingBottom: M.bodyPaddingY,
                     backgroundColor: C.panelBg,
+                    // full 은 상단바가 전폭이라 루트가 오른쪽 선을 못 그린다 → 메뉴 오른쪽(페이지 경계)이 대신 그린다.
+                    borderRight: header === "full" ? rightBorder : void 0,
                     pointerEvents: "auto"
                   },
                   children: /* @__PURE__ */ jsxRuntime.jsx("ul", { className: "m-0 flex list-none flex-col p-0", children: menuItems.map((item) => renderItem(item, 1)) })