Merge 732bc66d68
into 0884605b62
This commit is contained in:
commit
f825cca4bc
|
@ -39,6 +39,10 @@ export function calcPopupPosition(el: HTMLElement, props: {
|
||||||
left = window.innerWidth - contentWidth + window.scrollX - 1;
|
left = window.innerWidth - contentWidth + window.scrollX - 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (left < window.scrollX) {
|
||||||
|
left = window.scrollX;
|
||||||
|
}
|
||||||
|
|
||||||
return [left, top];
|
return [left, top];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -60,6 +64,10 @@ export function calcPopupPosition(el: HTMLElement, props: {
|
||||||
left = window.innerWidth - contentWidth + window.scrollX - 1;
|
left = window.innerWidth - contentWidth + window.scrollX - 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (left < window.scrollX) {
|
||||||
|
left = window.scrollX;
|
||||||
|
}
|
||||||
|
|
||||||
return [left, top];
|
return [left, top];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -81,6 +89,10 @@ export function calcPopupPosition(el: HTMLElement, props: {
|
||||||
top = window.innerHeight - contentHeight + window.scrollY - 1;
|
top = window.innerHeight - contentHeight + window.scrollY - 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (left < window.scrollX) {
|
||||||
|
left = window.scrollX;
|
||||||
|
}
|
||||||
|
|
||||||
return [left, top];
|
return [left, top];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -110,6 +122,10 @@ export function calcPopupPosition(el: HTMLElement, props: {
|
||||||
top = window.innerHeight - contentHeight + window.scrollY - 1;
|
top = window.innerHeight - contentHeight + window.scrollY - 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (left < window.scrollX) {
|
||||||
|
left = window.scrollX;
|
||||||
|
}
|
||||||
|
|
||||||
return [left, top];
|
return [left, top];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue