Skip to content

Commit aacb6f8

Browse files
authored
fix: popup zIndex 设置错误 (#315)
1 parent a7992a6 commit aacb6f8

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@
176176
"start-server-and-test": "^1.14.0",
177177
"tdesign-icons-view": "^0.0.1",
178178
"tdesign-publish-cli": "^0.0.9",
179-
"tdesign-site-components": "~0.5.44",
179+
"tdesign-site-components": "~0.5.52",
180180
"ts-jest": "^27.1.2",
181181
"ts-morph": "^13.0.02",
182182
"ts-node": "^10.4.0",

site/src/App.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ function Components(props) {
8585
<td-doc-aside ref={tdDocAsideRef} title="React for Web">
8686
{versionOptions.length ? (
8787
<div slot="extra">
88-
<Select value={version} options={versionOptions} onChange={changeVersion} />
88+
<Select popupProps={{ zIndex: 800 }} value={version} options={versionOptions} onChange={changeVersion} />
8989
</div>
9090
) : null}
9191
</td-doc-aside>

src/popup/Popup.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,9 @@ const Popup = forwardRef<HTMLDivElement, PopupProps>((props, ref) => {
119119
const { styles, attributes } = popperRef.current;
120120

121121
const defaultStyles = useMemo(() => {
122-
if (triggerRef && typeof overlayStyle === 'function') return { ...overlayStyle(triggerRef), zIndex };
123-
return { ...overlayStyle, zIndex };
124-
}, [overlayStyle, zIndex, triggerRef]);
122+
if (triggerRef && typeof overlayStyle === 'function') return { ...overlayStyle(triggerRef) };
123+
return { ...overlayStyle };
124+
}, [overlayStyle, triggerRef]);
125125

126126
// 设置 style 决定展示与隐藏
127127
const overlayVisibleStyle: CSSProperties = defaultStyles;
@@ -165,7 +165,7 @@ const Popup = forwardRef<HTMLDivElement, PopupProps>((props, ref) => {
165165
<CSSTransition in={visible} appear {...cssTransitionState.props}>
166166
<div
167167
ref={composeRefs(setOverlayRef, ref)}
168-
style={styles.popper}
168+
style={{ ...styles.popper, zIndex }}
169169
className={`${classPrefix}-popup`}
170170
{...attributes.popper}
171171
{...popupProps}

0 commit comments

Comments
 (0)