@atlaskit/editor-core 176.0.2 → 177.0.0

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

@@ -521,6 +521,12 @@ var MediaPluginStateImplementation = /*#__PURE__*/function () {
           break;
       }
     });
+    (0, _defineProperty2.default)(this, "setMediaGroupNode", function (node, getPos) {
+      _this.mediaGroupNodes[node.attrs.id] = {
+        node: node,
+        getPos: getPos
+      };
+    });
     (0, _defineProperty2.default)(this, "removeNodeById", function (state) {
       var id = state.id;
       var mediaNodeWithPos = helpers.findMediaNode(_this, id, (0, _isImage.isImage)(state.fileMimeType));

package/dist/cjs/plugins/media/toolbar/index.js

@@ -140,6 +140,7 @@ var generateMediaCardFloatingToolbar = function generateMediaCardFloatingToolbar
     id: 'editor.media.delete',
     type: 'button',
     appearance: 'danger',
+    focusEditoronEnter: true,
     icon: _remove.default,
     onMouseEnter: (0, _decoration.hoverDecoration)(mediaGroup, true),
     onMouseLeave: (0, _decoration.hoverDecoration)(mediaGroup, false),
@@ -213,6 +214,7 @@ var generateMediaInlineFloatingToolbar = function generateMediaInlineFloatingToo
     id: 'editor.media.delete',
     type: 'button',
     appearance: 'danger',
+    focusEditoronEnter: true,
     icon: _remove.default,
     onMouseEnter: (0, _decoration.hoverDecoration)(mediaInline, true),
     onMouseLeave: (0, _decoration.hoverDecoration)(mediaInline, false),
@@ -298,6 +300,7 @@ var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToo
     id: 'editor.media.delete',
     type: 'button',
     appearance: 'danger',
+    focusEditoronEnter: true,
     icon: _remove.default,
     onMouseEnter: (0, _decoration.hoverDecoration)(mediaSingle, true),
     onMouseLeave: (0, _decoration.hoverDecoration)(mediaSingle, false),

package/dist/cjs/plugins/media/utils/media-single.js

@@ -36,6 +36,8 @@ var _isImage = require("./is-image");
 
 var _position = require("../../../utils/prosemirror/position");
 
+var _mediaCommon2 = require("@atlaskit/media-common");
+
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(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; }
@@ -221,6 +223,7 @@ function transformSliceForMedia(slice, schema) {
       bulletList = _schema$nodes2.bulletList,
       orderedList = _schema$nodes2.orderedList,
       media = _schema$nodes2.media,
+      mediaInline = _schema$nodes2.mediaInline,
       expand = _schema$nodes2.expand;
   return function (selection) {
     var newSlice = slice;
@@ -234,10 +237,23 @@ function transformSliceForMedia(slice, schema) {
       });
     }
 
+    var __mediaTraceId = (0, _mediaCommon2.getRandomHex)(8);
+
     newSlice = (0, _slice.mapSlice)(newSlice, function (node) {
-      return node.type.name === 'media' && node.attrs.type === 'external' ? media.createChecked(_objectSpread(_objectSpread({}, node.attrs), {}, {
-        __external: true
-      }), node.content, node.marks) : node;
+      if (node.type.name === 'media') {
+        return media.createChecked(_objectSpread(_objectSpread({}, node.attrs), {}, {
+          __external: node.attrs.type === 'external',
+          __mediaTraceId: node.attrs.type === 'external' ? null : __mediaTraceId
+        }), node.content, node.marks);
+      }
+
+      if (node.type.name === 'mediaInline') {
+        return mediaInline.createChecked(_objectSpread(_objectSpread({}, node.attrs), {}, {
+          __mediaTraceId: __mediaTraceId
+        }), node.content, node.marks);
+      }
+
+      return node;
     });
     return newSlice;
   };

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

@@ -290,6 +290,7 @@ var getToolbarItems = function getToolbarItems(formatMessage, panelNodeType, isC
     id: 'editor.panel.delete',
     type: 'button',
     appearance: 'danger',
+    focusEditoronEnter: true,
     icon: _remove.default,
     onClick: (0, _actions.removePanel)(),
     onMouseEnter: (0, _decoration.hoverDecoration)(panelNodeType, true),

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

@@ -34,7 +34,7 @@ var panelAttrsToDom = function panelAttrsToDom(attrs, allowCustomPanel) {
       panelIconText = attrs.panelIconText;
   var isCustomPanel = panelType === _adfSchema.PanelType.CUSTOM && allowCustomPanel;
   var hasIcon = !isCustomPanel || !!panelIcon || !!panelIconId;
-  var style = ["".concat(panelColor && isCustomPanel ? "background-color: ".concat(panelColor, ";") : ''), "".concat(hasIcon ? '' : 'padding: 12px;')].join('');
+  var style = ["".concat(panelColor && isCustomPanel ? "background-color: ".concat(panelColor, ";") : ''), "".concat(hasIcon ? '' : 'padding-left: 12px;')].join('');
   var panelAttrs = {
     class: _panel.PanelSharedCssClassName.prefix,
     'data-panel-type': panelType || _adfSchema.PanelType.INFO,

package/dist/cjs/plugins/paste/index.js

@@ -9,7 +9,8 @@ var _main = require("./pm-plugins/main");
 
 var pastePlugin = function pastePlugin(_ref) {
   var cardOptions = _ref.cardOptions,
-      sanitizePrivateContent = _ref.sanitizePrivateContent;
+      sanitizePrivateContent = _ref.sanitizePrivateContent,
+      plainTextPasteLinkification = _ref.plainTextPasteLinkification;
   return {
     name: 'paste',
     pmPlugins: function pmPlugins() {

package/dist/cjs/plugins/paste/pm-plugins/analytics.js

@@ -8,7 +8,9 @@ Object.defineProperty(exports, "__esModule", {
 exports.createPasteAnalyticsPayload = createPasteAnalyticsPayload;
 exports.createPasteMeasurePayload = void 0;
 exports.getContent = getContent;
-exports.handleSelectedTableWithAnalytics = exports.handleRichTextWithAnalytics = exports.handlePastePreservingMarksWithAnalytics = exports.handlePastePanelIntoListWithAnalytics = exports.handlePasteLinkOnSelectedTextWithAnalytics = exports.handlePasteIntoTaskAndDecisionWithAnalytics = exports.handlePasteIntoCaptionWithAnalytics = exports.handlePasteAsPlainTextWithAnalytics = exports.handleMediaSingleWithAnalytics = exports.handleMarkdownWithAnalytics = exports.handleExpandWithAnalytics = exports.handleCodeBlockWithAnalytics = exports.getContentNodeTypes = void 0;
+exports.getContentNodeTypes = void 0;
+exports.getMediaTraceId = getMediaTraceId;
+exports.handleSelectedTableWithAnalytics = exports.handleRichTextWithAnalytics = exports.handlePastePreservingMarksWithAnalytics = exports.handlePastePanelIntoListWithAnalytics = exports.handlePasteLinkOnSelectedTextWithAnalytics = exports.handlePasteIntoTaskAndDecisionWithAnalytics = exports.handlePasteIntoCaptionWithAnalytics = exports.handlePasteAsPlainTextWithAnalytics = exports.handleMediaSingleWithAnalytics = exports.handleMarkdownWithAnalytics = exports.handleExpandWithAnalytics = exports.handleCodeBlockWithAnalytics = void 0;
 exports.pasteCommandWithAnalytics = pasteCommandWithAnalytics;
 exports.sendPasteAnalyticsEvent = sendPasteAnalyticsEvent;
 
@@ -118,6 +120,18 @@ function getContent(state, slice) {
   return pasteContent ? pasteContent : _analytics.PasteContents.uncategorized;
 }
 
+function getMediaTraceId(slice) {
+  var traceId;
+  (0, _slice.mapSlice)(slice, function (node) {
+    if (node.type.name === 'media' || node.type.name === 'mediaInline') {
+      traceId = node.attrs.__mediaTraceId;
+    }
+
+    return node;
+  });
+  return traceId;
+}
+
 function getActionSubjectId(view) {
   var _view$state = view.state,
       selection = _view$state.selection,
@@ -178,7 +192,8 @@ function createPasteAnalyticsPayload(view, event, slice, pasteContext) {
   var actionSubjectId = getActionSubjectId(view);
   var pasteSize = slice.size;
   var content = getContent(view.state, slice);
-  var linkUrls = []; // If we have a link among the pasted content, grab the
+  var linkUrls = [];
+  var mediaTraceId = getMediaTraceId(slice); // If we have a link among the pasted content, grab the
   // domain and send it up with the analytics event
 
   if (content === _analytics.PasteContents.url || content === _analytics.PasteContents.mixed) {
@@ -219,7 +234,8 @@ function createPasteAnalyticsPayload(view, event, slice, pasteContext) {
     content: content,
     source: source,
     hyperlinkPasteOnText: !!pasteContext.hyperlinkPasteOnText,
-    linksInPasteCount: linkUrls.length
+    linksInPasteCount: linkUrls.length,
+    mediaTraceId: mediaTraceId
   }, linkDomains);
 } // TODO: ED-6612 We should not dispatch only analytics, it's preferred to wrap each command with his own analytics.
 // However, handlers like handleMacroAutoConvert dispatch multiple time,

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

@@ -323,7 +323,7 @@ function createPlugin(schema, dispatchAnalyticsEvent, dispatch, cardOptions, san
           }
         }
 
-        slice = (0, _utils6.transformUnsupportedBlockCardToInline)(slice, state); // Handles edge case so that when copying text from the top level of the document
+        slice = (0, _utils6.transformUnsupportedBlockCardToInline)(slice, state, cardOptions); // Handles edge case so that when copying text from the top level of the document
         // it can be pasted into nodes like panels/actions/decisions without removing them.
         // Overriding openStart to be 1 when only pasting a paragraph makes the preferred
         // depth favour the text, rather than the paragraph node.

package/dist/cjs/plugins/paste/util/index.js

@@ -152,8 +152,8 @@ function isCode(str) {
 
 
 function escapeLinks(text) {
-  return text.replace(/(\[([^\]]+)\]\()?((https?|ftp):\/\/[^\s]+)/g, function (str) {
-    return str.match(/^(https?|ftp):\/\/[^\s]+$/) ? "<".concat(str, ">") : str;
+  return text.replace(/(\[([^\]]+)\]\()?((https?|ftp|jamfselfservice):\/\/[^\s]+)/g, function (str) {
+    return str.match(/^(https?|ftp|jamfselfservice):\/\/[^\s]+$/) ? "<".concat(str, ">") : str;
   });
 }
 

package/dist/cjs/plugins/placeholder/index.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.createPlaceholderDecoration = createPlaceholderDecoration;
 exports.createPlugin = createPlugin;
-exports.pluginKey = exports.default = void 0;
+exports.pluginKey = exports.placeholderTestId = exports.default = void 0;
 
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 
@@ -17,10 +17,6 @@ var _prosemirrorView = require("prosemirror-view");
 
 var _document = require("../../utils/document");
 
-var _main = require("../alignment/pm-plugins/main");
-
-var _styles = require("./styles");
-
 var _focusHandler = require("../base/pm-plugins/focus-handler");
 
 var _utils2 = require("../type-ahead/utils");
@@ -34,23 +30,26 @@ function getPlaceholderState(editorState) {
   return pluginKey.getState(editorState);
 }
 
+var placeholderTestId = 'placeholder-test-id';
+exports.placeholderTestId = placeholderTestId;
+
 function createPlaceholderDecoration(editorState, placeholderText) {
   var pos = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1;
   var placeholderDecoration = document.createElement('span');
-  var placeHolderClass = _styles.placeHolderClassName;
+  var placeholderNodeWithText = placeholderDecoration;
+  placeholderDecoration.setAttribute('data-testid', placeholderTestId);
+  placeholderDecoration.className = 'placeholder-decoration'; // PM sets contenteditable to false on Decorations so Firefox doesn't display the flashing cursor
+  // So adding an extra span which will contain the placeholder text
 
-  var alignment = _main.pluginKey.getState(editorState);
+  if (_utils.browser.gecko) {
+    var placeholderNode = document.createElement('span');
+    placeholderNode.setAttribute('contenteditable', 'true'); // explicitly overriding the default Decoration behaviour
 
-  if (alignment && alignment.align === 'end') {
-    placeHolderClass = placeHolderClass + ' align-end';
-  } else if (alignment && alignment.align === 'center') {
-    placeHolderClass = placeHolderClass + ' align-center';
+    placeholderDecoration.appendChild(placeholderNode);
+    placeholderNodeWithText = placeholderNode;
   }
 
-  placeholderDecoration.className = placeHolderClass;
-  var placeholderNode = document.createElement('span');
-  placeholderNode.textContent = placeholderText;
-  placeholderDecoration.appendChild(placeholderNode); // ME-2289 Tapping on backspace in empty editor hides and displays the keyboard
+  placeholderNodeWithText.textContent = placeholderText || ' '; // ME-2289 Tapping on backspace in empty editor hides and displays the keyboard
   // Add a editable buff node as the cursor moving forward is inevitable
   // when backspace in GBoard composition
 
@@ -62,7 +61,7 @@ function createPlaceholderDecoration(editorState, placeholderText) {
   }
 
   return _prosemirrorView.DecorationSet.create(editorState.doc, [_prosemirrorView.Decoration.widget(pos, placeholderDecoration, {
-    side: -1,
+    side: 0,
     key: 'placeholder'
   })]);
 }
@@ -79,7 +78,7 @@ var emptyPlaceholder = {
   hasPlaceholder: false
 };
 
-function createPlaceHolderStateFrom(editorState, getPlaceholderHintMessage, defaultPlaceholderText, bracketPlaceholderText) {
+function createPlaceHolderStateFrom(editorState, defaultPlaceholderText, bracketPlaceholderText) {
   var isEditorFocused = _focusHandler.focusStateKey.getState(editorState);
 
   if ((0, _utils2.isTypeAheadOpen)(editorState)) {
@@ -90,48 +89,26 @@ function createPlaceHolderStateFrom(editorState, getPlaceholderHintMessage, defa
     return setPlaceHolderState(defaultPlaceholderText);
   }
 
-  var placeholderHint = getPlaceholderHintMessage();
-
-  if (placeholderHint && (0, _document.isInEmptyLine)(editorState) && isEditorFocused) {
-    var $from = editorState.selection.$from;
-    return setPlaceHolderState(placeholderHint, $from.pos);
-  }
-
   if (bracketPlaceholderText && (0, _document.bracketTyped)(editorState) && isEditorFocused) {
-    var _$from = editorState.selection.$from; // Space is to account for positioning of the bracket
+    var $from = editorState.selection.$from; // Space is to account for positioning of the bracket
 
     var bracketHint = '  ' + bracketPlaceholderText;
-    return setPlaceHolderState(bracketHint, _$from.pos - 1);
+    return setPlaceHolderState(bracketHint, $from.pos - 1);
   }
 
   return emptyPlaceholder;
 }
 
-function createGetPlaceholderHintMessage(placeholderHints) {
-  var index = 0;
-  return function () {
-    if (!placeholderHints || placeholderHints.length === 0) {
-      return;
-    }
-
-    var length = placeholderHints.length;
-    var placeholder = placeholderHints[index++];
-    index = index % length;
-    return placeholder;
-  };
-}
-
-function createPlugin(defaultPlaceholderText, placeholderHints, bracketPlaceholderText) {
-  if (!defaultPlaceholderText && !placeholderHints && !bracketPlaceholderText) {
+function createPlugin(defaultPlaceholderText, bracketPlaceholderText) {
+  if (!defaultPlaceholderText && !bracketPlaceholderText) {
     return;
   }
 
-  var getPlaceholderHintMessage = createGetPlaceholderHintMessage(placeholderHints);
   return new _safePlugin.SafePlugin({
     key: pluginKey,
     state: {
       init: function init(_, state) {
-        return createPlaceHolderStateFrom(state, getPlaceholderHintMessage, defaultPlaceholderText, bracketPlaceholderText);
+        return createPlaceHolderStateFrom(state, defaultPlaceholderText, bracketPlaceholderText);
       },
       apply: function apply(tr, _oldPluginState, _oldEditorState, newEditorState) {
         var meta = tr.getMeta(pluginKey);
@@ -142,11 +119,11 @@ function createPlugin(defaultPlaceholderText, placeholderHints, bracketPlacehold
           }
 
           if (meta.applyPlaceholderIfEmpty) {
-            return createPlaceHolderStateFrom(newEditorState, getPlaceholderHintMessage, defaultPlaceholderText, bracketPlaceholderText);
+            return createPlaceHolderStateFrom(newEditorState, defaultPlaceholderText, bracketPlaceholderText);
           }
         }
 
-        return createPlaceHolderStateFrom(newEditorState, getPlaceholderHintMessage, defaultPlaceholderText, bracketPlaceholderText);
+        return createPlaceHolderStateFrom(newEditorState, defaultPlaceholderText, bracketPlaceholderText);
       }
     },
     props: {
@@ -173,7 +150,7 @@ var placeholderPlugin = function placeholderPlugin(options) {
       return [{
         name: 'placeholder',
         plugin: function plugin() {
-          return createPlugin(options && options.placeholder, options && options.placeholderHints, options && options.placeholderBracketHint);
+          return createPlugin(options && options.placeholder, options && options.placeholderBracketHint);
         }
       }];
     }

package/dist/cjs/plugins/placeholder/styles.js

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.placeholderStyles = exports.placeHolderClassName = void 0;
+exports.placeholderStyles = void 0;
 
 var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
 
@@ -17,7 +17,5 @@ var _tokens = require("@atlaskit/tokens");
 
 var _templateObject;
 
-var placeHolderClassName = 'placeholder-decoration';
-exports.placeHolderClassName = placeHolderClassName;
-var placeholderStyles = (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  .ProseMirror .", " {\n    position: relative;\n    color: ", ";\n    width: 100%;\n\n    pointer-events: none;\n    display: block;\n    user-select: none;\n\n    > span {\n      position: absolute;\n      pointer-events: none;\n      outline: none;\n    }\n\n    &.align-end > span {\n      right: 0;\n    }\n\n    &.align-center > span {\n      left: 0;\n    }\n  }\n"])), placeHolderClassName, (0, _tokens.token)('color.text.subtlest', _colors.N200));
+var placeholderStyles = (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  .ProseMirror .placeholder-decoration {\n    color: ", ";\n    width: 100%;\n    pointer-events: none;\n    user-select: none;\n  }\n"])), (0, _tokens.token)('color.text.subtlest', _colors.N200));
 exports.placeholderStyles = placeholderStyles;

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

@@ -27,6 +27,8 @@ var _react = _interopRequireDefault(require("react"));
 
 var _analyticsNext = require("@atlaskit/analytics-next");
 
+var _steps = require("@atlaskit/adf-schema/steps");
+
 var _nodeviews = require("../../../nodeviews");
 
 var _WithPluginState = _interopRequireDefault(require("../../../ui/WithPluginState"));
@@ -63,12 +65,14 @@ var Task = /*#__PURE__*/function (_ReactNodeView) {
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "handleOnChange", function (taskId, isChecked) {
       var tr = _this.view.state.tr;
 
-      var nodePos = _this.getPos();
+      var nodePos = _this.getPos(); // SetAttrsStep should be used to prevent task updates from being dropped when mapping task ticks
+      // from a previous version of the document, such as a published page.
+
 
-      tr.setNodeMarkup(nodePos, undefined, {
+      tr.step(new _steps.SetAttrsStep(nodePos, {
         state: isChecked ? 'DONE' : 'TODO',
         localId: taskId
-      });
+      }));
       tr.setMeta('scrollIntoView', false);
 
       _this.view.dispatch(tr);

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

@@ -89,6 +89,7 @@ var ToolbarDecision = /*#__PURE__*/function (_PureComponent) {
         disabled: disabled || isDisabled,
         spacing: isReducedSpacing ? 'none' : 'default',
         title: "".concat(label, " <>"),
+        "aria-keyshortcuts": "Shift+, Shift+. space",
         iconBefore: /*#__PURE__*/_react.default.createElement(_decision.default, {
           label: label
         })

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

@@ -51,6 +51,8 @@ var _icon = require("./icon");
 
 var _styles2 = require("./styles");
 
+var _getFeatureFlags2 = require("../../../feature-flags-context/get-feature-flags");
+
 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; }
@@ -109,10 +111,9 @@ var ToolbarTextColor = /*#__PURE__*/function (_React$Component) {
 
         var _this$props$pluginSta = _this.props.pluginState,
             palette = _this$props$pluginSta.palette,
-            paletteExpanded = _this$props$pluginSta.paletteExpanded,
             defaultColor = _this$props$pluginSta.defaultColor; // we store color names in analytics
 
-        var swatch = (paletteExpanded || palette).find(function (sw) {
+        var swatch = palette.find(function (sw) {
           return sw.value === color;
         });
         var isNewColor = color !== defaultColor && !_textColorPalette.textColorPalette.some(function (col) {
@@ -205,11 +206,14 @@ var ToolbarTextColor = /*#__PURE__*/function (_React$Component) {
           popupsScrollableElement = _this$props.popupsScrollableElement,
           isReducedSpacing = _this$props.isReducedSpacing,
           pluginState = _this$props.pluginState,
-          paletteExpanded = _this$props.pluginState.paletteExpanded,
           formatMessage = _this$props.intl.formatMessage,
           disabled = _this$props.disabled;
       var labelTextColor = formatMessage(messages.textColor);
-      var palette = paletteExpanded || pluginState.palette;
+      var palette = pluginState.palette;
+
+      var _getFeatureFlags = (0, _getFeatureFlags2.getFeatureFlags)(this.props.editorView.state),
+          useSomewhatSemanticTextColorNames = _getFeatureFlags.useSomewhatSemanticTextColorNames;
+
       var fitWidth;
 
       if (document.body.clientWidth <= 740) {
@@ -265,7 +269,8 @@ var ToolbarTextColor = /*#__PURE__*/function (_React$Component) {
           return _this2.changeTextColor(color, pluginState.disabled);
         },
         selectedColor: pluginState.color,
-        textPalette: true
+        textPalette: true,
+        useSomewhatSemanticTextColorNames: useSomewhatSemanticTextColorNames
       }))), (0, _react2.jsx)("span", {
         css: _styles.separatorStyles
       }));

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

@@ -35,6 +35,8 @@ var _enums = require("../../../../analytics/types/enums");
 
 var _types = require("../types");
 
+var _keymaps2 = require("@atlaskit/editor-common/keymaps");
+
 var _IconsMarkSchema;
 
 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); }
@@ -123,7 +125,9 @@ var getIcon = function getIcon(_ref) {
       name: iconType
     },
     isActive: isActive,
-    isDisabled: isDisabled
+    isDisabled: isDisabled,
+    'aria-label': tooltipKeymap ? (0, _keymaps.tooltip)(tooltipKeymap, String(content)) : String(content),
+    'aria-keyshortcuts': (0, _keymaps2.getAriaKeyshortcuts)(tooltipKeymap)
   };
 };
 

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

@@ -35,8 +35,11 @@ var SingleToolbarButtons = /*#__PURE__*/_react.default.memo(function (_ref) {
   return (0, _react2.jsx)("span", {
     css: _styles.buttonGroupStyle
   }, items.map(function (item) {
+    var _item$ariaLabel;
+
     return (0, _react2.jsx)(_ToolbarButton.default, {
       key: item.key,
+      testId: "editor-toolbar__".concat(String(item.content)),
       buttonId: item.buttonId,
       spacing: isReducedSpacing ? 'none' : 'default',
       onClick: onClick(item.command),
@@ -45,7 +48,8 @@ var SingleToolbarButtons = /*#__PURE__*/_react.default.memo(function (_ref) {
       title: item.tooltipElement,
       iconBefore: item.iconElement,
       "aria-pressed": item.isActive,
-      "aria-label": String(item.content)
+      "aria-label": (_item$ariaLabel = item['aria-label']) !== null && _item$ariaLabel !== void 0 ? _item$ariaLabel : String(item.content),
+      "aria-keyshortcuts": item['aria-keyshortcuts']
     });
   }));
 });

package/dist/cjs/plugins/toolbar-lists-indentation/ui/Toolbar.js

@@ -31,6 +31,8 @@ var _messages2 = require("../../indentation/messages");
 
 var _styles = require("../../../ui/styles");
 
+var _keymaps2 = require("@atlaskit/editor-common/keymaps");
+
 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; }
@@ -52,6 +54,8 @@ function Toolbar(props) {
       onItemActivated = props.onItemActivated;
   var labelUnorderedList = formatMessage(_messages.messages.unorderedList);
   var labelOrderedList = formatMessage(_messages.messages.orderedList);
+  var indentMessage = formatMessage(_messages2.messages.indent);
+  var outdentMessage = formatMessage(_messages2.messages.outdent);
 
   var handleOnItemActivated = function handleOnItemActivated(buttonName) {
     return function (event) {
@@ -66,11 +70,13 @@ function Toolbar(props) {
     css: _styles.buttonGroupStyle
   }, (0, _react.jsx)(_ToolbarButton.default, {
     buttonId: _ToolbarButton.TOOLBAR_BUTTON.BULLET_LIST,
+    testId: labelUnorderedList,
     spacing: isReducedSpacing ? 'none' : 'default',
     onClick: handleOnItemActivated('bullet_list'),
     selected: bulletListActive,
     "aria-pressed": bulletListActive,
-    "aria-label": labelUnorderedList,
+    "aria-label": (0, _keymaps.tooltip)(_keymaps.toggleBulletList, labelUnorderedList),
+    "aria-keyshortcuts": (0, _keymaps2.getAriaKeyshortcuts)(_keymaps.toggleBulletList),
     disabled: bulletListDisabled || disabled,
     title: (0, _react.jsx)(_keymaps.ToolTipContent, {
       description: labelUnorderedList,
@@ -81,11 +87,13 @@ function Toolbar(props) {
     })
   }), (0, _react.jsx)(_ToolbarButton.default, {
     buttonId: _ToolbarButton.TOOLBAR_BUTTON.ORDERED_LIST,
+    testId: labelOrderedList,
     spacing: isReducedSpacing ? 'none' : 'default',
     onClick: handleOnItemActivated('ordered_list'),
     selected: orderedListActive,
     "aria-pressed": orderedListActive,
-    "aria-label": labelOrderedList,
+    "aria-label": (0, _keymaps.tooltip)(_keymaps.toggleOrderedList, labelOrderedList),
+    "aria-keyshortcuts": (0, _keymaps2.getAriaKeyshortcuts)(_keymaps.toggleOrderedList),
     disabled: orderedListDisabled || disabled,
     title: (0, _react.jsx)(_keymaps.ToolTipContent, {
       description: labelOrderedList,
@@ -103,9 +111,10 @@ function Toolbar(props) {
       label: ""
     }),
     disabled: outdentDisabled || disabled,
-    "aria-label": formatMessage(_messages2.messages.outdent),
+    "aria-label": (0, _keymaps.tooltip)(_keymaps.outdent, outdentMessage),
+    "aria-keyshortcuts": (0, _keymaps2.getAriaKeyshortcuts)(_keymaps.outdent),
     title: (0, _react.jsx)(_keymaps.ToolTipContent, {
-      description: formatMessage(_messages2.messages.outdent),
+      description: outdentMessage,
       keymap: _keymaps.outdent
     })
   }), showIndentationButtons && (0, _react.jsx)(_ToolbarButton.default, {
@@ -117,9 +126,10 @@ function Toolbar(props) {
       label: ""
     }),
     disabled: indentDisabled || disabled,
-    "aria-label": formatMessage(_messages2.messages.indent),
+    "aria-label": (0, _keymaps.tooltip)(_keymaps.indent, indentMessage),
+    "aria-keyshortcuts": (0, _keymaps2.getAriaKeyshortcuts)(_keymaps.indent),
     title: (0, _react.jsx)(_keymaps.ToolTipContent, {
-      description: formatMessage(_messages2.messages.indent),
+      description: indentMessage,
       keymap: _keymaps.indent
     })
   }), (0, _react.jsx)("span", {

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

@@ -2,8 +2,6 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
-var _typeof = require("@babel/runtime/helpers/typeof");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -17,7 +15,7 @@ Object.defineProperty(exports, "typeAheadPluginKey", {
 
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 
-var _react = _interopRequireWildcard(require("react"));
+var _react = _interopRequireDefault(require("react"));
 
 var _typeAhead = require("@atlaskit/editor-common/type-ahead");
 
@@ -45,10 +43,6 @@ var _statsModifier = require("./stats-modifier");
 
 var _analytics = require("../analytics");
 
-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; }
-
 /**
  *
  * Revamped typeahead using decorations instead of the `typeAheadQuery` mark
@@ -97,7 +91,7 @@ var TypeAheadMenu = /*#__PURE__*/_react.default.memo(function (_ref) {
     });
   }, [onItemInsert, query]);
 
-  var cancel = (0, _react.useCallback)(function (_ref3) {
+  var cancel = _react.default.useCallback(function (_ref3) {
     var setSelectionAt = _ref3.setSelectionAt,
         addPrefixTrigger = _ref3.addPrefixTrigger,
         forceFocusOnEditor = _ref3.forceFocusOnEditor;