Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(Popper): add support of prop zIndex #8091

Merged
merged 2 commits into from
Dec 17, 2024
Merged

fix(Popper): add support of prop zIndex #8091

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5cad355
feat(Popper): add support of prop zIndex
EldarMuhamethanov Dec 17, 2024
80de259
fix(Popper): make with mergeStyle
EldarMuhamethanov Dec 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions packages/vkui/src/components/Popper/Popper.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
'use client';

import * as React from 'react';
import { mergeStyle } from '../../helpers/mergeStyle';
import { useExternRef } from '../../hooks/useExternRef';
import {
autoUpdateFloatingElement,
Expand Down Expand Up @@ -113,6 +114,8 @@
children,
usePortal = true,
onPlacementChange,
zIndex,
style,
...restProps
}: PopperProps): React.ReactNode => {
const [arrowRef, setArrowRef] = React.useState<HTMLDivElement | null>(null);
Expand Down Expand Up @@ -159,9 +162,17 @@
refs.setReference('current' in targetRef ? targetRef.current : targetRef);
}, [refs.setReference, targetRef]);

const dropdownStyle =
typeof zIndex !== 'undefined'
? {

Check warning on line 167 in packages/vkui/src/components/Popper/Popper.tsx

View check run for this annotation

Codecov / codecov/patch

packages/vkui/src/components/Popper/Popper.tsx#L167 

Added line #L167 was not covered by tests
zIndex,
}
: undefined;

const dropdown = (
<RootComponent
{...restProps}
style={mergeStyle(dropdownStyle, style)}
baseClassName={styles.host}
getRootRef={handleRootRef}
baseStyle={convertFloatingDataToReactCSSProperties(
Expand Down
Loading