fix(positioning): browser rounding width/height bug (valor-software#4328

) fix valor-software#4322
leo6104 · Oct 10, 2019 · d1e5e06 · d1e5e06
1 parent d907b05
commit d1e5e06
Showing 1 changed file with 25 additions and 24 deletions.
diff --git a/src/positioning/ng-positioning.ts b/src/positioning/ng-positioning.ts
@@ -94,22 +94,6 @@ export class Positioning {
       ? this.offset(hostElement, false)
       : this.position(hostElement, false);
     const targetElStyles = this.getAllStyles(targetElement);
-    const shiftWidth: any = {
-      left: hostElPosition.left,
-      center:
-        hostElPosition.left +
-        hostElPosition.width / 2 -
-        targetElement.offsetWidth / 2,
-      right: hostElPosition.left + hostElPosition.width
-    };
-    const shiftHeight: any = {
-      top: hostElPosition.top,
-      center:
-        hostElPosition.top +
-        hostElPosition.height / 2 -
-        targetElement.offsetHeight / 2,
-      bottom: hostElPosition.top + hostElPosition.height
-    };
     const targetElBCR = targetElement.getBoundingClientRect();
     let placementPrimary = placement.split(' ')[0] || 'top';
     const placementSecondary = placement.split(' ')[1] || 'center';
@@ -123,6 +107,23 @@ export class Positioning {
       right: targetElBCR.width || targetElement.offsetWidth
     };
 
+    const shiftHeight: any = {
+      top: hostElPosition.top,
+      center:
+        hostElPosition.top +
+        hostElPosition.height / 2 -
+        targetElPosition.height / 2,
+      bottom: hostElPosition.top + hostElPosition.height
+    };
+    const shiftWidth: any = {
+      left: hostElPosition.left,
+      center:
+        hostElPosition.left +
+        hostElPosition.width / 2 -
+        targetElPosition.width / 2,
+      right: hostElPosition.left + hostElPosition.width
+    };    
+
     if (placementPrimary === 'auto') {
       let newPlacementPrimary = this.autoPosition(
         targetElPosition,
@@ -144,10 +145,10 @@ export class Positioning {
       case 'top':
         targetElPosition.top =
           hostElPosition.top -
-          (targetElement.offsetHeight +
+          (targetElPosition.height +
             parseFloat(targetElStyles.marginBottom));
         targetElPosition.bottom +=
-          hostElPosition.top - targetElement.offsetHeight;
+          hostElPosition.top - targetElPosition.height;
         targetElPosition.left = shiftWidth[placementSecondary];
         targetElPosition.right += shiftWidth[placementSecondary];
         break;
@@ -162,9 +163,9 @@ export class Positioning {
         targetElPosition.bottom += shiftHeight[placementSecondary];
         targetElPosition.left =
           hostElPosition.left -
-          (targetElement.offsetWidth + parseFloat(targetElStyles.marginRight));
+          (targetElPosition.width + parseFloat(targetElStyles.marginRight));
         targetElPosition.right +=
-          hostElPosition.left - targetElement.offsetWidth;
+          hostElPosition.left - targetElPosition.width;
         break;
       case 'right':
         targetElPosition.top = shiftHeight[placementSecondary];
@@ -190,28 +191,28 @@ export class Positioning {
   ) {
     if (
       (!preferredPosition || preferredPosition === 'right') &&
-      targetElPosition.left + hostElPosition.left - targetElement.offsetWidth <
+      targetElPosition.left + hostElPosition.left - targetElPosition.width <
         0
     ) {
       return 'right';
     } else if (
       (!preferredPosition || preferredPosition === 'top') &&
       targetElPosition.bottom +
         hostElPosition.bottom +
-        targetElement.offsetHeight >
+        targetElPosition.height >
         window.innerHeight
     ) {
       return 'top';
     } else if (
       (!preferredPosition || preferredPosition === 'bottom') &&
-      targetElPosition.top + hostElPosition.top - targetElement.offsetHeight < 0
+      targetElPosition.top + hostElPosition.top - targetElPosition.height < 0
     ) {
       return 'bottom';
     } else if (
       (!preferredPosition || preferredPosition === 'left') &&
       targetElPosition.right +
         hostElPosition.right +
-        targetElement.offsetWidth >
+        targetElPosition.width >
         window.innerWidth
     ) {
       return 'left';