@atlaskit/editor-plugin-table 7.5.1 → 7.5.2

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/editor-plugin-table
 
+## 7.5.2
+
+### Patch Changes
+
+- [#79502](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/79502) [`be5350055f7a`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/be5350055f7a) - [ux] Fix switch focused table cause a crash
+
 ## 7.5.1
 
 ### Patch Changes

package/dist/cjs/utils/merged-cells.js

@@ -234,8 +234,13 @@ var checkEdgeHasMergedCells = exports.checkEdgeHasMergedCells = function checkEd
   var maxIndex = Math.max.apply(Math, (0, _toConsumableArray2.default)(indexes));
   var isTopSideHaveMergedCells = false;
   var isBottomSideHaveMergedCells = false;
-  var isOldMinIndex = !map[minIndex - 1] && !map[minIndex];
-  var isOldMaxIndex = !map[maxIndex + 1] && !map[maxIndex];
+
+  /**
+   * this is to check if the cell position from last focused table is overflow. since if you selection from a cell in 6th row and 7th column cell in a 7x8 table to 3x3 table, the cell position will be overflow because new table dont have this cell at all.
+   TODO: ED-22335 this should better called only when hover over the drag handle.
+  */
+  var isOldMinIndex = !map[minIndex - 1] || !map[minIndex];
+  var isOldMaxIndex = !map[maxIndex + 1] || !map[maxIndex];
   if (minIndex > 0 && !isOldMinIndex) {
     var prevSelectionSet = map[minIndex - 1];
     var minSelectionSet = map[minIndex];

package/dist/es2019/utils/merged-cells.js

@@ -212,8 +212,13 @@ export const checkEdgeHasMergedCells = (indexes, tableMap, direction) => {
   let maxIndex = Math.max(...indexes);
   let isTopSideHaveMergedCells = false;
   let isBottomSideHaveMergedCells = false;
-  let isOldMinIndex = !map[minIndex - 1] && !map[minIndex];
-  let isOldMaxIndex = !map[maxIndex + 1] && !map[maxIndex];
+
+  /**
+   * this is to check if the cell position from last focused table is overflow. since if you selection from a cell in 6th row and 7th column cell in a 7x8 table to 3x3 table, the cell position will be overflow because new table dont have this cell at all.
+   TODO: ED-22335 this should better called only when hover over the drag handle.
+  */
+  let isOldMinIndex = !map[minIndex - 1] || !map[minIndex];
+  let isOldMaxIndex = !map[maxIndex + 1] || !map[maxIndex];
   if (minIndex > 0 && !isOldMinIndex) {
     const prevSelectionSet = map[minIndex - 1];
     const minSelectionSet = map[minIndex];

package/dist/esm/utils/merged-cells.js

@@ -227,8 +227,13 @@ export var checkEdgeHasMergedCells = function checkEdgeHasMergedCells(indexes, t
   var maxIndex = Math.max.apply(Math, _toConsumableArray(indexes));
   var isTopSideHaveMergedCells = false;
   var isBottomSideHaveMergedCells = false;
-  var isOldMinIndex = !map[minIndex - 1] && !map[minIndex];
-  var isOldMaxIndex = !map[maxIndex + 1] && !map[maxIndex];
+
+  /**
+   * this is to check if the cell position from last focused table is overflow. since if you selection from a cell in 6th row and 7th column cell in a 7x8 table to 3x3 table, the cell position will be overflow because new table dont have this cell at all.
+   TODO: ED-22335 this should better called only when hover over the drag handle.
+  */
+  var isOldMinIndex = !map[minIndex - 1] || !map[minIndex];
+  var isOldMaxIndex = !map[maxIndex + 1] || !map[maxIndex];
   if (minIndex > 0 && !isOldMinIndex) {
     var prevSelectionSet = map[minIndex - 1];
     var minSelectionSet = map[minIndex];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-table",
-  "version": "7.5.1",
+  "version": "7.5.2",
   "description": "Table plugin for the @atlaskit/editor",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -145,4 +145,4 @@
       "type": "boolean"
     }
   }
-}
+}

package/src/utils/merged-cells.ts

@@ -259,13 +259,17 @@ export const checkEdgeHasMergedCells = (
   const { mapByRow, mapByColumn } = tableMap;
   const map = 'row' === direction ? mapByRow : mapByColumn;
   const lengthLimiter = direction === 'row' ? tableMap.width : tableMap.height;
-
   let minIndex = Math.min(...indexes);
   let maxIndex = Math.max(...indexes);
   let isTopSideHaveMergedCells = false;
   let isBottomSideHaveMergedCells = false;
-  let isOldMinIndex = !map[minIndex - 1] && !map[minIndex];
-  let isOldMaxIndex = !map[maxIndex + 1] && !map[maxIndex];
+
+  /**
+   * this is to check if the cell position from last focused table is overflow. since if you selection from a cell in 6th row and 7th column cell in a 7x8 table to 3x3 table, the cell position will be overflow because new table dont have this cell at all.
+   TODO: ED-22335 this should better called only when hover over the drag handle.
+  */
+  let isOldMinIndex = !map[minIndex - 1] || !map[minIndex];
+  let isOldMaxIndex = !map[maxIndex + 1] || !map[maxIndex];
 
   if (minIndex > 0 && !isOldMinIndex) {
     const prevSelectionSet = map[minIndex - 1];