@atlaskit/editor-tables 3.1.15 → 3.2.0

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/editor-tables
 
+## 3.2.0
+
+### Minor Changes
+
+- [`3ea3e1ea19b04`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/3ea3e1ea19b04) -
+  Add dedicated table selection entry points while preserving existing imports and table editing
+  behavior. Prefer the following imports over the aggregate `@atlaskit/editor-tables/utils` entry
+  point:
+  - `import { selectTable } from '@atlaskit/editor-tables/select-table'`
+  - `import { selectTableClosestToPos } from '@atlaskit/editor-tables/select-table-closest-to-pos'`
+  - `import { getTableSelectionClosesToPos } from '@atlaskit/editor-tables/get-table-selection-closes-to-pos'`
+
+## 3.1.16
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 3.1.15
 
 ### Patch Changes

package/cell-bookmark/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@atlaskit/editor-tables/cell-bookmark",
-  "main": "../dist/cjs/entry-points/cell-bookmark.js",
-  "module": "../dist/esm/entry-points/cell-bookmark.js",
-  "module:es2019": "../dist/es2019/entry-points/cell-bookmark.js",
+  "main": "../dist/cjs/cell-bookmark.js",
+  "module": "../dist/esm/cell-bookmark.js",
+  "module:es2019": "../dist/es2019/cell-bookmark.js",
   "sideEffects": false,
-  "types": "../dist/types/entry-points/cell-bookmark.d.ts"
+  "types": "../dist/types/cell-bookmark.d.ts"
 }

package/cell-selection/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@atlaskit/editor-tables/cell-selection",
-  "main": "../dist/cjs/entry-points/cell-selection.js",
-  "module": "../dist/esm/entry-points/cell-selection.js",
-  "module:es2019": "../dist/es2019/entry-points/cell-selection.js",
+  "main": "../dist/cjs/cell-selection.js",
+  "module": "../dist/esm/cell-selection.js",
+  "module:es2019": "../dist/es2019/cell-selection.js",
   "sideEffects": false,
-  "types": "../dist/types/entry-points/cell-selection.d.ts"
+  "types": "../dist/types/cell-selection.d.ts"
 }

package/dist/cjs/add-to-cache.js

@@ -0,0 +1,10 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.addToCache = addToCache;
+var _tableMapCache = require("./table-map-cache");
+function addToCache(key, value) {
+  return _tableMapCache.tableMapCache.set(key, value);
+}

package/dist/cjs/cell-bookmark.js

@@ -8,7 +8,7 @@ exports.CellBookmark = void 0;
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _state = require("@atlaskit/editor-prosemirror/state");
-var _tables = require("./utils/tables");
+var _inSameTable = require("./utils/in-same-table");
 /* eslint-disable @atlaskit/editor/no-re-export */
 // Entry file in package.json
 var CellBookmark = exports.CellBookmark = /*#__PURE__*/function () {
@@ -27,7 +27,7 @@ var CellBookmark = exports.CellBookmark = /*#__PURE__*/function () {
     value: function resolve(doc) {
       var $anchorCell = doc.resolve(this.anchor);
       var $headCell = doc.resolve(this.head);
-      if ($anchorCell.parent.type.spec.tableRole === 'row' && $headCell.parent.type.spec.tableRole === 'row' && $anchorCell.index() < $anchorCell.parent.childCount && $headCell.index() < $headCell.parent.childCount && (0, _tables.inSameTable)($anchorCell, $headCell)) {
+      if ($anchorCell.parent.type.spec.tableRole === 'row' && $headCell.parent.type.spec.tableRole === 'row' && $anchorCell.index() < $anchorCell.parent.childCount && $headCell.index() < $headCell.parent.childCount && (0, _inSameTable.inSameTable)($anchorCell, $headCell)) {
         var data = {
           type: 'cell',
           anchor: $anchorCell.pos,

package/dist/cjs/cell-selection.js

@@ -15,10 +15,10 @@ var _model = require("@atlaskit/editor-prosemirror/model");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _cellBookmark = require("./cell-bookmark");
 var _tableMap = require("./table-map");
-var _cells = require("./utils/cells");
-var _colspan = require("./utils/colspan");
 var _getCellSelectionRanges = require("./utils/get-cell-selection-ranges");
-var _tables = require("./utils/tables");
+var _inSameTable = require("./utils/in-same-table");
+var _pointsAtCell = require("./utils/points-at-cell");
+var _removeColSpan = require("./utils/remove-col-span");
 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) { (0, _defineProperty2.default)(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 _callSuper(t, o, e) { return o = (0, _getPrototypeOf2.default)(o), (0, _possibleConstructorReturn2.default)(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2.default)(t).constructor) : o.apply(t, e)); }
@@ -63,7 +63,7 @@ var CellSelection = exports.CellSelection = /*#__PURE__*/function (_Selection) {
     value: function map(doc, mapping) {
       var $anchorCell = doc.resolve(mapping.map(this.$anchorCell.pos));
       var $headCell = doc.resolve(mapping.map(this.$headCell.pos));
-      if ((0, _cells.pointsAtCell)($anchorCell) && (0, _cells.pointsAtCell)($headCell) && (0, _tables.inSameTable)($anchorCell, $headCell)) {
+      if ((0, _pointsAtCell.pointsAtCell)($anchorCell) && (0, _pointsAtCell.pointsAtCell)($headCell) && (0, _inSameTable.inSameTable)($anchorCell, $headCell)) {
         var tableChanged = this.$anchorCell.node(-1) !== $anchorCell.node(-1);
         if (tableChanged && this.isRowSelection()) {
           return CellSelection.rowSelection($anchorCell, $headCell);
@@ -108,12 +108,12 @@ var CellSelection = exports.CellSelection = /*#__PURE__*/function (_Selection) {
                 throw new Error("No cell at position ".concat(pos));
               }
               if (extraLeft > 0) {
-                attrs = (0, _colspan.removeColSpan)(attrs, 0, extraLeft);
+                attrs = (0, _removeColSpan.removeColSpan)(attrs, 0, extraLeft);
               }
               if (extraRight > 0) {
                 // Ignored via go/ees005
                 // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                attrs = (0, _colspan.removeColSpan)(attrs, attrs.colspan - extraRight, extraRight);
+                attrs = (0, _removeColSpan.removeColSpan)(attrs, attrs.colspan - extraRight, extraRight);
               }
               if (cellRect.left < rect.left) {
                 cell = cell.type.createAndFill(attrs);

package/dist/cjs/compute-map.js

@@ -0,0 +1,133 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.computeMap = computeMap;
+var _findBadColWidths = require("./find-bad-col-widths");
+var _findWidth = require("./find-width");
+var _tableMap = require("./table-map");
+/* eslint-disable @atlaskit/editor/no-re-export */
+// Entry file in package.json
+
+// Compute a table map.
+function computeMap(table) {
+  if (table.type.spec.tableRole !== 'table') {
+    throw new RangeError('Not a table node: ' + table.type.name);
+  }
+  var width = (0, _findWidth.findWidth)(table);
+  var height = table.childCount;
+  var map = [];
+  var colWidths = [];
+  var mapPos = 0,
+    problems = null;
+  for (var i = 0, e = width * height; i < e; i++) {
+    map[i] = 0;
+  }
+  for (var row = 0, pos = 0; row < height; row++) {
+    var rowNode = table.child(row);
+    pos++;
+    for (var _i = 0;; _i++) {
+      while (mapPos < map.length && map[mapPos] !== 0) {
+        mapPos++;
+      }
+      if (_i === rowNode.childCount) {
+        break;
+      }
+      var cellNode = rowNode.child(_i),
+        _cellNode$attrs = cellNode.attrs,
+        colspan = _cellNode$attrs.colspan,
+        rowspan = _cellNode$attrs.rowspan,
+        colwidth = _cellNode$attrs.colwidth;
+      for (var h = 0; h < rowspan; h++) {
+        if (h + row >= height) {
+          (problems || (problems = [])).push({
+            type: _tableMap.TableProblemTypes.OVERLONG_ROWSPAN,
+            pos: pos,
+            n: rowspan - h
+          });
+          break;
+        }
+        var start = mapPos + h * width;
+        for (var w = 0; w < colspan; w++) {
+          if (map[start + w] === 0) {
+            map[start + w] = pos;
+          } else {
+            (problems || (problems = [])).push({
+              type: _tableMap.TableProblemTypes.COLLISION,
+              row: row,
+              pos: pos,
+              n: colspan - w
+            });
+          }
+          var colW = colwidth && colwidth[w];
+          if (colW) {
+            var widthIndex = (start + w) % width * 2,
+              prev = colWidths[widthIndex];
+            if (prev == null || prev !== colW && colWidths[widthIndex + 1] === 1) {
+              colWidths[widthIndex] = colW;
+              colWidths[widthIndex + 1] = 1;
+            } else if (prev === colW) {
+              colWidths[widthIndex + 1]++;
+            }
+          }
+        }
+      }
+      mapPos += colspan;
+      pos += cellNode.nodeSize;
+    }
+    var expectedPos = (row + 1) * width;
+    var missing = 0;
+    while (mapPos < expectedPos) {
+      if (map[mapPos++] === 0) {
+        missing++;
+      }
+    }
+    if (missing) {
+      (problems || (problems = [])).push({
+        type: _tableMap.TableProblemTypes.MISSING,
+        row: row,
+        n: missing
+      });
+    }
+    pos++;
+  }
+  var mapByRow = Array(height);
+  var mapByColumn = Array(width);
+  for (var _i2 = 0; _i2 < map.length; _i2++) {
+    var _mapByColumn$columnIn, _mapByRow$rowIndex;
+    var columnIndex = _i2 % width;
+    mapByColumn[columnIndex] = (_mapByColumn$columnIn = mapByColumn[columnIndex]) !== null && _mapByColumn$columnIn !== void 0 ? _mapByColumn$columnIn : [];
+    mapByColumn[columnIndex].push(map[_i2]);
+    var rowIndex = Math.trunc(_i2 / width);
+    mapByRow[rowIndex] = (_mapByRow$rowIndex = mapByRow[rowIndex]) !== null && _mapByRow$rowIndex !== void 0 ? _mapByRow$rowIndex : [];
+    mapByRow[rowIndex].push(map[_i2]);
+  }
+  var tableMap = new _tableMap.TableMap(width, height, map, problems, mapByColumn, mapByRow);
+  var badWidths = false;
+
+  // For columns that have defined widths, but whose widths disagree
+  // between rows, fix up the cells whose width doesn't match the
+  // computed one.
+  for (var _i3 = 0; !badWidths && _i3 < colWidths.length; _i3 += 2) {
+    if (colWidths[_i3] != null && colWidths[_i3 + 1] < height) {
+      badWidths = true;
+    }
+  }
+
+  // colWidths is an array of numbers, it can look like this
+  // const colWidths = [255, 3, 125, 3, 150, 2, 130, 1];
+  // 255 is a colWidth and 3 is a number of cells with this colwidth.
+  // This check exists to make sure that the table has been resized,
+  // which means there will be elements in the colWidths array.
+  if (colWidths.length > 0 && colWidths.length !== width * 2) {
+    for (var _i4 = 0; _i4 < width * 2 - colWidths.length; _i4++) {
+      colWidths.push(_tableMap.tableNewColumnMinWidth, 0);
+    }
+    badWidths = true;
+  }
+  if (badWidths) {
+    (0, _findBadColWidths.findBadColWidths)(tableMap, colWidths, table);
+  }
+  return tableMap;
+}

package/dist/cjs/find-bad-col-widths.js

@@ -0,0 +1,51 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.findBadColWidths = findBadColWidths;
+var _tableMap = require("./table-map");
+/* eslint-disable @atlaskit/editor/no-re-export */
+// Entry file in package.json
+
+// Ignored via go/ees005
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+function freshColWidth(attrs) {
+  if (attrs.colwidth) {
+    return attrs.colwidth.slice();
+  }
+  var result = [];
+  for (var i = 0; i < attrs.colspan; i++) {
+    result.push(0);
+  }
+  return result;
+}
+function findBadColWidths(map, colWidths, table) {
+  if (!map.problems) {
+    map.problems = [];
+  }
+  var seen = {};
+  for (var i = 0; i < map.map.length; i++) {
+    var pos = map.map[i];
+    if (seen[pos]) {
+      continue;
+    }
+    seen[pos] = true;
+    var node = table.nodeAt(pos);
+    var updated = null;
+    for (var j = 0; j < node.attrs.colspan; j++) {
+      var col = (i + j) % map.width,
+        colWidth = colWidths[col * 2];
+      if (colWidth != null && (!node.attrs.colwidth || node.attrs.colwidth[j] !== colWidth)) {
+        (updated || (updated = freshColWidth(node.attrs)))[j] = colWidth;
+      }
+    }
+    if (updated) {
+      map.problems.unshift({
+        type: _tableMap.TableProblemTypes.COLWIDTH_MISMATCH,
+        pos: pos,
+        colwidth: updated
+      });
+    }
+  }
+}

package/dist/cjs/find-width.js

@@ -0,0 +1,41 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.findWidth = findWidth;
+/* eslint-disable @atlaskit/editor/no-re-export */
+// Entry file in package.json
+
+function findWidth(table) {
+  var width = -1;
+  var hasRowSpan = false;
+  for (var row = 0; row < table.childCount; row++) {
+    var rowNode = table.child(row);
+    var rowWidth = 0;
+    if (hasRowSpan) {
+      for (var j = 0; j < row; j++) {
+        var prevRow = table.child(j);
+        for (var i = 0; i < prevRow.childCount; i++) {
+          var cell = prevRow.child(i);
+          if (j + cell.attrs.rowspan > row) {
+            rowWidth += cell.attrs.colspan;
+          }
+        }
+      }
+    }
+    for (var _i = 0; _i < rowNode.childCount; _i++) {
+      var _cell = rowNode.child(_i);
+      rowWidth += _cell.attrs.colspan;
+      if (_cell.attrs.rowspan > 1) {
+        hasRowSpan = true;
+      }
+    }
+    if (width === -1) {
+      width = rowWidth;
+    } else if (width !== rowWidth) {
+      width = Math.max(width, rowWidth);
+    }
+  }
+  return width;
+}

package/dist/cjs/index.js

@@ -12,7 +12,7 @@ Object.defineProperty(exports, "CellSelection", {
 Object.defineProperty(exports, "Rect", {
   enumerable: true,
   get: function get() {
-    return _tableMap.Rect;
+    return _rect.Rect;
   }
 });
 Object.defineProperty(exports, "TableMap", {
@@ -24,7 +24,7 @@ Object.defineProperty(exports, "TableMap", {
 Object.defineProperty(exports, "findTable", {
   enumerable: true,
   get: function get() {
-    return _find.findTable;
+    return _findTable.findTable;
   }
 });
 Object.defineProperty(exports, "uuid", {
@@ -33,7 +33,8 @@ Object.defineProperty(exports, "uuid", {
     return _uuid.uuid;
   }
 });
+var _rect = require("./rect");
 var _tableMap = require("./table-map");
 var _cellSelection = require("./cell-selection");
-var _find = require("./utils/find");
+var _findTable = require("./utils/find-table");
 var _uuid = require("./utils/uuid");

package/dist/cjs/pm-plugins/handle-mouse-down.js

@@ -0,0 +1,154 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.handleMouseDown = handleMouseDown;
+var _cellSelection = require("../cell-selection");
+var _utils = require("../utils");
+var _cellAround = require("../utils/cell-around");
+var _inSameTable = require("../utils/in-same-table");
+var _pluginKey = require("./plugin-key");
+// This file defines a number of helpers for wiring up user input to
+// table-related functionality.
+
+function domInCell(view, inputDom) {
+  var dom = inputDom;
+  for (; dom && dom !== view.dom; dom = dom.parentNode) {
+    if (dom.nodeName === 'TD' || dom.nodeName === 'TH') {
+      return dom;
+    }
+  }
+  return null;
+}
+function cellUnderMouse(view, event) {
+  var mousePos = view.posAtCoords({
+    left: event.clientX,
+    top: event.clientY
+  });
+  if (!mousePos) {
+    return null;
+  }
+  return (0, _cellAround.cellAround)(view.state.doc.resolve(mousePos.pos));
+}
+function isInsideNestedTable(view, event) {
+  var mousePos = view.posAtCoords({
+    left: event.clientX,
+    top: event.clientY
+  });
+  if (!mousePos) {
+    return false;
+  }
+  var pos = view.state.doc.resolve(mousePos.pos);
+  var table = (0, _utils.findTableClosestToPos)(pos);
+  if (!table) {
+    return false;
+  }
+  var parent = view.state.doc.resolve(table.pos).parent;
+  var nodeTypes = view.state.schema.nodes;
+  return [nodeTypes.tableHeader, nodeTypes.tableCell].includes(parent.type);
+}
+function handleMouseDown(view, event) {
+  var startEvent = event;
+  // Prevent right clicks from making a cell selection https://product-fabric.atlassian.net/browse/ED-12527
+  if (startEvent.ctrlKey || startEvent.metaKey || startEvent.button === 2 // right mouse click
+  ) {
+    return false;
+  }
+
+  // Ignored via go/ees005
+  // eslint-disable-next-line @atlaskit/editor/no-as-casting
+  var startDOMCell = domInCell(view, startEvent.target);
+  var $anchor = (0, _cellAround.cellAround)(view.state.selection.$anchor);
+  if (startEvent.shiftKey && view.state.selection instanceof _cellSelection.CellSelection) {
+    var targetElement = event.target instanceof HTMLElement || event.target instanceof SVGElement ? event.target : null;
+    var isDragHandleElement = !!targetElement && !!targetElement.closest('button.pm-table-drag-handle-button-container, button.pm-table-drag-handle-button-clickable-zone');
+    if (isDragHandleElement) {
+      return false;
+    }
+    setCellSelection(view.state.selection.$anchorCell, startEvent);
+    startEvent.preventDefault();
+  } else if (startEvent.shiftKey && startDOMCell && $anchor !== null &&
+  // Ignored via go/ees005
+  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+  cellUnderMouse(view, startEvent).pos !== $anchor.pos) {
+    // Adding to a selection that starts in another cell (causing a
+    // cell selection to be created).
+    setCellSelection($anchor, startEvent);
+    startEvent.preventDefault();
+  } else if (!startDOMCell) {
+    // Not in a cell, let the default behavior happen.
+    return false;
+  }
+
+  // Create and dispatch a cell selection between the given anchor and
+  // the position under the mouse.
+  function setCellSelection($selectionAnchor, event) {
+    var $head = cellUnderMouse(view, event);
+    var starting = _pluginKey.tableEditingKey.getState(view.state) == null;
+    if (!$head || !(0, _inSameTable.inSameTable)($selectionAnchor, $head)) {
+      if (starting) {
+        $head = $selectionAnchor;
+      } else {
+        return false;
+      }
+    }
+    var selection = new _cellSelection.CellSelection($selectionAnchor, $head);
+    if (starting || !view.state.selection.eq(selection)) {
+      var tr = view.state.tr.setSelection(selection);
+      if (starting) {
+        tr.setMeta(_pluginKey.tableEditingKey, $selectionAnchor.pos);
+      }
+      view.dispatch(tr);
+    }
+  }
+
+  // Stop listening to mouse motion events.
+  function stop() {
+    // Ignored via go/ees005
+    // eslint-disable-next-line @repo/internal/dom-events/no-unsafe-event-listeners
+    view.root.removeEventListener('mouseup', stop);
+    // Ignored via go/ees005
+    // eslint-disable-next-line @repo/internal/dom-events/no-unsafe-event-listeners
+    view.root.removeEventListener('dragstart', stop);
+    // Ignored via go/ees005
+    // eslint-disable-next-line @repo/internal/dom-events/no-unsafe-event-listeners
+    view.root.removeEventListener('mousemove', move);
+    if (_pluginKey.tableEditingKey.getState(view.state) != null) {
+      view.dispatch(view.state.tr.setMeta(_pluginKey.tableEditingKey, -1));
+    }
+  }
+  function move(event) {
+    var anchor = _pluginKey.tableEditingKey.getState(view.state);
+    // eslint-disable-next-line @atlaskit/editor/no-as-casting
+    var currDOMCell = domInCell(view, event.target);
+    var isCurrCellInsideNestedTable = isInsideNestedTable(view, event);
+    var isStartCellInsideNestedTable = isInsideNestedTable(view, startEvent);
+    var isBothCellsInSameTable = isCurrCellInsideNestedTable === isStartCellInsideNestedTable;
+    var $moveAnchor;
+    if (anchor != null) {
+      // Continuing an existing cross-cell selection
+      $moveAnchor = view.state.doc.resolve(anchor);
+      // Ignored via go/ees005
+    } else if (currDOMCell !== startDOMCell && isBothCellsInSameTable) {
+      // Moving out of the initial cell -- start a new cell selection
+      $moveAnchor = cellUnderMouse(view, startEvent);
+      if (!$moveAnchor) {
+        stop();
+        return;
+      }
+    }
+    if ($moveAnchor) {
+      setCellSelection($moveAnchor, event);
+    }
+  }
+  // Ignored via go/ees005
+  // eslint-disable-next-line @repo/internal/dom-events/no-unsafe-event-listeners
+  view.root.addEventListener('mouseup', stop);
+  // eslint-disable-next-line @atlaskit/design-system/no-direct-use-of-web-platform-drag-and-drop, @repo/internal/dom-events/no-unsafe-event-listeners
+  view.root.addEventListener('dragstart', stop);
+  // Ignored via go/ees005
+  // eslint-disable-next-line @repo/internal/dom-events/no-unsafe-event-listeners
+  view.root.addEventListener('mousemove', move);
+  return false;
+}

package/dist/cjs/pm-plugins/handle-triple-click.js

@@ -0,0 +1,20 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.handleTripleClick = handleTripleClick;
+var _cellSelection = require("../cell-selection");
+var _cellAround = require("../utils/cell-around");
+// This file defines a number of helpers for wiring up user input to
+// table-related functionality.
+
+function handleTripleClick(view, pos) {
+  var doc = view.state.doc;
+  var $cell = (0, _cellAround.cellAround)(doc.resolve(pos));
+  if (!$cell) {
+    return false;
+  }
+  view.dispatch(view.state.tr.setSelection(new _cellSelection.CellSelection($cell)));
+  return true;
+}