Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
fix(OverlayTrigger): 修复嵌套弹出导致元素层级异常
  • Loading branch information
yaob421123 committed Apr 20, 2023
commit 09eea551f5a916336ab64a0bbe4703bec2e6d7ed
16 changes: 13 additions & 3 deletions packages/react-overlay-trigger/src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -251,13 +251,22 @@ export default React.forwardRef<OverlayTriggerRef, OverlayTriggerProps>((props,

function hide() {
if (!isOpen) return;
zIndex.current -= 1;
if (zIndex.current <= 999) {
zIndex.current = 999;
} else {
zIndex.current -= 1;
}
setIsOpen(false);
}

function show() {
if (isOpen) return;
zIndex.current += 1;
const nodeIndex = triggerRef.current?.style.zIndex;
if (nodeIndex) {
zIndex.current = Number(nodeIndex) + 1;
} else {
zIndex.current += 1;
}
setIsOpen(true);
}

Expand Down Expand Up @@ -305,6 +314,7 @@ export default React.forwardRef<OverlayTriggerRef, OverlayTriggerProps>((props,
Object.assign({}, child.props, {
...triggerProps,
ref: triggerRef,
style: { zIndex: zIndex.current },
className: [child.props.className, disabled ? `${prefixCls}-disabled` : null]
.filter(Boolean)
.join(' ')
Expand All @@ -326,7 +336,7 @@ export default React.forwardRef<OverlayTriggerRef, OverlayTriggerProps>((props,
Object.assign({
...overlay.props,
ref: popupRef,
className: [overlay.props && overlay.props.className, placement].filter(Boolean).join(' ').trim(),
className: ['aaa', overlay.props && overlay.props.className, placement].filter(Boolean).join(' ').trim(),
}),
)}
</Overlay>
Expand Down
2 changes: 2 additions & 0 deletions website/src/layouts/index.module.less
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
}

.layoutWrap {
position: relative;
z-index: 1;
background-color: #fff;
min-height: calc(100vh - 53px);
}
Expand Down