@atlaskit/editor-core 153.1.4 → 156.0.0

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);
 
@@ -123,6 +129,11 @@ var messages = (0, _reactIntlNext.defineMessages)({
     id: 'fabric.editor.hyperlink.searchLinkResults',
     defaultMessage: '{count, plural, =0 {no results} one {# result} other {# results}} found',
     description: 'Announce search results for screen-reader users.'
+  },
+  linkAriaLabel: {
+    id: 'fabric.editor.hyperlink.linkAriaLabel',
+    defaultMessage: 'Link label',
+    description: 'aria label for a link'
   }
 });
 exports.messages = messages;
@@ -464,6 +475,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 +501,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 +520,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 +567,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 +581,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 +597,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 +614,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 +893,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 +945,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 +959,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 +974,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;
@@ -976,26 +1017,30 @@ var HyperlinkLinkAddToolbar = /*#__PURE__*/function (_PureComponent) {
           return _this2.displayTextInputContainer = ele;
         },
         placeholder: formatDisplayText,
-        ariaLabel: 'Link label',
+        ariaLabel: formatMessage(messages.linkAriaLabel),
         testId: 'link-label',
         onChange: this.updateTextInput,
         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/hyperlink/ui/HyperlinkAddToolbar/messages.js

@@ -0,0 +1,42 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.utilMessages = void 0;
+
+var _reactIntlNext = require("react-intl-next");
+
+var utilMessages = (0, _reactIntlNext.defineMessages)({
+  hyperlinkIconIssueLabel: {
+    id: 'fabric.editor.headingLink.hyperlinkIconIssueLabel',
+    defaultMessage: 'Issue',
+    description: 'icon label for a jira issue'
+  },
+  hyperlinkIconBugLabel: {
+    id: 'fabric.editor.headingLink.hyperlinkIconBugLabel',
+    defaultMessage: 'Bug',
+    description: 'icon label for a jira bug'
+  },
+  hyperlinkIconStoryLabel: {
+    id: 'fabric.editor.headingLink.hyperlinkIconStoryLabel',
+    defaultMessage: 'Story',
+    description: 'icon label for a jira story'
+  },
+  hyperlinkIconTaskLabel: {
+    id: 'fabric.editor.headingLink.hyperlinkIconTaskLabel',
+    defaultMessage: 'Task',
+    description: 'icon label for a jira task'
+  },
+  hyperlinkIconPageLabel: {
+    id: 'fabric.editor.headingLink.hyperlinkIconPageLabel',
+    defaultMessage: 'Page',
+    description: 'icon label for a confluence page'
+  },
+  hyperlinkIconBlogLabel: {
+    id: 'fabric.editor.headingLink.hyperlinkIconBlogLabel',
+    defaultMessage: 'Blog',
+    description: 'icon label for a confluence blog'
+  }
+});
+exports.utilMessages = utilMessages;

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

@@ -23,25 +23,65 @@ var _5 = _interopRequireDefault(require("@atlaskit/icon-object/glyph/page/16"));
 
 var _6 = _interopRequireDefault(require("@atlaskit/icon-object/glyph/blog/16"));
 
+var _reactIntlNext = require("react-intl-next");
+
+var _messages = require("./messages");
+
+var Issue16 = function Issue16(props) {
+  var intl = props.intl;
+  return /*#__PURE__*/_react.default.createElement(_.default, {
+    label: intl.formatMessage(_messages.utilMessages.hyperlinkIconIssueLabel)
+  });
+};
+
+var Bug16 = function Bug16(props) {
+  var intl = props.intl;
+  return /*#__PURE__*/_react.default.createElement(_2.default, {
+    label: intl.formatMessage(_messages.utilMessages.hyperlinkIconBugLabel)
+  });
+};
+
+var Story16 = function Story16(props) {
+  var intl = props.intl;
+  return /*#__PURE__*/_react.default.createElement(_3.default, {
+    label: intl.formatMessage(_messages.utilMessages.hyperlinkIconStoryLabel)
+  });
+};
+
+var Task16 = function Task16(props) {
+  var intl = props.intl;
+  return /*#__PURE__*/_react.default.createElement(_4.default, {
+    label: intl.formatMessage(_messages.utilMessages.hyperlinkIconTaskLabel)
+  });
+};
+
+var Page16 = function Page16(props) {
+  var intl = props.intl;
+  return /*#__PURE__*/_react.default.createElement(_5.default, {
+    label: intl.formatMessage(_messages.utilMessages.hyperlinkIconPageLabel)
+  });
+};
+
+var Blog16 = function Blog16(props) {
+  var intl = props.intl;
+  return /*#__PURE__*/_react.default.createElement(_6.default, {
+    label: intl.formatMessage(_messages.utilMessages.hyperlinkIconBlogLabel)
+  });
+};
+
+var IntlIssue16Icon = (0, _reactIntlNext.injectIntl)(Issue16);
+var IntlBug16Icon = (0, _reactIntlNext.injectIntl)(Bug16);
+var IntlStory16Icon = (0, _reactIntlNext.injectIntl)(Story16);
+var IntlTask16Icon = (0, _reactIntlNext.injectIntl)(Task16);
+var IntlPage16Icon = (0, _reactIntlNext.injectIntl)(Page16);
+var IntlBlog16Icon = (0, _reactIntlNext.injectIntl)(Blog16);
 var mapContentTypeToIcon = {
-  'jira.issue': /*#__PURE__*/_react.default.createElement(_.default, {
-    label: "Issue"
-  }),
-  'jira.issue.bug': /*#__PURE__*/_react.default.createElement(_2.default, {
-    label: "Bug"
-  }),
-  'jira.issue.story': /*#__PURE__*/_react.default.createElement(_3.default, {
-    label: "Story"
-  }),
-  'jira.issue.task': /*#__PURE__*/_react.default.createElement(_4.default, {
-    label: "Task"
-  }),
-  'confluence.page': /*#__PURE__*/_react.default.createElement(_5.default, {
-    label: "Page"
-  }),
-  'confluence.blogpost': /*#__PURE__*/_react.default.createElement(_6.default, {
-    label: "Blog"
-  })
+  'jira.issue': /*#__PURE__*/_react.default.createElement(IntlIssue16Icon, null),
+  'jira.issue.bug': /*#__PURE__*/_react.default.createElement(IntlBug16Icon, null),
+  'jira.issue.story': /*#__PURE__*/_react.default.createElement(IntlStory16Icon, null),
+  'jira.issue.task': /*#__PURE__*/_react.default.createElement(IntlTask16Icon, null),
+  'confluence.page': /*#__PURE__*/_react.default.createElement(IntlPage16Icon, null),
+  'confluence.blogpost': /*#__PURE__*/_react.default.createElement(IntlBlog16Icon, null)
 };
 exports.mapContentTypeToIcon = mapContentTypeToIcon;
 

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

@@ -104,6 +104,10 @@ function linkifyContent(schema) {
       var isAllowedInParent = !parent || parent.type !== schema.nodes.codeBlock;
       var link = node.type.schema.marks.link;
 
+      if (link === undefined) {
+        throw new Error('Link not in schema - unable to linkify content');
+      }
+
       if (isAllowedInParent && node.isText && !link.isInSet(node.marks)) {
         var linkified = [];
         var text = node.text;

package/dist/cjs/plugins/image-upload/pm-plugins/main.js

@@ -13,7 +13,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
-var _prosemirrorState = require("prosemirror-state");
+var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 
 var _clipboard = require("../../../utils/clipboard");
 
@@ -58,7 +58,7 @@ var createPlugin = function createPlugin(_ref) {
   var dispatch = _ref.dispatch,
       providerFactory = _ref.providerFactory;
   var uploadHandler;
-  return new _prosemirrorState.Plugin({
+  return new _safePlugin.SafePlugin({
     state: {
       init: function init(_config, state) {
         return {

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, {

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

@@ -62,6 +62,8 @@ var from = function from(init) {
       label: init.content
     }),
     elemAfter: init.shortcut ? /*#__PURE__*/_react.default.createElement(_styles.Shortcut, null, init.shortcut) : undefined,
+    'aria-label': init.content,
+    'aria-haspopup': init['aria-haspopup'],
     shortcut: init.shortcut,
     isDisabled: init.disabled
   };
@@ -89,7 +91,8 @@ var link = mem(function (init) {
     disabled: init.disabled,
     name: 'link',
     shortcut: (0, _keymaps.tooltip)(_keymaps.addLink),
-    Icon: _link.default
+    Icon: _link.default,
+    'aria-haspopup': init['aria-haspopup']
   });
 });
 exports.link = link;
@@ -120,7 +123,8 @@ var mention = mem(function (init) {
     disabled: init.disabled,
     name: 'mention',
     Icon: _mention.default,
-    shortcut: '@'
+    shortcut: '@',
+    'aria-haspopup': init['aria-haspopup']
   });
 });
 exports.mention = mention;
@@ -131,7 +135,8 @@ var emoji = mem(function (init) {
     disabled: init.disabled,
     name: 'emoji',
     Icon: _emoji.default,
-    shortcut: ':'
+    shortcut: ':',
+    'aria-haspopup': init['aria-haspopup']
   });
 });
 exports.emoji = emoji;

package/dist/cjs/plugins/jira-issue/index.js

@@ -7,6 +7,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.pluginKey = exports.default = void 0;
 
+var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
+
 var _prosemirrorState = require("prosemirror-state");
 
 var _adfSchema = require("@atlaskit/adf-schema");
@@ -21,7 +23,7 @@ exports.pluginKey = pluginKey;
 var createPlugin = function createPlugin(_ref) {
   var portalProviderAPI = _ref.portalProviderAPI,
       eventDispatcher = _ref.eventDispatcher;
-  return new _prosemirrorState.Plugin({
+  return new _safePlugin.SafePlugin({
     key: pluginKey,
     props: {
       nodeViews: {

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

@@ -9,6 +9,8 @@ exports.default = exports.DEFAULT_LAYOUT = void 0;
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
+var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
+
 var _prosemirrorState = require("prosemirror-state");
 
 var _prosemirrorView = require("prosemirror-view");
@@ -89,7 +91,7 @@ var getInitialPluginState = function getInitialPluginState(options, state) {
 };
 
 var _default = function _default(options) {
-  return new _prosemirrorState.Plugin({
+  return new _safePlugin.SafePlugin({
     key: _pluginKey.pluginKey,
     state: {
       init: function init(_, state) {