From 6be8f53b5851b87d6e393161a9442db216c241fb Mon Sep 17 00:00:00 2001
From: Constance Chen <constance.chen.3@gmail.com>
Date: Tue, 21 Sep 2021 15:30:02 -0700
Subject: [PATCH] [Fix] Fix console error when dragging to reorder columns

---
 src/components/datagrid/column_selector.tsx | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/components/datagrid/column_selector.tsx b/src/components/datagrid/column_selector.tsx
index d3210fdd23e..f87f152d130 100644
--- a/src/components/datagrid/column_selector.tsx
+++ b/src/components/datagrid/column_selector.tsx
@@ -94,13 +94,15 @@ export const useDataGridColumnSelector = (
     source: { index: sourceIndex },
     destination,
   }: DropResult) {
-    const destinationIndex = destination!.index;
-    const nextSortedColumns = euiDragDropReorder(
-      sortedColumns,
-      sourceIndex,
-      destinationIndex
-    );
-    setColumns(nextSortedColumns);
+    if (destination) {
+      const destinationIndex = destination.index;
+      const nextSortedColumns = euiDragDropReorder(
+        sortedColumns,
+        sourceIndex,
+        destinationIndex
+      );
+      setColumns(nextSortedColumns);
+    }
   }
 
   const numberOfHiddenFields = availableColumns.length - visibleColumns.length;