@atlaskit/editor-plugin-table 1.2.5 → 1.2.6

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

@@ -27,8 +27,7 @@ export const RESIZE_HANDLE_AREA_DECORATION_GAP = 30;
  *
  */
 
-export let TableDecorations;
-(function (TableDecorations) {
+export let TableDecorations = /*#__PURE__*/function (TableDecorations) {
   TableDecorations["ALL_CONTROLS_HOVER"] = "CONTROLS_HOVER";
   TableDecorations["ROW_CONTROLS_HOVER"] = "ROW_CONTROLS_HOVER";
   TableDecorations["COLUMN_CONTROLS_HOVER"] = "COLUMN_CONTROLS_HOVER";
@@ -39,7 +38,8 @@ export let TableDecorations;
   TableDecorations["COLUMN_RESIZING_HANDLE"] = "COLUMN_RESIZING_HANDLE";
   TableDecorations["COLUMN_RESIZING_HANDLE_LINE"] = "COLUMN_RESIZING_HANDLE_LINE";
   TableDecorations["LAST_CELL_ELEMENT"] = "LAST_CELL_ELEMENT";
-})(TableDecorations || (TableDecorations = {}));
+  return TableDecorations;
+}({});
 export const TableCssClassName = {
   ...TableSharedCssClassName,
   COLUMN_CONTROLS: `${tablePrefixSelector}-column-controls`,
@@ -102,8 +102,8 @@ export const TableCssClassName = {
   WITH_RESIZE_LINE: `${tablePrefixSelector}-column-resize-line`,
   WITH_RESIZE_LINE_LAST_COLUMN: `${tablePrefixSelector}-column-resize-line-last-column`
 };
-export let ShadowEvent;
-(function (ShadowEvent) {
+export let ShadowEvent = /*#__PURE__*/function (ShadowEvent) {
   ShadowEvent["SHOW_BEFORE_SHADOW"] = "showBeforeShadow";
   ShadowEvent["SHOW_AFTER_SHADOW"] = "showAfterShadow";
-})(ShadowEvent || (ShadowEvent = {}));
+  return ShadowEvent;
+}({});

package/dist/es2019/plugins/table/ui/FloatingDeleteButton/index.js

@@ -83,6 +83,12 @@ class FloatingDeleteButton extends Component {
       } = this.props.editorView;
       return clearHoverSelection()(state, dispatch);
     });
+    /**
+     *
+     *
+     * @private
+     * @memberof FloatingDeleteButton
+     */
     _defineProperty(this, "handleClick", event => {
       event.preventDefault();
       const {
@@ -207,14 +213,6 @@ class FloatingDeleteButton extends Component {
     // Do nothing if doesn't change anything
     return null;
   }
-
-  /**
-   *
-   *
-   * @private
-   * @memberof FloatingDeleteButton
-   */
-
   render() {
     const {
       mountPoint,

package/dist/es2019/version.json

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

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

@@ -3,11 +3,11 @@ import { TableMap } from '@atlaskit/editor-tables/table-map';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { findTable, isTableSelected } from '@atlaskit/editor-tables/utils';
 import { RelativeSelectionPos, GapCursorSelection, Side, isSelectionAtStartOfNode, isSelectionAtEndOfNode } from '@atlaskit/editor-common/selection';
-export var TableSelectionDirection;
-(function (TableSelectionDirection) {
+export var TableSelectionDirection = /*#__PURE__*/function (TableSelectionDirection) {
   TableSelectionDirection["TopToBottom"] = "TopToBottom";
   TableSelectionDirection["BottomToTop"] = "BottomToTop";
-})(TableSelectionDirection || (TableSelectionDirection = {}));
+  return TableSelectionDirection;
+}({});
 export var arrowLeftFromTable = function arrowLeftFromTable(editorSelectionAPI) {
   return function () {
     return function (state, dispatch) {

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

@@ -213,8 +213,8 @@ export var handleMouseMove = function handleMouseMove(getEditorFeatureFlags) {
     var _getEditorFeatureFlag = getEditorFeatureFlags(),
       mouseMoveOptimization = _getEditorFeatureFlag.mouseMoveOptimization;
     if (!isResizeHandleDecoration(element) && isCell(element)) {
-      var positionColumn = getMousePositionHorizontalRelativeByElement(event, mouseMoveOptimization, elementContentRects, RESIZE_HANDLE_AREA_DECORATION_GAP);
-      if (positionColumn !== null) {
+      var _positionColumn = getMousePositionHorizontalRelativeByElement(event, mouseMoveOptimization, elementContentRects, RESIZE_HANDLE_AREA_DECORATION_GAP);
+      if (_positionColumn !== null) {
         var _state4 = view.state,
           _dispatch5 = view.dispatch;
         var _getPluginState5 = getPluginState(_state4),
@@ -224,7 +224,7 @@ export var handleMouseMove = function handleMouseMove(getEditorFeatureFlags) {
         var cellStartPosition = view.posAtDOM(tableCell, 0);
         var rect = findCellRectClosestToPos(_state4.doc.resolve(cellStartPosition));
         if (rect) {
-          var columnEndIndexTarget = positionColumn === 'left' ? rect.left : rect.right;
+          var columnEndIndexTarget = _positionColumn === 'left' ? rect.left : rect.right;
           var rowIndexTarget = rect.top;
           if (columnEndIndexTarget !== resizeHandleColumnIndex || rowIndexTarget !== resizeHandleRowIndex || !hasResizeHandler({
             target: element,

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

@@ -69,6 +69,11 @@ export var OverflowShadowsObserver = /*#__PURE__*/function () {
         _this.shadowsObserved = true;
       }
     });
+    /**
+     * Takes a heightStyle if it can be computed in a less expensive manner,
+     * e.g. bounds on an IntersectionObserverEntry, otherwise proceed with
+     * reading it from sticky cell
+     */
     _defineProperty(this, "updateStickyShadows", function (stickyRowHeight) {
       var _this$wrapper, _this$wrapper2, _this$wrapper2$parent, _this$wrapper3, _this$wrapper3$parent;
       if (!_this.isSticky) {
@@ -115,12 +120,6 @@ export var OverflowShadowsObserver = /*#__PURE__*/function () {
       var stickyCell = stickyRow && stickyRow.firstElementChild;
       return stickyCell;
     }
-
-    /**
-     * Takes a heightStyle if it can be computed in a less expensive manner,
-     * e.g. bounds on an IntersectionObserverEntry, otherwise proceed with
-     * reading it from sticky cell
-     */
   }, {
     key: "dispose",
     value: function dispose() {

package/dist/esm/plugins/table/pm-plugins/sticky-headers/nodeviews/tableRow.js

@@ -61,15 +61,20 @@ export var TableRowNodeView = /*#__PURE__*/function () {
   function TableRowNodeView(node, view, getPos, eventDispatcher, getEditorFeatureFlags) {
     var _this = this;
     _classCallCheck(this, TableRowNodeView);
+    // this is the sticky header table row
     _defineProperty(this, "colControlsOffset", 0);
     _defineProperty(this, "focused", false);
     _defineProperty(this, "topPosEditorElement", 0);
     _defineProperty(this, "stickyHeadersOptimization", false);
     _defineProperty(this, "sentinels", {});
+    /* external events */
     _defineProperty(this, "listening", false);
     _defineProperty(this, "headerRowMouseScrollEnd", debounce(function () {
       _this.dom.classList.remove('no-pointer-events');
     }, HEADER_ROW_SCROLL_RESET_DEBOUNCE_TIMEOUT));
+    // When the header is sticky, the header row is set to position: fixed
+    // This prevents mouse wheel scrolling on the scroll-parent div when user's mouse is hovering the header row.
+    // This fix sets pointer-events: none on the header row briefly to avoid this behaviour
     _defineProperty(this, "headerRowMouseScroll", throttle(function () {
       if (_this.isSticky) {
         _this.dom.classList.add('no-pointer-events');
@@ -128,6 +133,7 @@ export var TableRowNodeView = /*#__PURE__*/function () {
       _this.dom.scrollLeft = wrapper.scrollLeft;
       _this.lastTimePainted = performance.now();
     });
+    /* receive external events */
     _defineProperty(this, "onTablePluginState", function (state) {
       var tableRef = state.tableRef;
       var focusChanged = false;
@@ -263,12 +269,14 @@ export var TableRowNodeView = /*#__PURE__*/function () {
     _defineProperty(this, "getWrapperRefTop", function (wrapper) {
       return Math.round(getTop(wrapper)) + _this.getWrapperoffset();
     });
+    // TODO: rename!
     _defineProperty(this, "getScrolledTableTop", function (wrapper) {
       return _this.getWrapperRefTop(wrapper) - _this.topPosEditorElement;
     });
     _defineProperty(this, "getCurrentTableTop", function (tree) {
       return _this.getScrolledTableTop(tree.wrapper) + tree.table.clientHeight;
     });
+    /* emit external events */
     _defineProperty(this, "padding", 0);
     _defineProperty(this, "top", 0);
     _defineProperty(this, "emitOn", function (top, padding) {
@@ -316,18 +324,9 @@ export var TableRowNodeView = /*#__PURE__*/function () {
       this.subscribe();
     }
   }
-
-  /* external events */
-
-  // When the header is sticky, the header row is set to position: fixed
-  // This prevents mouse wheel scrolling on the scroll-parent div when user's mouse is hovering the header row.
-  // This fix sets pointer-events: none on the header row briefly to avoid this behaviour
   _createClass(TableRowNodeView, [{
     key: "tree",
-    get:
-    // this is the sticky header table row
-
-    function get() {
+    get: function get() {
       return getTree(this.dom);
     }
   }, {
@@ -556,12 +555,6 @@ export var TableRowNodeView = /*#__PURE__*/function () {
       }
       return true;
     }
-
-    /* receive external events */
-
-    // TODO: rename!
-
-    /* emit external events */
   }]);
   return TableRowNodeView;
 }();

package/dist/esm/plugins/table/pm-plugins/table-local-id.js

@@ -1,4 +1,7 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 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) { _defineProperty(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; }
 /**
@@ -18,21 +21,12 @@ import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { PluginKey } from 'prosemirror-state';
 import rafSchedule from 'raf-schd';
 import { uuid } from '@atlaskit/adf-schema';
-import { stepAddsOneOf } from '@atlaskit/editor-common/utils';
+import { stepHasSlice } from '@atlaskit/editor-common/utils';
 var pluginKey = new PluginKey('tableLocalIdPlugin');
 var getPluginState = function getPluginState(state) {
   return state && pluginKey.getState(state);
 };
 
-/**
- * Traverses a transaction's steps to see if we're inserting any tables
- */
-var checkIsAddingTable = function checkIsAddingTable(transaction, nodeType) {
-  return transaction.steps.some(function (step) {
-    return stepAddsOneOf(step, new Set([nodeType]));
-  });
-};
-
 /**
  * Ensures uniqueness of `localId`s on tables being created or edited
  */
@@ -125,7 +119,9 @@ var createPlugin = function createPlugin(dispatch) {
       var modified = false;
       var tr = newState.tr;
       var table = newState.schema.nodes.table;
-      var idsObserved = new Set();
+      var addedTableNodes = new Set();
+      var addedTableNodePos = new Map();
+      var localIds = new Set();
       transactions.forEach(function (transaction) {
         if (!transaction.docChanged) {
           return;
@@ -138,38 +134,70 @@ var createPlugin = function createPlugin(dispatch) {
           return;
         }
 
-        /** Check if we're actually inserting a table, otherwise we can ignore this tr */
-        var isAddingTable = checkIsAddingTable(transaction, table);
-        if (!isAddingTable) {
-          return;
-        }
-
-        // Can't simply look at changed nodes, as we could be adding a table
-        newState.doc.descendants(function (node, pos) {
-          var isTable = node.type === table;
-          var localId = node.attrs.localId;
-
-          // Dealing with a table - make sure it's a unique ID
-          if (isTable) {
-            if (localId && !idsObserved.has(localId)) {
-              idsObserved.add(localId);
-              // Also add a localId if it happens to not have one,
-            } else if (!localId || idsObserved.has(localId)) {
-              modified = true;
-              tr.setNodeMarkup(pos, undefined, _objectSpread(_objectSpread({}, node.attrs), {}, {
-                localId: uuid.generate()
-              }));
+        /** Get the tables we are adding and their position */
+        var _iterator = _createForOfIteratorHelper(transaction.steps),
+          _step;
+        try {
+          for (_iterator.s(); !(_step = _iterator.n()).done;) {
+            var step = _step.value;
+            if (!stepHasSlice(step)) {
+              continue;
             }
-            return false;
+            step.slice.content.descendants(function (node, pos) {
+              if (node.type === table) {
+                addedTableNodes.add(node);
+              }
+              return true;
+            });
           }
+        } catch (err) {
+          _iterator.e(err);
+        } finally {
+          _iterator.f();
+        }
+      });
+      if (!addedTableNodes.size) {
+        return;
+      }
 
-          /**
-           * Otherwise continue traversing, we can encounter tables nested in
-           * expands/bodiedExtensions
-           */
+      // Get the existing localIds on the page
+      newState.doc.descendants(function (node, pos) {
+        // Skip if this is position of added table
+        if (addedTableNodes.has(node)) {
+          addedTableNodePos.set(node, pos);
+          return false;
+        }
+        if (node.type !== table) {
           return true;
-        });
+        }
+        localIds.add(node.attrs.localId);
+
+        // can't have table within a table
+        return false;
       });
+
+      // If the added nodes have duplicate id, generate a new one
+      var _iterator2 = _createForOfIteratorHelper(addedTableNodes),
+        _step2;
+      try {
+        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+          var node = _step2.value;
+          if (!node.attrs.localId || localIds.has(node.attrs.localId)) {
+            var pos = addedTableNodePos.get(node);
+            if (pos === undefined) {
+              continue;
+            }
+            tr.setNodeMarkup(pos, undefined, _objectSpread(_objectSpread({}, node.attrs), {}, {
+              localId: uuid.generate()
+            }));
+            modified = true;
+          }
+        }
+      } catch (err) {
+        _iterator2.e(err);
+      } finally {
+        _iterator2.f();
+      }
       if (modified) {
         return tr;
       }

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

@@ -87,12 +87,12 @@ export function reduceSpace(state, amount) {
   }
   return state;
 }
-var ColType; // TODO: should handle when destIdx:
-// - is beyond the range, and then not give it back
-(function (ColType) {
+var ColType = /*#__PURE__*/function (ColType) {
   ColType["SOURCE"] = "src";
   ColType["DEST"] = "dest";
-})(ColType || (ColType = {}));
+  return ColType;
+}(ColType || {}); // TODO: should handle when destIdx:
+// - is beyond the range, and then not give it back
 function moveSpaceFrom(state, srcIdx, destIdx, amount) {
   var useFreeSpace = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : true;
   var srcCol = state.cols[srcIdx];

package/dist/esm/plugins/table/transforms/delete-rows.js

@@ -36,7 +36,7 @@ export var deleteRows = function deleteRows(rect) {
     var _loop = function _loop(rowIndex) {
       var rowCells = [];
       var row = table.node.child(rowIndex);
-      var _loop2 = function _loop2(colIndex) {
+      var _loop2 = function _loop2() {
         var cellPos = map.map[rowIndex * map.width + colIndex];
         var cell = table.node.nodeAt(cellPos);
         if (!cell) {
@@ -90,7 +90,7 @@ export var deleteRows = function deleteRows(rect) {
         }
       };
       for (var colIndex = 0; colIndex < map.width; colIndex++) {
-        var _ret = _loop2(colIndex);
+        var _ret = _loop2();
         if (_ret === "continue") continue;
       }
       if (rowCells.length) {

package/dist/esm/plugins/table/types.js

@@ -30,8 +30,7 @@ export var RESIZE_HANDLE_AREA_DECORATION_GAP = 30;
  *
  */
 
-export var TableDecorations;
-(function (TableDecorations) {
+export var TableDecorations = /*#__PURE__*/function (TableDecorations) {
   TableDecorations["ALL_CONTROLS_HOVER"] = "CONTROLS_HOVER";
   TableDecorations["ROW_CONTROLS_HOVER"] = "ROW_CONTROLS_HOVER";
   TableDecorations["COLUMN_CONTROLS_HOVER"] = "COLUMN_CONTROLS_HOVER";
@@ -42,7 +41,8 @@ export var TableDecorations;
   TableDecorations["COLUMN_RESIZING_HANDLE"] = "COLUMN_RESIZING_HANDLE";
   TableDecorations["COLUMN_RESIZING_HANDLE_LINE"] = "COLUMN_RESIZING_HANDLE_LINE";
   TableDecorations["LAST_CELL_ELEMENT"] = "LAST_CELL_ELEMENT";
-})(TableDecorations || (TableDecorations = {}));
+  return TableDecorations;
+}({});
 export var TableCssClassName = _objectSpread(_objectSpread({}, TableSharedCssClassName), {}, {
   COLUMN_CONTROLS: "".concat(tablePrefixSelector, "-column-controls"),
   COLUMN_CONTROLS_DECORATIONS: "".concat(tablePrefixSelector, "-column-controls-decoration"),
@@ -104,8 +104,8 @@ export var TableCssClassName = _objectSpread(_objectSpread({}, TableSharedCssCla
   WITH_RESIZE_LINE: "".concat(tablePrefixSelector, "-column-resize-line"),
   WITH_RESIZE_LINE_LAST_COLUMN: "".concat(tablePrefixSelector, "-column-resize-line-last-column")
 });
-export var ShadowEvent;
-(function (ShadowEvent) {
+export var ShadowEvent = /*#__PURE__*/function (ShadowEvent) {
   ShadowEvent["SHOW_BEFORE_SHADOW"] = "showBeforeShadow";
   ShadowEvent["SHOW_AFTER_SHADOW"] = "showAfterShadow";
-})(ShadowEvent || (ShadowEvent = {}));
+  return ShadowEvent;
+}({});

package/dist/esm/plugins/table/ui/FloatingDeleteButton/index.js

@@ -95,6 +95,12 @@ var FloatingDeleteButton = /*#__PURE__*/function (_Component) {
         dispatch = _this$props$editorVie2.dispatch;
       return clearHoverSelection()(state, dispatch);
     });
+    /**
+     *
+     *
+     * @private
+     * @memberof FloatingDeleteButton
+     */
     _defineProperty(_assertThisInitialized(_this), "handleClick", function (event) {
       event.preventDefault();
       var editorAnalyticsAPI = _this.props.editorAnalyticsAPI;
@@ -277,13 +283,6 @@ var FloatingDeleteButton = /*#__PURE__*/function (_Component) {
       // Do nothing if doesn't change anything
       return null;
     }
-
-    /**
-     *
-     *
-     * @private
-     * @memberof FloatingDeleteButton
-     */
   }]);
   return FloatingDeleteButton;
 }(Component);

package/dist/esm/plugins/table/ui/TableFloatingControls/index.js

@@ -7,7 +7,7 @@ import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 import React, { Component } from 'react';

package/dist/esm/version.json

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-table",
-  "version": "1.2.5",
+  "version": "1.2.6",
   "description": "Table plugin for the @atlaskit/editor",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -19,7 +19,7 @@
   },
   "dependencies": {
     "@atlaskit/adf-schema": "^25.5.0",
-    "@atlaskit/editor-common": "^72.9.0",
+    "@atlaskit/editor-common": "^73.0.0",
     "@atlaskit/editor-palette": "1.3.0",
     "@atlaskit/editor-shared-styles": "^2.3.0",
     "@atlaskit/editor-tables": "^2.2.0",
@@ -52,8 +52,8 @@
   "devDependencies": {
     "@atlaskit/analytics-next": "^9.0.0",
     "@atlaskit/button": "^16.6.0",
-    "@atlaskit/editor-core": "^182.1.0",
-    "@atlaskit/editor-plugin-feature-flags": "^0.0.3",
+    "@atlaskit/editor-core": "^182.2.0",
+    "@atlaskit/editor-plugin-feature-flags": "^0.0.4",
     "@atlaskit/editor-test-helpers": "^18.2.0",
     "@atlaskit/link-provider": "^1.5.0",
     "@atlaskit/logo": "^13.13.0",

package/src/__tests__/unit/pm-plugins/table-local-id.ts

@@ -347,23 +347,11 @@ describe('table local id plugin', () => {
         editorView.updateState(state3);
         dispatchPasteEvent(editorView, { html: dom.innerHTML, plain: text });
 
-        /**
-         * The end result order of IDs that we'll now observe is the following:
-         *  1. flooFirst
-         *  2. flooThird
-         *  3. flooSecond
-         *
-         * This is because we had `flooFirst` in our clipboard. We've now pasted
-         * it into the expand, so that becomes the first observed instance of
-         * the table. The "third" ID (second unique regeneration) then gets
-         * replaced in the first layout column.
-         *
-         */
         expect(editorView.state.doc).toEqualDocument(
           doc(
-            expand({ title: '' })(generateTableWithLocalId(flooFirst)),
+            expand({ title: '' })(generateTableWithLocalId(flooThird)),
             layoutSection(
-              layoutColumn({ width: 50 })(generateTableWithLocalId(flooThird)),
+              layoutColumn({ width: 50 })(generateTableWithLocalId(flooFirst)),
               layoutColumn({ width: 50 })(generateTableWithLocalId(flooSecond)),
             ),
             p(),

package/src/plugins/table/pm-plugins/table-local-id.ts

@@ -12,13 +12,13 @@
  */
 import { Dispatch } from '@atlaskit/editor-common/event-dispatcher';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import { EditorState, PluginKey, Transaction } from 'prosemirror-state';
-import { NodeType } from 'prosemirror-model';
+import { EditorState, PluginKey } from 'prosemirror-state';
+import { Node as ProsemirrorNode } from 'prosemirror-model';
 import rafSchedule from 'raf-schd';
 
 import { uuid } from '@atlaskit/adf-schema';
 
-import { stepAddsOneOf } from '@atlaskit/editor-common/utils';
+import { stepHasSlice } from '@atlaskit/editor-common/utils';
 
 interface TableLocalIdPluginState {
   // One time parse for initial load with existing tables without localIds
@@ -31,15 +31,6 @@ const getPluginState = (
 ): TableLocalIdPluginState | undefined | null =>
   state && pluginKey.getState(state);
 
-/**
- * Traverses a transaction's steps to see if we're inserting any tables
- */
-const checkIsAddingTable = (transaction: Transaction, nodeType: NodeType) => {
-  return transaction.steps.some((step) =>
-    stepAddsOneOf(step, new Set([nodeType])),
-  );
-};
-
 /**
  * Ensures uniqueness of `localId`s on tables being created or edited
  */
@@ -143,7 +134,9 @@ const createPlugin = (dispatch: Dispatch) =>
       const tr = newState.tr;
       const { table } = newState.schema.nodes;
 
-      const idsObserved = new Set<string>();
+      const addedTableNodes: Set<ProsemirrorNode> = new Set();
+      const addedTableNodePos: Map<ProsemirrorNode, number> = new Map();
+      const localIds: Set<string> = new Set();
 
       transactions.forEach((transaction) => {
         if (!transaction.docChanged) {
@@ -157,43 +150,66 @@ const createPlugin = (dispatch: Dispatch) =>
           return;
         }
 
-        /** Check if we're actually inserting a table, otherwise we can ignore this tr */
-        const isAddingTable = checkIsAddingTable(transaction, table);
-        if (!isAddingTable) {
-          return;
-        }
+        /** Get the tables we are adding and their position */
+        for (const step of transaction.steps) {
+          if (!stepHasSlice(step)) {
+            continue;
+          }
 
-        // Can't simply look at changed nodes, as we could be adding a table
-        newState.doc.descendants((node, pos) => {
-          const isTable = node.type === table;
-          const localId = node.attrs.localId;
-
-          // Dealing with a table - make sure it's a unique ID
-          if (isTable) {
-            if (localId && !idsObserved.has(localId)) {
-              idsObserved.add(localId);
-              // Also add a localId if it happens to not have one,
-            } else if (!localId || idsObserved.has(localId)) {
-              modified = true;
-              tr.setNodeMarkup(pos, undefined, {
-                ...node.attrs,
-                localId: uuid.generate(),
-              });
+          step.slice.content.descendants((node, pos) => {
+            if (node.type === table) {
+              addedTableNodes.add(node);
             }
-            return false;
-          }
 
-          /**
-           * Otherwise continue traversing, we can encounter tables nested in
-           * expands/bodiedExtensions
-           */
+            return true;
+          });
+        }
+      });
+
+      if (!addedTableNodes.size) {
+        return;
+      }
+
+      // Get the existing localIds on the page
+      newState.doc.descendants((node, pos) => {
+        // Skip if this is position of added table
+        if (addedTableNodes.has(node)) {
+          addedTableNodePos.set(node, pos);
+          return false;
+        }
+
+        if (node.type !== table) {
           return true;
-        });
+        }
+
+        localIds.add(node.attrs.localId);
+
+        // can't have table within a table
+        return false;
       });
 
+      // If the added nodes have duplicate id, generate a new one
+      for (const node of addedTableNodes) {
+        if (!node.attrs.localId || localIds.has(node.attrs.localId)) {
+          const pos = addedTableNodePos.get(node);
+
+          if (pos === undefined) {
+            continue;
+          }
+
+          tr.setNodeMarkup(pos, undefined, {
+            ...node.attrs,
+            localId: uuid.generate(),
+          });
+
+          modified = true;
+        }
+      }
+
       if (modified) {
         return tr;
       }
+
       return;
     },
   });