@deephaven/iris-grid 1.22.1 → 1.22.2-alpha-pivot-builder.0

package/dist/sidebar/visibility-ordering-builder/VisibilityOrderingBuilder.js

@@ -1,3 +1,9 @@
+function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
@@ -47,18 +53,15 @@ class VisibilityOrderingBuilderInner extends PureComponent {
      */
     _defineProperty(this, "scrollAndFocusColumnOnUpdate", null);
     _defineProperty(this, "handleGroupColorChange", throttle((group, color) => {
-      var {
-        columnHeaderGroups,
-        onColumnHeaderGroupChanged
-      } = this.props;
+      var _this$props = this.props,
+        columnHeaderGroups = _this$props.columnHeaderGroups,
+        onColumnHeaderGroupChanged = _this$props.onColumnHeaderGroupChanged;
       var newGroups = [...columnHeaderGroups];
       var newGroup = new ColumnHeaderGroup(_objectSpread(_objectSpread({}, group), {}, {
         color
       }));
       newGroups.splice(newGroups.findIndex(_ref => {
-        var {
-          name
-        } = _ref;
+        var name = _ref.name;
         return name === group.name;
       }), 1, newGroup);
       onColumnHeaderGroupChanged(newGroups);
@@ -92,24 +95,18 @@ class VisibilityOrderingBuilderInner extends PureComponent {
       max: 2
     }));
     _defineProperty(this, "makeVisibilityOrderingList", memoize((columns, treeItems, showHiddenColumns, isDraggable) => {
-      var {
-        movedColumns
-      } = this.props;
+      var movedColumns = this.props.movedColumns;
       var elements = [];
       var firstMovableIndex = this.getFirstMovableIndex();
       var lastMovableIndex = this.getLastMovableIndex();
       var firstMovableTreeIndex = treeItems.findIndex(_ref2 => {
-        var {
-          data
-        } = _ref2;
+        var data = _ref2.data;
         return Array.isArray(data.visibleIndex) ? data.visibleIndex[0] === firstMovableIndex : data.visibleIndex === firstMovableIndex;
       });
 
       // Searches from the end so it's faster than findIndex
       var lastMovableTreeIndex = treeItems.findLastIndex(_ref3 => {
-        var {
-          data
-        } = _ref3;
+        var data = _ref3.data;
         return Array.isArray(data.visibleIndex) ? data.visibleIndex[1] === lastMovableIndex : data.visibleIndex === lastMovableIndex;
       });
       var movableItems = treeItems.slice(firstMovableTreeIndex, lastMovableTreeIndex + 1);
@@ -212,10 +209,9 @@ class VisibilityOrderingBuilderInner extends PureComponent {
   }
   componentDidUpdate(prevProps) {
     // If we change because of undo/redo or reorders in the grid, update internal state
-    var {
-      movedColumns,
-      columnHeaderGroups
-    } = this.props;
+    var _this$props2 = this.props,
+      movedColumns = _this$props2.movedColumns,
+      columnHeaderGroups = _this$props2.columnHeaderGroups;
     if (prevProps.movedColumns !== movedColumns) {
       this.setState({
         movedColumns
@@ -230,7 +226,9 @@ class VisibilityOrderingBuilderInner extends PureComponent {
     // Scroll to the item when it's available
     if (this.scrollAndFocusColumnOnUpdate != null) {
       var _this$virtualizerRef$;
-      var [itemIndex, itemName] = this.scrollAndFocusColumnOnUpdate;
+      var _this$scrollAndFocusC = _slicedToArray(this.scrollAndFocusColumnOnUpdate, 2),
+        itemIndex = _this$scrollAndFocusC[0],
+        itemName = _this$scrollAndFocusC[1];
       (_this$virtualizerRef$ = this.virtualizerRef.current) === null || _this$virtualizerRef$ === void 0 || _this$virtualizerRef$.scrollToIndex(itemIndex);
 
       // Need to wait for the paint after the scroll so the item exists in the DOM
@@ -266,10 +264,9 @@ class VisibilityOrderingBuilderInner extends PureComponent {
     }
   }
   componentWillUnmount() {
-    var {
-      columnHeaderGroups,
-      onColumnHeaderGroupChanged
-    } = this.props;
+    var _this$props3 = this.props,
+      columnHeaderGroups = _this$props3.columnHeaderGroups,
+      onColumnHeaderGroupChanged = _this$props3.onColumnHeaderGroupChanged;
     // Clean up unnamed groups on unmount
     var filteredGroups = columnHeaderGroups.filter(group => !group.isNew);
     if (filteredGroups.length !== columnHeaderGroups.length) {
@@ -277,12 +274,11 @@ class VisibilityOrderingBuilderInner extends PureComponent {
     }
   }
   resetVisibilityOrdering() {
-    var {
-      model,
-      onReset,
-      onMovedColumnsChanged,
-      onColumnHeaderGroupChanged
-    } = this.props;
+    var _this$props4 = this.props,
+      model = _this$props4.model,
+      onReset = _this$props4.onReset,
+      onMovedColumnsChanged = _this$props4.onMovedColumnsChanged,
+      onColumnHeaderGroupChanged = _this$props4.onColumnHeaderGroupChanged;
     this.setState({
       selectedColumns: new Set(),
       lastSelectedColumn: ''
@@ -324,12 +320,8 @@ class VisibilityOrderingBuilderInner extends PureComponent {
    *
    */
   moveSelectedColumns(option) {
-    var {
-      columnHeaderGroups
-    } = this.props;
-    var {
-      selectedColumns
-    } = this.state;
+    var columnHeaderGroups = this.props.columnHeaderGroups;
+    var selectedColumns = this.state.selectedColumns;
     var treeItems = this.getFlattenedTree();
     var firstMovableIndex = this.getFirstMovableIndex();
     var lastMovableIndex = this.getLastMovableIndex();
@@ -346,14 +338,11 @@ class VisibilityOrderingBuilderInner extends PureComponent {
     var newMoves = [];
     var updatedGroups = columnHeaderGroups;
     var _loop = function _loop() {
-      var {
-        id,
-        parentId,
-        depth,
-        data: {
-          visibleIndex
-        }
-      } = selectedItems[i];
+      var _selectedItems$i = selectedItems[i],
+        id = _selectedItems$i.id,
+        parentId = _selectedItems$i.parentId,
+        depth = _selectedItems$i.depth,
+        visibleIndex = _selectedItems$i.data.visibleIndex;
       switch (option) {
         case VisibilityOrderingBuilderInner.MOVE_OPTIONS.TOP:
           {
@@ -440,15 +429,13 @@ class VisibilityOrderingBuilderInner extends PureComponent {
    * @param option The move operation
    */
   handleMoveColumns(option) {
-    var {
-      onMovedColumnsChanged,
-      movedColumns,
-      onColumnHeaderGroupChanged
-    } = this.props;
-    var {
-      newMoves,
-      groups
-    } = this.moveSelectedColumns(option);
+    var _this$props5 = this.props,
+      onMovedColumnsChanged = _this$props5.onMovedColumnsChanged,
+      movedColumns = _this$props5.movedColumns,
+      onColumnHeaderGroupChanged = _this$props5.onColumnHeaderGroupChanged;
+    var _this$moveSelectedCol = this.moveSelectedColumns(option),
+      newMoves = _this$moveSelectedCol.newMoves,
+      groups = _this$moveSelectedCol.groups;
     var scrollListAfterMove;
     if (option === VisibilityOrderingBuilderInner.MOVE_OPTIONS.TOP) {
       scrollListAfterMove = () => {
@@ -491,16 +478,12 @@ class VisibilityOrderingBuilderInner extends PureComponent {
     });
     var newMoves = [...movedColumns]; // Start with the base state moves by the model
     var moveToIndex = Math.min(...items.flatMap(item => {
-      var {
-        modelIndex
-      } = item.data;
+      var modelIndex = item.data.modelIndex;
       return Array.isArray(modelIndex) ? GridUtils.getVisibleIndexes(modelIndex, newMoves) : GridUtils.getVisibleIndex(modelIndex, newMoves);
     }));
     for (var i = 0; i < items.length; i += 1) {
       var item = items[i];
-      var {
-        modelIndex
-      } = item.data;
+      var modelIndex = item.data.modelIndex;
       var visibleIndex = Array.isArray(modelIndex) ? GridUtils.getVisibleIndexes(modelIndex, newMoves) : GridUtils.getVisibleIndex(modelIndex, newMoves);
       newMoves = Array.isArray(visibleIndex) ? GridUtils.moveRange([Math.min(...visibleIndex), Math.max(...visibleIndex)], moveToIndex, newMoves, true) : GridUtils.moveItem(visibleIndex, moveToIndex, newMoves);
       if (Array.isArray(visibleIndex)) {
@@ -513,10 +496,9 @@ class VisibilityOrderingBuilderInner extends PureComponent {
   }
   handleSortColumns(option) {
     var _this$getFirstMovable, _this$getLastMovableI;
-    var {
-      model,
-      onMovedColumnsChanged
-    } = this.props;
+    var _this$props6 = this.props,
+      model = _this$props6.model,
+      onMovedColumnsChanged = _this$props6.onMovedColumnsChanged;
     var tree = this.getTreeItems();
     var firstIndex = (_this$getFirstMovable = this.getFirstMovableIndex()) !== null && _this$getFirstMovable !== void 0 ? _this$getFirstMovable : 0;
     var lastIndex = (_this$getLastMovableI = this.getLastMovableIndex()) !== null && _this$getLastMovableI !== void 0 ? _this$getLastMovableI : tree.length - 1;
@@ -559,10 +541,9 @@ class VisibilityOrderingBuilderInner extends PureComponent {
       return [];
     }
     (_event$currentTarget = event.currentTarget) === null || _event$currentTarget === void 0 || _event$currentTarget.focus();
-    var {
-      selectedColumns,
-      lastSelectedColumn
-    } = this.state;
+    var _this$state = this.state,
+      selectedColumns = _this$state.selectedColumns,
+      lastSelectedColumn = _this$state.lastSelectedColumn;
     var isModifierKeyDown = GridUtils.isModifierKeyDown(event);
     var isShiftKeyDown = event.shiftKey;
     var isSelected = selectedColumns.has(name);
@@ -574,9 +555,7 @@ class VisibilityOrderingBuilderInner extends PureComponent {
     var movableItems = this.getFlattenedTree(showHiddenColumns);
     if (isSelected && !isShiftKeyDown && lastSelectedColumn === name) {
       var selectedItem = movableItems.find(_ref4 => {
-        var {
-          id
-        } = _ref4;
+        var id = _ref4.id;
         return id === name;
       });
       assertNotNull(selectedItem);
@@ -600,12 +579,8 @@ class VisibilityOrderingBuilderInner extends PureComponent {
   }
   handleSearchItemClicked(item, event) {
     var columnsToAdd = this.handleItemClick(item.id, event, true);
-    var {
-      showHiddenColumns
-    } = this.state;
-    var {
-      onColumnVisibilityChanged
-    } = this.props;
+    var showHiddenColumns = this.state.showHiddenColumns;
+    var onColumnVisibilityChanged = this.props.onColumnVisibilityChanged;
     if (columnsToAdd.length === 0) {
       return;
     }
@@ -622,12 +597,8 @@ class VisibilityOrderingBuilderInner extends PureComponent {
     if (items.length === 0) {
       return;
     }
-    var {
-      showHiddenColumns
-    } = this.state;
-    var {
-      onColumnVisibilityChanged
-    } = this.props;
+    var showHiddenColumns = this.state.showHiddenColumns;
+    var onColumnVisibilityChanged = this.props.onColumnVisibilityChanged;
     if (!showHiddenColumns) {
       var modelIndexesToShow = [...new Set(items.map(item => item.data.modelIndex).flat())];
       onColumnVisibilityChanged(modelIndexesToShow, true);
@@ -644,9 +615,7 @@ class VisibilityOrderingBuilderInner extends PureComponent {
    * @param addToExisting If these should be added to the existing selection or overwrite it
    */
   addColumnToSelected(columnsToBeAdded, addToExisting) {
-    var {
-      selectedColumns
-    } = this.state;
+    var selectedColumns = this.state.selectedColumns;
     var newSelectedColumns = new Set(addToExisting ? [...selectedColumns.values()].concat(columnsToBeAdded) : columnsToBeAdded);
     var flattenedItems = this.getFlattenedTree();
 
@@ -655,10 +624,8 @@ class VisibilityOrderingBuilderInner extends PureComponent {
     // We don't need to recursively iterate because of this
     // The parent will always be added before any children for nested selections
     flattenedItems.forEach(_ref5 => {
-      var {
-        id,
-        children
-      } = _ref5;
+      var id = _ref5.id,
+        children = _ref5.children;
       if (newSelectedColumns.has(id)) {
         children.forEach(child => newSelectedColumns.add(child.id));
       }
@@ -679,21 +646,15 @@ class VisibilityOrderingBuilderInner extends PureComponent {
    * @param name Name of the column to remove
    */
   removeColumnFromSelected(name) {
-    var {
-      selectedColumns
-    } = this.state;
+    var selectedColumns = this.state.selectedColumns;
     var flattenedItems = this.getFlattenedTree();
     var item = flattenedItems.find(_ref6 => {
-      var {
-        id
-      } = _ref6;
+      var id = _ref6.id;
       return id === name;
     });
     assertNotNull(item);
     var parentItem = flattenedItems.find(_ref7 => {
-      var {
-        id
-      } = _ref7;
+      var id = _ref7.id;
       return id === item.parentId;
     });
 
@@ -705,9 +666,7 @@ class VisibilityOrderingBuilderInner extends PureComponent {
       selectedColumns.delete(parentItem.id);
       var newParentId = parentItem.parentId;
       parentItem = flattenedItems.find(_ref8 => {
-        var {
-          id
-        } = _ref8;
+        var id = _ref8.id;
         return id === newParentId;
       });
     };
@@ -720,9 +679,7 @@ class VisibilityOrderingBuilderInner extends PureComponent {
     });
   }
   handleDragStart(id, event) {
-    var {
-      selectedColumns
-    } = this.state;
+    var selectedColumns = this.state.selectedColumns;
     if (selectedColumns.has(id)) {
       return;
     }
@@ -734,22 +691,20 @@ class VisibilityOrderingBuilderInner extends PureComponent {
     this.addColumnToSelected([id], isAddingToSelection);
   }
   handleDragEnd(from, to) {
-    var {
-      model,
-      movedColumns,
-      onMovedColumnsChanged,
-      columnHeaderGroups,
-      onColumnHeaderGroupChanged
-    } = this.props;
+    var _this$props7 = this.props,
+      model = _this$props7.model,
+      movedColumns = _this$props7.movedColumns,
+      onMovedColumnsChanged = _this$props7.onMovedColumnsChanged,
+      columnHeaderGroups = _this$props7.columnHeaderGroups,
+      onColumnHeaderGroupChanged = _this$props7.onColumnHeaderGroupChanged;
     var selectedParentItems = this.getSelectedParentItems();
     var firstMovableIndex = this.getFirstMovableIndex();
     var lastMovableIndex = this.getLastMovableIndex();
     assertNotNull(firstMovableIndex);
     assertNotNull(lastMovableIndex);
-    var {
-      groups: groupsAfterDrop,
-      movedColumns: newMoves
-    } = moveItemsFromDrop(from, to, movedColumns, columnHeaderGroups, selectedParentItems, firstMovableIndex, lastMovableIndex);
+    var _moveItemsFromDrop = moveItemsFromDrop(from, to, movedColumns, columnHeaderGroups, selectedParentItems, firstMovableIndex, lastMovableIndex),
+      groupsAfterDrop = _moveItemsFromDrop.groups,
+      newMoves = _moveItemsFromDrop.movedColumns;
 
     // Need to parse so the internal state is correct to prevent weird drop animations
     // when adding/removing from groups. But don't parse if nothing changed to prevent
@@ -770,17 +725,14 @@ class VisibilityOrderingBuilderInner extends PureComponent {
   }
   handleGroupNameChange(group, newName) {
     var _this$list3;
-    var {
-      columnHeaderGroups,
-      onColumnHeaderGroupChanged,
-      endUndoGroup
-    } = this.props;
+    var _this$props8 = this.props,
+      columnHeaderGroups = _this$props8.columnHeaderGroups,
+      onColumnHeaderGroupChanged = _this$props8.onColumnHeaderGroupChanged,
+      endUndoGroup = _this$props8.endUndoGroup;
     var newGroups = [...columnHeaderGroups];
     var oldName = group.name;
     var groupIndex = newGroups.findIndex(_ref9 => {
-      var {
-        name
-      } = _ref9;
+      var name = _ref9.name;
       return name === oldName;
     });
     var oldGroup = newGroups[groupIndex];
@@ -790,9 +742,7 @@ class VisibilityOrderingBuilderInner extends PureComponent {
     newGroup.name = newName;
     newGroups.splice(groupIndex, 1, newGroup);
     var parentIndex = newGroups.findIndex(_ref0 => {
-      var {
-        name
-      } = _ref0;
+      var name = _ref0.name;
       return name === newGroup.parent;
     });
     if (parentIndex >= 0) {
@@ -812,11 +762,10 @@ class VisibilityOrderingBuilderInner extends PureComponent {
     endUndoGroup();
   }
   handleGroupDelete(group) {
-    var {
-      columnHeaderGroups,
-      endUndoGroup,
-      onColumnHeaderGroupChanged
-    } = this.props;
+    var _this$props9 = this.props,
+      columnHeaderGroups = _this$props9.columnHeaderGroups,
+      endUndoGroup = _this$props9.endUndoGroup,
+      onColumnHeaderGroupChanged = _this$props9.onColumnHeaderGroupChanged;
     var newGroups = columnHeaderGroups.filter(g => g.name !== group.name);
     var parentIndex = newGroups.findIndex(g => g.name === group.parent);
     if (parentIndex >= 0) {
@@ -830,16 +779,14 @@ class VisibilityOrderingBuilderInner extends PureComponent {
     endUndoGroup();
   }
   handleGroupCreate() {
-    var {
-      movedColumns,
-      onMovedColumnsChanged,
-      onColumnHeaderGroupChanged,
-      startUndoGroup
-    } = this.props;
-    var {
-      newMoves,
-      groups
-    } = this.moveSelectedColumns(VisibilityOrderingBuilderInner.MOVE_OPTIONS.TOP);
+    var _this$props0 = this.props,
+      movedColumns = _this$props0.movedColumns,
+      onMovedColumnsChanged = _this$props0.onMovedColumnsChanged,
+      onColumnHeaderGroupChanged = _this$props0.onColumnHeaderGroupChanged,
+      startUndoGroup = _this$props0.startUndoGroup;
+    var _this$moveSelectedCol2 = this.moveSelectedColumns(VisibilityOrderingBuilderInner.MOVE_OPTIONS.TOP),
+      newMoves = _this$moveSelectedCol2.newMoves,
+      groups = _this$moveSelectedCol2.groups;
     var newGroups = groups.filter(group => !group.isNew);
     var selectedItems = this.getSelectedParentItems();
     var childIndexes = selectedItems.map(item => item.data.modelIndex).flat().filter(index => index >= 0);
@@ -850,9 +797,7 @@ class VisibilityOrderingBuilderInner extends PureComponent {
     var newGroup = new ColumnHeaderGroup({
       name,
       children: selectedItems.map(_ref1 => {
-        var {
-          id
-        } = _ref1;
+        var id = _ref1.id;
         return id;
       }),
       depth: 0,
@@ -875,25 +820,18 @@ class VisibilityOrderingBuilderInner extends PureComponent {
    * @returns Error message if invalid
    */
   validateGroupName(groupName) {
-    var {
-      model,
-      columnHeaderGroups
-    } = this.props;
-    var {
-      columns
-    } = model;
+    var _this$props1 = this.props,
+      model = _this$props1.model,
+      columnHeaderGroups = _this$props1.columnHeaderGroups;
+    var columns = model.columns;
     if (!DbNameValidator.isValidColumnName(groupName)) {
       return 'Invalid name';
     }
     if (columns.some(_ref10 => {
-      var {
-        name
-      } = _ref10;
+      var name = _ref10.name;
       return name === groupName;
     }) || columnHeaderGroups.some(_ref11 => {
-      var {
-        name
-      } = _ref11;
+      var name = _ref11.name;
       return name === groupName;
     })) {
       return 'Duplicate name';
@@ -901,28 +839,21 @@ class VisibilityOrderingBuilderInner extends PureComponent {
     return '';
   }
   renderItem(_ref12) {
-    var {
-      value,
-      clone,
-      item,
-      ref,
-      handleProps
-    } = _ref12;
-    var {
-      onColumnVisibilityChanged
-    } = this.props;
-    var {
-      selectedColumns,
-      showHiddenColumns
-    } = this.state;
+    var value = _ref12.value,
+      clone = _ref12.clone,
+      item = _ref12.item,
+      ref = _ref12.ref,
+      handleProps = _ref12.handleProps;
+    var onColumnVisibilityChanged = this.props.onColumnVisibilityChanged;
+    var _this$state2 = this.state,
+      selectedColumns = _this$state2.selectedColumns,
+      showHiddenColumns = _this$state2.showHiddenColumns;
     var displayString = value;
 
     // The cloned drag overlay we want to show the items being dragged
     if (clone) {
       var selectedItemNames = this.getSelectedParentItems().map(_ref13 => {
-        var {
-          id
-        } = _ref13;
+        var id = _ref13.id;
         return id;
       });
       displayString = selectedItemNames.join(', ');
@@ -947,20 +878,18 @@ class VisibilityOrderingBuilderInner extends PureComponent {
    * Gets the first movable visible index
    */
   getFirstMovableIndex() {
-    var {
-      model,
-      movedColumns
-    } = this.props;
+    var _this$props10 = this.props,
+      model = _this$props10.model,
+      movedColumns = _this$props10.movedColumns;
     return this.getMemoizedFirstMovableIndex(model, model.columns, movedColumns);
   }
   /**
    * Gets the last movable visible index
    */
   getLastMovableIndex() {
-    var {
-      model,
-      movedColumns
-    } = this.props;
+    var _this$props11 = this.props,
+      model = _this$props11.model,
+      movedColumns = _this$props11.movedColumns;
     return this.getMemoizedLastMovableIndex(model, model.columns, movedColumns);
   }
   /**
@@ -970,16 +899,14 @@ class VisibilityOrderingBuilderInner extends PureComponent {
    * @returns The tree items in order
    */
   getTreeItems(showHiddenColumns) {
-    var {
-      model,
-      hiddenColumns
-    } = this.props;
-    var {
-      movedColumns,
-      columnHeaderGroups,
-      selectedColumns,
-      showHiddenColumns: showHiddenColumnsState
-    } = this.state;
+    var _this$props12 = this.props,
+      model = _this$props12.model,
+      hiddenColumns = _this$props12.hiddenColumns;
+    var _this$state3 = this.state,
+      movedColumns = _this$state3.movedColumns,
+      columnHeaderGroups = _this$state3.columnHeaderGroups,
+      selectedColumns = _this$state3.selectedColumns,
+      showHiddenColumnsState = _this$state3.showHiddenColumns;
     return this.memoizedGetTreeItems(model.columns, movedColumns, columnHeaderGroups, hiddenColumns, selectedColumns, showHiddenColumns !== null && showHiddenColumns !== void 0 ? showHiddenColumns : showHiddenColumnsState);
   }
   /**
@@ -991,9 +918,7 @@ class VisibilityOrderingBuilderInner extends PureComponent {
     return this.memoizedGetFlattenedTree(this.getTreeItems(showHiddenColumns));
   }
   getSelectedItemModelIndexes(columnNames) {
-    var {
-      model
-    } = this.props;
+    var model = this.props.model;
     return [...columnNames.values()].map(name => model.getColumnIndexByName(name)).filter(i => i != null).flat();
   }
 
@@ -1004,15 +929,11 @@ class VisibilityOrderingBuilderInner extends PureComponent {
    * @returns The array of items whose parents are not selected
    */
   getSelectedParentItems() {
-    var {
-      selectedColumns
-    } = this.state;
+    var selectedColumns = this.state.selectedColumns;
     var treeItems = this.getFlattenedTree();
     return treeItems.filter(_ref14 => {
-      var {
-        id,
-        parentId
-      } = _ref14;
+      var id = _ref14.id,
+        parentId = _ref14.parentId;
       return (
         // All items whose parents are not selected
         selectedColumns.has(id) && !selectedColumns.has(parentId !== null && parentId !== void 0 ? parentId : '')
@@ -1020,10 +941,9 @@ class VisibilityOrderingBuilderInner extends PureComponent {
     });
   }
   handleOverflowAction(key) {
-    var {
-      undo,
-      redo
-    } = this.props;
+    var _this$props13 = this.props,
+      undo = _this$props13.undo,
+      redo = _this$props13.redo;
     switch (key) {
       case 'undo':
         undo();
@@ -1040,12 +960,11 @@ class VisibilityOrderingBuilderInner extends PureComponent {
     }
   }
   handleKeyboardShortcut(event) {
-    var {
-      canUndo,
-      canRedo,
-      undo,
-      redo
-    } = this.props;
+    var _this$props14 = this.props,
+      canUndo = _this$props14.canUndo,
+      canRedo = _this$props14.canRedo,
+      undo = _this$props14.undo,
+      redo = _this$props14.redo;
     if (GLOBAL_SHORTCUTS.UNDO.matchesEvent(event) && canUndo) {
       event.preventDefault();
       undo();
@@ -1058,13 +977,10 @@ class VisibilityOrderingBuilderInner extends PureComponent {
     if (isOpen) {
       this.resetSelection();
     } else {
-      var {
-        showHiddenColumns,
-        selectedColumns
-      } = this.state;
-      var {
-        onColumnVisibilityChanged
-      } = this.props;
+      var _this$state4 = this.state,
+        showHiddenColumns = _this$state4.showHiddenColumns,
+        selectedColumns = _this$state4.selectedColumns;
+      var onColumnVisibilityChanged = this.props.onColumnVisibilityChanged;
       // Make sure all selected columns are visible when closing the search modal
       if (!showHiddenColumns) {
         var modelIndexesToShow = this.getSelectedItemModelIndexes(selectedColumns);
@@ -1076,18 +992,16 @@ class VisibilityOrderingBuilderInner extends PureComponent {
     });
   }
   render() {
-    var {
-      model,
-      hiddenColumns,
-      onColumnVisibilityChanged,
-      canUndo,
-      canRedo
-    } = this.props;
-    var {
-      selectedColumns,
-      showHiddenColumns,
-      isSearchModalOpen
-    } = this.state;
+    var _this$props15 = this.props,
+      model = _this$props15.model,
+      hiddenColumns = _this$props15.hiddenColumns,
+      onColumnVisibilityChanged = _this$props15.onColumnVisibilityChanged,
+      canUndo = _this$props15.canUndo,
+      canRedo = _this$props15.canRedo;
+    var _this$state5 = this.state,
+      selectedColumns = _this$state5.selectedColumns,
+      showHiddenColumns = _this$state5.showHiddenColumns,
+      isSearchModalOpen = _this$state5.isSearchModalOpen;
     var hasSelection = selectedColumns.size > 0;
     var flattenedItems = this.getFlattenedTree();
     var hiddenColumnsSet = new Set(hiddenColumns);
@@ -1286,30 +1200,26 @@ _defineProperty(VisibilityOrderingBuilderInner, "MOVE_OPTIONS", {
   DOWN: 'DOWN'
 });
 var VisibilityOrderingBuilder = /*#__PURE__*/memo(props => {
-  var {
-    movedColumns,
-    hiddenColumns,
-    columnHeaderGroups,
-    onMovedColumnsChanged,
-    onColumnVisibilityChanged,
-    onColumnHeaderGroupChanged,
-    onFrozenColumnsChanged,
-    // Used for unit tests only
-    __testRef
-  } = props;
-  var {
-    set: setUndoState,
-    undo,
-    canUndo,
-    redo,
-    canRedo,
-    state
-  } = useUndoRedo({
-    movedColumns,
-    hiddenColumns,
-    columnHeaderGroups,
-    frozenColumns: props.model.frozenColumns
-  });
+  var movedColumns = props.movedColumns,
+    hiddenColumns = props.hiddenColumns,
+    columnHeaderGroups = props.columnHeaderGroups,
+    onMovedColumnsChanged = props.onMovedColumnsChanged,
+    onColumnVisibilityChanged = props.onColumnVisibilityChanged,
+    onColumnHeaderGroupChanged = props.onColumnHeaderGroupChanged,
+    onFrozenColumnsChanged = props.onFrozenColumnsChanged,
+    __testRef = props.__testRef;
+  var _useUndoRedo = useUndoRedo({
+      movedColumns,
+      hiddenColumns,
+      columnHeaderGroups,
+      frozenColumns: props.model.frozenColumns
+    }),
+    setUndoState = _useUndoRedo.set,
+    undo = _useUndoRedo.undo,
+    canUndo = _useUndoRedo.canUndo,
+    redo = _useUndoRedo.redo,
+    canRedo = _useUndoRedo.canRedo,
+    state = _useUndoRedo.state;
 
   // On undo/redo, we need to ignore the prop change
   // because we are the ones updating the props