@atlaskit/editor-plugin-table 1.1.0 → 1.1.2

package/dist/cjs/plugins/table/transforms/delete-columns.js

@@ -1,117 +1,87 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.deleteColumns = void 0;
-
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
 var _prosemirrorState = require("prosemirror-state");
-
 var _tableMap = require("@atlaskit/editor-tables/table-map");
-
 var _utils = require("@atlaskit/editor-tables/utils");
-
 var _steps = require("@atlaskit/adf-schema/steps");
-
 var _metadata = require("./metadata");
-
 var _split = require("./split");
-
 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; }
-
 var deleteColumnsCustomStep = function deleteColumnsCustomStep(rect) {
   return function (tr) {
     var table = (0, _utils.findTable)(tr.selection);
-
     if (!table) {
       return tr;
-    } // Need to split all the merge in the ranges (this is the current behaviour)
+    }
+
+    // Need to split all the merge in the ranges (this is the current behaviour)
     // Maybe is better to split only the last column?
     // TODO: After talking with Roto about this behaviour, he likes when we dont split the columns, I am keeping this for consistency of the current implementation.
+    (0, _split.splitCellsInColumns)(tr, table.pos, rect.left, rect.right);
 
-
-    (0, _split.splitCellsInColumns)(tr, table.pos, rect.left, rect.right); // Delete the columns
-
+    // Delete the columns
     var mapStart = tr.mapping.maps.length;
     var originalDoc = tr.doc;
     var deletedColumns = [];
-
     for (var i = rect.left; i < rect.right; i++) {
       var step = _steps.AddColumnStep.create(originalDoc, table.pos, i, true);
-
       deletedColumns.push(i);
       tr.step(step.map(tr.mapping.slice(mapStart)));
     }
-
     var tablePosResult = tr.mapping.mapResult(table.pos);
-
     if (tablePosResult.deleted) {
       var pos = Math.min(tablePosResult.pos, tr.doc.nodeSize - 1);
       tr.setSelection(_prosemirrorState.Selection.near(tr.doc.resolve(pos)));
     } else {
       var newTable = tr.doc.nodeAt(tablePosResult.pos);
-
       if (newTable) {
         var cursorPos = getNextCursorPos(newTable, deletedColumns);
         tr.setSelection(_prosemirrorState.Selection.near(tr.doc.resolve(table.pos + cursorPos)));
       }
     }
-
     return tr;
   };
 };
-
 var deleteColumnsLegacy = function deleteColumnsLegacy(rect) {
   return function (tr) {
     var table = (0, _utils.findTable)(tr.selection);
-
     if (!table) {
       return tr;
     }
-
     var columnsToDelete = [];
-
     for (var i = rect.left; i < rect.right; i++) {
       columnsToDelete.push(i);
     }
-
     if (!columnsToDelete.length) {
       return tr;
     }
-
     var map = _tableMap.TableMap.get(table.node);
-
     var rows = [];
     var seen = {};
     var deletedCells = {};
-
     for (var rowIndex = 0; rowIndex < map.height; rowIndex++) {
       var rowCells = [];
       var row = table.node.child(rowIndex);
-
       var _loop = function _loop(colIndex) {
         var cellPos = map.map[rowIndex * map.width + colIndex];
         var cell = table.node.nodeAt(cellPos);
-
         if (!cell) {
           return "continue";
         }
-
         var cellsInColumn = map.cellsInRect({
           left: colIndex,
           top: 0,
           right: colIndex + 1,
           bottom: map.height
         });
-
         if (columnsToDelete.indexOf(colIndex) === -1) {
           // decrement colspans for col-spanning cells that overlap deleted columns
           if (cellsInColumn.indexOf(cellPos) > -1 && !seen[cellPos]) {
@@ -121,12 +91,10 @@ var deleteColumnsLegacy = function deleteColumnsLegacy(rect) {
                 overlappingCols += 1;
               }
             });
-
             if (overlappingCols > 0) {
               var attrs = _objectSpread(_objectSpread({}, cell.attrs), {}, {
                 colspan: cell.attrs.colspan - overlappingCols
               });
-
               if (cell.attrs.colwidth) {
                 var minColIndex = Math.min.apply(Math, columnsToDelete);
                 var pos = minColIndex > 0 ? minColIndex - map.colCount(cellPos) : 0;
@@ -134,7 +102,6 @@ var deleteColumnsLegacy = function deleteColumnsLegacy(rect) {
                 colwidth.splice(pos, overlappingCols);
                 attrs.colwidth = colwidth;
               }
-
               var newCell = cell.type.createChecked(attrs, cell.content, cell.marks);
               rowCells.push(newCell);
               seen[cellPos] = true;
@@ -146,20 +113,16 @@ var deleteColumnsLegacy = function deleteColumnsLegacy(rect) {
               colspan: 1,
               rowspan: 1
             });
-
             if (cell.attrs.colwidth) {
               var _pos = colIndex > 0 ? colIndex - map.colCount(cellPos) : 0;
-
               _attrs.colwidth = cell.attrs.colwidth.slice().splice(_pos, 1);
             }
-
             var _newCell = cell.type.createChecked(_attrs, cell.type.schema.nodes.paragraph.createChecked(), cell.marks);
-
             rowCells.push(_newCell);
             return "continue";
-          } // normal cells that we want to keep
-
+          }
 
+          // normal cells that we want to keep
           if (!seen[cellPos]) {
             seen[cellPos] = true;
             rowCells.push(cell);
@@ -168,126 +131,98 @@ var deleteColumnsLegacy = function deleteColumnsLegacy(rect) {
           deletedCells[cellPos] = true;
         }
       };
-
       for (var colIndex = 0; colIndex < map.width; colIndex++) {
         var _ret = _loop(colIndex);
-
         if (_ret === "continue") continue;
       }
-
       if (rowCells.length) {
         rows.push(row.type.createChecked(row.attrs, rowCells, row.marks));
       }
     }
-
     if (!rows.length) {
       return (0, _metadata.setMeta)({
         type: 'DELETE_COLUMNS',
         problem: 'EMPTY_TABLE'
       })(tr);
     }
-
     var newTable = table.node.type.createChecked(table.node.attrs, rows, table.node.marks);
     var fixedTable = fixRowSpans(newTable);
-
     if (fixedTable === null) {
       return (0, _metadata.setMeta)({
         type: 'DELETE_COLUMNS',
         problem: 'FIX_ROWSPANS'
       })(tr);
     }
-
     var cursorPos = getNextCursorPos(newTable, columnsToDelete);
     return (0, _metadata.setMeta)({
       type: 'DELETE_COLUMNS'
-    })(tr.replaceWith(table.pos, table.pos + table.node.nodeSize, fixedTable) // move cursor to the left of the deleted columns if possible, otherwise - to the first column
+    })(tr.replaceWith(table.pos, table.pos + table.node.nodeSize, fixedTable)
+    // move cursor to the left of the deleted columns if possible, otherwise - to the first column
     .setSelection(_prosemirrorState.Selection.near(tr.doc.resolve(table.pos + cursorPos))));
   };
 };
-
 function getNextCursorPos(table, deletedColumns) {
   var minColumn = Math.min.apply(Math, (0, _toConsumableArray2.default)(deletedColumns));
   var nextColumnWithCursor = minColumn > 0 ? minColumn - 1 : 0;
-
   var map = _tableMap.TableMap.get(table);
-
   return map.map[nextColumnWithCursor];
-} // returns an array of numbers, each number indicates the minimum rowSpan in each row
-
+}
 
+// returns an array of numbers, each number indicates the minimum rowSpan in each row
 function getMinRowSpans(table) {
   var minRowSpans = [];
-
   for (var rowIndex = 0; rowIndex < table.childCount; rowIndex++) {
     var rowSpans = [];
     var row = table.child(rowIndex);
-
     for (var colIndex = 0; colIndex < row.childCount; colIndex++) {
       var cell = row.child(colIndex);
       rowSpans.push(cell.attrs.rowspan);
     }
-
     minRowSpans[rowIndex] = Math.min.apply(Math, rowSpans);
   }
-
   return minRowSpans;
 }
-
 function fixRowSpans(table) {
   var map = _tableMap.TableMap.get(table);
-
   var minRowSpans = getMinRowSpans(table);
-
   if (!minRowSpans.some(function (rowspan) {
     return rowspan > 1;
   })) {
     return table;
   }
-
   var rows = [];
-
   for (var rowIndex = 0; rowIndex < map.height; rowIndex++) {
     var row = table.child(rowIndex);
-
     if (minRowSpans[rowIndex] === 1) {
       rows.push(row);
     } else {
       var rowCells = [];
-
       for (var colIndex = 0; colIndex < row.childCount; colIndex++) {
         var cell = row.child(colIndex);
         var rowspan = cell.attrs.rowspan - minRowSpans[rowIndex] + 1;
-
         if (rowspan < 1) {
           return null;
         }
-
         var newCell = cell.type.createChecked(_objectSpread(_objectSpread({}, cell.attrs), {}, {
           rowspan: rowspan
         }), cell.content, cell.marks);
         rowCells.push(newCell);
       }
-
       rows.push(row.type.createChecked(row.attrs, rowCells, row.marks));
     }
   }
-
   if (!rows.length) {
     return null;
   }
-
   return table.type.createChecked(table.attrs, rows, table.marks);
 }
-
 var deleteColumns = function deleteColumns(rect) {
   var allowAddColumnCustomStep = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
   return function (tr) {
     if (allowAddColumnCustomStep) {
       return deleteColumnsCustomStep(rect)(tr);
     }
-
     return deleteColumnsLegacy(rect)(tr);
   };
 };
-
 exports.deleteColumns = deleteColumns;

package/dist/cjs/plugins/table/transforms/delete-rows.js

@@ -1,48 +1,32 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.deleteRows = void 0;
-
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
 var _prosemirrorState = require("prosemirror-state");
-
 var _tableMap = require("@atlaskit/editor-tables/table-map");
-
 var _utils = require("@atlaskit/editor-tables/utils");
-
 var _merge = require("./merge");
-
 var _metadata = require("./metadata");
-
 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; }
-
 var deleteRows = function deleteRows(rect) {
   var isHeaderRowRequired = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
   return function (tr) {
     var table = (0, _utils.findTable)(tr.selection);
-
     if (!table) {
       return tr;
     }
-
     var rowsToDelete = [];
-
     var map = _tableMap.TableMap.get(table.node);
-
     for (var i = rect.top; i < rect.bottom; i++) {
       // skip header row if its required
       if (isHeaderRowRequired) {
         var cell = table.node.nodeAt(map.map[i * map.width]);
-
         if (cell && cell.type !== cell.type.schema.nodes.tableHeader) {
           rowsToDelete.push(i);
         }
@@ -50,34 +34,27 @@ var deleteRows = function deleteRows(rect) {
         rowsToDelete.push(i);
       }
     }
-
     if (!rowsToDelete.length) {
       return tr;
     }
-
     var rows = [];
     var seen = {};
     var deletedCells = {};
-
     var _loop = function _loop(rowIndex) {
       var rowCells = [];
       var row = table.node.child(rowIndex);
-
       var _loop2 = function _loop2(colIndex) {
         var cellPos = map.map[rowIndex * map.width + colIndex];
         var cell = table.node.nodeAt(cellPos);
-
         if (!cell) {
           return "continue";
         }
-
         var cellsInRow = map.cellsInRect({
           left: 0,
           top: rowIndex,
           right: map.width,
           bottom: rowIndex + 1
         });
-
         if (rowsToDelete.indexOf(rowIndex) === -1 && !seen[cellPos]) {
           // decrement rowspans for row-spanning cells that overlap deleted rows
           if (cellsInRow.indexOf(cellPos) > -1) {
@@ -87,7 +64,6 @@ var deleteRows = function deleteRows(rect) {
                 overlappingRows += 1;
               }
             });
-
             if (overlappingRows > 0) {
               var newCell = cell.type.createChecked(_objectSpread(_objectSpread({}, cell.attrs), {}, {
                 rowspan: cell.attrs.rowspan - overlappingRows
@@ -102,19 +78,16 @@ var deleteRows = function deleteRows(rect) {
               colspan: 1,
               rowspan: 1
             });
-
             if (cell.attrs.colwidth) {
               var pos = colIndex > 0 ? colIndex - map.colCount(cellPos) : 0;
               attrs.colwidth = cell.attrs.colwidth.slice().splice(pos, 1);
             }
-
             var _newCell = cell.type.createChecked(attrs, cell.type.schema.nodes.paragraph.createChecked(), cell.marks);
-
             rowCells.push(_newCell);
             return "continue";
-          } // normal cells that we want to keep
-
+          }
 
+          // normal cells that we want to keep
           if (!seen[cellPos]) {
             seen[cellPos] = true;
             rowCells.push(cell);
@@ -123,54 +96,43 @@ var deleteRows = function deleteRows(rect) {
           deletedCells[cellPos] = true;
         }
       };
-
       for (var colIndex = 0; colIndex < map.width; colIndex++) {
         var _ret = _loop2(colIndex);
-
         if (_ret === "continue") continue;
       }
-
       if (rowCells.length) {
         rows.push(row.type.createChecked(row.attrs, rowCells, row.marks));
       }
     };
-
     for (var rowIndex = 0; rowIndex < map.height; rowIndex++) {
       _loop(rowIndex);
     }
-
     if (!rows.length) {
       return (0, _metadata.setMeta)({
         type: 'DELETE_ROWS',
         problem: 'EMPTY_TABLE'
       })(tr);
     }
-
     var newTable = table.node.type.createChecked(table.node.attrs, rows, table.node.marks);
     var fixedTable = (0, _merge.removeEmptyColumns)(newTable);
-
     if (fixedTable === null) {
       return (0, _metadata.setMeta)({
         type: 'DELETE_ROWS',
         problem: 'REMOVE_EMPTY_COLUMNS'
       })(tr);
     }
-
     var cursorPos = getNextCursorPos(newTable, rowsToDelete);
     return (0, _metadata.setMeta)({
       type: 'DELETE_ROWS'
-    })(tr.replaceWith(table.pos, table.pos + table.node.nodeSize, fixedTable) // move cursor before the deleted rows if possible, otherwise - to the first row
+    })(tr.replaceWith(table.pos, table.pos + table.node.nodeSize, fixedTable)
+    // move cursor before the deleted rows if possible, otherwise - to the first row
     .setSelection(_prosemirrorState.Selection.near(tr.doc.resolve(table.pos + cursorPos))));
   };
 };
-
 exports.deleteRows = deleteRows;
-
 function getNextCursorPos(table, deletedRows) {
   var minRow = Math.min.apply(Math, (0, _toConsumableArray2.default)(deletedRows));
   var nextRowWithCursor = minRow > 0 ? minRow - 1 : 0;
-
   var map = _tableMap.TableMap.get(table);
-
   return map.map[nextRowWithCursor * map.width];
 }