@skbkontur/side-menu 1.4.2 → 1.5.0

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.5.0](https://git.skbkontur.ru/ui/ui-parking/compare/@skbkontur/side-menu@1.4.2...@skbkontur/side-menu@1.5.0) (2023-09-05)
+
+
+### Features
+
+* **SideMenu:** always show widget ([f26dabb](https://git.skbkontur.ru/ui/ui-parking/commits/f26dabb14620eb12cb42ffa29b04e98708f4a200))
+
+
+
+
+
 ## [1.4.2](https://git.skbkontur.ru/ui/ui-parking/compare/@skbkontur/side-menu@1.4.1...@skbkontur/side-menu@1.4.2) (2023-08-25)
 
 **Note:** Version bump only for package @skbkontur/side-menu

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@skbkontur/side-menu",
-  "version": "1.4.2",
+  "version": "1.5.0",
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org/"

package/src/SideMenu/SideMenu.js

@@ -32,7 +32,6 @@ var SideMenuInner = forwardRef(function (_a, ref) {
     var _b, _c, _d, _e;
     var children = _a.children, value = _a.value, onValueChange = _a.onValueChange, _f = _a.size, size = _f === void 0 ? 'small' : _f, _g = _a.isSeparatedMenu, isSeparatedMenu = _g === void 0 ? false : _g, className = _a.className, _h = _a.disableSwipe, disableSwipe = _h === void 0 ? true : _h, desktopMediaQuery = _a.desktopMediaQuery, narrowDesktopMediaQuery = _a.narrowDesktopMediaQuery, tabletMediaQuery = _a.tabletMediaQuery, mobileMediaQuery = _a.mobileMediaQuery, rest = __rest(_a, ["children", "value", "onValueChange", "size", "isSeparatedMenu", "className", "disableSwipe", "desktopMediaQuery", "narrowDesktopMediaQuery", "tabletMediaQuery", "mobileMediaQuery"]);
     var transitionTimer = useRef(null);
-    var widgetTimer = useRef(null);
     var theme = getSideMenuTheme(useContext(ThemeContext));
     var customMediaQueries = {
         isMobileQuery: mobileMediaQuery || theme.sideMenuMobileMediaQuery,
@@ -50,23 +49,19 @@ var SideMenuInner = forwardRef(function (_a, ref) {
     var isTouchScreen = isTouchDevice() || isMobile || isTablet;
     var _k = useState(isNarrowDesktop), isMinimized = _k[0], setIsMinimized = _k[1];
     var _l = useState(false), isBeingTransitioned = _l[0], setIsBeingTransitioned = _l[1];
-    var _m = useState(false), showWidget = _m[0], setShowWidget = _m[1];
-    var _o = useState(value), activeMenuItem = _o[0], setActiveMenuItem = _o[1];
-    var _p = useState(isDesktopQuery || isNarrowDesktop), isShown = _p[0], setIsShown = _p[1];
-    var _q = useState(false), isSeparatedMenuShown = _q[0], setIsSeparatedMenuShown = _q[1];
-    var _r = useState(true), isMouseOutside = _r[0], setIsMouseOutside = _r[1];
-    var _s = useState('top'), scrollState = _s[0], setScrollState = _s[1];
-    var _t = useState(false), hasScrollBar = _t[0], setHasScrollBar = _t[1];
-    var _u = useState(0), mousePositionX = _u[0], setMousePositionX = _u[1];
-    var _v = useState(0), headerHeight = _v[0], setHeaderHeight = _v[1];
+    var _m = useState(value), activeMenuItem = _m[0], setActiveMenuItem = _m[1];
+    var _o = useState(isDesktopQuery || isNarrowDesktop), isShown = _o[0], setIsShown = _o[1];
+    var _p = useState(false), isSeparatedMenuShown = _p[0], setIsSeparatedMenuShown = _p[1];
+    var _q = useState(true), isMouseOutside = _q[0], setIsMouseOutside = _q[1];
+    var _r = useState('top'), scrollState = _r[0], setScrollState = _r[1];
+    var _s = useState(false), hasScrollBar = _s[0], setHasScrollBar = _s[1];
+    var _t = useState(0), mousePositionX = _t[0], setMousePositionX = _t[1];
+    var _u = useState(0), headerHeight = _u[0], setHeaderHeight = _u[1];
     useEffect(function () {
         return function () {
             if (transitionTimer.current) {
                 clearTimeout(transitionTimer.current);
             }
-            if (widgetTimer.current) {
-                clearTimeout(widgetTimer.current);
-            }
         };
     }, []);
     useEffect(function () {
@@ -108,15 +103,8 @@ var SideMenuInner = forwardRef(function (_a, ref) {
         }
         isMouseOutside && showMinimizedRoot(false);
         setIsMouseOutside(false);
-        widgetTimer.current = setTimeout(function () {
-            setShowWidget(true);
-        }, 500);
     };
     var handleMouseLeave = function () {
-        if (widgetTimer.current) {
-            clearTimeout(widgetTimer.current);
-        }
-        setShowWidget(false);
         if (isNarrowDesktop) {
             setIsMinimized(true);
         }
@@ -155,11 +143,11 @@ var SideMenuInner = forwardRef(function (_a, ref) {
         }
     };
     var isSideMenuOverContent = (isNarrowDesktop && !isMinimized) || (isMobile && isShown) || (isTablet && isShown && !isSeparatedMenuShown);
-    var _w = useAnimateOnMount(!!isTabletOrMobile && !!isShown, burgerTransitionDuration, {
+    var _v = useAnimateOnMount(!!isTabletOrMobile && !!isShown, burgerTransitionDuration, {
         opacity: DEFAULT_THEME.sidePageBackingBgOpacity,
     }, {
         opacity: 0,
-    }), shouldShowBackdrop = _w[0], backdropStyle = _w[1];
+    }), shouldShowBackdrop = _v[0], backdropStyle = _v[1];
     var isSideMenuOverflowing = (isTabletOrMobile && isShown) || (isNarrowDesktop && !isMinimized);
     return (React.createElement(SideMenuContext.Provider, { value: {
             isMinimized: isMinimized,
@@ -167,7 +155,6 @@ var SideMenuInner = forwardRef(function (_a, ref) {
             isBeingTransitioned: isBeingTransitioned,
             isSeparatedMenu: isSeparatedMenu,
             size: size,
-            showWidget: showWidget,
             activeMenuItem: activeMenuItem,
             switchActiveMenuItem: switchActiveMenuItem,
             isDesktop: isDesktopQuery,

package/src/SideMenuContext.d.ts

@@ -10,7 +10,6 @@ export interface SideMenuContextType {
     activeMenuItem?: string | null;
     switchActiveMenuItem?: (id: string) => void;
     hasSubIcons?: boolean;
-    showWidget?: boolean;
     openedParents?: string[];
     isDesktop?: boolean;
     isNarrowDesktop?: boolean;

package/src/SideMenuHeader/SideMenuHeader.js

@@ -10,7 +10,7 @@ import { getSideMenuTheme } from '../../lib/theming/ThemeHelpers';
 import { getDOMRect } from '@skbkontur/react-ui/lib/dom/getDOMRect';
 var SideMenuHeaderInner = forwardRef(function (_a, ref) {
     var _b;
-    var className = _a.className, productLogo = _a.productLogo, konturLogo = _a.konturLogo, iconUrl = _a.iconUrl, style = _a.style, withWidget = _a.withWidget, dataTid = _a["data-tid"], rest = __rest(_a, ["className", "productLogo", "konturLogo", "iconUrl", "style", "withWidget", 'data-tid']);
+    var className = _a.className, productLogo = _a.productLogo, konturLogo = _a.konturLogo, iconUrl = _a.iconUrl, style = _a.style, _c = _a.withWidget, withWidget = _c === void 0 ? true : _c, dataTid = _a["data-tid"], rest = __rest(_a, ["className", "productLogo", "konturLogo", "iconUrl", "style", "withWidget", 'data-tid']);
     var context = useContext(SideMenuContext);
     var theme = getSideMenuTheme(useContext(ThemeContext));
     var headerWrapperRef = useRef(null);

package/src/internal/SideMenuLogotype.js

@@ -49,17 +49,11 @@ var SideMenuLogotype = forwardRef(function (_a, ref) {
             setSize(24);
         }
     }, []);
-    var getWidget = function (withWidget, isTouchScreen, isMinimizedInNarrowDesktop, showWidget) {
-        if (withWidget !== undefined) {
-            return withWidget;
-        }
-        if (isTouchScreen) {
-            return true;
-        }
-        else if (isMinimizedInNarrowDesktop) {
+    var getWidget = function (withWidget, isMinimizedInNarrowDesktop) {
+        if (isMinimizedInNarrowDesktop) {
             return false;
         }
-        return showWidget;
+        return withWidget;
     };
     var handleError = function () {
         setProductIconUrl(getStaticIconPath('kontur'));
@@ -78,7 +72,7 @@ var SideMenuLogotype = forwardRef(function (_a, ref) {
                 _d[jsStyles.logoWrapperHidden()] = context.isMinimized,
                 _d)) },
             (context.isTablet || context.isMobile) && React.createElement(Burger, null),
-            React.createElement(Logotype, __assign({ ref: refLogotype, size: size, productLogo: productLogo, konturLogo: konturLogo, withWidget: getWidget(withWidget, context.isTouchScreen, context.isMinimized && context.isNarrowDesktop, context.showWidget) }, rest)))));
+            React.createElement(Logotype, __assign({ ref: refLogotype, size: size, productLogo: productLogo, konturLogo: konturLogo, withWidget: getWidget(withWidget, context.isMinimized && context.isNarrowDesktop) }, rest)))));
 });
 SideMenuLogotype.displayName = 'SideMenuLogotype';
 var SideMenuLogotypeWithStaticFields = Object.assign(SideMenuLogotype, { __KONTUR_REACT_UI__: 'SideMenuLogotype' });