@atlaskit/editor-core 174.0.0 → 175.0.1

package/dist/cjs/plugins/floating-toolbar/utils.js

@@ -5,6 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.compareArrays = void 0;
 exports.findNode = findNode;
+exports.getFirstFocusableElement = getFirstFocusableElement;
+exports.getFocusableElements = getFocusableElements;
+exports.getLastFocusableElement = getLastFocusableElement;
 exports.shallowEqual = void 0;
 
 var shallowEqual = function shallowEqual(objA, objB) {
@@ -77,4 +80,31 @@ function findNode(parent, predicate) {
     return true;
   });
   return matchedNode;
+}
+
+function getFirstFocusableElement(rootNode) {
+  if (!rootNode) {
+    return;
+  }
+
+  var focusableModalElements = rootNode.querySelectorAll('a[href], button:not([disabled]), textarea, input, select') || [];
+  return focusableModalElements[0];
+}
+
+function getFocusableElements(rootNode) {
+  if (!rootNode) {
+    return;
+  }
+
+  var focusableModalElements = rootNode.querySelectorAll('a[href], button:not([disabled]), textarea, input, select') || [];
+  return focusableModalElements;
+}
+
+function getLastFocusableElement(rootNode) {
+  if (!rootNode) {
+    return;
+  }
+
+  var focusableModalElements = rootNode.querySelectorAll('a[href], button:not([disabled]), textarea, input, select') || [];
+  return focusableModalElements[focusableModalElements.length - 1];
 }

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

@@ -442,6 +442,16 @@ var quickInsertAutoFormat = function quickInsertAutoFormat(_ref3) {
   };
 };
 
+var getKeyParts = function getKeyParts(keymap) {
+  var shortcut = keymap[_utils.browser.mac ? 'mac' : 'windows'];
+
+  if (_utils.browser.mac) {
+    shortcut = shortcut.replace('Alt', 'Opt');
+  }
+
+  return shortcut.replace(/\-(?=.)/g, ' + ').split(' ');
+};
+
 var getSupportedFormatting = function getSupportedFormatting(schema, intl, imageEnabled, quickInsertEnabled) {
   var supportedBySchema = formatting(intl).filter(function (format) {
     return schema.nodes[format.type] || schema.marks[format.type];
@@ -452,33 +462,27 @@ var getSupportedFormatting = function getSupportedFormatting(schema, intl, image
 exports.getSupportedFormatting = getSupportedFormatting;
 
 var getComponentFromKeymap = function getComponentFromKeymap(keymap) {
-  var shortcut = keymap[_utils.browser.mac ? 'mac' : 'windows'];
-
-  if (_utils.browser.mac) {
-    shortcut = shortcut.replace('Alt', 'Opt');
-  }
-
-  var keyParts = shortcut.replace(/\-(?=.)/g, ' + ').split(' ');
+  var keyParts = getKeyParts(keymap);
   return (0, _react2.jsx)("span", null, keyParts.map(function (part, index) {
     if (part === '+') {
       return (0, _react2.jsx)("span", {
-        key: "".concat(shortcut, "-").concat(index)
+        key: "".concat(keyParts, "-").concat(index)
       }, ' + ');
     } else if (part === 'Cmd') {
       return (0, _react2.jsx)("span", {
         css: _styles.codeSm,
-        key: "".concat(shortcut, "-").concat(index)
+        key: "".concat(keyParts, "-").concat(index)
       }, "\u2318");
     } else if (['ctrl', 'alt', 'opt', 'shift'].indexOf(part.toLowerCase()) >= 0) {
       return (0, _react2.jsx)("span", {
         css: _styles.codeMd,
-        key: "".concat(shortcut, "-").concat(index)
+        key: "".concat(keyParts, "-").concat(index)
       }, part);
     }
 
     return (0, _react2.jsx)("span", {
       css: _styles.codeSm,
-      key: "".concat(shortcut, "-").concat(index)
+      key: "".concat(keyParts, "-").concat(index)
     }, part.toUpperCase());
   }));
 };
@@ -492,7 +496,9 @@ var ModalHeader = (0, _reactIntlNext.injectIntl)(function (_ref4) {
 
   return (0, _react2.jsx)("div", {
     css: _styles.header
-  }, (0, _react2.jsx)(_reactIntlNext.FormattedMessage, messages.editorHelp), (0, _react2.jsx)("div", null, (0, _react2.jsx)(_ToolbarButton.default // @ts-ignore
+  }, (0, _react2.jsx)("h1", {
+    css: _styles.dialogHeader
+  }, (0, _react2.jsx)(_reactIntlNext.FormattedMessage, messages.editorHelp)), (0, _react2.jsx)("div", null, (0, _react2.jsx)(_ToolbarButton.default // @ts-ignore
   , {
     onClick: onClose,
     title: formatMessage(messages.closeHelpDialog),
@@ -569,21 +575,21 @@ var HelpDialog = /*#__PURE__*/function (_React$Component) {
         width: "large",
         onClose: this.closeDialog,
         testId: "help-modal-dialog"
-      }, (0, _react2.jsx)(ModalHeader, null), (0, _react2.jsx)(_modalDialog.ModalBody, null, (0, _react2.jsx)("div", {
+      }, (0, _react2.jsx)(ModalHeader, null), (0, _react2.jsx)("div", {
         css: _styles.contentWrapper
       }, (0, _react2.jsx)("div", {
         css: _styles.line
       }), (0, _react2.jsx)("div", {
         css: _styles.content
       }, (0, _react2.jsx)("div", {
-        css: _styles.columnLeft
-      }, (0, _react2.jsx)("div", {
+        css: _styles.column
+      }, (0, _react2.jsx)("h2", {
         css: _styles.title
-      }, (0, _react2.jsx)(_reactIntlNext.FormattedMessage, messages.keyboardShortcuts)), (0, _react2.jsx)("div", null, this.formatting.filter(function (form) {
+      }, (0, _react2.jsx)(_reactIntlNext.FormattedMessage, messages.keyboardShortcuts)), (0, _react2.jsx)("ul", null, this.formatting.filter(function (form) {
         var keymap = form.keymap && form.keymap(_this2.props);
         return keymap && keymap[_utils.browser.mac ? 'mac' : 'windows'];
       }).map(function (form) {
-        return (0, _react2.jsx)("div", {
+        return (0, _react2.jsx)("li", {
           css: _styles.row,
           key: "textFormatting-".concat(form.name)
         }, (0, _react2.jsx)("span", null, form.name), getComponentFromKeymap(form.keymap()));
@@ -592,24 +598,24 @@ var HelpDialog = /*#__PURE__*/function (_React$Component) {
       }).filter(function (form) {
         return form.autoFormatting;
       }).map(function (form) {
-        return (0, _react2.jsx)("div", {
+        return (0, _react2.jsx)("li", {
           css: _styles.row,
           key: "autoFormatting-".concat(form.name)
         }, (0, _react2.jsx)("span", null, form.name), form.autoFormatting());
       }))), (0, _react2.jsx)("div", {
         css: _styles.line
       }), (0, _react2.jsx)("div", {
-        css: _styles.columnRight
-      }, (0, _react2.jsx)("div", {
+        css: _styles.column
+      }, (0, _react2.jsx)("h2", {
         css: _styles.title
-      }, (0, _react2.jsx)(_reactIntlNext.FormattedMessage, messages.markdown)), (0, _react2.jsx)("div", null, this.formatting.filter(function (form) {
+      }, (0, _react2.jsx)(_reactIntlNext.FormattedMessage, messages.markdown)), (0, _react2.jsx)("ul", null, this.formatting.filter(function (form) {
         return shortcutNamesWithoutKeymap.indexOf(form.type) === -1;
       }).map(function (form) {
-        return form.autoFormatting && (0, _react2.jsx)("div", {
-          css: _styles.row,
-          key: "autoFormatting-".concat(form.name)
+        return form.autoFormatting && (0, _react2.jsx)("li", {
+          key: "autoFormatting-".concat(form.name),
+          css: _styles.row
         }, (0, _react2.jsx)("span", null, form.name), form.autoFormatting());
-      })))))), (0, _react2.jsx)(ModalFooter, null)) : null);
+      }))))), (0, _react2.jsx)(ModalFooter, null)) : null);
     }
   }]);
   return HelpDialog;

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

@@ -7,7 +7,7 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.title = exports.row = exports.line = exports.header = exports.footer = exports.contentWrapper = exports.content = exports.columnRight = exports.columnLeft = exports.codeSm = exports.codeMd = exports.codeLg = void 0;
+exports.title = exports.row = exports.line = exports.header = exports.footer = exports.dialogHeader = exports.contentWrapper = exports.content = exports.column = exports.codeSm = exports.codeMd = exports.codeLg = void 0;
 
 var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
 
@@ -21,7 +21,7 @@ var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 
 var _tokens = require("@atlaskit/tokens");
 
-var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject10, _templateObject11, _templateObject12;
+var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9;
 
 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); }
 
@@ -31,23 +31,44 @@ var header = (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTe
 exports.header = header;
 var footer = (0, _react.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n  z-index: ", ";\n  font-size: ", ";\n  line-height: 20px;\n  color: ", ";\n  padding: 24px;\n  text-align: right;\n  box-shadow: 'none';\n"])), _editorSharedStyles.akEditorUnitZIndex, (0, _editorSharedStyles.relativeFontSizeToBase16)(14), (0, _tokens.token)('color.text.subtlest', colors.N300));
 exports.footer = footer;
-var contentWrapper = (0, _react.css)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\n  padding: 18px 20px;\n  border-bottom-right-radius: ", "px;\n  overflow: auto;\n  position: relative;\n  color: ", ";\n  background-color: ", ";\n"])), (0, _constants.borderRadius)(), (0, _tokens.token)('color.text.subtle', colors.N400), (0, _tokens.token)('color.background.neutral.subtle', colors.N0));
+var contentWrapper = (0, _react.css)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\n  padding: 20px 44px;\n  border-bottom-right-radius: ", "px;\n  overflow: auto;\n  position: relative;\n  color: ", ";\n  background-color: ", ";\n"])), (0, _constants.borderRadius)(), (0, _tokens.token)('color.text.subtle', colors.N400), (0, _tokens.token)('color.background.neutral.subtle', colors.N0));
 exports.contentWrapper = contentWrapper;
 var line = (0, _react.css)(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2.default)(["\n  background: ", ";\n  content: '';\n  display: block;\n  height: 2px;\n  left: 0;\n  position: absolute;\n  top: 0;\n  right: 0;\n  width: 100%;\n  min-width: 604px;\n"])), (0, _tokens.token)('color.background.neutral.subtle', '#fff'));
 exports.line = line;
 var content = (0, _react.css)(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2.default)(["\n  min-width: 524px;\n  width: 100%;\n  position: relative;\n  display: flex;\n  justify-content: space-between;\n"])));
 exports.content = content;
-var columnLeft = (0, _react.css)(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteral2.default)(["\n  width: 44%;\n"])));
-exports.columnLeft = columnLeft;
-var columnRight = (0, _react.css)(_templateObject7 || (_templateObject7 = (0, _taggedTemplateLiteral2.default)(["\n  width: 44%;\n"])));
-exports.columnRight = columnRight;
-var row = (0, _react.css)(_templateObject8 || (_templateObject8 = (0, _taggedTemplateLiteral2.default)(["\n  margin: 20px 0;\n  display: flex;\n  justify-content: space-between;\n"])));
+var column = {
+  width: '44%',
+  '& > ul': {
+    padding: 0
+  }
+};
+exports.column = column;
+var row = (0, _react.css)(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteral2.default)(["\n  margin: 20px 0;\n  display: flex;\n  justify-content: space-between;\n"])));
 exports.row = row;
-var title = (0, _react.css)(_templateObject9 || (_templateObject9 = (0, _taggedTemplateLiteral2.default)(["\n  font-size: ", ";\n  font-weight: 400;\n"])), (0, _editorSharedStyles.relativeFontSizeToBase16)(18));
+var dialogHeader = {
+  '&': {
+    fontSize: (0, _editorSharedStyles.relativeFontSizeToBase16)(24),
+    fontWeight: 400,
+    color: (0, _tokens.token)('color.text.subtle', colors.N400),
+    letterSpacing: 'normal',
+    lineHeight: 1.42857142857143
+  }
+};
+exports.dialogHeader = dialogHeader;
+var title = {
+  '&': {
+    fontSize: (0, _editorSharedStyles.relativeFontSizeToBase16)(18),
+    fontWeight: 400,
+    color: (0, _tokens.token)('color.text.subtle', colors.N400),
+    letterSpacing: 'normal',
+    lineHeight: 1.42857142857143
+  }
+};
 exports.title = title;
-var codeSm = (0, _react.css)(_templateObject10 || (_templateObject10 = (0, _taggedTemplateLiteral2.default)(["\n  background-color: ", ";\n  border-radius: ", "px;\n  width: 24px;\n  display: inline-block;\n  height: 24px;\n  line-height: 24px;\n  text-align: center;\n"])), (0, _tokens.token)('color.background.neutral', colors.N20), (0, _constants.borderRadius)());
+var codeSm = (0, _react.css)(_templateObject7 || (_templateObject7 = (0, _taggedTemplateLiteral2.default)(["\n  background-color: ", ";\n  border-radius: ", "px;\n  width: 24px;\n  display: inline-block;\n  height: 24px;\n  line-height: 24px;\n  text-align: center;\n"])), (0, _tokens.token)('color.background.neutral', colors.N20), (0, _constants.borderRadius)());
 exports.codeSm = codeSm;
-var codeMd = (0, _react.css)(_templateObject11 || (_templateObject11 = (0, _taggedTemplateLiteral2.default)(["\n  background-color: ", ";\n  border-radius: ", "px;\n  display: inline-block;\n  height: 24px;\n  line-height: 24px;\n  width: 50px;\n  text-align: center;\n"])), (0, _tokens.token)('color.background.neutral', colors.N20), (0, _constants.borderRadius)());
+var codeMd = (0, _react.css)(_templateObject8 || (_templateObject8 = (0, _taggedTemplateLiteral2.default)(["\n  background-color: ", ";\n  border-radius: ", "px;\n  display: inline-block;\n  height: 24px;\n  line-height: 24px;\n  width: 50px;\n  text-align: center;\n"])), (0, _tokens.token)('color.background.neutral', colors.N20), (0, _constants.borderRadius)());
 exports.codeMd = codeMd;
-var codeLg = (0, _react.css)(_templateObject12 || (_templateObject12 = (0, _taggedTemplateLiteral2.default)(["\n  background-color: ", ";\n  border-radius: ", "px;\n  display: inline-block;\n  height: 24px;\n  line-height: 24px;\n  padding: 0 10px;\n  text-align: center;\n"])), (0, _tokens.token)('color.background.neutral', colors.N20), (0, _constants.borderRadius)());
+var codeLg = (0, _react.css)(_templateObject9 || (_templateObject9 = (0, _taggedTemplateLiteral2.default)(["\n  background-color: ", ";\n  border-radius: ", "px;\n  display: inline-block;\n  height: 24px;\n  line-height: 24px;\n  padding: 0 10px;\n  text-align: center;\n"])), (0, _tokens.token)('color.background.neutral', colors.N20), (0, _constants.borderRadius)());
 exports.codeLg = codeLg;

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

@@ -39,8 +39,6 @@ var _analytics = require("../analytics");
 
 var _linkingUtils = require("../../utils/linking-utils");
 
-var _toolbar = require("../copy-button/toolbar");
-
 var _featureFlagsContext = require("../feature-flags-context");
 
 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; }
@@ -90,12 +88,6 @@ function getLinkText(activeLinkMark, state) {
   return activeLinkMark.node.text;
 }
 
-var getCopyButtonGroup = function getCopyButtonGroup(state, intl, nodeType) {
-  return state && (0, _toolbar.showCopyButton)(state) ? [{
-    type: 'separator'
-  }, (0, _toolbar.getCopyButtonConfig)(state, intl.formatMessage, nodeType)] : [];
-};
-
 var getSettingsButtonGroup = function getSettingsButtonGroup(state, intl) {
   var _getFeatureFlags = (0, _featureFlagsContext.getFeatureFlags)(state),
       floatingToolbarLinkSettingsButton = _getFeatureFlags.floatingToolbarLinkSettingsButton;
@@ -205,7 +197,17 @@ var getToolbarConfig = function getToolbarConfig(options) {
                 title: labelUnlink,
                 icon: _unlink.default,
                 tabIndex: null
-              }].concat((0, _toConsumableArray2.default)(getCopyButtonGroup(state, intl, hyperLinkToolbar.nodeType)), (0, _toConsumableArray2.default)(getSettingsButtonGroup(state, intl)))
+              }, {
+                type: 'copy-button',
+                items: [{
+                  type: 'separator'
+                }, {
+                  state: state,
+                  formatMessage: formatMessage,
+                  markType: state.schema.marks.link
+                }]
+              }].concat((0, _toConsumableArray2.default)(getSettingsButtonGroup(state, intl))),
+              scrollable: true
             });
           }
 
@@ -229,6 +231,7 @@ var getToolbarConfig = function getToolbarConfig(options) {
               items: [{
                 type: 'custom',
                 fallback: [],
+                disableArrowNavigation: true,
                 render: function render(view, idx) {
                   if (!view) {
                     return null;

package/dist/cjs/plugins/hyperlink/pm-plugins/input-rule.js

@@ -21,7 +21,6 @@ var _analytics2 = require("../analytics");
 
 function createLinkInputRule(regexp) {
   var skipAnalytics = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-  var useUnpredictableInputRule = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
   // Plain typed text (eg, typing 'www.google.com') should convert to a hyperlink
   return (0, _inputRules.createRule)(regexp, function (state, match, start, end) {
     var schema = state.schema;
@@ -48,12 +47,6 @@ function createLinkInputRule(regexp) {
 
     if ((0, _utils.isLinkInMatches)(start, filepaths)) {
       var _tr = state.tr;
-
-      if (useUnpredictableInputRule) {
-        _tr.insertText(' ');
-      } // To keep consistent with original behaviour.
-
-
       return _tr;
     }
 
@@ -61,7 +54,7 @@ function createLinkInputRule(regexp) {
     var to = Math.min(start + link.text.length, state.doc.content.size);
     var tr = state.tr.addMark(from, to, markType); // Keep old behavior that will delete the space after the link
 
-    if (useUnpredictableInputRule || to === end) {
+    if (to === end) {
       tr.insertText(' ');
     }
 
@@ -81,9 +74,7 @@ function createInputRulePlugin(schema) {
     return;
   }
 
-  var hasUseUnpredictableFlag = typeof featureFlags.useUnpredictableInputRule === 'boolean';
-  var useUnpredictableInputRule = hasUseUnpredictableFlag ? Boolean(featureFlags.useUnpredictableInputRule) : true;
-  var urlWithASpaceRule = createLinkInputRule(_utils.LinkMatcher.create(useUnpredictableInputRule), skipAnalytics, featureFlags.useUnpredictableInputRule); // [something](link) should convert to a hyperlink
+  var urlWithASpaceRule = createLinkInputRule(_utils.LinkMatcher.create(), skipAnalytics); // [something](link) should convert to a hyperlink
 
   var markdownLinkRule = (0, _inputRules.createRule)(/(^|[^!])\[(.*?)\]\((\S+)\)$/, function (state, match, start, end) {
     var schema = state.schema;
@@ -105,9 +96,7 @@ function createInputRulePlugin(schema) {
 
     return (0, _analytics.addAnalytics)(state, tr, (0, _analytics2.getLinkCreationAnalyticsEvent)(_analytics.INPUT_METHOD.FORMATTING, url));
   });
-  return (0, _inputRules.createPlugin)('hyperlink', [urlWithASpaceRule, markdownLinkRule], {
-    useUnpredictableInputRule: featureFlags.useUnpredictableInputRule
-  });
+  return (0, _inputRules.createPlugin)('hyperlink', [urlWithASpaceRule, markdownLinkRule]);
 }
 
 var _default = createInputRulePlugin;

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

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.findFilepaths = exports.LinkMatcher = exports.FILEPATH_REGEXP = void 0;
+exports.findFilepaths = exports.LinkMatcher = exports.FILEPATH_REGEXP = exports.DONTLINKIFY_REGEXP = void 0;
 exports.getLinkDomain = getLinkDomain;
 exports.isFromCurrentDomain = isFromCurrentDomain;
 exports.isLinkInMatches = void 0;
@@ -21,14 +21,17 @@ var _slice = require("../../utils/slice");
 var _adfSchema = require("@atlaskit/adf-schema");
 
 // Regular expression for a windows filepath in the format <DRIVE LETTER>:\<folder name>\
-var FILEPATH_REGEXP = /([a-zA-Z]:|\\)([^\/:*?<>"|]+\\)?([^\/:*?<>"| ]+(?=\s?))?/gim;
+var FILEPATH_REGEXP = /([a-zA-Z]:|\\)([^\/:*?<>"|]+\\)?([^\/:*?<>"| ]+(?=\s?))?/gim; // Don't linkify if starts with $ or {
+
+exports.FILEPATH_REGEXP = FILEPATH_REGEXP;
+var DONTLINKIFY_REGEXP = /^(\$|{)/;
 /**
  * Instance of class LinkMatcher are used in autoformatting in place of Regex.
  * Hence it has been made similar to regex with an exec method.
  * Extending it directly from class Regex was introducing some issues, thus that has been avoided.
  */
 
-exports.FILEPATH_REGEXP = FILEPATH_REGEXP;
+exports.DONTLINKIFY_REGEXP = DONTLINKIFY_REGEXP;
 
 var LinkMatcher = /*#__PURE__*/function () {
   function LinkMatcher() {
@@ -37,7 +40,7 @@ var LinkMatcher = /*#__PURE__*/function () {
 
   (0, _createClass2.default)(LinkMatcher, null, [{
     key: "create",
-    value: function create(useUnpredictableInputRule) {
+    value: function create() {
       var LinkMatcherRegex = /*#__PURE__*/function () {
         function LinkMatcherRegex() {
           (0, _classCallCheck2.default)(this, LinkMatcherRegex);
@@ -54,6 +57,10 @@ var LinkMatcher = /*#__PURE__*/function () {
               return null;
             }
 
+            if (DONTLINKIFY_REGEXP.test(lastStringBeforeSpace)) {
+              return null;
+            }
+
             var links = _adfSchema.linkify.match(lastStringBeforeSpace);
 
             if (!links || links.length === 0) {
@@ -65,15 +72,6 @@ var LinkMatcher = /*#__PURE__*/function () {
             lastLink.input = str.substring(lastMatch.index);
             lastLink.length = lastLink.lastIndex - lastLink.index + 1;
             lastLink.index = str.lastIndexOf(lastStringBeforeSpace) + lastMatch.index;
-
-            if (useUnpredictableInputRule) {
-              // ugly hack to make this works with unpredictable input rules
-              // prosemirror does this to find the positions:
-              // `(match[0].length - text.length)`
-              // @ts-ignore
-              lastLink[0] = lastLink;
-            }
-
             return lastLink;
           }
         }]);

package/dist/cjs/plugins/image-upload/pm-plugins/input-rule.js

@@ -30,9 +30,7 @@ function inputRulePlugin(schema, featureFlags) {
 
     return null;
   });
-  return (0, _inputRules.createPlugin)('image-upload', [imageRule], {
-    useUnpredictableInputRule: featureFlags.useUnpredictableInputRule
-  });
+  return (0, _inputRules.createPlugin)('image-upload', [imageRule]);
 }
 
 var _default = inputRulePlugin;

package/dist/cjs/plugins/index.js

@@ -361,12 +361,6 @@ Object.defineProperty(exports, "submitEditorPlugin", {
     return _submitEditor.default;
   }
 });
-Object.defineProperty(exports, "tablesPlugin", {
-  enumerable: true,
-  get: function get() {
-    return _table.default;
-  }
-});
 Object.defineProperty(exports, "tasksAndDecisionsPlugin", {
   enumerable: true,
   get: function get() {
@@ -480,8 +474,6 @@ var _saveOnEnter = _interopRequireDefault(require("./save-on-enter"));
 
 var _submitEditor = _interopRequireDefault(require("./submit-editor"));
 
-var _table = _interopRequireDefault(require("./table"));
-
 var _tasksAndDecisions = _interopRequireDefault(require("./tasks-and-decisions"));
 
 var _textColor = _interopRequireDefault(require("./text-color"));

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

@@ -33,11 +33,11 @@ var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 
 var _tokens = require("@atlaskit/tokens");
 
-var _types = require("../table/types");
+var _types = require("@atlaskit/editor-plugin-table/types");
 
-var _consts = require("../table/ui/consts");
+var _consts = require("@atlaskit/editor-plugin-table/ui/consts");
 
 var _templateObject;
 
-var layoutStyles = (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  .ProseMirror {\n    ", " [data-layout-section] {\n      margin: ", "px -", "px 0;\n      transition: border-color 0.3s ", ";\n      cursor: pointer;\n\n      /* Inner cursor located 26px from left */\n      [data-layout-column] {\n        flex: 1;\n        min-width: 0;\n        // TODO: https://product-fabric.atlassian.net/browse/DSP-4353\n        border: ", "px solid\n          ", ";\n        border-radius: 4px;\n        padding: ", "px;\n        box-sizing: border-box;\n\n        > div {\n          > :not(style):first-child,\n          > style:first-child + * {\n            margin-top: 0;\n          }\n\n          > .ProseMirror-gapcursor.-right:first-of-type + * {\n            margin-top: 0;\n          }\n\n          > .ProseMirror-gapcursord:first-of-type + span + * {\n            margin-top: 0;\n          }\n\n          .rich-media-item {\n            margin-top: 0;\n          }\n\n          > .mediaSingleView-content-wrap:first-of-type .rich-media-item {\n            margin-top: 0;\n          }\n\n          > .ProseMirror-gapcursor.-right:first-of-type\n            + .mediaSingleView-content-wrap\n            .rich-media-item {\n            margin-top: 0;\n          }\n\n          > .ProseMirror-gapcursor:first-of-type\n            + span\n            + .mediaSingleView-content-wrap\n            .rich-media-item {\n            margin-top: 0;\n          }\n\n          /* Prevent first DecisionWrapper's margin-top: 8px from shifting decisions down\n             and shrinking layout's node selectable area (leniency margin) */\n          > [data-node-type='decisionList'] {\n            li:first-of-type [data-decision-wrapper] {\n              margin-top: 0;\n            }\n          }\n        }\n\n        /* Make the 'content' fill the entire height of the layout column to allow click\n           handler of layout section nodeview to target only data-layout-column */\n        [data-layout-content] {\n          height: 100%;\n          cursor: text;\n        }\n      }\n\n      [data-layout-column] + [data-layout-column] {\n        margin-left: ", "px;\n      }\n\n      @media screen and (max-width: ", "px) {\n        [data-layout-column] + [data-layout-column] {\n          margin-left: 0;\n        }\n      }\n\n      // TODO: https://product-fabric.atlassian.net/browse/DSP-4441\n      /* Shows the border when cursor is inside a layout */\n      &.selected [data-layout-column],\n      &:hover [data-layout-column] {\n        border-color: ", ";\n      }\n\n      &.selected.danger > [data-layout-column] {\n        background-color: ", ";\n        border-color: ", ";\n      }\n\n      &.", ":not(.danger) {\n        [data-layout-column] {\n          ", "\n        }\n      }\n    }\n  }\n\n  .fabric-editor--full-width-mode .ProseMirror {\n    [data-layout-section] {\n      .", " {\n        margin: 0 ", "px;\n      }\n    }\n  }\n"])), _styles.columnLayoutSharedStyle, (0, _constants.gridSize)() - 1, _editorSharedStyles.akLayoutGutterOffset, _editorSharedStyles.akEditorSwoopCubicBezier, _editorSharedStyles.akEditorSelectedBorderSize, (0, _tokens.token)('color.border', _colors.N40A), _styles.LAYOUT_COLUMN_PADDING, _styles.LAYOUT_SECTION_MARGIN, _editorSharedStyles.gridMediumMaxWidth, (0, _tokens.token)('color.border', _colors.N50A), (0, _tokens.token)('color.background.danger', _editorSharedStyles.akEditorDeleteBackground), (0, _tokens.token)('color.border.danger', _editorSharedStyles.akEditorDeleteBorder), _editorSharedStyles.akEditorSelectedNodeClassName, (0, _editorSharedStyles.getSelectionStyles)([_editorSharedStyles.SelectionStyle.Border, _editorSharedStyles.SelectionStyle.Blanket]), _types.TableCssClassName.TABLE_CONTAINER, _consts.tableMarginFullWidthMode);
+var layoutStyles = (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  .ProseMirror {\n    ", " [data-layout-section] {\n      margin: ", "px -", "px 0;\n      transition: border-color 0.3s ", ";\n      cursor: pointer;\n\n      /* Inner cursor located 26px from left */\n      [data-layout-column] {\n        flex: 1;\n        min-width: 0;\n        border: ", "px solid\n          ", ";\n        border-radius: 4px;\n        padding: ", "px;\n        box-sizing: border-box;\n\n        > div {\n          > :not(style):first-child,\n          > style:first-child + * {\n            margin-top: 0;\n          }\n\n          > .ProseMirror-gapcursor:first-child + *,\n          > style:first-child + .ProseMirror-gapcursor + * {\n            margin-top: 0;\n          }\n\n          > .ProseMirror-gapcursor:first-child + span + *,\n          > style:first-child + .ProseMirror-gapcursor:first-child + span + * {\n            margin-top: 0;\n          }\n\n          > .embedCardView-content-wrap:first-of-type .rich-media-item {\n            margin-top: 0;\n          }\n\n          > .mediaSingleView-content-wrap:first-of-type .rich-media-item {\n            margin-top: 0;\n          }\n\n          > .ProseMirror-gapcursor.-right:first-child\n            + .mediaSingleView-content-wrap\n            .rich-media-item,\n          > style:first-child\n            + .ProseMirror-gapcursor.-right\n            + .mediaSingleView-content-wrap\n            .rich-media-item,\n          > .ProseMirror-gapcursor.-right:first-of-type\n            + .embedCardView-content-wrap\n            .rich-media-item {\n            margin-top: 0;\n          }\n\n          > .ProseMirror-gapcursor:first-child\n            + span\n            + .mediaSingleView-content-wrap\n            .rich-media-item,\n          > style:first-child\n            + .ProseMirror-gapcursor\n            + span\n            + .mediaSingleView-content-wrap\n            .rich-media-item {\n            margin-top: 0;\n          }\n\n          /* Prevent first DecisionWrapper's margin-top: 8px from shifting decisions down\n             and shrinking layout's node selectable area (leniency margin) */\n          > [data-node-type='decisionList'] {\n            li:first-of-type [data-decision-wrapper] {\n              margin-top: 0;\n            }\n          }\n        }\n\n        /* Make the 'content' fill the entire height of the layout column to allow click\n           handler of layout section nodeview to target only data-layout-column */\n        [data-layout-content] {\n          height: 100%;\n          cursor: text;\n        }\n      }\n\n      [data-layout-column] + [data-layout-column] {\n        margin-left: ", "px;\n      }\n\n      @media screen and (max-width: ", "px) {\n        [data-layout-column] + [data-layout-column] {\n          margin-left: 0;\n        }\n      }\n\n      // TODO: Remove the border styles below once design tokens have been enabled and fallbacks are no longer triggered.\n      // This is because the default state already uses the same token and, as such, the hover style won't change anything.\n      // https://product-fabric.atlassian.net/browse/DSP-4441\n      /* Shows the border when cursor is inside a layout */\n      &.selected [data-layout-column],\n      &:hover [data-layout-column] {\n        border-color: ", ";\n      }\n\n      &.selected.danger > [data-layout-column] {\n        background-color: ", ";\n        border-color: ", ";\n      }\n\n      &.", ":not(.danger) {\n        [data-layout-column] {\n          ", "\n        }\n      }\n    }\n  }\n\n  .fabric-editor--full-width-mode .ProseMirror {\n    [data-layout-section] {\n      .", " {\n        margin: 0 ", "px;\n      }\n    }\n  }\n"])), _styles.columnLayoutSharedStyle, (0, _constants.gridSize)() - 1, _editorSharedStyles.akLayoutGutterOffset, _editorSharedStyles.akEditorSwoopCubicBezier, _editorSharedStyles.akEditorSelectedBorderSize, (0, _tokens.token)('color.border', _colors.N40A), _styles.LAYOUT_COLUMN_PADDING, _styles.LAYOUT_SECTION_MARGIN, _editorSharedStyles.gridMediumMaxWidth, (0, _tokens.token)('color.border', _colors.N50A), (0, _tokens.token)('color.background.danger', _editorSharedStyles.akEditorDeleteBackground), (0, _tokens.token)('color.border.danger', _editorSharedStyles.akEditorDeleteBorder), _editorSharedStyles.akEditorSelectedNodeClassName, (0, _editorSharedStyles.getSelectionStyles)([_editorSharedStyles.SelectionStyle.Border, _editorSharedStyles.SelectionStyle.Blanket]), _types.TableCssClassName.TABLE_CONTAINER, _consts.tableMarginFullWidthMode);
 exports.layoutStyles = layoutStyles;

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

@@ -33,8 +33,6 @@ var _actions = require("./actions");
 
 var _decoration = require("../base/pm-plugins/decoration");
 
-var _toolbar = require("../copy-button/toolbar");
-
 var LAYOUT_TYPES = [{
   id: 'editor.layout.twoEquals',
   type: 'two_equal',
@@ -119,7 +117,15 @@ var buildToolbar = function buildToolbar(state, intl, pos, _allowBreakout, addSi
         return buildLayoutButton(intl, i, currentLayout);
       })), (0, _toConsumableArray2.default)(addSidebarLayouts ? SIDEBAR_LAYOUT_TYPES.map(function (i) {
         return buildLayoutButton(intl, i, currentLayout);
-      }) : []), (0, _toConsumableArray2.default)(state && (0, _toolbar.showCopyButton)(state) ? [separator, (0, _toolbar.getCopyButtonConfig)(state, intl.formatMessage, nodeType)] : []), [separator, deleteButton])
+      }) : []), [{
+        type: 'copy-button',
+        items: [separator, {
+          state: state,
+          formatMessage: intl.formatMessage,
+          nodeType: nodeType
+        }]
+      }, separator, deleteButton]),
+      scrollable: true
     };
   }
 

package/dist/cjs/plugins/list/actions/conversions.js

@@ -19,6 +19,8 @@ var _utils = require("../../../utils");
 
 var _find = require("../utils/find");
 
+var _gapCursorSelection = require("../../selection/gap-cursor-selection");
+
 function convertListType(_ref) {
   var tr = _ref.tr,
       nextListNodeType = _ref.nextListNodeType;
@@ -26,7 +28,16 @@ function convertListType(_ref) {
       _tr$selection = tr.selection,
       $from = _tr$selection.$from,
       $to = _tr$selection.$to;
-  var listRange = $from.blockRange($to, _node.isListNode);
+  var listRange;
+
+  if (tr.selection instanceof _gapCursorSelection.GapCursorSelection) {
+    var _$from$nodeAfter;
+
+    var nodeSize = ((_$from$nodeAfter = $from.nodeAfter) === null || _$from$nodeAfter === void 0 ? void 0 : _$from$nodeAfter.nodeSize) || 1;
+    listRange = $from.blockRange($from.doc.resolve($from.pos + nodeSize));
+  } else {
+    listRange = $from.blockRange($to, _node.isListNode);
+  }
 
   if (listRange) {
     return convertSelectedList({
@@ -74,7 +85,7 @@ function convertListType(_ref) {
     var currentNodeNotWrappedInList = node;
     var isNotAnEmptyParagraphAndIsParagraphOrLeafNode = !(0, _utils.isEmptyParagraph)(currentNodeNotWrappedInList) && (!node.type.isBlock || node.type.name === 'paragraph');
 
-    if (isNotAnEmptyParagraphAndIsParagraphOrLeafNode) {
+    if (isNotAnEmptyParagraphAndIsParagraphOrLeafNode && nodeRangeAroundList) {
       var remainingNodeRange = new _prosemirrorModel.NodeRange(tr.doc.resolve(tr.mapping.map(pos)), tr.doc.resolve(tr.mapping.map(pos) + currentNodeNotWrappedInList.nodeSize), nodeRangeAroundList.depth);
       convertAroundList({
         tr: tr,
@@ -103,16 +114,18 @@ var convertSelectedList = function convertSelectedList(_ref2) {
   var selection = tr.selection,
       _tr$selection2 = tr.selection,
       from = _tr$selection2.from,
-      to = _tr$selection2.to; // get the positions of all the leaf nodes within the selection
+      to = _tr$selection2.to;
+  var codeBlock = tr.doc.type.schema.nodes.codeBlock; // get the positions of all the leaf nodes within the selection
 
   var nodePositions = [];
 
-  if (selection instanceof _prosemirrorState.TextSelection && selection.$cursor) {
+  if (selection instanceof _prosemirrorState.TextSelection && selection.$cursor || selection instanceof _gapCursorSelection.GapCursorSelection) {
     nodePositions.push(from);
   } else {
     // nodesBetween doesn't return leaf nodes that are outside of from and to
     tr.doc.nodesBetween(from, to, function (node, pos) {
-      if (!node.isLeaf) {
+      // isLeaf is false for empty codeBlock so adding additional check for childCount
+      if (!node.isLeaf && !(node.type === codeBlock && node.childCount === 0)) {
         return true;
       }
 

package/dist/cjs/plugins/list/actions/wrap-and-join-lists.js

@@ -12,6 +12,10 @@ var _prosemirrorTransform = require("prosemirror-transform");
 
 var _autojoin = require("../../../utils/prosemirror/autojoin");
 
+var _gapCursorSelection = require("../../selection/gap-cursor-selection");
+
+var _selection = require("../utils/selection");
+
 /**
  * Wraps the selection in a list with the given type. If this results in
  * two adjacent lists of the same type, those will be joined together.
@@ -34,7 +38,15 @@ function wrapInList(listType, attrs) {
     var _tr$selection = tr.selection,
         $from = _tr$selection.$from,
         $to = _tr$selection.$to;
-    var range = $from.blockRange($to);
+    var range;
+
+    if (tr.selection instanceof _gapCursorSelection.GapCursorSelection && $from.nodeAfter && (0, _selection.isWrappingPossible)(listType, tr.selection)) {
+      var nodeSize = $from.nodeAfter.nodeSize || 1;
+      range = $from.blockRange($from.doc.resolve($from.pos + nodeSize));
+    } else {
+      range = $from.blockRange($to);
+    }
+
     var doJoin = false;
     var outerRange = range;
 

package/dist/cjs/plugins/list/commands/index.js

@@ -81,14 +81,13 @@ var enterKeyCommand = function enterKeyCommand(state, dispatch) {
     var _state$schema$nodes = state.schema.nodes,
         listItem = _state$schema$nodes.listItem,
         codeBlock = _state$schema$nodes.codeBlock;
-    var node = $from.node($from.depth);
     var wrapper = $from.node($from.depth - 1);
 
     if (wrapper && wrapper.type === listItem) {
       /** Check if the wrapper has any visible content */
       var wrapperHasContent = (0, _document.hasVisibleContent)(wrapper);
 
-      if ((0, _document.isNodeEmpty)(node) && !wrapperHasContent) {
+      if (!wrapperHasContent) {
         return (0, _outdentList.outdentList)(_analytics.INPUT_METHOD.KEYBOARD)(state, dispatch);
       } else if (!(0, _prosemirrorUtils.hasParentNodeOfType)(codeBlock)(selection)) {
         return splitListItem(listItem)(state, dispatch);
@@ -143,7 +142,12 @@ function untoggleSelectedList(tr) {
       selection = _tr.selection;
   var depth = rootListDepth(selection.$to, tr.doc.type.schema.nodes);
   tr = (0, _transforms.liftFollowingList)(selection.$to.pos, selection.$to.end(depth), depth || 0, tr);
-  tr = (0, _transforms.liftSelectionList)(selection, tr);
+
+  if (selection instanceof _prosemirrorState.NodeSelection || selection instanceof _gapCursorSelection.GapCursorSelection) {
+    return (0, _transforms.liftNodeSelectionList)(selection, tr);
+  }
+
+  return (0, _transforms.liftTextSelectionList)(selection, tr);
 }
 
 function toggleList(inputMethod, listType) {
@@ -154,9 +158,12 @@ function toggleList(inputMethod, listType) {
     var actionSubjectId = listType === 'bulletList' ? _analytics.ACTION_SUBJECT_ID.FORMAT_LIST_BULLET : _analytics.ACTION_SUBJECT_ID.FORMAT_LIST_NUMBER;
 
     if (listInsideSelection) {
-      var selection = state.selection;
-      var fromNode = selection.$from.node(selection.$from.depth - 2);
-      var toNode = selection.$to.node(selection.$to.depth - 2);
+      var selection = state.selection; // for gap cursor or node selection - list is expected 1 level up (listItem -> list)
+      // for text selection - list is expected 2 levels up (paragraph -> listItem -> list)
+
+      var positionDiff = selection instanceof _gapCursorSelection.GapCursorSelection || selection instanceof _prosemirrorState.NodeSelection ? 1 : 2;
+      var fromNode = selection.$from.node(selection.$from.depth - positionDiff);
+      var toNode = selection.$to.node(selection.$to.depth - positionDiff);
       var transformedFrom = listInsideSelection.type.name === 'bulletList' ? _analytics.ACTION_SUBJECT_ID.FORMAT_LIST_BULLET : _analytics.ACTION_SUBJECT_ID.FORMAT_LIST_NUMBER;
 
       if ((fromNode === null || fromNode === void 0 ? void 0 : fromNode.type.name) === listType && (toNode === null || toNode === void 0 ? void 0 : toNode.type.name) === listType) {

package/dist/cjs/plugins/list/pm-plugins/input-rules/index.js

@@ -33,9 +33,7 @@ function inputRulePlugin(schema, featureFlags) {
   }
 
   if (rules.length !== 0) {
-    return (0, _inputRules.createPlugin)('lists', rules, {
-      useUnpredictableInputRule: featureFlags.useUnpredictableInputRule
-    });
+    return (0, _inputRules.createPlugin)('lists', rules);
   }
 
   return;