@carbon/ibm-products 2.0.0-rc.3 → 2.0.0-rc.32

package/es/components/DataSpreadsheet/utils/handleActiveCellInSelectionEnter.js

@@ -1,42 +1,35 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
 /**
  * Copyright IBM Corp. 2022, 2022
  *
  * This source code is licensed under the Apache-2.0 license found in the
  * LICENSE file in the root directory of this source tree.
  */
+
 import { getSelectionAreaPoints } from './getSelectionAreaPoints';
 export var handleActiveCellInSelectionEnter = function handleActiveCellInSelectionEnter(_ref) {
   var activeCellInsideSelectionArea = _ref.activeCellInsideSelectionArea,
-      activeCellCoordinates = _ref.activeCellCoordinates,
-      activeCellRef = _ref.activeCellRef,
-      selectionAreas = _ref.selectionAreas,
-      updateActiveCellCoordinates = _ref.updateActiveCellCoordinates;
-
+    activeCellCoordinates = _ref.activeCellCoordinates,
+    activeCellRef = _ref.activeCellRef,
+    selectionAreas = _ref.selectionAreas,
+    updateActiveCellCoordinates = _ref.updateActiveCellCoordinates;
   if (!activeCellInsideSelectionArea) {
     return;
   }
-
   var activeCellSelectionId = activeCellRef.current.getAttribute('data-selection-id');
   var activeCellIndexInSelectionAreas = selectionAreas.findIndex(function (item) {
     return item.matcher === activeCellSelectionId;
   });
   var selectionAreaToNavigate = selectionAreas[activeCellIndexInSelectionAreas];
-
   var _getSelectionAreaPoin = getSelectionAreaPoints(selectionAreaToNavigate),
-      lowestColumnIndex = _getSelectionAreaPoin.lowestColumnIndex,
-      lowestRowIndex = _getSelectionAreaPoin.lowestRowIndex,
-      greatestColumnIndex = _getSelectionAreaPoin.greatestColumnIndex,
-      greatestRowIndex = _getSelectionAreaPoin.greatestRowIndex; // Move active cell down one row if possible
-
-
+    lowestColumnIndex = _getSelectionAreaPoin.lowestColumnIndex,
+    lowestRowIndex = _getSelectionAreaPoin.lowestRowIndex,
+    greatestColumnIndex = _getSelectionAreaPoin.greatestColumnIndex,
+    greatestRowIndex = _getSelectionAreaPoin.greatestRowIndex;
+  // Move active cell down one row if possible
   var coordinatesClone = _objectSpread({}, activeCellCoordinates);
-
   if ((activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row) < greatestRowIndex) {
     updateActiveCellCoordinates({
       coords: coordinatesClone,
@@ -45,11 +38,10 @@ export var handleActiveCellInSelectionEnter = function handleActiveCellInSelecti
       },
       optOutOfSelectionAreaUpdate: true
     });
-  } // Move active cell to next column of selection area if it exists
+  }
+  // Move active cell to next column of selection area if it exists
   // If not, find the next selection area and update active cell to
   // be the first cell in that selection
-
-
   if ((activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row) === greatestRowIndex) {
     if ((activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column) < greatestColumnIndex) {
       updateActiveCellCoordinates({
@@ -60,21 +52,18 @@ export var handleActiveCellInSelectionEnter = function handleActiveCellInSelecti
         },
         optOutOfSelectionAreaUpdate: true
       });
-    } // Move to next selection area if there is one, or back to
+    }
+    // Move to next selection area if there is one, or back to
     // the beginning of the current selection
-
-
     if ((activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column) === greatestColumnIndex) {
       if (selectionAreas.length > 1) {
         if (selectionAreas[activeCellIndexInSelectionAreas + 1]) {
           // Update activeCellRef data-selection-id attribute to the matcher of the next selection area
           activeCellRef.current.setAttribute('data-selection-id', selectionAreas[activeCellIndexInSelectionAreas + 1].matcher);
           var nextSelectionArea = selectionAreas[activeCellIndexInSelectionAreas + 1];
-
           var _getSelectionAreaPoin2 = getSelectionAreaPoints(nextSelectionArea),
-              _lowestColumnIndex = _getSelectionAreaPoin2.lowestColumnIndex,
-              _lowestRowIndex = _getSelectionAreaPoin2.lowestRowIndex;
-
+            _lowestColumnIndex = _getSelectionAreaPoin2.lowestColumnIndex,
+            _lowestRowIndex = _getSelectionAreaPoin2.lowestRowIndex;
           updateActiveCellCoordinates({
             coords: coordinatesClone,
             updatedValue: {
@@ -89,11 +78,9 @@ export var handleActiveCellInSelectionEnter = function handleActiveCellInSelecti
           // So we need to move the active cell to the first cell in the first selection area
           activeCellRef.current.setAttribute('data-selection-id', selectionAreas[0].matcher);
           var firstSelectionArea = selectionAreas[0];
-
           var _getSelectionAreaPoin3 = getSelectionAreaPoints(firstSelectionArea),
-              _lowestColumnIndex2 = _getSelectionAreaPoin3.lowestColumnIndex,
-              _lowestRowIndex2 = _getSelectionAreaPoin3.lowestRowIndex;
-
+            _lowestColumnIndex2 = _getSelectionAreaPoin3.lowestColumnIndex,
+            _lowestRowIndex2 = _getSelectionAreaPoin3.lowestRowIndex;
           updateActiveCellCoordinates({
             coords: coordinatesClone,
             updatedValue: {
@@ -103,9 +90,8 @@ export var handleActiveCellInSelectionEnter = function handleActiveCellInSelecti
             optOutOfSelectionAreaUpdate: true
           });
         }
-      } // Only one selection area, go back to first cell in the selection
-
-
+      }
+      // Only one selection area, go back to first cell in the selection
       if (selectionAreas.length === 1) {
         return updateActiveCellCoordinates({
           coords: coordinatesClone,

package/es/components/DataSpreadsheet/utils/handleActiveCellInSelectionTab.js

@@ -4,31 +4,28 @@
  * This source code is licensed under the Apache-2.0 license found in the
  * LICENSE file in the root directory of this source tree.
  */
+
 import { getSelectionAreaPoints } from './getSelectionAreaPoints';
 export var handleActiveCellInSelectionTab = function handleActiveCellInSelectionTab(_ref) {
   var activeCellInsideSelectionArea = _ref.activeCellInsideSelectionArea,
-      activeCellCoordinates = _ref.activeCellCoordinates,
-      activeCellRef = _ref.activeCellRef,
-      selectionAreas = _ref.selectionAreas,
-      updateActiveCellCoordinates = _ref.updateActiveCellCoordinates;
-
+    activeCellCoordinates = _ref.activeCellCoordinates,
+    activeCellRef = _ref.activeCellRef,
+    selectionAreas = _ref.selectionAreas,
+    updateActiveCellCoordinates = _ref.updateActiveCellCoordinates;
   if (!activeCellInsideSelectionArea) {
     return;
   }
-
   var activeCellSelectionId = activeCellRef.current.getAttribute('data-selection-id');
   var activeCellIndexInSelectionAreas = selectionAreas.findIndex(function (item) {
     return item.matcher === activeCellSelectionId;
   });
   var selectionAreaToNavigate = selectionAreas[activeCellIndexInSelectionAreas];
-
   var _getSelectionAreaPoin = getSelectionAreaPoints(selectionAreaToNavigate),
-      lowestColumnIndex = _getSelectionAreaPoin.lowestColumnIndex,
-      lowestRowIndex = _getSelectionAreaPoin.lowestRowIndex,
-      greatestColumnIndex = _getSelectionAreaPoin.greatestColumnIndex,
-      greatestRowIndex = _getSelectionAreaPoin.greatestRowIndex; // Move active cell to next column in selection area
-
-
+    lowestColumnIndex = _getSelectionAreaPoin.lowestColumnIndex,
+    lowestRowIndex = _getSelectionAreaPoin.lowestRowIndex,
+    greatestColumnIndex = _getSelectionAreaPoin.greatestColumnIndex,
+    greatestRowIndex = _getSelectionAreaPoin.greatestRowIndex;
+  // Move active cell to next column in selection area
   if ((activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column) < greatestColumnIndex) {
     updateActiveCellCoordinates({
       updatedValue: {
@@ -36,11 +33,10 @@ export var handleActiveCellInSelectionTab = function handleActiveCellInSelection
       },
       optOutOfSelectionAreaUpdate: true
     });
-  } // Move active cell to next row of selection area if it exists
+  }
+  // Move active cell to next row of selection area if it exists
   // If not, find the next selection area and update active cell to
   // be the first cell in that selection
-
-
   if ((activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column) === greatestColumnIndex) {
     if ((activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row) < greatestRowIndex) {
       updateActiveCellCoordinates({
@@ -50,21 +46,18 @@ export var handleActiveCellInSelectionTab = function handleActiveCellInSelection
         },
         optOutOfSelectionAreaUpdate: true
       });
-    } // Move to next selection area if there is on, or back to
+    }
+    // Move to next selection area if there is on, or back to
     // the beginning of the current selection
-
-
     if ((activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row) === greatestRowIndex) {
       if (selectionAreas.length > 1) {
         if (selectionAreas[activeCellIndexInSelectionAreas + 1]) {
           // Update activeCellRef data-selection-id attribute to the matcher of the next selection area
           activeCellRef.current.setAttribute('data-selection-id', selectionAreas[activeCellIndexInSelectionAreas + 1].matcher);
           var nextSelectionArea = selectionAreas[activeCellIndexInSelectionAreas + 1];
-
           var _getSelectionAreaPoin2 = getSelectionAreaPoints(nextSelectionArea),
-              _lowestColumnIndex = _getSelectionAreaPoin2.lowestColumnIndex,
-              _lowestRowIndex = _getSelectionAreaPoin2.lowestRowIndex;
-
+            _lowestColumnIndex = _getSelectionAreaPoin2.lowestColumnIndex,
+            _lowestRowIndex = _getSelectionAreaPoin2.lowestRowIndex;
           updateActiveCellCoordinates({
             updatedValue: {
               column: _lowestColumnIndex,
@@ -78,11 +71,9 @@ export var handleActiveCellInSelectionTab = function handleActiveCellInSelection
           // So we need to move the active cell to the first cell in the first selection area
           activeCellRef.current.setAttribute('data-selection-id', selectionAreas[0].matcher);
           var firstSelectionArea = selectionAreas[0];
-
           var _getSelectionAreaPoin3 = getSelectionAreaPoints(firstSelectionArea),
-              _lowestColumnIndex2 = _getSelectionAreaPoin3.lowestColumnIndex,
-              _lowestRowIndex2 = _getSelectionAreaPoin3.lowestRowIndex;
-
+            _lowestColumnIndex2 = _getSelectionAreaPoin3.lowestColumnIndex,
+            _lowestRowIndex2 = _getSelectionAreaPoin3.lowestRowIndex;
           updateActiveCellCoordinates({
             updatedValue: {
               column: _lowestColumnIndex2,
@@ -91,9 +82,8 @@ export var handleActiveCellInSelectionTab = function handleActiveCellInSelection
             optOutOfSelectionAreaUpdate: true
           });
         }
-      } // Only one selection area, go back to first cell in the selection
-
-
+      }
+      // Only one selection area, go back to first cell in the selection
       if (selectionAreas.length === 1) {
         return updateActiveCellCoordinates({
           updatedValue: {

package/es/components/DataSpreadsheet/utils/handleCellDeletion.js

@@ -4,23 +4,32 @@
  * This source code is licensed under the Apache-2.0 license found in the
  * LICENSE file in the root directory of this source tree.
  */
+
 import { deepCloneObject } from '../../../global/js/utils/deepCloneObject';
 import { rangeWithCallback } from '../../../global/js/utils/rangeWithCallback';
 export var handleCellDeletion = function handleCellDeletion(_ref) {
-  var selectionAreas = _ref.selectionAreas,
-      currentMatcher = _ref.currentMatcher,
-      rows = _ref.rows,
-      setActiveCellContent = _ref.setActiveCellContent,
-      updateData = _ref.updateData;
+  var _selectionAreaToEmpty, _selectionAreaToEmpty2, _selectionAreaToEmpty3, _selectionAreaToEmpty4, _selectionAreaToEmpty5, _selectionAreaToEmpty6, _selectionAreaToEmpty7, _selectionAreaToEmpty8;
+  var activeCellCoordinates = _ref.activeCellCoordinates,
+    selectionAreas = _ref.selectionAreas,
+    currentMatcher = _ref.currentMatcher,
+    rows = _ref.rows,
+    setActiveCellContent = _ref.setActiveCellContent,
+    updateData = _ref.updateData;
+  // This means that the delete key has been pressed when the active cell is in a header,
+  // not within the spreadsheet body. To delete an entire row/column, it must first be
+  // selected, and then can be deleted.
+  if ((activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column) === 'header' || (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row) === 'header') {
+    return;
+  }
   var selectionAreaClone = deepCloneObject(selectionAreas);
   var indexOfCurrentSelectionArea = selectionAreaClone.findIndex(function (item) {
     return item.matcher === currentMatcher;
   });
   var selectionAreaToEmptyContents = selectionAreaClone[indexOfCurrentSelectionArea];
-  var lowestColumnIndex = Math.min(selectionAreaToEmptyContents.point1.column, selectionAreaToEmptyContents.point2.column);
-  var greatestColumnIndex = Math.max(selectionAreaToEmptyContents.point1.column, selectionAreaToEmptyContents.point2.column);
-  var lowestRowIndex = Math.min(selectionAreaToEmptyContents.point1.row, selectionAreaToEmptyContents.point2.row);
-  var greatestRowIndex = Math.max(selectionAreaToEmptyContents.point1.row, selectionAreaToEmptyContents.point2.row);
+  var lowestColumnIndex = Math.min(selectionAreaToEmptyContents === null || selectionAreaToEmptyContents === void 0 ? void 0 : (_selectionAreaToEmpty = selectionAreaToEmptyContents.point1) === null || _selectionAreaToEmpty === void 0 ? void 0 : _selectionAreaToEmpty.column, selectionAreaToEmptyContents === null || selectionAreaToEmptyContents === void 0 ? void 0 : (_selectionAreaToEmpty2 = selectionAreaToEmptyContents.point2) === null || _selectionAreaToEmpty2 === void 0 ? void 0 : _selectionAreaToEmpty2.column);
+  var greatestColumnIndex = Math.max(selectionAreaToEmptyContents === null || selectionAreaToEmptyContents === void 0 ? void 0 : (_selectionAreaToEmpty3 = selectionAreaToEmptyContents.point1) === null || _selectionAreaToEmpty3 === void 0 ? void 0 : _selectionAreaToEmpty3.column, selectionAreaToEmptyContents === null || selectionAreaToEmptyContents === void 0 ? void 0 : (_selectionAreaToEmpty4 = selectionAreaToEmptyContents.point2) === null || _selectionAreaToEmpty4 === void 0 ? void 0 : _selectionAreaToEmpty4.column);
+  var lowestRowIndex = Math.min(selectionAreaToEmptyContents === null || selectionAreaToEmptyContents === void 0 ? void 0 : (_selectionAreaToEmpty5 = selectionAreaToEmptyContents.point1) === null || _selectionAreaToEmpty5 === void 0 ? void 0 : _selectionAreaToEmpty5.row, selectionAreaToEmptyContents === null || selectionAreaToEmptyContents === void 0 ? void 0 : (_selectionAreaToEmpty6 = selectionAreaToEmptyContents.point2) === null || _selectionAreaToEmpty6 === void 0 ? void 0 : _selectionAreaToEmpty6.row);
+  var greatestRowIndex = Math.max(selectionAreaToEmptyContents === null || selectionAreaToEmptyContents === void 0 ? void 0 : (_selectionAreaToEmpty7 = selectionAreaToEmptyContents.point1) === null || _selectionAreaToEmpty7 === void 0 ? void 0 : _selectionAreaToEmpty7.row, selectionAreaToEmptyContents === null || selectionAreaToEmptyContents === void 0 ? void 0 : (_selectionAreaToEmpty8 = selectionAreaToEmptyContents.point2) === null || _selectionAreaToEmpty8 === void 0 ? void 0 : _selectionAreaToEmpty8.row);
   rangeWithCallback(lowestColumnIndex, greatestColumnIndex, function (columnIndex) {
     rangeWithCallback(lowestRowIndex, greatestRowIndex, function (rowIndex) {
       var cellProps = rows[rowIndex].cells[columnIndex];

package/es/components/DataSpreadsheet/utils/handleEditSubmit.js

@@ -1,43 +1,39 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
 /**
  * Copyright IBM Corp. 2022, 2022
  *
  * This source code is licensed under the Apache-2.0 license found in the
  * LICENSE file in the root directory of this source tree.
  */
+
 import { removeCellSelections } from './removeCellSelections';
-import uuidv4 from '../../../global/js/utils/uuidv4'; // Update the data
+import uuidv4 from '../../../global/js/utils/uuidv4';
 
+// Update the data
 export var handleEditSubmit = function handleEditSubmit(_ref) {
   var activeCellCoordinates = _ref.activeCellCoordinates,
-      cellEditorRulerRef = _ref.cellEditorRulerRef,
-      columns = _ref.columns,
-      previousState = _ref.previousState,
-      removeCellEditor = _ref.removeCellEditor,
-      rows = _ref.rows,
-      setActiveCellCoordinates = _ref.setActiveCellCoordinates,
-      setCurrentMatcher = _ref.setCurrentMatcher,
-      setSelectionAreas = _ref.setSelectionAreas,
-      spreadsheetRef = _ref.spreadsheetRef,
-      updateData = _ref.updateData;
+    cellEditorRulerRef = _ref.cellEditorRulerRef,
+    columns = _ref.columns,
+    previousState = _ref.previousState,
+    removeCellEditor = _ref.removeCellEditor,
+    rows = _ref.rows,
+    setActiveCellCoordinates = _ref.setActiveCellCoordinates,
+    setCurrentMatcher = _ref.setCurrentMatcher,
+    setSelectionAreas = _ref.setSelectionAreas,
+    spreadsheetRef = _ref.spreadsheetRef,
+    updateData = _ref.updateData;
   return function (event) {
     var key = event.key;
-
     var updateSelectionAreaOnCellEditSubmit = function updateSelectionAreaOnCellEditSubmit(_ref2) {
       var type = _ref2.type;
-
       var submitEditChanges = function submitEditChanges() {
         var prevCoords = previousState === null || previousState === void 0 ? void 0 : previousState.activeCellCoordinates;
         var cellProps = rows[prevCoords === null || prevCoords === void 0 ? void 0 : prevCoords.row].cells[prevCoords === null || prevCoords === void 0 ? void 0 : prevCoords.column];
         removeCellEditor();
         updateData(prevCoords === null || prevCoords === void 0 ? void 0 : prevCoords.row, cellProps.column.id);
       };
-
       removeCellSelections({
         spreadsheetRef: spreadsheetRef
       });
@@ -56,7 +52,6 @@ export var handleEditSubmit = function handleEditSubmit(_ref) {
       setCurrentMatcher(tempMatcher);
       cellEditorRulerRef.current.textContent = '';
     };
-
     if (key === 'Enter') {
       updateSelectionAreaOnCellEditSubmit({
         type: 'Enter'
@@ -64,7 +59,6 @@ export var handleEditSubmit = function handleEditSubmit(_ref) {
       setActiveCellCoordinates(function (prev) {
         return _objectSpread(_objectSpread({}, prev), {}, {
           row: prev.row === rows.length - 1 ? prev.row : prev.row + 1 // do not move to next cell below if we're already in the last row
-
         });
       });
     }
@@ -77,7 +71,6 @@ export var handleEditSubmit = function handleEditSubmit(_ref) {
       setActiveCellCoordinates(function (prev) {
         return _objectSpread(_objectSpread({}, prev), {}, {
           column: prev.column === columns.length - 1 ? prev.column : prev.column + 1 // do not move to next cell below if we're already in the last column
-
         });
       });
     }

package/es/components/DataSpreadsheet/utils/handleHeaderCellSelection.js

@@ -1,54 +1,48 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
-
 /**
  * Copyright IBM Corp. 2022, 2022
  *
  * This source code is licensed under the Apache-2.0 license found in the
  * LICENSE file in the root directory of this source tree.
  */
+
 import { deepCloneObject } from '../../../global/js/utils/deepCloneObject';
 import uuidv4 from '../../../global/js/utils/uuidv4';
 import { removeCellSelections } from './removeCellSelections';
 import { checkActiveHeaderCell } from './checkActiveHeaderCell';
-
 var getSelectedItemIndexList = function getSelectedItemIndexList(_ref) {
   var indexList = _ref.indexList,
-      newIndex = _ref.newIndex,
-      activeCellIndex = _ref.activeCellIndex;
+    newIndex = _ref.newIndex,
+    activeCellIndex = _ref.activeCellIndex;
   var lowestIndex = newIndex > activeCellIndex ? activeCellIndex : Math.min.apply(Math, _toConsumableArray(indexList).concat([newIndex]));
   var highestIndex = newIndex < activeCellIndex ? activeCellIndex : Math.max.apply(Math, _toConsumableArray(indexList).concat([newIndex]));
   var newIndexList = [];
-
   for (var i = lowestIndex; i <= highestIndex; i++) {
     newIndexList.push(i);
   }
-
   return [].concat(newIndexList);
 };
-
 export var handleHeaderCellSelection = function handleHeaderCellSelection(_ref2) {
   var type = _ref2.type,
-      activeCellCoordinates = _ref2.activeCellCoordinates,
-      rows = _ref2.rows,
-      columns = _ref2.columns,
-      currentMatcher = _ref2.currentMatcher,
-      setActiveCellCoordinates = _ref2.setActiveCellCoordinates,
-      setCurrentMatcher = _ref2.setCurrentMatcher,
-      setSelectionAreas = _ref2.setSelectionAreas,
-      spreadsheetRef = _ref2.spreadsheetRef,
-      index = _ref2.index,
-      isKeyboard = _ref2.isKeyboard,
-      setSelectionAreaData = _ref2.setSelectionAreaData,
-      isHoldingCommandKey = _ref2.isHoldingCommandKey,
-      isHoldingShiftKey = _ref2.isHoldingShiftKey;
-
+    activeCellCoordinates = _ref2.activeCellCoordinates,
+    rows = _ref2.rows,
+    columns = _ref2.columns,
+    currentMatcher = _ref2.currentMatcher,
+    setActiveCellCoordinates = _ref2.setActiveCellCoordinates,
+    setCurrentMatcher = _ref2.setCurrentMatcher,
+    setSelectionAreas = _ref2.setSelectionAreas,
+    spreadsheetRef = _ref2.spreadsheetRef,
+    index = _ref2.index,
+    isKeyboard = _ref2.isKeyboard,
+    setSelectionAreaData = _ref2.setSelectionAreaData,
+    isHoldingCommandKey = _ref2.isHoldingCommandKey,
+    isHoldingShiftKey = _ref2.isHoldingShiftKey;
   if (!isHoldingCommandKey) {
     setSelectionAreaData([]);
     removeCellSelections({
       spreadsheetRef: spreadsheetRef
     });
   }
-
   var rowValue = isKeyboard ? activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row : index;
   var columnValue = isKeyboard ? activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column : index;
   var point1 = {
@@ -61,7 +55,6 @@ export var handleHeaderCellSelection = function handleHeaderCellSelection(_ref2)
     column: type === 'column' ? columnValue : columns.length - 1
   };
   var tempMatcher = uuidv4();
-
   if (!isHoldingShiftKey) {
     setActiveCellCoordinates({
       row: type === 'column' ? 0 : rowValue,
@@ -69,7 +62,6 @@ export var handleHeaderCellSelection = function handleHeaderCellSelection(_ref2)
     });
     setCurrentMatcher(tempMatcher);
   }
-
   var newSelectionArea = {
     point1: point1,
     point2: point2,
@@ -82,41 +74,32 @@ export var handleHeaderCellSelection = function handleHeaderCellSelection(_ref2)
   };
   setSelectionAreas(function (prev) {
     var selectionsClone = deepCloneObject(prev);
-
     if (isHoldingCommandKey) {
       var selectionsFromHeaderCell = selectionsClone.filter(function (item) {
         var _item$header;
-
         return (_item$header = item.header) === null || _item$header === void 0 ? void 0 : _item$header.type;
       });
       var previouslyCreatedHeaderSelection = selectionsFromHeaderCell.filter(function (item) {
         var _item$header2;
-
         return ((_item$header2 = item.header) === null || _item$header2 === void 0 ? void 0 : _item$header2.type) === type;
       });
-      var isHeaderPartOfPreviousSelection = checkActiveHeaderCell(index, previouslyCreatedHeaderSelection, type); // Prevents row/column header selections from being created multiple times
-
+      var isHeaderPartOfPreviousSelection = checkActiveHeaderCell(index, previouslyCreatedHeaderSelection, type);
+      // Prevents row/column header selections from being created multiple times
       if (previouslyCreatedHeaderSelection.length && isHeaderPartOfPreviousSelection) {
         return prev;
       }
-
       return [].concat(_toConsumableArray(prev), [newSelectionArea]);
     }
-
     if (isHoldingShiftKey) {
       var _selectionAreasClone$, _selectionAreasClone$2;
-
       var _selectionsFromHeaderCell = selectionsClone.filter(function (item) {
         var _item$header3;
-
         return (_item$header3 = item.header) === null || _item$header3 === void 0 ? void 0 : _item$header3.type;
-      }); // Shift/click behavior should not occur unless there are activeCellCoordinates set
-
-
+      });
+      // Shift/click behavior should not occur unless there are activeCellCoordinates set
       var currentSelectionArea = _selectionsFromHeaderCell.filter(function (item) {
         return item.matcher === currentMatcher;
       })[0];
-
       var originalAreaIndex = Math.max(currentSelectionArea === null || currentSelectionArea === void 0 ? void 0 : currentSelectionArea.point1[type], currentSelectionArea === null || currentSelectionArea === void 0 ? void 0 : currentSelectionArea.point2[type], activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates[type]);
       var newIndexValue = type === 'column' ? columnValue : rowValue;
       var newPoint = {
@@ -132,22 +115,19 @@ export var handleHeaderCellSelection = function handleHeaderCellSelection(_ref2)
         newIndex: newIndexValue,
         activeCellIndex: activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates[type]
       });
-
       var setPoint1 = function setPoint1(value) {
         return value < newIndexValue ? {
           row: type === 'column' ? 0 : Math.min.apply(Math, _toConsumableArray(newIndexList)),
           column: type === 'column' ? Math.min.apply(Math, _toConsumableArray(newIndexList)) : 0
         } : newPoint;
       };
-
       var setPoint2 = function setPoint2(value) {
         return value < newIndexValue ? newPoint : {
           row: type === 'column' ? rows.length - 1 : Math.max.apply(Math, _toConsumableArray(newIndexList)),
           column: type === 'column' ? Math.max.apply(Math, _toConsumableArray(newIndexList)) : columns.length - 1
         };
-      }; // If there is no active cell set and shift is clicked on a header cell
-
-
+      };
+      // If there is no active cell set and shift is clicked on a header cell
       if (!activeCellCoordinates || typeof activeCellCoordinates === 'undefined') {
         // Need to set positioning of active cell because it doesn't exist yet
         setCurrentMatcher(tempMatcher);
@@ -167,14 +147,12 @@ export var handleHeaderCellSelection = function handleHeaderCellSelection(_ref2)
         });
         return [firstSelectionArea];
       }
-
       selectionAreasClone[indexOfCurrentArea].point1 = setPoint1(activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates[type]);
       selectionAreasClone[indexOfCurrentArea].point2 = setPoint2(activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates[type]);
       selectionAreasClone[indexOfCurrentArea].areaCreated = false;
       selectionAreasClone[indexOfCurrentArea].header.selectedIndexList = newIndexList;
       return selectionAreasClone;
     }
-
     return [newSelectionArea];
   });
 };