@atlaskit/editor-core 149.0.2 → 150.0.3

package/dist/cjs/plugins/layout/toolbar-messages.js

@@ -8,6 +8,11 @@ exports.toolbarMessages = void 0;
 var _reactIntl = require("react-intl");
 
 var toolbarMessages = (0, _reactIntl.defineMessages)({
+  singleColumn: {
+    id: 'fabric.editor.single',
+    defaultMessage: 'Single column',
+    description: 'Layout with one single column'
+  },
   twoColumns: {
     id: 'fabric.editor.twoColumns',
     defaultMessage: 'Two columns',

package/dist/cjs/plugins/layout/toolbar.js

@@ -11,6 +11,8 @@ var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers
 
 var _prosemirrorUtils = require("prosemirror-utils");
 
+var _layoutSingle = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/layout-single"));
+
 var _layoutTwoEqual = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/layout-two-equal"));
 
 var _layoutThreeEqual = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/layout-three-equal"));
@@ -42,6 +44,12 @@ var LAYOUT_TYPES = [{
   title: _toolbarMessages.toolbarMessages.threeColumns,
   icon: _layoutThreeEqual.default
 }];
+var LAYOUT_TYPES_WITH_SINGLE_COL = [{
+  id: 'editor.layout.singeLayout',
+  type: 'single',
+  title: _toolbarMessages.toolbarMessages.singleColumn,
+  icon: _layoutSingle.default
+}].concat(LAYOUT_TYPES);
 var SIDEBAR_LAYOUT_TYPES = [{
   id: 'editor.layout.twoRightSidebar',
   type: 'two_right_sidebar',
@@ -74,7 +82,7 @@ var buildLayoutButton = function buildLayoutButton(intl, item, currentLayout) {
 var layoutToolbarTitle = 'Layout floating controls';
 exports.layoutToolbarTitle = layoutToolbarTitle;
 
-var buildToolbar = function buildToolbar(state, intl, pos, _allowBreakout, addSidebarLayouts) {
+var buildToolbar = function buildToolbar(state, intl, pos, _allowBreakout, addSidebarLayouts, allowSingleColumnLayout) {
   var node = state.doc.nodeAt(pos);
 
   if (node) {
@@ -96,13 +104,14 @@ var buildToolbar = function buildToolbar(state, intl, pos, _allowBreakout, addSi
       onFocus: (0, _decoration.hoverDecoration)(nodeType, true),
       onBlur: (0, _decoration.hoverDecoration)(nodeType, false)
     };
+    var layoutTypes = allowSingleColumnLayout ? LAYOUT_TYPES_WITH_SINGLE_COL : LAYOUT_TYPES;
     return {
       title: layoutToolbarTitle,
       getDomRef: function getDomRef(view) {
         return (0, _prosemirrorUtils.findDomRefAtPos)(pos, view.domAtPos.bind(view));
       },
       nodeType: nodeType,
-      items: [].concat((0, _toConsumableArray2.default)(LAYOUT_TYPES.map(function (i) {
+      items: [].concat((0, _toConsumableArray2.default)(layoutTypes.map(function (i) {
         return buildLayoutButton(intl, i, currentLayout);
       })), (0, _toConsumableArray2.default)(addSidebarLayouts ? SIDEBAR_LAYOUT_TYPES.map(function (i) {
         return buildLayoutButton(intl, i, currentLayout);

package/dist/cjs/plugins/list/pm-plugins/main.js

@@ -15,16 +15,12 @@ var _prosemirrorView = require("prosemirror-view");
 
 var _prosemirrorUtils = require("prosemirror-utils");
 
-var _analytics = require("../../analytics");
-
 var _selection = require("../utils/selection");
 
 var _node = require("../utils/node");
 
 var _pluginStateFactory = require("../../../utils/plugin-state-factory");
 
-var _find = require("../utils/find");
-
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
@@ -133,40 +129,6 @@ var createPlugin = function createPlugin(eventDispatch) {
   return new _prosemirrorState.Plugin({
     state: createPluginState(eventDispatch, createInitialState),
     key: listPluginKey,
-    appendTransaction: function appendTransaction(transactions, _oldState, newState) {
-      var lastTransaction = transactions[transactions.length - 1];
-
-      if (!lastTransaction.docChanged || !lastTransaction.selectionSet) {
-        return;
-      }
-
-      var tr = newState.tr;
-      var rootList = (0, _find.findRootParentListNode)(tr.selection.$from);
-
-      if (!rootList) {
-        return;
-      }
-
-      var listsJoined = (0, _node.joinSiblingLists)({
-        tr: tr,
-        direction: _node.JoinDirection.RIGHT
-      });
-
-      if (tr.docChanged) {
-        var orderedListsJoined = listsJoined.orderedList,
-            bulletListsJoined = listsJoined.bulletList;
-        (0, _analytics.addAnalytics)(newState, tr, {
-          action: _analytics.ACTION.FIXED,
-          actionSubject: _analytics.ACTION_SUBJECT.LIST,
-          eventType: _analytics.EVENT_TYPE.TRACK,
-          attributes: {
-            orderedListsJoined: orderedListsJoined,
-            bulletListsJoined: bulletListsJoined
-          }
-        });
-        return tr;
-      }
-    },
     props: {
       decorations: function decorations(state) {
         var _getPluginState = getPluginState(state),

package/dist/cjs/plugins/mentions/analytics.js

@@ -102,7 +102,7 @@ var buildTypeAheadInviteItemViewedPayload = function buildTypeAheadInviteItemVie
 
 exports.buildTypeAheadInviteItemViewedPayload = buildTypeAheadInviteItemViewedPayload;
 
-var buildTypeAheadInviteExposurePayload = function buildTypeAheadInviteExposurePayload(shouldEnableInvite, sessionId, contextIdentifierProvider, inviteExperimentCohort, userRole) {
+var buildTypeAheadInviteExposurePayload = function buildTypeAheadInviteExposurePayload(sessionId, contextIdentifierProvider, inviteExperimentCohort, userRole) {
   var _ref2 = contextIdentifierProvider || {},
       containerId = _ref2.containerId,
       objectId = _ref2.objectId,
@@ -110,8 +110,7 @@ var buildTypeAheadInviteExposurePayload = function buildTypeAheadInviteExposureP
 
   return buildAnalyticsPayload('feature', 'exposed', _analyticsGasTypes.OPERATIONAL_EVENT_TYPE, sessionId, {
     flagKey: 'confluence.frontend.invite.from.mention',
-    value: shouldEnableInvite,
-    cohort: inviteExperimentCohort,
+    value: inviteExperimentCohort || 'not-enrolled',
     containerId: containerId,
     objectId: objectId,
     childObjectId: childObjectId,

package/dist/cjs/plugins/mentions/type-ahead/index.js

@@ -40,6 +40,12 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
+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); if (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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
@@ -232,6 +238,7 @@ var createTypeAheadConfig = function createTypeAheadConfig(_ref6) {
       HighlightComponent = _ref6.HighlightComponent;
   var sessionId = (0, _uuid.default)();
   var firstQueryWithoutResults = null;
+  var subscriptionKeys = new Set();
   var typeAhead = {
     id: _typeAhead.TypeAheadAvailableNodes.MENTION,
     trigger: '@',
@@ -278,9 +285,15 @@ var createTypeAheadConfig = function createTypeAheadConfig(_ref6) {
         var key = "loadingMentionsForTypeAhead_".concat((0, _uuid.default)());
 
         var mentionsSubscribeCallback = function mentionsSubscribeCallback(mentions) {
-          var query = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
+          var resultQuery = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
           var stats = arguments.length > 2 ? arguments[2] : undefined;
+
+          if (query !== resultQuery) {
+            return;
+          }
+
           mentionProvider.unsubscribe(key);
+          subscriptionKeys.delete(key);
           var mentionItems = mentions.map(function (mention) {
             return memoizedToItem.call(mention);
           });
@@ -292,6 +305,13 @@ var createTypeAheadConfig = function createTypeAheadConfig(_ref6) {
 
           if (mentions.length === 0 && firstQueryWithoutResults === null) {
             firstQueryWithoutResults = query;
+          } // Growth (El-dorado) experiment design hard requirement
+
+
+          if (mentionItems.length <= 2) {
+            var inviteExperimentCohort = mentionProvider.inviteExperimentCohort,
+                userRole = mentionProvider.userRole;
+            fireEvent((0, _analytics.buildTypeAheadInviteExposurePayload)(sessionId, contextIdentifierProvider, inviteExperimentCohort, userRole));
           }
 
           if (!mentionProvider.shouldEnableInvite || mentionItems.length > 2) {
@@ -309,26 +329,15 @@ var createTypeAheadConfig = function createTypeAheadConfig(_ref6) {
           }
         };
 
+        subscriptionKeys.add(key);
         mentionProvider.subscribe(key, mentionsSubscribeCallback);
         mentionProvider.filter(query || '', _objectSpread(_objectSpread({}, contextIdentifierProvider), {}, {
           sessionId: sessionId
         }));
       });
     },
-    onOpen: function onOpen(editorState) {
+    onOpen: function onOpen() {
       firstQueryWithoutResults = null;
-      var pluginState = (0, _utils2.getMentionPluginState)(editorState);
-
-      if (!pluginState || !pluginState.mentionProvider) {
-        return null;
-      }
-
-      var contextIdentifierProvider = pluginState.contextIdentifierProvider,
-          _pluginState$mentionP = pluginState.mentionProvider,
-          shouldEnableInvite = _pluginState$mentionP.shouldEnableInvite,
-          inviteExperimentCohort = _pluginState$mentionP.inviteExperimentCohort,
-          userRole = _pluginState$mentionP.userRole;
-      fireEvent((0, _analytics.buildTypeAheadInviteExposurePayload)(!!shouldEnableInvite, sessionId, contextIdentifierProvider, inviteExperimentCohort, userRole));
     },
     selectItem: function selectItem(state, item, insert, _ref8) {
       var mode = _ref8.mode,
@@ -399,11 +408,33 @@ var createTypeAheadConfig = function createTypeAheadConfig(_ref6) {
       return insert(_prosemirrorModel.Fragment.from([mentionNode, space]));
     },
     dismiss: function dismiss(_ref9) {
-      var query = _ref9.query,
+      var editorState = _ref9.editorState,
+          query = _ref9.query,
           stats = _ref9.stats;
       firstQueryWithoutResults = null;
       var pickerElapsedTime = stats.startedAt ? Date.now() - stats.startedAt : 0;
       fireEvent((0, _analytics.buildTypeAheadCancelPayload)(pickerElapsedTime, stats.keyCount.arrowUp, stats.keyCount.arrowDown, sessionId, query || ''));
+      var pluginState = (0, _utils2.getMentionPluginState)(editorState);
+
+      if (pluginState !== null && pluginState !== void 0 && pluginState.mentionProvider) {
+        var mentionProvider = pluginState.mentionProvider;
+
+        var _iterator = _createForOfIteratorHelper(subscriptionKeys),
+            _step;
+
+        try {
+          for (_iterator.s(); !(_step = _iterator.n()).done;) {
+            var key = _step.value;
+            mentionProvider.unsubscribe(key);
+          }
+        } catch (err) {
+          _iterator.e(err);
+        } finally {
+          _iterator.f();
+        }
+      }
+
+      subscriptionKeys.clear();
       sessionId = (0, _uuid.default)();
     }
   };

package/dist/cjs/plugins/panel/nodeviews/panel.js

@@ -35,7 +35,8 @@ var _editorCommon = require("@atlaskit/editor-common");
 
 var _utils = require("../utils");
 
-var fitToHeight = 20;
+var _consts = require("@atlaskit/editor-shared-styles/consts");
+
 var panelIcons = {
   info: _info.default,
   success: _success.default,
@@ -60,7 +61,7 @@ var PanelIcon = function PanelIcon(props) {
       shortName: panelIcon,
       showTooltip: false,
       allowTextFallback: false,
-      fitToHeight: fitToHeight
+      fitToHeight: _consts.akEditorCustomIconSize
     });
   }
 
@@ -91,7 +92,10 @@ var PanelNodeView = /*#__PURE__*/function () {
 
     if (!this.icon) {
       return;
-    }
+    } // set contentEditable as false to be able to select the custom panels with keyboard
+
+
+    this.icon.contentEditable = 'false';
 
     _reactDom.default.render( /*#__PURE__*/_react.default.createElement(PanelIcon, {
       allowCustomPanel: pluginOptions.UNSAFE_allowCustomPanel,

package/dist/cjs/plugins/panel/toolbar.js

@@ -21,7 +21,7 @@ var _warning = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/warni
 
 var _error = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/error"));
 
-var _EditorHideEmojiIcon = _interopRequireDefault(require("../floating-toolbar/ui/EditorHideEmojiIcon"));
+var _EditorRemoveEmojiIcon = _interopRequireDefault(require("../floating-toolbar/ui/EditorRemoveEmojiIcon"));
 
 var _messages = _interopRequireDefault(require("../../messages"));
 
@@ -247,13 +247,15 @@ var getToolbarItems = function getToolbarItems(formatMessage, panelNodeType, isC
         return changeEmoji(emojiShortName);
       }
     };
-    items.push(emojiPicker, {
-      id: 'editor.panel.hideEmoji',
+    var removeEmojiButton = {
+      id: 'editor.panel.removeEmoji',
       type: 'button',
-      icon: _EditorHideEmojiIcon.default,
+      icon: _EditorRemoveEmojiIcon.default,
       onClick: removeEmoji(),
-      title: formatMessage(_messages.default.hideEmoji)
-    }, {
+      title: formatMessage(_messages.default.removeEmoji),
+      disabled: activePanelIcon ? false : true
+    };
+    items.push(emojiPicker, removeEmojiButton, {
       type: 'separator'
     }, colorPicker);
   }

package/dist/cjs/plugins/panel/toolbar.test.js

@@ -100,16 +100,16 @@ describe('getToolbarItems', function () {
         color: '#ABF5D1'
       }, true);
     });
-    it("should call changePanelType when clicked on hide emoji", function () {
-      var hideEmojiButton = itemsWithCustomPanelEnabled.find(function (item) {
-        return item.type === 'button' && item.id === 'editor.panel.hideEmoji';
+    it("should call changePanelType when clicked on remove emoji", function () {
+      var removeEmojiButton = itemsWithCustomPanelEnabled.find(function (item) {
+        return item.type === 'button' && item.id === 'editor.panel.removeEmoji';
       });
-      hideEmojiButton.onClick(editorView.state);
+      removeEmojiButton.onClick(editorView.state);
       expect(changePanelTypespy).toBeCalledWith(_adfSchema.PanelType.CUSTOM, {
         emoji: undefined
       }, true);
     });
-    it("should not call changePanelType when clicked on hide emoji when no emoji in panel", function () {
+    it("should not call changePanelType when clicked on remove emoji when no emoji in panel", function () {
       var _createEditor2 = createEditor({
         doc: (0, _docBuilder.doc)((0, _docBuilder.panel)({
           panelType: 'custom'
@@ -120,13 +120,27 @@ describe('getToolbarItems', function () {
           editorView = _createEditor2.editorView;
 
       var toolbarItems = (0, _toolbar.getToolbarItems)(dummyFormatMessage, _schema.default.nodes.panel, true, providerFactory, _adfSchema.PanelType.CUSTOM);
-      var hideEmojiButton = toolbarItems.find(function (item) {
-        return item.type === 'button' && item.id === 'editor.panel.hideEmoji';
+      var removeEmojiButton = toolbarItems.find(function (item) {
+        return item.type === 'button' && item.id === 'editor.panel.removeEmoji';
       });
       changePanelTypespy.mockClear();
-      hideEmojiButton.onClick(editorView.state);
+      removeEmojiButton.onClick(editorView.state);
       expect(changePanelTypespy).not.toBeCalled();
     });
+    it("should have remove emoji button disabled when focus on panel without emoji", function () {
+      var toolbarItems = (0, _toolbar.getToolbarItems)(dummyFormatMessage, _schema.default.nodes.panel, true, providerFactory, _adfSchema.PanelType.CUSTOM, '#ABF5D1', '');
+      var removeEmojiButton = toolbarItems.find(function (item) {
+        return item.type === 'button' && item.id === 'editor.panel.removeEmoji';
+      });
+      expect(removeEmojiButton.disabled).toBe(true);
+    });
+    it("should have remove emoji button enabled when focus on panel with emoji", function () {
+      var toolbarItems = (0, _toolbar.getToolbarItems)(dummyFormatMessage, _schema.default.nodes.panel, true, providerFactory, _adfSchema.PanelType.CUSTOM, '#ABF5D1', ':smiley:');
+      var removeEmojiButton = toolbarItems.find(function (item) {
+        return item.type === 'button' && item.id === 'editor.panel.removeEmoji';
+      });
+      expect(removeEmojiButton.disabled).toBe(false);
+    });
   });
   describe('analytics for custom panels', function () {
     var createEditor = (0, _createProsemirrorEditor.createProsemirrorEditorFactory)();
@@ -189,14 +203,14 @@ describe('getToolbarItems', function () {
       expect(createAnalyticsEvent).toHaveBeenCalledWith(payload);
     });
     it('Should trigger analytics when Icon is removed', function () {
-      var hideEmojiButton = itemsWithCustomPanelEnabled.find(function (item) {
-        return item.type === 'button' && item.id === 'editor.panel.hideEmoji';
+      var removeEmojiButton = itemsWithCustomPanelEnabled.find(function (item) {
+        return item.type === 'button' && item.id === 'editor.panel.removeEmoji';
       });
       var emojiPickerConfig = itemsWithCustomPanelEnabled.find(function (item) {
         return item.type === 'select' && item.selectType === 'emoji';
       });
       emojiPickerConfig.onChange(':smiley:')(editorView.state, editorView.dispatch);
-      hideEmojiButton.onClick(editorView.state, editorView.dispatch);
+      removeEmojiButton.onClick(editorView.state, editorView.dispatch);
       var payload = {
         action: _analytics.ACTION.REMOVE_ICON,
         actionSubject: _analytics.ACTION_SUBJECT.PANEL,

package/dist/cjs/plugins/table/commands/insert.js

@@ -21,6 +21,8 @@ var _utils2 = require("../utils");
 
 var _getAllowAddColumnCustomStep = require("../utils/get-allow-add-column-custom-step");
 
+var _columnWidth = require("../transforms/column-width");
+
 // #region Imports
 // #endregion
 function addColumnAtCustomStep(column) {
@@ -37,17 +39,30 @@ function addColumnAtCustomStep(column) {
 
 function addColumnAt(column) {
   var allowAddColumnCustomStep = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+  var view = arguments.length > 2 ? arguments[2] : undefined;
+  return function (tr) {
+    var updatedTr = tr;
 
-  if (allowAddColumnCustomStep) {
-    return addColumnAtCustomStep(column);
-  }
+    if (allowAddColumnCustomStep) {
+      updatedTr = addColumnAtCustomStep(column)(updatedTr);
+    } else {
+      updatedTr = (0, _utils.addColumnAt)(column)(updatedTr);
+    }
+
+    var table = (0, _utils.findTable)(updatedTr.selection);
 
-  return (0, _utils.addColumnAt)(column);
+    if (table) {
+      // [ED-8288] Update colwidths manually to avoid multiple dispatch in TableComponent
+      updatedTr = (0, _columnWidth.rescaleColumns)(table, view)(updatedTr);
+    }
+
+    return updatedTr;
+  };
 } // :: (EditorState, dispatch: ?(tr: Transaction)) → bool
 // Command to add a column before the column with the selection.
 
 
-var addColumnBefore = function addColumnBefore(state, dispatch) {
+var addColumnBefore = function addColumnBefore(state, dispatch, view) {
   var table = (0, _utils.findTable)(state.selection);
 
   if (!table) {
@@ -56,7 +71,7 @@ var addColumnBefore = function addColumnBefore(state, dispatch) {
 
   if (dispatch) {
     var rect = (0, _utils.selectedRect)(state);
-    dispatch(addColumnAt(rect.left, (0, _getAllowAddColumnCustomStep.getAllowAddColumnCustomStep)(state))(state.tr));
+    dispatch(addColumnAt(rect.left, (0, _getAllowAddColumnCustomStep.getAllowAddColumnCustomStep)(state), view)(state.tr));
   }
 
   return true;
@@ -66,7 +81,7 @@ var addColumnBefore = function addColumnBefore(state, dispatch) {
 
 exports.addColumnBefore = addColumnBefore;
 
-var addColumnAfter = function addColumnAfter(state, dispatch) {
+var addColumnAfter = function addColumnAfter(state, dispatch, view) {
   var table = (0, _utils.findTable)(state.selection);
 
   if (!table) {
@@ -75,7 +90,7 @@ var addColumnAfter = function addColumnAfter(state, dispatch) {
 
   if (dispatch) {
     var rect = (0, _utils.selectedRect)(state);
-    dispatch(addColumnAt(rect.right, (0, _getAllowAddColumnCustomStep.getAllowAddColumnCustomStep)(state))(state.tr));
+    dispatch(addColumnAt(rect.right, (0, _getAllowAddColumnCustomStep.getAllowAddColumnCustomStep)(state), view)(state.tr));
   }
 
   return true;
@@ -85,8 +100,8 @@ var addColumnAfter = function addColumnAfter(state, dispatch) {
 exports.addColumnAfter = addColumnAfter;
 
 var insertColumn = function insertColumn(column) {
-  return function (state, dispatch) {
-    var tr = addColumnAt(column, (0, _getAllowAddColumnCustomStep.getAllowAddColumnCustomStep)(state))(state.tr);
+  return function (state, dispatch, view) {
+    var tr = addColumnAt(column, (0, _getAllowAddColumnCustomStep.getAllowAddColumnCustomStep)(state), view)(state.tr);
     var table = (0, _utils.findTable)(tr.selection);
 
     if (!table) {

package/dist/cjs/plugins/table/commands/misc.js

@@ -131,7 +131,7 @@ var setCellAttr = function setCellAttr(name, value) {
 exports.setCellAttr = setCellAttr;
 
 var triggerUnlessTableHeader = function triggerUnlessTableHeader(command) {
-  return function (state, dispatch) {
+  return function (state, dispatch, view) {
     var selection = state.selection,
         tableHeader = state.schema.nodes.tableHeader;
 
@@ -139,7 +139,7 @@ var triggerUnlessTableHeader = function triggerUnlessTableHeader(command) {
       var cell = (0, _utils.findCellClosestToPos)(selection.$from);
 
       if (cell && cell.node.type !== tableHeader) {
-        return command(state, dispatch);
+        return command(state, dispatch, view);
       }
     }
 
@@ -147,7 +147,7 @@ var triggerUnlessTableHeader = function triggerUnlessTableHeader(command) {
       var rect = (0, _utils.getSelectionRect)(selection);
 
       if (!(0, _nodes.checkIfHeaderRowEnabled)(state) || rect && rect.top > 0) {
-        return command(state, dispatch);
+        return command(state, dispatch, view);
       }
     }
 

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

@@ -206,16 +206,17 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
       var layoutSize = _this.tableNodeLayoutSize(node, containerWidth.width, options);
 
       var hasNumberedColumnChanged = prevAttrs.isNumberColumnEnabled !== node.attrs.isNumberColumnEnabled;
+      var noOfColumnsChanged = (0, _utils4.tablesHaveDifferentNoOfColumns)(node, prevNode);
 
       if ( // Breakout mode/layout changed
       layoutChanged || // We need to react if our parent changes
       // Scales the cols widths relative to the new parent width.
       parentWidthChanged || // Enabling / disabling this feature reduces or adds size to the table.
-      hasNumberedColumnChanged || // Adding or removing columns from the table, should snap the remaining / new columns to the layout width.
-      (0, _utils4.tablesHaveDifferentNoOfColumns)(node, prevNode) || // This last check is also to cater for dynamic text sizing changing the 'default' layout width
+      hasNumberedColumnChanged || // This last check is also to cater for dynamic text sizing changing the 'default' layout width
       // Usually happens on window resize.
-      layoutSize !== _this.layoutSize) {
-        if (!hasNumberedColumnChanged) {
+      layoutSize !== _this.layoutSize || noOfColumnsChanged) {
+        // If column has been inserted/deleted avoid multi dispatch
+        if (!hasNumberedColumnChanged && !noOfColumnsChanged) {
           _this.scaleTable({
             parentWidth: parentWidth,
             layoutChanged: layoutChanged

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

@@ -47,16 +47,30 @@ var TableCellNodeView = /*#__PURE__*/function () {
   }
 
   (0, _createClass2.default)(TableCellNodeView, [{
-    key: "shouldRecreateNodeView",
-    value: function shouldRecreateNodeView(node) {
+    key: "updateNodeView",
+    value: function updateNodeView(node) {
       var _this = this;
 
       if (this.node.type !== node.type) {
         return false;
       }
 
-      var attrs = (0, _adfSchema.setCellAttrs)(this.node);
-      var nextAttrs = (0, _adfSchema.setCellAttrs)(node); // added + changed attributes
+      var attrs = (0, _adfSchema.getCellDomAttrs)(this.node);
+      var nextAttrs = (0, _adfSchema.getCellDomAttrs)(node);
+
+      var _getCellAttrs = (0, _adfSchema.getCellAttrs)(this.dom),
+          colspan = _getCellAttrs.colspan,
+          rowspan = _getCellAttrs.rowspan; // need to rerender when colspan/rowspan in dom are different from the node attrs
+      // this can happen when undoing merge cells
+
+
+      var defaultColspan = 1,
+          defaultRowspan = 1;
+
+      if (colspan !== (node.attrs.colspan || defaultColspan) || rowspan !== (node.attrs.rowspan || defaultRowspan)) {
+        return false;
+      } // added + changed attributes
+
 
       var addedAttrs = Object.entries(nextAttrs).filter(function (_ref2) {
         var _ref3 = (0, _slicedToArray2.default)(_ref2, 2),
@@ -93,9 +107,9 @@ var TableCellNodeView = /*#__PURE__*/function () {
   }, {
     key: "update",
     value: function update(node) {
-      var shouldUpdate = this.shouldRecreateNodeView(node);
+      var didUpdate = this.updateNodeView(node);
       this.node = node;
-      return shouldUpdate;
+      return didUpdate;
     }
   }, {
     key: "destroy",

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

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getNewResizeStateFromSelectedColumns = exports.areColumnsEven = exports.bulkColumnsResize = exports.evenSelectedColumnsWidths = exports.evenAllColumnsWidths = exports.adjustColumnsWidths = exports.getTotalWidth = exports.updateColgroup = exports.getResizeState = void 0;
+exports.getNewResizeStateFromSelectedColumns = exports.normaliseTableLayout = exports.areColumnsEven = exports.bulkColumnsResize = exports.evenSelectedColumnsWidths = exports.evenAllColumnsWidths = exports.adjustColumnsWidths = exports.getTotalWidth = exports.updateColgroup = exports.getResizeState = void 0;
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
@@ -300,6 +300,8 @@ var normaliseTableLayout = function normaliseTableLayout(input) {
   }
 };
 
+exports.normaliseTableLayout = normaliseTableLayout;
+
 var getNewResizeStateFromSelectedColumns = function getNewResizeStateFromSelectedColumns(rect, state, domAtPos, dynamicTextSizing) {
   var _getSelectedTableInfo = (0, _utils.getSelectedTableInfo)(state.selection),
       totalRowCount = _getSelectedTableInfo.totalRowCount,

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

@@ -5,6 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.scaleTableTo = scaleTableTo;
 exports.scaleWithParent = exports.scale = void 0;
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));

package/dist/cjs/plugins/table/toolbar.js

@@ -133,12 +133,12 @@ var getToolbarCellOptionsConfig = function getToolbarCellOptionsConfig(editorSta
   var options = [{
     id: 'editor.table.insertColumn',
     title: formatMessage(_messages2.default.insertColumn),
-    onClick: function onClick(state, dispatch) {
+    onClick: function onClick(state, dispatch, view) {
       var selectionRect = getClosestSelectionRect(state);
       var index = selectionRect === null || selectionRect === void 0 ? void 0 : selectionRect.right;
 
       if (index) {
-        (0, _commandsWithAnalytics.insertColumnWithAnalytics)(_analytics.INPUT_METHOD.FLOATING_TB, index)(state, dispatch);
+        (0, _commandsWithAnalytics.insertColumnWithAnalytics)(_analytics.INPUT_METHOD.FLOATING_TB, index)(state, dispatch, view);
       }
 
       return true;
@@ -168,11 +168,11 @@ var getToolbarCellOptionsConfig = function getToolbarCellOptionsConfig(editorSta
     title: formatMessage(_messages2.default.removeColumns, {
       0: numberOfColumns
     }),
-    onClick: function onClick(state, dispatch) {
+    onClick: function onClick(state, dispatch, view) {
       var selectionRect = getClosestSelectionRect(state);
 
       if (selectionRect) {
-        (0, _commandsWithAnalytics.deleteColumnsWithAnalytics)(_analytics.INPUT_METHOD.FLOATING_TB, selectionRect)(state, dispatch);
+        (0, _commandsWithAnalytics.deleteColumnsWithAnalytics)(_analytics.INPUT_METHOD.FLOATING_TB, selectionRect)(state, dispatch, view);
       }
 
       return true;