@atlaskit/editor-tables 2.5.3 → 2.5.5

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/editor-tables
 
+## 2.5.5
+
+### Patch Changes
+
+- [#72037](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/72037) [`e59f0b7a9115`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/e59f0b7a9115) - [ux] add flexiable to make merged cells detection allow to detect edge merged cells
+
+## 2.5.4
+
+### Patch Changes
+
+- [#68572](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/68572) [`15d407fe5143`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/15d407fe5143) - Upgrading @atlaskit/editor-prosemirror dependency
+
 ## 2.5.3
 
 ### Patch Changes

package/dist/cjs/table-map.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.tableNewColumnMinWidth = exports.TableProblemTypes = exports.TableMap = exports.Rect = void 0;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 // Because working with row and column-spanning cells is not quite
@@ -73,14 +74,16 @@ var tableNewColumnMinWidth = exports.tableNewColumnMinWidth = 140;
 // be able to do that, positions saved in the map are relative to the
 // start of the table, rather than the start of the document.
 var TableMap = exports.TableMap = /*#__PURE__*/function () {
-  // The width of the table
-
-  // The table's height
-
-  function TableMap(width, height, map, problems) {
+  function TableMap(width, height, map, problems, mapByColumn, mapByRow) {
     (0, _classCallCheck2.default)(this, TableMap);
+    // The width of the table
+    // The table's height
+    (0, _defineProperty2.default)(this, "mapByColumn", []);
+    (0, _defineProperty2.default)(this, "mapByRow", []);
     this.width = width;
     this.height = height;
+    this.mapByColumn = mapByColumn || [];
+    this.mapByRow = mapByRow || [];
     // :: [number] A width * height array with the start position of
     // the cell covering that part of the table in each slot
     this.map = map;
@@ -267,6 +270,12 @@ var TableMap = exports.TableMap = /*#__PURE__*/function () {
         return parentRowNode.childCount;
       }
     }
+  }, {
+    key: "hasMergedCells",
+    value: function hasMergedCells() {
+      var uniquePositions = new Set(this.map);
+      return uniquePositions.size !== this.map.length;
+    }
 
     // :: (Node) → TableMap
     // Find the table map for the given table node.
@@ -359,14 +368,25 @@ function computeMap(table) {
     }
     pos++;
   }
-  var tableMap = new TableMap(width, height, map, problems);
+  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(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 _i2 = 0; !badWidths && _i2 < colWidths.length; _i2 += 2) {
-    if (colWidths[_i2] != null && colWidths[_i2 + 1] < height) {
+  for (var _i3 = 0; !badWidths && _i3 < colWidths.length; _i3 += 2) {
+    if (colWidths[_i3] != null && colWidths[_i3 + 1] < height) {
       badWidths = true;
     }
   }
@@ -377,7 +397,7 @@ function computeMap(table) {
   // 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 _i3 = 0; _i3 < width * 2 - colWidths.length; _i3++) {
+    for (var _i4 = 0; _i4 < width * 2 - colWidths.length; _i4++) {
       colWidths.push(tableNewColumnMinWidth, 0);
     }
     badWidths = true;
@@ -404,8 +424,8 @@ function findWidth(table) {
         }
       }
     }
-    for (var _i4 = 0; _i4 < rowNode.childCount; _i4++) {
-      var _cell = rowNode.child(_i4);
+    for (var _i5 = 0; _i5 < rowNode.childCount; _i5++) {
+      var _cell = rowNode.child(_i5);
       rowWidth += _cell.attrs.colspan;
       if (_cell.attrs.rowspan > 1) {
         hasRowSpan = true;

package/dist/es2019/table-map.js

@@ -1,3 +1,4 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
 // Because working with row and column-spanning cells is not quite
 // trivial, this code builds up a descriptive structure for a given
 // table node. The structures are cached with the (persistent) table
@@ -63,13 +64,15 @@ export const tableNewColumnMinWidth = 140;
 // be able to do that, positions saved in the map are relative to the
 // start of the table, rather than the start of the document.
 export class TableMap {
-  // The width of the table
-
-  // The table's height
-
-  constructor(width, height, map, problems) {
+  constructor(width, height, map, problems, mapByColumn, mapByRow) {
+    // The width of the table
+    // The table's height
+    _defineProperty(this, "mapByColumn", []);
+    _defineProperty(this, "mapByRow", []);
     this.width = width;
     this.height = height;
+    this.mapByColumn = mapByColumn || [];
+    this.mapByRow = mapByRow || [];
     // :: [number] A width * height array with the start position of
     // the cell covering that part of the table in each slot
     this.map = map;
@@ -235,6 +238,10 @@ export class TableMap {
       return parentRowNode.childCount;
     }
   }
+  hasMergedCells() {
+    const uniquePositions = new Set(this.map);
+    return uniquePositions.size !== this.map.length;
+  }
 
   // :: (Node) → TableMap
   // Find the table map for the given table node.
@@ -326,7 +333,18 @@ function computeMap(table) {
     }
     pos++;
   }
-  let tableMap = new TableMap(width, height, map, problems);
+  let mapByRow = Array(height);
+  let mapByColumn = Array(width);
+  for (let i = 0; i < map.length; i++) {
+    var _mapByColumn$columnIn, _mapByRow$rowIndex;
+    const columnIndex = i % width;
+    mapByColumn[columnIndex] = (_mapByColumn$columnIn = mapByColumn[columnIndex]) !== null && _mapByColumn$columnIn !== void 0 ? _mapByColumn$columnIn : [];
+    mapByColumn[columnIndex].push(map[i]);
+    const rowIndex = Math.trunc(i / width);
+    mapByRow[rowIndex] = (_mapByRow$rowIndex = mapByRow[rowIndex]) !== null && _mapByRow$rowIndex !== void 0 ? _mapByRow$rowIndex : [];
+    mapByRow[rowIndex].push(map[i]);
+  }
+  let tableMap = new TableMap(width, height, map, problems, mapByColumn, mapByRow);
   let badWidths = false;
 
   // For columns that have defined widths, but whose widths disagree

package/dist/esm/table-map.js

@@ -1,3 +1,4 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _createClass from "@babel/runtime/helpers/createClass";
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 // Because working with row and column-spanning cells is not quite
@@ -66,14 +67,16 @@ export var tableNewColumnMinWidth = 140;
 // be able to do that, positions saved in the map are relative to the
 // start of the table, rather than the start of the document.
 export var TableMap = /*#__PURE__*/function () {
-  // The width of the table
-
-  // The table's height
-
-  function TableMap(width, height, map, problems) {
+  function TableMap(width, height, map, problems, mapByColumn, mapByRow) {
     _classCallCheck(this, TableMap);
+    // The width of the table
+    // The table's height
+    _defineProperty(this, "mapByColumn", []);
+    _defineProperty(this, "mapByRow", []);
     this.width = width;
     this.height = height;
+    this.mapByColumn = mapByColumn || [];
+    this.mapByRow = mapByRow || [];
     // :: [number] A width * height array with the start position of
     // the cell covering that part of the table in each slot
     this.map = map;
@@ -260,6 +263,12 @@ export var TableMap = /*#__PURE__*/function () {
         return parentRowNode.childCount;
       }
     }
+  }, {
+    key: "hasMergedCells",
+    value: function hasMergedCells() {
+      var uniquePositions = new Set(this.map);
+      return uniquePositions.size !== this.map.length;
+    }
 
     // :: (Node) → TableMap
     // Find the table map for the given table node.
@@ -354,14 +363,25 @@ function computeMap(table) {
     }
     pos++;
   }
-  var tableMap = new TableMap(width, height, map, problems);
+  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(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 _i2 = 0; !badWidths && _i2 < colWidths.length; _i2 += 2) {
-    if (colWidths[_i2] != null && colWidths[_i2 + 1] < height) {
+  for (var _i3 = 0; !badWidths && _i3 < colWidths.length; _i3 += 2) {
+    if (colWidths[_i3] != null && colWidths[_i3 + 1] < height) {
       badWidths = true;
     }
   }
@@ -372,7 +392,7 @@ function computeMap(table) {
   // 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 _i3 = 0; _i3 < width * 2 - colWidths.length; _i3++) {
+    for (var _i4 = 0; _i4 < width * 2 - colWidths.length; _i4++) {
       colWidths.push(tableNewColumnMinWidth, 0);
     }
     badWidths = true;
@@ -399,8 +419,8 @@ function findWidth(table) {
         }
       }
     }
-    for (var _i4 = 0; _i4 < rowNode.childCount; _i4++) {
-      var _cell = rowNode.child(_i4);
+    for (var _i5 = 0; _i5 < rowNode.childCount; _i5++) {
+      var _cell = rowNode.child(_i5);
       rowWidth += _cell.attrs.colspan;
       if (_cell.attrs.rowspan > 1) {
         hasRowSpan = true;

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

@@ -51,7 +51,9 @@ export declare class TableMap {
     height: number;
     map: number[];
     problems?: TableProblem[] | null;
-    constructor(width: number, height: number, map: number[], problems?: TableProblem[] | null);
+    mapByColumn: number[][];
+    mapByRow: number[][];
+    constructor(width: number, height: number, map: number[], problems?: TableProblem[] | null, mapByColumn?: number[][], mapByRow?: number[][]);
     findCell(pos: number): Rect;
     colCount(pos: number): number;
     rowCount(pos: number): number;
@@ -64,5 +66,6 @@ export declare class TableMap {
     cellsInRect(rect: Rect): number[];
     positionAt(row: number, col: number, table: PMNode): number;
     getMaxColInRow(pos: ResolvedPos): number | undefined;
+    hasMergedCells(): boolean;
     static get(table: PMNode): TableMap;
 }

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

@@ -51,7 +51,9 @@ export declare class TableMap {
     height: number;
     map: number[];
     problems?: TableProblem[] | null;
-    constructor(width: number, height: number, map: number[], problems?: TableProblem[] | null);
+    mapByColumn: number[][];
+    mapByRow: number[][];
+    constructor(width: number, height: number, map: number[], problems?: TableProblem[] | null, mapByColumn?: number[][], mapByRow?: number[][]);
     findCell(pos: number): Rect;
     colCount(pos: number): number;
     rowCount(pos: number): number;
@@ -64,5 +66,6 @@ export declare class TableMap {
     cellsInRect(rect: Rect): number[];
     positionAt(row: number, col: number, table: PMNode): number;
     getMaxColInRow(pos: ResolvedPos): number | undefined;
+    hasMergedCells(): boolean;
     static get(table: PMNode): TableMap;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-tables",
-  "version": "2.5.3",
+  "version": "2.5.5",
   "description": "A package that contains common classes and utility functions for editor tables",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -28,7 +28,7 @@
     "releaseModel": "continuous"
   },
   "dependencies": {
-    "@atlaskit/editor-prosemirror": "1.1.0",
+    "@atlaskit/editor-prosemirror": "3.0.0",
     "@atlaskit/platform-feature-flags": "^0.2.4",
     "@babel/runtime": "^7.0.0"
   },

package/tsconfig.json

@@ -1,36 +1,7 @@
 {
   "extends": "../../../tsconfig.json",
   "compilerOptions": {
-    "baseUrl": "./",
-    "paths": {
-      "@atlaskit/platform-feature-flags": [
-        "../../platform/feature-flags/src/index.ts"
-      ],
-      "@atlassian/feature-flags-test-utils": [
-        "../../platform/feature-flags-test-utils/src/index.ts"
-      ],
-      "@atlaskit/editor-tables/cell-bookmark": [
-        "src/cell-bookmark.ts"
-      ],
-      "@atlaskit/editor-tables/cell-selection": [
-        "src/cell-selection.ts"
-      ],
-      "@atlaskit/editor-tables/pm-plugins": [
-        "src/pm-plugins.ts"
-      ],
-      "@atlaskit/editor-tables/table-map": [
-        "src/table-map.ts"
-      ],
-      "@atlaskit/editor-tables/types": [
-        "src/types.ts"
-      ],
-      "@atlaskit/editor-tables/utils": [
-        "src/utils.ts"
-      ],
-      "@atlaskit/editor-tables": [
-        "./src"
-      ]
-    }
+    "baseUrl": "./"
   },
   "include": [
     "src/**/*.ts",