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

Jump to bottom

feat: Tooltip support z-index manager #45422

Merged
merged 4 commits into from
Oct 20, 2023
Merged

feat: Tooltip support z-index manager #45422

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1e6c15f
feat: Tooltip support z-index manager
kiner-tang Oct 19, 2023
2294955
feat: optimize code
kiner-tang Oct 20, 2023
297f48e
Merge branch 'refactor-z-index-context' into feat-z-index-Tooltip
kiner-tang Oct 20, 2023
4edf357
Merge branch 'refactor-z-index-context' into feat-z-index-Tooltip
kiner-tang Oct 20, 2023
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
2 changes: 1 addition & 1 deletion components/tooltip/__tests__/__snapshots__/demo-extend.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1522,7 +1522,7 @@ exports[`renders components/tooltip/demo/disabled.tsx extend context correctly 1
</div>
<div
class="ant-select-dropdown ant-slide-up-appear ant-slide-up-appear-prepare ant-slide-up ant-select-dropdown-empty ant-select-dropdown-placement-bottomLeft"
style="--arrow-x: 0px; --arrow-y: 0px; left: -1000vw; top: -1000vh; box-sizing: border-box;"
style="--arrow-x: 0px; --arrow-y: 0px; left: -1000vw; top: -1000vh; box-sizing: border-box; z-index: 1120;"
>
<div>
<div
Expand Down
29 changes: 29 additions & 0 deletions components/tooltip/__tests__/tooltip.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import Group from '../../input/Group';
import Radio from '../../radio';
import Switch from '../../switch';
import { isTooltipOpen } from './util';
import { Select } from 'antd';

describe('Tooltip', () => {
mountTest(Tooltip);
Expand Down Expand Up @@ -603,4 +604,32 @@ describe('Tooltip', () => {
expect(error).toHaveBeenCalled();
error.mockRestore();
});
it('z-index should be accumulated in nested Tooltip', () => {
const options = [
{
label: 'Option 1',
value: '1',
},
{
label: 'Option 2',
value: '2',
},
];
render(
<>
<Select open options={options} popupClassName="select0" />
<Tooltip open title="test1" rootClassName="test1">
<Select open options={options} popupClassName="select1" />
<Tooltip open title="test2" rootClassName="test2">
<Select open options={options} popupClassName="select2" />
</Tooltip>
</Tooltip>
</>,
);
expect((document.querySelector('.test1') as HTMLDivElement)!.style.zIndex).toBeFalsy();
expect((document.querySelector('.test2') as HTMLDivElement)!.style.zIndex).toBe('2140');
expect((document.querySelector('.select0') as HTMLDivElement)!.style.zIndex).toBeFalsy();
expect((document.querySelector('.select1') as HTMLDivElement)!.style.zIndex).toBe('1120');
expect((document.querySelector('.select2') as HTMLDivElement)!.style.zIndex).toBe('2190');
});
});
60 changes: 34 additions & 26 deletions components/tooltip/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,14 @@ import useMergedState from 'rc-util/lib/hooks/useMergedState';

import type { PresetColorType } from '../_util/colors';
import type { RenderFunction } from '../_util/getRenderPropValue';
import { useZIndex } from '../_util/hooks/useZIndex';
import { getTransitionName } from '../_util/motion';
import type { AdjustOverflow, PlacementsConfig } from '../_util/placements';
import getPlacements from '../_util/placements';
import { cloneElement, isFragment, isValidElement } from '../_util/reactNode';
import type { LiteralUnion } from '../_util/type';
import { devUseWarning } from '../_util/warning';
import zIndexContext from '../_util/zindexContext';
import { ConfigContext } from '../config-provider';
import { NoCompactStyle } from '../space/Compact';
import { useToken } from '../theme/internal';
Expand Down Expand Up @@ -292,33 +294,39 @@ const Tooltip = React.forwardRef<TooltipRef, TooltipProps>((props, ref) => {
hashId,
);

// ============================ zIndex ============================
const [zIndex, contextZIndex] = useZIndex('Tooltip', otherProps.zIndex);

return wrapSSR(
<RcTooltip
{...otherProps}
showArrow={mergedShowArrow}
placement={placement}
mouseEnterDelay={mouseEnterDelay}
mouseLeaveDelay={mouseLeaveDelay}
prefixCls={prefixCls}
overlayClassName={customOverlayClassName}
overlayStyle={{ ...arrowContentStyle, ...overlayStyle }}
getTooltipContainer={getPopupContainer || getTooltipContainer || getContextPopupContainer}
ref={tooltipRef}
builtinPlacements={tooltipPlacements}
overlay={memoOverlayWrapper}
visible={tempOpen}
onVisibleChange={onOpenChange}
afterVisibleChange={afterOpenChange ?? afterVisibleChange}
overlayInnerStyle={formattedOverlayInnerStyle}
arrowContent={<span className={`${prefixCls}-arrow-content`} />}
motion={{
motionName: getTransitionName(rootPrefixCls, 'zoom-big-fast', props.transitionName),
motionDeadline: 1000,
}}
destroyTooltipOnHide={!!destroyTooltipOnHide}
>
{tempOpen ? cloneElement(child, { className: childCls }) : child}
</RcTooltip>,
<zIndexContext.Provider value={injectFromPopover ? undefined : contextZIndex}>
kiner-tang marked this conversation as resolved.
Show resolved Hide resolved
<RcTooltip
{...otherProps}
zIndex={zIndex}
showArrow={mergedShowArrow}
placement={placement}
mouseEnterDelay={mouseEnterDelay}
mouseLeaveDelay={mouseLeaveDelay}
prefixCls={prefixCls}
overlayClassName={customOverlayClassName}
overlayStyle={{ ...arrowContentStyle, ...overlayStyle }}
getTooltipContainer={getPopupContainer || getTooltipContainer || getContextPopupContainer}
ref={tooltipRef}
builtinPlacements={tooltipPlacements}
overlay={memoOverlayWrapper}
visible={tempOpen}
onVisibleChange={onOpenChange}
afterVisibleChange={afterOpenChange ?? afterVisibleChange}
overlayInnerStyle={formattedOverlayInnerStyle}
arrowContent={<span className={`${prefixCls}-arrow-content`} />}
motion={{
motionName: getTransitionName(rootPrefixCls, 'zoom-big-fast', props.transitionName),
motionDeadline: 1000,
}}
destroyTooltipOnHide={!!destroyTooltipOnHide}
>
{tempOpen ? cloneElement(child, { className: childCls }) : child}
</RcTooltip>
</zIndexContext.Provider>,
);
}) as React.ForwardRefExoticComponent<
React.PropsWithoutRef<TooltipProps> & React.RefAttributes<unknown>
Expand Down
Loading