@atlaskit/editor-core 148.0.0 → 149.0.3

package/dist/cjs/plugins/floating-toolbar/ui/EditorEmojiAddIcon.js

@@ -0,0 +1,35 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = EditorEmojiAddIcon;
+
+var _react = _interopRequireDefault(require("react"));
+
+function EditorEmojiAddIcon() {
+  return /*#__PURE__*/_react.default.createElement("svg", {
+    width: 24,
+    height: 24,
+    viewBox: "0 0 24 24",
+    fill: "none",
+    "aria-label": "editor-add-emoji"
+  }, /*#__PURE__*/_react.default.createElement("rect", {
+    width: 24,
+    height: 24,
+    fill: "white",
+    fillOpacity: "0.01"
+  }), /*#__PURE__*/_react.default.createElement("path", {
+    fillRule: "evenodd",
+    clipRule: "evenodd",
+    d: "M14.5715 6.20367C13.7531 5.88041 12.8807 5.71423 12 5.71423C10.1435 5.71423 8.36301 6.45173 7.05025 7.76449C5.7375 9.07724 5 10.8577 5 12.7142C5 14.5708 5.7375 16.3512 7.05025 17.664C8.36301 18.9767 10.1435 19.7142 12 19.7142C12.9193 19.7142 13.8295 19.5332 14.6788 19.1814C15.5281 18.8296 16.2997 18.314 16.9497 17.664C17.5998 17.014 18.1154 16.2423 18.4672 15.393C18.8189 14.5437 19 13.6335 19 12.7142C19 12.1349 18.9281 11.5591 18.7868 10.9999H17.2266C17.404 11.5396 17.5 12.1159 17.5 12.7142C17.5 15.7472 15.033 18.2142 12 18.2142C8.967 18.2142 6.5 15.7472 6.5 12.7142C6.50159 11.256 7.08156 9.85801 8.11267 8.8269C9.14377 7.79579 10.5418 7.21582 12 7.21423C12.9284 7.21423 13.8037 7.44537 14.5715 7.85312V6.20367ZM9.79289 11.9213C9.98043 12.1089 10.2348 12.2142 10.5 12.2142C10.7652 12.2142 11.0196 12.1089 11.2071 11.9213C11.3946 11.7338 11.5 11.4795 11.5 11.2142C11.5 10.949 11.3946 10.6947 11.2071 10.5071C11.0196 10.3196 10.7652 10.2142 10.5 10.2142C10.2348 10.2142 9.98043 10.3196 9.79289 10.5071C9.60536 10.6947 9.5 10.949 9.5 11.2142C9.5 11.4795 9.60536 11.7338 9.79289 11.9213ZM12.7929 11.9213C12.9804 12.1089 13.2348 12.2142 13.5 12.2142C13.7652 12.2142 14.0196 12.1089 14.2071 11.9213C14.3946 11.7338 14.5 11.4795 14.5 11.2142C14.5 10.949 14.3946 10.6947 14.2071 10.5071C14.0196 10.3196 13.7652 10.2142 13.5 10.2142C13.2348 10.2142 12.9804 10.3196 12.7929 10.5071C12.6054 10.6947 12.5 10.949 12.5 11.2142C12.5 11.4795 12.6054 11.7338 12.7929 11.9213ZM14.1965 13.61C14.0355 13.6153 13.8828 13.6823 13.77 13.7972C12.871 14.8032 11.133 14.8032 10.232 13.8002C10.1205 13.6799 9.96614 13.6082 9.80223 13.6006C9.63832 13.5931 9.47801 13.6503 9.35592 13.7599C9.23383 13.8695 9.15974 14.0227 9.14965 14.1865C9.13956 14.3503 9.19428 14.5115 9.302 14.6352C9.64217 15.0139 10.0582 15.3167 10.523 15.5241C10.9878 15.7316 11.491 15.8389 12 15.8392C12.51 15.839 13.0142 15.7313 13.4797 15.5231C13.9453 15.315 14.3617 15.0111 14.702 14.6312C14.8037 14.5064 14.8535 14.3472 14.8409 14.1866C14.8282 14.0261 14.7542 13.8766 14.6342 13.7692C14.5142 13.6618 14.3574 13.6048 14.1965 13.61Z",
+    fill: "currentColor"
+  }), /*#__PURE__*/_react.default.createElement("path", {
+    fillRule: "evenodd",
+    clipRule: "evenodd",
+    d: "M16.2856 8.31714H17.0228V9.05429C17.0228 9.28161 17.1131 9.49963 17.2738 9.66038C17.4345 9.82112 17.6526 9.91143 17.8799 9.91143C18.1072 9.91143 18.3252 9.82112 18.486 9.66038C18.6467 9.49963 18.737 9.28161 18.737 9.05429V8.31714H19.4828C19.7101 8.31714 19.9281 8.22684 20.0888 8.06609C20.2496 7.90535 20.3399 7.68733 20.3399 7.46C20.3399 7.23267 20.2496 7.01465 20.0888 6.85391C19.9281 6.69316 19.7101 6.60286 19.4828 6.60286H18.737V5.85714C18.737 5.62981 18.6467 5.4118 18.486 5.25105C18.3252 5.09031 18.1072 5 17.8799 5C17.6526 5 17.4345 5.09031 17.2738 5.25105C17.1131 5.4118 17.0228 5.62981 17.0228 5.85714V6.60286H16.2856C16.0583 6.60286 15.8403 6.69316 15.6795 6.85391C15.5188 7.01465 15.4285 7.23267 15.4285 7.46C15.4285 7.68733 15.5188 7.90535 15.6795 8.06609C15.8403 8.22684 16.0583 8.31714 16.2856 8.31714Z",
+    fill: "currentColor"
+  }));
+}

package/dist/cjs/plugins/floating-toolbar/ui/EditorHideEmojiIcon.js

@@ -0,0 +1,38 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = EditorHideEmojiIcon;
+
+var _react = _interopRequireDefault(require("react"));
+
+function EditorHideEmojiIcon() {
+  return /*#__PURE__*/_react.default.createElement("svg", {
+    width: "24",
+    height: "24",
+    viewBox: "0 0 24 24",
+    fill: "none",
+    xmlns: "http://www.w3.org/2000/svg"
+  }, /*#__PURE__*/_react.default.createElement("rect", {
+    width: "24",
+    height: "24",
+    fill: "white",
+    fillOpacity: "0.01"
+  }), /*#__PURE__*/_react.default.createElement("path", {
+    fillRule: "evenodd",
+    clipRule: "evenodd",
+    d: "M5.84238 8.67075C5.29444 9.68427 5 10.827 5 12C5 13.8565 5.7375 15.637 7.05025 16.9497C8.36301 18.2625 10.1435 19 12 19C12.9193 19 13.8295 18.8189 14.6788 18.4672C14.9012 18.375 15.1183 18.2717 15.3292 18.1576L14.2087 17.037C13.5324 17.3347 12.7851 17.5 12 17.5C8.967 17.5 6.5 15.033 6.5 12C6.50084 11.2327 6.66182 10.4821 6.9644 9.79277L5.84238 8.67075ZM17.0371 14.2086C17.3347 13.5323 17.5 12.7851 17.5 12C17.5 8.967 15.033 6.5 12 6.5C11.2327 6.50084 10.4821 6.6618 9.79285 6.96437L8.67083 5.84234C9.68433 5.29442 10.827 5 12 5C12.9193 5 13.8295 5.18106 14.6788 5.53284C15.5281 5.88463 16.2997 6.40024 16.9497 7.05025C17.5998 7.70026 18.1154 8.47194 18.4672 9.32122C18.8189 10.1705 19 11.0807 19 12C19 12.9193 18.8189 13.8295 18.4672 14.6788C18.375 14.9012 18.2717 15.1182 18.1577 15.3292L17.0371 14.2086Z",
+    fill: "currentColor"
+  }), /*#__PURE__*/_react.default.createElement("rect", {
+    x: "4.31882",
+    y: "5.55618",
+    width: "1.75",
+    height: "19.9758",
+    rx: "0.875",
+    transform: "rotate(-45 4.31882 5.55618)",
+    fill: "currentColor"
+  }));
+}

package/dist/cjs/plugins/floating-toolbar/ui/EmojiPickerButton.js

@@ -17,14 +17,14 @@ var _styledComponents = _interopRequireDefault(require("styled-components"));
 
 var _button = _interopRequireDefault(require("@atlaskit/button"));
 
-var _emoji = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/emoji"));
-
 var _editorCommon = require("@atlaskit/editor-common");
 
-var _emoji2 = require("@atlaskit/emoji");
+var _emoji = require("@atlaskit/emoji");
 
 var _tooltip = _interopRequireDefault(require("@atlaskit/tooltip"));
 
+var _EditorEmojiAddIcon = _interopRequireDefault(require("./EditorEmojiAddIcon"));
+
 var _templateObject;
 
 // helps adjusts position of popup
@@ -52,7 +52,7 @@ var EmojiPickerButton = function EmojiPickerButton(props) {
       return null;
     }
 
-    return /*#__PURE__*/_react.default.createElement(_emoji2.EmojiPicker, {
+    return /*#__PURE__*/_react.default.createElement(_emoji.EmojiPicker, {
       emojiProvider: providers.emojiProvider,
       onSelection: updateEmoji,
       onPickerRef: function onPickerRef() {}
@@ -94,9 +94,7 @@ var EmojiPickerButton = function EmojiPickerButton(props) {
     onClick: togglePopup,
     ref: buttonRef,
     isSelected: props.isSelected,
-    iconBefore: /*#__PURE__*/_react.default.createElement(_emoji.default, {
-      label: "emoji"
-    })
+    iconBefore: /*#__PURE__*/_react.default.createElement(_EditorEmojiAddIcon.default, null)
   })), renderPopup());
 };
 

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

@@ -388,12 +388,13 @@ var getComponentFromKeymap = function getComponentFromKeymap(keymap) {
 
 exports.getComponentFromKeymap = getComponentFromKeymap;
 var ModalHeader = (0, _reactIntl.injectIntl)(function (_ref4) {
-  var onClose = _ref4.onClose,
-      showKeyline = _ref4.showKeyline,
-      formatMessage = _ref4.intl.formatMessage;
-  return /*#__PURE__*/_react.default.createElement(_styles.Header, {
-    showKeyline: showKeyline
-  }, /*#__PURE__*/_react.default.createElement(_reactIntl.FormattedMessage, messages.editorHelp), /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_ToolbarButton.default, {
+  var formatMessage = _ref4.intl.formatMessage;
+
+  var _useModal = (0, _modalDialog.useModal)(),
+      onClose = _useModal.onClose;
+
+  return /*#__PURE__*/_react.default.createElement(_styles.Header, null, /*#__PURE__*/_react.default.createElement(_reactIntl.FormattedMessage, messages.editorHelp), /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_ToolbarButton.default // @ts-ignore
+  , {
     onClick: onClose,
     title: formatMessage(messages.closeHelpDialog),
     spacing: "compact",
@@ -404,11 +405,8 @@ var ModalHeader = (0, _reactIntl.injectIntl)(function (_ref4) {
   })));
 });
 
-var ModalFooter = function ModalFooter(_ref5) {
-  var showKeyline = _ref5.showKeyline;
-  return /*#__PURE__*/_react.default.createElement(_styles.Footer, {
-    showKeyline: showKeyline
-  }, /*#__PURE__*/_react.default.createElement(_reactIntl.FormattedMessage, (0, _extends2.default)({}, messages.helpDialogTips, {
+var ModalFooter = function ModalFooter() {
+  return /*#__PURE__*/_react.default.createElement(_styles.Footer, null, /*#__PURE__*/_react.default.createElement(_reactIntl.FormattedMessage, (0, _extends2.default)({}, messages.helpDialogTips, {
     values: {
       keyMap: getComponentFromKeymap(keymaps.openHelp)
     }
@@ -468,12 +466,8 @@ 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,
-        components: {
-          Header: ModalHeader,
-          Footer: ModalFooter
-        }
-      }, /*#__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(_reactIntl.FormattedMessage, messages.keyboardShortcuts)), /*#__PURE__*/_react.default.createElement("div", null, this.formatting.filter(function (form) {
+        onClose: this.closeDialog
+      }, /*#__PURE__*/_react.default.createElement(ModalHeader, null), /*#__PURE__*/_react.default.createElement(_modalDialog.ModalBody, null, /*#__PURE__*/_react.default.createElement(_styles.ContentWrapper, null, /*#__PURE__*/_react.default.createElement(_styles.Line, null), /*#__PURE__*/_react.default.createElement(_styles.Content, null, /*#__PURE__*/_react.default.createElement(_styles.ColumnLeft, null, /*#__PURE__*/_react.default.createElement(_styles.Title, null, /*#__PURE__*/_react.default.createElement(_reactIntl.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'];
       }).map(function (form) {
@@ -494,7 +488,7 @@ var HelpDialog = /*#__PURE__*/function (_React$Component) {
         return form.autoFormatting && /*#__PURE__*/_react.default.createElement(_styles.Row, {
           key: "autoFormatting-".concat(form.name)
         }, /*#__PURE__*/_react.default.createElement("span", null, form.name), form.autoFormatting());
-      })))))) : null);
+      })))))), /*#__PURE__*/_react.default.createElement(ModalFooter, null)) : null);
     }
   }]);
   return HelpDialog;

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

@@ -25,15 +25,11 @@ 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 Header = _styledComponents.default.div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  z-index: ", ";\n  min-height: 24px;\n  padding: 20px 40px;\n  font-size: ", ";\n  display: flex;\n  justify-content: space-between;\n  align-items: center;\n  box-shadow: ", ";\n  color: ", ";\n  background-color: ", ";\n  border-radius: ", "px;\n"])), _editorSharedStyles.akEditorUnitZIndex, (0, _editorSharedStyles.relativeFontSizeToBase16)(24), function (props) {
-  return props.showKeyline ? "0 2px 0 ".concat(colors.N30) : 'none';
-}, colors.N400, colors.N0, (0, _constants.borderRadius)());
+var Header = _styledComponents.default.div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  z-index: ", ";\n  min-height: 24px;\n  padding: 20px 40px;\n  font-size: ", ";\n  display: flex;\n  justify-content: space-between;\n  align-items: center;\n  box-shadow: 'none';\n  color: ", ";\n  background-color: ", ";\n  border-radius: ", "px;\n"])), _editorSharedStyles.akEditorUnitZIndex, (0, _editorSharedStyles.relativeFontSizeToBase16)(24), colors.N400, colors.N0, (0, _constants.borderRadius)());
 
 exports.Header = Header;
 
-var Footer = _styledComponents.default.div(_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: ", ";\n"])), _editorSharedStyles.akEditorUnitZIndex, (0, _editorSharedStyles.relativeFontSizeToBase16)(14), colors.N300, function (props) {
-  return props.showKeyline ? "0 -2px 0 ".concat(colors.N30) : 'none';
-});
+var Footer = _styledComponents.default.div(_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), colors.N300);
 
 exports.Footer = Footer;
 

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

@@ -80,17 +80,11 @@ var hyperlinkPlugin = function hyperlinkPlugin(options) {
           icon: function icon() {
             return /*#__PURE__*/_react.default.createElement(_assets.IconLink, null);
           },
-          action: function action(_insert, state) {
-            var pos = state.selection.from;
-            var nodeBefore = state.selection.$from.nodeBefore;
-
-            if (!nodeBefore) {
-              return false;
-            }
-
-            var tr = state.tr.setMeta(_main.stateKey, {
+          action: function action(insert, state) {
+            var tr = insert(undefined);
+            tr.setMeta(_main.stateKey, {
               type: _main.LinkAction.SHOW_INSERT_TOOLBAR
-            }).delete(pos - nodeBefore.nodeSize, pos);
+            });
             return (0, _analytics.addAnalytics)(state, tr, {
               action: _analytics.ACTION.INVOKED,
               actionSubject: _analytics.ACTION_SUBJECT.TYPEAHEAD,

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

@@ -17,7 +17,9 @@ var _pluginKey = require("../media/pm-plugins/plugin-key");
 
 var _main2 = require("../hyperlink/pm-plugins/main");
 
-var _mentions = require("../mentions");
+var _utils = require("../type-ahead/utils");
+
+var _key = require("../mentions/pm-plugins/key");
 
 var _layout = require("../layout");
 
@@ -29,12 +31,12 @@ var _WithPluginState = _interopRequireDefault(require("../../ui/WithPluginState"
 
 var _ToolbarInsertBlock = _interopRequireDefault(require("./ui/ToolbarInsertBlock"));
 
+var _key2 = require("../type-ahead/pm-plugins/key");
+
 var _commands = require("../block-type/commands");
 
 var _commands2 = require("../image-upload/pm-plugins/commands");
 
-var _main3 = require("../type-ahead/pm-plugins/main");
-
 var _analytics = require("../analytics");
 
 var _pluginKey2 = require("../image-upload/pm-plugins/plugin-key");
@@ -92,10 +94,10 @@ var insertBlockPlugin = function insertBlockPlugin() {
       var renderNode = function renderNode(providers) {
         return /*#__PURE__*/_react.default.createElement(_WithPluginState.default, {
           plugins: {
-            typeAheadState: _main3.pluginKey,
+            typeAheadState: _key2.pluginKey,
             blockTypeState: _main.pluginKey,
             mediaState: _pluginKey.stateKey,
-            mentionState: _mentions.mentionPluginKey,
+            mentionState: _key.mentionPluginKey,
             macroState: _pluginKey5.pluginKey,
             hyperlinkState: _main2.stateKey,
             emojiState: _emoji.emojiPluginKey,
@@ -105,8 +107,7 @@ var insertBlockPlugin = function insertBlockPlugin() {
             layoutState: _layout.pluginKey
           },
           render: function render(_ref2) {
-            var typeAheadState = _ref2.typeAheadState,
-                mentionState = _ref2.mentionState,
+            var mentionState = _ref2.mentionState,
                 blockTypeState = _ref2.blockTypeState,
                 mediaState = _ref2.mediaState,
                 _ref2$macroState = _ref2.macroState,
@@ -121,7 +122,7 @@ var insertBlockPlugin = function insertBlockPlugin() {
               buttons: buttons,
               isReducedSpacing: isToolbarReducedSpacing,
               isDisabled: disabled,
-              isTypeAheadAllowed: typeAheadState && typeAheadState.isAllowed,
+              isTypeAheadAllowed: (0, _utils.isTypeAheadAllowed)(editorView.state),
               editorView: editorView,
               tableSupported: options.allowTables,
               actionSupported: !!editorView.state.schema.nodes.taskItem,

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

@@ -53,7 +53,7 @@ var _commands4 = require("../../../expand/commands");
 
 var _commands5 = require("../../../hyperlink/commands");
 
-var _insertMentionQuery = require("../../../mentions/commands/insert-mention-query");
+var _api = require("../../../type-ahead/api");
 
 var _actions4 = require("../../../status/actions");
 
@@ -221,7 +221,12 @@ var ToolbarInsertBlock = /*#__PURE__*/function (_React$PureComponent) {
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "insertMention", function (inputMethod) {
       var editorView = _this.props.editorView;
-      (0, _insertMentionQuery.insertMentionQuery)(inputMethod)(editorView.state, editorView.dispatch);
+
+      if (!editorView) {
+        return true;
+      }
+
+      (0, _api.createTypeAheadTools)(editorView).openMention(inputMethod);
       return true;
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "insertTable", function (inputMethod) {
@@ -239,7 +244,6 @@ var ToolbarInsertBlock = /*#__PURE__*/function (_React$PureComponent) {
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "createDate", function (inputMethod) {
       var editorView = _this.props.editorView;
       (0, _actions.insertDate)(undefined, inputMethod)(editorView.state, editorView.dispatch);
-      (0, _actions.openDatePicker)()(editorView.state, editorView.dispatch);
       return true;
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "createPlaceholderText", function () {

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

@@ -132,6 +132,11 @@ var listPlugin = function listPlugin() {
         },
         render: function render(_ref5) {
           var listState = _ref5.listState;
+
+          if (!listState) {
+            return null;
+          }
+
           return /*#__PURE__*/_react.default.createElement(_ToolbarLists.default, {
             isSmall: isSmall,
             isSeparator: true,

package/dist/cjs/plugins/macro/actions.js

@@ -91,20 +91,20 @@ var insertMacroFromMacroBrowser = function insertMacroFromMacroBrowser(macroProv
                 tr.setSelection(_prosemirrorState.TextSelection.create(tr.doc, state.selection.anchor));
               } // If any extension is currently selected
               else if ((0, _prosemirrorUtils.findSelectedNodeOfType)([extension, bodiedExtension, inlineExtension])(selection)) {
-                  tr = (0, _prosemirrorUtils.replaceSelectedNode)(node)(tr); // Replacing selected node doesn't update the selection. `selection.node` still returns the old node
-
-                  tr.setSelection(_prosemirrorState.NodeSelection.create(tr.doc, tr.mapping.map(state.selection.anchor)));
-                } // When we loose the selection. This usually happens when Synchrony resets or changes
-                // the selection when user is in the middle of updating an extension.
-                else if (extensionState.element) {
-                    pos = view.posAtDOM(extensionState.element, -1);
-
-                    if (pos > -1) {
-                      tr = tr.replaceWith(pos, pos + macroNode.nodeSize, node);
-                      tr.setSelection(_prosemirrorState.Selection.near(tr.doc.resolve(pos)));
-                      targetSelectionSource = _extensionEvents.TARGET_SELECTION_SOURCE.HTML_ELEMENT;
-                    }
-                  } // Only scroll if we have anything to update, best to avoid surprise scroll
+                tr = (0, _prosemirrorUtils.replaceSelectedNode)(node)(tr); // Replacing selected node doesn't update the selection. `selection.node` still returns the old node
+
+                tr.setSelection(_prosemirrorState.NodeSelection.create(tr.doc, tr.mapping.map(state.selection.anchor)));
+              } // When we loose the selection. This usually happens when Synchrony resets or changes
+              // the selection when user is in the middle of updating an extension.
+              else if (extensionState.element) {
+                pos = view.posAtDOM(extensionState.element, -1);
+
+                if (pos > -1) {
+                  tr = tr.replaceWith(pos, pos + macroNode.nodeSize, node);
+                  tr.setSelection(_prosemirrorState.Selection.near(tr.doc.resolve(pos)));
+                  targetSelectionSource = _extensionEvents.TARGET_SELECTION_SOURCE.HTML_ELEMENT;
+                }
+              } // Only scroll if we have anything to update, best to avoid surprise scroll
 
 
               if (dispatch && tr.docChanged) {

package/dist/cjs/plugins/media/index.js

@@ -258,6 +258,7 @@ var mediaPlugin = function mediaPlugin(options) {
       floatingToolbar: function floatingToolbar(state, intl, providerFactory) {
         return (0, _toolbar.floatingToolbar)(state, intl, {
           providerFactory: providerFactory,
+          allowMediaInline: options && options.allowMediaInline,
           allowResizing: options && options.allowResizing,
           allowResizingInTables: options && options.allowResizingInTables,
           allowAnnotation: options && options.allowAnnotation,

package/dist/cjs/plugins/media/nodeviews/mediaGroup.js

@@ -160,6 +160,7 @@ var MediaGroup = /*#__PURE__*/function (_React$Component) {
           onClick: function onClick() {
             (0, _utils.setNodeSelection)(_this.props.view, getNodePos());
           },
+          shouldEnableDownloadButton: mediaOptions.enableDownloadButton,
           actions: [{
             handler: disabled ? function () {} : _this.mediaPluginState.handleMediaNodeRemoval.bind(null, undefined, getNodePos),
             icon: /*#__PURE__*/_react.default.createElement(_close.default, {

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

@@ -203,7 +203,7 @@ var MediaPluginStateImplementation = /*#__PURE__*/function () {
                 _this.allowsUploads = !!_this.mediaProvider.uploadMediaClientConfig;
                 view = _this.view, allowsUploads = _this.allowsUploads; // make sure editable DOM node is mounted
 
-                if (!_this.destroyed && view.dom.parentNode) {
+                if (!_this.destroyed && view && view.dom.parentNode) {
                   // make PM plugin aware of the state change to update UI during 'apply' hook
                   view.dispatch(view.state.tr.setMeta(_pluginKey.stateKey, {
                     allowsUploads: allowsUploads
@@ -254,6 +254,20 @@ var MediaPluginStateImplementation = /*#__PURE__*/function () {
     (0, _defineProperty2.default)(this, "getMediaOptions", function () {
       return _this.options;
     });
+    (0, _defineProperty2.default)(this, "isMediaSchemaNode", function (_ref3) {
+      var _this$mediaOptions;
+
+      var type = _ref3.type;
+      var _this$view$state$sche = _this.view.state.schema.nodes,
+          mediaSingle = _this$view$state$sche.mediaSingle,
+          media = _this$view$state$sche.media;
+
+      if ((_this$mediaOptions = _this.mediaOptions) !== null && _this$mediaOptions !== void 0 && _this$mediaOptions.allowMediaInline) {
+        return type === mediaSingle || type === media;
+      }
+
+      return type === mediaSingle;
+    });
     (0, _defineProperty2.default)(this, "hasUserAuthProvider", function () {
       return !!_this.uploadMediaClientConfig && !!_this.uploadMediaClientConfig.userAuthProvider;
     });
@@ -401,8 +415,8 @@ var MediaPluginStateImplementation = /*#__PURE__*/function () {
       });
     });
     (0, _defineProperty2.default)(this, "handleMediaNodeUnmount", function (oldNode) {
-      _this.mediaNodes = _this.mediaNodes.filter(function (_ref3) {
-        var node = _ref3.node;
+      _this.mediaNodes = _this.mediaNodes.filter(function (_ref4) {
+        var node = _ref4.node;
         return oldNode !== node;
       });
     });
@@ -511,11 +525,9 @@ var MediaPluginStateImplementation = /*#__PURE__*/function () {
       return true;
     });
     (0, _defineProperty2.default)(this, "selectedMediaContainerNode", function () {
-      var _this$view$state = _this.view.state,
-          selection = _this$view$state.selection,
-          schema = _this$view$state.schema;
+      var selection = _this.view.state.selection;
 
-      if (selection instanceof _prosemirrorState.NodeSelection && (selection.node.type === schema.nodes.mediaSingle || selection.node.type === schema.nodes.mediaGroup)) {
+      if (selection instanceof _prosemirrorState.NodeSelection && _this.isMediaSchemaNode(selection.node)) {
         return selection.node;
       }
 
@@ -554,9 +566,8 @@ var MediaPluginStateImplementation = /*#__PURE__*/function () {
     value: function updateElement() {
       var newElement;
       var selectedContainer = this.selectedMediaContainerNode();
-      var mediaSingle = this.view.state.schema.nodes.mediaSingle;
 
-      if (selectedContainer && selectedContainer.type === mediaSingle) {
+      if (selectedContainer && this.isMediaSchemaNode(selectedContainer)) {
         newElement = this.getDomElement(this.view.domAtPos.bind(this.view));
       }
 
@@ -567,19 +578,20 @@ var MediaPluginStateImplementation = /*#__PURE__*/function () {
   }, {
     key: "getDomElement",
     value: function getDomElement(domAtPos) {
-      var _this$view$state2 = this.view.state,
-          selection = _this$view$state2.selection,
-          schema = _this$view$state2.schema;
+      var _this$mediaOptions2;
+
+      var selection = this.view.state.selection;
 
       if (!(selection instanceof _prosemirrorState.NodeSelection)) {
         return;
       }
 
-      if (selection.node.type !== schema.nodes.mediaSingle) {
+      if (!this.isMediaSchemaNode(selection.node)) {
         return;
       }
 
-      var node = (0, _prosemirrorUtils.findDomRefAtPos)(selection.from, domAtPos);
+      var position = (_this$mediaOptions2 = this.mediaOptions) !== null && _this$mediaOptions2 !== void 0 && _this$mediaOptions2.allowMediaInline ? selection.from + 1 : selection.from;
+      var node = (0, _prosemirrorUtils.findDomRefAtPos)(position, domAtPos);
 
       if (node) {
         if (!node.childNodes.length) {

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

@@ -21,7 +21,7 @@ var _mediaCard = require("@atlaskit/media-card");
 
 var _templateObject;
 
-var mediaStyles = (0, _styledComponents.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  .ProseMirror {\n    ", " & [layout='full-width'] .", ",\n    & [layout='wide'] .", " {\n      margin-left: 50%;\n      transform: translateX(-50%);\n    }\n\n    & [layout^='wrap-'] + [layout^='wrap-'] {\n      clear: none;\n      & + p,\n      & + div[class^='fabric-editor-align'],\n      & + ul,\n      & + ol,\n      & + h1,\n      & + h2,\n      & + h3,\n      & + h4,\n      & + h5,\n      & + h6 {\n        clear: both !important;\n      }\n      & .", " {\n        margin-left: 0;\n        margin-right: 0;\n      }\n    }\n\n    .mediaSingleView-content-wrap[layout^='wrap-'] {\n      max-width: 100%;\n      // overwrite default Prosemirror setting making it clear: both\n      clear: inherit;\n    }\n\n    .mediaSingleView-content-wrap[layout='wrap-left'] {\n      float: left;\n    }\n\n    .mediaSingleView-content-wrap[layout='wrap-right'] {\n      float: right;\n    }\n\n    .mediaSingleView-content-wrap[layout='wrap-right']\n      + .mediaSingleView-content-wrap[layout='wrap-left'] {\n      clear: both;\n    }\n\n    /* Larger margins for resize handlers when at depth 0 of the document */\n    & > .mediaSingleView-content-wrap {\n      .richMedia-resize-handle-right {\n        margin-right: -", "px;\n      }\n      .richMedia-resize-handle-left {\n        margin-left: -", "px;\n      }\n    }\n  }\n\n  .richMedia-resize-handle-right,\n  .richMedia-resize-handle-left {\n    display: flex;\n    flex-direction: column;\n\n    /* vertical align */\n    justify-content: center;\n  }\n\n  .richMedia-resize-handle-right {\n    align-items: flex-end;\n    padding-right: 12px;\n    margin-right: -", "px;\n  }\n\n  .richMedia-resize-handle-left {\n    align-items: flex-start;\n    padding-left: 12px;\n    margin-left: -", "px;\n  }\n\n  .richMedia-resize-handle-right::after,\n  .richMedia-resize-handle-left::after {\n    content: ' ';\n    display: flex;\n    width: 3px;\n    height: 64px;\n\n    border-radius: 6px;\n  }\n\n  .", ":hover .richMedia-resize-handle-left::after,\n  .", ":hover .richMedia-resize-handle-right::after {\n    background: ", ";\n  }\n\n  .", " .richMedia-resize-handle-right::after,\n  .", " .richMedia-resize-handle-left::after,\n  .", " .richMedia-resize-handle-right:hover::after,\n  .", " .richMedia-resize-handle-left:hover::after,\n  .", ".is-resizing .richMedia-resize-handle-right::after,\n  .", ".is-resizing .richMedia-resize-handle-left::after {\n    background: ", ";\n  }\n\n  .__resizable_base__ {\n    left: unset !important;\n    width: auto !important;\n    height: auto !important;\n  }\n\n  /* Danger when top level node for smart cards / inline links */\n  .danger > div > div > .media-card-frame,\n  .danger > span > a {\n    background-color: ", ";\n    box-shadow: 0px 0px 0px ", "px\n      ", ";\n    transition: background-color 0s;\n    transition: box-shadow 0s;\n  }\n\n  /* Danger when nested node or common */\n  .danger {\n    /* Media single */\n    .", " .", "::after {\n      border: 1px solid ", ";\n    }\n    /* Media single video player */\n    .", " .", "::after {\n      border: 1px solid ", ";\n    }\n    /* New file experience */\n    .", " .", " {\n      box-shadow: 0 0 0 1px ", " !important;\n    }\n    /* Media resize handlers */\n    .richMedia-resize-handle-right::after,\n    .richMedia-resize-handle-left::after {\n      background: ", ";\n    }\n\n    /* Smart cards */\n    div div .media-card-frame,\n    .inlineCardView-content-wrap > span > a {\n      background-color: rgb(255, 189, 173, 0.5); /* R75 with 50% opactiy */\n      transition: background-color 0s;\n    }\n\n    div div .media-card-frame::after {\n      box-shadow: none;\n    }\n  }\n"])), _editorCommon.mediaSingleSharedStyle, _editorCommon.richMediaClassName, _editorCommon.richMediaClassName, _editorCommon.richMediaClassName, _editorSharedStyles.akEditorMediaResizeHandlerPaddingWide, _editorSharedStyles.akEditorMediaResizeHandlerPaddingWide, _editorSharedStyles.akEditorMediaResizeHandlerPadding, _editorSharedStyles.akEditorMediaResizeHandlerPadding, _editorCommon.richMediaClassName, _editorCommon.richMediaClassName, _colors.N60, _editorSharedStyles.akEditorSelectedNodeClassName, _editorSharedStyles.akEditorSelectedNodeClassName, _editorCommon.richMediaClassName, _editorCommon.richMediaClassName, _editorCommon.richMediaClassName, _editorCommon.richMediaClassName, _colors.B200, _editorSharedStyles.akEditorDeleteBackground, _editorSharedStyles.akEditorSelectedBorderBoldSize, _editorSharedStyles.akEditorDeleteBorder, _editorCommon.richMediaClassName, _mediaCard.fileCardImageViewSelector, _editorSharedStyles.akEditorDeleteIconColor, _editorCommon.richMediaClassName, _mediaCard.inlinePlayerClassName, _editorSharedStyles.akEditorDeleteIconColor, _editorCommon.richMediaClassName, _mediaCard.newFileExperienceClassName, _editorSharedStyles.akEditorDeleteIconColor, _editorSharedStyles.akEditorDeleteIconColor);
+var mediaStyles = (0, _styledComponents.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  .ProseMirror {\n    ", " & [layout='full-width'] .", ",\n    & [layout='wide'] .", " {\n      margin-left: 50%;\n      transform: translateX(-50%);\n    }\n\n    & [layout^='wrap-'] + [layout^='wrap-'] {\n      clear: none;\n      & + p,\n      & + div[class^='fabric-editor-align'],\n      & + ul,\n      & + ol,\n      & + h1,\n      & + h2,\n      & + h3,\n      & + h4,\n      & + h5,\n      & + h6 {\n        clear: both !important;\n      }\n      & .", " {\n        margin-left: 0;\n        margin-right: 0;\n      }\n    }\n\n    .mediaSingleView-content-wrap[layout^='wrap-'] {\n      max-width: 100%;\n      // overwrite default Prosemirror setting making it clear: both\n      clear: inherit;\n    }\n\n    .mediaSingleView-content-wrap[layout='wrap-left'] {\n      float: left;\n    }\n\n    .mediaSingleView-content-wrap[layout='wrap-right'] {\n      float: right;\n    }\n\n    .mediaSingleView-content-wrap[layout='wrap-right']\n      + .mediaSingleView-content-wrap[layout='wrap-left'] {\n      clear: both;\n    }\n\n    /* Larger margins for resize handlers when at depth 0 of the document */\n    & > .mediaSingleView-content-wrap {\n      .richMedia-resize-handle-right {\n        margin-right: -", "px;\n      }\n      .richMedia-resize-handle-left {\n        margin-left: -", "px;\n      }\n    }\n  }\n\n  .richMedia-resize-handle-right,\n  .richMedia-resize-handle-left {\n    display: flex;\n    flex-direction: column;\n\n    /* vertical align */\n    justify-content: center;\n  }\n\n  .richMedia-resize-handle-right {\n    align-items: flex-end;\n    padding-right: 12px;\n    margin-right: -", "px;\n  }\n\n  .richMedia-resize-handle-left {\n    align-items: flex-start;\n    padding-left: 12px;\n    margin-left: -", "px;\n  }\n\n  .richMedia-resize-handle-right::after,\n  .richMedia-resize-handle-left::after {\n    content: ' ';\n    display: flex;\n    width: 3px;\n    height: 64px;\n\n    border-radius: 6px;\n  }\n\n  .", ":hover .richMedia-resize-handle-left::after,\n  .", ":hover .richMedia-resize-handle-right::after {\n    background: ", ";\n  }\n\n  .", " .richMedia-resize-handle-right::after,\n  .", " .richMedia-resize-handle-left::after,\n  .", " .richMedia-resize-handle-right:hover::after,\n  .", " .richMedia-resize-handle-left:hover::after,\n  .", ".is-resizing .richMedia-resize-handle-right::after,\n  .", ".is-resizing .richMedia-resize-handle-left::after {\n    background: ", ";\n  }\n\n  .__resizable_base__ {\n    left: unset !important;\n    width: auto !important;\n    height: auto !important;\n  }\n\n  /* Danger when top level node for smart cards / inline links */\n  .danger > div > div > .media-card-frame,\n  .danger > span > a {\n    background-color: ", ";\n    box-shadow: 0px 0px 0px ", "px\n      ", ";\n    transition: background-color 0s;\n    transition: box-shadow 0s;\n  }\n  .mediaGroupView-content-wrap.danger {\n    /* Media inline */\n    .", "::after {\n      border: 1px solid ", ";\n    }\n  }\n  /* Danger when nested node or common */\n  .danger {\n    /* Media single */\n    .", " .", "::after {\n      border: 1px solid ", ";\n    }\n    /* Media single video player */\n    .", " .", "::after {\n      border: 1px solid ", ";\n    }\n    /* New file experience */\n    .", " .", " {\n      box-shadow: 0 0 0 1px ", " !important;\n    }\n    /* Media resize handlers */\n    .richMedia-resize-handle-right::after,\n    .richMedia-resize-handle-left::after {\n      background: ", ";\n    }\n\n    /* Smart cards */\n    div div .media-card-frame,\n    .inlineCardView-content-wrap > span > a {\n      background-color: rgb(255, 189, 173, 0.5); /* R75 with 50% opactiy */\n      transition: background-color 0s;\n    }\n\n    div div .media-card-frame::after {\n      box-shadow: none;\n    }\n  }\n"])), _editorCommon.mediaSingleSharedStyle, _editorCommon.richMediaClassName, _editorCommon.richMediaClassName, _editorCommon.richMediaClassName, _editorSharedStyles.akEditorMediaResizeHandlerPaddingWide, _editorSharedStyles.akEditorMediaResizeHandlerPaddingWide, _editorSharedStyles.akEditorMediaResizeHandlerPadding, _editorSharedStyles.akEditorMediaResizeHandlerPadding, _editorCommon.richMediaClassName, _editorCommon.richMediaClassName, _colors.N60, _editorSharedStyles.akEditorSelectedNodeClassName, _editorSharedStyles.akEditorSelectedNodeClassName, _editorCommon.richMediaClassName, _editorCommon.richMediaClassName, _editorCommon.richMediaClassName, _editorCommon.richMediaClassName, _colors.B200, _editorSharedStyles.akEditorDeleteBackground, _editorSharedStyles.akEditorSelectedBorderBoldSize, _editorSharedStyles.akEditorDeleteBorder, _mediaCard.fileCardImageViewSelectedSelector, _editorSharedStyles.akEditorDeleteIconColor, _editorCommon.richMediaClassName, _mediaCard.fileCardImageViewSelector, _editorSharedStyles.akEditorDeleteIconColor, _editorCommon.richMediaClassName, _mediaCard.inlinePlayerClassName, _editorSharedStyles.akEditorDeleteIconColor, _editorCommon.richMediaClassName, _mediaCard.newFileExperienceClassName, _editorSharedStyles.akEditorDeleteIconColor, _editorSharedStyles.akEditorDeleteIconColor);
 /* `left: unset` above is to work around Chrome bug where rendering a div with
  * that style applied inside a container that has a scroll, causes any svgs on
  * the page, without a border, that are inside a flexbox, to no longer align to

package/dist/cjs/plugins/media/toolbar/filePreviewItem.js

@@ -0,0 +1,86 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+var _typeof = require("@babel/runtime/helpers/typeof");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.FilePreviewItem = void 0;
+
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _reactDom = _interopRequireDefault(require("react-dom"));
+
+var _mediaViewer = require("@atlaskit/media-viewer");
+
+var _filePreview = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/file-preview"));
+
+var _Button = _interopRequireDefault(require("../../floating-toolbar/ui/Button"));
+
+var _utils = require("./utils");
+
+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); }
+
+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 FilePreviewItem = function FilePreviewItem(_ref) {
+  var mediaPluginState = _ref.mediaPluginState;
+
+  var _useState = (0, _react.useState)(false),
+      _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+      isMediaViewerVisible = _useState2[0],
+      setMediaViewerVisible = _useState2[1];
+
+  var openMediaViewer = function openMediaViewer() {
+    setMediaViewerVisible(true);
+  };
+
+  var onMediaViewerClose = function onMediaViewerClose() {
+    setMediaViewerVisible(false);
+  };
+
+  var renderMediaViewer = function renderMediaViewer() {
+    if (isMediaViewerVisible) {
+      var dataSource = {
+        list: []
+      };
+      var selectedNodeAttrs = (0, _utils.getSelectedMediaContainerNodeAttrs)(mediaPluginState);
+
+      if (selectedNodeAttrs && mediaPluginState.mediaClientConfig) {
+        var id = selectedNodeAttrs.id,
+            _selectedNodeAttrs$co = selectedNodeAttrs.collection,
+            collection = _selectedNodeAttrs$co === void 0 ? '' : _selectedNodeAttrs$co;
+        var identifier = {
+          id: id,
+          mediaItemType: 'file',
+          collectionName: collection
+        };
+        return /*#__PURE__*/_reactDom.default.createPortal( /*#__PURE__*/_react.default.createElement(_mediaViewer.MediaViewer, {
+          collectionName: collection,
+          dataSource: dataSource,
+          mediaClientConfig: mediaPluginState.mediaClientConfig,
+          selectedItem: identifier,
+          onClose: onMediaViewerClose
+        }), document.body);
+      }
+    }
+
+    return null;
+  };
+
+  var mediaViewer = renderMediaViewer();
+  return /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_Button.default, {
+    testId: "file-preview-toolbar-button",
+    key: "editor.media.card.preview",
+    onClick: openMediaViewer,
+    icon: /*#__PURE__*/_react.default.createElement(_filePreview.default, {
+      label: "file preview"
+    })
+  }), mediaViewer);
+};
+
+exports.FilePreviewItem = FilePreviewItem;