Revert "fix(toolbar): use helper to adjust z-index for popups (#544)"

This reverts commit d452b02.

Author: makhnatkin

src/bundle/ToolbarView.tsx

@@ -3,8 +3,6 @@ import {useLayoutEffect, useRef} from 'react';
 import type {QAProps} from '@gravity-ui/uikit';
 import {useUpdate} from 'react-use';
 
-import {LAYOUT} from 'src/common/layout';
-
 import type {ClassNameProps} from '../classname';
 import {i18n} from '../i18n/menubar';
 import {useSticky} from '../react-utils/useSticky';
@@ -67,7 +65,6 @@ export function ToolbarView<T>({
                 },
                 [className],
             )}
-            data-layout={LAYOUT.STICKY_TOOLBAR}
         >
             <FlexToolbar
                 data={toolbarConfig}

src/bundle/settings/index.tsx

@@ -15,9 +15,6 @@ import {
     type QAProps,
 } from '@gravity-ui/uikit';
 
-import {LAYOUT} from 'src/common/layout';
-import {getTargetZIndex} from 'src/utils/get-target-z-index';
-
 import {type ClassNameProps, cn} from '../../classname';
 import {i18n} from '../../i18n/bundle';
 import WysiwygModeIcon from '../../icons/WysiwygMode';
@@ -93,7 +90,6 @@ export const EditorSettings = memo<EditorSettingsProps>(function EditorSettings(
                         anchorElement={chevronElement}
                         placement={placement}
                         onOpenChange={hidePopup}
-                        zIndex={getTargetZIndex(LAYOUT.STICKY_TOOLBAR)}
                     >
                         <SettingsContent
                             {...props}
@@ -178,7 +174,6 @@ const SettingsContent: React.FC<SettingsContentProps> = function SettingsContent
                                 popoverProps={{
                                     placement: mdHelpPlacement,
                                     modal: false,
-                                    zIndex: getTargetZIndex(LAYOUT.STICKY_TOOLBAR),
                                 }}
                                 className={bContent('mode-help')}
                             >

src/bundle/toolbar/ToolbarButtonWithPopupMenu.tsx

@@ -11,9 +11,6 @@ import {
     type PopupProps,
 } from '@gravity-ui/uikit';
 
-import {LAYOUT} from 'src/common/layout';
-import {getTargetZIndex} from 'src/utils/get-target-z-index';
-
 import {cn} from '../../classname';
 import type {Action} from '../../core';
 import {groupBy, isFunction} from '../../lodash';
@@ -130,7 +127,6 @@ export const ToolbarButtonWithPopupMenu: React.FC<ToolbarButtonWithPopupMenuProp
                 onOpenChange={(open) => {
                     if (!open) hide();
                 }}
-                zIndex={getTargetZIndex(LAYOUT.STICKY_TOOLBAR)}
             >
                 <Menu size="l" qa={qaMenu} data-toolbar-menu-for={textTitle}>
                     {Object.entries(groups).map(([label, items], key) => {

src/common/layout.ts

@@ -3,9 +3,6 @@ import {Fragment, useEffect, useState} from 'react';
 import {ChevronDown} from '@gravity-ui/icons';
 import {HelpMark, Hotkey, Icon, Menu, Popover, Popup} from '@gravity-ui/uikit';
 
-import {LAYOUT} from 'src/common/layout';
-import {getTargetZIndex} from 'src/utils/get-target-z-index';
-
 import {cn} from '../classname';
 import {i18n} from '../i18n/common';
 import {isFunction} from '../lodash';
@@ -97,12 +94,7 @@ export function ToolbarListButton<E>({
             >
                 {buttonContent}
             </ToolbarButtonView>
-            <Popup
-                anchorElement={anchorElement}
-                open={popupOpen}
-                onOpenChange={hide}
-                zIndex={getTargetZIndex(LAYOUT.STICKY_TOOLBAR)}
-            >
+            <Popup anchorElement={anchorElement} open={popupOpen} onOpenChange={hide}>
                 <Menu size="l" className={b('menu')} qa={qaMenu} data-toolbar-menu-for={titleText}>
                     {data
                         .map((data) => {