@atlaskit/editor-core 153.1.4 → 153.1.5

package/dist/cjs/plugins/fragment/pm-plugins/fragment-consistency.js

@@ -0,0 +1,157 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createPlugin = void 0;
+
+var _prosemirrorState = require("prosemirror-state");
+
+var _adfSchema = require("@atlaskit/adf-schema");
+
+var _step = require("../../../utils/step");
+
+/**
+ * This plugin ensures that certain nodes (such as tables, and various extension ones)
+ * have a unique `localId` attribute value for `fragment` marks.
+ * It also ensures the preservation of these IDs when nodes are being cut-and-pasted
+ * around the document.
+ *
+ * The implementation has been _heavily_ borrowed from
+ * - packages/editor/editor-core/src/plugins/table/pm-plugins/table-local-id.ts
+ */
+var pluginKey = new _prosemirrorState.PluginKey('fragmentMarkConsistencyPlugin');
+/**
+ * Traverses a transaction's steps to see if we're inserting a node which supports a fragment mark
+ */
+
+var checkIsAddingSupportedNode = function checkIsAddingSupportedNode(schema, transaction) {
+  var nodesSupportingFragmentMark = getNodesSupportingFragmentMark(schema);
+  return transaction.steps.some(function (step) {
+    return nodesSupportingFragmentMark.some(function (nodeType) {
+      return (0, _step.stepAddsOneOf)(step, new Set([nodeType]));
+    });
+  });
+};
+
+var getNodesSupportingFragmentMark = function getNodesSupportingFragmentMark(schema) {
+  var _schema$nodes = schema.nodes,
+      table = _schema$nodes.table,
+      extension = _schema$nodes.extension,
+      bodiedExtension = _schema$nodes.bodiedExtension,
+      inlineExtension = _schema$nodes.inlineExtension;
+  return [table, extension, bodiedExtension, inlineExtension];
+};
+
+var regenerateFragmentIdIfNeeded = function regenerateFragmentIdIfNeeded(_ref) {
+  var transaction = _ref.transaction,
+      schema = _ref.schema,
+      doc = _ref.doc,
+      shouldRegenerateLocalId = _ref.shouldRegenerateLocalId;
+  var fragment = schema.marks.fragment;
+  var nodesSupportingFragmentMark = getNodesSupportingFragmentMark(schema);
+  var transactionChanged = false;
+  doc.descendants(function (node, pos) {
+    var isSupportedNode = nodesSupportingFragmentMark.some(function (supportedNode) {
+      return node.type === supportedNode;
+    });
+
+    if (!isSupportedNode) {
+      // continue traversing
+      return true;
+    }
+
+    var existingFragmentMark = node.marks.find(function (mark) {
+      return mark.type === fragment;
+    });
+
+    if (!existingFragmentMark) {
+      // continue traversing
+      return true;
+    }
+
+    if (shouldRegenerateLocalId(existingFragmentMark.attrs.localId)) {
+      transactionChanged = true;
+      transaction.setNodeMarkup(pos, undefined, node.attrs, node.marks.map(function (mark) {
+        if (mark.type === fragment) {
+          mark.attrs.localId = _adfSchema.uuid.generate();
+        }
+
+        return mark;
+      }));
+    }
+    /**
+     * Continue traversing, as we can encounter inline extension nodes pretty much anywhere
+     */
+
+
+    return true;
+  });
+  return {
+    transactionChanged: transactionChanged
+  };
+};
+/**
+ * Ensures presence of `fragment` mark on certain node types and the uniqueness of their `localId` attributes
+ */
+
+
+var createPlugin = function createPlugin(dispatch) {
+  return new _prosemirrorState.Plugin({
+    key: pluginKey,
+    appendTransaction: function appendTransaction(transactions, _oldState, newState) {
+      var modified = false;
+      var tr = newState.tr;
+      transactions.forEach(function (transaction) {
+        var fragmentLocalIdsObserved = new Set();
+
+        if (!transaction.docChanged) {
+          return;
+        } // Don't interfere with cut as it clashes with fixTables & we don't need
+        // to handle any extra cut cases in this plugin
+
+
+        var uiEvent = transaction.getMeta('uiEvent');
+
+        if (uiEvent === 'cut') {
+          return;
+        }
+        /** Check if we're actually inserting a supported node, otherwise we can ignore this tr */
+
+
+        var isAddingSupportedNode = checkIsAddingSupportedNode(newState.schema, transaction);
+
+        if (!isAddingSupportedNode) {
+          return;
+        }
+
+        var _regenerateFragmentId = regenerateFragmentIdIfNeeded({
+          doc: newState.doc,
+          schema: newState.schema,
+          transaction: tr,
+          shouldRegenerateLocalId: function shouldRegenerateLocalId(localId) {
+            if (fragmentLocalIdsObserved.has(localId)) {
+              return true;
+            }
+
+            fragmentLocalIdsObserved.add(localId);
+            return false;
+          }
+        }),
+            transactionChanged = _regenerateFragmentId.transactionChanged;
+
+        if (transactionChanged) {
+          modified = true;
+        }
+      });
+
+      if (modified) {
+        return tr;
+      }
+
+      return;
+    }
+  });
+};
+
+exports.createPlugin = createPlugin;

package/dist/cjs/plugins/help-dialog/ui/index.js

@@ -31,7 +31,7 @@ var _react = _interopRequireDefault(require("react"));
 
 var _reactIntlNext = require("react-intl-next");
 
-var _editorCommon = require("@atlaskit/editor-common");
+var _utils = require("@atlaskit/editor-common/utils");
 
 var _cross = _interopRequireDefault(require("@atlaskit/icon/glyph/cross"));
 
@@ -53,6 +53,8 @@ var _messages3 = require("../../block-type/messages");
 
 var _messages4 = require("../../undo-redo/messages");
 
+var _messages5 = require("../../../ui/Alignment/messages");
+
 var _commands = require("../commands");
 
 var _toolbar = require("../../annotation/toolbar");
@@ -144,6 +146,18 @@ var formatting = function formatting(_ref) {
     autoFormatting: function autoFormatting() {
       return /*#__PURE__*/_react.default.createElement("span", null, /*#__PURE__*/_react.default.createElement(_styles.CodeLg, null, "~~", /*#__PURE__*/_react.default.createElement(_reactIntlNext.FormattedMessage, _toolbarMessages.toolbarMessages.strike), "~~"));
     }
+  }, {
+    name: formatMessage(_toolbarMessages.toolbarMessages.subscript),
+    type: 'subsup',
+    keymap: function keymap() {
+      return keymaps.toggleSubscript;
+    }
+  }, {
+    name: formatMessage(_toolbarMessages.toolbarMessages.superscript),
+    type: 'subsup',
+    keymap: function keymap() {
+      return keymaps.toggleSuperscript;
+    }
   }, {
     name: formatMessage(_messages3.messages.heading1),
     type: 'heading',
@@ -288,6 +302,18 @@ var formatting = function formatting(_ref) {
     autoFormatting: function autoFormatting() {
       return /*#__PURE__*/_react.default.createElement("span", null, /*#__PURE__*/_react.default.createElement(_styles.CodeLg, null, "@"));
     }
+  }, {
+    name: formatMessage(_messages5.alignmentMessages.alignLeft),
+    type: 'alignment',
+    keymap: function keymap() {
+      return keymaps.alignLeft;
+    }
+  }, {
+    name: formatMessage(_messages5.alignmentMessages.alignRight),
+    type: 'alignment',
+    keymap: function keymap() {
+      return keymaps.alignRight;
+    }
   }];
 };
 
@@ -358,9 +384,9 @@ var getSupportedFormatting = function getSupportedFormatting(schema, intl, image
 exports.getSupportedFormatting = getSupportedFormatting;
 
 var getComponentFromKeymap = function getComponentFromKeymap(keymap) {
-  var shortcut = keymap[_editorCommon.browser.mac ? 'mac' : 'windows'];
+  var shortcut = keymap[_utils.browser.mac ? 'mac' : 'windows'];
 
-  if (_editorCommon.browser.mac) {
+  if (_utils.browser.mac) {
     shortcut = shortcut.replace('Alt', 'Opt');
   }
 
@@ -469,7 +495,7 @@ var HelpDialog = /*#__PURE__*/function (_React$Component) {
         onClose: this.closeDialog
       }, /*#__PURE__*/_react.default.createElement(ModalHeader, null), /*#__PURE__*/_react.default.createElement(_modalDialog.ModalBody, null, /*#__PURE__*/_react.default.createElement(_styles.ContentWrapper, null, /*#__PURE__*/_react.default.createElement(_styles.Line, null), /*#__PURE__*/_react.default.createElement(_styles.Content, null, /*#__PURE__*/_react.default.createElement(_styles.ColumnLeft, null, /*#__PURE__*/_react.default.createElement(_styles.Title, null, /*#__PURE__*/_react.default.createElement(_reactIntlNext.FormattedMessage, messages.keyboardShortcuts)), /*#__PURE__*/_react.default.createElement("div", null, this.formatting.filter(function (form) {
         var keymap = form.keymap && form.keymap(_this2.props);
-        return keymap && keymap[_editorCommon.browser.mac ? 'mac' : 'windows'];
+        return keymap && keymap[_utils.browser.mac ? 'mac' : 'windows'];
       }).map(function (form) {
         return /*#__PURE__*/_react.default.createElement(_styles.Row, {
           key: "textFormatting-".concat(form.name)

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

@@ -13,7 +13,7 @@ var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/hel
 
 var _styledComponents = _interopRequireWildcard(require("styled-components"));
 
-var _editorCommon = require("@atlaskit/editor-common");
+var _styles = require("@atlaskit/editor-common/styles");
 
 var _templateObject, _templateObject2, _templateObject3;
 
@@ -21,7 +21,7 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-var linkStyles = (0, _styledComponents.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  .ProseMirror {\n    ", "\n  }\n"])), _editorCommon.linkSharedStyle);
+var linkStyles = (0, _styledComponents.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  .ProseMirror {\n    ", "\n  }\n"])), _styles.linkSharedStyle);
 /**
  * Visible only to screenreaders. Use when there is a need
  * to provide more context to a non-sighted user.

package/dist/cjs/plugins/hyperlink/ui/HyperlinkAddToolbar/HyperlinkAddToolbar.js

@@ -79,6 +79,12 @@ var _actions = require("../../../card/pm-plugins/actions");
 
 var _styles = require("../../styles");
 
+var _utils3 = require("@atlaskit/editor-common/utils");
+
+var _transformTimeStamp = require("../../../../ui/LinkSearch/transformTimeStamp");
+
+var _announcer = _interopRequireDefault(require("../../../../utils/announcer/announcer"));
+
 var _templateObject, _templateObject2, _templateObject3;
 
 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); }
@@ -92,7 +98,7 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 var RECENT_SEARCH_LIST_SIZE = 5;
 exports.RECENT_SEARCH_LIST_SIZE = RECENT_SEARCH_LIST_SIZE;
 
-var ClearText = _styledComponents.default.span(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  cursor: pointer;\n  padding-right: 8px;\n  color: ", ";\n"])), _colors.N90);
+var ClearText = _styledComponents.default.button(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  cursor: pointer;\n  padding: 0;\n  margin-right: 8px;\n  color: ", ";\n  background: transparent;\n  border: none;\n"])), _colors.N90);
 
 var TextInputWrapper = _styledComponents.default.div(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n  ", ";\n  border-top: 1px solid ", ";\n  border-bottom: 1px solid ", ";\n"])), _ToolbarComponents.InputWrapper, _colors.N30, _colors.N30);
 
@@ -464,6 +470,22 @@ var HyperlinkLinkAddToolbar = /*#__PURE__*/function (_PureComponent) {
         (0, _commands.hideLinkToolbar)()(view.state, view.dispatch);
       }
     });
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "getScreenReaderText", function () {
+      var intl = _this.props.intl;
+      var _this$state3 = _this.state,
+          items = _this$state3.items,
+          selectedIndex = _this$state3.selectedIndex;
+
+      if (items.length && selectedIndex > -1) {
+        var _items$selectedIndex = items[selectedIndex],
+            name = _items$selectedIndex.name,
+            container = _items$selectedIndex.container,
+            lastUpdatedDate = _items$selectedIndex.lastUpdatedDate,
+            lastViewedDate = _items$selectedIndex.lastViewedDate;
+        var date = (0, _transformTimeStamp.transformTimeStamp)(intl, lastViewedDate, lastUpdatedDate);
+        return "".concat(name, ", ").concat(container, ", ").concat(date === null || date === void 0 ? void 0 : date.pageAction, " ").concat(date === null || date === void 0 ? void 0 : date.dateString, " ").concat((date === null || date === void 0 ? void 0 : date.timeSince) || '');
+      }
+    });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "isUrlPopulatedWithSelectedItem", function () {
       /**
        * When we use ArrowKey to navigate through result items,
@@ -474,10 +496,10 @@ var HyperlinkLinkAddToolbar = /*#__PURE__*/function (_PureComponent) {
        * It can be useful to detect whether we want to insert a
        * smartlink or a hyperlink with customized title
        */
-      var _this$state3 = _this.state,
-          items = _this$state3.items,
-          selectedIndex = _this$state3.selectedIndex,
-          displayUrl = _this$state3.displayUrl;
+      var _this$state4 = _this.state,
+          items = _this$state4.items,
+          selectedIndex = _this$state4.selectedIndex,
+          displayUrl = _this$state4.displayUrl;
       var selectedItem = items[selectedIndex];
 
       if (selectedItem && selectedItem.url === displayUrl) {
@@ -493,10 +515,10 @@ var HyperlinkLinkAddToolbar = /*#__PURE__*/function (_PureComponent) {
       var _this$props = _this.props,
           pluginState = _this$props.pluginState,
           onSubmit = _this$props.onSubmit;
-      var _this$state4 = _this.state,
-          items = _this$state4.items,
-          selectedIndex = _this$state4.selectedIndex,
-          displayText = _this$state4.displayText;
+      var _this$state5 = _this.state,
+          items = _this$state5.items,
+          selectedIndex = _this$state5.selectedIndex,
+          displayText = _this$state5.displayText;
 
       if (onSubmit) {
         _this.submitted = true;
@@ -540,9 +562,9 @@ var HyperlinkLinkAddToolbar = /*#__PURE__*/function (_PureComponent) {
       });
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "handleMouseLeaveResultItem", function (objectId) {
-      var _this$state5 = _this.state,
-          items = _this$state5.items,
-          selectedIndex = _this$state5.selectedIndex;
+      var _this$state6 = _this.state,
+          items = _this$state6.items,
+          selectedIndex = _this$state6.selectedIndex;
       var index = findIndex(items, function (item) {
         return item.objectId === objectId;
       }); // This is to avoid updating index that was set by other mouseenter event
@@ -554,10 +576,10 @@ var HyperlinkLinkAddToolbar = /*#__PURE__*/function (_PureComponent) {
       }
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "handleSubmit", function () {
-      var _this$state6 = _this.state,
-          displayUrl = _this$state6.displayUrl,
-          selectedIndex = _this$state6.selectedIndex,
-          items = _this$state6.items;
+      var _this$state7 = _this.state,
+          displayUrl = _this$state7.displayUrl,
+          selectedIndex = _this$state7.selectedIndex,
+          items = _this$state7.items;
       var selectedItem = items[selectedIndex];
 
       if (_this.isUrlPopulatedWithSelectedItem()) {
@@ -570,15 +592,15 @@ var HyperlinkLinkAddToolbar = /*#__PURE__*/function (_PureComponent) {
         }
       }
     });
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "handleTextKeyDown", function (event) {
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "handleClearTextKeyDown", function (event) {
       var KEY_CODE_TAB = 9;
       var keyCode = event.keyCode;
 
       if (keyCode === KEY_CODE_TAB) {
         if (!_this.submitted) {
-          var _this$state7 = _this.state,
-              displayUrl = _this$state7.displayUrl,
-              _displayText = _this$state7.displayText;
+          var _this$state8 = _this.state,
+              displayUrl = _this$state8.displayUrl,
+              _displayText = _this$state8.displayText;
           var url = (0, _utils.normalizeUrl)(displayUrl);
 
           _this.handleInsert(url, _displayText || displayUrl, _analytics.INPUT_METHOD.MANUAL, 'notselected');
@@ -587,13 +609,11 @@ var HyperlinkLinkAddToolbar = /*#__PURE__*/function (_PureComponent) {
         event.preventDefault();
         return;
       }
-
-      _this.handleKeyDown(event);
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "handleKeyDown", function (event) {
-      var _this$state8 = _this.state,
-          items = _this$state8.items,
-          selectedIndex = _this$state8.selectedIndex;
+      var _this$state9 = _this.state,
+          items = _this$state9.items,
+          selectedIndex = _this$state9.selectedIndex;
       var _this$props2 = _this.props,
           pluginState = _this$props2.pluginState,
           view = _this$props2.view;
@@ -868,13 +888,13 @@ var HyperlinkLinkAddToolbar = /*#__PURE__*/function (_PureComponent) {
     key: "loadInitialLinkSearchResult",
     value: function () {
       var _loadInitialLinkSearchResult = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee6() {
-        var _this$state9, displayUrl, activityProvider, _items3;
+        var _this$state10, displayUrl, activityProvider, _items3;
 
         return _regenerator.default.wrap(function _callee6$(_context6) {
           while (1) {
             switch (_context6.prev = _context6.next) {
               case 0:
-                _this$state9 = this.state, displayUrl = _this$state9.displayUrl, activityProvider = _this$state9.activityProvider;
+                _this$state10 = this.state, displayUrl = _this$state10.displayUrl, activityProvider = _this$state10.activityProvider;
                 _context6.prev = 1;
 
                 if (!(!displayUrl && activityProvider)) {
@@ -920,12 +940,12 @@ var HyperlinkLinkAddToolbar = /*#__PURE__*/function (_PureComponent) {
     value: function render() {
       var _this2 = this;
 
-      var _this$state10 = this.state,
-          items = _this$state10.items,
-          isLoading = _this$state10.isLoading,
-          selectedIndex = _this$state10.selectedIndex,
-          displayUrl = _this$state10.displayUrl,
-          displayText = _this$state10.displayText;
+      var _this$state11 = this.state,
+          items = _this$state11.items,
+          isLoading = _this$state11.isLoading,
+          selectedIndex = _this$state11.selectedIndex,
+          displayUrl = _this$state11.displayUrl,
+          displayText = _this$state11.displayText;
       var _this$props3 = this.props,
           formatMessage = _this$props3.intl.formatMessage,
           activityProvider = _this$props3.activityProvider;
@@ -934,6 +954,12 @@ var HyperlinkLinkAddToolbar = /*#__PURE__*/function (_PureComponent) {
       var formatClearLinkText = formatMessage(messages.clearLink);
       var formatDisplayText = formatMessage(messages.displayText);
       var screenReaderDescriptionId = 'search-recent-links-field-description';
+      var linkSearchListId = 'hyperlink-search-list';
+      var ariaActiveDescendant = selectedIndex > -1 ? "link-search-list-item-".concat(selectedIndex) : ''; // Added workaround with a screen reader Announcer specifically for VoiceOver + Safari
+      // as the Aria design pattern for combobox does not work in this case
+      // for details: https://a11y-internal.atlassian.net/browse/AK-740
+
+      var screenReaderText = _utils3.browser.safari && this.getScreenReaderText();
       return /*#__PURE__*/_react.default.createElement("div", {
         className: "recent-list"
       }, /*#__PURE__*/_react.default.createElement(_ToolbarComponents.Container, {
@@ -943,10 +969,20 @@ var HyperlinkLinkAddToolbar = /*#__PURE__*/function (_PureComponent) {
         content: formatLinkAddressText
       }, /*#__PURE__*/_react.default.createElement(_link.default, {
         label: formatLinkAddressText
-      }))), /*#__PURE__*/_react.default.createElement(_styles.ScreenReaderText, {
+      }))), screenReaderText && /*#__PURE__*/_react.default.createElement(_announcer.default, {
+        ariaLive: "assertive",
+        text: screenReaderText,
+        ariaRelevant: "additions",
+        delay: 250
+      }), /*#__PURE__*/_react.default.createElement(_styles.ScreenReaderText, {
         "aria-hidden": "true",
         id: screenReaderDescriptionId
       }, formatMessage(messages.searchLinkAriaDescription)), /*#__PURE__*/_react.default.createElement(_PanelTextInput.default, {
+        role: "combobox",
+        ariaExpanded: true,
+        ariaActiveDescendant: ariaActiveDescendant,
+        ariaControls: linkSearchListId,
+        ariaAutoComplete: true,
         describedById: screenReaderDescriptionId,
         ref: function ref(ele) {
           return _this2.urlInputContainer = ele;
@@ -982,20 +1018,24 @@ var HyperlinkLinkAddToolbar = /*#__PURE__*/function (_PureComponent) {
         onCancel: this.handleCancel,
         defaultValue: displayText,
         onSubmit: this.handleSubmit,
-        onKeyDown: this.handleTextKeyDown
+        onKeyDown: this.handleKeyDown
       }), displayText && /*#__PURE__*/_react.default.createElement(_tooltip.default, {
         content: formatMessage(messages.clearText)
       }, /*#__PURE__*/_react.default.createElement(ClearText, {
-        onClick: this.handleClearDisplayText
+        onClick: this.handleClearDisplayText,
+        onKeyDown: this.handleClearTextKeyDown
       }, /*#__PURE__*/_react.default.createElement(_crossCircle.default, {
         label: formatMessage(messages.clearText)
       })))), /*#__PURE__*/_react.default.createElement(_styles.ScreenReaderText, {
-        "aria-live": "assertive",
+        "aria-live": "polite",
+        "aria-atomic": "true",
         id: "fabric.editor.hyperlink.suggested.results"
       }, displayUrl && formatMessage(messages.searchLinkResults, {
         count: items.length
       })), /*#__PURE__*/_react.default.createElement(_LinkSearchList.default, {
         ariaControls: "fabric.editor.hyperlink.suggested.results",
+        id: linkSearchListId,
+        role: "listbox",
         items: items,
         isLoading: isLoading,
         selectedIndex: selectedIndex,

package/dist/cjs/plugins/hyperlink/ui/HyperlinkAddToolbar/index.js

@@ -19,7 +19,7 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
 
 var _react = _interopRequireDefault(require("react"));
 
-var _editorCommon = require("@atlaskit/editor-common");
+var _providerFactory = require("@atlaskit/editor-common/provider-factory");
 
 var _HyperlinkAddToolbar = _interopRequireDefault(require("./HyperlinkAddToolbar"));
 
@@ -50,7 +50,7 @@ var HyperlinkAddToolbar = /*#__PURE__*/function (_React$PureComponent) {
           displayUrl = _this$props.displayUrl,
           providerFactory = _this$props.providerFactory,
           view = _this$props.view;
-      return /*#__PURE__*/_react.default.createElement(_editorCommon.WithProviders, {
+      return /*#__PURE__*/_react.default.createElement(_providerFactory.WithProviders, {
         providers: ['activityProvider', 'searchProvider'],
         providerFactory: providerFactory,
         renderNode: function renderNode(_ref) {

package/dist/cjs/plugins/insert-block/index.js

@@ -9,7 +9,7 @@ exports.default = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _editorCommon = require("@atlaskit/editor-common");
+var _providerFactory = require("@atlaskit/editor-common/provider-factory");
 
 var _main = require("../block-type/pm-plugins/main");
 
@@ -162,7 +162,7 @@ var insertBlockPlugin = function insertBlockPlugin() {
         });
       };
 
-      return /*#__PURE__*/_react.default.createElement(_editorCommon.WithProviders, {
+      return /*#__PURE__*/_react.default.createElement(_providerFactory.WithProviders, {
         providerFactory: providerFactory,
         providers: ['emojiProvider'],
         renderNode: renderNode

package/dist/cjs/plugins/insert-block/ui/ToolbarInsertBlock/block-insert-element-browser.js

@@ -9,14 +9,14 @@ exports.BlockInsertElementBrowser = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _editorCommon = require("@atlaskit/editor-common");
+var _ui = require("@atlaskit/editor-common/ui");
 
 var _InsertMenu = _interopRequireDefault(require("../../../../ui/ElementBrowser/InsertMenu"));
 
 var _dropdownButton = require("./dropdown-button");
 
 var BlockInsertElementBrowser = function BlockInsertElementBrowser(props) {
-  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, props.open && /*#__PURE__*/_react.default.createElement(_editorCommon.Popup, {
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, props.open && /*#__PURE__*/_react.default.createElement(_ui.Popup, {
     target: props.plusButtonRef,
     fitHeight: 500,
     fitWidth: 350,
@@ -30,6 +30,8 @@ var BlockInsertElementBrowser = function BlockInsertElementBrowser(props) {
     onInsert: props.onInsert,
     toggleVisiblity: props.togglePlusMenuVisibility
   })), /*#__PURE__*/_react.default.createElement(_dropdownButton.DropDownButton, {
+    "aria-expanded": props.open,
+    "aria-haspopup": true,
     handleRef: props.onRef,
     selected: props.open,
     disabled: props.disabled,

package/dist/cjs/plugins/insert-block/ui/ToolbarInsertBlock/block-insert-menu-legacy.js

@@ -36,6 +36,8 @@ var BlockInsertMenuLegacy = function BlockInsertMenuLegacy(props) {
     fitWidth: 175,
     zIndex: _editorSharedStyles.akEditorMenuZIndex
   }, /*#__PURE__*/_react.default.createElement(_dropdownButton.DropDownButton, {
+    "aria-expanded": props.open,
+    "aria-haspopup": true,
     handleRef: props.onRef,
     selected: props.open,
     disabled: props.disabled,

package/dist/cjs/plugins/insert-block/ui/ToolbarInsertBlock/block-insert-menu.js

@@ -22,6 +22,8 @@ var BlockInsertMenu = function BlockInsertMenu(props) {
 
   if (props.disabled) {
     return /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_dropdownButton.DropDownButton, {
+      "aria-expanded": props.open,
+      "aria-haspopup": true,
       handleRef: props.onRef,
       selected: props.open,
       disabled: props.disabled,

package/dist/cjs/plugins/insert-block/ui/ToolbarInsertBlock/create-items.js

@@ -93,7 +93,8 @@ var createInsertBlockItems = function createInsertBlockItems(config) {
     items.push((0, _item.link)({
       content: formatMessage(_messages.messages.link),
       tooltipDescription: formatMessage(_messages.messages.linkDescription),
-      disabled: !!linkDisabled
+      disabled: !!linkDisabled,
+      'aria-haspopup': 'dialog'
     }));
   }
 
@@ -116,7 +117,8 @@ var createInsertBlockItems = function createInsertBlockItems(config) {
     items.push((0, _item.mention)({
       content: formatMessage(_messages.messages.mention),
       tooltipDescription: formatMessage(_messages.messages.mentionDescription),
-      disabled: !isTypeAheadAllowed
+      disabled: !isTypeAheadAllowed,
+      'aria-haspopup': 'listbox'
     }));
   }
 
@@ -124,7 +126,8 @@ var createInsertBlockItems = function createInsertBlockItems(config) {
     items.push((0, _item.emoji)({
       content: formatMessage(_messages.messages.emoji),
       tooltipDescription: formatMessage(_messages.messages.emojiDescription),
-      disabled: emojiDisabled || !isTypeAheadAllowed
+      disabled: emojiDisabled || !isTypeAheadAllowed,
+      'aria-haspopup': 'dialog'
     }));
   }
 

package/dist/cjs/plugins/insert-block/ui/ToolbarInsertBlock/dropdown-button.js

@@ -36,8 +36,11 @@ var DropDownButton = /*#__PURE__*/_react.default.memo(function (props) {
     disabled: props.disabled,
     onClick: props.onClick,
     spacing: props.spacing,
+    "aria-expanded": props['aria-expanded'],
+    "aria-haspopup": props['aria-haspopup'],
+    "aria-label": props.label,
     iconBefore: /*#__PURE__*/_react.default.createElement(DropDownButtonIcon, {
-      label: props.label
+      label: ""
     }),
     title: /*#__PURE__*/_react.default.createElement(_keymaps.ToolTipContent, {
       description: props.label,

package/dist/cjs/plugins/insert-block/ui/ToolbarInsertBlock/index.js

@@ -31,7 +31,7 @@ var _reactIntlNext = require("react-intl-next");
 
 var _picker = require("@atlaskit/emoji/picker");
 
-var _editorCommon = require("@atlaskit/editor-common");
+var _ui = require("@atlaskit/editor-common/ui");
 
 var _ToolbarButton = _interopRequireDefault(require("../../../../ui/ToolbarButton"));
 
@@ -489,7 +489,7 @@ var ToolbarInsertBlock = /*#__PURE__*/function (_React$PureComponent) {
         return null;
       }
 
-      return /*#__PURE__*/_react.default.createElement(_editorCommon.Popup, {
+      return /*#__PURE__*/_react.default.createElement(_ui.Popup, {
         target: ref,
         fitHeight: 350,
         fitWidth: 350,
@@ -534,6 +534,8 @@ var ToolbarInsertBlock = /*#__PURE__*/function (_React$PureComponent) {
           iconBefore: btn.elemBefore,
           selected: btn.isActive,
           title: btn.title,
+          "aria-label": btn['aria-label'],
+          "aria-haspopup": btn['aria-haspopup'],
           onItemClick: _this2.insertToolbarMenuItem
         });
       }), /*#__PURE__*/_react.default.createElement(_styles.Wrapper, null, this.renderPopup(), /*#__PURE__*/_react.default.createElement(_blockInsertMenu.BlockInsertMenu, {