@carbon/ibm-products 2.65.0 → 2.66.0

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

@@ -5,35 +5,37 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import { objectSpread2 as _objectSpread2 } from '../../../_virtual/_rollupPluginBabelHelpers.js';
 import { getSelectionAreaPoints } from './getSelectionAreaPoints.js';
 
-var handleActiveCellInSelectionEnter = function handleActiveCellInSelectionEnter(_ref) {
-  var activeCellInsideSelectionArea = _ref.activeCellInsideSelectionArea,
-    activeCellCoordinates = _ref.activeCellCoordinates,
-    activeCellRef = _ref.activeCellRef,
-    selectionAreas = _ref.selectionAreas,
-    updateActiveCellCoordinates = _ref.updateActiveCellCoordinates;
+const handleActiveCellInSelectionEnter = _ref => {
+  let {
+    activeCellInsideSelectionArea,
+    activeCellCoordinates,
+    activeCellRef,
+    selectionAreas,
+    updateActiveCellCoordinates
+  } = _ref;
   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;
+  const activeCellSelectionId = activeCellRef.current.getAttribute('data-selection-id');
+  const activeCellIndexInSelectionAreas = selectionAreas.findIndex(item => item.matcher === activeCellSelectionId);
+  const selectionAreaToNavigate = selectionAreas[activeCellIndexInSelectionAreas];
+  const {
+    lowestColumnIndex,
+    lowestRowIndex,
+    greatestColumnIndex,
+    greatestRowIndex
+  } = getSelectionAreaPoints(selectionAreaToNavigate);
   // Move active cell down one row if possible
-  var coordinatesClone = _objectSpread2({}, activeCellCoordinates);
-  if ((activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row) < greatestRowIndex) {
+  const coordinatesClone = {
+    ...activeCellCoordinates
+  };
+  if (activeCellCoordinates?.row < greatestRowIndex) {
     updateActiveCellCoordinates({
       coords: coordinatesClone,
       updatedValue: {
-        row: (coordinatesClone === null || coordinatesClone === void 0 ? void 0 : coordinatesClone.row) + 1
+        row: coordinatesClone?.row + 1
       },
       optOutOfSelectionAreaUpdate: true
     });
@@ -41,12 +43,12 @@ var handleActiveCellInSelectionEnter = function handleActiveCellInSelectionEnter
   // 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) {
+  if (activeCellCoordinates?.row === greatestRowIndex) {
+    if (activeCellCoordinates?.column < greatestColumnIndex) {
       updateActiveCellCoordinates({
         coords: coordinatesClone,
         updatedValue: {
-          column: (coordinatesClone === null || coordinatesClone === void 0 ? void 0 : coordinatesClone.column) + 1,
+          column: coordinatesClone?.column + 1,
           row: lowestRowIndex
         },
         optOutOfSelectionAreaUpdate: true
@@ -54,20 +56,21 @@ var handleActiveCellInSelectionEnter = function handleActiveCellInSelectionEnter
     }
     // 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 (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;
+          const nextSelectionArea = selectionAreas[activeCellIndexInSelectionAreas + 1];
+          const {
+            lowestColumnIndex,
+            lowestRowIndex
+          } = getSelectionAreaPoints(nextSelectionArea);
           updateActiveCellCoordinates({
             coords: coordinatesClone,
             updatedValue: {
-              column: _lowestColumnIndex,
-              row: _lowestRowIndex
+              column: lowestColumnIndex,
+              row: lowestRowIndex
             },
             optOutOfSelectionAreaUpdate: true
           });
@@ -76,15 +79,16 @@ var handleActiveCellInSelectionEnter = function handleActiveCellInSelectionEnter
           // There are multiple selection areas and the active cell is in the last one
           // 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;
+          const firstSelectionArea = selectionAreas[0];
+          const {
+            lowestColumnIndex,
+            lowestRowIndex
+          } = getSelectionAreaPoints(firstSelectionArea);
           updateActiveCellCoordinates({
             coords: coordinatesClone,
             updatedValue: {
-              column: _lowestColumnIndex2,
-              row: _lowestRowIndex2
+              column: lowestColumnIndex,
+              row: lowestRowIndex
             },
             optOutOfSelectionAreaUpdate: true
           });

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

@@ -7,30 +7,31 @@
 
 import { getSelectionAreaPoints } from './getSelectionAreaPoints.js';
 
-var handleActiveCellInSelectionTab = function handleActiveCellInSelectionTab(_ref) {
-  var activeCellInsideSelectionArea = _ref.activeCellInsideSelectionArea,
-    activeCellCoordinates = _ref.activeCellCoordinates,
-    activeCellRef = _ref.activeCellRef,
-    selectionAreas = _ref.selectionAreas,
-    updateActiveCellCoordinates = _ref.updateActiveCellCoordinates;
+const handleActiveCellInSelectionTab = _ref => {
+  let {
+    activeCellInsideSelectionArea,
+    activeCellCoordinates,
+    activeCellRef,
+    selectionAreas,
+    updateActiveCellCoordinates
+  } = _ref;
   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;
+  const activeCellSelectionId = activeCellRef.current.getAttribute('data-selection-id');
+  const activeCellIndexInSelectionAreas = selectionAreas.findIndex(item => item.matcher === activeCellSelectionId);
+  const selectionAreaToNavigate = selectionAreas[activeCellIndexInSelectionAreas];
+  const {
+    lowestColumnIndex,
+    lowestRowIndex,
+    greatestColumnIndex,
+    greatestRowIndex
+  } = getSelectionAreaPoints(selectionAreaToNavigate);
   // Move active cell to next column in selection area
-  if ((activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column) < greatestColumnIndex) {
+  if (activeCellCoordinates?.column < greatestColumnIndex) {
     updateActiveCellCoordinates({
       updatedValue: {
-        column: (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column) + 1
+        column: activeCellCoordinates?.column + 1
       },
       optOutOfSelectionAreaUpdate: true
     });
@@ -38,31 +39,32 @@ var handleActiveCellInSelectionTab = function handleActiveCellInSelectionTab(_re
   // 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) {
+  if (activeCellCoordinates?.column === greatestColumnIndex) {
+    if (activeCellCoordinates?.row < greatestRowIndex) {
       updateActiveCellCoordinates({
         updatedValue: {
           column: lowestColumnIndex,
-          row: (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row) + 1
+          row: activeCellCoordinates?.row + 1
         },
         optOutOfSelectionAreaUpdate: true
       });
     }
     // 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 (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;
+          const nextSelectionArea = selectionAreas[activeCellIndexInSelectionAreas + 1];
+          const {
+            lowestColumnIndex,
+            lowestRowIndex
+          } = getSelectionAreaPoints(nextSelectionArea);
           updateActiveCellCoordinates({
             updatedValue: {
-              column: _lowestColumnIndex,
-              row: _lowestRowIndex
+              column: lowestColumnIndex,
+              row: lowestRowIndex
             },
             optOutOfSelectionAreaUpdate: true
           });
@@ -71,14 +73,15 @@ var handleActiveCellInSelectionTab = function handleActiveCellInSelectionTab(_re
           // There are multiple selection areas and the active cell is in the last one
           // 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;
+          const firstSelectionArea = selectionAreas[0];
+          const {
+            lowestColumnIndex,
+            lowestRowIndex
+          } = getSelectionAreaPoints(firstSelectionArea);
           updateActiveCellCoordinates({
             updatedValue: {
-              column: _lowestColumnIndex2,
-              row: _lowestRowIndex2
+              column: lowestColumnIndex,
+              row: lowestRowIndex
             },
             optOutOfSelectionAreaUpdate: true
           });

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

@@ -5,36 +5,35 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import { deepCloneObject as _deepCloneObject } from '../../../global/js/utils/deepCloneObject.js';
+import { deepCloneObject } from '../../../global/js/utils/deepCloneObject.js';
 import { rangeWithCallback } from '../../../global/js/utils/rangeWithCallback.js';
 
-var handleCellDeletion = function handleCellDeletion(_ref) {
-  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;
+const handleCellDeletion = _ref => {
+  let {
+    activeCellCoordinates,
+    selectionAreas,
+    currentMatcher,
+    rows,
+    setActiveCellContent,
+    updateData
+  } = _ref;
   // 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') {
+  if (activeCellCoordinates?.column === 'header' || 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 === null || selectionAreaToEmptyContents === void 0 || (_selectionAreaToEmpty = selectionAreaToEmptyContents.point1) === null || _selectionAreaToEmpty === void 0 ? void 0 : _selectionAreaToEmpty.column, selectionAreaToEmptyContents === null || selectionAreaToEmptyContents === void 0 || (_selectionAreaToEmpty2 = selectionAreaToEmptyContents.point2) === null || _selectionAreaToEmpty2 === void 0 ? void 0 : _selectionAreaToEmpty2.column);
-  var greatestColumnIndex = Math.max(selectionAreaToEmptyContents === null || selectionAreaToEmptyContents === void 0 || (_selectionAreaToEmpty3 = selectionAreaToEmptyContents.point1) === null || _selectionAreaToEmpty3 === void 0 ? void 0 : _selectionAreaToEmpty3.column, selectionAreaToEmptyContents === null || selectionAreaToEmptyContents === void 0 || (_selectionAreaToEmpty4 = selectionAreaToEmptyContents.point2) === null || _selectionAreaToEmpty4 === void 0 ? void 0 : _selectionAreaToEmpty4.column);
-  var lowestRowIndex = Math.min(selectionAreaToEmptyContents === null || selectionAreaToEmptyContents === void 0 || (_selectionAreaToEmpty5 = selectionAreaToEmptyContents.point1) === null || _selectionAreaToEmpty5 === void 0 ? void 0 : _selectionAreaToEmpty5.row, selectionAreaToEmptyContents === null || selectionAreaToEmptyContents === void 0 || (_selectionAreaToEmpty6 = selectionAreaToEmptyContents.point2) === null || _selectionAreaToEmpty6 === void 0 ? void 0 : _selectionAreaToEmpty6.row);
-  var greatestRowIndex = Math.max(selectionAreaToEmptyContents === null || selectionAreaToEmptyContents === void 0 || (_selectionAreaToEmpty7 = selectionAreaToEmptyContents.point1) === null || _selectionAreaToEmpty7 === void 0 ? void 0 : _selectionAreaToEmpty7.row, selectionAreaToEmptyContents === null || selectionAreaToEmptyContents === 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];
-      updateData(rowIndex, cellProps === null || cellProps === void 0 ? void 0 : cellProps.column.id, '');
+  const selectionAreaClone = deepCloneObject(selectionAreas);
+  const indexOfCurrentSelectionArea = selectionAreaClone.findIndex(item => item.matcher === currentMatcher);
+  const selectionAreaToEmptyContents = selectionAreaClone[indexOfCurrentSelectionArea];
+  const lowestColumnIndex = Math.min(selectionAreaToEmptyContents?.point1?.column, selectionAreaToEmptyContents?.point2?.column);
+  const greatestColumnIndex = Math.max(selectionAreaToEmptyContents?.point1?.column, selectionAreaToEmptyContents?.point2?.column);
+  const lowestRowIndex = Math.min(selectionAreaToEmptyContents?.point1?.row, selectionAreaToEmptyContents?.point2?.row);
+  const greatestRowIndex = Math.max(selectionAreaToEmptyContents?.point1?.row, selectionAreaToEmptyContents?.point2?.row);
+  rangeWithCallback(lowestColumnIndex, greatestColumnIndex, columnIndex => {
+    rangeWithCallback(lowestRowIndex, greatestRowIndex, rowIndex => {
+      const cellProps = rows[rowIndex].cells[columnIndex];
+      updateData(rowIndex, cellProps?.column.id, '');
     });
   });
   setActiveCellContent(null);

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

@@ -5,39 +5,44 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import { objectSpread2 as _objectSpread2 } from '../../../_virtual/_rollupPluginBabelHelpers.js';
 import { removeCellSelections } from './removeCellSelections.js';
 import uuidv4 from '../../../global/js/utils/uuidv4.js';
 
 // Update the data
-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;
-  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];
+const handleEditSubmit = _ref => {
+  let {
+    activeCellCoordinates,
+    cellEditorRulerRef,
+    columns,
+    previousState,
+    removeCellEditor,
+    rows,
+    setActiveCellCoordinates,
+    setCurrentMatcher,
+    setSelectionAreas,
+    spreadsheetRef,
+    updateData
+  } = _ref;
+  return event => {
+    const {
+      key
+    } = event;
+    const updateSelectionAreaOnCellEditSubmit = _ref2 => {
+      let {
+        type
+      } = _ref2;
+      const submitEditChanges = () => {
+        const prevCoords = previousState?.activeCellCoordinates;
+        const cellProps = rows[prevCoords?.row].cells[prevCoords?.column];
         removeCellEditor();
-        updateData(prevCoords === null || prevCoords === void 0 ? void 0 : prevCoords.row, cellProps.column.id);
+        updateData(prevCoords?.row, cellProps.column.id);
       };
       removeCellSelections({
-        spreadsheetRef: spreadsheetRef
+        spreadsheetRef
       });
       submitEditChanges();
-      var tempMatcher = uuidv4();
-      var newSelectionArea = {
+      const tempMatcher = uuidv4();
+      const newSelectionArea = {
         row: type === 'Enter' ? activeCellCoordinates.row === rows.length - 1 ? activeCellCoordinates.row : activeCellCoordinates.row + 1 : activeCellCoordinates.row,
         column: type === 'Tab' ? activeCellCoordinates.column === columns.length - 1 ? activeCellCoordinates.column : activeCellCoordinates.column + 1 : activeCellCoordinates.column
       };
@@ -54,22 +59,20 @@ var handleEditSubmit = function handleEditSubmit(_ref) {
       updateSelectionAreaOnCellEditSubmit({
         type: 'Enter'
       });
-      setActiveCellCoordinates(function (prev) {
-        return _objectSpread2(_objectSpread2({}, 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
-        });
-      });
+      setActiveCellCoordinates(prev => ({
+        ...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
+      }));
     }
     if (key === 'Tab') {
       event.preventDefault();
       updateSelectionAreaOnCellEditSubmit({
         type: 'Tab'
       });
-      setActiveCellCoordinates(function (prev) {
-        return _objectSpread2(_objectSpread2({}, 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
-        });
-      });
+      setActiveCellCoordinates(prev => ({
+        ...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
+      }));
     }
     return;
   };

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

@@ -5,57 +5,60 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import { toConsumableArray as _toConsumableArray } from '../../../_virtual/_rollupPluginBabelHelpers.js';
-import { deepCloneObject as _deepCloneObject } from '../../../global/js/utils/deepCloneObject.js';
+import { deepCloneObject } from '../../../global/js/utils/deepCloneObject.js';
 import uuidv4 from '../../../global/js/utils/uuidv4.js';
 import { removeCellSelections } from './removeCellSelections.js';
 import { checkActiveHeaderCell } from './checkActiveHeaderCell.js';
 
-var getSelectedItemIndexList = function getSelectedItemIndexList(_ref) {
-  var indexList = _ref.indexList,
-    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++) {
+const getSelectedItemIndexList = _ref => {
+  let {
+    indexList,
+    newIndex,
+    activeCellIndex
+  } = _ref;
+  const lowestIndex = newIndex > activeCellIndex ? activeCellIndex : Math.min(...indexList, newIndex);
+  const highestIndex = newIndex < activeCellIndex ? activeCellIndex : Math.max(...indexList, newIndex);
+  const newIndexList = [];
+  for (let i = lowestIndex; i <= highestIndex; i++) {
     newIndexList.push(i);
   }
-  return [].concat(newIndexList);
+  return [...newIndexList];
 };
-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;
+const handleHeaderCellSelection = _ref2 => {
+  let {
+    type,
+    activeCellCoordinates,
+    rows,
+    columns,
+    currentMatcher,
+    setActiveCellCoordinates,
+    setCurrentMatcher,
+    setSelectionAreas,
+    spreadsheetRef,
+    index,
+    isKeyboard,
+    setSelectionAreaData,
+    isHoldingCommandKey,
+    isHoldingShiftKey
+  } = _ref2;
   if (!isHoldingCommandKey) {
     setSelectionAreaData([]);
     removeCellSelections({
-      spreadsheetRef: 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 = {
+  const rowValue = isKeyboard ? activeCellCoordinates?.row : index;
+  const columnValue = isKeyboard ? activeCellCoordinates?.column : index;
+  const point1 = {
     row: type === 'column' ? 0 : rowValue,
     column: type === 'column' ? columnValue : 0
   };
-  var point2 = {
+  const point2 = {
     row: type === 'column' ? rows.length - 1 : rowValue,
     // going to always be the last row
     column: type === 'column' ? columnValue : columns.length - 1
   };
-  var tempMatcher = uuidv4();
+  const tempMatcher = uuidv4();
   if (!isHoldingShiftKey) {
     setActiveCellCoordinates({
       row: type === 'column' ? 0 : rowValue,
@@ -63,82 +66,68 @@ var handleHeaderCellSelection = function handleHeaderCellSelection(_ref2) {
     });
     setCurrentMatcher(tempMatcher);
   }
-  var newSelectionArea = {
-    point1: point1,
-    point2: point2,
+  const newSelectionArea = {
+    point1,
+    point2,
     areaCreated: false,
     matcher: tempMatcher,
     header: {
-      type: type,
+      type,
       selectedIndexList: [type === 'column' ? columnValue : rowValue]
     }
   };
-  setSelectionAreas(function (prev) {
-    var selectionsClone = _deepCloneObject(prev);
+  setSelectionAreas(prev => {
+    const 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);
+      const selectionsFromHeaderCell = selectionsClone.filter(item => item.header?.type);
+      const previouslyCreatedHeaderSelection = selectionsFromHeaderCell.filter(item => item.header?.type === type);
+      const 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]);
+      return [...prev, newSelectionArea];
     }
     if (isHoldingShiftKey) {
-      var _selectionAreasClone$;
-      var _selectionsFromHeaderCell = selectionsClone.filter(function (item) {
-        var _item$header3;
-        return (_item$header3 = item.header) === null || _item$header3 === void 0 ? void 0 : _item$header3.type;
-      });
+      const selectionsFromHeaderCell = selectionsClone.filter(item => item.header?.type);
       // 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 = {
+      const currentSelectionArea = selectionsFromHeaderCell.filter(item => item.matcher === currentMatcher)[0];
+      const originalAreaIndex = Math.max(currentSelectionArea?.point1[type], currentSelectionArea?.point2[type], activeCellCoordinates?.[type]);
+      const newIndexValue = type === 'column' ? columnValue : rowValue;
+      const newPoint = {
         row: originalAreaIndex < newIndexValue ? rows.length - 1 : 0,
         column: columnValue
       };
-      var selectionAreasClone = _deepCloneObject(prev);
-      var indexOfCurrentArea = selectionAreasClone.findIndex(function (item) {
-        return item.matcher === currentMatcher;
-      });
-      var newIndexList = getSelectedItemIndexList({
-        indexList: ((_selectionAreasClone$ = selectionAreasClone[indexOfCurrentArea]) === null || _selectionAreasClone$ === void 0 || (_selectionAreasClone$ = _selectionAreasClone$.header) === null || _selectionAreasClone$ === void 0 ? void 0 : _selectionAreasClone$.selectedIndexList) || [type === 'column' ? columnValue : rowValue],
+      const selectionAreasClone = deepCloneObject(prev);
+      const indexOfCurrentArea = selectionAreasClone.findIndex(item => item.matcher === currentMatcher);
+      const newIndexList = getSelectedItemIndexList({
+        indexList: selectionAreasClone[indexOfCurrentArea]?.header?.selectedIndexList || [type === 'column' ? columnValue : rowValue],
         newIndex: newIndexValue,
-        activeCellIndex: activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates[type]
+        activeCellIndex: activeCellCoordinates?.[type]
       });
-      var setPoint1 = function setPoint1(value) {
+      const 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
+          row: type === 'column' ? 0 : Math.min(...newIndexList),
+          column: type === 'column' ? Math.min(...newIndexList) : 0
         } : newPoint;
       };
-      var setPoint2 = function setPoint2(value) {
+      const 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
+          row: type === 'column' ? rows.length - 1 : Math.max(...newIndexList),
+          column: type === 'column' ? Math.max(...newIndexList) : columns.length - 1
         };
       };
       // 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);
-        var firstSelectionArea = {
+        const firstSelectionArea = {
           point1: setPoint1(type === 'column' ? columnValue : rowValue),
           point2: setPoint2(type === 'column' ? columnValue : rowValue),
           areaCreated: false,
           matcher: tempMatcher,
           header: {
-            type: type,
+            type,
             selectedIndexList: [type === 'column' ? columnValue : rowValue]
           }
         };
@@ -148,8 +137,8 @@ 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].point1 = setPoint1(activeCellCoordinates?.[type]);
+      selectionAreasClone[indexOfCurrentArea].point2 = setPoint2(activeCellCoordinates?.[type]);
       selectionAreasClone[indexOfCurrentArea].areaCreated = false;
       selectionAreasClone[indexOfCurrentArea].header.selectedIndexList = newIndexList;
       return selectionAreasClone;