naive-ui 2.41.1 → 2.43.0

package/es/menu/src/MenuOption.mjs

@@ -22,18 +22,19 @@ export const NMenuOption = defineComponent({
     const MenuChild = useMenuChild(props);
     const {
       NSubmenu,
-      NMenu
+      NMenu,
+      NMenuOptionGroup
     } = MenuChild;
     const {
       props: menuProps,
       mergedClsPrefixRef,
       mergedCollapsedRef
     } = NMenu;
-    const submenuDisabledRef = NSubmenu ? NSubmenu.mergedDisabledRef : {
+    const parentDisabledRef = NSubmenu ? NSubmenu.mergedDisabledRef : NMenuOptionGroup ? NMenuOptionGroup.mergedDisabledRef : {
       value: false
     };
     const mergedDisabledRef = computed(() => {
-      return submenuDisabledRef.value || props.disabled;
+      return parentDisabledRef.value || props.disabled;
     });
     function doClick(e) {
       const {

package/es/menu/src/MenuOptionContent.d.ts

@@ -82,8 +82,8 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     selected: boolean;
     hover: boolean;
     showArrow: boolean;
-    childActive: boolean;
     collapsed: boolean;
+    childActive: boolean;
     isEllipsisPlaceholder: boolean;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 export default _default;

package/es/menu/src/MenuOptionGroup.d.ts

@@ -22,7 +22,7 @@ export declare const menuItemGroupProps: {
     readonly title: PropType<string | (() => import("vue").VNodeChild)>;
     readonly extra: PropType<string | (() => import("vue").VNodeChild)>;
 };
-export declare const menuItemGroupPropKeys: ("extra" | "root" | "title" | "tmNode" | "level" | "isGroup" | "tmNodes" | "internalKey")[];
+export declare const menuItemGroupPropKeys: ("extra" | "root" | "title" | "tmNodes" | "level" | "isGroup" | "tmNode" | "internalKey")[];
 export declare const NMenuOptionGroup: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
     readonly tmNode: {
         readonly type: PropType<TmNode>;

package/es/menu/src/MenuOptionGroup.mjs

@@ -1,6 +1,6 @@
-import { defineComponent, Fragment, h, inject, provide } from 'vue';
+import { computed, defineComponent, Fragment, h, inject, provide } from 'vue';
 import { keysOf, render } from "../../_utils/index.mjs";
-import { menuInjectionKey, menuItemGroupInjectionKey, submenuInjectionKey } from "./context.mjs";
+import { menuInjectionKey, menuItemGroupInjectionKey } from "./context.mjs";
 import { useMenuChild } from "./use-menu-child.mjs";
 import { useMenuChildProps } from "./use-menu-child-props.mjs";
 import { itemRenderer } from "./utils.mjs";
@@ -19,10 +19,17 @@ export const NMenuOptionGroup = defineComponent({
   name: 'MenuOptionGroup',
   props: menuItemGroupProps,
   setup(props) {
-    provide(submenuInjectionKey, null);
     const MenuChild = useMenuChild(props);
+    const {
+      NSubmenu
+    } = MenuChild;
+    const mergedDisabledRef = computed(() => {
+      if (NSubmenu === null || NSubmenu === void 0 ? void 0 : NSubmenu.mergedDisabledRef.value) return true;
+      return props.tmNode.disabled;
+    });
     provide(menuItemGroupInjectionKey, {
-      paddingLeftRef: MenuChild.paddingLeft
+      paddingLeftRef: MenuChild.paddingLeft,
+      mergedDisabledRef
     });
     const {
       mergedClsPrefixRef,

package/es/menu/src/Submenu.d.ts

@@ -35,7 +35,7 @@ export declare const submenuProps: {
     readonly title: PropType<string | (() => VNodeChild)>;
     readonly extra: PropType<string | (() => VNodeChild)>;
 };
-export declare const submenuPropKeys: ("extra" | "root" | "disabled" | "title" | "icon" | "onClick" | "tmNode" | "level" | "isGroup" | "tmNodes" | "internalKey" | "isEllipsisPlaceholder" | "rawNodes" | "domId" | "virtualChildActive")[];
+export declare const submenuPropKeys: ("extra" | "root" | "disabled" | "title" | "icon" | "onClick" | "tmNodes" | "level" | "isGroup" | "tmNode" | "internalKey" | "isEllipsisPlaceholder" | "rawNodes" | "domId" | "virtualChildActive")[];
 export declare const NSubmenu: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
     readonly rawNodes: {
         readonly type: PropType<MenuMixedOption[]>;
@@ -176,7 +176,20 @@ export declare const NSubmenu: import("vue").DefineComponent<import("vue").Extra
                     arrowOffsetVertical: string;
                     arrowHeight: string;
                     padding: string;
-                }, any>;
+                }, {
+                    Scrollbar: import("../../_mixins").Theme<"Scrollbar", {
+                        height: string;
+                        width: string;
+                        borderRadius: string;
+                        color: string;
+                        colorHover: string;
+                        railInsetHorizontalBottom: string;
+                        railInsetHorizontalTop: string;
+                        railInsetVerticalRight: string;
+                        railInsetVerticalLeft: string;
+                        railColor: string;
+                    }, any>;
+                }>;
             }>;
             Dropdown: import("../../_mixins").Theme<"Dropdown", {
                 optionHeightSmall: string;
@@ -246,7 +259,20 @@ export declare const NSubmenu: import("vue").DefineComponent<import("vue").Extra
                     arrowOffsetVertical: string;
                     arrowHeight: string;
                     padding: string;
-                }, any>;
+                }, {
+                    Scrollbar: import("../../_mixins").Theme<"Scrollbar", {
+                        height: string;
+                        width: string;
+                        borderRadius: string;
+                        color: string;
+                        colorHover: string;
+                        railInsetHorizontalBottom: string;
+                        railInsetHorizontalTop: string;
+                        railInsetVerticalRight: string;
+                        railInsetVerticalLeft: string;
+                        railColor: string;
+                    }, any>;
+                }>;
             }>;
         };
         peerOverrides: {
@@ -265,7 +291,20 @@ export declare const NSubmenu: import("vue").DefineComponent<import("vue").Extra
                         arrowOffsetVertical: string;
                         arrowHeight: string;
                         padding: string;
-                    }, any>> | undefined;
+                    }, {
+                        Scrollbar: import("../../_mixins").Theme<"Scrollbar", {
+                            height: string;
+                            width: string;
+                            borderRadius: string;
+                            color: string;
+                            colorHover: string;
+                            railInsetHorizontalBottom: string;
+                            railInsetHorizontalTop: string;
+                            railInsetVerticalRight: string;
+                            railInsetVerticalLeft: string;
+                            railColor: string;
+                        }, any>;
+                    }>> | undefined;
                 } | undefined;
             } | undefined;
             Dropdown?: {
@@ -283,7 +322,20 @@ export declare const NSubmenu: import("vue").DefineComponent<import("vue").Extra
                         arrowOffsetVertical: string;
                         arrowHeight: string;
                         padding: string;
-                    }, any>> | undefined;
+                    }, {
+                        Scrollbar: import("../../_mixins").Theme<"Scrollbar", {
+                            height: string;
+                            width: string;
+                            borderRadius: string;
+                            color: string;
+                            colorHover: string;
+                            railInsetHorizontalBottom: string;
+                            railInsetHorizontalTop: string;
+                            railInsetVerticalRight: string;
+                            railInsetVerticalLeft: string;
+                            railColor: string;
+                        }, any>;
+                    }>> | undefined;
                 } | undefined;
             } | undefined;
         };
@@ -391,7 +443,20 @@ export declare const NSubmenu: import("vue").DefineComponent<import("vue").Extra
                     arrowOffsetVertical: string;
                     arrowHeight: string;
                     padding: string;
-                }, any>;
+                }, {
+                    Scrollbar: import("../../_mixins").Theme<"Scrollbar", {
+                        height: string;
+                        width: string;
+                        borderRadius: string;
+                        color: string;
+                        colorHover: string;
+                        railInsetHorizontalBottom: string;
+                        railInsetHorizontalTop: string;
+                        railInsetVerticalRight: string;
+                        railInsetVerticalLeft: string;
+                        railColor: string;
+                    }, any>;
+                }>;
             }>;
             Dropdown: import("../../_mixins").Theme<"Dropdown", {
                 optionHeightSmall: string;
@@ -461,7 +526,20 @@ export declare const NSubmenu: import("vue").DefineComponent<import("vue").Extra
                     arrowOffsetVertical: string;
                     arrowHeight: string;
                     padding: string;
-                }, any>;
+                }, {
+                    Scrollbar: import("../../_mixins").Theme<"Scrollbar", {
+                        height: string;
+                        width: string;
+                        borderRadius: string;
+                        color: string;
+                        colorHover: string;
+                        railInsetHorizontalBottom: string;
+                        railInsetHorizontalTop: string;
+                        railInsetVerticalRight: string;
+                        railInsetVerticalLeft: string;
+                        railColor: string;
+                    }, any>;
+                }>;
             }>;
         };
         peerOverrides: {
@@ -480,7 +558,20 @@ export declare const NSubmenu: import("vue").DefineComponent<import("vue").Extra
                         arrowOffsetVertical: string;
                         arrowHeight: string;
                         padding: string;
-                    }, any>> | undefined;
+                    }, {
+                        Scrollbar: import("../../_mixins").Theme<"Scrollbar", {
+                            height: string;
+                            width: string;
+                            borderRadius: string;
+                            color: string;
+                            colorHover: string;
+                            railInsetHorizontalBottom: string;
+                            railInsetHorizontalTop: string;
+                            railInsetVerticalRight: string;
+                            railInsetVerticalLeft: string;
+                            railColor: string;
+                        }, any>;
+                    }>> | undefined;
                 } | undefined;
             } | undefined;
             Dropdown?: {
@@ -498,7 +589,20 @@ export declare const NSubmenu: import("vue").DefineComponent<import("vue").Extra
                         arrowOffsetVertical: string;
                         arrowHeight: string;
                         padding: string;
-                    }, any>> | undefined;
+                    }, {
+                        Scrollbar: import("../../_mixins").Theme<"Scrollbar", {
+                            height: string;
+                            width: string;
+                            borderRadius: string;
+                            color: string;
+                            colorHover: string;
+                            railInsetHorizontalBottom: string;
+                            railInsetHorizontalTop: string;
+                            railInsetVerticalRight: string;
+                            railInsetVerticalLeft: string;
+                            railColor: string;
+                        }, any>;
+                    }>> | undefined;
                 } | undefined;
             } | undefined;
         };
@@ -557,8 +661,8 @@ export declare const NSubmenu: import("vue").DefineComponent<import("vue").Extra
 }>> & Readonly<{}>, {
     readonly root: boolean;
     readonly disabled: boolean;
-    readonly isGroup: boolean;
     readonly tmNodes: TmNode[];
+    readonly isGroup: boolean;
     readonly isEllipsisPlaceholder: boolean;
     readonly rawNodes: MenuMixedOption[];
     readonly virtualChildActive: boolean;

package/es/menu/src/use-menu-child.d.ts

@@ -25,6 +25,7 @@ export interface SubmenuInjection {
 }
 export interface MenuOptionGroupInjection {
     paddingLeftRef: Ref<number | undefined>;
+    mergedDisabledRef: Ref<boolean>;
 }
 export interface UseMenuChild {
     dropdownPlacement: ComputedRef<FollowerPlacement>;
@@ -34,5 +35,6 @@ export interface UseMenuChild {
     iconMarginRight: ComputedRef<number>;
     NMenu: MenuInjection;
     NSubmenu: SubmenuInjection | null;
+    NMenuOptionGroup: MenuOptionGroupInjection | null;
 }
 export declare function useMenuChild(props: UseMenuChildProps): UseMenuChild;

package/es/menu/src/use-menu-child.mjs

@@ -83,6 +83,7 @@ export function useMenuChild(props) {
     paddingLeft: paddingLeftRef,
     iconMarginRight: iconMarginRightRef,
     NMenu,
-    NSubmenu
+    NSubmenu,
+    NMenuOptionGroup
   };
 }

package/es/menu/styles/light.d.ts

@@ -119,7 +119,7 @@ export declare function self(vars: ThemeCommonVars): {
     dividerColor: string;
 };
 export type MenuThemeVars = ReturnType<typeof self>;
-declare const menuLight: import("../../_mixins/use-theme").Theme<"Menu", {
+declare const menuLight: import("../../_mixins").Theme<"Menu", {
     itemColorHoverInverted: string;
     itemColorActiveInverted: string;
     itemColorActiveHoverInverted: string;
@@ -200,14 +200,14 @@ declare const menuLight: import("../../_mixins/use-theme").Theme<"Menu", {
     fontSize: string;
     dividerColor: string;
 }, {
-    Tooltip: import("../../_mixins/use-theme").Theme<"Tooltip", {
+    Tooltip: import("../../_mixins").Theme<"Tooltip", {
         borderRadius: string;
         boxShadow: string;
         color: string;
         textColor: string;
         padding: string;
     }, {
-        Popover: import("../../_mixins/use-theme").Theme<"Popover", {
+        Popover: import("../../_mixins").Theme<"Popover", {
             fontSize: string;
             borderRadius: string;
             color: string;
@@ -220,9 +220,22 @@ declare const menuLight: import("../../_mixins/use-theme").Theme<"Menu", {
             arrowOffsetVertical: string;
             arrowHeight: string;
             padding: string;
-        }, any>;
+        }, {
+            Scrollbar: import("../../_mixins").Theme<"Scrollbar", {
+                height: string;
+                width: string;
+                borderRadius: string;
+                color: string;
+                colorHover: string;
+                railInsetHorizontalBottom: string;
+                railInsetHorizontalTop: string;
+                railInsetVerticalRight: string;
+                railInsetVerticalLeft: string;
+                railColor: string;
+            }, any>;
+        }>;
     }>;
-    Dropdown: import("../../_mixins/use-theme").Theme<"Dropdown", {
+    Dropdown: import("../../_mixins").Theme<"Dropdown", {
         optionHeightSmall: string;
         optionHeightMedium: string;
         optionHeightLarge: string;
@@ -277,7 +290,7 @@ declare const menuLight: import("../../_mixins/use-theme").Theme<"Menu", {
         optionIconPrefixWidthLarge: string;
         optionIconPrefixWidthHuge: string;
     }, {
-        Popover: import("../../_mixins/use-theme").Theme<"Popover", {
+        Popover: import("../../_mixins").Theme<"Popover", {
             fontSize: string;
             borderRadius: string;
             color: string;
@@ -290,7 +303,20 @@ declare const menuLight: import("../../_mixins/use-theme").Theme<"Menu", {
             arrowOffsetVertical: string;
             arrowHeight: string;
             padding: string;
-        }, any>;
+        }, {
+            Scrollbar: import("../../_mixins").Theme<"Scrollbar", {
+                height: string;
+                width: string;
+                borderRadius: string;
+                color: string;
+                colorHover: string;
+                railInsetHorizontalBottom: string;
+                railInsetHorizontalTop: string;
+                railInsetVerticalRight: string;
+                railInsetVerticalLeft: string;
+                railColor: string;
+            }, any>;
+        }>;
     }>;
 }>;
 export default menuLight;

package/es/message/src/Message.d.ts

@@ -49,6 +49,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         '--n-close-icon-color-hover': string;
         '--n-line-height': string;
         '--n-border-radius': string;
+        '--n-border': string;
     }> | undefined;
     themeClass: import("vue").Ref<string, string> | undefined;
     onRender: (() => void) | undefined;

package/es/message/src/Message.mjs

@@ -50,6 +50,7 @@ export default defineComponent({
           fontSize,
           lineHeight,
           borderRadius,
+          border,
           iconColorInfo,
           iconColorSuccess,
           iconColorWarning,
@@ -93,7 +94,8 @@ export default defineComponent({
         '--n-close-icon-color-pressed': closeIconColorPressed,
         '--n-close-icon-color-hover': closeIconColorHover,
         '--n-line-height': lineHeight,
-        '--n-border-radius': borderRadius
+        '--n-border-radius': borderRadius,
+        '--n-border': border
       };
     });
     const themeClassHandle = inlineThemeDisabled ? useThemeClass('message', computed(() => props.type[0]), cssVarsRef, {}) : undefined;

package/es/message/src/MessageProvider.d.ts

@@ -104,6 +104,7 @@ export declare const messageProviderProps: {
         loadingColor: string;
         lineHeight: string;
         borderRadius: string;
+        border: string;
         margin: string;
         padding: string;
         maxWidth: string;
@@ -174,6 +175,7 @@ export declare const messageProviderProps: {
         loadingColor: string;
         lineHeight: string;
         borderRadius: string;
+        border: string;
         margin: string;
         padding: string;
         maxWidth: string;
@@ -244,6 +246,7 @@ export declare const messageProviderProps: {
         loadingColor: string;
         lineHeight: string;
         borderRadius: string;
+        border: string;
         margin: string;
         padding: string;
         maxWidth: string;
@@ -332,6 +335,7 @@ declare const _default: import("vue").DefineComponent<ExtractPropTypes<{
         loadingColor: string;
         lineHeight: string;
         borderRadius: string;
+        border: string;
         margin: string;
         padding: string;
         maxWidth: string;
@@ -402,6 +406,7 @@ declare const _default: import("vue").DefineComponent<ExtractPropTypes<{
         loadingColor: string;
         lineHeight: string;
         borderRadius: string;
+        border: string;
         margin: string;
         padding: string;
         maxWidth: string;
@@ -472,6 +477,7 @@ declare const _default: import("vue").DefineComponent<ExtractPropTypes<{
         loadingColor: string;
         lineHeight: string;
         borderRadius: string;
+        border: string;
         margin: string;
         padding: string;
         maxWidth: string;
@@ -584,6 +590,7 @@ declare const _default: import("vue").DefineComponent<ExtractPropTypes<{
         loadingColor: string;
         lineHeight: string;
         borderRadius: string;
+        border: string;
         margin: string;
         padding: string;
         maxWidth: string;
@@ -654,6 +661,7 @@ declare const _default: import("vue").DefineComponent<ExtractPropTypes<{
         loadingColor: string;
         lineHeight: string;
         borderRadius: string;
+        border: string;
         margin: string;
         padding: string;
         maxWidth: string;
@@ -724,6 +732,7 @@ declare const _default: import("vue").DefineComponent<ExtractPropTypes<{
         loadingColor: string;
         lineHeight: string;
         borderRadius: string;
+        border: string;
         margin: string;
         padding: string;
         maxWidth: string;
@@ -737,8 +746,8 @@ declare const _default: import("vue").DefineComponent<ExtractPropTypes<{
     }, any>>>;
 }>> & Readonly<{}>, {
     duration: number;
-    placement: "top" | "bottom" | "top-left" | "top-right" | "bottom-left" | "bottom-right";
     closable: boolean;
+    placement: "top" | "bottom" | "top-left" | "top-right" | "bottom-left" | "bottom-right";
     keepAliveOnHover: boolean;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 export default _default;

package/es/message/src/styles/index.cssr.mjs

@@ -55,6 +55,7 @@ export default c([cB('message-wrapper', `
  margin-bottom .3s var(--n-bezier);
  padding: var(--n-padding);
  border-radius: var(--n-border-radius);
+ border: var(--n-border);
  flex-wrap: nowrap;
  overflow: hidden;
  max-width: var(--n-max-width);

package/es/message/styles/light.d.ts

@@ -59,6 +59,7 @@ export declare function self(vars: ThemeCommonVars): {
     loadingColor: string;
     lineHeight: string;
     borderRadius: string;
+    border: string;
     margin: string;
     padding: string;
     maxWidth: string;

package/es/message/styles/light.mjs

@@ -76,7 +76,8 @@ export function self(vars) {
     closeIconColorPressedLoading: closeIconColorPressed,
     loadingColor: primaryColor,
     lineHeight,
-    borderRadius
+    borderRadius,
+    border: '0'
   });
 }
 const messageLight = {

package/es/modal/src/BodyWrapper.d.ts

@@ -56,6 +56,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     contentStyle: PropType<string | import("vue").CSSProperties>;
     actionClass: PropType<string | Array<string | undefined>>;
     actionStyle: PropType<string | import("vue").CSSProperties>;
+    closeFocusable: BooleanConstructor;
     headerClass: StringConstructor;
     headerStyle: PropType<import("vue").CSSProperties | string>;
     headerExtraClass: StringConstructor;
@@ -64,7 +65,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     footerStyle: PropType<import("vue").CSSProperties | string>;
     embedded: BooleanConstructor;
     segmented: {
-        readonly type: PropType<boolean | import("../../card").CardSegmented>;
+        readonly type: PropType<boolean | import("../..").CardSegmented>;
         readonly default: false;
     };
     size: {
@@ -102,6 +103,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         type: PropType<boolean | ModalDraggableOptions>;
         default: boolean;
     };
+    maskHidden: BooleanConstructor;
 }>, {
     mergedTheme: import("vue").Ref<{
         common: import("../..").ThemeCommonVars;
@@ -1231,6 +1233,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     contentStyle: PropType<string | import("vue").CSSProperties>;
     actionClass: PropType<string | Array<string | undefined>>;
     actionStyle: PropType<string | import("vue").CSSProperties>;
+    closeFocusable: BooleanConstructor;
     headerClass: StringConstructor;
     headerStyle: PropType<import("vue").CSSProperties | string>;
     headerExtraClass: StringConstructor;
@@ -1239,7 +1242,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     footerStyle: PropType<import("vue").CSSProperties | string>;
     embedded: BooleanConstructor;
     segmented: {
-        readonly type: PropType<boolean | import("../../card").CardSegmented>;
+        readonly type: PropType<boolean | import("../..").CardSegmented>;
         readonly default: false;
     };
     size: {
@@ -1277,20 +1280,23 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         type: PropType<boolean | ModalDraggableOptions>;
         default: boolean;
     };
+    maskHidden: BooleanConstructor;
 }>> & Readonly<{}>, {
-    type: "error" | "default" | "info" | "success" | "warning";
+    type: "error" | "default" | "info" | "warning" | "success";
     tag: keyof HTMLElementTagNameMap;
     size: "small" | "medium" | "large" | "huge";
     draggable: boolean | ModalDraggableOptions;
     loading: boolean;
     autoFocus: boolean;
-    bordered: boolean;
     showIcon: boolean;
+    bordered: boolean;
     closable: boolean;
-    hoverable: boolean;
     embedded: boolean;
-    segmented: boolean | import("../../card").CardSegmented;
-    trapFocus: boolean;
+    segmented: boolean | import("../..").CardSegmented;
+    hoverable: boolean;
+    closeFocusable: boolean;
     blockScroll: boolean;
+    trapFocus: boolean;
+    maskHidden: boolean;
 }, SlotsType<ModalSlots>, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 export default _default;

package/es/modal/src/BodyWrapper.mjs

@@ -38,7 +38,8 @@ export default defineComponent({
     draggable: {
       type: [Boolean, Object],
       default: false
-    }
+    },
+    maskHidden: Boolean
   }, presetProps), {
     renderMask: Function,
     // events
@@ -235,7 +236,7 @@ export default defineComponent({
     }
     return this.displayDirective === 'show' || this.displayed || this.show ? withDirectives(h("div", {
       role: "none",
-      class: `${mergedClsPrefix}-modal-body-wrapper`
+      class: [`${mergedClsPrefix}-modal-body-wrapper`, this.maskHidden && `${mergedClsPrefix}-modal-body-wrapper--mask-hidden`]
     }, h(NScrollbar, {
       ref: "scrollbarRef",
       theme: this.mergedTheme.peers.Scrollbar,
@@ -245,7 +246,7 @@ export default defineComponent({
       default: () => {
         var _a;
         return [(_a = this.renderMask) === null || _a === void 0 ? void 0 : _a.call(this), h(VFocusTrap, {
-          disabled: !this.trapFocus,
+          disabled: !this.trapFocus || this.maskHidden,
           active: this.show,
           onEsc: this.onEsc,
           autoFocus: this.autoFocus