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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (58) hide show
  1. package/dist/CellInputField.js +41 -22
  2. package/dist/CellInputField.js.map +1 -1
  3. package/dist/CellRenderer.js +19 -27
  4. package/dist/CellRenderer.js.map +1 -1
  5. package/dist/DataBarCellRenderer.js +61 -87
  6. package/dist/DataBarCellRenderer.js.map +1 -1
  7. package/dist/Grid.d.ts.map +1 -1
  8. package/dist/Grid.js +291 -453
  9. package/dist/Grid.js.map +1 -1
  10. package/dist/GridColorUtils.js +23 -21
  11. package/dist/GridColorUtils.js.map +1 -1
  12. package/dist/GridMetricCalculator.js +192 -303
  13. package/dist/GridMetricCalculator.js.map +1 -1
  14. package/dist/GridRange.js +18 -28
  15. package/dist/GridRange.js.map +1 -1
  16. package/dist/GridRenderer.js +429 -600
  17. package/dist/GridRenderer.js.map +1 -1
  18. package/dist/GridUtils.js +130 -163
  19. package/dist/GridUtils.js.map +1 -1
  20. package/dist/MockGridModel.js +17 -10
  21. package/dist/MockGridModel.js.map +1 -1
  22. package/dist/MockTreeGridModel.js +36 -31
  23. package/dist/MockTreeGridModel.js.map +1 -1
  24. package/dist/TextCellRenderer.js +36 -57
  25. package/dist/TextCellRenderer.js.map +1 -1
  26. package/dist/key-handlers/EditKeyHandler.js +4 -7
  27. package/dist/key-handlers/EditKeyHandler.js.map +1 -1
  28. package/dist/key-handlers/PasteKeyHandler.js +1 -3
  29. package/dist/key-handlers/PasteKeyHandler.js.map +1 -1
  30. package/dist/key-handlers/SelectionKeyHandler.js +40 -71
  31. package/dist/key-handlers/SelectionKeyHandler.js.map +1 -1
  32. package/dist/key-handlers/TreeKeyHandler.js +4 -10
  33. package/dist/key-handlers/TreeKeyHandler.js.map +1 -1
  34. package/dist/mouse-handlers/EditMouseHandler.js +3 -7
  35. package/dist/mouse-handlers/EditMouseHandler.js.map +1 -1
  36. package/dist/mouse-handlers/GridColumnMoveMouseHandler.js +54 -82
  37. package/dist/mouse-handlers/GridColumnMoveMouseHandler.js.map +1 -1
  38. package/dist/mouse-handlers/GridColumnSeparatorMouseHandler.js +4 -8
  39. package/dist/mouse-handlers/GridColumnSeparatorMouseHandler.js.map +1 -1
  40. package/dist/mouse-handlers/GridHorizontalScrollBarMouseHandler.js +31 -55
  41. package/dist/mouse-handlers/GridHorizontalScrollBarMouseHandler.js.map +1 -1
  42. package/dist/mouse-handlers/GridRowMoveMouseHandler.js +26 -46
  43. package/dist/mouse-handlers/GridRowMoveMouseHandler.js.map +1 -1
  44. package/dist/mouse-handlers/GridRowSeparatorMouseHandler.js +2 -4
  45. package/dist/mouse-handlers/GridRowSeparatorMouseHandler.js.map +1 -1
  46. package/dist/mouse-handlers/GridRowTreeMouseHandler.js +14 -22
  47. package/dist/mouse-handlers/GridRowTreeMouseHandler.js.map +1 -1
  48. package/dist/mouse-handlers/GridScrollBarCornerMouseHandler.js +8 -16
  49. package/dist/mouse-handlers/GridScrollBarCornerMouseHandler.js.map +1 -1
  50. package/dist/mouse-handlers/GridSelectionMouseHandler.js +47 -75
  51. package/dist/mouse-handlers/GridSelectionMouseHandler.js.map +1 -1
  52. package/dist/mouse-handlers/GridSeparatorMouseHandler.js +9 -23
  53. package/dist/mouse-handlers/GridSeparatorMouseHandler.js.map +1 -1
  54. package/dist/mouse-handlers/GridTokenMouseHandler.js +24 -39
  55. package/dist/mouse-handlers/GridTokenMouseHandler.js.map +1 -1
  56. package/dist/mouse-handlers/GridVerticalScrollBarMouseHandler.js +31 -55
  57. package/dist/mouse-handlers/GridVerticalScrollBarMouseHandler.js.map +1 -1
  58. package/package.json +3 -3
package/dist/GridUtils.js CHANGED
@@ -1,3 +1,9 @@
1
+ function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
2
+ 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."); }
3
+ 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; } }
4
+ 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; }
5
+ 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; } }
6
+ function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
1
7
  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; }
2
8
  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; }
3
9
  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; }
@@ -33,18 +39,15 @@ export class GridUtils {
33
39
  };
34
40
  }
35
41
  static getCellInfoFromXY(x, y, metrics) {
36
- var {
37
- row,
38
- column
39
- } = GridUtils.getGridPointFromXY(x, y, metrics);
40
- var {
41
- allColumnWidths,
42
- allRowHeights,
43
- allColumnXs,
44
- allRowYs,
45
- modelColumns,
46
- modelRows
47
- } = metrics;
42
+ var _GridUtils$getGridPoi = GridUtils.getGridPointFromXY(x, y, metrics),
43
+ row = _GridUtils$getGridPoi.row,
44
+ column = _GridUtils$getGridPoi.column;
45
+ var allColumnWidths = metrics.allColumnWidths,
46
+ allRowHeights = metrics.allRowHeights,
47
+ allColumnXs = metrics.allColumnXs,
48
+ allRowYs = metrics.allRowYs,
49
+ modelColumns = metrics.modelColumns,
50
+ modelRows = metrics.modelRows;
48
51
  var modelRow = row !== null ? modelRows.get(row) : null;
49
52
  var modelColumn = column !== null ? modelColumns.get(column) : null;
50
53
  var left = column !== null ? allColumnXs.get(column) : null;
@@ -64,10 +67,8 @@ export class GridUtils {
64
67
  }
65
68
  static getColumnHeaderDepthAtY(y, metrics) {
66
69
  var row = GridUtils.getRowAtY(y, metrics);
67
- var {
68
- columnHeaderHeight,
69
- columnHeaderMaxDepth
70
- } = metrics;
70
+ var columnHeaderHeight = metrics.columnHeaderHeight,
71
+ columnHeaderMaxDepth = metrics.columnHeaderMaxDepth;
71
72
  if (row === null && y <= columnHeaderHeight * columnHeaderMaxDepth) {
72
73
  return clamp(columnHeaderMaxDepth - Math.ceil(y / columnHeaderHeight), 0, columnHeaderMaxDepth - 1);
73
74
  }
@@ -204,15 +205,13 @@ export class GridUtils {
204
205
  */
205
206
  static getColumnAtX(x, metrics) {
206
207
  var ignoreFloating = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
207
- var {
208
- columnCount,
209
- floatingLeftColumnCount,
210
- floatingRightColumnCount,
211
- visibleColumns,
212
- allColumnXs,
213
- allColumnWidths,
214
- gridX
215
- } = metrics;
208
+ var columnCount = metrics.columnCount,
209
+ floatingLeftColumnCount = metrics.floatingLeftColumnCount,
210
+ floatingRightColumnCount = metrics.floatingRightColumnCount,
211
+ visibleColumns = metrics.visibleColumns,
212
+ allColumnXs = metrics.allColumnXs,
213
+ allColumnWidths = metrics.allColumnWidths,
214
+ gridX = metrics.gridX;
216
215
  if (x < gridX) {
217
216
  return null;
218
217
  }
@@ -226,15 +225,13 @@ export class GridUtils {
226
225
  * @returns Index of the row at that coordinate, or null if no row matches
227
226
  */
228
227
  static getRowAtY(y, metrics) {
229
- var {
230
- floatingTopRowCount,
231
- floatingBottomRowCount,
232
- rowCount,
233
- visibleRows,
234
- allRowYs,
235
- allRowHeights,
236
- gridY
237
- } = metrics;
228
+ var floatingTopRowCount = metrics.floatingTopRowCount,
229
+ floatingBottomRowCount = metrics.floatingBottomRowCount,
230
+ rowCount = metrics.rowCount,
231
+ visibleRows = metrics.visibleRows,
232
+ allRowYs = metrics.allRowYs,
233
+ allRowHeights = metrics.allRowHeights,
234
+ gridY = metrics.gridY;
238
235
  if (y < gridY) {
239
236
  return null;
240
237
  }
@@ -270,11 +267,9 @@ export class GridUtils {
270
267
  * @returns Index of the next visible item, or null if no more are visible
271
268
  */
272
269
  static getNextShownColumn(startIndex, metrics) {
273
- var {
274
- modelColumns,
275
- visibleColumns,
276
- userColumnWidths
277
- } = metrics;
270
+ var modelColumns = metrics.modelColumns,
271
+ visibleColumns = metrics.visibleColumns,
272
+ userColumnWidths = metrics.userColumnWidths;
278
273
  return GridUtils.getNextShownItem(startIndex, modelColumns, visibleColumns, userColumnWidths);
279
274
  }
280
275
 
@@ -285,11 +280,9 @@ export class GridUtils {
285
280
  * @returns Index of the next visible item, or null if no more are visible
286
281
  */
287
282
  static getNextShownRow(startIndex, metrics) {
288
- var {
289
- modelRows,
290
- visibleRows,
291
- userRowHeights
292
- } = metrics;
283
+ var modelRows = metrics.modelRows,
284
+ visibleRows = metrics.visibleRows,
285
+ userRowHeights = metrics.userRowHeights;
293
286
  return GridUtils.getNextShownItem(startIndex, modelRows, visibleRows, userRowHeights);
294
287
  }
295
288
 
@@ -374,22 +367,18 @@ export class GridUtils {
374
367
  * @returns Index of the column separator at the coordinates provided, or null if none match
375
368
  */
376
369
  static getColumnSeparatorIndex(x, y, metrics, theme, model) {
377
- var {
378
- rowHeaderWidth,
379
- columnHeaderHeight,
380
- floatingColumns,
381
- floatingLeftWidth,
382
- visibleColumns,
383
- allColumnXs,
384
- allColumnWidths,
385
- columnHeaderMaxDepth,
386
- columnCount,
387
- movedColumns
388
- } = metrics;
389
- var {
390
- allowColumnResize,
391
- headerSeparatorHandleSize
392
- } = theme;
370
+ var rowHeaderWidth = metrics.rowHeaderWidth,
371
+ columnHeaderHeight = metrics.columnHeaderHeight,
372
+ floatingColumns = metrics.floatingColumns,
373
+ floatingLeftWidth = metrics.floatingLeftWidth,
374
+ visibleColumns = metrics.visibleColumns,
375
+ allColumnXs = metrics.allColumnXs,
376
+ allColumnWidths = metrics.allColumnWidths,
377
+ columnHeaderMaxDepth = metrics.columnHeaderMaxDepth,
378
+ columnCount = metrics.columnCount,
379
+ movedColumns = metrics.movedColumns;
380
+ var allowColumnResize = theme.allowColumnResize,
381
+ headerSeparatorHandleSize = theme.headerSeparatorHandleSize;
393
382
  if (columnHeaderMaxDepth * columnHeaderHeight < y || !allowColumnResize || headerSeparatorHandleSize <= 0) {
394
383
  return null;
395
384
  }
@@ -469,9 +458,7 @@ export class GridUtils {
469
458
  * @returns True if the column is hidden, false otherwise
470
459
  */
471
460
  static isColumnHidden(columnIndex, metrics) {
472
- var {
473
- allColumnWidths
474
- } = metrics;
461
+ var allColumnWidths = metrics.allColumnWidths;
475
462
  return GridUtils.isItemHidden(columnIndex, allColumnWidths);
476
463
  }
477
464
 
@@ -485,11 +472,9 @@ export class GridUtils {
485
472
  if (row == null) {
486
473
  return false;
487
474
  }
488
- var {
489
- floatingTopRowCount,
490
- floatingBottomRowCount,
491
- rowCount
492
- } = metrics;
475
+ var floatingTopRowCount = metrics.floatingTopRowCount,
476
+ floatingBottomRowCount = metrics.floatingBottomRowCount,
477
+ rowCount = metrics.rowCount;
493
478
  return row < floatingTopRowCount || row >= rowCount - floatingBottomRowCount;
494
479
  }
495
480
 
@@ -503,11 +488,9 @@ export class GridUtils {
503
488
  if (column == null) {
504
489
  return false;
505
490
  }
506
- var {
507
- floatingLeftColumnCount,
508
- floatingRightColumnCount,
509
- columnCount
510
- } = metrics;
491
+ var floatingLeftColumnCount = metrics.floatingLeftColumnCount,
492
+ floatingRightColumnCount = metrics.floatingRightColumnCount,
493
+ columnCount = metrics.columnCount;
511
494
  return column < floatingLeftColumnCount || column >= columnCount - floatingRightColumnCount;
512
495
  }
513
496
 
@@ -542,10 +525,8 @@ export class GridUtils {
542
525
  * @returns Array of items that are hidden
543
526
  */
544
527
  static getHiddenColumns(columnIndex, metrics) {
545
- var {
546
- visibleColumns,
547
- allColumnWidths
548
- } = metrics;
528
+ var visibleColumns = metrics.visibleColumns,
529
+ allColumnWidths = metrics.allColumnWidths;
549
530
  return GridUtils.getHiddenItems(columnIndex, allColumnWidths, visibleColumns);
550
531
  }
551
532
 
@@ -558,17 +539,13 @@ export class GridUtils {
558
539
  * @returns Index of the row separator at the coordinates provided, or null if none match
559
540
  */
560
541
  static getRowSeparatorIndex(x, y, metrics, theme) {
561
- var {
562
- rowHeaderWidth,
563
- columnHeaderHeight,
564
- visibleRows,
565
- allRowYs,
566
- allRowHeights
567
- } = metrics;
568
- var {
569
- allowRowResize,
570
- headerSeparatorHandleSize
571
- } = theme;
542
+ var rowHeaderWidth = metrics.rowHeaderWidth,
543
+ columnHeaderHeight = metrics.columnHeaderHeight,
544
+ visibleRows = metrics.visibleRows,
545
+ allRowYs = metrics.allRowYs,
546
+ allRowHeights = metrics.allRowHeights;
547
+ var allowRowResize = theme.allowRowResize,
548
+ headerSeparatorHandleSize = theme.headerSeparatorHandleSize;
572
549
  if (rowHeaderWidth < x || !allowRowResize || headerSeparatorHandleSize <= 0) {
573
550
  return null;
574
551
  }
@@ -608,9 +585,7 @@ export class GridUtils {
608
585
  * @returns True if the row is hidden, false otherwise
609
586
  */
610
587
  static isRowHidden(rowIndex, metrics) {
611
- var {
612
- allRowHeights
613
- } = metrics;
588
+ var allRowHeights = metrics.allRowHeights;
614
589
  return GridUtils.isItemHidden(rowIndex, allRowHeights);
615
590
  }
616
591
 
@@ -621,10 +596,8 @@ export class GridUtils {
621
596
  * @returns Array of items that are hidden
622
597
  */
623
598
  static getHiddenRows(rowIndex, metrics) {
624
- var {
625
- visibleRows,
626
- allRowHeights
627
- } = metrics;
599
+ var visibleRows = metrics.visibleRows,
600
+ allRowHeights = metrics.allRowHeights;
628
601
  return GridUtils.getHiddenItems(rowIndex, allRowHeights, visibleRows);
629
602
  }
630
603
 
@@ -736,15 +709,15 @@ export class GridUtils {
736
709
  var reverse = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
737
710
  var result = [[start, end]];
738
711
  var _loop = function _loop() {
739
- var {
740
- from: fromItemOrRange,
741
- to: toItem
742
- } = movedItems[i];
712
+ var _movedItems$i = movedItems[i],
713
+ fromItemOrRange = _movedItems$i.from,
714
+ toItem = _movedItems$i.to;
743
715
  var length = 1;
744
716
  var fromItem;
745
717
  if (isBoundedAxisRange(fromItemOrRange)) {
746
718
  length = fromItemOrRange[1] - fromItemOrRange[0] + 1; // Ranges are inclusive
747
- [fromItem] = fromItemOrRange;
719
+ var _fromItemOrRange = _slicedToArray(fromItemOrRange, 1);
720
+ fromItem = _fromItemOrRange[0];
748
721
  } else {
749
722
  fromItem = fromItemOrRange;
750
723
  }
@@ -758,17 +731,23 @@ export class GridUtils {
758
731
  var currentStart = (_result$j$ = result[j][0]) !== null && _result$j$ !== void 0 ? _result$j$ : Number.NEGATIVE_INFINITY;
759
732
  var currentEnd = (_result$j$2 = result[j][1]) !== null && _result$j$2 !== void 0 ? _result$j$2 : Number.POSITIVE_INFINITY;
760
733
  var movedRange;
761
- var currentResult = [[currentStart, fromStart - 1], [fromStart, fromEnd], [fromEnd + 1, currentEnd]].map(_ref2 => {
762
- var [s, e] = _ref2;
734
+ var currentResult = [[currentStart, fromStart - 1], [fromStart, fromEnd], [fromEnd + 1, currentEnd]].map(_ref3 => {
735
+ var _ref4 = _slicedToArray(_ref3, 2),
736
+ s = _ref4[0],
737
+ e = _ref4[1];
763
738
  return [
764
739
  // Cap the ranges to within the current range bounds
765
740
  Math.max(s, currentStart), Math.min(e, currentEnd)];
766
- }).filter(_ref3 => {
767
- var [s, e] = _ref3;
741
+ }).filter(_ref5 => {
742
+ var _ref6 = _slicedToArray(_ref5, 2),
743
+ s = _ref6[0],
744
+ e = _ref6[1];
768
745
  return s <= e;
769
746
  }) // Remove invalid ranges
770
747
  .map(range => {
771
- var [s, e] = range;
748
+ var _range = _slicedToArray(range, 2),
749
+ s = _range[0],
750
+ e = _range[1];
772
751
  if (fromStart <= s && fromEnd >= e) {
773
752
  // Current range in moved range
774
753
  movedRange = [s + moveDistance, e + moveDistance];
@@ -780,7 +759,9 @@ export class GridUtils {
780
759
  }
781
760
  return range;
782
761
  }).map(range => {
783
- var [s, e] = range;
762
+ var _range2 = _slicedToArray(range, 2),
763
+ s = _range2[0],
764
+ e = _range2[1];
784
765
  if (toStart > s && toStart <= e) {
785
766
  // Moved range splits this range
786
767
  return [[s, toStart - 1], [toStart + length, e + length]];
@@ -803,7 +784,9 @@ export class GridUtils {
803
784
 
804
785
  // Return infinity values back to null
805
786
  result = nextResult.map(_ref => {
806
- var [s, e] = _ref;
787
+ var _ref2 = _slicedToArray(_ref, 2),
788
+ s = _ref2[0],
789
+ e = _ref2[1];
807
790
  return [Number.isFinite(s) ? s : null, Number.isFinite(e) ? e : null];
808
791
  });
809
792
  };
@@ -976,9 +959,7 @@ export class GridUtils {
976
959
  * @returns True if this platform is a Mac, false otherwise
977
960
  */
978
961
  static isMacPlatform() {
979
- var {
980
- platform
981
- } = window.navigator;
962
+ var platform = window.navigator.platform;
982
963
  return platform.startsWith('Mac');
983
964
  }
984
965
 
@@ -1035,22 +1016,20 @@ export class GridUtils {
1035
1016
  * @returns Dimensions of the drag area in relation to the canvas they need to drag outside of to start scrolling
1036
1017
  */
1037
1018
  static getScrollDragBounds(metrics, row, column) {
1038
- var {
1039
- gridX,
1040
- gridY,
1041
- width,
1042
- height,
1043
- floatingTopRowCount,
1044
- floatingBottomRowCount,
1045
- floatingLeftColumnCount,
1046
- floatingRightColumnCount,
1047
- floatingLeftWidth,
1048
- floatingRightWidth,
1049
- floatingTopHeight,
1050
- floatingBottomHeight,
1051
- columnCount,
1052
- rowCount
1053
- } = metrics;
1019
+ var gridX = metrics.gridX,
1020
+ gridY = metrics.gridY,
1021
+ width = metrics.width,
1022
+ height = metrics.height,
1023
+ floatingTopRowCount = metrics.floatingTopRowCount,
1024
+ floatingBottomRowCount = metrics.floatingBottomRowCount,
1025
+ floatingLeftColumnCount = metrics.floatingLeftColumnCount,
1026
+ floatingRightColumnCount = metrics.floatingRightColumnCount,
1027
+ floatingLeftWidth = metrics.floatingLeftWidth,
1028
+ floatingRightWidth = metrics.floatingRightWidth,
1029
+ floatingTopHeight = metrics.floatingTopHeight,
1030
+ floatingBottomHeight = metrics.floatingBottomHeight,
1031
+ columnCount = metrics.columnCount,
1032
+ rowCount = metrics.rowCount;
1054
1033
  var x1 = gridX;
1055
1034
  var y1 = gridY;
1056
1035
  var x2 = width;
@@ -1094,10 +1073,8 @@ export class GridUtils {
1094
1073
  var pageHeight = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 768;
1095
1074
  var lineWidth = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 20;
1096
1075
  var lineHeight = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 20;
1097
- var {
1098
- deltaX,
1099
- deltaY
1100
- } = wheelEvent;
1076
+ var deltaX = wheelEvent.deltaX,
1077
+ deltaY = wheelEvent.deltaY;
1101
1078
 
1102
1079
  // Flip scroll direction if shiftKey is held on windows/linux.
1103
1080
  // On mac, deltaX/Y values are switched at the event level when shiftKey=true.
@@ -1168,20 +1145,16 @@ export class GridUtils {
1168
1145
  * @returns The token box with translated coordinates
1169
1146
  */
1170
1147
  static translateTokenBox(tokenBox, metrics) {
1171
- var {
1172
- x1: left,
1173
- y1: top,
1174
- x2: right,
1175
- y2: bottom
1176
- } = tokenBox;
1177
- var {
1178
- gridX,
1179
- gridY,
1180
- width: gridWidth,
1181
- height: gridHeight,
1182
- verticalBarWidth,
1183
- horizontalBarHeight
1184
- } = metrics;
1148
+ var left = tokenBox.x1,
1149
+ top = tokenBox.y1,
1150
+ right = tokenBox.x2,
1151
+ bottom = tokenBox.y2;
1152
+ var gridX = metrics.gridX,
1153
+ gridY = metrics.gridY,
1154
+ gridWidth = metrics.width,
1155
+ gridHeight = metrics.height,
1156
+ verticalBarWidth = metrics.verticalBarWidth,
1157
+ horizontalBarHeight = metrics.horizontalBarHeight;
1185
1158
 
1186
1159
  // Clamp the values within the grid
1187
1160
  var newLeft = clamp(gridX + left, gridX, gridWidth - verticalBarWidth);
@@ -1208,25 +1181,19 @@ export class GridUtils {
1208
1181
  * @returns Object with width, x, and y of the text
1209
1182
  */
1210
1183
  static getTextRenderMetrics(state, column, row) {
1211
- var {
1212
- metrics,
1213
- model,
1214
- theme
1215
- } = state;
1216
- var {
1217
- firstColumn,
1218
- allColumnXs,
1219
- allColumnWidths,
1220
- allRowYs,
1221
- allRowHeights,
1222
- modelRows,
1223
- modelColumns
1224
- } = metrics;
1225
- var {
1226
- cellHorizontalPadding,
1227
- treeDepthIndent,
1228
- treeHorizontalPadding
1229
- } = theme;
1184
+ var metrics = state.metrics,
1185
+ model = state.model,
1186
+ theme = state.theme;
1187
+ var firstColumn = metrics.firstColumn,
1188
+ allColumnXs = metrics.allColumnXs,
1189
+ allColumnWidths = metrics.allColumnWidths,
1190
+ allRowYs = metrics.allRowYs,
1191
+ allRowHeights = metrics.allRowHeights,
1192
+ modelRows = metrics.modelRows,
1193
+ modelColumns = metrics.modelColumns;
1194
+ var cellHorizontalPadding = theme.cellHorizontalPadding,
1195
+ treeDepthIndent = theme.treeDepthIndent,
1196
+ treeHorizontalPadding = theme.treeHorizontalPadding;
1230
1197
  var modelRow = getOrThrow(modelRows, row);
1231
1198
  var modelColumn = getOrThrow(modelColumns, column);
1232
1199
  var textAlign = model.textAlignForCell(modelColumn, modelRow);