@atlaskit/editor-core 151.2.0 → 152.0.1

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

@@ -4,6 +4,12 @@ import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
 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 _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) { _defineProperty(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; }
@@ -13,7 +19,7 @@ import ReactDOM from 'react-dom';
 import { NodeSelection, Plugin } from 'prosemirror-state';
 import { insertPoint } from 'prosemirror-transform';
 import { Decoration, DecorationSet } from 'prosemirror-view';
-import { ErrorReporter } from '@atlaskit/editor-common';
+import { ErrorReporter, browser } from '@atlaskit/editor-common';
 import assert from 'assert';
 import { findDomRefAtPos, isNodeSelection } from 'prosemirror-utils';
 import { insertMediaSingleNode, isMediaSingle } from '../utils/media-single';
@@ -27,6 +33,9 @@ import PickerFacade from '../picker-facade';
 import { INPUT_METHOD } from '../../analytics/types';
 import { isImage } from '../utils/is-image';
 import { isInEmptyLine } from '../../../utils/document';
+import { getMediaFeatureFlag } from '@atlaskit/media-common';
+import { isInListItem } from '../../../utils';
+import { CAPTION_PLACEHOLDER_ID } from '../ui/CaptionPlaceholder';
 export { stateKey } from './plugin-key';
 
 var createDropPlaceholder = function createDropPlaceholder(allowDropLine) {
@@ -243,7 +252,7 @@ export var MediaPluginStateImplementation = /*#__PURE__*/function () {
           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) {
+      if (getMediaFeatureFlag('mediaInline', (_this$mediaOptions = _this.mediaOptions) === null || _this$mediaOptions === void 0 ? void 0 : _this$mediaOptions.featureFlags)) {
         return type === mediaSingle || type === media || type === mediaInline;
       }
 
@@ -282,7 +291,7 @@ export var MediaPluginStateImplementation = /*#__PURE__*/function () {
 
       if (isMediaSingle(state.schema, mediaStateWithContext.fileMimeType)) {
         insertMediaSingleNode(_this.view, mediaStateWithContext, _this.getInputMethod(pickerType), collection, _this.mediaOptions && _this.mediaOptions.alignLeftOnInsert);
-      } else if ((_this$mediaOptions2 = _this.mediaOptions) !== null && _this$mediaOptions2 !== void 0 && _this$mediaOptions2.allowMediaInline && !isInEmptyLine(state) && !isInsidePotentialEmptyParagraph(state) && canInsertMediaInline(state)) {
+      } else if (getMediaFeatureFlag('mediaInline', (_this$mediaOptions2 = _this.mediaOptions) === null || _this$mediaOptions2 === void 0 ? void 0 : _this$mediaOptions2.featureFlags) && !isInEmptyLine(state) && (!isInsidePotentialEmptyParagraph(state) || isInListItem(state)) && canInsertMediaInline(state)) {
         insertMediaInlineNode(_this.view, mediaStateWithContext, collection, _this.getInputMethod(pickerType));
       } else {
         insertMediaGroupNode(_this.view, [mediaStateWithContext], collection, _this.getInputMethod(pickerType));
@@ -590,8 +599,6 @@ export var MediaPluginStateImplementation = /*#__PURE__*/function () {
   }, {
     key: "getDomElement",
     value: function getDomElement(domAtPos) {
-      var _this$mediaOptions3;
-
       var selection = this.view.state.selection;
 
       if (!(selection instanceof NodeSelection)) {
@@ -602,16 +609,14 @@ export var MediaPluginStateImplementation = /*#__PURE__*/function () {
         return;
       }
 
-      var position = (_this$mediaOptions3 = this.mediaOptions) !== null && _this$mediaOptions3 !== void 0 && _this$mediaOptions3.allowMediaInline ? selection.from + 1 : selection.from;
-      var node = findDomRefAtPos(position, domAtPos);
+      var node = findDomRefAtPos(selection.from, domAtPos);
 
       if (node) {
         if (!node.childNodes.length) {
           return node.parentNode;
         }
 
-        var target = node.querySelector('figure') || node;
-        return target;
+        return node;
       }
 
       return;
@@ -804,13 +809,31 @@ export var createPlugin = function createPlugin(_schema, options, reactContext,
         return pluginState;
       }
     },
-    filterTransaction: function filterTransaction(transaction, state) {
-      // Media node inside mediaSingle should not be selected
-      // We are relying on plugins/media/nodeviews/mediaNodeView/media.tsx#selectMediaSingleFromCard
-      // to set selection on correct mediaSingle node,
-      // We don't use 'appendTransaction' because we would like to avoid have additional transactions
-      // http://product-fabric.atlassian.net/browse/ED-10091
-      return !(transaction.selectionSet && isNodeSelection(transaction.selection) && transaction.selection.node.type === state.schema.nodes.media && transaction.selection.$anchor.parent.type === state.schema.nodes.mediaSingle);
+    appendTransaction: function appendTransaction(transactions, _oldState, newState) {
+      var _iterator = _createForOfIteratorHelper(transactions),
+          _step;
+
+      try {
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          var transaction = _step.value;
+          var isSelectionOnMediaInsideMediaSingle = transaction.selectionSet && isNodeSelection(transaction.selection) && transaction.selection.node.type === newState.schema.nodes.media && transaction.selection.$anchor.parent.type === newState.schema.nodes.mediaSingle; // Note: this causes an additional transaction when selecting a media node
+          // through clicking  on it with the cursor.
+
+          if (isSelectionOnMediaInsideMediaSingle) {
+            // If a selection has been placed on a media inside a media single,
+            // we shift it to the media single parent as other code is opinionated about
+            // the selection landing there. In particular the caption insertion and selection
+            // action.
+            return newState.tr.setSelection(NodeSelection.create(newState.doc, transaction.selection.$from.pos - 1));
+          }
+        }
+      } catch (err) {
+        _iterator.e(err);
+      } finally {
+        _iterator.f();
+      }
+
+      return;
     },
     key: stateKey,
     view: function view(_view) {
@@ -866,6 +889,14 @@ export var createPlugin = function createPlugin(_schema, options, reactContext,
       handleTextInput: function handleTextInput(view) {
         getMediaPluginState(view.state).splitMediaGroup();
         return false;
+      },
+      handleClick: function handleClick(_editorView, _pos, event) {
+        var _parentElement;
+
+        // Workaround for Chrome given a regression introduced in prosemirror-view@1.18.6
+        // Returning true prevents that updateSelection() is getting called in the commit below:
+        // @see https://github.com/ProseMirror/prosemirror-view/compare/1.18.5...1.18.6
+        return Boolean((browser.chrome || browser.safari) && event.target && CAPTION_PLACEHOLDER_ID === ((_parentElement = event.target.parentElement) === null || _parentElement === void 0 ? void 0 : _parentElement.dataset.id));
       }
     }
   });

package/dist/esm/plugins/media/toolbar/commands.js

@@ -0,0 +1,45 @@
+import { NodeSelection } from 'prosemirror-state';
+import { isNodeSelection, removeSelectedNode, safeInsert } from 'prosemirror-utils';
+export var changeInlineToMediaCard = function changeInlineToMediaCard(state, dispatch) {
+  var _state$schema$nodes = state.schema.nodes,
+      media = _state$schema$nodes.media,
+      mediaInline = _state$schema$nodes.mediaInline,
+      mediaGroup = _state$schema$nodes.mediaGroup;
+  var selectedNode = state.selection instanceof NodeSelection && state.selection.node.type === mediaInline && state.selection.node;
+
+  if (!selectedNode) {
+    return false;
+  }
+
+  var _selectedNode$attrs = selectedNode.attrs,
+      id = _selectedNode$attrs.id,
+      type = _selectedNode$attrs.type,
+      collection = _selectedNode$attrs.collection;
+  var mediaNode = media.createChecked({
+    id: id,
+    type: type,
+    collection: collection
+  });
+  var group = mediaGroup.createChecked({}, mediaNode);
+  var nodePos = state.tr.doc.resolve(state.selection.from).end();
+  var tr = state.tr;
+  tr = removeSelectedNode(tr);
+  tr = safeInsert(group, nodePos, true)(tr);
+
+  if (dispatch) {
+    dispatch(tr);
+  }
+
+  return true;
+};
+export var removeInlineCard = function removeInlineCard(state, dispatch) {
+  if (isNodeSelection(state.selection)) {
+    if (dispatch) {
+      dispatch(removeSelectedNode(state.tr));
+    }
+
+    return true;
+  }
+
+  return false;
+};

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

@@ -2,11 +2,13 @@ import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import React, { useState } from 'react';
 import ReactDOM from 'react-dom';
 import { MediaViewer } from '@atlaskit/media-viewer';
+import { messages } from '@atlaskit/media-ui';
 import FilePreviewIcon from '@atlaskit/icon/glyph/editor/file-preview';
 import ToolbarButton from '../../floating-toolbar/ui/Button';
 import { getSelectedMediaContainerNodeAttrs } from './utils';
 export var FilePreviewItem = function FilePreviewItem(_ref) {
-  var mediaPluginState = _ref.mediaPluginState;
+  var mediaPluginState = _ref.mediaPluginState,
+      intl = _ref.intl;
 
   var _useState = useState(false),
       _useState2 = _slicedToArray(_useState, 2),
@@ -51,12 +53,14 @@ export var FilePreviewItem = function FilePreviewItem(_ref) {
   };
 
   var mediaViewer = renderMediaViewer();
+  var tooltipContent = intl.formatMessage(messages.preview);
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(ToolbarButton, {
     testId: "file-preview-toolbar-button",
     key: "editor.media.card.preview",
     onClick: openMediaViewer,
     icon: /*#__PURE__*/React.createElement(FilePreviewIcon, {
       label: "file preview"
-    })
+    }),
+    tooltipContent: tooltipContent
   }), mediaViewer);
 };

package/dist/esm/plugins/media/toolbar/index.js

@@ -28,6 +28,8 @@ import { messages as cardMessages } from '../../card/messages';
 import { FilePreviewItem } from './filePreviewItem';
 import { downloadMedia, removeMediaGroupNode } from './utils';
 import { Fragment } from 'prosemirror-model';
+import { changeInlineToMediaCard, removeInlineCard } from './commands';
+import { MediaInlineNodeSelector, MediaSingleNodeSelector } from '../nodeviews/styles';
 
 var remove = function remove(state, dispatch) {
   if (dispatch) {
@@ -79,6 +81,7 @@ var changeMediaCardToInline = function changeMediaCardToInline(state, dispatch)
 var generateMediaCardFloatingToolbar = function generateMediaCardFloatingToolbar(state, intl, mediaPluginState) {
   var mediaGroup = state.schema.nodes.mediaGroup;
   var items = [{
+    id: 'editor.media.view.switcher',
     type: 'dropdown',
     title: intl.formatMessage(messages.displayThumbnail),
     options: [{
@@ -102,7 +105,8 @@ var generateMediaCardFloatingToolbar = function generateMediaCardFloatingToolbar
     render: function render() {
       return /*#__PURE__*/React.createElement(FilePreviewItem, {
         key: "editor.media.card.preview",
-        mediaPluginState: mediaPluginState
+        mediaPluginState: mediaPluginState,
+        intl: intl
       });
     }
   }, {
@@ -134,6 +138,66 @@ var generateMediaCardFloatingToolbar = function generateMediaCardFloatingToolbar
   return items;
 };
 
+var generateMediaInlineFloatingToolbar = function generateMediaInlineFloatingToolbar(state, intl, mediaPluginState) {
+  var mediaInline = state.schema.nodes.mediaInline;
+  var items = [{
+    id: 'editor.media.view.switcher',
+    type: 'dropdown',
+    title: intl.formatMessage(cardMessages.inline),
+    options: [{
+      title: intl.formatMessage(cardMessages.inline),
+      selected: true,
+      onClick: function onClick() {
+        return true;
+      },
+      testId: 'inline-appearance'
+    }, {
+      title: intl.formatMessage(messages.displayThumbnail),
+      selected: false,
+      onClick: changeInlineToMediaCard,
+      testId: 'thumbnail-appearance'
+    }]
+  }, {
+    type: 'separator'
+  }, {
+    type: 'custom',
+    fallback: [],
+    render: function render() {
+      return /*#__PURE__*/React.createElement(FilePreviewItem, {
+        key: "editor.media.card.preview",
+        mediaPluginState: mediaPluginState,
+        intl: intl
+      });
+    }
+  }, {
+    type: 'separator'
+  }, {
+    id: 'editor.media.card.download',
+    type: 'button',
+    icon: DownloadIcon,
+    onClick: function onClick() {
+      downloadMedia(mediaPluginState);
+      return true;
+    },
+    title: intl.formatMessage(messages.download)
+  }, {
+    type: 'separator'
+  }, {
+    id: 'editor.media.delete',
+    type: 'button',
+    appearance: 'danger',
+    icon: RemoveIcon,
+    onMouseEnter: hoverDecoration(mediaInline, true),
+    onMouseLeave: hoverDecoration(mediaInline, false),
+    onFocus: hoverDecoration(mediaInline, true),
+    onBlur: hoverDecoration(mediaInline, false),
+    title: intl.formatMessage(commonMessages.remove),
+    onClick: removeInlineCard,
+    testId: 'media-toolbar-remove-button'
+  }];
+  return items;
+};
+
 var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToolbar(state, intl, options, pluginState, mediaLinkingState) {
   var mediaSingle = state.schema.nodes.mediaSingle;
   var allowResizing = options.allowResizing,
@@ -278,9 +342,14 @@ export var floatingToolbar = function floatingToolbar(state, intl) {
   }
 
   var items = [];
-  var parentNode = findParentNodeOfType(mediaGroup)(state.selection);
+  var parentMediaGroupNode = findParentNodeOfType(mediaGroup)(state.selection);
+  var selectedNodeType;
 
-  if (allowMediaInline && parentNode && parentNode.node.type === mediaGroup) {
+  if (state.selection instanceof NodeSelection) {
+    selectedNodeType = state.selection.node.type;
+  }
+
+  if (allowMediaInline && (parentMediaGroupNode === null || parentMediaGroupNode === void 0 ? void 0 : parentMediaGroupNode.node.type) === mediaGroup) {
     var mediaOffset = state.selection.$from.parentOffset + 1;
 
     baseToolbar.getDomRef = function () {
@@ -291,7 +360,23 @@ export var floatingToolbar = function floatingToolbar(state, intl) {
     };
 
     items = generateMediaCardFloatingToolbar(state, intl, mediaPluginState);
+  } else if (allowMediaInline && selectedNodeType && selectedNodeType === mediaInline) {
+    baseToolbar.getDomRef = function () {
+      var _mediaPluginState$ele2;
+
+      var element = (_mediaPluginState$ele2 = mediaPluginState.element) === null || _mediaPluginState$ele2 === void 0 ? void 0 : _mediaPluginState$ele2.querySelector(".".concat(MediaInlineNodeSelector));
+      return element || mediaPluginState.element;
+    };
+
+    items = generateMediaInlineFloatingToolbar(state, intl, mediaPluginState);
   } else {
+    baseToolbar.getDomRef = function () {
+      var _mediaPluginState$ele3;
+
+      var element = (_mediaPluginState$ele3 = mediaPluginState.element) === null || _mediaPluginState$ele3 === void 0 ? void 0 : _mediaPluginState$ele3.querySelector(".".concat(MediaSingleNodeSelector));
+      return element || mediaPluginState.element;
+    };
+
     items = generateMediaSingleFloatingToolbar(state, intl, options, mediaPluginState, mediaLinkingState);
   }
 

package/dist/esm/plugins/media/ui/ResizableMediaSingle/index.js

@@ -427,7 +427,15 @@ var ResizableMediaSingle = /*#__PURE__*/function (_React$Component) {
           return columResizingPluginState ? !columResizingPluginState.dragging : true;
         },
         nodeType: "media",
-        dispatchAnalyticsEvent: this.props.dispatchAnalyticsEvent
+        dispatchAnalyticsEvent: this.props.dispatchAnalyticsEvent // when cursor is located below a media with caption,
+        // press “Up“ key will result cursor focus on an invalid position, (on the resize handler)
+        // This workaround adds an empty div inside the resize handler to prevent the issue.
+        ,
+        handleComponentFunc: function handleComponentFunc() {
+          return /*#__PURE__*/React.createElement("div", {
+            contentEditable: false
+          });
+        }
       }), children));
     }
   }]);

package/dist/esm/plugins/media/utils/media-common.js

@@ -279,7 +279,7 @@ export var unwrapNestedMediaElements = function unwrapNestedMediaElements(html)
     // ProseMirror should handle this case properly.
 
 
-    if (mediaParent instanceof HTMLDivElement) {
+    if (mediaParent instanceof HTMLDivElement || mediaParent instanceof HTMLSpanElement && mediaParent.closest('[class*="emoji-common"]')) {
       return;
     } // Find the top most element that the parent has a valid container for the image.
     // Stop just before found the wrapper

package/dist/esm/plugins/media/utils/media-files.js

@@ -95,7 +95,12 @@ export var insertMediaInlineNode = function insertMediaInlineNode(view, mediaSta
     collection: collection
   });
   var space = state.schema.text(' ');
-  var pos = state.selection.$to.pos;
+  var pos = state.selection.$to.pos; // If the selection is inside an empty list item set pos inside paragraph
+
+  if (isInListItem(state) && isInsidePotentialEmptyParagraph(state)) {
+    pos = pos + 1;
+  }
+
   var content = Fragment.from([mediaInlineNode, space]); // Delete the selection if a selection is made
 
   var deleteRange = findDeleteRange(state);

package/dist/esm/plugins/panel/actions.js

@@ -42,7 +42,7 @@ export var removePanel = function removePanel() {
 };
 export var changePanelType = function changePanelType(panelType) {
   var panelOptions = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  var UNSAFE_allowCustomPanel = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+  var allowCustomPanel = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
   return function (state, dispatch) {
     var nodes = state.schema.nodes,
         tr = state.tr;
@@ -56,7 +56,7 @@ export var changePanelType = function changePanelType(panelType) {
     var previousType = panelNode.node.attrs.panelType;
     var newTr;
 
-    if (UNSAFE_allowCustomPanel) {
+    if (allowCustomPanel) {
       var previousColor = panelNode.node.attrs.panelColor || getPanelTypeBackground(previousType);
       var previousIcon = panelNode.node.attrs.panelIcon;
 

package/dist/esm/plugins/panel/index.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { customPanel, PanelType } from '@atlaskit/adf-schema';
+import { panel, PanelType } from '@atlaskit/adf-schema';
 import { createPlugin } from './pm-plugins/main';
 import { getToolbarConfig } from './toolbar';
 import keymap from './pm-plugins/keymaps';
@@ -7,7 +7,7 @@ import { addAnalytics, ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, INPUT_METHOD,
 import { IconPanel, IconPanelNote, IconPanelSuccess, IconPanelWarning, IconPanelError } from '../quick-insert/assets';
 import { messages } from '../block-type/messages';
 import IconCustomPanel from '../quick-insert/assets/custom-panel';
-import { T75 } from '@atlaskit/theme/colors';
+import { T50 } from '@atlaskit/theme/colors';
 
 var insertPanelTypeWithAnalytics = function insertPanelTypeWithAnalytics(panelAttributes, state, insert) {
   var tr = insert(insertPanelType(panelAttributes, state));
@@ -37,7 +37,7 @@ var panelPlugin = function panelPlugin() {
   return {
     name: 'panel',
     nodes: function nodes() {
-      var panelNode = customPanel(!!options.UNSAFE_allowCustomPanel);
+      var panelNode = panel(!!options.allowCustomPanel);
       return [{
         name: 'panel',
         node: panelNode
@@ -130,7 +130,7 @@ var panelPlugin = function panelPlugin() {
           }
         }];
 
-        if (options.UNSAFE_allowCustomPanelEdit && options.UNSAFE_allowCustomPanel) {
+        if (options.allowCustomPanel && options.allowCustomPanelEdit) {
           quickInsertOptions.push({
             id: 'custompanel',
             title: formatMessage(messages.customPanel),
@@ -143,7 +143,7 @@ var panelPlugin = function panelPlugin() {
               return insertPanelTypeWithAnalytics({
                 panelType: PanelType.CUSTOM,
                 panelIcon: ':rainbow:',
-                panelColor: T75
+                panelColor: T50
               }, state, insert);
             }
           });

package/dist/esm/plugins/panel/nodeviews/panel.js

@@ -55,7 +55,7 @@ var PanelNodeView = /*#__PURE__*/function () {
     this.view = view;
     this.node = node;
 
-    var _DOMSerializer$render = DOMSerializer.renderSpec(document, panelAttrsToDom(node.attrs, pluginOptions.UNSAFE_allowCustomPanel || false)),
+    var _DOMSerializer$render = DOMSerializer.renderSpec(document, panelAttrsToDom(node.attrs, pluginOptions.allowCustomPanel || false)),
         dom = _DOMSerializer$render.dom,
         contentDOM = _DOMSerializer$render.contentDOM;
 
@@ -71,7 +71,7 @@ var PanelNodeView = /*#__PURE__*/function () {
 
     this.icon.contentEditable = 'false';
     ReactDOM.render( /*#__PURE__*/React.createElement(PanelIcon, {
-      allowCustomPanel: pluginOptions.UNSAFE_allowCustomPanel,
+      allowCustomPanel: pluginOptions.allowCustomPanel,
       panelAttributes: node.attrs,
       providerFactory: this.providerFactory
     }), this.icon);

package/dist/esm/plugins/panel/toolbar.js

@@ -12,7 +12,7 @@ import NoteIcon from '@atlaskit/icon/glyph/editor/note';
 import RemoveIcon from '@atlaskit/icon/glyph/editor/remove';
 import WarningIcon from '@atlaskit/icon/glyph/editor/warning';
 import ErrorIcon from '@atlaskit/icon/glyph/editor/error';
-import RemoveEmojiIcon from '../floating-toolbar/ui/EditorRemoveEmojiIcon';
+import RemoveEmojiIcon from '@atlaskit/icon/glyph/editor/remove-emoji';
 import commonMessages from '../../messages';
 import { removePanel, changePanelType } from './actions';
 import { hoverDecoration } from '../base/pm-plugins/decoration';
@@ -24,7 +24,7 @@ import { DEFAULT_BORDER_COLOR } from '../../ui/ColorPalette/Palettes';
 import { PanelType } from '@atlaskit/adf-schema';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE, ACTION_SUBJECT_ID, withAnalytics } from '../analytics';
 import { messages } from './message';
-export var panelIconMap = (_panelIconMap = {}, _defineProperty(_panelIconMap, PanelType.INFO, ':info:'), _defineProperty(_panelIconMap, PanelType.NOTE, ':note:'), _defineProperty(_panelIconMap, PanelType.WARNING, ':warning:'), _defineProperty(_panelIconMap, PanelType.ERROR, ':error:'), _defineProperty(_panelIconMap, PanelType.SUCCESS, ':success:'), _defineProperty(_panelIconMap, PanelType.TIP, ':tip:'), _panelIconMap);
+export var panelIconMap = (_panelIconMap = {}, _defineProperty(_panelIconMap, PanelType.INFO, ':info:'), _defineProperty(_panelIconMap, PanelType.NOTE, ':note:'), _defineProperty(_panelIconMap, PanelType.WARNING, ':warning:'), _defineProperty(_panelIconMap, PanelType.ERROR, ':cross_mark:'), _defineProperty(_panelIconMap, PanelType.SUCCESS, ':check_mark:'), _defineProperty(_panelIconMap, PanelType.TIP, ':tip:'), _panelIconMap);
 export var getToolbarItems = function getToolbarItems(formatMessage, panelNodeType, isCustomPanelEnabled, isCustomPanelEditable, providerFactory, activePanelType, activePanelColor, activePanelIcon) {
   var items = [{
     id: 'editor.panel.info',
@@ -238,9 +238,14 @@ export var getToolbarConfig = function getToolbarConfig(state, intl) {
     var _panelObject$node$att = panelObject.node.attrs,
         panelType = _panelObject$node$att.panelType,
         panelColor = _panelObject$node$att.panelColor,
-        panelIcon = _panelObject$node$att.panelIcon; // force toolbar to be turned on
+        panelIcon = _panelObject$node$att.panelIcon;
 
-    var items = getToolbarItems(formatMessage, nodeType, options.UNSAFE_allowCustomPanel || false, options.UNSAFE_allowCustomPanel && options.UNSAFE_allowCustomPanelEdit || false, providerFactory, panelType, options.UNSAFE_allowCustomPanel ? panelColor : undefined, options.UNSAFE_allowCustomPanel ? panelIcon : undefined);
+    var isStandardPanel = function isStandardPanel(panelType) {
+      return panelType !== PanelType.CUSTOM ? panelType : undefined;
+    }; // force toolbar to be turned on
+
+
+    var items = getToolbarItems(formatMessage, nodeType, options.allowCustomPanel || false, options.allowCustomPanel && options.allowCustomPanelEdit || false, providerFactory, panelType, options.allowCustomPanel ? panelColor : undefined, options.allowCustomPanel ? panelIcon || isStandardPanel(panelType) : undefined);
 
     var getDomRef = function getDomRef(editorView) {
       var domAtPos = editorView.domAtPos.bind(editorView);

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

@@ -1,3 +1,9 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+
+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 _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) { _defineProperty(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; }
+
 import { findSelectedNodeOfType, findParentNodeOfType } from 'prosemirror-utils';
 import { PanelType } from '@atlaskit/adf-schema';
 import { PanelSharedCssClassName } from '@atlaskit/editor-common';
@@ -17,6 +23,13 @@ export var panelAttrsToDom = function panelAttrsToDom(attrs, allowCustomPanel) {
     'data-panel-type': panelType || PanelType.INFO,
     style: style
   };
+
+  if (panelColor && isCustomPanel) {
+    panelAttrs = _objectSpread(_objectSpread({}, panelAttrs), {}, {
+      'data-panel-color': panelColor
+    });
+  }
+
   var iconDiv = ['div', {
     class: PanelSharedCssClassName.icon
   }];

package/dist/esm/plugins/rank.js

@@ -6,9 +6,10 @@ export default {
   // https://product-fabric.atlassian.net/wiki/spaces/E/pages/1113098008/Selection+Guide#Special-Cases
   'expandKeymap', 'tableSelectionKeymap', 'tableKeymap', 'captionKeymap', // selection keymap needs to be above gap cursor keymap so it can set node selections from
   // left/right arrows
-  'selectionKeymap', 'gapCursorKeymap', 'gapCursor', 'syncUrlText', 'fakeCursorToolbarPlugin', 'hyperLink', 'table', 'tableDecorations', 'hyperlinkInputRule', 'tablePMColResizing', 'hyperlinkKeymap', 'tableColResizing', 'undoRedoKeyMap', 'blockTypeKeyMap', 'tableEditing', 'filterStepsPlugin', 'pmCollab', 'collab', 'ruleInputRule', 'ruleKeymap', 'panel', 'media', 'mediaKeymap', 'mediaSingleKeymap', 'mediaEditor', 'unsupportedContent', 'jiraIssue', 'fakeTextCursor', 'helpDialog', 'helpDialogKeymap', 'macro', 'expand', 'extension', 'layout', 'contextPanel', 'floatingToolbar', 'clearMarksOnChange', 'reactNodeView', 'history', 'undoRedoPlugin', 'codeBlockIndent', 'placeholder', 'width', 'maxContentSize', 'multilineContent', 'grid', 'mobileDimensions', 'scrollGutterPlugin', 'analytics', 'findReplace', 'selection', 'avatarGroup', 'viewUpdateSubscription', 'inlineCode'],
+  'selectionKeymap', 'gapCursorKeymap', 'gapCursor', 'syncUrlText', 'fakeCursorToolbarPlugin', 'hyperLink', 'table', 'tableDecorations', 'hyperlinkInputRule', 'tablePMColResizing', 'hyperlinkKeymap', 'tableColResizing', 'undoRedoKeyMap', 'blockTypeKeyMap', 'tableEditing', 'filterStepsPlugin', 'pmCollab', 'collab', 'ruleInputRule', 'ruleKeymap', 'panel', 'media', 'mediaKeymap', 'mediaSingleKeymap', 'mediaEditor', 'unsupportedContent', 'jiraIssue', 'fakeTextCursor', 'helpDialog', 'helpDialogKeymap', 'macro', 'expand', 'extension', 'layout', 'contextPanel', 'floatingToolbar', 'clearMarksOnChange', 'reactNodeView', 'history', 'undoRedoPlugin', 'codeBlockIndent', 'placeholder', 'width', 'maxContentSize', 'multilineContent', 'grid', 'mobileDimensions', 'scrollGutterPlugin', 'analytics', 'findReplace', 'selection', 'avatarGroup', 'viewUpdateSubscription', 'beforePrimaryToolbar', 'inlineCode'],
   nodes: ['doc', 'paragraph', 'text', 'bulletList', 'orderedList', 'listItem', 'heading', 'blockquote', 'codeBlock', 'rule', 'panel', 'mention', 'confluenceUnsupportedBlock', 'confluenceUnsupportedInline', 'unsupportedBlock', 'unsupportedInline', 'confluenceJiraIssue', 'hardBreak', 'emoji', 'placeholder', 'mediaSingle', 'mediaGroup', 'table', 'expand', 'nestedExpand', 'media', 'tableHeader', 'decisionList', 'tableRow', 'decisionItem', 'tableCell', 'taskList', 'taskItem', 'extension', 'bodiedExtension', 'inlineExtension', 'layoutSection', 'layoutColumn', 'inlineCard', 'blockCard', 'embedCard'],
-  marks: [// Inline marks
+  marks: [// Fragment mark is both for inline and block elements
+  'fragment', // Inline marks
   'link', 'em', 'strong', 'textColor', 'strike', 'subsup', 'underline', 'code', 'typeAheadQuery', // Block marks
   'alignment', 'breakout', 'indentation', 'annotation', //Unsupported mark
   'unsupportedMark', 'unsupportedNodeAttribute']

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

@@ -10,6 +10,29 @@ export var getInitialState = function getInitialState(state) {
     selection: state.selection
   };
 };
+
+var toggleContentEditable = function toggleContentEditable(node) {
+  var root = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+
+  if (root || node.getAttribute('contenteditable') === 'true') {
+    var wasTrue = node.getAttribute('contenteditable') === 'true';
+    node.setAttribute('contenteditable', 'false');
+    requestAnimationFrame(function () {
+      if (wasTrue) {
+        node.setAttribute('contenteditable', 'true');
+      } else {
+        node.removeAttribute('contenteditable');
+      }
+    });
+  } // any children with contenteditable = true block selection from proceeding
+
+
+  var children = Array.from(node.children);
+  children.forEach(function (child) {
+    return toggleContentEditable(child);
+  });
+};
+
 export var createPlugin = function createPlugin(dispatch, dispatchAnalyticsEvent) {
   var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   return new Plugin({
@@ -92,10 +115,11 @@ export var createPlugin = function createPlugin(dispatch, dispatchAnalyticsEvent
           return false;
         },
         keydown: function keydown(editorView, event) {
-          // Firefox bugfix to bypass issue with editing text adjacent to a DOM node with
+          var state = editorView.state; // Firefox bugfix to bypass issue with editing text adjacent to a DOM node with
           // contenteditable="false". (See https://product-fabric.atlassian.net/browse/ED-9452)
           // On keypress, if the head of cursor selection touches a node with contenteditable="false",
           // we temporarily remove the attribute, wait one tick, then restore it with its original value.
+
           if (browser.gecko) {
             var node = editorView.nodeDOM(editorView.state.selection.head);
 
@@ -105,6 +129,31 @@ export var createPlugin = function createPlugin(dispatch, dispatchAnalyticsEvent
                 node.setAttribute('contenteditable', 'false');
               });
             }
+          } // Bugfix for block ReactNodeViews like table and extension
+          // They could not be selected with Shift + ArrowDown/ArrowUp
+          // Fixed when contenteditable = false, but then you couldn't edit their contents
+          // Therefore, briefly set contenteditable=false to allow the selection through, then set it back to true
+
+
+          if (event instanceof KeyboardEvent && event.shiftKey && (event.key === 'ArrowDown' || event.key === 'ArrowUp')) {
+            var pos;
+
+            if (event.key === 'ArrowDown') {
+              pos = state.selection.$head.after();
+            } else {
+              pos = state.selection.$head.before() - 1; // block extensions only take up one position, dont need to get before()
+
+              if (!editorView.nodeDOM(pos)) {
+                pos = state.doc.resolve(pos).before();
+              }
+            }
+
+            var _node = editorView.nodeDOM(pos);
+
+            if (_node instanceof HTMLDivElement && _node.className.includes('View-content-wrap') // class added by ReactNodeView
+            ) {
+              toggleContentEditable(_node, true);
+            }
           }
 
           return false;

package/dist/esm/plugins/status/ui/statusPicker.js

@@ -227,7 +227,8 @@ export var StatusPickerWithoutAnalytcs = /*#__PURE__*/function (_React$Component
           target = _this$props.target;
       var _this$state3 = this.state,
           color = _this$state3.color,
-          text = _this$state3.text;
+          text = _this$state3.text,
+          localId = _this$state3.localId;
       return target && /*#__PURE__*/React.createElement(PopupWithListeners, {
         target: target,
         offset: [0, 8],
@@ -244,7 +245,8 @@ export var StatusPickerWithoutAnalytcs = /*#__PURE__*/function (_React$Component
         onColorClick: this.onColorClick,
         onColorHover: this.onColorHover,
         onTextChanged: this.onTextChanged,
-        onEnter: this.onEnter
+        onEnter: this.onEnter,
+        localId: localId
       })));
     }
   }]);