@atlaskit/editor-core 153.1.4 → 153.1.5

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

@@ -3,49 +3,95 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.collapseSelectedTable = void 0;
+exports.isTableCollapsible = exports.collapseSelectedTable = void 0;
 
 var _prosemirrorModel = require("prosemirror-model");
 
+var _prosemirrorTransform = require("prosemirror-transform");
+
 var _utils = require("@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
  */
-var collapseSelectedTable = function collapseSelectedTable(tr) {
+
+
+var isTableCollapsible = function isTableCollapsible(tr) {
   var selection = tr.selection;
   var schema = tr.doc.type.schema;
   var nodePos = (0, _utils.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 _prosemirrorModel.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 _prosemirrorModel.NodeRange($pos, tr.doc.resolve(pos + node.nodeSize), $pos.depth);
+
+  if (!range) {
+    return bail();
+  }
+
+  var canWrap = (0, _prosemirrorTransform.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
+ */
+
+
+exports.isTableCollapsible = isTableCollapsible;
+
+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/cjs/plugins/tasks-and-decisions/commands.js

@@ -104,13 +104,14 @@ 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 _prosemirrorState.TextSelection(tr.doc.resolve(pos + $to.depth)));
+    }]).setSelection(new _prosemirrorState.TextSelection(tr.doc.resolve(newItemParagraphPos)));
   };
 
   var tr = insertTaskDecisionWithAnalytics(state, listType, inputMethod, addAndCreateList, addToList, listLocalId, itemLocalId);

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.walkOut = exports.subtreeHeight = exports.liftBlock = exports.isTable = exports.isInsideTaskOrDecisionItem = exports.isInsideTask = exports.isEmptyTaskDecision = exports.isActionOrDecisionList = exports.isActionOrDecisionItem = exports.getCurrentIndentLevel = exports.getBlockRange = void 0;
+exports.walkOut = exports.subtreeHeight = exports.liftBlock = exports.isTable = exports.isInsideTaskOrDecisionItem = exports.isInsideTask = exports.isInsideDecision = exports.isEmptyTaskDecision = exports.isActionOrDecisionList = exports.isActionOrDecisionItem = exports.getTaskItemIndex = exports.getCurrentIndentLevel = exports.getBlockRange = void 0;
 
 var _prosemirrorTransform = require("prosemirror-transform");
 
@@ -45,6 +45,13 @@ var isInsideTask = function isInsideTask(state) {
 
 exports.isInsideTask = isInsideTask;
 
+var isInsideDecision = function isInsideDecision(state) {
+  var decisionItem = state.schema.nodes.decisionItem;
+  return (0, _prosemirrorUtils.hasParentNodeOfType)([decisionItem])(state.selection);
+};
+
+exports.isInsideDecision = isInsideDecision;
+
 var isTable = function isTable(node) {
   if (!node) {
     return false;
@@ -99,6 +106,23 @@ var getCurrentIndentLevel = function getCurrentIndentLevel(selection) {
 
   return $from.depth - furthestParent.depth;
 };
+/**
+ * Finds the index of the current task item in relation to the closest taskList
+ */
+
+
+exports.getCurrentIndentLevel = getCurrentIndentLevel;
+
+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 = (0, _prosemirrorUtils.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.
@@ -107,7 +131,7 @@ var getCurrentIndentLevel = function getCurrentIndentLevel(selection) {
  */
 
 
-exports.getCurrentIndentLevel = getCurrentIndentLevel;
+exports.getTaskItemIndex = getTaskItemIndex;
 
 var walkOut = function walkOut($startPos) {
   var $pos = $startPos; // invariant 1: don't walk past the end of the document

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

@@ -120,7 +120,24 @@ var unindent = (0, _commands.filter)(_helpers.isInsideTask, function (state, dis
   }
 
   return (0, _analytics.withAnalytics)(indentationAnalytics(curIndentLevel, _analytics.INDENT_DIRECTION.OUTDENT))((0, _prosemirrorCommands.autoJoin)(_commands3.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 = (0, _helpers.getCurrentIndentLevel)(state.selection);
+  var curIndex = (0, _helpers.getTaskItemIndex)(state);
+  var _state$schema$nodes2 = state.schema.nodes,
+      tableCell = _state$schema$nodes2.tableCell,
+      tableHeader = _state$schema$nodes2.tableHeader;
+  var cell = (0, _prosemirrorUtils.findParentNodeOfType)([tableCell, tableHeader])(state.selection);
+
+  if ((curIndentLevel === 1 && curIndex === 0 || (0, _helpers.isInsideDecision)(state)) && cell) {
+    return true;
+  }
+
+  return false;
+};
+
 var indent = (0, _commands.filter)(_helpers.isInsideTask, function (state, dispatch) {
   // limit ui indentation to 6 levels
   var curIndentLevel = (0, _helpers.getCurrentIndentLevel)(state.selection);
@@ -129,9 +146,9 @@ var indent = (0, _commands.filter)(_helpers.isInsideTask, function (state, dispa
     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;
@@ -154,9 +171,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);
@@ -187,10 +204,10 @@ var backspace = (0, _commands.filter)(_commands.isEmptySelectionAtStart, (0, _pr
 var deleteHandler = (0, _commands.filter)([_helpers.isInsideTaskOrDecisionItem, _commands.isEmptySelectionAtEnd], (0, _prosemirrorCommands.chainCommands)(joinTaskDecisionFollowing, function (state, dispatch) {
   // look for the node after this current one
   var $next = (0, _helpers.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;
@@ -355,8 +372,16 @@ var enter = (0, _commands.filter)(_helpers.isInsideTaskOrDecisionItem, (0, _pros
 
 function keymapPlugin(schema, allowNestedTasks, consumeTabs) {
   var indentHandlers = {
-    'Shift-Tab': consumeTabs ? (0, _prosemirrorCommands.chainCommands)(unindent, _helpers.isInsideTaskOrDecisionItem) : unindent,
-    Tab: consumeTabs ? (0, _prosemirrorCommands.chainCommands)(indent, _helpers.isInsideTaskOrDecisionItem) : indent
+    'Shift-Tab': (0, _commands.filter)([_helpers.isInsideTaskOrDecisionItem, function (state) {
+      return !shouldLetTabThroughInTable(state);
+    }], function (state, dispatch) {
+      return unindent(state, dispatch) || !!consumeTabs;
+    }),
+    Tab: (0, _commands.filter)([_helpers.isInsideTaskOrDecisionItem, function (state) {
+      return !shouldLetTabThroughInTable(state);
+    }], function (state, dispatch) {
+      return indent(state, dispatch) || !!consumeTabs;
+    })
   };
   var defaultHandlers = consumeTabs ? {
     'Shift-Tab': _helpers.isInsideTaskOrDecisionItem,

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

@@ -11,11 +11,11 @@ var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/hel
 
 var _styledComponents = require("styled-components");
 
-var _editorCommon = require("@atlaskit/editor-common");
+var _styles = require("@atlaskit/editor-common/styles");
 
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 
 var _templateObject;
 
-var taskDecisionStyles = (0, _styledComponents.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\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"])), _editorSharedStyles.akEditorSelectedNodeClassName, _editorSharedStyles.akEditorSelectedNodeClassName, (0, _editorSharedStyles.getSelectionStyles)([_editorSharedStyles.SelectionStyle.BoxShadow, _editorSharedStyles.SelectionStyle.Blanket]), _editorCommon.TaskDecisionSharedCssClassName.DECISION_CONTAINER, _editorSharedStyles.akEditorSelectedNodeClassName, _editorSharedStyles.akEditorSelectedBorderSize, _editorSharedStyles.akEditorDeleteBorder, _editorSharedStyles.akEditorDeleteBackgroundWithOpacity);
+var taskDecisionStyles = (0, _styledComponents.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\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"])), _editorSharedStyles.akEditorSelectedNodeClassName, _editorSharedStyles.akEditorSelectedNodeClassName, (0, _editorSharedStyles.getSelectionStyles)([_editorSharedStyles.SelectionStyle.BoxShadow, _editorSharedStyles.SelectionStyle.Blanket]), _styles.TaskDecisionSharedCssClassName.DECISION_CONTAINER, _editorSharedStyles.akEditorSelectedNodeClassName, _editorSharedStyles.akEditorSelectedBorderSize, _editorSharedStyles.akEditorDeleteBorder, _editorSharedStyles.akEditorDeleteBackgroundWithOpacity);
 exports.taskDecisionStyles = taskDecisionStyles;

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

@@ -31,7 +31,7 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _reactIntlNext = require("react-intl-next");
 
-var _editorCommon = require("@atlaskit/editor-common");
+var _providerFactory2 = require("@atlaskit/editor-common/provider-factory");
 
 var _taskItemWithProviders = _interopRequireDefault(require("./task-item-with-providers"));
 
@@ -77,7 +77,7 @@ var TaskItem = /*#__PURE__*/function (_PureComponent) {
         contextIdentifierProvider: contextIdentifierProvider
       }));
     });
-    _this.providerFactory = props.providers || new _editorCommon.ProviderFactory();
+    _this.providerFactory = props.providers || new _providerFactory2.ProviderFactory();
     return _this;
   }
 
@@ -93,7 +93,7 @@ var TaskItem = /*#__PURE__*/function (_PureComponent) {
   }, {
     key: "render",
     value: function render() {
-      return /*#__PURE__*/_react.default.createElement(_editorCommon.WithProviders, {
+      return /*#__PURE__*/_react.default.createElement(_providerFactory2.WithProviders, {
         providers: ['taskDecisionProvider', 'contextIdentifierProvider'],
         providerFactory: this.providerFactory,
         renderNode: this.renderWithProvider

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

@@ -29,7 +29,7 @@ var textColorGlyph = function textColorGlyph(props) {
 var EditorTextColorIcon = function EditorTextColorIcon() {
   return /*#__PURE__*/_react.default.createElement(_base.default, {
     glyph: textColorGlyph,
-    label: "Text color icon"
+    label: ""
   });
 };
 

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

@@ -251,6 +251,8 @@ 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.default.createElement(_styles.TriggerWrapper, null, /*#__PURE__*/_react.default.createElement(_styles2.TextColorIconWrapper, null, /*#__PURE__*/_react.default.createElement(_icon.EditorTextColorIcon, null), /*#__PURE__*/_react.default.createElement(_styles2.TextColorIconBar, {

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

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

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

@@ -11,9 +11,9 @@ var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/hel
 
 var _styledComponents = require("styled-components");
 
-var _editorCommon = require("@atlaskit/editor-common");
+var _styles = require("@atlaskit/editor-common/styles");
 
 var _templateObject;
 
-var textFormattingStyles = (0, _styledComponents.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  ", "\n"])), _editorCommon.codeMarkSharedStyles);
+var textFormattingStyles = (0, _styledComponents.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  ", "\n"])), _styles.codeMarkSharedStyles);
 exports.textFormattingStyles = textFormattingStyles;

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

@@ -61,13 +61,15 @@ var FormattingTextDropdownMenu = /*#__PURE__*/_react.default.memo(function (_ref
     items: group,
     zIndex: _editorSharedStyles.akEditorMenuZIndex,
     fitHeight: 188,
-    fitWidth: 136
+    fitWidth: 136,
+    shouldUseDefaultRole: true
   }, /*#__PURE__*/_react.default.createElement(_moreButton.MoreButton, {
     isSelected: isMenuOpen || hasFormattingActive,
     label: moreButtonLabel,
     isReducedSpacing: isReducedSpacing,
     isDisabled: false,
-    onClick: toggleMenu
+    onClick: toggleMenu,
+    "aria-expanded": isMenuOpen
   }));
 });
 

package/dist/cjs/plugins/text-formatting/ui/Toolbar/hooks/formatting-icons.js

@@ -51,10 +51,9 @@ var IconButtons = {
     command: withToolbarInputMethod(commands.toggleStrongWithAnalytics),
     message: _toolbarMessages.toolbarMessages.bold,
     tooltipKeymap: _keymaps.toggleBold,
-    component: function component(_ref) {
-      var label = _ref.label;
+    component: function component() {
       return /*#__PURE__*/_react.default.createElement(_bold.default, {
-        label: label
+        label: ""
       });
     }
   },
@@ -63,10 +62,9 @@ var IconButtons = {
     command: withToolbarInputMethod(commands.toggleEmWithAnalytics),
     message: _toolbarMessages.toolbarMessages.italic,
     tooltipKeymap: _keymaps.toggleItalic,
-    component: function component(_ref2) {
-      var label = _ref2.label;
+    component: function component() {
       return /*#__PURE__*/_react.default.createElement(_italic.default, {
-        label: label
+        label: ""
       });
     }
   },
@@ -87,19 +85,21 @@ var IconButtons = {
   },
   subscript: {
     command: withToolbarInputMethod(commands.toggleSubscriptWithAnalytics),
-    message: _toolbarMessages.toolbarMessages.subscript
+    message: _toolbarMessages.toolbarMessages.subscript,
+    tooltipKeymap: _keymaps.toggleSubscript
   },
   superscript: {
     command: withToolbarInputMethod(commands.toggleSuperscriptWithAnalytics),
-    message: _toolbarMessages.toolbarMessages.superscript
+    message: _toolbarMessages.toolbarMessages.superscript,
+    tooltipKeymap: _keymaps.toggleSuperscript
   }
 };
 
-var getIcon = function getIcon(_ref3) {
-  var iconType = _ref3.iconType,
-      isDisabled = _ref3.isDisabled,
-      isActive = _ref3.isActive,
-      intl = _ref3.intl;
+var getIcon = function getIcon(_ref) {
+  var iconType = _ref.iconType,
+      isDisabled = _ref.isDisabled,
+      isActive = _ref.isActive,
+      intl = _ref.intl;
   var icon = IconButtons[iconType];
   var content = intl.formatMessage(icon.message);
   var tooltipKeymap = icon.tooltipKeymap;
@@ -109,9 +109,7 @@ var getIcon = function getIcon(_ref3) {
     iconMark: iconType,
     key: iconType,
     command: icon.command,
-    iconElement: icon.component ? icon.component({
-      label: content
-    }) : undefined,
+    iconElement: icon.component ? icon.component() : undefined,
     tooltipElement: tooltipKeymap ? /*#__PURE__*/_react.default.createElement(_keymaps.ToolTipContent, {
       description: content,
       keymap: tooltipKeymap
@@ -128,9 +126,9 @@ var getIcon = function getIcon(_ref3) {
 var IconsMarkSchema = (_IconsMarkSchema = {}, (0, _defineProperty2.default)(_IconsMarkSchema, _types.IconTypes.strong, 'strong'), (0, _defineProperty2.default)(_IconsMarkSchema, _types.IconTypes.em, 'em'), (0, _defineProperty2.default)(_IconsMarkSchema, _types.IconTypes.strike, 'strike'), (0, _defineProperty2.default)(_IconsMarkSchema, _types.IconTypes.code, 'code'), (0, _defineProperty2.default)(_IconsMarkSchema, _types.IconTypes.underline, 'underline'), (0, _defineProperty2.default)(_IconsMarkSchema, _types.IconTypes.superscript, 'subsup'), (0, _defineProperty2.default)(_IconsMarkSchema, _types.IconTypes.subscript, 'subsup'), _IconsMarkSchema);
 
 var buildMenuIconState = function buildMenuIconState(iconMark) {
-  return function (_ref4) {
-    var schema = _ref4.schema,
-        textFormattingPluginState = _ref4.textFormattingPluginState;
+  return function (_ref2) {
+    var schema = _ref2.schema,
+        textFormattingPluginState = _ref2.textFormattingPluginState;
     var hasPluginState = Boolean(textFormattingPluginState);
     var markSchema = IconsMarkSchema[iconMark];
     var hasSchemaMark = Boolean(schema.marks[markSchema]);
@@ -158,11 +156,11 @@ var buildMenuIconState = function buildMenuIconState(iconMark) {
 
 var buildIcon = function buildIcon(iconMark) {
   var getState = buildMenuIconState(iconMark);
-  return function (_ref5) {
-    var schema = _ref5.schema,
-        textFormattingPluginState = _ref5.textFormattingPluginState,
-        intl = _ref5.intl,
-        isToolbarDisabled = _ref5.isToolbarDisabled;
+  return function (_ref3) {
+    var schema = _ref3.schema,
+        textFormattingPluginState = _ref3.textFormattingPluginState,
+        intl = _ref3.intl,
+        isToolbarDisabled = _ref3.isToolbarDisabled;
     var iconState = getState({
       schema: schema,
       textFormattingPluginState: textFormattingPluginState
@@ -200,10 +198,10 @@ var useTextFormattingPluginState = function useTextFormattingPluginState(editorS
   }, [editorState]);
 };
 
-var useFormattingIcons = function useFormattingIcons(_ref6) {
-  var isToolbarDisabled = _ref6.isToolbarDisabled,
-      editorState = _ref6.editorState,
-      intl = _ref6.intl;
+var useFormattingIcons = function useFormattingIcons(_ref4) {
+  var isToolbarDisabled = _ref4.isToolbarDisabled,
+      editorState = _ref4.editorState,
+      intl = _ref4.intl;
   var textFormattingPluginState = useTextFormattingPluginState(editorState);
   var schema = editorState.schema;
   var props = {
@@ -227,9 +225,9 @@ var useFormattingIcons = function useFormattingIcons(_ref6) {
 
 exports.useFormattingIcons = useFormattingIcons;
 
-var useHasFormattingActived = function useHasFormattingActived(_ref7) {
-  var editorState = _ref7.editorState,
-      iconTypeList = _ref7.iconTypeList;
+var useHasFormattingActived = function useHasFormattingActived(_ref5) {
+  var editorState = _ref5.editorState,
+      iconTypeList = _ref5.iconTypeList;
   var textFormattingPluginState = useTextFormattingPluginState(editorState);
   var hasActiveFormatting = (0, _react.useMemo)(function () {
     if (!textFormattingPluginState) {

package/dist/cjs/plugins/text-formatting/ui/Toolbar/index.js

@@ -106,7 +106,9 @@ var ToolbarFormatting = function ToolbarFormatting(_ref) {
     label: moreFormattingButtonLabel,
     isReducedSpacing: isReducedSpacing,
     isDisabled: true,
-    isSelected: false
+    isSelected: false,
+    "aria-expanded": undefined,
+    "aria-pressed": undefined
   })) : /*#__PURE__*/_react.default.createElement(_dropdownMenu.FormattingTextDropdownMenu, {
     popupsMountPoint: popupsMountPoint,
     popupsBoundariesElement: popupsBoundariesElement,

package/dist/cjs/plugins/text-formatting/ui/Toolbar/more-button.js

@@ -2,14 +2,12 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
-var _typeof = require("@babel/runtime/helpers/typeof");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.MoreButton = void 0;
 
-var _react = _interopRequireWildcard(require("react"));
+var _react = _interopRequireDefault(require("react"));
 
 var _more = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/more"));
 
@@ -17,28 +15,25 @@ var _styles = require("../../../../ui/styles");
 
 var _ToolbarButton = _interopRequireDefault(require("../../../../ui/ToolbarButton"));
 
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-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 MoreButton = /*#__PURE__*/_react.default.memo(function (_ref) {
   var label = _ref.label,
+      ariaExpanded = _ref['aria-expanded'],
       isReducedSpacing = _ref.isReducedSpacing,
       isSelected = _ref.isSelected,
       isDisabled = _ref.isDisabled,
       onClick = _ref.onClick;
-  var more = (0, _react.useMemo)(function () {
-    return /*#__PURE__*/_react.default.createElement(_styles.TriggerWrapper, null, /*#__PURE__*/_react.default.createElement(_more.default, {
-      label: label
-    }));
-  }, [label]);
   return /*#__PURE__*/_react.default.createElement(_ToolbarButton.default, {
     disabled: isDisabled,
     selected: isSelected,
     onClick: onClick,
     spacing: isReducedSpacing ? 'none' : 'default',
     title: label,
-    iconBefore: more
+    iconBefore: /*#__PURE__*/_react.default.createElement(_styles.TriggerWrapper, null, /*#__PURE__*/_react.default.createElement(_more.default, {
+      label: ""
+    })),
+    "aria-expanded": ariaExpanded,
+    "aria-label": label,
+    "aria-haspopup": true
   });
 });
 

package/dist/cjs/plugins/text-formatting/ui/Toolbar/single-toolbar-buttons.js

@@ -40,7 +40,9 @@ var SingleToolbarButtons = /*#__PURE__*/_react.default.memo(function (_ref) {
       selected: item.isActive,
       disabled: item.isDisabled,
       title: item.tooltipElement,
-      iconBefore: item.iconElement
+      iconBefore: item.iconElement,
+      "aria-pressed": item.isActive,
+      "aria-label": String(item.content)
     });
   }));
 });