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

fix(select-input): fix select-input popup content width calculation problem #2647

Merged
merged 2 commits into from
Dec 6, 2023
Merged

fix(select-input): fix select-input popup content width calculation problem #2647

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b845d2d
fix(select-input): fix select-input popup content width calculation p…
HaixingOoO Dec 5, 2023
30ea5ee
fix(select-input): fix select-input can't get width
HaixingOoO Dec 5, 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
25 changes: 20 additions & 5 deletions src/select-input/useOverlayInnerStyle.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,27 @@ export default function useOverlayInnerStyle(

const matchWidthFunc = (triggerElement: HTMLElement, popupElement: HTMLElement) => {
if (!triggerElement || !popupElement) return;
// 避免因滚动条出现文本省略，预留宽度 8
const SCROLLBAR_WIDTH = popupElement.scrollHeight > popupElement.offsetHeight ? 8 : 0;

// 设置display来可以获取popupElement的宽度
// eslint-disable-next-line no-param-reassign
popupElement.style.display = '';
// popupElement的scrollBar宽度
const overlayScrollWidth = popupElement.offsetWidth - popupElement.scrollWidth;

/**
* issue：https://github.com/Tencent/tdesign-react/issues/2642
*
* popupElement的内容宽度不超过triggerElement的宽度，就使用triggerElement的宽度减去popup的滚动条宽度，
* 让popupElement的宽度加上scrollBar的宽度等于triggerElement的宽度；
*
* popupElement的内容宽度超过triggerElement的宽度，就使用popupElement的scrollWidth，
* 不用offsetWidth是会包含scrollBar的宽度
*/
const width =
popupElement.offsetWidth + SCROLLBAR_WIDTH >= triggerElement.offsetWidth
? popupElement.offsetWidth
: triggerElement.offsetWidth;
popupElement.offsetWidth - overlayScrollWidth > triggerElement.offsetWidth
? popupElement.scrollWidth
: triggerElement.offsetWidth - overlayScrollWidth;

let otherOverlayInnerStyle: React.CSSProperties = {};
if (popupProps && typeof popupProps.overlayInnerStyle === 'object' && !popupProps.overlayInnerStyle.width) {
otherOverlayInnerStyle = popupProps.overlayInnerStyle;
Expand Down
Loading