@atlaskit/editor-core 153.1.1 → 154.0.0

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

@@ -17,7 +17,7 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 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';
-import { browser } from '@atlaskit/editor-common';
+import { browser } from '@atlaskit/editor-common/utils';
 import { hoverRows, selectRow } from '../../commands';
 import { isSelectionUpdated } from '../../utils';
 import CornerControls from './CornerControls';

package/dist/esm/plugins/table/ui/common-styles.css.js

@@ -3,7 +3,7 @@ import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral
 var _templateObject, _templateObject2, _templateObject3;
 
 import { css } from 'styled-components';
-import { tableMarginTop, tableSharedStyle } from '@atlaskit/editor-common';
+import { tableMarginTop, tableSharedStyle } from '@atlaskit/editor-common/styles';
 import { fontSize } from '@atlaskit/theme/constants';
 import { N40A, B300, N300, N20A, N0, R500 } from '@atlaskit/theme/colors';
 import { SelectionStyle, getSelectionStyles, akEditorSmallZIndex, akEditorTableNumberColumnWidth, akEditorStickyHeaderZIndex, akEditorTableToolbarSize, akEditorUnitZIndex, akEditorSelectedNodeClassName, relativeFontSizeToBase16 } from '@atlaskit/editor-shared-styles';

package/dist/esm/plugins/table/ui/consts.js

@@ -1,5 +1,5 @@
-import { B100, B300, B75, N0, N20, R50, R400, R75, DN400, N200, DN30 } from '@atlaskit/theme/colors';
-import { tableCellBorderWidth, tableMarginTop } from '@atlaskit/editor-common';
+import { B200, B300, B75, N0, N20, R50, R400, R75, DN400, N200, DN30 } from '@atlaskit/theme/colors';
+import { tableCellBorderWidth, tableMarginTop } from '@atlaskit/editor-common/styles';
 import { akEditorTableBorder, akEditorTableBorderDark, akEditorTableToolbar, akEditorTableToolbarDark, akEditorTableToolbarSize, akEditorUnitZIndex, akRichMediaResizeZIndex } from '@atlaskit/editor-shared-styles';
 import { RESIZE_HANDLE_AREA_DECORATION_GAP } from '../types';
 import { themed } from '@atlaskit/theme/components';
@@ -25,7 +25,7 @@ export var tableBorderColor = themed({
 });
 export var tableFloatingControlsColor = N20;
 export var tableCellSelectedColor = B75;
-export var tableToolbarSelectedColor = B100;
+export var tableToolbarSelectedColor = B200;
 export var tableBorderSelectedColor = B300;
 export var tableCellDeleteColor = R50;
 export var tableBorderDeleteColor = R400;

package/dist/esm/plugins/table/ui/ui-styles.css.js

@@ -3,7 +3,7 @@ import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral
 var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject10, _templateObject11, _templateObject12, _templateObject13, _templateObject14, _templateObject15, _templateObject16, _templateObject17, _templateObject18, _templateObject19, _templateObject20, _templateObject21;
 
 import { css } from 'styled-components';
-import { tableCellBorderWidth, tableMarginBottom, tableMarginTop } from '@atlaskit/editor-common';
+import { tableCellBorderWidth, tableMarginBottom, tableMarginTop } from '@atlaskit/editor-common/styles';
 import { akEditorShadowZIndex, akEditorTableNumberColumnWidth, akEditorUnitZIndex } from '@atlaskit/editor-shared-styles';
 import { N40A, B300, N300, R300, N20A, N60A, N0, Y50, Y200 } from '@atlaskit/theme/colors';
 import { tableToolbarColor, tableBorderColor, tableToolbarSelectedColor, tableBorderSelectedColor, tableCellDeleteColor, tableBorderDeleteColor, tableToolbarDeleteColor, lineMarkerOffsetFromColumnControls, lineMarkerSize, columnControlsDecorationHeight, columnControlsZIndex, columnControlsSelectedZIndex, resizeHandlerAreaWidth, resizeLineWidth, resizeHandlerZIndex, tableToolbarSize, tableInsertColumnButtonSize, tableDeleteButtonSize, tableControlsSpacing } from './consts';

package/dist/esm/plugins/table/utils/collapse.js

@@ -1,42 +1,84 @@
 import { NodeRange } from 'prosemirror-model';
+import { findWrapping } from 'prosemirror-transform';
 import { findTable } from '@atlaskit/editor-tables/utils';
+
+var bail = function bail() {
+  return {
+    tableIsCollapsible: false
+  };
+};
 /**
- * Collapses the selected table into an expand given a transaction.
- *
- * Will return undefined if it cannot determine the relevant table from a
- * selection,
- *
- * Or if wrapping it in an expand results in any errors
- *
- * @param tr
- * @returns Transaction | undefined
+ * Checks whether we can wrap the selected table into an expand via
+ * prosemirror-transform's `findWrapping` helper
  */
 
-export var collapseSelectedTable = function collapseSelectedTable(tr) {
+
+export var isTableCollapsible = function isTableCollapsible(tr) {
   var selection = tr.selection;
   var schema = tr.doc.type.schema;
   var nodePos = findTable(selection);
 
   if (!nodePos) {
-    return undefined;
+    return bail();
   }
 
+  var expand = schema.nodes.expand;
   var node = nodePos.node,
       pos = nodePos.pos;
   var $pos = tr.doc.resolve(pos);
-  var expand = schema.nodes.expand;
-  var range = new NodeRange($pos, tr.doc.resolve(pos + node.nodeSize), $pos.depth); // Check if result of this transaction would result in an invalid document
-
-  try {
-    // TODO: add attrs: { __expanded: false } when it is working with new collab (CEMS-1204)
-    tr.wrap(range, [{
-      type: expand
-    }]).setMeta('scrollIntoView', true);
-    tr.doc.check();
-  } catch (err) {
-    // Don't care why it failed, only that we couldn't do so without issue
+  var range = new NodeRange($pos, tr.doc.resolve(pos + node.nodeSize), $pos.depth);
+
+  if (!range) {
+    return bail();
+  }
+
+  var canWrap = findWrapping(range, expand);
+
+  if (canWrap === null) {
+    return bail();
+  }
+
+  return {
+    tableIsCollapsible: true,
+    range: range,
+
+    /**
+     * Do we ever want to deal with the result of `findWrapping`? Probably not,
+     * but we have it anyway.
+     */
+    findWrappingRes: canWrap
+  };
+};
+/**
+ * Collapses the selected table into an expand given a transaction via
+ * `Transform.wrap`.
+ *
+ * Will return undefined if it cannot determine the relevant table from a
+ * selection, or if the table itself isn't collapsible.
+ *
+ * @param tr
+ * @returns Transaction | undefined
+ */
+
+export var collapseSelectedTable = function collapseSelectedTable(tr) {
+  var canCollapse = isTableCollapsible(tr);
+  var expand = tr.doc.type.schema.nodes.expand;
+
+  if (!canCollapse.range || !canCollapse.tableIsCollapsible) {
     return undefined;
   }
+  /**
+   * TODO: add attrs: { __expanded: false } when
+   * - it is working with new collab (CEMS-1204)
+   * - synchrony is no longer used
+   *
+   *   (via confluence-frontend, "this feature" referencing allowInteractiveExpand)
+   *   `we can NEVER allow this feature to be enabled for the synchrony-powered editor
+   */
+
 
+  tr.wrap(canCollapse.range, [{
+    type: expand
+  }]).setMeta('scrollIntoView', true);
   return tr;
 };

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

@@ -1,8 +1,8 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 
-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 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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(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; }
+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; }
 
 import { TableMap } from '@atlaskit/editor-tables/table-map';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';

package/dist/esm/plugins/tasks-and-decisions/commands.js

@@ -88,13 +88,14 @@ export var insertTaskDecision = function insertTaskDecision(view, listType) {
         item = _ref2.item,
         itemLocalId = _ref2.itemLocalId;
     var $to = state.selection.$to;
-    var pos = $to.end($to.depth);
-    return tr.split(pos, 1, [{
+    var endPos = $to.end($to.depth);
+    var newItemParagraphPos = endPos + 2;
+    return tr.split(endPos, 1, [{
       type: item,
       attrs: {
         localId: itemLocalId
       }
-    }]).setSelection(new TextSelection(tr.doc.resolve(pos + $to.depth)));
+    }]).setSelection(new TextSelection(tr.doc.resolve(newItemParagraphPos)));
   };
 
   var tr = insertTaskDecisionWithAnalytics(state, listType, inputMethod, addAndCreateList, addToList, listLocalId, itemLocalId);

package/dist/esm/plugins/tasks-and-decisions/nodeviews/taskItem.js

@@ -7,9 +7,9 @@ import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstruct
 import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 
-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 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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(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; }
+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; }
 
 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); }; }
 

package/dist/esm/plugins/tasks-and-decisions/pm-plugins/helpers.js

@@ -1,5 +1,5 @@
 import { liftTarget } from 'prosemirror-transform';
-import { hasParentNodeOfType } from 'prosemirror-utils';
+import { findParentNodeClosestToPos, hasParentNodeOfType } from 'prosemirror-utils';
 import { findFarthestParentNode } from '../../../utils';
 export var isInsideTaskOrDecisionItem = function isInsideTaskOrDecisionItem(state) {
   var _state$schema$nodes = state.schema.nodes,
@@ -23,6 +23,10 @@ export var isInsideTask = function isInsideTask(state) {
   var taskItem = state.schema.nodes.taskItem;
   return hasParentNodeOfType([taskItem])(state.selection);
 };
+export var isInsideDecision = function isInsideDecision(state) {
+  var decisionItem = state.schema.nodes.decisionItem;
+  return hasParentNodeOfType([decisionItem])(state.selection);
+};
 export var isTable = function isTable(node) {
   if (!node) {
     return false;
@@ -71,6 +75,20 @@ export var getCurrentIndentLevel = function getCurrentIndentLevel(selection) {
 
   return $from.depth - furthestParent.depth;
 };
+/**
+ * Finds the index of the current task item in relation to the closest taskList
+ */
+
+export var getTaskItemIndex = function getTaskItemIndex(state) {
+  var $pos = state.selection.$from;
+
+  var isTaskList = function isTaskList(node) {
+    return (node === null || node === void 0 ? void 0 : node.type.name) === 'taskList';
+  };
+
+  var itemAtPos = findParentNodeClosestToPos($pos, isTaskList);
+  return $pos.index(itemAtPos ? itemAtPos.depth : undefined);
+};
 /**
  * Walk outwards from a position until we encounter the (inside) start of
  * the next node, or reach the end of the document.

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

@@ -1,20 +1,20 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 
-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 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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(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; }
+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; }
 
 import { autoJoin, chainCommands } from 'prosemirror-commands';
 import { keymap } from 'prosemirror-keymap';
 import { Fragment, Slice } from 'prosemirror-model';
 import { TextSelection } from 'prosemirror-state';
-import { findParentNodeOfTypeClosestToPos } from 'prosemirror-utils';
+import { findParentNodeOfType, findParentNodeOfTypeClosestToPos } from 'prosemirror-utils';
 import { uuid } from '@atlaskit/adf-schema';
 import { filter, isEmptySelectionAtEnd, isEmptySelectionAtStart } from '../../../utils/commands';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INDENT_DIRECTION, INDENT_TYPE, INPUT_METHOD, withAnalytics } from '../../analytics';
 import { insertTaskDecisionWithAnalytics } from '../commands';
 import { joinAtCut, liftSelection, wrapSelectionInTaskList } from './commands';
-import { getBlockRange, getCurrentIndentLevel, isActionOrDecisionItem, isActionOrDecisionList, isEmptyTaskDecision, isInsideTask, isInsideTaskOrDecisionItem, liftBlock, subtreeHeight, walkOut, isTable } from './helpers';
+import { getBlockRange, getCurrentIndentLevel, isActionOrDecisionItem, isActionOrDecisionList, isEmptyTaskDecision, isInsideTask, isInsideTaskOrDecisionItem, liftBlock, subtreeHeight, walkOut, isTable, getTaskItemIndex, isInsideDecision } from './helpers';
 
 var indentationAnalytics = function indentationAnalytics(curIndentLevel, direction) {
   return {
@@ -100,7 +100,24 @@ var unindent = filter(isInsideTask, function (state, dispatch) {
   }
 
   return withAnalytics(indentationAnalytics(curIndentLevel, INDENT_DIRECTION.OUTDENT))(autoJoin(liftSelection, ['taskList']))(state, dispatch);
-});
+}); // if selection is decision item or first action item in table cell
+// then dont consume the Tab, as table-keymap should tab to the next cell
+
+var shouldLetTabThroughInTable = function shouldLetTabThroughInTable(state) {
+  var curIndentLevel = getCurrentIndentLevel(state.selection);
+  var curIndex = getTaskItemIndex(state);
+  var _state$schema$nodes2 = state.schema.nodes,
+      tableCell = _state$schema$nodes2.tableCell,
+      tableHeader = _state$schema$nodes2.tableHeader;
+  var cell = findParentNodeOfType([tableCell, tableHeader])(state.selection);
+
+  if ((curIndentLevel === 1 && curIndex === 0 || isInsideDecision(state)) && cell) {
+    return true;
+  }
+
+  return false;
+};
+
 var indent = filter(isInsideTask, function (state, dispatch) {
   // limit ui indentation to 6 levels
   var curIndentLevel = getCurrentIndentLevel(state.selection);
@@ -109,9 +126,9 @@ var indent = filter(isInsideTask, function (state, dispatch) {
     return true;
   }
 
-  var _state$schema$nodes2 = state.schema.nodes,
-      taskList = _state$schema$nodes2.taskList,
-      taskItem = _state$schema$nodes2.taskItem;
+  var _state$schema$nodes3 = state.schema.nodes,
+      taskList = _state$schema$nodes3.taskList,
+      taskItem = _state$schema$nodes3.taskItem;
   var _state$selection = state.selection,
       $from = _state$selection.$from,
       $to = _state$selection.$to;
@@ -134,9 +151,9 @@ var backspaceFrom = function backspaceFrom($from) {
     } // if nested, just unindent
 
 
-    var _state$schema$nodes3 = state.schema.nodes,
-        taskList = _state$schema$nodes3.taskList,
-        paragraph = _state$schema$nodes3.paragraph;
+    var _state$schema$nodes4 = state.schema.nodes,
+        taskList = _state$schema$nodes4.taskList,
+        paragraph = _state$schema$nodes4.paragraph;
 
     if ($from.node($from.depth - 2).type === taskList) {
       return unindent(state, dispatch);
@@ -167,10 +184,10 @@ var backspace = filter(isEmptySelectionAtStart, autoJoin(chainCommands(function
 var deleteHandler = filter([isInsideTaskOrDecisionItem, isEmptySelectionAtEnd], chainCommands(joinTaskDecisionFollowing, function (state, dispatch) {
   // look for the node after this current one
   var $next = walkOut(state.selection.$from);
-  var _state$schema$nodes4 = state.schema.nodes,
-      taskList = _state$schema$nodes4.taskList,
-      paragraph = _state$schema$nodes4.paragraph,
-      doc = _state$schema$nodes4.doc; // this is a top-level node it wont have $next.before()
+  var _state$schema$nodes5 = state.schema.nodes,
+      taskList = _state$schema$nodes5.taskList,
+      paragraph = _state$schema$nodes5.paragraph,
+      doc = _state$schema$nodes5.doc; // this is a top-level node it wont have $next.before()
 
   if (!$next.parent || $next.parent.type === doc) {
     return false;
@@ -333,8 +350,16 @@ var enter = filter(isInsideTaskOrDecisionItem, chainCommands(filter(isEmptyTaskD
 }));
 export function keymapPlugin(schema, allowNestedTasks, consumeTabs) {
   var indentHandlers = {
-    'Shift-Tab': consumeTabs ? chainCommands(unindent, isInsideTaskOrDecisionItem) : unindent,
-    Tab: consumeTabs ? chainCommands(indent, isInsideTaskOrDecisionItem) : indent
+    'Shift-Tab': filter([isInsideTaskOrDecisionItem, function (state) {
+      return !shouldLetTabThroughInTable(state);
+    }], function (state, dispatch) {
+      return unindent(state, dispatch) || !!consumeTabs;
+    }),
+    Tab: filter([isInsideTaskOrDecisionItem, function (state) {
+      return !shouldLetTabThroughInTable(state);
+    }], function (state, dispatch) {
+      return indent(state, dispatch) || !!consumeTabs;
+    })
   };
   var defaultHandlers = consumeTabs ? {
     'Shift-Tab': isInsideTaskOrDecisionItem,

package/dist/esm/plugins/tasks-and-decisions/pm-plugins/main.js

@@ -1,9 +1,10 @@
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
+var _excluded = ["localId"];
 
-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 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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(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; }
+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; }
 
 import { NodeSelection, Plugin } from 'prosemirror-state';
 import { uuid } from '@atlaskit/adf-schema';
@@ -142,7 +143,7 @@ export function createPlugin(portalProviderAPI, eventDispatcher, providerFactory
           if (!!node.type && (node.type === decisionList || node.type === decisionItem || node.type === taskList || node.type === taskItem)) {
             var _node$attrs = node.attrs,
                 localId = _node$attrs.localId,
-                rest = _objectWithoutProperties(_node$attrs, ["localId"]);
+                rest = _objectWithoutProperties(_node$attrs, _excluded);
 
             if (localId === undefined || localId === null || localId === '') {
               tr.step(new SetAttrsStep(pos, _objectSpread({

package/dist/esm/plugins/tasks-and-decisions/styles.js

@@ -3,6 +3,6 @@ import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral
 var _templateObject;
 
 import { css } from 'styled-components';
-import { TaskDecisionSharedCssClassName } from '@atlaskit/editor-common';
+import { TaskDecisionSharedCssClassName } from '@atlaskit/editor-common/styles';
 import { SelectionStyle, getSelectionStyles, akEditorDeleteBackgroundWithOpacity, akEditorDeleteBorder, akEditorSelectedBorderSize, akEditorSelectedNodeClassName } from '@atlaskit/editor-shared-styles';
 export var taskDecisionStyles = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  [data-decision-wrapper] {\n    cursor: pointer;\n  }\n\n  .", " > [data-decision-wrapper],\n  ol[data-node-type='decisionList'].", " {\n    border-radius: 4px;\n    ", "\n  }\n\n  .danger {\n    .", ".", "\n      > div {\n      box-shadow: 0 0 0 ", "px ", ";\n      background-color: ", ";\n      &::after {\n        content: none; /* reset the Blanket selection style */\n      }\n    }\n  }\n"])), akEditorSelectedNodeClassName, akEditorSelectedNodeClassName, getSelectionStyles([SelectionStyle.BoxShadow, SelectionStyle.Blanket]), TaskDecisionSharedCssClassName.DECISION_CONTAINER, akEditorSelectedNodeClassName, akEditorSelectedBorderSize, akEditorDeleteBorder, akEditorDeleteBackgroundWithOpacity);

package/dist/esm/plugins/tasks-and-decisions/ui/Task/index.js

@@ -7,6 +7,7 @@ import _inherits from "@babel/runtime/helpers/inherits";
 import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
 import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
+var _excluded = ["providers", "intl"];
 
 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); }; }
 
@@ -14,7 +15,7 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 
 import React, { PureComponent } from 'react';
 import { defineMessages, injectIntl } from 'react-intl-next';
-import { ProviderFactory, WithProviders } from '@atlaskit/editor-common';
+import { ProviderFactory, WithProviders } from '@atlaskit/editor-common/provider-factory';
 import TaskItemWithProviders from './task-item-with-providers';
 var messages = defineMessages({
   placeholder: {
@@ -39,7 +40,7 @@ export var TaskItem = /*#__PURE__*/function (_PureComponent) {
       var _this$props = _this.props,
           _providerFactory = _this$props.providers,
           formatMessage = _this$props.intl.formatMessage,
-          otherProps = _objectWithoutProperties(_this$props, ["providers", "intl"]);
+          otherProps = _objectWithoutProperties(_this$props, _excluded);
 
       var taskDecisionProvider = providers.taskDecisionProvider,
           contextIdentifierProvider = providers.contextIdentifierProvider;

package/dist/esm/plugins/tasks-and-decisions/ui/Task/task-item-with-providers.js

@@ -9,6 +9,7 @@ import _inherits from "@babel/runtime/helpers/inherits";
 import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
 import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
+var _excluded = ["contextIdentifierProvider"];
 
 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); }; }
 
@@ -129,7 +130,7 @@ var TaskItemWithProviders = /*#__PURE__*/function (_Component) {
     value: function render() {
       var _this$props = this.props,
           contextIdentifierProvider = _this$props.contextIdentifierProvider,
-          otherProps = _objectWithoutProperties(_this$props, ["contextIdentifierProvider"]);
+          otherProps = _objectWithoutProperties(_this$props, _excluded);
 
       var _ref = this.state.resolvedContextProvider || {},
           objectId = _ref.objectId;

package/dist/esm/plugins/text-color/pm-plugins/main.js

@@ -1,9 +1,9 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 
-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 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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(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; }
+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; }
 
 import { Plugin, PluginKey } from 'prosemirror-state';
 import { textColorPalette, textColorPaletteExtended } from '../../../ui/ColorPalette/Palettes/textColorPalette';

package/dist/esm/plugins/text-color/ui/ToolbarTextColor/icon.js

@@ -18,6 +18,6 @@ var textColorGlyph = function textColorGlyph(props) {
 export var EditorTextColorIcon = function EditorTextColorIcon() {
   return /*#__PURE__*/React.createElement(Icon, {
     glyph: textColorGlyph,
-    label: "Text color icon"
+    label: ""
   });
 };

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

@@ -6,9 +6,9 @@ import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstruct
 import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 
-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 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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(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; }
+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; }
 
 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); }; }
 
@@ -221,6 +221,8 @@ export var ToolbarTextColor = /*#__PURE__*/function (_React$Component) {
           disabled: disabled || pluginState.disabled,
           selected: isOpen,
           "aria-label": labelTextColor,
+          "aria-expanded": isOpen,
+          "aria-haspopup": true,
           title: labelTextColor,
           onClick: this.toggleOpen,
           iconBefore: /*#__PURE__*/React.createElement(TriggerWrapper, null, /*#__PURE__*/React.createElement(TextColorIconWrapper, null, /*#__PURE__*/React.createElement(EditorTextColorIcon, null), /*#__PURE__*/React.createElement(TextColorIconBar, {

package/dist/esm/plugins/text-formatting/pm-plugins/keymap.js

@@ -29,6 +29,18 @@ export default function keymapPlugin(schema) {
     }), list);
   }
 
+  if (schema.marks.subsup) {
+    keymaps.bindKeymapWithCommand(keymaps.toggleSubscript.common, commands.toggleSubscriptWithAnalytics({
+      inputMethod: INPUT_METHOD.SHORTCUT
+    }), list);
+  }
+
+  if (schema.marks.subsup) {
+    keymaps.bindKeymapWithCommand(keymaps.toggleSuperscript.common, commands.toggleSuperscriptWithAnalytics({
+      inputMethod: INPUT_METHOD.SHORTCUT
+    }), list);
+  }
+
   if (schema.marks.underline) {
     keymaps.bindKeymapWithCommand(keymaps.toggleUnderline.common, commands.toggleUnderlineWithAnalytics({
       inputMethod: INPUT_METHOD.SHORTCUT

package/dist/esm/plugins/text-formatting/styles.js

@@ -3,5 +3,5 @@ import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral
 var _templateObject;
 
 import { css } from 'styled-components';
-import { codeMarkSharedStyles } from '@atlaskit/editor-common';
+import { codeMarkSharedStyles } from '@atlaskit/editor-common/styles';
 export var textFormattingStyles = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  ", "\n"])), codeMarkSharedStyles);

package/dist/esm/plugins/text-formatting/ui/Toolbar/dropdown-menu.js

@@ -40,12 +40,14 @@ export var FormattingTextDropdownMenu = /*#__PURE__*/React.memo(function (_ref)
     items: group,
     zIndex: akEditorMenuZIndex,
     fitHeight: 188,
-    fitWidth: 136
+    fitWidth: 136,
+    shouldUseDefaultRole: true
   }, /*#__PURE__*/React.createElement(MoreButton, {
     isSelected: isMenuOpen || hasFormattingActive,
     label: moreButtonLabel,
     isReducedSpacing: isReducedSpacing,
     isDisabled: false,
-    onClick: toggleMenu
+    onClick: toggleMenu,
+    "aria-expanded": isMenuOpen
   }));
 });