Skip to content

Commit a08425b

Browse files
author
Полеводин Дмитрий Игоревич (4094029)
committed
feat: upped @gravity-ui/uikit version to latest and added zIndex prop to PopoverProps in HelpMark
1 parent 6efee79 commit a08425b

File tree

4 files changed

+62
-38
lines changed

4 files changed

+62
-38
lines changed

package-lock.json

Lines changed: 49 additions & 37 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@
233233
"@gravity-ui/prettier-config": "1.1.0",
234234
"@gravity-ui/stylelint-config": "4.0.1",
235235
"@gravity-ui/tsconfig": "1.0.0",
236-
"@gravity-ui/uikit": "7.1.1",
236+
"@gravity-ui/uikit": "7.11.0",
237237
"@playwright/experimental-ct-react": "1.49.0",
238238
"@playwright/test": "1.49.0",
239239
"@storybook/addon-docs": "8.4.1",

src/bundle/settings/index.tsx

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ import {
1515
type QAProps,
1616
} from '@gravity-ui/uikit';
1717

18+
import {getZIndexFromVariables} from 'src/utils/get-z-index-from-variables';
19+
1820
import {type ClassNameProps, cn} from '../../classname';
1921
import {i18n} from '../../i18n/bundle';
2022
import WysiwygModeIcon from '../../icons/WysiwygMode';
@@ -172,6 +174,9 @@ const SettingsContent: React.FC<SettingsContentProps> = function SettingsContent
172174
popoverProps={{
173175
placement: mdHelpPlacement,
174176
modal: false,
177+
zIndex: getZIndexFromVariables(
178+
'--md-editor-sticky-toolbar-popup-z-index',
179+
),
175180
}}
176181
className={bContent('mode-help')}
177182
>
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
export const getZIndexFromVariables = (variable: string): number => {
2+
const zIndexValue = getComputedStyle(document.documentElement)
3+
.getPropertyValue(variable)
4+
.trim();
5+
6+
return parseInt(zIndexValue, 10) || 0;
7+
};

0 commit comments

Comments
 (0)