@atlaskit/editor-core 149.0.0 → 150.0.1

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/commands/selection.js

@@ -187,23 +187,23 @@ var arrowLeftFromText = function arrowLeftFromText(selection) {
 
       if (isSelectionAtStartOfTable($from, selection) && $from.parent.type.name === 'paragraph' && $from.depth === table.depth + 3 // + 3 for: row, cell & paragraph nodes
       ) {
-          var _getSelectionPluginSt4 = (0, _pluginFactory.getPluginState)(state),
-              selectionRelativeToNode = _getSelectionPluginSt4.selectionRelativeToNode;
-
-          if (selectionRelativeToNode === _types.RelativeSelectionPos.Before) {
-            // we have a text selection at start of first table cell, directly inside a top level paragraph,
-            // and want to set gap cursor selection before table
-            return setGapCursorBeforeTable()(state, dispatch);
-          } else {
-            // we have a text selection at start of first table cell, directly inside a top level paragraph,
-            // and want to set a full table cell selection
-            return selectFullTable({
-              node: table.node,
-              startPos: table.start,
-              dir: TableSelectionDirection.BottomToTop
-            })(state, dispatch);
-          }
+        var _getSelectionPluginSt4 = (0, _pluginFactory.getPluginState)(state),
+            selectionRelativeToNode = _getSelectionPluginSt4.selectionRelativeToNode;
+
+        if (selectionRelativeToNode === _types.RelativeSelectionPos.Before) {
+          // we have a text selection at start of first table cell, directly inside a top level paragraph,
+          // and want to set gap cursor selection before table
+          return setGapCursorBeforeTable()(state, dispatch);
+        } else {
+          // we have a text selection at start of first table cell, directly inside a top level paragraph,
+          // and want to set a full table cell selection
+          return selectFullTable({
+            node: table.node,
+            startPos: table.start,
+            dir: TableSelectionDirection.BottomToTop
+          })(state, dispatch);
         }
+      }
     }
 
     return false;
@@ -219,14 +219,14 @@ var arrowRightFromText = function arrowRightFromText(selection) {
 
       if (isSelectionAtEndOfTable($to, selection) && $to.parent.type.name === 'paragraph' && $to.depth === table.depth + 3 // + 3 for: row, cell & paragraph nodes
       ) {
-          // we have a text selection at end of last table cell, directly inside a top level paragraph,
-          // and want to set a full table cell selection
-          return selectFullTable({
-            node: table.node,
-            startPos: table.start,
-            dir: TableSelectionDirection.TopToBottom
-          })(state, dispatch);
-        }
+        // we have a text selection at end of last table cell, directly inside a top level paragraph,
+        // and want to set a full table cell selection
+        return selectFullTable({
+          node: table.node,
+          startPos: table.start,
+          dir: TableSelectionDirection.TopToBottom
+        })(state, dispatch);
+      }
     }
 
     return false;

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"));
 
@@ -218,8 +218,7 @@ var bulkColumnsResize = function bulkColumnsResize(resizeState, columnsIndexes,
 
   var newState = _objectSpread(_objectSpread({}, resizeState), {}, {
     cols: cols.map(function (col) {
-      if (columnsIndexes.indexOf(col.index) > -1 || // take from prev columns only if dragging the first handle to the left
-      columnsIndexes.indexOf(sourceColumnIndex) > -1 && col.index < colIndex) {
+      if (columnsIndexes.indexOf(col.index) > -1 || columnsIndexes.indexOf(sourceColumnIndex) > -1 && col.index < colIndex) {
         return col;
       }
 
@@ -257,19 +256,19 @@ var bulkColumnsResize = function bulkColumnsResize(resizeState, columnsIndexes,
     } // table is in overflow: keep the dragged column at its widths and evenly distribute columns
     // to recover from overflow state
     else {
-        var columnWidth = Math.floor((minTableWidth - sourceCol.width) / (newState.cols.length - 1));
-        newState = _objectSpread(_objectSpread({}, resizeState), {}, {
-          cols: newState.cols.map(function (col) {
-            if (col.index === sourceCol.index) {
-              return col;
-            }
-
-            return _objectSpread(_objectSpread({}, col), {}, {
-              width: columnWidth
-            });
-          })
-        });
-      }
+      var columnWidth = Math.floor((minTableWidth - sourceCol.width) / (newState.cols.length - 1));
+      newState = _objectSpread(_objectSpread({}, resizeState), {}, {
+        cols: newState.cols.map(function (col) {
+          if (col.index === sourceCol.index) {
+            return col;
+          }
+
+          return _objectSpread(_objectSpread({}, col), {}, {
+            width: columnWidth
+          });
+        })
+      });
+    }
   } // fix total table widths by adding missing pixels to columns widths here and there
 
 
@@ -301,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;

package/dist/cjs/plugins/table/transforms/column-width.js

@@ -5,14 +5,24 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.updateColumnWidths = void 0;
+exports.rescaleColumns = exports.updateColumnWidths = void 0;
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
 var _tableMap = require("@atlaskit/editor-tables/table-map");
 
+var _utils = require("../pm-plugins/table-resizing/utils");
+
 var _metadata = require("./metadata");
 
+var _resizeState = require("../pm-plugins/table-resizing/utils/resize-state");
+
+var _misc = require("../pm-plugins/table-resizing/utils/misc");
+
+var _editorCommon = require("@atlaskit/editor-common");
+
+var _scaleTable = require("../pm-plugins/table-resizing/utils/scale-table");
+
 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; }
@@ -105,21 +115,71 @@ var updateColumnWidths = function updateColumnWidths(resizeState, table, start)
     }
 
     var tablePos = start - 1;
-    var _tr = tr,
-        selection = _tr.selection;
-    /* Create a mapping before the table node is replaced to allow the current
-     * selection to be mapped back to it's original position inside the table.
+    var selectionBookmark = tr.selection.getBookmark();
+    tr.replaceWith(tablePos, tablePos + table.nodeSize, table.type.createChecked(table.attrs, rows, table.marks));
+    /**
+     * We want to restore to the original selection but w/o applying the mapping. Function
+     * tr.replaceWith puts the selection after the inserted content. We need to manually
+     * set the selection back to original state. Mapping in this case doesn't quite work
+     * e.g. if we change the content before a selection. This is because mapping
+     * means moving it if the content in front of it changed. Instead we can get
+     * bookmark of selection.
      *
-     * If the mapping from the new 'replaceWith' transaction is used, prosemirror
-     * will map the selection to after the table as it thinks the original table
-     * node has been deleted.
+     * @see https://github.com/ProseMirror/prosemirror/issues/645
      */
 
-    var originalMap = Object.assign(Object.create(Object.getPrototypeOf(tr.mapping)), tr.mapping);
-    tr.replaceWith(tablePos, tablePos + table.nodeSize, table.type.createChecked(table.attrs, rows, table.marks)); // restore selection after replacing the table
+    return tr.setSelection(selectionBookmark.resolve(tr.doc));
+  };
+};
+/**
+ * This function is called when user inserts/deletes a column in a table to rescale all columns.
+ * This is done manually to avoid a multi-dispatch in TableComponent. See [ED-8288].
+ * @param table
+ * @param view
+ * @returns Updated transaction with rescaled columns for a given table
+ */
+
+
+exports.updateColumnWidths = updateColumnWidths;
+
+var rescaleColumns = function rescaleColumns(table, view) {
+  return function (tr) {
+    if (!view || !(0, _utils.hasTableBeenResized)(table.node)) {
+      return tr;
+    }
+
+    var state = view.state;
+    var domAtPos = view.domAtPos.bind(view);
+    var maybeTable = domAtPos(table.start).node;
+    var tableRef = maybeTable.closest('table');
+
+    if (!tableRef) {
+      return tr;
+    }
+
+    var layout = (0, _resizeState.normaliseTableLayout)(tableRef === null || tableRef === void 0 ? void 0 : tableRef.dataset.layout);
+    var maxSize = (0, _misc.getTableMaxWidth)({
+      table: table.node,
+      tableStart: table.start,
+      state: state,
+      layout: layout,
+      dynamicTextSizing: true
+    });
+    var resizeState = (0, _resizeState.getResizeState)({
+      minWidth: _editorCommon.tableCellMinWidth,
+      table: table.node,
+      start: table.start,
+      tableRef: tableRef,
+      domAtPos: domAtPos,
+      maxSize: maxSize
+    });
+
+    if (resizeState.overflow) {
+      resizeState = (0, _scaleTable.scaleTableTo)(resizeState, maxSize);
+    }
 
-    return tr.setSelection(selection.map(tr.doc, originalMap));
+    return updateColumnWidths(resizeState, table.node, table.start)(tr);
   };
 };
 
-exports.updateColumnWidths = updateColumnWidths;
+exports.rescaleColumns = rescaleColumns;

package/dist/cjs/plugins/table/ui/FloatingContextualMenu/ContextualMenu.js

@@ -354,7 +354,7 @@ var ContextualMenu = /*#__PURE__*/function (_Component) {
           break;
 
         case 'insert_column':
-          (0, _commandsWithAnalytics.insertColumnWithAnalytics)(_analytics.INPUT_METHOD.CONTEXT_MENU, selectionRect.right)(state, dispatch);
+          (0, _commandsWithAnalytics.insertColumnWithAnalytics)(_analytics.INPUT_METHOD.CONTEXT_MENU, selectionRect.right)(state, dispatch, editorView);
 
           _this.toggleOpen();
 

package/dist/cjs/plugins/table/ui/FloatingInsertButton/index.js

@@ -228,7 +228,7 @@ var FloatingInsertButton = /*#__PURE__*/function (_React$Component) {
         event.preventDefault();
         var state = editorView.state,
             dispatch = editorView.dispatch;
-        (0, _commandsWithAnalytics.insertColumnWithAnalytics)(_analytics.INPUT_METHOD.BUTTON, insertColumnButtonIndex)(state, dispatch);
+        (0, _commandsWithAnalytics.insertColumnWithAnalytics)(_analytics.INPUT_METHOD.BUTTON, insertColumnButtonIndex)(state, dispatch, editorView);
       }
     }
   }]);

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

@@ -1,9 +1,13 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getMergedCellsPositions = void 0;
+exports.colsToRect = exports.getMergedCellsPositions = void 0;
+
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 
 var _tableMap = require("@atlaskit/editor-tables/table-map");
 
@@ -30,4 +34,15 @@ var getMergedCellsPositions = function getMergedCellsPositions(tr) {
   return mergedCells;
 };
 
-exports.getMergedCellsPositions = getMergedCellsPositions;
+exports.getMergedCellsPositions = getMergedCellsPositions;
+
+var colsToRect = function colsToRect(cols, noOfRows) {
+  return {
+    left: Math.min.apply(Math, (0, _toConsumableArray2.default)(cols)),
+    right: Math.max.apply(Math, (0, _toConsumableArray2.default)(cols)) + 1,
+    top: 0,
+    bottom: noOfRows
+  };
+};
+
+exports.colsToRect = colsToRect;

package/dist/cjs/plugins/tasks-and-decisions/pm-plugins/keymaps.js

@@ -204,8 +204,7 @@ var deleteHandler = (0, _commands.filter)([_helpers.isInsideTaskOrDecisionItem,
   } // if nested, just unindent
 
 
-  if ($next.node($next.depth - 2).type === taskList || // this is for the case when we are on a non-nested item and next one is nested
-  $next.node($next.depth - 1).type === taskList && $next.parent.type === taskList) {
+  if ($next.node($next.depth - 2).type === taskList || $next.node($next.depth - 1).type === taskList && $next.parent.type === taskList) {
     var tr = (0, _helpers.liftBlock)(state.tr, $next, $next);
 
     if (dispatch && tr) {

package/dist/cjs/plugins/text-color/ui/ToolbarTextColor/index.js

@@ -175,12 +175,6 @@ var ToolbarTextColor = /*#__PURE__*/function (_React$Component) {
           isOpen = _this$state.isOpen,
           isShowingMoreColors = _this$state.isShowingMoreColors;
 
-      if (e.defaultPrevented) {
-        // This should be handled by stopping propogation, but as an additional safety net
-        // we ignore handled events for the purpose of hiding the popup.
-        return;
-      }
-
       if (isOpen === true) {
         _this.dispatchAnalyticsEvent(_this.buildAnalyticsPalette(_analytics.ACTION.CLOSED, {
           isShowingMoreColors: isShowingMoreColors,
@@ -266,13 +260,15 @@ var ToolbarTextColor = /*#__PURE__*/function (_React$Component) {
             label: ""
           })))
         })
+      }, /*#__PURE__*/_react.default.createElement("div", {
+        "data-testid": "text-color-palette"
       }, /*#__PURE__*/_react.default.createElement(_ColorPalette.default, {
         palette: palette,
         onClick: function onClick(color) {
           return _this2.changeTextColor(color, pluginState.disabled);
         },
         selectedColor: pluginState.color
-      }), showMoreColorsToggle && /*#__PURE__*/_react.default.createElement(_styles2.ShowMoreWrapper, null, /*#__PURE__*/_react.default.createElement(_customThemeButton.default, {
+      })), showMoreColorsToggle && /*#__PURE__*/_react.default.createElement(_styles2.ShowMoreWrapper, null, /*#__PURE__*/_react.default.createElement(_customThemeButton.default, {
         appearance: "subtle",
         onClick: this.handleShowMoreToggle,
         iconBefore: /*#__PURE__*/_react.default.createElement(_backgroundColor.default, {

package/dist/cjs/plugins/text-formatting/pm-plugins/cursor.js

@@ -32,10 +32,7 @@ var _default = new _prosemirrorState.Plugin({
       var clickWasAtTextNode = !!(clickNode && clickNode.isText);
       var clickWasAtEndOfAParagraphNode = $click.parent.type === paragraph && $click.textOffset === 0 && $click.nodeAfter === null;
 
-      if (clickWasAtEdgeOfATextNode && clickWasNearACodeMark && clickedDOMElementPosition && ( // if click did not occur at a text node or end of paragraph, then
-      // it was at a directly adjacent non-text node, so we skip this manual
-      // text selection logic to preserve that non-text node's selection
-      clickWasAtTextNode || clickWasAtEndOfAParagraphNode)) {
+      if (clickWasAtEdgeOfATextNode && clickWasNearACodeMark && clickedDOMElementPosition && (clickWasAtTextNode || clickWasAtEndOfAParagraphNode)) {
         var clickWasInsideNodeDOM = event.target.parentNode === view.domAtPos(clickedDOMElementPosition).node && code.isInSet(view.state.doc.resolve(clickedDOMElementPosition).nodeAfter.marks);
         var nodeNextToClick = $click.nodeBefore && code.isInSet($click.nodeBefore.marks) ? $click.nodeAfter : $click.nodeBefore; // Need to set the selection here to allow clicking between [code('text'),{<>},emoji()]
 

package/dist/cjs/plugins/type-ahead/transforms/open-typeahead-at-cursor.js

@@ -25,9 +25,26 @@ var openTypeAheadAtCursor = function openTypeAheadAtCursor(_ref) {
       }
     });
     var selection = tr.selection;
-    var isTextRangeSelection = selection instanceof _prosemirrorState.TextSelection && selection.$cursor === null;
-    var nextTr = isTextRangeSelection ? tr.deleteSelection() : tr;
-    return nextTr;
+
+    if (!(selection instanceof _prosemirrorState.TextSelection)) {
+      return tr;
+    }
+
+    if (!selection.$cursor) {
+      tr.deleteSelection();
+      return tr;
+    } // Search & Destroy placeholder
+
+
+    var cursorPos = selection.$cursor.pos;
+    var nodeAtCursor = tr.doc.nodeAt(cursorPos);
+    var isPlaceholderAtCursorPosition = nodeAtCursor && nodeAtCursor.type.name === 'placeholder';
+
+    if (nodeAtCursor && isPlaceholderAtCursorPosition) {
+      tr.delete(cursorPos, cursorPos + nodeAtCursor.nodeSize);
+    }
+
+    return tr;
   };
 };
 

package/dist/cjs/plugins/type-ahead/ui/InputQuery.js

@@ -73,7 +73,7 @@ var InputQuery = /*#__PURE__*/_react.default.memo(function (_ref) {
     var text = cleanedInputContent();
     onQueryChange(text);
   }, [onQueryChange, cleanedInputContent]);
-  var onKeyDown = (0, _react.useCallback)(function (event) {
+  var checkKeyEvent = (0, _react.useCallback)(function (event) {
     var key = (0, _w3cKeyname.keyName)(event);
     var sel = document.getSelection();
     var raw = ref.current.textContent || '';
@@ -186,7 +186,10 @@ var InputQuery = /*#__PURE__*/_react.default.memo(function (_ref) {
         });
         event.preventDefault();
         event.stopPropagation();
+        return;
       }
+
+      checkKeyEvent(event);
     };
 
     var onFocusOut = function onFocusOut(event) {
@@ -281,7 +284,7 @@ var InputQuery = /*#__PURE__*/_react.default.memo(function (_ref) {
         element.removeEventListener('input', onInput);
       }
     };
-  }, [triggerQueryPrefix, cleanedInputContent, onQueryFocus, cancel]);
+  }, [triggerQueryPrefix, cleanedInputContent, onQueryFocus, cancel, checkKeyEvent]);
   (0, _react.useEffect)(function () {
     var hasReopenQuery = typeof reopenQuery === 'string' && reopenQuery.trim().length > 0;
 
@@ -311,7 +314,6 @@ var InputQuery = /*#__PURE__*/_react.default.memo(function (_ref) {
     contentEditable: true,
     innerRef: ref,
     onKeyUp: onKeyUp,
-    onKeyDown: onKeyDown,
     onClick: onClick,
     role: "textbox",
     suppressContentEditableWarning: true,

package/dist/cjs/plugins/type-ahead/ui/TypeAheadPopup.js

@@ -23,8 +23,6 @@ var _constants = require("@atlaskit/theme/constants");
 
 var _colors = require("@atlaskit/theme/colors");
 
-var _math = require("@atlaskit/theme/math");
-
 var _analytics = require("../../analytics");
 
 var _TypeAheadList = require("./TypeAheadList");
@@ -35,7 +33,7 @@ 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; }
 
-var TypeAheadContent = _styledComponents.default.div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  background: ", ";\n  border-radius: ", "px;\n  box-shadow: 0 0 1px ", ", 0 4px 8px -2px ", ";\n  padding: ", "px 0;\n  width: 320px;\n  max-height: 380px; /* ~5.5 visibile items */\n  overflow-y: auto;\n  -ms-overflow-style: -ms-autohiding-scrollbar;\n  position: relative;\n"])), _colors.N0, (0, _constants.borderRadius)(), _colors.N60A, _colors.N50A, (0, _math.divide)(_constants.gridSize, 2));
+var TypeAheadContent = _styledComponents.default.div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  background: ", ";\n  border-radius: ", "px;\n  box-shadow: 0 0 1px ", ", 0 4px 8px -2px ", ";\n  padding: ", "px 0;\n  width: 320px;\n  max-height: 380px; /* ~5.5 visibile items */\n  overflow-y: auto;\n  -ms-overflow-style: -ms-autohiding-scrollbar;\n  position: relative;\n"])), _colors.N0, (0, _constants.borderRadius)(), _colors.N60A, _colors.N50A, (0, _constants.gridSize)() / 2);
 
 var Highlight = function Highlight(_ref) {
   var state = _ref.state,