@atlaskit/editor-core 153.1.4 → 156.0.0

package/dist/esm/plugins/hyperlink/pm-plugins/main.js

@@ -4,7 +4,8 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
-import { Plugin, PluginKey, TextSelection } from 'prosemirror-state';
+import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import { PluginKey, TextSelection } from 'prosemirror-state';
 import uuid from 'uuid';
 import { shallowEqual } from '../../../utils';
 export var LinkAction;
@@ -225,7 +226,7 @@ var getActiveText = function getActiveText(selection) {
 
 export var stateKey = new PluginKey('hyperlinkPlugin');
 export var plugin = function plugin(dispatch) {
-  return new Plugin({
+  return new SafePlugin({
     state: {
       init: function init(_, state) {
         var canInsertLink = canLinkBeCreatedInRange(state.selection.from, state.selection.to)(state);
@@ -236,7 +237,7 @@ export var plugin = function plugin(dispatch) {
           activeLinkMark: toState(undefined, LinkAction.SELECTION_CHANGE, state)
         };
       },
-      apply: function apply(tr, pluginState, _oldState, newState) {
+      apply: function apply(tr, pluginState, oldState, newState) {
         var state = pluginState;
         var action = tr.getMeta(stateKey) && tr.getMeta(stateKey).type;
         var inputMethod = tr.getMeta(stateKey) && tr.getMeta(stateKey).inputMethod;
@@ -267,7 +268,9 @@ export var plugin = function plugin(dispatch) {
           }, stateForAnalytics);
         }
 
-        if (tr.selectionSet) {
+        var hasPositionChanged = oldState.selection.from !== newState.selection.from || oldState.selection.to !== newState.selection.to;
+
+        if (tr.selectionSet && hasPositionChanged) {
           state = {
             activeText: getActiveText(newState.selection),
             canInsertLink: canLinkBeCreatedInRange(newState.selection.from, newState.selection.to)(newState),
@@ -285,6 +288,46 @@ export var plugin = function plugin(dispatch) {
         return state;
       }
     },
-    key: stateKey
+    key: stateKey,
+    props: {
+      handleDOMEvents: {
+        mouseup: function mouseup(_, event) {
+          // this prevents redundant selection transaction when clicking on link
+          // link state will be update on slection change which happens on mousedown
+          if (isLinkDirectTarget(event)) {
+            event.preventDefault();
+            return true;
+          }
+
+          return false;
+        },
+        mousedown: function mousedown(view, event) {
+          // since link clicks are disallowed by browsers inside contenteditable
+          // so we need to handle shift+click selection ourselves in this case
+          if (!event.shiftKey || !isLinkDirectTarget(event)) {
+            return false;
+          }
+
+          var state = view.state;
+          var $anchor = state.selection.$anchor;
+          var newPosition = view.posAtCoords({
+            left: event.clientX,
+            top: event.clientY
+          });
+
+          if ((newPosition === null || newPosition === void 0 ? void 0 : newPosition.pos) != null && newPosition.pos !== $anchor.pos) {
+            var tr = state.tr.setSelection(TextSelection.create(state.doc, $anchor.pos, newPosition.pos));
+            view.dispatch(tr);
+            return true;
+          }
+
+          return false;
+        }
+      }
+    }
   });
-};
+};
+
+function isLinkDirectTarget(event) {
+  return (event === null || event === void 0 ? void 0 : event.target) instanceof HTMLElement && event.target.tagName === 'A';
+}

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

@@ -2,8 +2,9 @@ import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral
 
 var _templateObject, _templateObject2, _templateObject3;
 
+/* eslint-disable @atlaskit/design-system/use-visually-hidden */
 import styled, { css } from 'styled-components';
-import { linkSharedStyle } from '@atlaskit/editor-common';
+import { linkSharedStyle } from '@atlaskit/editor-common/styles';
 export var linkStyles = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  .ProseMirror {\n    ", "\n  }\n"])), linkSharedStyle);
 /**
  * Visible only to screenreaders. Use when there is a need

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

@@ -41,8 +41,11 @@ import { mapContentTypeToIcon, sha1, wordCount } from './utils';
 import { hideLinkToolbar } from '../../commands';
 import { hideLinkToolbar as cardHideLinkToolbar } from '../../../card/pm-plugins/actions';
 import { ScreenReaderText } from '../../styles';
+import { browser } from '@atlaskit/editor-common/utils';
+import { transformTimeStamp } from '../../../../ui/LinkSearch/transformTimeStamp';
+import Announcer from '../../../../utils/announcer/announcer';
 export var RECENT_SEARCH_LIST_SIZE = 5;
-var ClearText = styled.span(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  cursor: pointer;\n  padding-right: 8px;\n  color: ", ";\n"])), N90);
+var ClearText = styled.button(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  cursor: pointer;\n  padding: 0;\n  margin-right: 8px;\n  color: ", ";\n  background: transparent;\n  border: none;\n"])), N90);
 var TextInputWrapper = styled.div(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  ", ";\n  border-top: 1px solid ", ";\n  border-bottom: 1px solid ", ";\n"])), InputWrapper, N30, N30);
 var IconWrapper = styled.span(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  color: ", ";\n  padding: 4px 8px;\n  width: 18px;\n"])), N80);
 export var messages = defineMessages({
@@ -70,6 +73,11 @@ export var messages = 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'
   }
 });
 var defaultIcon = /*#__PURE__*/React.createElement(Page16Icon, {
@@ -423,6 +431,23 @@ export var HyperlinkLinkAddToolbar = /*#__PURE__*/function (_PureComponent) {
       }
     });
 
+    _defineProperty(_assertThisInitialized(_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 = 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) || '');
+      }
+    });
+
     _defineProperty(_assertThisInitialized(_this), "isUrlPopulatedWithSelectedItem", function () {
       /**
        * When we use ArrowKey to navigate through result items,
@@ -433,10 +458,10 @@ export 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) {
@@ -454,10 +479,10 @@ export 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;
@@ -503,9 +528,9 @@ export var HyperlinkLinkAddToolbar = /*#__PURE__*/function (_PureComponent) {
     });
 
     _defineProperty(_assertThisInitialized(_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
@@ -518,10 +543,10 @@ export var HyperlinkLinkAddToolbar = /*#__PURE__*/function (_PureComponent) {
     });
 
     _defineProperty(_assertThisInitialized(_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()) {
@@ -535,15 +560,15 @@ export var HyperlinkLinkAddToolbar = /*#__PURE__*/function (_PureComponent) {
       }
     });
 
-    _defineProperty(_assertThisInitialized(_this), "handleTextKeyDown", function (event) {
+    _defineProperty(_assertThisInitialized(_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 = normalizeUrl(displayUrl);
 
           _this.handleInsert(url, _displayText || displayUrl, INPUT_METHOD.MANUAL, 'notselected');
@@ -552,14 +577,12 @@ export var HyperlinkLinkAddToolbar = /*#__PURE__*/function (_PureComponent) {
         event.preventDefault();
         return;
       }
-
-      _this.handleKeyDown(event);
     });
 
     _defineProperty(_assertThisInitialized(_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;
@@ -837,13 +860,13 @@ export var HyperlinkLinkAddToolbar = /*#__PURE__*/function (_PureComponent) {
     key: "loadInitialLinkSearchResult",
     value: function () {
       var _loadInitialLinkSearchResult = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6() {
-        var _this$state9, displayUrl, activityProvider, _items3;
+        var _this$state10, displayUrl, activityProvider, _items3;
 
         return _regeneratorRuntime.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)) {
@@ -889,12 +912,12 @@ export 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;
@@ -903,6 +926,12 @@ export 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 = browser.safari && this.getScreenReaderText();
       return /*#__PURE__*/React.createElement("div", {
         className: "recent-list"
       }, /*#__PURE__*/React.createElement(Container, {
@@ -912,10 +941,20 @@ export var HyperlinkLinkAddToolbar = /*#__PURE__*/function (_PureComponent) {
         content: formatLinkAddressText
       }, /*#__PURE__*/React.createElement(LinkIcon, {
         label: formatLinkAddressText
-      }))), /*#__PURE__*/React.createElement(ScreenReaderText, {
+      }))), screenReaderText && /*#__PURE__*/React.createElement(Announcer, {
+        ariaLive: "assertive",
+        text: screenReaderText,
+        ariaRelevant: "additions",
+        delay: 250
+      }), /*#__PURE__*/React.createElement(ScreenReaderText, {
         "aria-hidden": "true",
         id: screenReaderDescriptionId
       }, formatMessage(messages.searchLinkAriaDescription)), /*#__PURE__*/React.createElement(PanelTextInput, {
+        role: "combobox",
+        ariaExpanded: true,
+        ariaActiveDescendant: ariaActiveDescendant,
+        ariaControls: linkSearchListId,
+        ariaAutoComplete: true,
         describedById: screenReaderDescriptionId,
         ref: function ref(ele) {
           return _this2.urlInputContainer = ele;
@@ -945,26 +984,30 @@ export 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.createElement(Tooltip, {
         content: formatMessage(messages.clearText)
       }, /*#__PURE__*/React.createElement(ClearText, {
-        onClick: this.handleClearDisplayText
+        onClick: this.handleClearDisplayText,
+        onKeyDown: this.handleClearTextKeyDown
       }, /*#__PURE__*/React.createElement(CrossCircleIcon, {
         label: formatMessage(messages.clearText)
       })))), /*#__PURE__*/React.createElement(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.createElement(LinkSearchList, {
         ariaControls: "fabric.editor.hyperlink.suggested.results",
+        id: linkSearchListId,
+        role: "listbox",
         items: items,
         isLoading: isLoading,
         selectedIndex: selectedIndex,

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

@@ -9,7 +9,7 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
 import React from 'react';
-import { WithProviders } from '@atlaskit/editor-common';
+import { WithProviders } from '@atlaskit/editor-common/provider-factory';
 import HyperlinkAddToolbarComp from './HyperlinkAddToolbar';
 import { stateKey as pluginKey } from '../../pm-plugins/main';
 import WithPluginState from '../../../../ui/WithPluginState';

package/dist/esm/plugins/hyperlink/ui/HyperlinkAddToolbar/messages.js

@@ -0,0 +1,33 @@
+import { defineMessages } from 'react-intl-next';
+export var utilMessages = 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'
+  }
+});

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

@@ -6,25 +6,64 @@ import Story16Icon from '@atlaskit/icon-object/glyph/story/16';
 import Task16Icon from '@atlaskit/icon-object/glyph/task/16';
 import Page16Icon from '@atlaskit/icon-object/glyph/page/16';
 import Blog16Icon from '@atlaskit/icon-object/glyph/blog/16';
+import { injectIntl } from 'react-intl-next';
+import { utilMessages } from './messages';
+
+var Issue16 = function Issue16(props) {
+  var intl = props.intl;
+  return /*#__PURE__*/React.createElement(Issue16Icon, {
+    label: intl.formatMessage(utilMessages.hyperlinkIconIssueLabel)
+  });
+};
+
+var Bug16 = function Bug16(props) {
+  var intl = props.intl;
+  return /*#__PURE__*/React.createElement(Bug16Icon, {
+    label: intl.formatMessage(utilMessages.hyperlinkIconBugLabel)
+  });
+};
+
+var Story16 = function Story16(props) {
+  var intl = props.intl;
+  return /*#__PURE__*/React.createElement(Story16Icon, {
+    label: intl.formatMessage(utilMessages.hyperlinkIconStoryLabel)
+  });
+};
+
+var Task16 = function Task16(props) {
+  var intl = props.intl;
+  return /*#__PURE__*/React.createElement(Task16Icon, {
+    label: intl.formatMessage(utilMessages.hyperlinkIconTaskLabel)
+  });
+};
+
+var Page16 = function Page16(props) {
+  var intl = props.intl;
+  return /*#__PURE__*/React.createElement(Page16Icon, {
+    label: intl.formatMessage(utilMessages.hyperlinkIconPageLabel)
+  });
+};
+
+var Blog16 = function Blog16(props) {
+  var intl = props.intl;
+  return /*#__PURE__*/React.createElement(Blog16Icon, {
+    label: intl.formatMessage(utilMessages.hyperlinkIconBlogLabel)
+  });
+};
+
+var IntlIssue16Icon = injectIntl(Issue16);
+var IntlBug16Icon = injectIntl(Bug16);
+var IntlStory16Icon = injectIntl(Story16);
+var IntlTask16Icon = injectIntl(Task16);
+var IntlPage16Icon = injectIntl(Page16);
+var IntlBlog16Icon = injectIntl(Blog16);
 export var mapContentTypeToIcon = {
-  'jira.issue': /*#__PURE__*/React.createElement(Issue16Icon, {
-    label: "Issue"
-  }),
-  'jira.issue.bug': /*#__PURE__*/React.createElement(Bug16Icon, {
-    label: "Bug"
-  }),
-  'jira.issue.story': /*#__PURE__*/React.createElement(Story16Icon, {
-    label: "Story"
-  }),
-  'jira.issue.task': /*#__PURE__*/React.createElement(Task16Icon, {
-    label: "Task"
-  }),
-  'confluence.page': /*#__PURE__*/React.createElement(Page16Icon, {
-    label: "Page"
-  }),
-  'confluence.blogpost': /*#__PURE__*/React.createElement(Blog16Icon, {
-    label: "Blog"
-  })
+  'jira.issue': /*#__PURE__*/React.createElement(IntlIssue16Icon, null),
+  'jira.issue.bug': /*#__PURE__*/React.createElement(IntlBug16Icon, null),
+  'jira.issue.story': /*#__PURE__*/React.createElement(IntlStory16Icon, null),
+  'jira.issue.task': /*#__PURE__*/React.createElement(IntlTask16Icon, null),
+  'confluence.page': /*#__PURE__*/React.createElement(IntlPage16Icon, null),
+  'confluence.blogpost': /*#__PURE__*/React.createElement(IntlBlog16Icon, null)
 };
 export var sha1 = function sha1(input) {
   return Rusha.createHash().update(input).digest('hex');

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

@@ -86,6 +86,10 @@ export 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/esm/plugins/image-upload/pm-plugins/main.js

@@ -6,7 +6,7 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
-import { Plugin } from 'prosemirror-state';
+import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { isPastedFile } from '../../../utils/clipboard';
 import { isDroppedFile } from '../../../utils/drag-drop';
 import { canInsertMedia, isMediaSelected } from '../utils';
@@ -42,7 +42,7 @@ export var createPlugin = function createPlugin(_ref) {
   var dispatch = _ref.dispatch,
       providerFactory = _ref.providerFactory;
   var uploadHandler;
-  return new Plugin({
+  return new SafePlugin({
     state: {
       init: function init(_config, state) {
         return {

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

@@ -1,5 +1,5 @@
 import React from 'react';
-import { WithProviders } from '@atlaskit/editor-common';
+import { WithProviders } from '@atlaskit/editor-common/provider-factory';
 import { pluginKey as blockTypeStateKey } from '../block-type/pm-plugins/main';
 import { stateKey as mediaStateKey } from '../media/pm-plugins/plugin-key';
 import { stateKey as hyperlinkPluginKey } from '../hyperlink/pm-plugins/main';

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

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Popup } from '@atlaskit/editor-common';
+import { Popup } from '@atlaskit/editor-common/ui';
 import InsertMenu from '../../../../ui/ElementBrowser/InsertMenu';
 import { DropDownButton } from './dropdown-button';
 export var BlockInsertElementBrowser = function BlockInsertElementBrowser(props) {
@@ -17,6 +17,8 @@ export var BlockInsertElementBrowser = function BlockInsertElementBrowser(props)
     onInsert: props.onInsert,
     toggleVisiblity: props.togglePlusMenuVisibility
   })), /*#__PURE__*/React.createElement(DropDownButton, {
+    "aria-expanded": props.open,
+    "aria-haspopup": true,
     handleRef: props.onRef,
     selected: props.open,
     disabled: props.disabled,

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

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

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

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

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

@@ -74,7 +74,8 @@ var createInsertBlockItems = function createInsertBlockItems(config) {
     items.push(link({
       content: formatMessage(messages.link),
       tooltipDescription: formatMessage(messages.linkDescription),
-      disabled: !!linkDisabled
+      disabled: !!linkDisabled,
+      'aria-haspopup': 'dialog'
     }));
   }
 
@@ -97,7 +98,8 @@ var createInsertBlockItems = function createInsertBlockItems(config) {
     items.push(mention({
       content: formatMessage(messages.mention),
       tooltipDescription: formatMessage(messages.mentionDescription),
-      disabled: !isTypeAheadAllowed
+      disabled: !isTypeAheadAllowed,
+      'aria-haspopup': 'listbox'
     }));
   }
 
@@ -105,7 +107,8 @@ var createInsertBlockItems = function createInsertBlockItems(config) {
     items.push(emoji({
       content: formatMessage(messages.emoji),
       tooltipDescription: formatMessage(messages.emojiDescription),
-      disabled: emojiDisabled || !isTypeAheadAllowed
+      disabled: emojiDisabled || !isTypeAheadAllowed,
+      'aria-haspopup': 'dialog'
     }));
   }
 

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

@@ -19,8 +19,11 @@ export var DropDownButton = /*#__PURE__*/React.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.createElement(DropDownButtonIcon, {
-      label: props.label
+      label: ""
     }),
     title: /*#__PURE__*/React.createElement(ToolTipContent, {
       description: props.label,

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

@@ -19,7 +19,7 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import { injectIntl } from 'react-intl-next';
 import { EmojiPicker as AkEmojiPicker } from '@atlaskit/emoji/picker';
-import { Popup } from '@atlaskit/editor-common';
+import { Popup } from '@atlaskit/editor-common/ui';
 import ToolbarButton from '../../../../ui/ToolbarButton';
 import { Separator, ButtonGroup, Wrapper } from '../../../../ui/styles';
 import { createTable } from '../../../table/commands';
@@ -521,6 +521,8 @@ export 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.createElement(Wrapper, null, this.renderPopup(), /*#__PURE__*/React.createElement(BlockInsertMenu, {

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

@@ -32,6 +32,8 @@ var from = function from(init) {
       label: init.content
     }),
     elemAfter: init.shortcut ? /*#__PURE__*/React.createElement(Shortcut, null, init.shortcut) : undefined,
+    'aria-label': init.content,
+    'aria-haspopup': init['aria-haspopup'],
     shortcut: init.shortcut,
     isDisabled: init.disabled
   };
@@ -58,7 +60,8 @@ export var link = mem(function (init) {
     disabled: init.disabled,
     name: 'link',
     shortcut: tooltip(addLink),
-    Icon: LinkIcon
+    Icon: LinkIcon,
+    'aria-haspopup': init['aria-haspopup']
   });
 });
 export var media = mem(function (init) {
@@ -86,7 +89,8 @@ export var mention = mem(function (init) {
     disabled: init.disabled,
     name: 'mention',
     Icon: MentionIcon,
-    shortcut: '@'
+    shortcut: '@',
+    'aria-haspopup': init['aria-haspopup']
   });
 });
 export var emoji = mem(function (init) {
@@ -96,7 +100,8 @@ export var emoji = mem(function (init) {
     disabled: init.disabled,
     name: 'emoji',
     Icon: EmojiIcon,
-    shortcut: ':'
+    shortcut: ':',
+    'aria-haspopup': init['aria-haspopup']
   });
 });
 export var table = mem(function (init) {