@atlaskit/editor-plugin-table 0.0.6 → 0.0.7

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @atlaskit/editor-plugin-table
 
+## 0.0.7
+
+### Patch Changes
+
+- [`3b93848ef7e`](https://bitbucket.org/atlassian/atlassian-frontend/commits/3b93848ef7e) - This changes addresses a bug that occurs when a user is resizing tables and receives a TypeError (found on Sentry). This change adds a null check on columns existing in the growColumn and shrinkColumn functions so that we do not try to access a column that doesn't exist.
+- [`a1b80e72418`](https://bitbucket.org/atlassian/atlassian-frontend/commits/a1b80e72418) - This change addresses a RangeError on `getRelativeDomCellWidths` found on Sentry. It sets the check for `colspan` to be strict equals to one as the value comes from the first table row's colspan DOM attribute and cannot be negative.
+
+  Reference: https://sentry.io/organizations/atlassian-2y/issues/3434914334/?project=5988900
+
+- [`b63aa34e1fe`](https://bitbucket.org/atlassian/atlassian-frontend/commits/b63aa34e1fe) - This change addresses a bug that occurs when a user is clicking into an element inside the table and receives a RangeError (found on Sentry). This change adds bounds, NaN, and type checks when reading a cellIndex from tableMap so that we don't pass NaN or undefined to the call to nodeAt.
+
 ## 0.0.6
 
 ### Patch Changes

package/dist/cjs/plugins/table/event-handlers.js

@@ -37,11 +37,6 @@ var _utils3 = require("./utils");
 
 var _getAllowAddColumnCustomStep = require("./utils/get-allow-add-column-custom-step");
 
-// import {
-//   isElementInTableCell,
-//   isLastItemMediaGroup,
-//   setNodeSelection,
-// } from '@atlaskit/editor-core/src/utils';
 // import { closestElement } from '@atlaskit/editor-core/src/utils/dom';
 var isFocusingCalendar = function isFocusingCalendar(event) {
   return event instanceof FocusEvent && event.relatedTarget instanceof HTMLElement && event.relatedTarget.getAttribute('aria-label') === 'calendar';
@@ -113,7 +108,13 @@ var handleClick = function handleClick(view, event) {
       _view$state = view.state,
       tr = _view$state.tr,
       paragraph = _view$state.schema.nodes.paragraph;
-  var editorElement = table.node.nodeAt(map.map[cellIndex]);
+  var cellPos = map.map[cellIndex];
+
+  if (isNaN(cellPos) || cellPos === undefined || typeof cellPos !== 'number') {
+    return false;
+  }
+
+  var editorElement = table.node.nodeAt(cellPos);
   /** Only if the last item is media group, insert a paragraph */
 
   if ((0, _utils2.isLastItemMediaGroup)(editorElement)) {

package/dist/cjs/plugins/table/nodeviews/tableCell.js

@@ -19,6 +19,9 @@ var _prosemirrorModel = require("prosemirror-model");
 
 var _adfSchema = require("@atlaskit/adf-schema");
 
+var DEFAULT_COL_SPAN = 1;
+var DEFAULT_ROW_SPAN = 1;
+
 var TableCellNodeView = /*#__PURE__*/function () {
   function TableCellNodeView(node, view, getPos, getEditorFeatureFlags, observer) {
     (0, _classCallCheck2.default)(this, TableCellNodeView);
@@ -62,10 +65,7 @@ var TableCellNodeView = /*#__PURE__*/function () {
       // this can happen when undoing merge cells
 
 
-      var defaultColspan = 1,
-          defaultRowspan = 1;
-
-      if (colspan !== (node.attrs.colspan || defaultColspan) || rowspan !== (node.attrs.rowspan || defaultRowspan)) {
+      if (colspan !== (node.attrs.colspan || DEFAULT_COL_SPAN) || rowspan !== (node.attrs.rowspan || DEFAULT_ROW_SPAN)) {
         return false;
       } // added + changed attributes
 

package/dist/cjs/plugins/table/pm-plugins/table-resizing/utils/column-state.js

@@ -54,7 +54,7 @@ var getCellsRefsInColumn = function getCellsRefsInColumn(columnIndex, table, tab
     }
   });
   return cells;
-}; // calculates column withs based on `cells` DOM refs
+}; // calculates column widths based on `cells` DOM refs
 
 
 exports.getCellsRefsInColumn = getCellsRefsInColumn;

package/dist/cjs/plugins/table/pm-plugins/table-resizing/utils/resize-logic.js

@@ -24,8 +24,8 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 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 growColumn = function growColumn(state, colIndex, amount, selectedColumns) {
-  // can't grow the last column
-  if (!state.cols[colIndex + 1]) {
+  // can't grow if columns don't exist or it's the last column
+  if (!state.cols[colIndex] || !state.cols[colIndex + 1]) {
     return state;
   }
 
@@ -47,7 +47,12 @@ var growColumn = function growColumn(state, colIndex, amount, selectedColumns) {
 exports.growColumn = growColumn;
 
 var shrinkColumn = function shrinkColumn(state, colIndex, amount, selectedColumns) {
-  // try to shrink dragging column by giving from the column to the right first
+  // can't shrink if columns don't exist
+  if (!state.cols[colIndex] || !state.cols[colIndex + 1]) {
+    return state;
+  } // try to shrink dragging column by giving from the column to the right first
+
+
   var res = moveSpaceFrom(state, colIndex, colIndex + 1, -amount);
   var newState = res.state;
   var isOverflownTable = (0, _resizeState.getTotalWidth)(newState) > newState.maxSize;

package/dist/cjs/plugins/table/utils/column-controls.js

@@ -149,7 +149,7 @@ var getRelativeDomCellWidths = function getRelativeDomCellWidths(_ref) {
   // for cells in a table with unchanged column widths,
   // these are identified by the lack of colwidth data attribute,
   // return equally partitioned total cell width in DOM for each cell.
-  if (colspan <= 1 || !colwidth) {
+  if (colspan === 1 || !colwidth) {
     return new Array(colspan).fill(width / colspan);
   } // For cells that have colSpan > 1 and
   // are part of a table with resized columns

package/dist/cjs/version.json

@@ -1,4 +1,4 @@
 {
 	"name": "@atlaskit/editor-plugin-table",
-	"version": "0.0.6"
+	"version": "0.0.7"
 }

package/dist/es2019/plugins/table/event-handlers.js

@@ -2,12 +2,7 @@ import { Selection, TextSelection } from 'prosemirror-state';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { TableMap } from '@atlaskit/editor-tables/table-map';
 import { cellAround, findCellRectClosestToPos, findTable, getSelectionRect, removeTable } from '@atlaskit/editor-tables/utils';
-import { browser } from '@atlaskit/editor-common/utils'; // import {
-//   isElementInTableCell,
-//   isLastItemMediaGroup,
-//   setNodeSelection,
-// } from '@atlaskit/editor-core/src/utils';
-
+import { browser } from '@atlaskit/editor-common/utils';
 import { isElementInTableCell, isLastItemMediaGroup, setNodeSelection } from '@atlaskit/editor-common/utils'; // import { closestElement } from '@atlaskit/editor-core/src/utils/dom';
 
 import { closestElement } from '@atlaskit/editor-common/utils';
@@ -89,7 +84,13 @@ export const handleClick = (view, event) => {
       }
     }
   } = view;
-  const editorElement = table.node.nodeAt(map.map[cellIndex]);
+  const cellPos = map.map[cellIndex];
+
+  if (isNaN(cellPos) || cellPos === undefined || typeof cellPos !== 'number') {
+    return false;
+  }
+
+  const editorElement = table.node.nodeAt(cellPos);
   /** Only if the last item is media group, insert a paragraph */
 
   if (isLastItemMediaGroup(editorElement)) {

package/dist/es2019/plugins/table/nodeviews/tableCell.js

@@ -1,6 +1,8 @@
 import uuid from 'uuid';
 import { DOMSerializer } from 'prosemirror-model';
 import { getCellDomAttrs, getCellAttrs } from '@atlaskit/adf-schema';
+const DEFAULT_COL_SPAN = 1;
+const DEFAULT_ROW_SPAN = 1;
 export default class TableCellNodeView {
   constructor(node, view, getPos, getEditorFeatureFlags, observer) {
     this.view = view;
@@ -37,10 +39,7 @@ export default class TableCellNodeView {
     } = getCellAttrs(this.dom); // need to rerender when colspan/rowspan in dom are different from the node attrs
     // this can happen when undoing merge cells
 
-    const defaultColspan = 1,
-          defaultRowspan = 1;
-
-    if (colspan !== (node.attrs.colspan || defaultColspan) || rowspan !== (node.attrs.rowspan || defaultRowspan)) {
+    if (colspan !== (node.attrs.colspan || DEFAULT_COL_SPAN) || rowspan !== (node.attrs.rowspan || DEFAULT_ROW_SPAN)) {
       return false;
     } // added + changed attributes
 

package/dist/es2019/plugins/table/pm-plugins/table-resizing/utils/column-state.js

@@ -35,7 +35,7 @@ export const getCellsRefsInColumn = (columnIndex, table, tableStart, domAtPos) =
     }
   });
   return cells;
-}; // calculates column withs based on `cells` DOM refs
+}; // calculates column widths based on `cells` DOM refs
 
 export const calculateColumnWidth = (cells, calculateColumnWidthCb) => {
   let maxColWidth = 0;

package/dist/es2019/plugins/table/pm-plugins/table-resizing/utils/resize-logic.js

@@ -1,8 +1,8 @@
 import { getFreeSpace } from './column-state';
 import { bulkColumnsResize, getTotalWidth } from './resize-state';
 export const growColumn = (state, colIndex, amount, selectedColumns) => {
-  // can't grow the last column
-  if (!state.cols[colIndex + 1]) {
+  // can't grow if columns don't exist or it's the last column
+  if (!state.cols[colIndex] || !state.cols[colIndex + 1]) {
     return state;
   }
 
@@ -21,7 +21,12 @@ export const growColumn = (state, colIndex, amount, selectedColumns) => {
   return newState;
 };
 export const shrinkColumn = (state, colIndex, amount, selectedColumns) => {
-  // try to shrink dragging column by giving from the column to the right first
+  // can't shrink if columns don't exist
+  if (!state.cols[colIndex] || !state.cols[colIndex + 1]) {
+    return state;
+  } // try to shrink dragging column by giving from the column to the right first
+
+
   const res = moveSpaceFrom(state, colIndex, colIndex + 1, -amount);
   let newState = res.state;
   const isOverflownTable = getTotalWidth(newState) > newState.maxSize;

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

@@ -115,7 +115,7 @@ const getRelativeDomCellWidths = ({
   // for cells in a table with unchanged column widths,
   // these are identified by the lack of colwidth data attribute,
   // return equally partitioned total cell width in DOM for each cell.
-  if (colspan <= 1 || !colwidth) {
+  if (colspan === 1 || !colwidth) {
     return new Array(colspan).fill(width / colspan);
   } // For cells that have colSpan > 1 and
   // are part of a table with resized columns

package/dist/es2019/version.json

@@ -1,4 +1,4 @@
 {
 	"name": "@atlaskit/editor-plugin-table",
-	"version": "0.0.6"
+	"version": "0.0.7"
 }

package/dist/esm/plugins/table/event-handlers.js

@@ -3,12 +3,7 @@ import { Selection, TextSelection } from 'prosemirror-state';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { TableMap } from '@atlaskit/editor-tables/table-map';
 import { cellAround, findCellRectClosestToPos, findTable, getSelectionRect, removeTable } from '@atlaskit/editor-tables/utils';
-import { browser } from '@atlaskit/editor-common/utils'; // import {
-//   isElementInTableCell,
-//   isLastItemMediaGroup,
-//   setNodeSelection,
-// } from '@atlaskit/editor-core/src/utils';
-
+import { browser } from '@atlaskit/editor-common/utils';
 import { isElementInTableCell, isLastItemMediaGroup, setNodeSelection } from '@atlaskit/editor-common/utils'; // import { closestElement } from '@atlaskit/editor-core/src/utils/dom';
 
 import { closestElement } from '@atlaskit/editor-common/utils';
@@ -84,7 +79,13 @@ export var handleClick = function handleClick(view, event) {
       _view$state = view.state,
       tr = _view$state.tr,
       paragraph = _view$state.schema.nodes.paragraph;
-  var editorElement = table.node.nodeAt(map.map[cellIndex]);
+  var cellPos = map.map[cellIndex];
+
+  if (isNaN(cellPos) || cellPos === undefined || typeof cellPos !== 'number') {
+    return false;
+  }
+
+  var editorElement = table.node.nodeAt(cellPos);
   /** Only if the last item is media group, insert a paragraph */
 
   if (isLastItemMediaGroup(editorElement)) {

package/dist/esm/plugins/table/nodeviews/tableCell.js

@@ -4,6 +4,8 @@ import _createClass from "@babel/runtime/helpers/createClass";
 import uuid from 'uuid';
 import { DOMSerializer } from 'prosemirror-model';
 import { getCellDomAttrs, getCellAttrs } from '@atlaskit/adf-schema';
+var DEFAULT_COL_SPAN = 1;
+var DEFAULT_ROW_SPAN = 1;
 
 var TableCellNodeView = /*#__PURE__*/function () {
   function TableCellNodeView(node, view, getPos, getEditorFeatureFlags, observer) {
@@ -49,10 +51,7 @@ var TableCellNodeView = /*#__PURE__*/function () {
       // this can happen when undoing merge cells
 
 
-      var defaultColspan = 1,
-          defaultRowspan = 1;
-
-      if (colspan !== (node.attrs.colspan || defaultColspan) || rowspan !== (node.attrs.rowspan || defaultRowspan)) {
+      if (colspan !== (node.attrs.colspan || DEFAULT_COL_SPAN) || rowspan !== (node.attrs.rowspan || DEFAULT_ROW_SPAN)) {
         return false;
       } // added + changed attributes
 

package/dist/esm/plugins/table/pm-plugins/table-resizing/utils/column-state.js

@@ -35,7 +35,7 @@ export var getCellsRefsInColumn = function getCellsRefsInColumn(columnIndex, tab
     }
   });
   return cells;
-}; // calculates column withs based on `cells` DOM refs
+}; // calculates column widths based on `cells` DOM refs
 
 export var calculateColumnWidth = function calculateColumnWidth(cells, calculateColumnWidthCb) {
   var maxColWidth = 0;

package/dist/esm/plugins/table/pm-plugins/table-resizing/utils/resize-logic.js

@@ -9,8 +9,8 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 import { getFreeSpace } from './column-state';
 import { bulkColumnsResize, getTotalWidth } from './resize-state';
 export var growColumn = function growColumn(state, colIndex, amount, selectedColumns) {
-  // can't grow the last column
-  if (!state.cols[colIndex + 1]) {
+  // can't grow if columns don't exist or it's the last column
+  if (!state.cols[colIndex] || !state.cols[colIndex + 1]) {
     return state;
   }
 
@@ -29,7 +29,12 @@ export var growColumn = function growColumn(state, colIndex, amount, selectedCol
   return newState;
 };
 export var shrinkColumn = function shrinkColumn(state, colIndex, amount, selectedColumns) {
-  // try to shrink dragging column by giving from the column to the right first
+  // can't shrink if columns don't exist
+  if (!state.cols[colIndex] || !state.cols[colIndex + 1]) {
+    return state;
+  } // try to shrink dragging column by giving from the column to the right first
+
+
   var res = moveSpaceFrom(state, colIndex, colIndex + 1, -amount);
   var newState = res.state;
   var isOverflownTable = getTotalWidth(newState) > newState.maxSize;

package/dist/esm/plugins/table/utils/column-controls.js

@@ -119,7 +119,7 @@ var getRelativeDomCellWidths = function getRelativeDomCellWidths(_ref) {
   // for cells in a table with unchanged column widths,
   // these are identified by the lack of colwidth data attribute,
   // return equally partitioned total cell width in DOM for each cell.
-  if (colspan <= 1 || !colwidth) {
+  if (colspan === 1 || !colwidth) {
     return new Array(colspan).fill(width / colspan);
   } // For cells that have colSpan > 1 and
   // are part of a table with resized columns

package/dist/esm/version.json

@@ -1,4 +1,4 @@
 {
 	"name": "@atlaskit/editor-plugin-table",
-	"version": "0.0.6"
+	"version": "0.0.7"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-table",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "description": "Table plugin for the @atlaskit/editor",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -25,7 +25,7 @@
   },
   "dependencies": {
     "@atlaskit/adf-schema": "^24.0.0",
-    "@atlaskit/editor-common": "^70.0.0",
+    "@atlaskit/editor-common": "^70.1.0",
     "@atlaskit/editor-shared-styles": "^2.2.0",
     "@atlaskit/editor-tables": "^2.2.0",
     "@atlaskit/icon": "^21.11.0",
@@ -56,6 +56,7 @@
     "styled-components": "^3.2.6"
   },
   "devDependencies": {
+    "@atlaskit/analytics-next": "^8.3.3",
     "@atlaskit/button": "^16.3.0",
     "@atlaskit/editor-core": "^173.0.0",
     "@atlaskit/editor-test-helpers": "^17.2.0",
@@ -63,6 +64,7 @@
     "@atlaskit/logo": "^13.10.0",
     "@atlaskit/media-integration-test-helpers": "^2.6.0",
     "@atlaskit/synchrony-test-helpers": "^2.3.0",
+    "@atlaskit/util-data-test": "^17.5.5",
     "@atlaskit/visual-regression": "*",
     "@atlaskit/webdriver-runner": "*",
     "@atlassian/atlassian-frontend-prettier-config-1.0.1": "npm:@atlassian/atlassian-frontend-prettier-config@1.0.1",