naive-ui 2.23.2 → 2.24.3

package/lib/layout/src/LayoutContent.d.ts

@@ -114,11 +114,14 @@ declare const _default: import("vue").DefineComponent<{
     mergedClsPrefix: import("vue").ComputedRef<string>;
     scrollableElRef: import("vue").Ref<HTMLElement | null>;
     scrollbarInstRef: import("vue").Ref<{
-        scrollTo: import("../../_internal/scrollbar/src/ScrollBar").ScrollTo;
-        sync: () => void;
         containerRef: HTMLElement | null;
         contentRef: HTMLElement | null;
         containerScrollTop: number;
+        syncUnifiedContainer: () => void;
+        scrollTo: import("../../_internal/scrollbar/src/ScrollBar").ScrollTo;
+        sync: () => void;
+        handleMouseEnterWrapper: () => void;
+        handleMouseLeaveWrapper: () => void;
     } | null>;
     hasSiderStyle: import("vue").CSSProperties;
     mergedTheme: import("vue").ComputedRef<{
@@ -269,28 +272,28 @@ declare const _default: import("vue").DefineComponent<{
         '--n-color': string;
         '--n-text-color': string;
     }>;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<{
-    embedded?: unknown;
-    position?: unknown;
-    nativeScrollbar?: unknown;
-    scrollbarProps?: unknown;
-    onScroll?: unknown;
-    contentStyle?: unknown;
-    hasSider?: unknown;
-    siderPlacement?: unknown;
-    theme?: unknown;
-    themeOverrides?: unknown;
-    builtinThemeOverrides?: unknown;
-} & {
-    position: "static" | "absolute";
-    contentStyle: string | import("vue").CSSProperties;
-    embedded: boolean;
-    nativeScrollbar: boolean;
-    hasSider: boolean;
-    siderPlacement: "left" | "right";
-} & {
-    onScroll?: ((e: Event) => void) | undefined;
-    theme?: import("../../_mixins").Theme<"Layout", {
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    embedded: BooleanConstructor;
+    position: {
+        readonly type: import("vue").PropType<"static" | "absolute">;
+        readonly default: "static";
+    };
+    nativeScrollbar: {
+        readonly type: BooleanConstructor;
+        readonly default: true;
+    };
+    scrollbarProps: import("vue").PropType<Partial<import("../../_internal").ScrollbarProps>>;
+    onScroll: import("vue").PropType<(e: Event) => void>;
+    contentStyle: {
+        readonly type: import("vue").PropType<string | import("vue").CSSProperties>;
+        readonly default: "";
+    };
+    hasSider: BooleanConstructor;
+    siderPlacement: {
+        readonly type: import("vue").PropType<"left" | "right">;
+        readonly default: "left";
+    };
+    theme: import("vue").PropType<import("../../_mixins").Theme<"Layout", {
         textColor: string;
         textColorInverted: string;
         color: string;
@@ -319,8 +322,8 @@ declare const _default: import("vue").DefineComponent<{
             color: string;
             colorHover: string;
         }, any>;
-    }> | undefined;
-    themeOverrides?: import("../../_mixins/use-theme").ExtractThemeOverrides<import("../../_mixins").Theme<"Layout", {
+    }>>;
+    themeOverrides: import("vue").PropType<import("../../_mixins/use-theme").ExtractThemeOverrides<import("../../_mixins").Theme<"Layout", {
         textColor: string;
         textColorInverted: string;
         color: string;
@@ -349,8 +352,8 @@ declare const _default: import("vue").DefineComponent<{
             color: string;
             colorHover: string;
         }, any>;
-    }>> | undefined;
-    builtinThemeOverrides?: import("../../_mixins/use-theme").ExtractThemeOverrides<import("../../_mixins").Theme<"Layout", {
+    }>>>;
+    builtinThemeOverrides: import("vue").PropType<import("../../_mixins/use-theme").ExtractThemeOverrides<import("../../_mixins").Theme<"Layout", {
         textColor: string;
         textColorInverted: string;
         color: string;
@@ -379,9 +382,8 @@ declare const _default: import("vue").DefineComponent<{
             color: string;
             colorHover: string;
         }, any>;
-    }>> | undefined;
-    scrollbarProps?: Partial<import("../../_internal").ScrollbarProps> | undefined;
-}>, {
+    }>>>;
+}>>, {
     position: "static" | "absolute";
     contentStyle: string | import("vue").CSSProperties;
     embedded: boolean;

package/lib/layout/src/LayoutFooter.d.ts

@@ -198,19 +198,14 @@ declare const _default: import("vue").DefineComponent<{
 }, {
     mergedClsPrefix: import("vue").ComputedRef<string>;
     cssVars: import("vue").ComputedRef<any>;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<{
-    inverted?: unknown;
-    position?: unknown;
-    bordered?: unknown;
-    theme?: unknown;
-    themeOverrides?: unknown;
-    builtinThemeOverrides?: unknown;
-} & {
-    position: "static" | "absolute";
-    bordered: boolean;
-    inverted: boolean;
-} & {
-    theme?: import("../../_mixins").Theme<"Layout", {
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    inverted: BooleanConstructor;
+    position: {
+        readonly type: import("vue").PropType<"static" | "absolute">;
+        readonly default: "static";
+    };
+    bordered: BooleanConstructor;
+    theme: import("vue").PropType<import("../../_mixins").Theme<"Layout", {
         textColor: string;
         textColorInverted: string;
         color: string;
@@ -239,8 +234,8 @@ declare const _default: import("vue").DefineComponent<{
             color: string;
             colorHover: string;
         }, any>;
-    }> | undefined;
-    themeOverrides?: import("../../_mixins/use-theme").ExtractThemeOverrides<import("../../_mixins").Theme<"Layout", {
+    }>>;
+    themeOverrides: import("vue").PropType<import("../../_mixins/use-theme").ExtractThemeOverrides<import("../../_mixins").Theme<"Layout", {
         textColor: string;
         textColorInverted: string;
         color: string;
@@ -269,8 +264,8 @@ declare const _default: import("vue").DefineComponent<{
             color: string;
             colorHover: string;
         }, any>;
-    }>> | undefined;
-    builtinThemeOverrides?: import("../../_mixins/use-theme").ExtractThemeOverrides<import("../../_mixins").Theme<"Layout", {
+    }>>>;
+    builtinThemeOverrides: import("vue").PropType<import("../../_mixins/use-theme").ExtractThemeOverrides<import("../../_mixins").Theme<"Layout", {
         textColor: string;
         textColorInverted: string;
         color: string;
@@ -299,8 +294,8 @@ declare const _default: import("vue").DefineComponent<{
             color: string;
             colorHover: string;
         }, any>;
-    }>> | undefined;
-}>, {
+    }>>>;
+}>>, {
     position: "static" | "absolute";
     bordered: boolean;
     inverted: boolean;

package/lib/layout/src/LayoutHeader.d.ts

@@ -114,19 +114,17 @@ declare const _default: import("vue").DefineComponent<{
 }, {
     mergedClsPrefix: import("vue").ComputedRef<string>;
     cssVars: import("vue").ComputedRef<any>;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<{
-    position?: unknown;
-    inverted?: unknown;
-    bordered?: unknown;
-    theme?: unknown;
-    themeOverrides?: unknown;
-    builtinThemeOverrides?: unknown;
-} & {
-    position: "static" | "absolute";
-    bordered: boolean;
-    inverted: boolean;
-} & {
-    theme?: import("../../_mixins").Theme<"Layout", {
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    position: {
+        readonly type: import("vue").PropType<"static" | "absolute">;
+        readonly default: "static";
+    };
+    inverted: BooleanConstructor;
+    bordered: {
+        readonly type: BooleanConstructor;
+        readonly default: false;
+    };
+    theme: import("vue").PropType<import("../../_mixins").Theme<"Layout", {
         textColor: string;
         textColorInverted: string;
         color: string;
@@ -155,8 +153,8 @@ declare const _default: import("vue").DefineComponent<{
             color: string;
             colorHover: string;
         }, any>;
-    }> | undefined;
-    themeOverrides?: import("../../_mixins/use-theme").ExtractThemeOverrides<import("../../_mixins").Theme<"Layout", {
+    }>>;
+    themeOverrides: import("vue").PropType<import("../../_mixins/use-theme").ExtractThemeOverrides<import("../../_mixins").Theme<"Layout", {
         textColor: string;
         textColorInverted: string;
         color: string;
@@ -185,8 +183,8 @@ declare const _default: import("vue").DefineComponent<{
             color: string;
             colorHover: string;
         }, any>;
-    }>> | undefined;
-    builtinThemeOverrides?: import("../../_mixins/use-theme").ExtractThemeOverrides<import("../../_mixins").Theme<"Layout", {
+    }>>>;
+    builtinThemeOverrides: import("vue").PropType<import("../../_mixins/use-theme").ExtractThemeOverrides<import("../../_mixins").Theme<"Layout", {
         textColor: string;
         textColorInverted: string;
         color: string;
@@ -215,8 +213,8 @@ declare const _default: import("vue").DefineComponent<{
             color: string;
             colorHover: string;
         }, any>;
-    }>> | undefined;
-}>, {
+    }>>>;
+}>>, {
     position: "static" | "absolute";
     bordered: boolean;
     inverted: boolean;

package/lib/layout/src/LayoutSider.d.ts

@@ -201,11 +201,14 @@ declare const _default: import("vue").DefineComponent<{
     scrollTo: ((options: ScrollToOptions) => void) & ((x: number, y: number) => void);
     scrollableElRef: import("vue").Ref<HTMLElement | null>;
     scrollbarInstRef: import("vue").Ref<{
-        scrollTo: import("../../_internal/scrollbar/src/ScrollBar").ScrollTo;
-        sync: () => void;
         containerRef: HTMLElement | null;
         contentRef: HTMLElement | null;
         containerScrollTop: number;
+        syncUnifiedContainer: () => void;
+        scrollTo: import("../../_internal/scrollbar/src/ScrollBar").ScrollTo;
+        sync: () => void;
+        handleMouseEnterWrapper: () => void;
+        handleMouseLeaveWrapper: () => void;
     } | null>;
     mergedClsPrefix: import("vue").ComputedRef<string>;
     mergedTheme: import("vue").ComputedRef<{
@@ -358,49 +361,59 @@ declare const _default: import("vue").DefineComponent<{
     handleTransitionend: (e: TransitionEvent) => void;
     handleTriggerClick: () => void;
     cssVars: import("vue").ComputedRef<any>;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<{
-    position?: unknown;
-    bordered?: unknown;
-    collapsedWidth?: unknown;
-    width?: unknown;
-    contentStyle?: unknown;
-    collapseMode?: unknown;
-    collapsed?: unknown;
-    defaultCollapsed?: unknown;
-    showCollapsedContent?: unknown;
-    showTrigger?: unknown;
-    nativeScrollbar?: unknown;
-    inverted?: unknown;
-    scrollbarProps?: unknown;
-    triggerStyle?: unknown;
-    collapsedTriggerStyle?: unknown;
-    'onUpdate:collapsed'?: unknown;
-    onUpdateCollapsed?: unknown;
-    onAfterEnter?: unknown;
-    onAfterLeave?: unknown;
-    onExpand?: unknown;
-    onCollapse?: unknown;
-    onScroll?: unknown;
-    theme?: unknown;
-    themeOverrides?: unknown;
-    builtinThemeOverrides?: unknown;
-} & {
-    position: "static" | "absolute";
-    width: string | number;
-    bordered: boolean;
-    contentStyle: string | CSSProperties;
-    inverted: boolean;
-    nativeScrollbar: boolean;
-    collapsedWidth: number;
-    collapseMode: "transform" | "width";
-    defaultCollapsed: boolean;
-    showCollapsedContent: boolean;
-    showTrigger: boolean | "bar" | "arrow-circle";
-} & {
-    onAfterEnter?: (() => void) | undefined;
-    onAfterLeave?: (() => void) | undefined;
-    onScroll?: ((e: Event) => void) | undefined;
-    theme?: import("../../_mixins").Theme<"Layout", {
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    position: {
+        readonly type: PropType<"static" | "absolute">;
+        readonly default: "static";
+    };
+    bordered: BooleanConstructor;
+    collapsedWidth: {
+        readonly type: NumberConstructor;
+        readonly default: 48;
+    };
+    width: {
+        readonly type: PropType<string | number>;
+        readonly default: 272;
+    };
+    contentStyle: {
+        readonly type: PropType<string | CSSProperties>;
+        readonly default: "";
+    };
+    collapseMode: {
+        readonly type: PropType<"transform" | "width">;
+        readonly default: "transform";
+    };
+    collapsed: {
+        readonly type: PropType<boolean | undefined>;
+        readonly default: undefined;
+    };
+    defaultCollapsed: BooleanConstructor;
+    showCollapsedContent: {
+        readonly type: BooleanConstructor;
+        readonly default: true;
+    };
+    showTrigger: {
+        readonly type: PropType<boolean | "bar" | "arrow-circle">;
+        readonly default: false;
+    };
+    nativeScrollbar: {
+        readonly type: BooleanConstructor;
+        readonly default: true;
+    };
+    inverted: BooleanConstructor;
+    scrollbarProps: PropType<Partial<ScrollbarProps> & {
+        style: CSSProperties;
+    }>;
+    triggerStyle: PropType<string | CSSProperties>;
+    collapsedTriggerStyle: PropType<string | CSSProperties>;
+    'onUpdate:collapsed': PropType<MaybeArray<(value: boolean) => void>>;
+    onUpdateCollapsed: PropType<MaybeArray<(value: boolean) => void>>;
+    onAfterEnter: PropType<() => void>;
+    onAfterLeave: PropType<() => void>;
+    onExpand: PropType<MaybeArray<() => void>>;
+    onCollapse: PropType<MaybeArray<() => void>>;
+    onScroll: PropType<(e: Event) => void>;
+    theme: PropType<import("../../_mixins").Theme<"Layout", {
         textColor: string;
         textColorInverted: string;
         color: string;
@@ -429,8 +442,8 @@ declare const _default: import("vue").DefineComponent<{
             color: string;
             colorHover: string;
         }, any>;
-    }> | undefined;
-    themeOverrides?: import("../../_mixins/use-theme").ExtractThemeOverrides<import("../../_mixins").Theme<"Layout", {
+    }>>;
+    themeOverrides: PropType<import("../../_mixins/use-theme").ExtractThemeOverrides<import("../../_mixins").Theme<"Layout", {
         textColor: string;
         textColorInverted: string;
         color: string;
@@ -459,8 +472,8 @@ declare const _default: import("vue").DefineComponent<{
             color: string;
             colorHover: string;
         }, any>;
-    }>> | undefined;
-    builtinThemeOverrides?: import("../../_mixins/use-theme").ExtractThemeOverrides<import("../../_mixins").Theme<"Layout", {
+    }>>>;
+    builtinThemeOverrides: PropType<import("../../_mixins/use-theme").ExtractThemeOverrides<import("../../_mixins").Theme<"Layout", {
         textColor: string;
         textColorInverted: string;
         color: string;
@@ -489,18 +502,8 @@ declare const _default: import("vue").DefineComponent<{
             color: string;
             colorHover: string;
         }, any>;
-    }>> | undefined;
-    collapsed?: boolean | undefined;
-    scrollbarProps?: (Partial<ScrollbarProps> & {
-        style: CSSProperties;
-    }) | undefined;
-    triggerStyle?: string | CSSProperties | undefined;
-    collapsedTriggerStyle?: string | CSSProperties | undefined;
-    "onUpdate:collapsed"?: MaybeArray<(value: boolean) => void> | undefined;
-    onUpdateCollapsed?: MaybeArray<(value: boolean) => void> | undefined;
-    onExpand?: MaybeArray<() => void> | undefined;
-    onCollapse?: MaybeArray<() => void> | undefined;
-}>, {
+    }>>>;
+}>>, {
     position: "static" | "absolute";
     width: string | number;
     bordered: boolean;

package/lib/layout/src/LayoutSider.js

@@ -216,6 +216,7 @@ exports.default = (0, vue_1.defineComponent)({
                         overflow: 'auto'
                     }
                 ], ref: "scrollableElRef" }, this.$slots)),
-            showTrigger ? (showTrigger === 'bar' ? ((0, vue_1.h)(ToggleBar_1.default, { clsPrefix: mergedClsPrefix, style: mergedCollapsed ? this.collapsedTriggerStyle : this.triggerStyle, onClick: this.handleTriggerClick })) : ((0, vue_1.h)(ToggleButton_1.default, { clsPrefix: mergedClsPrefix, style: mergedCollapsed ? this.collapsedTriggerStyle : this.triggerStyle, onClick: this.handleTriggerClick }))) : null));
+            showTrigger ? (showTrigger === 'bar' ? ((0, vue_1.h)(ToggleBar_1.default, { clsPrefix: mergedClsPrefix, style: mergedCollapsed ? this.collapsedTriggerStyle : this.triggerStyle, onClick: this.handleTriggerClick })) : ((0, vue_1.h)(ToggleButton_1.default, { clsPrefix: mergedClsPrefix, style: mergedCollapsed ? this.collapsedTriggerStyle : this.triggerStyle, onClick: this.handleTriggerClick }))) : null,
+            this.bordered ? ((0, vue_1.h)("div", { class: `${mergedClsPrefix}-layout-sider__border` })) : null));
     }
 });

package/lib/layout/src/ToggleBar.d.ts

@@ -5,12 +5,11 @@ declare const _default: import("vue").DefineComponent<{
         required: true;
     };
     onClick: PropType<(e: MouseEvent) => void>;
-}, unknown, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<{
-    clsPrefix?: unknown;
-    onClick?: unknown;
-} & {
-    clsPrefix: string;
-} & {
-    onClick?: ((e: MouseEvent) => void) | undefined;
-}>, {}>;
+}, unknown, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    clsPrefix: {
+        type: StringConstructor;
+        required: true;
+    };
+    onClick: PropType<(e: MouseEvent) => void>;
+}>>, {}>;
 export default _default;

package/lib/layout/src/ToggleButton.d.ts

@@ -5,12 +5,11 @@ declare const _default: import("vue").DefineComponent<{
         required: true;
     };
     onClick: PropType<(e: MouseEvent) => void>;
-}, unknown, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<{
-    clsPrefix?: unknown;
-    onClick?: unknown;
-} & {
-    clsPrefix: string;
-} & {
-    onClick?: ((e: MouseEvent) => void) | undefined;
-}>, {}>;
+}, unknown, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    clsPrefix: {
+        type: StringConstructor;
+        required: true;
+    };
+    onClick: PropType<(e: MouseEvent) => void>;
+}>>, {}>;
 export default _default;

package/lib/layout/src/interface.d.ts

@@ -1,5 +1,5 @@
-import { InjectionKey, PropType, Ref } from 'vue';
-export declare const layoutSiderInjectionKey: InjectionKey<{
+import { PropType, Ref } from 'vue';
+export declare const layoutSiderInjectionKey: import("vue").InjectionKey<{
     collapsedRef: Ref<boolean>;
     collapseModeRef: Ref<'transform' | 'width'>;
 }>;

package/lib/layout/src/interface.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.positionProp = exports.layoutSiderInjectionKey = void 0;
-exports.layoutSiderInjectionKey = Symbol('layoutSiderInjection');
+const _utils_1 = require("../../_utils");
+exports.layoutSiderInjectionKey = (0, _utils_1.createInjectionKey)('n-layout-sider');
 exports.positionProp = {
     type: String,
     default: 'static'

package/lib/layout/src/styles/layout-sider.cssr.js

@@ -30,12 +30,21 @@ exports.default = (0, cssr_1.cB)('layout-sider', `
  background-color: var(--n-color);
  display: flex;
  justify-content: flex-end;
-`, [(0, cssr_1.cM)('right-placement', `
+`, [(0, cssr_1.cM)('bordered', [(0, cssr_1.cE)('border', `
+ content: "";
+ position: absolute;
+ top: 0;
+ bottom: 0;
+ width: 1px;
+ background-color: var(--n-border-color);
+ transition: background-color .3s var(--n-bezier);
+ `)]), (0, cssr_1.cE)('left-placement', [(0, cssr_1.cM)('bordered', [(0, cssr_1.cE)('border', `
+ right: 0;
+ `)])]), (0, cssr_1.cM)('right-placement', `
  justify-content: flex-start;
- `, [(0, cssr_1.cM)('bordered', `
- border-right: none;
- border-left: 1px solid var(--n-border-color);
- `), (0, cssr_1.cM)('collapsed', [(0, cssr_1.cB)('layout-toggle-button', [(0, cssr_1.cB)('base-icon', `
+ `, [(0, cssr_1.cM)('bordered', [(0, cssr_1.cE)('border', `
+ left: 0;
+ `)]), (0, cssr_1.cM)('collapsed', [(0, cssr_1.cB)('layout-toggle-button', [(0, cssr_1.cB)('base-icon', `
  transform: rotate(180deg);
  `)]), (0, cssr_1.cB)('layout-toggle-bar', [(0, cssr_1.c)('&:hover', [(0, cssr_1.cE)('top', {
   transform: 'rotate(-12deg) scale(1.15) translateY(-2px)'
@@ -82,6 +91,7 @@ exports.default = (0, cssr_1.cB)('layout-sider', `
  background-color: var(--n-toggle-button-color);
  box-shadow: 0 2px 4px 0px rgba(0, 0, 0, .06);
  transform: translateX(50%) translateY(-50%);
+ z-index: 1;
  `, [(0, cssr_1.cB)('base-icon', `
  transition: transform .3s var(--n-bezier);
  transform: rotate(180deg);
@@ -134,6 +144,4 @@ exports.default = (0, cssr_1.cB)('layout-sider', `
  left: 0;
  top: 0;
  bottom: 0;
- `), (0, cssr_1.cM)('bordered', `
- border-right: 1px solid var(--n-border-color);
  `)]);

package/lib/legacy-grid/src/Col.d.ts

@@ -43,17 +43,24 @@ declare const _default: import("vue").DefineComponent<{
     gutter: import("vue").Ref<string | number | [number, number]>;
     stylePadding: import("vue").ComputedRef<string>;
     mergedPush: import("vue").ComputedRef<number>;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<{
-    readonly span?: unknown;
-    readonly push?: unknown;
-    readonly pull?: unknown;
-    readonly offset?: unknown;
-} & {
-    push: Span;
-    offset: Span;
-    span: Span;
-    pull: Span;
-} & {}>, {
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    readonly span: {
+        readonly type: PropType<Span>;
+        readonly default: 1;
+    };
+    readonly push: {
+        readonly type: PropType<Span>;
+        readonly default: 0;
+    };
+    readonly pull: {
+        readonly type: PropType<Span>;
+        readonly default: 0;
+    };
+    readonly offset: {
+        readonly type: PropType<Span>;
+        readonly default: 0;
+    };
+}>>, {
     push: Span;
     offset: Span;
     span: Span;

package/lib/legacy-grid/src/Row.d.ts

@@ -1,12 +1,12 @@
-import { InjectionKey, PropType, Ref } from 'vue';
-import type { ExtractPublicPropTypes } from '../../_utils';
+import { PropType, Ref } from 'vue';
+import { ExtractPublicPropTypes } from '../../_utils';
 export interface RowInjection {
     gutterRef: Ref<string | number | [number, number]>;
     verticalGutterRef: Ref<number>;
     horizontalGutterRef: Ref<number>;
     mergedClsPrefixRef: Ref<string>;
 }
-export declare const rowInjectionKey: InjectionKey<RowInjection>;
+export declare const rowInjectionKey: import("vue").InjectionKey<RowInjection>;
 export declare const rowProps: {
     readonly gutter: {
         readonly type: PropType<string | number | [number, number]>;
@@ -28,16 +28,14 @@ declare const _default: import("vue").DefineComponent<{
     mergedClsPrefix: import("vue").ComputedRef<string>;
     styleMargin: import("vue").ComputedRef<string>;
     styleWidth: import("vue").ComputedRef<string>;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<{
-    readonly gutter?: unknown;
-    readonly alignItems?: unknown;
-    readonly justifyContent?: unknown;
-} & {
-    gutter: string | number | [number, number];
-} & {
-    alignItems?: string | undefined;
-    justifyContent?: string | undefined;
-}>, {
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    readonly gutter: {
+        readonly type: PropType<string | number | [number, number]>;
+        readonly default: 0;
+    };
+    readonly alignItems: StringConstructor;
+    readonly justifyContent: StringConstructor;
+}>>, {
     gutter: string | number | [number, number];
 }>;
 export default _default;

package/lib/legacy-grid/src/Row.js

@@ -9,7 +9,7 @@ const vooks_1 = require("vooks");
 const _utils_1 = require("../../_utils");
 const _mixins_1 = require("../../_mixins");
 const index_cssr_1 = __importDefault(require("./styles/index.cssr"));
-exports.rowInjectionKey = Symbol('row');
+exports.rowInjectionKey = (0, _utils_1.createInjectionKey)('n-row');
 exports.rowProps = {
     gutter: {
         type: [Array, Number, String],