@gx-design-vue/pro-layout 0.1.0-alpha.10 → 0.1.0-alpha.11

package/dist/components/Menu/style/siderMenu.js

@@ -1,6 +1,14 @@
 import { proGenStyleHooks, setAlpha } from "@gx-design-vue/pro-provider";
 import { unit as unit$1 } from "@antdv-next/cssinjs";
 //#region src/components/Menu/style/siderMenu.ts
+function hasActiveBarWidth(activeBarWidth) {
+	if (activeBarWidth == null) return false;
+	if (typeof activeBarWidth === "number") return activeBarWidth !== 0;
+	const width = activeBarWidth.trim();
+	if (!width) return false;
+	const numericWidth = Number.parseFloat(width);
+	return Number.isNaN(numericWidth) || numericWidth !== 0;
+}
 const prepareComponentToken = (token) => {
 	const { colorPrimary, colorError, colorTextDisabled, colorErrorBg, colorText, colorTextDescription, colorBgContainer, colorFillAlter, colorFillContent, lineWidth, lineWidthBold, controlItemBgActive, colorBgTextHover, controlHeightLG, lineHeight, colorBgElevated, marginXXS, padding, fontSize, controlHeightSM, fontSizeLG, colorTextLightSolid, colorErrorHover } = token;
 	const activeBarWidth = token.activeBarWidth ?? 0;
@@ -77,7 +85,7 @@ const prepareComponentToken = (token) => {
 		darkDangerItemHoverColor: colorErrorHover,
 		darkDangerItemSelectedColor: colorTextLightSolid,
 		darkDangerItemActiveBg: colorError,
-		itemWidth: activeBarWidth ? `calc(100% + ${activeBarBorderWidth}px)` : `calc(100% - ${itemMarginInline * 2}px)`
+		itemWidth: hasActiveBarWidth(activeBarWidth) ? `calc(100% + ${unit$1(activeBarBorderWidth)})` : `calc(100% - ${itemMarginInline * 2}px)`
 	};
 };
 /**
@@ -152,7 +160,7 @@ const genSiderMenuStyle = (token) => {
 				marginBlock: siderMenuItemMarginBlock,
 				marginInline: siderMenuItemMarginInline,
 				paddingInlineStart: `calc(${unit$1(siderMenuBasePadding)} + var(--pro-layout-sider-menu-level, 0) * var(--pro-layout-sider-menu-indent, 24px))`,
-				paddingInlineEnd: siderMenuPaddingWithArrow,
+				paddingInlineEnd: siderMenuBasePadding,
 				overflow: "hidden",
 				color: token.siderColorTextMenu || token.itemColor,
 				lineHeight: unit$1(siderMenuItemHeight),
@@ -205,9 +213,11 @@ const genSiderMenuStyle = (token) => {
 					justifyContent: "center",
 					paddingInline: `calc(50% - ${iconSize} / 2 - ${unit$1(siderMenuItemMarginInline)})`,
 					textOverflow: "clip"
-				}
+				},
+				"> *": { flex: "none" }
 			},
 			[`${componentCls}-submenu-title`]: {
+				paddingInlineEnd: siderMenuPaddingWithArrow,
 				[`&:not(${componentCls}-item-selected):not(${componentCls}-item-active):not(${componentCls}-item-disabled):hover`]: {
 					color: token.siderColorTextMenuItemHover || token.itemHoverColor,
 					backgroundColor: token.siderColorBgMenuItemHover || token.itemHoverBg
@@ -242,7 +252,7 @@ const genSiderMenuStyle = (token) => {
 				fontSize: collapsedIconSize
 			},
 			[`${componentCls}-title`]: {
-				flex: "1 1 auto",
+				flex: "auto",
 				minWidth: 0,
 				overflow: "hidden",
 				textOverflow: "ellipsis",