From 1f549e4a26cb28d2549504ba1294c8137cf81b8f Mon Sep 17 00:00:00 2001 From: Emily Huang Date: Mon, 27 Mar 2023 11:23:05 -0400 Subject: [PATCH] Return null position instead of using assertNotNull --- packages/iris-grid/src/IrisGridRenderer.ts | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/iris-grid/src/IrisGridRenderer.ts b/packages/iris-grid/src/IrisGridRenderer.ts index 0f3b9c31d2..96927440b9 100644 --- a/packages/iris-grid/src/IrisGridRenderer.ts +++ b/packages/iris-grid/src/IrisGridRenderer.ts @@ -1005,7 +1005,7 @@ class IrisGridRenderer extends GridRenderer { height: number | null; } { const NULL_POSITION = { left: null, top: null, width: null, height: null }; - if (mouseX == null || mouseY == null || !metrics) { + if (mouseX == null || mouseY == null || metrics == null) { return NULL_POSITION; } const { rowHeight, columnWidth, left, top } = GridUtils.getCellInfoFromXY( @@ -1014,9 +1014,10 @@ class IrisGridRenderer extends GridRenderer { metrics ); - assertNotNull(left); - assertNotNull(columnWidth); - assertNotNull(top); + if (left == null || columnWidth == null || top == null) { + return NULL_POSITION; + } + const { width: gridWidth, verticalBarWidth } = metrics; const { cellHorizontalPadding } = theme;