@atlaskit/editor-tables 2.2.1 → 2.2.3

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @atlaskit/editor-tables
 
+## 2.2.3
+
+### Patch Changes
+
+- [`dbef481f7df`](https://bitbucket.org/atlassian/atlassian-frontend/commits/dbef481f7df) - [ux] ED-15724: fix the merged row(2nd row or later) cannot been recongnized as row selection and cannot be deleted.
+
+## 2.2.2
+
+### Patch Changes
+
+- [`47f1f76cb80`](https://bitbucket.org/atlassian/atlassian-frontend/commits/47f1f76cb80) - Add selectTableClosestToPos function
+- [`755d7bf5c2a`](https://bitbucket.org/atlassian/atlassian-frontend/commits/755d7bf5c2a) - [ux] ED-12527 Prevents editor-tables handleMouseDown() from creating a cell selection when right clicking in a table cell.
+
 ## 2.2.1
 
 ### Patch Changes

package/dist/cjs/cell-selection.js

@@ -265,9 +265,25 @@ var CellSelection = /*#__PURE__*/function (_Selection) {
         return false;
       }
 
+      var start = this.$anchorCell.start(-1);
+
       var map = _tableMap.TableMap.get(this.$anchorCell.node(-1));
 
-      var start = this.$anchorCell.start(-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
+      // should be in the row except merged cell
+
+      var maxColumnInSelectedRow = map.getMaxColInRow(this.$anchorCell); // 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.
+
+
       var anchorLeft = map.colCount(this.$anchorCell.pos - start);
       var headLeft = map.colCount(this.$headCell.pos - start);
 

package/dist/cjs/pm-plugins/input.js

@@ -160,9 +160,10 @@ function handleTripleClick(view, pos) {
 }
 
 function handleMouseDown(view, event) {
-  var startEvent = 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) {
+  if (startEvent.ctrlKey || startEvent.metaKey || startEvent.button === 2 // right mouse click
+  ) {
     return false;
   }
 

package/dist/cjs/table-map.js

@@ -143,6 +143,29 @@ var TableMap = /*#__PURE__*/function () {
       }
 
       throw new RangeError('No cell with offset ' + pos + ' found');
+    } // Find the top side of the cell at the given position.
+
+  }, {
+    key: "rowCount",
+    value: function rowCount(pos) {
+      if (this.width <= 0) {
+        throw new RangeError('Wrong table width found');
+      }
+
+      for (var i = 0; i < this.map.length; i++) {
+        if (this.map[i] === pos) {
+          return Math.floor(i / this.width);
+        }
+      }
+
+      throw new RangeError('No cell with offset ' + pos + ' found');
+    }
+  }, {
+    key: "isPosMerged",
+    value: function isPosMerged(pos) {
+      return this.map.filter(function (cellPos) {
+        return cellPos === pos;
+      }).length > 1;
     } // :: (number, string, number) → ?number
     // Find the next cell in the given direction, starting from the cell
     // at `pos`, if any.
@@ -239,6 +262,15 @@ var TableMap = /*#__PURE__*/function () {
 
         rowStart = rowEnd;
       }
+    }
+  }, {
+    key: "getMaxColInRow",
+    value: function getMaxColInRow(pos) {
+      var parentRowNode = pos.parent;
+
+      if (parentRowNode.type.name === 'tableRow') {
+        return parentRowNode.childCount;
+      }
     } // :: (Node) → TableMap
     // Find the table map for the given table node.
 

package/dist/cjs/utils/select-nodes.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.selectTable = exports.selectRow = exports.selectColumn = void 0;
+exports.selectTableClosestToPos = exports.selectTable = exports.selectRow = exports.selectColumn = void 0;
 
 var _cellSelection = require("../cell-selection");
 
@@ -101,4 +101,25 @@ var selectTable = function selectTable(tr) {
   return tr;
 };
 
-exports.selectTable = selectTable;
+exports.selectTable = selectTable;
+
+var selectTableClosestToPos = function selectTableClosestToPos(tr, $pos) {
+  var table = (0, _find.findTableClosestToPos)($pos);
+
+  if (table) {
+    var _TableMap$get2 = _tableMap.TableMap.get(table.node),
+        map = _TableMap$get2.map;
+
+    if (map && map.length) {
+      var head = table.start + map[0];
+      var anchor = table.start + map[map.length - 1];
+      var $head = tr.doc.resolve(head);
+      var $anchor = tr.doc.resolve(anchor);
+      return (0, _cloneTr.cloneTr)(tr.setSelection(new _cellSelection.CellSelection($anchor, $head)));
+    }
+  }
+
+  return tr;
+};
+
+exports.selectTableClosestToPos = selectTableClosestToPos;

package/dist/cjs/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/editor-tables",
-	"version": "2.2.1",
+	"version": "2.2.3",
 	"sideEffects": false
 }

package/dist/es2019/cell-selection.js

@@ -245,8 +245,23 @@ export class CellSelection extends Selection {
       return false;
     }
 
-    const map = TableMap.get(this.$anchorCell.node(-1));
     const start = this.$anchorCell.start(-1);
+    const map = TableMap.get(this.$anchorCell.node(-1));
+    const rowAtAnchorCell = map.rowCount(this.$anchorCell.pos - start);
+    const rowAtHeadCell = map.rowCount(this.$headCell.pos - start);
+    const isSelectionSameRow = rowAtAnchorCell === rowAtHeadCell; // if anchor and head in the same line, counting how many cells
+    // should be in the row except merged cell
+
+    let maxColumnInSelectedRow = map.getMaxColInRow(this.$anchorCell); // 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.
+
+
     const anchorLeft = map.colCount(this.$anchorCell.pos - start);
     const headLeft = map.colCount(this.$headCell.pos - start);
 

package/dist/es2019/pm-plugins/input.js

@@ -145,9 +145,10 @@ export function handleTripleClick(view, pos) {
   return true;
 }
 export function handleMouseDown(view, event) {
-  const startEvent = event;
+  const startEvent = event; // Prevent right clicks from making a cell selection https://product-fabric.atlassian.net/browse/ED-12527
 
-  if (startEvent.ctrlKey || startEvent.metaKey) {
+  if (startEvent.ctrlKey || startEvent.metaKey || startEvent.button === 2 // right mouse click
+  ) {
     return false;
   }
 

package/dist/es2019/table-map.js

@@ -122,6 +122,25 @@ export class TableMap {
     }
 
     throw new RangeError('No cell with offset ' + pos + ' found');
+  } // Find the top side of the cell at the given position.
+
+
+  rowCount(pos) {
+    if (this.width <= 0) {
+      throw new RangeError('Wrong table width found');
+    }
+
+    for (let i = 0; i < this.map.length; i++) {
+      if (this.map[i] === pos) {
+        return Math.floor(i / this.width);
+      }
+    }
+
+    throw new RangeError('No cell with offset ' + pos + ' found');
+  }
+
+  isPosMerged(pos) {
+    return this.map.filter(cellPos => cellPos === pos).length > 1;
   } // :: (number, string, number) → ?number
   // Find the next cell in the given direction, starting from the cell
   // at `pos`, if any.
@@ -215,6 +234,14 @@ export class TableMap {
 
       rowStart = rowEnd;
     }
+  }
+
+  getMaxColInRow(pos) {
+    let parentRowNode = pos.parent;
+
+    if (parentRowNode.type.name === 'tableRow') {
+      return parentRowNode.childCount;
+    }
   } // :: (Node) → TableMap
   // Find the table map for the given table node.
 

package/dist/es2019/utils/select-nodes.js

@@ -1,7 +1,7 @@
 import { CellSelection } from '../cell-selection';
 import { TableMap } from '../table-map';
 import { cloneTr } from './clone-tr';
-import { findCellClosestToPos, findTable } from './find';
+import { findCellClosestToPos, findTable, findTableClosestToPos } from './find';
 
 const select = type => (index, expand) => tr => {
   const table = findTable(tr.selection);
@@ -81,5 +81,24 @@ export const selectTable = tr => {
     }
   }
 
+  return tr;
+};
+export const selectTableClosestToPos = (tr, $pos) => {
+  const table = findTableClosestToPos($pos);
+
+  if (table) {
+    const {
+      map
+    } = TableMap.get(table.node);
+
+    if (map && map.length) {
+      const head = table.start + map[0];
+      const anchor = table.start + map[map.length - 1];
+      const $head = tr.doc.resolve(head);
+      const $anchor = tr.doc.resolve(anchor);
+      return cloneTr(tr.setSelection(new CellSelection($anchor, $head)));
+    }
+  }
+
   return tr;
 };

package/dist/es2019/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/editor-tables",
-	"version": "2.2.1",
+	"version": "2.2.3",
 	"sideEffects": false
 }

package/dist/esm/cell-selection.js

@@ -246,8 +246,23 @@ export var CellSelection = /*#__PURE__*/function (_Selection) {
         return false;
       }
 
-      var map = TableMap.get(this.$anchorCell.node(-1));
       var start = this.$anchorCell.start(-1);
+      var map = 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
+      // should be in the row except merged cell
+
+      var maxColumnInSelectedRow = map.getMaxColInRow(this.$anchorCell); // 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.
+
+
       var anchorLeft = map.colCount(this.$anchorCell.pos - start);
       var headLeft = map.colCount(this.$headCell.pos - start);
 

package/dist/esm/pm-plugins/input.js

@@ -141,9 +141,10 @@ export function handleTripleClick(view, pos) {
   return true;
 }
 export function handleMouseDown(view, event) {
-  var startEvent = 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) {
+  if (startEvent.ctrlKey || startEvent.metaKey || startEvent.button === 2 // right mouse click
+  ) {
     return false;
   }
 

package/dist/esm/table-map.js

@@ -130,6 +130,29 @@ export var TableMap = /*#__PURE__*/function () {
       }
 
       throw new RangeError('No cell with offset ' + pos + ' found');
+    } // Find the top side of the cell at the given position.
+
+  }, {
+    key: "rowCount",
+    value: function rowCount(pos) {
+      if (this.width <= 0) {
+        throw new RangeError('Wrong table width found');
+      }
+
+      for (var i = 0; i < this.map.length; i++) {
+        if (this.map[i] === pos) {
+          return Math.floor(i / this.width);
+        }
+      }
+
+      throw new RangeError('No cell with offset ' + pos + ' found');
+    }
+  }, {
+    key: "isPosMerged",
+    value: function isPosMerged(pos) {
+      return this.map.filter(function (cellPos) {
+        return cellPos === pos;
+      }).length > 1;
     } // :: (number, string, number) → ?number
     // Find the next cell in the given direction, starting from the cell
     // at `pos`, if any.
@@ -226,6 +249,15 @@ export var TableMap = /*#__PURE__*/function () {
 
         rowStart = rowEnd;
       }
+    }
+  }, {
+    key: "getMaxColInRow",
+    value: function getMaxColInRow(pos) {
+      var parentRowNode = pos.parent;
+
+      if (parentRowNode.type.name === 'tableRow') {
+        return parentRowNode.childCount;
+      }
     } // :: (Node) → TableMap
     // Find the table map for the given table node.
 

package/dist/esm/utils/select-nodes.js

@@ -1,7 +1,7 @@
 import { CellSelection } from '../cell-selection';
 import { TableMap } from '../table-map';
 import { cloneTr } from './clone-tr';
-import { findCellClosestToPos, findTable } from './find';
+import { findCellClosestToPos, findTable, findTableClosestToPos } from './find';
 
 var select = function select(type) {
   return function (index, expand) {
@@ -84,5 +84,23 @@ export var selectTable = function selectTable(tr) {
     }
   }
 
+  return tr;
+};
+export var selectTableClosestToPos = function selectTableClosestToPos(tr, $pos) {
+  var table = findTableClosestToPos($pos);
+
+  if (table) {
+    var _TableMap$get2 = TableMap.get(table.node),
+        map = _TableMap$get2.map;
+
+    if (map && map.length) {
+      var head = table.start + map[0];
+      var anchor = table.start + map[map.length - 1];
+      var $head = tr.doc.resolve(head);
+      var $anchor = tr.doc.resolve(anchor);
+      return cloneTr(tr.setSelection(new CellSelection($anchor, $head)));
+    }
+  }
+
   return tr;
 };

package/dist/esm/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/editor-tables",
-	"version": "2.2.1",
+	"version": "2.2.3",
 	"sideEffects": false
 }

package/dist/types/table-map.d.ts

@@ -1,4 +1,4 @@
-import { Node as PMNode } from 'prosemirror-model';
+import { Node as PMNode, ResolvedPos } from 'prosemirror-model';
 import { Axis } from './types';
 export declare class Rect {
     left: number;
@@ -54,9 +54,12 @@ export declare class TableMap {
     constructor(width: number, height: number, map: number[], problems?: TableProblem[] | null);
     findCell(pos: number): Rect;
     colCount(pos: number): number;
+    rowCount(pos: number): number;
+    isPosMerged(pos: number): boolean;
     nextCell(pos: number, axis: Axis, dir: number): number | null;
     rectBetween(a: number, b: number): Rect;
     cellsInRect(rect: Rect): number[];
     positionAt(row: number, col: number, table: PMNode): number;
+    getMaxColInRow(pos: ResolvedPos): number | undefined;
     static get(table: PMNode): TableMap;
 }

package/dist/types/utils/select-nodes.d.ts

@@ -1,4 +1,6 @@
+import { ResolvedPos } from 'prosemirror-model';
 import { Transaction } from 'prosemirror-state';
 export declare const selectColumn: (index: number, expand?: boolean | undefined) => (tr: Transaction) => Transaction;
 export declare const selectRow: (index: number, expand?: boolean | undefined) => (tr: Transaction) => Transaction;
 export declare const selectTable: (tr: Transaction) => Transaction;
+export declare const selectTableClosestToPos: (tr: Transaction, $pos: ResolvedPos) => Transaction;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-tables",
-  "version": "2.2.1",
+  "version": "2.2.3",
   "description": "A package that contains common classes and utility functions for editor tables",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -29,8 +29,8 @@
     "prosemirror-view": "1.23.2"
   },
   "devDependencies": {
-    "@atlaskit/adf-schema": "^24.0.0",
-    "@atlaskit/editor-test-helpers": "^17.2.0",
+    "@atlaskit/adf-schema": "^25.0.0",
+    "@atlaskit/editor-test-helpers": "^18.0.0",
     "@atlassian/atlassian-frontend-prettier-config-1.0.1": "npm:@atlassian/atlassian-frontend-prettier-config@1.0.1"
   },
   "techstack": {

package/report.api.md

@@ -1,12 +1,17 @@
+<!-- API Report Version: 2.3 -->
+
 ## API Report File for "@atlaskit/editor-tables"
 
-> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+> Do not edit this file. This report is auto-generated using [API Extractor](https://api-extractor.com/).
+> [Learn more about API reports](https://hello.atlassian.net/wiki/spaces/UR/pages/1825484529/Package+API+Reports)
+
+### Table of contents
 
-<!--
-	Generated API Report version: 2.0
--->
+- [Main Entry Types](#main-entry-types)
 
-[Learn more about API reports](https://hello.atlassian.net/wiki/spaces/UR/pages/1825484529/Package+API+Reports)
+### Main Entry Types
+
+<!--SECTION START: Main Entry Types-->
 
 ```ts
 import { ContentNodeWithPos } from 'prosemirror-utils';
@@ -127,11 +132,15 @@ export class TableMap {
   // (undocumented)
   static get(table: Node_2): TableMap;
   // (undocumented)
+  getMaxColInRow(pos: ResolvedPos): number | undefined;
+  // (undocumented)
   height: number;
   // (undocumented)
+  isPosMerged(pos: number): boolean;
+  // (undocumented)
   map: number[];
   // (undocumented)
-  nextCell(pos: number, axis: Axis, dir: number): number | null;
+  nextCell(pos: number, axis: Axis, dir: number): null | number;
   // (undocumented)
   positionAt(row: number, col: number, table: Node_2): number;
   // (undocumented)
@@ -139,15 +148,17 @@ export class TableMap {
   // (undocumented)
   rectBetween(a: number, b: number): Rect;
   // (undocumented)
+  rowCount(pos: number): number;
+  // (undocumented)
   width: number;
 }
 
 // @public (undocumented)
 type TableProblem =
+  | TableProblemColWidthMismatch
   | TableProblemCollision
   | TableProblemLongRowspan
-  | TableProblemMissing
-  | TableProblemColWidthMismatch;
+  | TableProblemMissing;
 
 // @public (undocumented)
 type TableProblemCollision = {
@@ -192,9 +203,11 @@ enum TableProblemTypes {
 
 // @public (undocumented)
 export const uuid: {
-  setStatic(value: string | false): void;
+  setStatic(value: false | string): void;
   generate(): string;
 };
 
 // (No @packageDocumentation comment for this package)
 ```
+
+<!--SECTION END: Main Entry Types-->