@atlaskit/editor-core 153.1.3 → 155.0.0

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');
   }
 
@@ -466,10 +492,11 @@ var HelpDialog = /*#__PURE__*/function (_React$Component) {
       this.formatting = getSupportedFormatting(editorView.state.schema, intl, imageEnabled, quickInsertEnabled);
       return /*#__PURE__*/_react.default.createElement(_modalDialog.ModalTransition, null, this.props.isVisible ? /*#__PURE__*/_react.default.createElement(_modalDialog.default, {
         width: "large",
-        onClose: this.closeDialog
+        onClose: this.closeDialog,
+        testId: "help-modal-dialog"
       }, /*#__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/history/index.js

@@ -9,6 +9,8 @@ exports.historyPluginKey = exports.default = void 0;
 
 var _pluginStateFactory = require("../../utils/plugin-state-factory");
 
+var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
+
 var _prosemirrorState = require("prosemirror-state");
 
 var _reducer = _interopRequireDefault(require("./reducer"));
@@ -39,7 +41,7 @@ var _pluginFactory = (0, _pluginStateFactory.pluginFactory)(historyPluginKey, _r
     getPluginState = _pluginFactory.getPluginState;
 
 var createPlugin = function createPlugin(dispatch) {
-  return new _prosemirrorState.Plugin({
+  return new _safePlugin.SafePlugin({
     state: createPluginState(dispatch, getInitialState),
     key: historyPluginKey,
     appendTransaction: function appendTransaction(transactions, oldState, newState) {

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

@@ -35,9 +35,9 @@ var _analytics = require("../analytics");
 
 var _linkingUtils = require("../../utils/linking-utils");
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+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; }
 
 /* type guard for edit links */
 function isEditLink(linkMark) {
@@ -99,7 +99,8 @@ var getToolbarConfig = function getToolbarConfig(state, intl, providerFactory, c
           });
           var link = linkMark[0] && linkMark[0].attrs.href;
           var isValidUrl = (0, _adfSchema.isSafeUrl)(link);
-          var labelOpenLink = formatMessage(isValidUrl ? _messages.linkMessages.openLink : _messages.linkToolbarMessages.unableToOpenLink);
+          var labelOpenLink = formatMessage(isValidUrl ? _messages.linkMessages.openLink : _messages.linkToolbarMessages.unableToOpenLink); // TODO: ED-14403 investigate why these are not translating?
+
           var labelUnlink = formatMessage(_messages.linkToolbarMessages.unlink);
           var editLink = formatMessage(_messages.linkToolbarMessages.editLink);
           var metadata = {
@@ -150,7 +151,8 @@ var getToolbarConfig = function getToolbarConfig(state, intl, providerFactory, c
               title: labelOpenLink,
               icon: _shortcut.default,
               className: 'hyperlink-open-link',
-              metadata: metadata
+              metadata: metadata,
+              tabIndex: null
             }, {
               type: 'separator'
             }, {
@@ -159,7 +161,8 @@ var getToolbarConfig = function getToolbarConfig(state, intl, providerFactory, c
               onClick: (0, _commands.removeLink)(pos),
               selected: false,
               title: labelUnlink,
-              icon: _unlink.default
+              icon: _unlink.default,
+              tabIndex: null
             }]
           });
         }

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

@@ -34,9 +34,9 @@ var _analytics2 = require("./analytics");
 
 var _linkingUtils = require("../../utils/linking-utils");
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+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; }
 
 function isTextAtPos(pos) {
   return function (state) {

package/dist/cjs/plugins/hyperlink/pm-plugins/fake-cursor-for-toolbar.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _prosemirrorState = require("prosemirror-state");
+var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 
 var _prosemirrorView = require("prosemirror-view");
 
@@ -39,7 +39,7 @@ var getInsertLinkToolbarState = function getInsertLinkToolbarState(editorState)
   return undefined;
 };
 
-var fakeCursorToolbarPlugin = new _prosemirrorState.Plugin({
+var fakeCursorToolbarPlugin = new _safePlugin.SafePlugin({
   key: _fakeCurorForToolbarPluginKey.fakeCursorForToolbarPluginKey,
   state: {
     init: function init() {

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

@@ -9,15 +9,17 @@ exports.stateKey = exports.plugin = exports.canLinkBeCreatedInRange = exports.Li
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
+var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
+
 var _prosemirrorState = require("prosemirror-state");
 
 var _uuid = _interopRequireDefault(require("uuid"));
 
 var _utils = require("../../../utils");
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+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; }
 
 var LinkAction;
 exports.LinkAction = LinkAction;
@@ -243,7 +245,7 @@ var stateKey = new _prosemirrorState.PluginKey('hyperlinkPlugin');
 exports.stateKey = stateKey;
 
 var plugin = function plugin(dispatch) {
-  return new _prosemirrorState.Plugin({
+  return new _safePlugin.SafePlugin({
     state: {
       init: function init(_, state) {
         var canInsertLink = canLinkBeCreatedInRange(state.selection.from, state.selection.to)(state);
@@ -254,7 +256,7 @@ 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;
@@ -285,7 +287,9 @@ 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),
@@ -303,8 +307,48 @@ 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(_prosemirrorState.TextSelection.create(state.doc, $anchor.pos, newPosition.pos));
+            view.dispatch(tr);
+            return true;
+          }
+
+          return false;
+        }
+      }
+    }
   });
 };
 
-exports.plugin = plugin;
+exports.plugin = plugin;
+
+function isLinkDirectTarget(event) {
+  return (event === null || event === void 0 ? void 0 : event.target) instanceof HTMLElement && event.target.tagName === 'A';
+}

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);
 
@@ -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;