@atlaskit/editor-core 151.2.0 → 152.0.1

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

@@ -31,10 +31,10 @@ const mediaPlugin = options => ({
     const {
       allowMediaGroup = true,
       allowMediaSingle = false,
-      allowMediaInline = false,
       featureFlags
     } = options || {};
     const captions = getMediaFeatureFlag('captions', featureFlags);
+    const allowMediaInline = getMediaFeatureFlag('mediaInline', featureFlags);
     const mediaSingleNode = captions ? mediaSingleWithCaption : mediaSingle;
     return [{
       name: 'mediaGroup',
@@ -221,7 +221,7 @@ const mediaPlugin = options => ({
     }],
     floatingToolbar: (state, intl, providerFactory) => floatingToolbar(state, intl, {
       providerFactory,
-      allowMediaInline: options && options.allowMediaInline,
+      allowMediaInline: options && getMediaFeatureFlag('mediaInline', options.featureFlags),
       allowResizing: options && options.allowResizing,
       allowResizingInTables: options && options.allowResizingInTables,
       allowAnnotation: options && options.allowAnnotation,

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

@@ -11,6 +11,7 @@ import { isNodeSelectedOrInRange, SelectedState } from '../../../utils/nodes';
 import { pluginKey as editorDisabledPluginKey } from '../../editor-disabled';
 import { stateKey as mediaStateKey } from '../pm-plugins/plugin-key';
 import { MediaNodeUpdater } from './mediaNodeUpdater';
+import { getMediaFeatureFlag } from '@atlaskit/media-common';
 
 const isMediaGroupSelectedFromProps = props => {
   return isNodeSelectedOrInRange(props.anchorPos, props.headPos, props.getPos(), props.node.nodeSize);
@@ -135,7 +136,7 @@ export default class MediaGroup extends React.Component {
           onClick: () => {
             setNodeSelection(this.props.view, getNodePos());
           },
-          ...mediaInlineOptions(mediaOptions.allowMediaInline)
+          ...mediaInlineOptions(getMediaFeatureFlag('mediaInline', mediaOptions.featureFlags))
         };
       });
       return /*#__PURE__*/React.createElement(Filmstrip, {

package/dist/es2019/plugins/media/nodeviews/mediaInline.js

@@ -1,7 +1,8 @@
 import React, { useEffect, useState } from 'react';
-import { ReactNodeView } from '../../../nodeviews/';
+import { SelectionBasedNodeView } from '../../../nodeviews/';
 import { MediaInlineCard } from '@atlaskit/media-card';
 import { WithProviders } from '@atlaskit/editor-common';
+import { MediaInlineNodeSelector } from './styles';
 export const MediaInline = props => {
   const [viewMediaClientConfig, setViewMediaClientConfig] = useState({});
   useEffect(() => {
@@ -27,14 +28,16 @@ export const MediaInline = props => {
     collectionName: collection
   };
   return /*#__PURE__*/React.createElement(MediaInlineCard, {
+    isSelected: props.isSelected,
     identifier: identifier,
     mediaClientConfig: viewMediaClientConfig
   });
 };
-export class MediaInlineNodeView extends ReactNodeView {
+export class MediaInlineNodeView extends SelectionBasedNodeView {
   createDomRef() {
     const domRef = document.createElement('span');
     domRef.contentEditable = 'false';
+    domRef.classList.add(MediaInlineNodeSelector);
     return domRef;
   }
 
@@ -54,7 +57,7 @@ export class MediaInlineNodeView extends ReactNodeView {
       return true;
     }
 
-    return false;
+    return super.viewShouldUpdate(nextNode);
   }
 
   render(props) {
@@ -74,7 +77,8 @@ export class MediaInlineNodeView extends ReactNodeView {
         return /*#__PURE__*/React.createElement(MediaInline, {
           identifier: this.node.attrs.id,
           mediaProvider: mediaProvider,
-          node: this.node
+          node: this.node,
+          isSelected: this.nodeInsideSelection()
         });
       }
     });

package/dist/es2019/plugins/media/nodeviews/mediaSingle.js

@@ -13,7 +13,7 @@ import { stateKey as mediaPluginKey } from '../pm-plugins/main';
 import { MediaNodeUpdater } from './mediaNodeUpdater';
 import { findParentNodeOfTypeClosestToPos } from 'prosemirror-utils';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
-import { FigureWrapper } from './styles';
+import { FigureWrapper, MediaSingleNodeSelector } from './styles';
 import { floatingLayouts, isRichMediaInsideOfBlockNode } from '../../../utils/rich-media-utils';
 import { getAttrsFromUrl } from '@atlaskit/media-client';
 import { isMediaBlobUrlFromAttrs } from '../utils/media-common';
@@ -289,7 +289,9 @@ export default class MediaSingleNode extends Component {
     const lineLength = this.getLineLength(view, getPos()) || this.props.lineLength;
     const isSelected = selected();
     const shouldShowPlaceholder = getMediaFeatureFlag('captions', mediaOptions.featureFlags) && node.childCount !== 2 && isSelected && state.selection instanceof NodeSelection;
-    const MediaChildren = /*#__PURE__*/React.createElement(FigureWrapper, null, /*#__PURE__*/React.createElement("div", {
+    const MediaChildren = /*#__PURE__*/React.createElement(FigureWrapper, {
+      className: MediaSingleNodeSelector
+    }, /*#__PURE__*/React.createElement("div", {
       ref: this.props.forwardRef
     }), shouldShowPlaceholder && /*#__PURE__*/React.createElement(CaptionPlaceholder, {
       onClick: this.clickPlaceholder
@@ -391,12 +393,12 @@ class MediaSingleNodeView extends ReactNodeView {
     return undefined;
   }
 
-  update(node, decorations, isValidUpdate) {
+  update(node, decorations, _innerDecorations, isValidUpdate) {
     if (!isValidUpdate) {
       isValidUpdate = (currentNode, newNode) => this.getNodeMediaId(currentNode) === this.getNodeMediaId(newNode);
     }
 
-    return super.update(node, decorations, isValidUpdate);
+    return super.update(node, decorations, _innerDecorations, isValidUpdate);
   }
 
   render(props, forwardRef) {
@@ -456,7 +458,7 @@ class MediaSingleNodeView extends ReactNodeView {
       if (offsetLeft !== this.lastOffsetLeft) {
         this.lastOffsetLeft = offsetLeft;
         this.forceViewUpdate = true;
-        this.update(this.node, [], () => true);
+        this.update(this.node, [], [], () => true);
       }
     }
 

package/dist/es2019/plugins/media/nodeviews/styles.js

@@ -1,5 +1,7 @@
 import React from 'react';
 import styled from 'styled-components';
+export const MediaInlineNodeSelector = 'media-inline-node';
+export const MediaSingleNodeSelector = 'media-single-node';
 export const FigureWrapper = styled.figure`
   margin: 0;
 `;

package/dist/es2019/plugins/media/pm-plugins/alt-text/ui/AltTextEdit.js

@@ -186,6 +186,8 @@ export class AltTextEditComponent extends React.Component {
       onClick: this.closeMediaAltTextMenu
     })), /*#__PURE__*/React.createElement(PanelTextInput, {
       testId: "alt-text-input",
+      ariaLabel: formatMessage(messages.placeholder),
+      describedById: "support-text",
       placeholder: formatMessage(messages.placeholder),
       defaultValue: this.state.lastValue,
       onCancel: this.dispatchCancelEvent,
@@ -202,7 +204,9 @@ export class AltTextEditComponent extends React.Component {
       })),
       tooltipContent: formatMessage(messages.clear),
       onClick: this.handleClearText
-    }))), !!errorsList.length && /*#__PURE__*/React.createElement(ValidationWrapper, null, errorsList), /*#__PURE__*/React.createElement(SupportText, null, formatMessage(messages.supportText)));
+    }))), !!errorsList.length && /*#__PURE__*/React.createElement(ValidationWrapper, null, errorsList), /*#__PURE__*/React.createElement(SupportText, {
+      id: "support-text"
+    }, formatMessage(messages.supportText)));
   }
 
   fireAnalytics(actionType) {

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

@@ -4,7 +4,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';
@@ -18,6 +18,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';
 
 const createDropPlaceholder = allowDropLine => {
@@ -157,7 +160,7 @@ export class MediaPluginStateImplementation {
         media
       } = this.view.state.schema.nodes;
 
-      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;
       }
 
@@ -194,7 +197,7 @@ export class MediaPluginStateImplementation {
 
       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));
@@ -491,8 +494,6 @@ export class MediaPluginStateImplementation {
   }
 
   getDomElement(domAtPos) {
-    var _this$mediaOptions3;
-
     const {
       selection
     } = this.view.state;
@@ -505,16 +506,14 @@ export class MediaPluginStateImplementation {
       return;
     }
 
-    const position = (_this$mediaOptions3 = this.mediaOptions) !== null && _this$mediaOptions3 !== void 0 && _this$mediaOptions3.allowMediaInline ? selection.from + 1 : selection.from;
-    const node = findDomRefAtPos(position, domAtPos);
+    const node = findDomRefAtPos(selection.from, domAtPos);
 
     if (node) {
       if (!node.childNodes.length) {
         return node.parentNode;
       }
 
-      const target = node.querySelector('figure') || node;
-      return target;
+      return node;
     }
 
     return;
@@ -648,13 +647,21 @@ export const createPlugin = (_schema, options, reactContext, dispatch, mediaOpti
 
     },
 
-    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(transactions, _oldState, newState) {
+      for (const transaction of transactions) {
+        const 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));
+        }
+      }
+
+      return;
     },
 
     key: stateKey,
@@ -716,8 +723,16 @@ export const createPlugin = (_schema, options, reactContext, dispatch, mediaOpti
       handleTextInput(view) {
         getMediaPluginState(view.state).splitMediaGroup();
         return false;
-      }
+      },
 
+      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/es2019/plugins/media/toolbar/commands.js

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

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

@@ -1,11 +1,13 @@
 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 const FilePreviewItem = ({
-  mediaPluginState
+  mediaPluginState,
+  intl
 }) => {
   const [isMediaViewerVisible, setMediaViewerVisible] = useState(false);
 
@@ -48,12 +50,14 @@ export const FilePreviewItem = ({
   };
 
   const mediaViewer = renderMediaViewer();
+  const 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/es2019/plugins/media/toolbar/index.js

@@ -21,6 +21,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';
 
 const remove = (state, dispatch) => {
   if (dispatch) {
@@ -75,6 +77,7 @@ const generateMediaCardFloatingToolbar = (state, intl, mediaPluginState) => {
     mediaGroup
   } = state.schema.nodes;
   const items = [{
+    id: 'editor.media.view.switcher',
     type: 'dropdown',
     title: intl.formatMessage(messages.displayThumbnail),
     options: [{
@@ -98,7 +101,8 @@ const generateMediaCardFloatingToolbar = (state, intl, mediaPluginState) => {
     render: () => {
       return /*#__PURE__*/React.createElement(FilePreviewItem, {
         key: "editor.media.card.preview",
-        mediaPluginState: mediaPluginState
+        mediaPluginState: mediaPluginState,
+        intl: intl
       });
     }
   }, {
@@ -130,6 +134,68 @@ const generateMediaCardFloatingToolbar = (state, intl, mediaPluginState) => {
   return items;
 };
 
+const generateMediaInlineFloatingToolbar = (state, intl, mediaPluginState) => {
+  const {
+    mediaInline
+  } = state.schema.nodes;
+  const items = [{
+    id: 'editor.media.view.switcher',
+    type: 'dropdown',
+    title: intl.formatMessage(cardMessages.inline),
+    options: [{
+      title: intl.formatMessage(cardMessages.inline),
+      selected: true,
+      onClick: () => {
+        return true;
+      },
+      testId: 'inline-appearance'
+    }, {
+      title: intl.formatMessage(messages.displayThumbnail),
+      selected: false,
+      onClick: changeInlineToMediaCard,
+      testId: 'thumbnail-appearance'
+    }]
+  }, {
+    type: 'separator'
+  }, {
+    type: 'custom',
+    fallback: [],
+    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: () => {
+      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;
+};
+
 const generateMediaSingleFloatingToolbar = (state, intl, options, pluginState, mediaLinkingState) => {
   const {
     mediaSingle
@@ -282,9 +348,14 @@ export const floatingToolbar = (state, intl, options = {}) => {
   }
 
   let items = [];
-  const parentNode = findParentNodeOfType(mediaGroup)(state.selection);
+  const parentMediaGroupNode = findParentNodeOfType(mediaGroup)(state.selection);
+  let selectedNodeType;
+
+  if (state.selection instanceof NodeSelection) {
+    selectedNodeType = state.selection.node.type;
+  }
 
-  if (allowMediaInline && parentNode && parentNode.node.type === mediaGroup) {
+  if (allowMediaInline && (parentMediaGroupNode === null || parentMediaGroupNode === void 0 ? void 0 : parentMediaGroupNode.node.type) === mediaGroup) {
     const mediaOffset = state.selection.$from.parentOffset + 1;
 
     baseToolbar.getDomRef = () => {
@@ -295,7 +366,23 @@ export const floatingToolbar = (state, intl, options = {}) => {
     };
 
     items = generateMediaCardFloatingToolbar(state, intl, mediaPluginState);
+  } else if (allowMediaInline && selectedNodeType && selectedNodeType === mediaInline) {
+    baseToolbar.getDomRef = () => {
+      var _mediaPluginState$ele2;
+
+      const element = (_mediaPluginState$ele2 = mediaPluginState.element) === null || _mediaPluginState$ele2 === void 0 ? void 0 : _mediaPluginState$ele2.querySelector(`.${MediaInlineNodeSelector}`);
+      return element || mediaPluginState.element;
+    };
+
+    items = generateMediaInlineFloatingToolbar(state, intl, mediaPluginState);
   } else {
+    baseToolbar.getDomRef = () => {
+      var _mediaPluginState$ele3;
+
+      const element = (_mediaPluginState$ele3 = mediaPluginState.element) === null || _mediaPluginState$ele3 === void 0 ? void 0 : _mediaPluginState$ele3.querySelector(`.${MediaSingleNodeSelector}`);
+      return element || mediaPluginState.element;
+    };
+
     items = generateMediaSingleFloatingToolbar(state, intl, options, mediaPluginState, mediaLinkingState);
   }
 

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

@@ -343,7 +343,13 @@ export default class ResizableMediaSingle extends 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: () => /*#__PURE__*/React.createElement("div", {
+        contentEditable: false
+      })
     }), children));
   }
 

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

@@ -296,7 +296,7 @@ export const 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/es2019/plugins/media/utils/media-files.js

@@ -111,7 +111,12 @@ export const insertMediaInlineNode = (view, mediaState, collection, inputMethod)
     collection
   });
   const space = state.schema.text(' ');
-  const pos = state.selection.$to.pos;
+  let 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;
+  }
+
   let content = Fragment.from([mediaInlineNode, space]); // Delete the selection if a selection is made
 
   const deleteRange = findDeleteRange(state);

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

@@ -36,7 +36,7 @@ export const removePanel = () => (state, dispatch) => {
 
   return true;
 };
-export const changePanelType = (panelType, panelOptions = {}, UNSAFE_allowCustomPanel = false) => (state, dispatch) => {
+export const changePanelType = (panelType, panelOptions = {}, allowCustomPanel = false) => (state, dispatch) => {
   const {
     schema: {
       nodes
@@ -53,7 +53,7 @@ export const changePanelType = (panelType, panelOptions = {}, UNSAFE_allowCustom
   let previousType = panelNode.node.attrs.panelType;
   let newTr;
 
-  if (UNSAFE_allowCustomPanel) {
+  if (allowCustomPanel) {
     let previousColor = panelNode.node.attrs.panelColor || getPanelTypeBackground(previousType);
     let previousIcon = panelNode.node.attrs.panelIcon;
     let newPanelOptions = {

package/dist/es2019/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';
 
 const insertPanelTypeWithAnalytics = (panelAttributes, state, insert) => {
   const tr = insert(insertPanelType(panelAttributes, state));
@@ -34,7 +34,7 @@ const panelPlugin = (options = {}) => ({
   name: 'panel',
 
   nodes() {
-    const panelNode = customPanel(!!options.UNSAFE_allowCustomPanel);
+    const panelNode = panel(!!options.allowCustomPanel);
     return [{
       name: 'panel',
       node: panelNode
@@ -127,7 +127,7 @@ const panelPlugin = (options = {}) => ({
 
       }];
 
-      if (options.UNSAFE_allowCustomPanelEdit && options.UNSAFE_allowCustomPanel) {
+      if (options.allowCustomPanel && options.allowCustomPanelEdit) {
         quickInsertOptions.push({
           id: 'custompanel',
           title: formatMessage(messages.customPanel),
@@ -139,7 +139,7 @@ const panelPlugin = (options = {}) => ({
             return insertPanelTypeWithAnalytics({
               panelType: PanelType.CUSTOM,
               panelIcon: ':rainbow:',
-              panelColor: T75
+              panelColor: T50
             }, state, insert);
           }
 

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

@@ -56,7 +56,7 @@ class PanelNodeView {
     const {
       dom,
       contentDOM
-    } = DOMSerializer.renderSpec(document, panelAttrsToDom(node.attrs, pluginOptions.UNSAFE_allowCustomPanel || false));
+    } = DOMSerializer.renderSpec(document, panelAttrsToDom(node.attrs, pluginOptions.allowCustomPanel || false));
     this.getPos = getPos;
     this.dom = dom;
     this.contentDOM = contentDOM;
@@ -69,7 +69,7 @@ class PanelNodeView {
 
     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/es2019/plugins/panel/toolbar.js

@@ -4,7 +4,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';
@@ -20,8 +20,8 @@ export const panelIconMap = {
   [PanelType.INFO]: ':info:',
   [PanelType.NOTE]: ':note:',
   [PanelType.WARNING]: ':warning:',
-  [PanelType.ERROR]: ':error:',
-  [PanelType.SUCCESS]: ':success:',
+  [PanelType.ERROR]: ':cross_mark:',
+  [PanelType.SUCCESS]: ':check_mark:',
   [PanelType.TIP]: ':tip:'
 };
 export const getToolbarItems = (formatMessage, panelNodeType, isCustomPanelEnabled, isCustomPanelEditable, providerFactory, activePanelType, activePanelColor, activePanelIcon) => {
@@ -228,9 +228,14 @@ export const getToolbarConfig = (state, intl, options = {}, providerFactory) =>
       panelType,
       panelColor,
       panelIcon
-    } = panelObject.node.attrs; // force toolbar to be turned on
+    } = panelObject.node.attrs;
 
-    const 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);
+    const isStandardPanel = panelType => {
+      return panelType !== PanelType.CUSTOM ? panelType : undefined;
+    }; // force toolbar to be turned on
+
+
+    const items = getToolbarItems(formatMessage, nodeType, options.allowCustomPanel || false, options.allowCustomPanel && options.allowCustomPanelEdit || false, providerFactory, panelType, options.allowCustomPanel ? panelColor : undefined, options.allowCustomPanel ? panelIcon || isStandardPanel(panelType) : undefined);
 
     const getDomRef = editorView => {
       const domAtPos = editorView.domAtPos.bind(editorView);