@atlaskit/editor-plugin-table 1.1.0 → 1.1.2

package/dist/es2019/plugins/table/utils/paste.js

@@ -1,13 +1,13 @@
 import { Fragment, Slice } from 'prosemirror-model';
 import { flatten } from 'prosemirror-utils';
 import { flatmap, mapSlice } from '@atlaskit/editor-common/utils';
-import { getPluginState } from '../pm-plugins/plugin-factory'; // lifts up the content of each cell, returning an array of nodes
+import { getPluginState } from '../pm-plugins/plugin-factory';
 
+// lifts up the content of each cell, returning an array of nodes
 export const unwrapContentFromTable = maybeTable => {
   const {
     schema
   } = maybeTable.type;
-
   if (maybeTable.type === schema.nodes.table) {
     const content = [];
     const {
@@ -18,12 +18,10 @@ export const unwrapContentFromTable = maybeTable => {
       if (maybeCell.type === tableCell || maybeCell.type === tableHeader) {
         content.push(...flatten(maybeCell, false).map(child => child.node));
       }
-
       return true;
     });
     return content;
   }
-
   return maybeTable;
 };
 export const removeTableFromFirstChild = (node, i) => {
@@ -32,12 +30,12 @@ export const removeTableFromFirstChild = (node, i) => {
 export const removeTableFromLastChild = (node, i, fragment) => {
   return i === fragment.childCount - 1 ? unwrapContentFromTable(node) : node;
 };
+
 /**
  * When we copy from a table cell with a hardBreak at the end,
  * the slice generated will come with a hardBreak outside of the table.
  * This code will look for that pattern and fix it.
  */
-
 export const transformSliceToFixHardBreakProblemOnCopyFromCell = (slice, schema) => {
   const {
     paragraph,
@@ -49,52 +47,50 @@ export const transformSliceToFixHardBreakProblemOnCopyFromCell = (slice, schema)
   const paragraphNodeSize = emptyParagraphNode ? emptyParagraphNode.nodeSize : 0;
   const hardBreakNodeSize = hardBreakNode ? hardBreakNode.nodeSize : 0;
   const paragraphWithHardBreakSize = paragraphNodeSize + hardBreakNodeSize;
-
   if (slice.content.childCount === 2 && slice.content.firstChild && slice.content.lastChild && slice.content.firstChild.type === table && slice.content.lastChild.type === paragraph && slice.content.lastChild.nodeSize === paragraphWithHardBreakSize) {
     const nodes = unwrapContentFromTable(slice.content.firstChild);
-
     if (nodes instanceof Array) {
-      return new Slice(Fragment.from( // keep only the content and discard the hardBreak
+      return new Slice(Fragment.from(
+      // keep only the content and discard the hardBreak
       nodes[0]), slice.openStart, slice.openEnd);
     }
   }
-
   return slice;
 };
 export const transformSliceToRemoveOpenTable = (slice, schema) => {
   var _slice$content$firstC6;
-
   // we're removing the table, tableRow and tableCell reducing the open depth by 3
-  const depthDecrement = 3; // Case 1: A slice entirely within a single CELL
+  const depthDecrement = 3;
 
-  if ( // starts and ends inside of a cell
-  slice.openStart >= 4 && slice.openEnd >= 4 && // slice is a table node
+  // Case 1: A slice entirely within a single CELL
+  if (
+  // starts and ends inside of a cell
+  slice.openStart >= 4 && slice.openEnd >= 4 &&
+  // slice is a table node
   slice.content.childCount === 1 && slice.content.firstChild.type === schema.nodes.table) {
     var _slice$content$firstC, _slice$content$firstC2, _slice$content$firstC3, _slice$content$firstC4, _slice$content$firstC5;
-
     // prosemirror-view has a bug that it duplicates table entry when selecting multiple paragraphs in a table cell.
     // https://github.com/ProseMirror/prosemirror/issues/1270
     // The structure becomes
     // table(genuine) > tableRow(genuine) > table(duplicated) > tableRow(duplicated) > tableCell/tableHeader(genuine) > contents(genuine)
     // As we are removing wrapping table anyway, we keep duplicated table and tableRow for simplicity
     let cleaned = slice;
-
     if (((_slice$content$firstC = slice.content.firstChild) === null || _slice$content$firstC === void 0 ? void 0 : (_slice$content$firstC2 = _slice$content$firstC.content) === null || _slice$content$firstC2 === void 0 ? void 0 : (_slice$content$firstC3 = _slice$content$firstC2.firstChild) === null || _slice$content$firstC3 === void 0 ? void 0 : (_slice$content$firstC4 = _slice$content$firstC3.content) === null || _slice$content$firstC4 === void 0 ? void 0 : (_slice$content$firstC5 = _slice$content$firstC4.firstChild) === null || _slice$content$firstC5 === void 0 ? void 0 : _slice$content$firstC5.type) === schema.nodes.table) {
       cleaned = new Slice(slice.content.firstChild.content.firstChild.content, slice.openStart - 2, slice.openEnd - 2);
     }
-
     return new Slice(flatmap(cleaned.content, unwrapContentFromTable), cleaned.openStart - depthDecrement, cleaned.openEnd - depthDecrement);
-  } // Case 2: A slice starting within a CELL and ending outside the table
-
+  }
 
-  if ( // starts inside of a cell but ends outside of the starting table
-  slice.openStart >= 4 && // slice starts from a table node (and spans across more than one node)
+  // Case 2: A slice starting within a CELL and ending outside the table
+  if (
+  // starts inside of a cell but ends outside of the starting table
+  slice.openStart >= 4 &&
+  // slice starts from a table node (and spans across more than one node)
   slice.content.childCount > 1 && ((_slice$content$firstC6 = slice.content.firstChild) === null || _slice$content$firstC6 === void 0 ? void 0 : _slice$content$firstC6.type) === schema.nodes.table) {
     // repoint the slice's cutting depth so that cell content where the slice starts
     // does not get lifted out of the cell on paste
     return new Slice(slice.content, 1, slice.openEnd);
   }
-
   return slice;
 };
 export const transformSliceToCorrectEmptyTableCells = (slice, schema) => {
@@ -106,7 +102,6 @@ export const transformSliceToCorrectEmptyTableCells = (slice, schema) => {
     if (node && (node.type === tableCell || node.type === tableHeader) && !node.content.childCount) {
       return node.type.createAndFill(node.attrs) || node;
     }
-
     return node;
   });
 };

package/dist/es2019/plugins/table/utils/row-controls.js

@@ -7,14 +7,13 @@ import { TableCssClassName as ClassName } from '../types';
 import { tableDeleteButtonSize } from '../ui/consts';
 export const getRowHeights = tableRef => {
   const heights = [];
-
   if (tableRef.lastChild) {
     const rows = tableRef.lastChild.childNodes;
-
     for (let i = 0, count = rows.length; i < count; i++) {
       const row = rows[i];
-      heights[i] = row.getBoundingClientRect().height + 1; // padding only gets applied when the container has sticky
+      heights[i] = row.getBoundingClientRect().height + 1;
 
+      // padding only gets applied when the container has sticky
       if (row.classList.contains('sticky') && i === 0) {
         const styles = window.getComputedStyle(row);
         const paddingTop = parsePx(styles.paddingTop || '');
@@ -22,46 +21,37 @@ export const getRowHeights = tableRef => {
       }
     }
   }
-
   return heights;
 };
 export const isRowDeleteButtonVisible = selection => {
   if (!isTableSelected(selection) && selection instanceof CellSelection && selection.isRowSelection()) {
     return true;
   }
-
   return false;
 };
 export const getRowDeleteButtonParams = (rowsHeights, selection, offsetTop = 0) => {
   const rect = getSelectionRect(selection);
-
   if (!rect) {
     return null;
   }
-
   let height = 0;
-  let offset = offsetTop; // find the rows before the selection
-
+  let offset = offsetTop;
+  // find the rows before the selection
   for (let i = 0; i < rect.top; i++) {
     const rowHeight = rowsHeights[i];
-
     if (rowHeight) {
       offset += rowHeight - 1;
     }
-  } // these are the selected rows widths
-
-
+  }
+  // these are the selected rows widths
   const indexes = [];
-
   for (let i = rect.top; i < rect.bottom; i++) {
     const rowHeight = rowsHeights[i];
-
     if (rowHeight) {
       height += rowHeight - 1;
       indexes.push(i);
     }
   }
-
   const top = offset + height / 2 - tableDeleteButtonSize / 2;
   return {
     top,
@@ -70,63 +60,49 @@ export const getRowDeleteButtonParams = (rowsHeights, selection, offsetTop = 0)
 };
 export const getRowsParams = rowsHeights => {
   const rows = [];
-
   for (let i = 0, count = rowsHeights.length; i < count; i++) {
     const height = rowsHeights[i];
-
     if (!height) {
       continue;
     }
-
     let endIndex = rowsHeights.length;
-
     for (let k = i + 1, count = rowsHeights.length; k < count; k++) {
       if (rowsHeights[k]) {
         endIndex = k;
         break;
       }
     }
-
     rows.push({
       startIndex: i,
       endIndex,
       height
     });
   }
-
   return rows;
 };
 export const getRowClassNames = (index, selection, hoveredRows = [], isInDanger, isResizing) => {
   const classNames = [];
-
   if (isRowSelected(index)(selection) || hoveredRows.indexOf(index) > -1 && !isResizing) {
     classNames.push(ClassName.HOVERED_CELL_ACTIVE);
-
     if (isInDanger) {
       classNames.push(ClassName.HOVERED_CELL_IN_DANGER);
     }
   }
-
   return classNames.join(' ');
 };
 export const copyPreviousRow = schema => insertNewRowIndex => tr => {
   const table = findTable(tr.selection);
-
   if (!table) {
     return tr;
   }
-
   const map = TableMap.get(table.node);
   const copyPreviousRowIndex = insertNewRowIndex - 1;
-
   if (insertNewRowIndex <= 0) {
     throw Error(`Row Index less or equal 0 isn't not allowed since there is not a previous to copy`);
   }
-
   if (insertNewRowIndex > map.height) {
     return tr;
   }
-
   const tableNode = table.node;
   const {
     nodes: {
@@ -145,26 +121,22 @@ export const copyPreviousRow = schema => insertNewRowIndex => tr => {
   const cellsPositionsInNextRow = map.map.slice(offsetNextLineIndexPosition, offsetNextLineIndexPosition + map.width);
   let cells = [];
   let fixRowspans = [];
-
   for (let i = 0; i < cellsPositionsInOriginalRow.length;) {
     const pos = cellsPositionsInOriginalRow[i];
     const documentCellPos = pos + table.start;
     const node = tr.doc.nodeAt(documentCellPos);
-
     if (!node) {
       continue;
     }
-
-    const attributes = { ...node.attrs,
+    const attributes = {
+      ...node.attrs,
       colspan: 1,
       rowspan: 1
     };
     const newCell = node.type.createAndFill(attributes);
-
     if (!newCell) {
       return tr;
     }
-
     if (cellsPositionsInNextRow.indexOf(pos) > -1) {
       fixRowspans.push({
         pos: documentCellPos,
@@ -172,38 +144,33 @@ export const copyPreviousRow = schema => insertNewRowIndex => tr => {
       });
     } else if (cellsInRow.indexOf(pos) > -1) {
       if (node.attrs.colspan > 1) {
-        const newCellWithColspanFixed = node.type.createAndFill({ ...attributes,
+        const newCellWithColspanFixed = node.type.createAndFill({
+          ...attributes,
           colspan: node.attrs.colspan
         });
-
         if (!newCellWithColspanFixed) {
           return tr;
         }
-
         cells.push(newCellWithColspanFixed);
         i = i + node.attrs.colspan;
         continue;
       }
-
       cells.push(newCell);
     } else {
       cells.push(newCell);
     }
-
     i++;
   }
-
   fixRowspans.forEach(cell => {
-    tr.setNodeMarkup(cell.pos, undefined, { ...cell.node.attrs,
+    tr.setNodeMarkup(cell.pos, undefined, {
+      ...cell.node.attrs,
       rowspan: cell.node.attrs.rowspan + 1
     });
   });
   const cloneRow = tableNode.child(copyPreviousRowIndex);
   let rowPos = table.start;
-
   for (let i = 0; i < insertNewRowIndex; i++) {
     rowPos += tableNode.child(i).nodeSize;
   }
-
   return safeInsert(tableRow.createChecked(cloneRow.attrs, cells, cloneRow.marks), rowPos)(tr);
 };

package/dist/es2019/plugins/table/utils/selection.js

@@ -2,14 +2,11 @@ import { TableMap } from '@atlaskit/editor-tables/table-map';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { findTable, getSelectionRangeInColumn, getSelectionRangeInRow, getSelectionRect, isSelectionType } from '@atlaskit/editor-tables/utils';
 export const isSelectionUpdated = (oldSelection, newSelection) => !!(!newSelection && oldSelection) || isSelectionType(oldSelection, 'cell') !== isSelectionType(newSelection, 'cell') || isSelectionType(oldSelection, 'cell') && isSelectionType(newSelection, 'cell') && oldSelection.ranges !== newSelection.ranges;
-
 const isRectangularCellSelection = (selection, rect) => {
   const table = findTable(selection);
-
   if (!table) {
     return true;
   }
-
   const {
     width,
     height,
@@ -19,77 +16,59 @@ const isRectangularCellSelection = (selection, rect) => {
   let indexLeft = indexTop;
   let indexBottom = (rect.bottom - 1) * width + rect.left;
   let indexRight = indexTop + (rect.right - rect.left - 1);
-
   for (let i = rect.top; i < rect.bottom; i++) {
     if (rect.left > 0 && map[indexLeft] === map[indexLeft - 1] || rect.right < width && map[indexRight] === map[indexRight + 1]) {
       return false;
     }
-
     indexLeft += width;
     indexRight += width;
   }
-
   for (let i = rect.left; i < rect.right; i++) {
     if (rect.top > 0 && map[indexTop] === map[indexTop - width] || rect.bottom < height && map[indexBottom] === map[indexBottom + width]) {
       return false;
     }
-
     indexTop++;
     indexBottom++;
   }
-
   return true;
 };
-
 export const normalizeSelection = tr => {
   const {
     selection
   } = tr;
   const rect = getSelectionRect(selection);
-
   if (!rect || !(selection instanceof CellSelection) || isRectangularCellSelection(selection, rect)) {
     return tr;
   }
-
   if (selection.isColSelection()) {
     var _getSelectionRangeInC, _getSelectionRangeInC2;
-
     const $anchor = (_getSelectionRangeInC = getSelectionRangeInColumn(rect.left)(tr)) === null || _getSelectionRangeInC === void 0 ? void 0 : _getSelectionRangeInC.$anchor;
     const $head = (_getSelectionRangeInC2 = getSelectionRangeInColumn(rect.right - 1)(tr)) === null || _getSelectionRangeInC2 === void 0 ? void 0 : _getSelectionRangeInC2.$head;
-
     if ($anchor && $head) {
       return tr.setSelection(new CellSelection($anchor, $head));
     }
   }
-
   if (selection.isRowSelection()) {
     var _getSelectionRangeInR, _getSelectionRangeInR2;
-
     const $anchor = (_getSelectionRangeInR = getSelectionRangeInRow(rect.top)(tr)) === null || _getSelectionRangeInR === void 0 ? void 0 : _getSelectionRangeInR.$anchor;
     const $head = (_getSelectionRangeInR2 = getSelectionRangeInRow(rect.bottom - 1)(tr)) === null || _getSelectionRangeInR2 === void 0 ? void 0 : _getSelectionRangeInR2.$head;
-
     if ($anchor && $head) {
       return tr.setSelection(new CellSelection($anchor, $head));
     }
   }
-
   return tr;
 };
 export const getSelectedColumnIndexes = selectionRect => {
   const columnIndexes = [];
-
   for (let i = selectionRect.left; i < selectionRect.right; i++) {
     columnIndexes.push(i);
   }
-
   return columnIndexes;
 };
 export const getSelectedRowIndexes = selectionRect => {
   const rowIndexes = [];
-
   for (let i = selectionRect.top; i < selectionRect.bottom; i++) {
     rowIndexes.push(i);
   }
-
   return rowIndexes;
 };

package/dist/es2019/plugins/table/utils/table.js

@@ -2,11 +2,9 @@ import { TableMap } from '@atlaskit/editor-tables/table-map';
 import { findTable } from '@atlaskit/editor-tables/utils';
 export const getMergedCellsPositions = tr => {
   const table = findTable(tr.selection);
-
   if (!table) {
     return [];
   }
-
   const map = TableMap.get(table.node);
   const cellPositions = new Set();
   const mergedCells = [];

package/dist/es2019/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/editor-plugin-table",
-	"version": "1.1.0",
+	"version": "1.1.2",
 	"sideEffects": false
 }

package/dist/esm/plugins/table/commands/clear.js

@@ -2,12 +2,12 @@
 import { Selection } from 'prosemirror-state';
 import { findCellClosestToPos, emptyCell, isSelectionType } from '@atlaskit/editor-tables/utils';
 // #endregion
+
 // #region Commands
 export var clearMultipleCells = function clearMultipleCells(targetCellPosition) {
   return function (state, dispatch) {
     var cursorPos;
     var tr = state.tr;
-
     if (isSelectionType(tr.selection, 'cell')) {
       var selection = tr.selection;
       selection.forEachCell(function (_node, pos) {
@@ -20,22 +20,17 @@ export var clearMultipleCells = function clearMultipleCells(targetCellPosition)
       tr = emptyCell(cell, state.schema)(tr);
       cursorPos = cell.pos;
     }
-
     if (tr.docChanged && cursorPos) {
       var $pos = tr.doc.resolve(tr.mapping.map(cursorPos));
       var textSelection = Selection.findFrom($pos, 1, true);
-
       if (textSelection) {
         tr.setSelection(textSelection);
       }
-
       if (dispatch) {
         dispatch(tr);
       }
-
       return true;
     }
-
     return false;
   };
 };
@@ -43,6 +38,6 @@ export var clearSelection = function clearSelection(state, dispatch) {
   if (dispatch) {
     dispatch(state.tr.setSelection(Selection.near(state.selection.$from)).setMeta('addToHistory', false));
   }
-
   return true;
-}; // #endregion
+};
+// #endregion

package/dist/esm/plugins/table/commands/collapse.js

@@ -1,14 +1,11 @@
 import { collapseSelectedTable } from '../utils/collapse';
 export var wrapTableInExpand = function wrapTableInExpand(state, dispatch) {
   var collapseTr = collapseSelectedTable(state.tr);
-
   if (!collapseTr) {
     return false;
   }
-
   if (dispatch) {
     dispatch(collapseTr);
   }
-
   return true;
 };

package/dist/esm/plugins/table/commands/go-to-next-cell.js

@@ -10,28 +10,27 @@ export var goToNextCell = function goToNextCell(editorAnalyticsAPI) {
   return function (direction) {
     return function (state, dispatch) {
       var table = findTable(state.selection);
-
       if (!table) {
         return false;
       }
-
       var map = TableMap.get(table.node);
       var _state$schema$nodes = state.schema.nodes,
-          tableCell = _state$schema$nodes.tableCell,
-          tableHeader = _state$schema$nodes.tableHeader;
+        tableCell = _state$schema$nodes.tableCell,
+        tableHeader = _state$schema$nodes.tableHeader;
       var cell = findParentNodeOfType([tableCell, tableHeader])(state.selection);
       var firstCellPos = map.positionAt(0, 0, table.node) + table.start;
-      var lastCellPos = map.positionAt(map.height - 1, map.width - 1, table.node) + table.start; // when tabbing backwards at first cell (top left), insert row at the start of table
+      var lastCellPos = map.positionAt(map.height - 1, map.width - 1, table.node) + table.start;
 
+      // when tabbing backwards at first cell (top left), insert row at the start of table
       if (firstCellPos === cell.pos && direction === TAB_BACKWARD_DIRECTION) {
         insertRowWithAnalytics(editorAnalyticsAPI)(INPUT_METHOD.KEYBOARD, {
           index: 0,
           moveCursorToInsertedRow: true
         })(state, dispatch);
         return true;
-      } // when tabbing forwards at last cell (bottom right), insert row at the end of table
-
+      }
 
+      // when tabbing forwards at last cell (bottom right), insert row at the end of table
       if (lastCellPos === cell.pos && direction === TAB_FORWARD_DIRECTION) {
         insertRowWithAnalytics(editorAnalyticsAPI)(INPUT_METHOD.KEYBOARD, {
           index: map.height,
@@ -39,11 +38,9 @@ export var goToNextCell = function goToNextCell(editorAnalyticsAPI) {
         })(state, dispatch);
         return true;
       }
-
       if (dispatch) {
         return baseGotoNextCell(direction)(state, dispatch);
       }
-
       return true;
     };
   };

package/dist/esm/plugins/table/commands/hover.js

@@ -3,29 +3,26 @@ import { TableMap } from '@atlaskit/editor-tables/table-map';
 import { findTable, getCellsInColumn, getCellsInRow } from '@atlaskit/editor-tables/utils';
 import { createCommand } from '../pm-plugins/plugin-factory';
 import { TableDecorations } from '../types';
-import { createCellHoverDecoration, createColumnLineResize, createControlsHoverDecoration, getMergedCellsPositions, updatePluginStateDecorations } from '../utils'; // #endregion
-// #region Utils
+import { createCellHoverDecoration, createColumnLineResize, createControlsHoverDecoration, getMergedCellsPositions, updatePluginStateDecorations } from '../utils';
+// #endregion
 
+// #region Utils
 var makeArray = function makeArray(n) {
   return Array.from(Array(n).keys());
-}; // #endregion
-// #region Commands
-
+};
+// #endregion
 
+// #region Commands
 export var hoverMergedCells = function hoverMergedCells() {
   return createCommand(function (state) {
     var mergedCellsPositions = getMergedCellsPositions(state.tr);
-
     if (!mergedCellsPositions.length) {
       return false;
     }
-
     var table = findTable(state.tr.selection);
-
     if (!table) {
       return false;
     }
-
     var mergedCells = mergedCellsPositions.map(function (pos) {
       return {
         pos: pos + table.start,
@@ -47,11 +44,9 @@ export var hoverMergedCells = function hoverMergedCells() {
 export var hoverColumns = function hoverColumns(hoveredColumns, isInDanger) {
   return createCommand(function (state) {
     var cells = getCellsInColumn(hoveredColumns)(state.tr.selection);
-
     if (!cells) {
       return false;
     }
-
     var decorations = createControlsHoverDecoration(cells, 'column', state.tr, isInDanger);
     return {
       type: 'HOVER_COLUMNS',
@@ -68,11 +63,9 @@ export var hoverColumns = function hoverColumns(hoveredColumns, isInDanger) {
 export var hoverRows = function hoverRows(hoveredRows, isInDanger) {
   return createCommand(function (state) {
     var cells = getCellsInRow(hoveredRows)(state.selection);
-
     if (!cells) {
       return false;
     }
-
     var decorations = createControlsHoverDecoration(cells, 'row', state.tr, isInDanger);
     return {
       type: 'HOVER_ROWS',
@@ -89,20 +82,16 @@ export var hoverRows = function hoverRows(hoveredRows, isInDanger) {
 export var hoverTable = function hoverTable(isInDanger, isSelected) {
   return createCommand(function (state) {
     var table = findTable(state.selection);
-
     if (!table) {
       return false;
     }
-
     var map = TableMap.get(table.node);
     var hoveredColumns = makeArray(map.width);
     var hoveredRows = makeArray(map.height);
     var cells = getCellsInRow(hoveredRows)(state.selection);
-
     if (!cells) {
       return false;
     }
-
     var decorations = createControlsHoverDecoration(cells, 'table', state.tr, isInDanger, isSelected);
     return {
       type: 'HOVER_TABLE',
@@ -147,4 +136,5 @@ export var hideResizeHandleLine = function hideResizeHandleLine() {
       }
     };
   });
-}; // #endregion
+};
+// #endregion