From e6f0d3e041346088df749d822f7154f60f7efa74 Mon Sep 17 00:00:00 2001 From: 07akioni <07akioni2@gmail.com> Date: Mon, 13 Jan 2020 17:12:18 +0800 Subject: [PATCH] fix(placeable): corss browser position not right (in safari) --- packages/mixins/placeable.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/mixins/placeable.js b/packages/mixins/placeable.js index 50774f417..7d1df4df8 100644 --- a/packages/mixins/placeable.js +++ b/packages/mixins/placeable.js @@ -24,16 +24,16 @@ function getActivatorRect (manuallyPositioned, x, y, trackedElement) { left: x, height: 0, width: 0, - right: window.innerWidth - x, - bottom: window.innerHeight - y + right: document.documentElement.clientWidth - x - window.pageXOffset, + bottom: document.documentElement.clientHeight - y - window.pageYOffset } } else { const activatorRect = trackedElement.getBoundingClientRect() return { - left: parseInt(activatorRect.left), - top: parseInt(activatorRect.top), - bottom: parseInt(window.innerHeight - activatorRect.bottom), - right: parseInt(window.innerWidth - activatorRect.right), + left: parseInt(activatorRect.left + window.pageXOffset), + top: parseInt(activatorRect.top + window.pageYOffset), + bottom: parseInt(document.documentElement.clientHeight - activatorRect.bottom - window.pageYOffset), + right: parseInt(document.documentElement.clientWidth - activatorRect.right - window.pageXOffset), width: parseInt(activatorRect.width), height: parseInt(activatorRect.height) }