@skbkontur/side-menu 0.9.1 → 0.9.3

package/CHANGELOG.md

@@ -3,6 +3,25 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.9.3](https://git.skbkontur.ru/ui/ui-parking/compare/@skbkontur/side-menu@0.9.2...@skbkontur/side-menu@0.9.3) (2023-05-24)
+
+
+### Bug Fixes
+
+* **SideMenu:** change z-index for SidePage to 8000 ([1452080](https://git.skbkontur.ru/ui/ui-parking/commits/1452080fffc9079bccd3fbbabdd52461926c48c8))
+
+
+
+
+
+## [0.9.2](https://git.skbkontur.ru/ui/ui-parking/compare/@skbkontur/side-menu@0.9.1...@skbkontur/side-menu@0.9.2) (2023-05-19)
+
+**Note:** Version bump only for package @skbkontur/side-menu
+
+
+
+
+
 ## [0.9.1](https://git.skbkontur.ru/ui/ui-parking/compare/@skbkontur/side-menu@0.9.0...@skbkontur/side-menu@0.9.1) (2023-05-15)
 
 

package/hooks/useNumberOfTextLinesInItem.js

@@ -1,3 +1,4 @@
+import { isBrowser } from '../utils/scripts';
 export var useNumberOfTextLinesInItem = function (textRef, setLinesNumber, text, marker, size) {
     if (text === void 0) { text = ''; }
     if (marker === void 0) { marker = ''; }
@@ -25,7 +26,7 @@ export var useNumberOfTextLinesInItem = function (textRef, setLinesNumber, text,
         return lineCount;
     };
     var fontSize = size === 'small' ? 14 : 16; //TODO после перехода на переменные темы заменить на side-menu-font-size-small и side-menu-font-size-large
-    var fontFamily = textRef.current && typeof window !== undefined
+    var fontFamily = textRef.current && isBrowser
         ? window.getComputedStyle(textRef.current).getPropertyValue('font-family')
         : "'Lab Grotesque', 'Segoe UI', 'Helvetica Neue', Roboto, Arial, sans-serif";
     var canvas = document.createElement('canvas');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@skbkontur/side-menu",
-  "version": "0.9.1",
+  "version": "0.9.3",
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org/"
@@ -15,7 +15,6 @@
   "author": "Kontur",
   "peerDependencies": {
     "@skbkontur/react-ui": ">=4.5.0 <5",
-    "@skbkontur/react-ui-addons": ">=4.0.1",
     "react": ">=16.9",
     "react-dom": ">=16.9"
   },
@@ -24,6 +23,7 @@
   },
   "dependencies": {
     "@skbkontur/icons": "^0.16.0",
+    "@skbkontur/react-ui-addons": "^4.6.2",
     "tslib": "^1"
   }
 }

package/src/SideMenu/SideMenu.js

@@ -184,7 +184,7 @@ var SideMenuInner = forwardRef(function (_a, ref) {
             hasScrollBar: hasScrollBar,
             setHasScrollBar: setHasScrollBar,
         } },
-        React.createElement(ZIndex, { priority: isTabletOrMobile || isNarrowDesktop ? 'Sidepage' : 0, className: cx((_b = {},
+        React.createElement(ZIndex, { priority: isTabletOrMobile || isNarrowDesktop ? 8 : 0, className: cx((_b = {},
                 _b[jsStyles.root()] = true,
                 _b[jsStyles.rootForTabletsOrMobiles()] = isTabletOrMobile,
                 _b[jsStyles.shownRootForTabletsOrMobiles()] = isShown && isTabletOrMobile,

package/src/internal/InnerSubMenu.d.ts

@@ -1,9 +1,10 @@
 import React from 'react';
+import { ZIndex } from '@skbkontur/react-ui/internal/ZIndex';
 interface InnerSubMenuProps {
     children?: React.ReactNode;
     generatedId?: string;
 }
-declare const InnerSubMenuWithStaticFields: React.ForwardRefExoticComponent<InnerSubMenuProps & React.RefAttributes<HTMLDivElement>> & {
+declare const InnerSubMenuWithStaticFields: React.ForwardRefExoticComponent<InnerSubMenuProps & React.RefAttributes<ZIndex>> & {
     __KONTUR_REACT_UI__: string;
 };
 export { InnerSubMenuWithStaticFields as InnerSubMenu };

package/src/internal/InnerSubMenu.js

@@ -1,5 +1,6 @@
 import React, { forwardRef } from 'react';
 import { isClickableSubElement } from '../../utils/scripts';
+import { ZIndex } from '@skbkontur/react-ui/internal/ZIndex';
 /**
  * Подменю, раскрывающееся внутри основного меню
  *
@@ -8,7 +9,7 @@ import { isClickableSubElement } from '../../utils/scripts';
 var InnerSubMenu = forwardRef(function (_a, ref) {
     var children = _a.children, generatedId = _a.generatedId;
     var levelIndex = 0;
-    return (React.createElement(React.Fragment, null, React.Children.map(children, function (child) {
+    return (React.createElement(ZIndex, { priority: 0, ref: ref }, React.Children.map(children, function (child) {
         if (React.isValidElement(child)) {
             if (
             // @ts-expect-error: accessing private property
@@ -19,7 +20,7 @@ var InnerSubMenu = forwardRef(function (_a, ref) {
                     _generatedId: generatedId + "-" + oldIndex,
                 });
             }
-            return React.cloneElement(child, { ref: ref });
+            return React.cloneElement(child);
         }
         return child;
     })));

package/src/internal/ItemContent/Icon.styles.js

@@ -2,7 +2,7 @@ import { __makeTemplateObject } from "tslib";
 import { css, memoizeStyle } from '@skbkontur/react-ui/lib/theming/Emotion';
 var styles = {
     root: function () {
-        return css(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n      display: flex;\n      align-items: center;\n      padding: 0 8px;\n      min-height: 32px;\n      line-height: 20px;\n      flex-shrink: 0;\n    "], ["\n      display: flex;\n      align-items: center;\n      padding: 0 8px;\n      min-height: 32px;\n      line-height: 20px;\n      flex-shrink: 0;\n    "])));
+        return css(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n      display: flex;\n      align-items: center;\n      padding: 0 8px;\n      min-height: 32px;\n      line-height: 20px;\n      flex-shrink: 0;\n      box-sizing: content-box;\n    "], ["\n      display: flex;\n      align-items: center;\n      padding: 0 8px;\n      min-height: 32px;\n      line-height: 20px;\n      flex-shrink: 0;\n      box-sizing: content-box;\n    "])));
     },
     rootMultiline: function () {
         return css(templateObject_2 || (templateObject_2 = __makeTemplateObject(["\n      align-self: flex-start;\n      align-items: flex-start;\n    "], ["\n      align-self: flex-start;\n      align-items: flex-start;\n    "])));

package/src/internal/SeparatedSubMenu.d.ts

@@ -1,4 +1,5 @@
 import React from 'react';
+import { ZIndex } from '@skbkontur/react-ui/internal/ZIndex';
 interface SeparatedSubMenuProps {
     children?: React.ReactNode;
     generatedId?: string;
@@ -6,7 +7,7 @@ interface SeparatedSubMenuProps {
     href?: string;
     caption?: string;
 }
-declare const SeparatedSubMenuWithStaticFields: React.ForwardRefExoticComponent<SeparatedSubMenuProps & React.RefAttributes<HTMLDivElement>> & {
+declare const SeparatedSubMenuWithStaticFields: React.ForwardRefExoticComponent<SeparatedSubMenuProps & React.RefAttributes<ZIndex>> & {
     __KONTUR_REACT_UI__: string;
 };
 export { SeparatedSubMenuWithStaticFields as SeparatedSubMenu };

package/src/internal/SeparatedSubMenu.js

@@ -9,6 +9,7 @@ import { BackButton } from './BackButton';
 import { SideMenuDataTids } from '../../SideMenuDataTids';
 import { ScrollContainer } from '@skbkontur/react-ui';
 import { isIE11 } from '@skbkontur/react-ui/lib/client';
+import { ZIndex } from '@skbkontur/react-ui/internal/ZIndex';
 /**
  * Отдельностоящее подменю
  *
@@ -33,7 +34,7 @@ var SeparatedSubMenu = forwardRef(function (_a, ref) {
     var levelIndex = 0;
     var isDesktopOverlayMenu = (context.isDesktop || context.isNarrowDesktop) && !context.separatedMenuWithoutOverlay;
     var isSeparatedSubMenuOverContent = (context.isTablet || isDesktopOverlayMenu) && !isIE11;
-    return (React.createElement("div", { className: cx((_b = {},
+    return (React.createElement(ZIndex, { priority: context.separatedMenuWithoutOverlay ? 8 : 0, className: cx((_b = {},
             _b[jsStyles.container()] = true,
             _b[jsStyles.containerForTouchScreens()] = context.isTouchScreen,
             _b[jsStylesForSeparatedSubMenu.root()] = true,

package/src/internal/SeparatedSubMenu.styles.js

@@ -3,7 +3,7 @@ import { css, memoizeStyle } from '@skbkontur/react-ui/lib/theming/Emotion';
 import { sideMenuBoxShadow, sideMenuMinimizedWidth, sideMenuStandardWidth } from '../SideMenu/SideMenu.styles';
 var styles = {
     root: function () {
-        return css(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n      position: absolute;\n      top: 0;\n      z-index: 8000;\n      background: #fff;\n      left: 100%;\n      overflow: auto;\n      justify-content: flex-start;\n      border-right: 1px solid #e5e5e5;\n    "], ["\n      position: absolute;\n      top: 0;\n      z-index: 8000;\n      background: #fff;\n      left: 100%;\n      overflow: auto;\n      justify-content: flex-start;\n      border-right: 1px solid #e5e5e5;\n    "])));
+        return css(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n      position: absolute;\n      top: 0;\n      background: #fff;\n      left: 100%;\n      overflow: auto;\n      justify-content: flex-start;\n      border-right: 1px solid #e5e5e5;\n    "], ["\n      position: absolute;\n      top: 0;\n      background: #fff;\n      left: 100%;\n      overflow: auto;\n      justify-content: flex-start;\n      border-right: 1px solid #e5e5e5;\n    "])));
     },
     rootForMobiles: function () {
         var headerHeight = '68px';

package/src/internal/SubMenu.d.ts

@@ -1,4 +1,5 @@
 import React from 'react';
+import { ZIndex } from '@skbkontur/react-ui/internal/ZIndex';
 interface SubMenuProps {
     children?: React.ReactNode;
     generatedId?: string;
@@ -10,7 +11,7 @@ interface SubMenuProps {
     href?: string;
     caption?: string;
 }
-declare const SubMenuWithStaticFields: React.ForwardRefExoticComponent<SubMenuProps & React.RefAttributes<HTMLDivElement>> & {
+declare const SubMenuWithStaticFields: React.ForwardRefExoticComponent<SubMenuProps & React.RefAttributes<ZIndex>> & {
     __KONTUR_REACT_UI__: string;
 };
 export { SubMenuWithStaticFields as SubMenu };

package/utils/scripts.d.ts

@@ -8,5 +8,6 @@ export declare const getChildrenIdArray: (childrenArray: FlattedArrayElementType
 export declare const getElementsChildren: (element: ReactElement, levelIndex: string) => FlattedArrayElementType[];
 export declare const isParentOpened: (id: string | undefined, generatedId: string | undefined, openedParents: string[] | undefined) => boolean | "" | undefined;
 export declare const isElementActive: (id: string | undefined, activeMenuItem: string | undefined | null) => boolean;
+export declare const isBrowser: boolean;
 export declare const isTouchDevice: () => boolean;
 export declare const getIconSize: (_isSubMenu?: boolean | undefined, _isBackButton?: boolean | undefined) => 24 | 16 | undefined;

package/utils/scripts.js

@@ -73,8 +73,9 @@ export var isParentOpened = function (id, generatedId, openedParents) {
 export var isElementActive = function (id, activeMenuItem) {
     return !!id && !!activeMenuItem && id === activeMenuItem;
 };
+export var isBrowser = typeof window !== 'undefined';
 export var isTouchDevice = function () {
-    return typeof window !== undefined && ('ontouchstart' in window || navigator.maxTouchPoints > 0);
+    return isBrowser && ('ontouchstart' in window || navigator.maxTouchPoints > 0);
 };
 export var getIconSize = function (_isSubMenu, _isBackButton) {
     if (!_isSubMenu) {