Merge branch 'master' into dataViz-annotations

1 files changed, 6 insertions, 10 deletions

diff --git a/src/fields/Doc.ts b/src/fields/Doc.ts
index 9e3eb28f9..feacdc9c5 100644
--- a/src/fields/Doc.ts
+++ b/src/fields/Doc.ts
@@ -687,16 +687,12 @@ export namespace Doc {
      */
     export function ComputeContentBounds(docList: Doc[]) {
         const bounds = docList.reduce(
-            (bounds, doc) => {
-                const [sptX, sptY] = [NumCast(doc.x), NumCast(doc.y)];
-                const [bptX, bptY] = [sptX + doc[Width](), sptY + doc[Height]()];
-                return {
-                    x: Math.min(sptX, bounds.x),
-                    y: Math.min(sptY, bounds.y),
-                    r: Math.max(bptX, bounds.r),
-                    b: Math.max(bptY, bounds.b),
-                };
-            },
+            (bounds, doc) => ({
+                x: Math.min(NumCast(doc.x), bounds.x),
+                y: Math.min(NumCast(doc.y), bounds.y),
+                r: Math.max(NumCast(doc.x) + doc[Width](), bounds.r),
+                b: Math.max(NumCast(doc.y) + doc[Height](), bounds.b),
+            }),
             { x: Number.MAX_VALUE, y: Number.MAX_VALUE, r: -Number.MAX_VALUE, b: -Number.MAX_VALUE }
         );
         return bounds;