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

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",

package/dist/components/PageTransition/index.d.ts

@@ -49,10 +49,10 @@ declare const GPageTransition: _$vue.DefineComponent<_$vue.ExtractPropTypes<{
     default: string;
   };
 }>> & Readonly<{}>, {
-  reverse: boolean;
   name: string;
-  direction: string;
+  reverse: boolean;
   disabled: boolean;
+  direction: string;
 }, SlotsType<GPageTransitionSlots>, {}, {}, string, _$vue.ComponentProvideOptions, true, {}, any>;
 //#endregion
 export { GPageTransition as default };

package/dist/hooks/useLayoutBase.d.ts

@@ -16,7 +16,7 @@ declare function useLayoutBase(props?: {
   collapsed?: boolean;
 }): {
   layoutContext: LayoutContextProps;
-  layout: _$vue.ComputedRef<"top" | "side" | "mix" | "wide" | "simple">;
+  layout: _$vue.ComputedRef<"side" | "top" | "mix" | "wide" | "simple">;
   sider: _$vue.ComputedRef<Required<LayoutSiderConfig>>;
   header: _$vue.ComputedRef<Required<LayoutHeaderConfig>>;
   zIndex: _$vue.Ref<number, number>;
@@ -39,34 +39,34 @@ declare function useLayoutBase(props?: {
   selectedKeys: _$vue.ComputedRef<string[]>;
   openKeys: _$vue.ComputedRef<string[]>;
   proClasses: _$vue.ComputedRef<{
+    root?: string;
     header?: string;
     sider?: string;
-    breadcrumb?: string;
-    logo?: string;
-    content?: string;
-    root?: string;
     siderChildren?: string;
     siderHeader?: string;
     siderFooter?: string;
+    logo?: string;
     logoImage?: string;
+    content?: string;
     footer?: string;
     menu?: string;
     tabs?: string;
+    breadcrumb?: string;
   }>;
   proStyles: _$vue.ComputedRef<{
+    root?: _$vue.CSSProperties;
     header?: _$vue.CSSProperties;
     sider?: _$vue.CSSProperties;
-    breadcrumb?: _$vue.CSSProperties;
-    logo?: _$vue.CSSProperties;
-    content?: _$vue.CSSProperties;
-    root?: _$vue.CSSProperties;
     siderChildren?: _$vue.CSSProperties;
     siderHeader?: _$vue.CSSProperties;
     siderFooter?: _$vue.CSSProperties;
+    logo?: _$vue.CSSProperties;
     logoImage?: _$vue.CSSProperties;
+    content?: _$vue.CSSProperties;
     footer?: _$vue.CSSProperties;
     menu?: _$vue.CSSProperties;
     tabs?: _$vue.CSSProperties;
+    breadcrumb?: _$vue.CSSProperties;
   }>;
   breadcrumbRender: _$vue.Ref<(props: LayoutBreadcrumbSlotProps) => any, (props: LayoutBreadcrumbSlotProps) => any>;
   breadcrumbConfig: _$vue.ComputedRef<LayoutBreadcrumbConfig>;