@atlaskit/editor-tables 2.2.4 → 2.2.5

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/editor-tables
 
+## 2.2.5
+
+### Patch Changes
+
+- [`2e01c9c74b5`](https://bitbucket.org/atlassian/atlassian-frontend/commits/2e01c9c74b5) - DUMMY remove before merging to master; dupe adf-schema via adf-utils
+
 ## 2.2.4
 
 ### Patch Changes

package/dist/cjs/cell-bookmark.js

@@ -1,27 +1,20 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.CellBookmark = void 0;
-
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-
 var _prosemirrorState = require("prosemirror-state");
-
 var _tables = require("./utils/tables");
-
 var CellBookmark = /*#__PURE__*/function () {
   function CellBookmark(anchor, head) {
     (0, _classCallCheck2.default)(this, CellBookmark);
     this.anchor = anchor;
     this.head = head;
   }
-
   (0, _createClass2.default)(CellBookmark, [{
     key: "map",
     value: function map(mapping) {
@@ -32,7 +25,6 @@ var 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)) {
         var data = {
           type: 'cell',
@@ -41,11 +33,9 @@ var CellBookmark = /*#__PURE__*/function () {
         };
         return _prosemirrorState.Selection.fromJSON(doc, data);
       }
-
       return _prosemirrorState.Selection.near($headCell, 1);
     }
   }]);
   return CellBookmark;
 }();
-
 exports.CellBookmark = CellBookmark;

package/dist/cjs/cell-selection.js

@@ -1,48 +1,32 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.CellSelection = void 0;
-
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
-
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
-
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
-
 var _prosemirrorModel = require("prosemirror-model");
-
 var _prosemirrorState = require("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");
-
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
-
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } } // Was copied from https://github.com/ProseMirror/prosemirror-tables/blob/master/src/cellselection.js
+// This file defines a ProseMirror selection subclass that models
+// table cell selections. The table plugin needs to be active to wire
+// in the user interaction part of table selections (so that you
+// actually get such selections when you select across cells).
 // ::- A [`Selection`](http://prosemirror.net/docs/ref/#state.Selection)
 // subclass that represents a cell selection spanning part of a table.
 // With the plugin enabled, these will be created when the user
@@ -50,138 +34,112 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 // `selectedCell` CSS class.
 var CellSelection = /*#__PURE__*/function (_Selection) {
   (0, _inherits2.default)(CellSelection, _Selection);
-
   var _super = _createSuper(CellSelection);
-
   // :: (ResolvedPos, ?ResolvedPos)
   // A table selection is identified by its anchor and head cells. The
   // positions given to this constructor should point _before_ two
   // cells in the same table. They may be the same, to select a single
   // cell.
+
   function CellSelection($anchorCell) {
     var _this;
-
     var $headCell = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : $anchorCell;
     (0, _classCallCheck2.default)(this, CellSelection);
     var ranges = (0, _getCellSelectionRanges.getCellSelectionRanges)($anchorCell, $headCell);
-    _this = _super.call(this, ranges[0].$from, ranges[0].$to, ranges); // :: ResolvedPos
+    _this = _super.call(this, ranges[0].$from, ranges[0].$to, ranges);
+    // :: ResolvedPos
     // A resolved position pointing _in front of_ the anchor cell (the one
     // that doesn't move when extending the selection).
-
-    _this.$anchorCell = $anchorCell; // :: ResolvedPos
+    _this.$anchorCell = $anchorCell;
+    // :: ResolvedPos
     // A resolved position pointing in front of the head cell (the one
     // moves when extending the selection).
-
     _this.$headCell = $headCell;
     _this.visible = false;
     return _this;
   }
-
   (0, _createClass2.default)(CellSelection, [{
     key: "map",
     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)) {
         var tableChanged = this.$anchorCell.node(-1) !== $anchorCell.node(-1);
-
         if (tableChanged && this.isRowSelection()) {
           return CellSelection.rowSelection($anchorCell, $headCell);
         }
-
         if (tableChanged && this.isColSelection()) {
           return CellSelection.colSelection($anchorCell, $headCell);
         }
-
         return new CellSelection($anchorCell, $headCell);
       }
-
       return _prosemirrorState.TextSelection.between($anchorCell, $headCell);
-    } // :: () → Slice
+    }
+
+    // :: () → Slice
     // Returns a rectangular slice of table rows containing the selected
     // cells.
-
   }, {
     key: "content",
     value: function content() {
       var table = this.$anchorCell.node(-1);
-
       var map = _tableMap.TableMap.get(table);
-
       var start = this.$anchorCell.start(-1);
       var rect = map.rectBetween(this.$anchorCell.pos - start, this.$headCell.pos - start);
       var seen = {};
       var rows = [];
-
       for (var row = rect.top; row < rect.bottom; row++) {
         var rowContent = [];
-
         for (var index = row * map.width + rect.left, col = rect.left; col < rect.right; col++, index++) {
           var _pos = map.map[index];
-
           if (!seen[_pos]) {
             seen[_pos] = true;
             var cellRect = map.findCell(_pos);
             var cell = table.nodeAt(_pos);
-
             if (cell === null || cell === undefined) {
               throw new Error("No cell at position ".concat(_pos));
             }
-
             var extraLeft = rect.left - cellRect.left;
             var extraRight = cellRect.right - rect.right;
-
             if (extraLeft > 0 || extraRight > 0) {
               var _cell = cell,
-                  attrs = _cell.attrs;
-
+                attrs = _cell.attrs;
               if (!attrs) {
                 throw new Error("No cell at position ".concat(_pos));
               }
-
               if (extraLeft > 0) {
                 attrs = (0, _colspan.removeColSpan)(attrs, 0, extraLeft);
               }
-
               if (extraRight > 0) {
                 attrs = (0, _colspan.removeColSpan)(attrs, attrs.colspan - extraRight, extraRight);
               }
-
               if (cellRect.left < rect.left) {
                 cell = cell.type.createAndFill(attrs);
               } else {
                 cell = cell.type.create(attrs, cell.content);
               }
             }
-
             if (cell === null || cell === undefined) {
               throw new Error("No cell at position after create/createAndFill");
             }
-
             if (cellRect.top < rect.top || cellRect.bottom > rect.bottom) {
               var _attrs = _objectSpread(_objectSpread({}, cell.attrs), {}, {
                 rowspan: Math.min(cellRect.bottom, rect.bottom) - Math.max(cellRect.top, rect.top)
               });
-
               if (cellRect.top < rect.top) {
                 cell = cell.type.createAndFill(_attrs);
               } else {
                 cell = cell.type.create(_attrs, cell.content);
               }
             }
-
             if (cell === null || cell === undefined) {
               throw new Error("No cell at position before rowContent.push");
             }
-
             rowContent.push(cell);
           }
         }
-
         rows.push(table.child(row).copy(_prosemirrorModel.Fragment.from(rowContent)));
       }
-
       var fragment = this.isColSelection() && this.isRowSelection() ? table : rows;
       return new _prosemirrorModel.Slice(_prosemirrorModel.Fragment.from(fragment), 1, 1);
     }
@@ -191,17 +149,14 @@ var CellSelection = /*#__PURE__*/function (_Selection) {
       var content = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : _prosemirrorModel.Slice.empty;
       var mapFrom = tr.steps.length;
       var ranges = this.ranges;
-
       for (var i = 0; i < ranges.length; i++) {
         var _ranges$i = ranges[i],
-            $from = _ranges$i.$from,
-            $to = _ranges$i.$to;
+          $from = _ranges$i.$from,
+          $to = _ranges$i.$to;
         var mapping = tr.mapping.slice(mapFrom);
         tr.replace(mapping.map($from.pos), mapping.map($to.pos), i ? _prosemirrorModel.Slice.empty : content);
       }
-
       var sel = _prosemirrorState.Selection.findFrom(tr.doc.resolve(tr.mapping.slice(mapFrom).map(this.to)), -1);
-
       if (sel) {
         tr.setSelection(sel);
       }
@@ -215,82 +170,74 @@ var CellSelection = /*#__PURE__*/function (_Selection) {
     key: "forEachCell",
     value: function forEachCell(f) {
       var table = this.$anchorCell.node(-1);
-
       var map = _tableMap.TableMap.get(table);
-
       var start = this.$anchorCell.start(-1);
       var cells = map.cellsInRect(map.rectBetween(this.$anchorCell.pos - start, this.$headCell.pos - start));
-
       for (var i = 0; i < cells.length; i++) {
         var cell = table.nodeAt(cells[i]);
-
         if (cell === null || cell === undefined) {
           throw new Error("undefined cell at pos ".concat(cells[i]));
         }
-
         f(cell, start + cells[i]);
       }
-    } // :: () → bool
+    }
+
+    // :: () → bool
     // True if this selection goes all the way from the top to the
     // bottom of the table.
-
   }, {
     key: "isColSelection",
     value: function isColSelection() {
       if (!this.$anchorCell || !this.$headCell) {
         throw new Error('invalid $anchorCell or $headCell');
       }
-
       var anchorTop = this.$anchorCell.index(-1);
       var headTop = this.$headCell.index(-1);
-
       if (Math.min(anchorTop, headTop) > 0) {
         return false;
       }
-
       var anchorBot = anchorTop + this.$anchorCell.nodeAfter.attrs.rowspan;
       var headBot = headTop + this.$headCell.nodeAfter.attrs.rowspan;
       return Math.max(anchorBot, headBot) === this.$headCell.node(-1).childCount;
-    } // :: (ResolvedPos, ?ResolvedPos) → CellSelection
+    }
+
+    // :: (ResolvedPos, ?ResolvedPos) → CellSelection
     // Returns the smallest column selection that covers the given anchor
     // and head cell.
-
   }, {
     key: "isRowSelection",
-    value: // :: () → bool
+    value:
+    // :: () → bool
     // True if this selection goes all the way from the left to the
     // right of the table.
     function isRowSelection() {
       if (!this.$anchorCell || !this.$headCell) {
         return false;
       }
-
       var start = this.$anchorCell.start(-1);
-
       var map = _tableMap.TableMap.get(this.$anchorCell.node(-1));
-
       var rowAtAnchorCell = map.rowCount(this.$anchorCell.pos - start);
       var rowAtHeadCell = map.rowCount(this.$headCell.pos - start);
-      var isSelectionSameRow = rowAtAnchorCell === rowAtHeadCell; // if anchor and head in the same line, counting how many cells
+      var isSelectionSameRow = rowAtAnchorCell === rowAtHeadCell;
+
+      // if anchor and head in the same line, counting how many cells
       // should be in the row except merged cell
+      var maxColumnInSelectedRow = map.getMaxColInRow(this.$anchorCell);
 
-      var maxColumnInSelectedRow = map.getMaxColInRow(this.$anchorCell); // if selected cells less than table max column amount, and
+      // if selected cells less than table max column amount, and
       // the anchor/head not in a merged cell
       // it should be select maxColumnInSelectedRow to be TRUE
-
       if (isSelectionSameRow && this.ranges.length <= map.width && !map.isPosMerged(this.$anchorCell.pos - start) && !map.isPosMerged(this.$headCell.pos - start)) {
         return this.ranges.length === maxColumnInSelectedRow;
-      } // If anchor and head in different row, it should be always in first and
-      // last column to select the whole row.
-
+      }
 
+      // If anchor and head in different row, it should be always in first and
+      // last column to select the whole row.
       var anchorLeft = map.colCount(this.$anchorCell.pos - start);
       var headLeft = map.colCount(this.$headCell.pos - start);
-
       if (Math.min(anchorLeft, headLeft) > 0) {
         return false;
       }
-
       var anchorRight = anchorLeft + this.$anchorCell.nodeAfter.attrs.colspan;
       var headRight = headLeft + this.$headCell.nodeAfter.attrs.colspan;
       return Math.max(anchorRight, headRight) === map.width;
@@ -299,10 +246,11 @@ var CellSelection = /*#__PURE__*/function (_Selection) {
     key: "eq",
     value: function eq(other) {
       return other instanceof CellSelection && other.$anchorCell.pos === this.$anchorCell.pos && other.$headCell.pos === this.$headCell.pos;
-    } // :: (ResolvedPos, ?ResolvedPos) → CellSelection
+    }
+
+    // :: (ResolvedPos, ?ResolvedPos) → CellSelection
     // Returns the smallest row selection that covers the given anchor
     // and head cell.
-
   }, {
     key: "toJSON",
     value: function toJSON() {
@@ -323,19 +271,15 @@ var CellSelection = /*#__PURE__*/function (_Selection) {
       var $headCell = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : $anchorCell;
       var $calculatedAnchorCell = $anchorCell;
       var $calculatedHeadCell = $headCell;
-
       var map = _tableMap.TableMap.get($calculatedAnchorCell.node(-1));
-
       var start = $calculatedAnchorCell.start(-1);
       var anchorRect = map.findCell($calculatedAnchorCell.pos - start);
       var headRect = map.findCell($calculatedHeadCell.pos - start);
       var doc = $calculatedAnchorCell.node(0);
-
       if (anchorRect.top <= headRect.top) {
         if (anchorRect.top > 0) {
           $calculatedAnchorCell = doc.resolve(start + map.map[anchorRect.left]);
         }
-
         if (headRect.bottom < map.height) {
           $calculatedHeadCell = doc.resolve(start + map.map[map.width * (map.height - 1) + headRect.right - 1]);
         }
@@ -343,12 +287,10 @@ var CellSelection = /*#__PURE__*/function (_Selection) {
         if (headRect.top > 0) {
           $calculatedHeadCell = doc.resolve(start + map.map[headRect.left]);
         }
-
         if (anchorRect.bottom < map.height) {
           $calculatedAnchorCell = doc.resolve(start + map.map[map.width * (map.height - 1) + anchorRect.right - 1]);
         }
       }
-
       return new CellSelection($calculatedAnchorCell, $calculatedHeadCell);
     }
   }, {
@@ -357,19 +299,15 @@ var CellSelection = /*#__PURE__*/function (_Selection) {
       var $headCell = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : $anchorCell;
       var $calculatedAnchorCell = $anchorCell;
       var $calculatedHeadCell = $headCell;
-
       var map = _tableMap.TableMap.get($calculatedAnchorCell.node(-1));
-
       var start = $calculatedAnchorCell.start(-1);
       var anchorRect = map.findCell($calculatedAnchorCell.pos - start);
       var headRect = map.findCell($calculatedHeadCell.pos - start);
       var doc = $calculatedAnchorCell.node(0);
-
       if (anchorRect.left <= headRect.left) {
         if (anchorRect.left > 0) {
           $calculatedAnchorCell = doc.resolve(start + map.map[anchorRect.top * map.width]);
         }
-
         if (headRect.right < map.width) {
           $calculatedHeadCell = doc.resolve(start + map.map[map.width * (headRect.top + 1) - 1]);
         }
@@ -377,20 +315,19 @@ var CellSelection = /*#__PURE__*/function (_Selection) {
         if (headRect.left > 0) {
           $calculatedHeadCell = doc.resolve(start + map.map[headRect.top * map.width]);
         }
-
         if (anchorRect.right < map.width) {
           $calculatedAnchorCell = doc.resolve(start + map.map[map.width * (anchorRect.top + 1) - 1]);
         }
       }
-
       return new CellSelection($calculatedAnchorCell, $calculatedHeadCell);
     }
   }, {
     key: "fromJSON",
     value: function fromJSON(doc, json) {
       return new CellSelection(doc.resolve(json.anchor), doc.resolve(json.head));
-    } // :: (Node, number, ?number) → CellSelection
+    }
 
+    // :: (Node, number, ?number) → CellSelection
   }, {
     key: "create",
     value: function create(doc, anchorCell) {
@@ -400,7 +337,5 @@ var CellSelection = /*#__PURE__*/function (_Selection) {
   }]);
   return CellSelection;
 }(_prosemirrorState.Selection);
-
 exports.CellSelection = CellSelection;
-
 _prosemirrorState.Selection.jsonID('cell', CellSelection);

package/dist/cjs/index.js

@@ -33,11 +33,7 @@ Object.defineProperty(exports, "uuid", {
     return _uuid.uuid;
   }
 });
-
 var _tableMap = require("./table-map");
-
 var _cellSelection = require("./cell-selection");
-
 var _find = require("./utils/find");
-
 var _uuid = require("./utils/uuid");