@atlaskit/editor-core 174.0.0 → 175.0.0

package/dist/esm/plugins/card/nodeviews/embedCard.js

@@ -31,7 +31,6 @@ import { createDisplayGrid } from '../../../plugins/grid';
 import WithPluginState from '../../../ui/WithPluginState';
 import { pluginKey as widthPluginKey } from '../../width';
 import { floatingLayouts, isRichMediaInsideOfBlockNode } from '../../../utils/rich-media-utils';
-import { pluginKey as tableResizePluginKey } from '../../table/pm-plugins/table-resizing';
 import { SetAttrsStep } from '@atlaskit/adf-schema/steps';
 export var EmbedCardComponent = /*#__PURE__*/function (_React$PureComponent) {
   _inherits(EmbedCardComponent, _React$PureComponent);
@@ -157,15 +156,24 @@ export var EmbedCardComponent = /*#__PURE__*/function (_React$PureComponent) {
     });
 
     _defineProperty(_assertThisInitialized(_this), "saveOriginalDimensionsAttributes", function (height, width) {
-      var view = _this.props.view;
-      var tableResizeState = tableResizePluginKey.getState(view.state); // We are not updating ADF when this function fired while table is resizing.
+      var view = _this.props.view; // TODO: ED-15663
+      // Please, do not copy or use this kind of code below
+      // @ts-ignore
+
+      var fakeTableResizePluginKey = {
+        key: 'tableFlexiColumnResizing$',
+        getState: function getState(state) {
+          return state['tableFlexiColumnResizing$'];
+        }
+      };
+      var fakeTableResizeState = fakeTableResizePluginKey.getState(view.state); // We are not updating ADF when this function fired while table is resizing.
       // Changing ADF in the middle of resize will break table resize plugin logic
       // (tables will be considered different at the end of the drag and cell size won't be stored)
       // But this is not a big problem, editor user will be seeing latest height anyway (via updated state)
       // And even if page to be saved with slightly outdated height, renderer is capable of reading latest height value
       // when embed loads, and so it won't be a problem.
 
-      if (tableResizeState !== null && tableResizeState !== void 0 && tableResizeState.dragging) {
+      if (fakeTableResizeState !== null && fakeTableResizeState !== void 0 && fakeTableResizeState.dragging) {
         return;
       }
 

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

@@ -27,7 +27,6 @@ import { messages } from './messages';
 import buildLayoutButtons from '../../ui/MediaAndEmbedsToolbar';
 import { buildOpenedSettingsPayload, buildVisitedLinkPayload } from '../../utils/linking-utils';
 import { FLOATING_TOOLBAR_LINKPICKER_CLASSNAME } from './styles';
-import { getCopyButtonConfig, showCopyButton } from '../copy-button/toolbar';
 import { getFeatureFlags } from '../feature-flags-context';
 export var removeCard = function removeCard(state, dispatch) {
   if (!(state.selection instanceof NodeSelection)) {
@@ -113,7 +112,7 @@ export var floatingToolbar = function floatingToolbar(cardOptions, platform, lin
     } : {}; // Applies padding override for when link picker is currently displayed
 
     var className = pluginState.showLinkingToolbar ? FLOATING_TOOLBAR_LINKPICKER_CLASSNAME : undefined;
-    return _objectSpread(_objectSpread({
+    return _objectSpread(_objectSpread(_objectSpread({
       title: intl.formatMessage(messages.card),
       className: className,
       nodeType: nodeType
@@ -132,7 +131,9 @@ export var floatingToolbar = function floatingToolbar(cardOptions, platform, lin
         return element;
       },
       items: generateToolbarItems(state, intl, providerFactory, cardOptions, platform, linkPickerOptions)
-    }, pluginState.showLinkingToolbar ? editLinkToolbarConfig : {});
+    }, pluginState.showLinkingToolbar ? editLinkToolbarConfig : {}), {}, {
+      scrollable: pluginState.showLinkingToolbar ? false : true
+    });
   };
 };
 
@@ -205,7 +206,16 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
         onClick: visitCardLink
       }, {
         type: 'separator'
-      }].concat(_toConsumableArray(getUnlinkButtonGroup(state, intl, node, inlineCard)), _toConsumableArray(getCopyButtonGroup(state, intl, node)), _toConsumableArray(getSettingsButtonGroup(state, intl)), [{
+      }].concat(_toConsumableArray(getUnlinkButtonGroup(state, intl, node, inlineCard)), [{
+        type: 'copy-button',
+        items: [{
+          state: state,
+          formatMessage: intl.formatMessage,
+          nodeType: node.type
+        }, {
+          type: 'separator'
+        }]
+      }], _toConsumableArray(getSettingsButtonGroup(state, intl)), [{
         id: 'editor.link.delete',
         type: 'button',
         appearance: 'danger',
@@ -284,10 +294,4 @@ var getSettingsButtonGroup = function getSettingsButtonGroup(state, intl) {
   }, {
     type: 'separator'
   }] : [];
-};
-
-var getCopyButtonGroup = function getCopyButtonGroup(state, intl, node) {
-  return state && showCopyButton(state) ? [getCopyButtonConfig(state, intl.formatMessage, node.type), {
-    type: 'separator'
-  }] : [];
 };

package/dist/esm/plugins/card/ui/LinkToolbarIconDropdown.js

@@ -92,7 +92,8 @@ var Option = function Option(_ref) {
       width: 38,
       height: 38,
       label: title
-    })),
+    })) // @ts-ignore Overriding Menu styles is not supported
+    ,
     css: getCustomStyles(selected, disabled),
     description: description,
     testId: testId,

package/dist/esm/plugins/code-block/pm-plugins/codeBlockCopySelectionPlugin.js

@@ -94,7 +94,7 @@ export function provideVisualFeedbackForCopyButton(state, dispatch) {
     dispatch(tr);
   }
 
-  return false;
+  return true;
 }
 export function removeVisualFeedbackForCopyButton(state, dispatch) {
   var tr = state.tr;
@@ -108,5 +108,5 @@ export function removeVisualFeedbackForCopyButton(state, dispatch) {
     dispatch(tr);
   }
 
-  return false;
+  return true;
 }

package/dist/esm/plugins/code-block/styles.js

@@ -4,10 +4,10 @@ var _templateObject;
 
 import { css } from '@emotion/react';
 import { R75 } from '@atlaskit/theme/colors';
-import { akEditorDeleteBackground, akEditorDeleteBorder, akEditorSelectedBorderSize, akEditorDeleteIconColor, SelectionStyle, getSelectionStyles, akEditorSelectedNodeClassName } from '@atlaskit/editor-shared-styles';
+import { akEditorDeleteBackground, akEditorDeleteBorder, akEditorSelectedBorderSize, akEditorDeleteIconColor, SelectionStyle, getSelectionStyles, akEditorSelectedNodeClassName, blockNodesVerticalMargin } from '@atlaskit/editor-shared-styles';
 import { token } from '@atlaskit/tokens';
 import { codeBlockClassNames } from './ui/class-names';
 import { codeBlockSharedStyles } from '@atlaskit/editor-common/styles';
 export var codeBlockStyles = function codeBlockStyles(props) {
-  return css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  .ProseMirror {\n    ", "\n  }\n\n  .ProseMirror li > .code-block {\n    margin: 0;\n  }\n\n  .ProseMirror .code-block.", ":not(.danger) {\n    ", "\n  }\n\n  /* Danger when top level node */\n  .ProseMirror .danger.code-block {\n    box-shadow: 0 0 0 ", "px ", ";\n\n    .", " {\n      background-color: ", ";\n      color: ", ";\n    }\n\n    .", " {\n      background-color: ", ";\n    }\n  }\n\n  /* Danger when nested node */\n  .ProseMirror .danger .code-block {\n    .", " {\n      background-color: ", ";\n      color: ", ";\n    }\n\n    .", " {\n      background-color: ", ";\n    }\n  }\n"])), codeBlockSharedStyles(props), akEditorSelectedNodeClassName, getSelectionStyles([SelectionStyle.BoxShadow, SelectionStyle.Blanket]), akEditorSelectedBorderSize, akEditorDeleteBorder, codeBlockClassNames.gutter, token('color.blanket.danger', R75), token('color.text.danger', akEditorDeleteIconColor), codeBlockClassNames.content, token('color.background.danger', akEditorDeleteBackground), codeBlockClassNames.gutter, token('color.blanket.danger', 'rgba(255, 143, 115, 0.5)'), token('color.text.danger', akEditorDeleteIconColor), codeBlockClassNames.content, token('color.background.danger', 'rgba(255, 189, 173, 0.5)'));
+  return css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  .ProseMirror {\n    ", "\n  }\n\n  .ProseMirror li {\n    /* if same list item has multiple code blocks we need top margin for all but first */\n    > .code-block {\n      margin: ", " 0 0 0;\n    }\n    > .code-block:first-child,\n    > .ProseMirror-gapcursor:first-child + .code-block {\n      margin-top: 0;\n    }\n\n    > div:last-of-type.code-block {\n      margin-bottom: ", ";\n    }\n  }\n\n  .ProseMirror .code-block.", ":not(.danger) {\n    ", "\n  }\n\n  /* Danger when top level node */\n  .ProseMirror .danger.code-block {\n    box-shadow: 0 0 0 ", "px ", ";\n\n    .", " {\n      background-color: ", ";\n      color: ", ";\n    }\n\n    .", " {\n      background-color: ", ";\n    }\n  }\n\n  /* Danger when nested node */\n  .ProseMirror .danger .code-block {\n    .", " {\n      background-color: ", ";\n      color: ", ";\n    }\n\n    .", " {\n      background-color: ", ";\n    }\n  }\n"])), codeBlockSharedStyles(props), blockNodesVerticalMargin, blockNodesVerticalMargin, akEditorSelectedNodeClassName, getSelectionStyles([SelectionStyle.BoxShadow, SelectionStyle.Blanket]), akEditorSelectedBorderSize, akEditorDeleteBorder, codeBlockClassNames.gutter, token('color.blanket.danger', R75), token('color.text.danger', akEditorDeleteIconColor), codeBlockClassNames.content, token('color.background.danger', akEditorDeleteBackground), codeBlockClassNames.gutter, token('color.blanket.danger', 'rgba(255, 143, 115, 0.5)'), token('color.text.danger', akEditorDeleteIconColor), codeBlockClassNames.content, token('color.background.danger', 'rgba(255, 189, 173, 0.5)'));
 };

package/dist/esm/plugins/code-block/toolbar.js

@@ -104,7 +104,8 @@ export var getToolbarConfig = function getToolbarConfig() {
         return findDomRefAtPos(pos, view.domAtPos.bind(view));
       },
       nodeType: nodeType,
-      items: [languageSelect, separator].concat(copyToClipboardItems, [deleteButton])
+      items: [languageSelect, separator].concat(copyToClipboardItems, [deleteButton]),
+      scrollable: true
     };
   };
 };

package/dist/esm/plugins/copy-button/commands.js

@@ -1,58 +1,144 @@
-import { pluginKey } from './pm-plugins/plugin-key';
+import { copyButtonPluginKey } from './pm-plugins/plugin-key';
 import { hoverDecoration } from '../base/pm-plugins/decoration';
 import { copyHTMLToClipboard } from '../../utils/clipboard';
 import { getSelectedNodeOrNodeParentByNodeType, toDOM } from './utils';
 import { addAnalytics, ACTION, INPUT_METHOD } from '../analytics';
 import { getAnalyticsPayload } from '../clipboard/pm-plugins/main';
-export var createToolbarCopyCommand = function createToolbarCopyCommand(nodeType) {
-  return function (state, dispatch) {
-    var tr = state.tr,
-        schema = state.schema; // This command should only be triggered by the Copy button in the floating toolbar
-    // which is only visible when selection is inside the target node
-
-    var node = getSelectedNodeOrNodeParentByNodeType({
-      nodeType: nodeType,
-      selection: tr.selection
-    });
+export function createToolbarCopyCommandForMark(markType) {
+  function command(state, dispatch) {
+    var textNode = state.tr.selection.$head.parent.maybeChild(state.tr.selection.$head.index());
 
-    if (!node) {
+    if (!textNode) {
       return false;
     }
 
-    var domNode = toDOM(node.node, schema);
-
-    if (domNode) {
-      var div = document.createElement('div');
-      div.appendChild(domNode); // if copying inline content
+    if (dispatch) {
+      // As calling copyHTMLToClipboard causes side effects -- we only run this when
+      // dispatch is provided -- as otherwise the consumer is only testing to see if
+      // the action is availble.
+      var domNode = toDOM(textNode, state.schema);
 
-      if (node.node.type.inlineContent) {
-        // The "1 1" refers to the start and end depth of the slice
+      if (domNode) {
+        var div = document.createElement('div');
+        var p = document.createElement('p');
+        div.appendChild(p);
+        p.appendChild(domNode); // The "1 1" refers to the start and end depth of the slice
         // since we're copying the text inside a paragraph, it will always be 1 1
         // https://github.com/ProseMirror/prosemirror-view/blob/master/src/clipboard.ts#L32
+
         div.firstChild.setAttribute('data-pm-slice', '1 1 []');
-      } else {
-        // The "0 0" refers to the start and end depth of the slice
-        // since we're copying the block node only, it will always be 0 0
-        // https://github.com/ProseMirror/prosemirror-view/blob/master/src/clipboard.ts#L32
-        div.firstChild.setAttribute('data-pm-slice', '0 0 []');
+        copyHTMLToClipboard(div.innerHTML);
       }
 
-      copyHTMLToClipboard(div.innerHTML);
+      var copyToClipboardTr = state.tr;
+      copyToClipboardTr.setMeta(copyButtonPluginKey, {
+        copied: true
+      });
+      var analyticsPayload = getAnalyticsPayload(state, ACTION.COPIED);
+
+      if (analyticsPayload) {
+        analyticsPayload.attributes.inputMethod = INPUT_METHOD.FLOATING_TB;
+        analyticsPayload.attributes.markType = markType.name;
+        addAnalytics(state, copyToClipboardTr, analyticsPayload);
+      }
+
+      dispatch(copyToClipboardTr);
+    }
+
+    return true;
+  }
+
+  return command;
+}
+export function getProvideMarkVisualFeedbackForCopyButtonCommand(markType) {
+  function provideMarkVisualFeedbackForCopyButtonCommand(state, dispatch) {
+    var tr = state.tr;
+    tr.setMeta(copyButtonPluginKey, {
+      showSelection: true,
+      markType: markType
+    });
+
+    if (dispatch) {
+      dispatch(tr);
+    }
+
+    return true;
+  }
+
+  return provideMarkVisualFeedbackForCopyButtonCommand;
+}
+export function removeMarkVisualFeedbackForCopyButtonCommand(state, dispatch) {
+  var tr = state.tr;
+  tr.setMeta(copyButtonPluginKey, {
+    removeSelection: true
+  });
+  var copyButtonState = copyButtonPluginKey.getState(state);
+
+  if (copyButtonState !== null && copyButtonState !== void 0 && copyButtonState.copied) {
+    tr.setMeta(copyButtonPluginKey, {
+      copied: false
+    });
+  }
+
+  if (dispatch) {
+    dispatch(tr);
+  }
+
+  return true;
+}
+export var createToolbarCopyCommandForNode = function createToolbarCopyCommandForNode(nodeType) {
+  return function (state, dispatch) {
+    var tr = state.tr,
+        schema = state.schema; // This command should only be triggered by the Copy button in the floating toolbar
+    // which is only visible when selection is inside the target node
+
+    var contentNodeWithPos = getSelectedNodeOrNodeParentByNodeType({
+      nodeType: nodeType,
+      selection: tr.selection
+    });
+
+    if (!contentNodeWithPos) {
+      return false;
     }
 
     var copyToClipboardTr = tr;
-    copyToClipboardTr.setMeta(pluginKey, {
+    copyToClipboardTr.setMeta(copyButtonPluginKey, {
       copied: true
     });
     var analyticsPayload = getAnalyticsPayload(state, ACTION.COPIED);
 
     if (analyticsPayload) {
       analyticsPayload.attributes.inputMethod = INPUT_METHOD.FLOATING_TB;
-      analyticsPayload.attributes.nodeType = node.node.type.name;
+      analyticsPayload.attributes.nodeType = contentNodeWithPos.node.type.name;
       addAnalytics(state, copyToClipboardTr, analyticsPayload);
     }
 
     if (dispatch) {
+      // As calling copyHTMLToClipboard causes side effects -- we only run this when
+      // dispatch is provided -- as otherwise the consumer is only testing to see if
+      // the action is availble.
+      var domNode = toDOM(contentNodeWithPos.node, schema);
+
+      if (domNode) {
+        var div = document.createElement('div');
+        div.appendChild(domNode); // if copying inline content
+
+        if (contentNodeWithPos.node.type.inlineContent) {
+          // The "1 1" refers to the start and end depth of the slice
+          // since we're copying the text inside a paragraph, it will always be 1 1
+          // https://github.com/ProseMirror/prosemirror-view/blob/master/src/clipboard.ts#L32
+          div.firstChild.setAttribute('data-pm-slice', '1 1 []');
+        } else {
+          // The "0 0" refers to the start and end depth of the slice
+          // since we're copying the block node only, it will always be 0 0
+          // https://github.com/ProseMirror/prosemirror-view/blob/master/src/clipboard.ts#L32
+          div.firstChild.setAttribute('data-pm-slice', '0 0 []');
+        }
+
+        copyHTMLToClipboard(div.innerHTML);
+      }
+
+      copyToClipboardTr.setMeta('scrollIntoView', false);
       dispatch(copyToClipboardTr);
     }
 
@@ -69,10 +155,10 @@ export var resetCopiedState = function resetCopiedState(nodeType, onMouseLeave)
     };
 
     onMouseLeave ? onMouseLeave(state, customDispatch) : hoverDecoration(nodeType, false)(state, customDispatch);
-    var copyButtonState = pluginKey.getState(state);
+    var copyButtonState = copyButtonPluginKey.getState(state);
 
     if (copyButtonState !== null && copyButtonState !== void 0 && copyButtonState.copied) {
-      customTr.setMeta(pluginKey, {
+      customTr.setMeta(copyButtonPluginKey, {
         copied: false
       });
     }

package/dist/esm/plugins/copy-button/pm-plugins/main.js

@@ -1,26 +1,100 @@
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import { pluginKey } from './plugin-key';
+import { DecorationSet } from 'prosemirror-view';
+import { copyButtonPluginKey } from './plugin-key';
+
+function getMarkSelectionDecorationStartAndEnd(_ref) {
+  var markType = _ref.markType,
+      transaction = _ref.transaction;
+  var headHesolvedPos = transaction.selection.$head;
+  var textNodeIndex = transaction.selection.$head.index();
+  var textNode = headHesolvedPos.parent.maybeChild(textNodeIndex);
+  var textNodeOffset = 0;
+  headHesolvedPos.parent.forEach(function (_node, nodeOffset, index) {
+    if (index === textNodeIndex) {
+      textNodeOffset = nodeOffset;
+    }
+  });
+  var start = headHesolvedPos.start(headHesolvedPos.depth) + textNodeOffset;
+  var end = start + textNode.text.length;
+  return {
+    start: start,
+    end: end,
+    markType: markType
+  };
+}
+
 export function copyButtonPlugin() {
   return new SafePlugin({
+    key: copyButtonPluginKey,
     state: {
       init: function init() {
         return {
-          copied: false
+          copied: false,
+          markSelection: undefined
         };
       },
-      apply: function apply(tr, pluginState) {
-        var meta = tr.getMeta(pluginKey);
+      apply: function apply(tr, currentPluginState) {
+        var meta = tr.getMeta(copyButtonPluginKey);
 
         if ((meta === null || meta === void 0 ? void 0 : meta.copied) !== undefined) {
           return {
-            copied: meta.copied
+            copied: meta.copied,
+            markSelection: undefined
           };
         }
 
-        return pluginState;
+        if (meta !== null && meta !== void 0 && meta.showSelection) {
+          return {
+            copied: currentPluginState.copied,
+            markSelection: getMarkSelectionDecorationStartAndEnd({
+              markType: meta.markType,
+              transaction: tr
+            })
+          };
+        }
+
+        if (meta !== null && meta !== void 0 && meta.removeSelection) {
+          return {
+            copied: currentPluginState.copied,
+            markSelection: undefined
+          };
+        }
+
+        if (currentPluginState.markSelection) {
+          return {
+            copied: currentPluginState.copied,
+            markSelection: getMarkSelectionDecorationStartAndEnd({
+              markType: currentPluginState.markSelection.markType,
+              transaction: tr
+            })
+          };
+        }
+
+        return currentPluginState;
       }
     },
-    key: pluginKey
+    props: {
+      decorations: function decorations(_state) {
+        // Showing visual hints for the hyperlink copy button has been disabled
+        // due to an issue where invalid hyperlink marks cause the floating toolbar
+        // to jump around when the copy button is hovered.
+        // See the following bug for details -- once that is resolved -- the visual
+        // hints can be re enabled.
+        // https://product-fabric.atlassian.net/browse/DTR-722
+        // const copyButtonPluginState = copyButtonPluginKey.getState(
+        //   state,
+        // ) as CopyButtonPluginState;
+        // if (copyButtonPluginState.markSelection) {
+        //   const { start, end } = copyButtonPluginState.markSelection;
+        //   return DecorationSet.create(state.doc, [
+        //     Decoration.inline(start, end, {
+        //       class: 'ProseMirror-fake-text-selection',
+        //     }),
+        //   ]);
+        // }
+        return DecorationSet.empty;
+      }
+    }
   });
 }
 export default copyButtonPlugin;

package/dist/esm/plugins/copy-button/pm-plugins/plugin-key.js

@@ -1,2 +1,2 @@
 import { PluginKey } from 'prosemirror-state';
-export var pluginKey = new PluginKey('copyButtonPlugin');
+export var copyButtonPluginKey = new PluginKey('copyButtonPlugin');

package/dist/esm/plugins/copy-button/toolbar.js

@@ -1,31 +1,96 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
 import CopyIcon from '@atlaskit/icon/glyph/copy';
 import commonMessages from '../../messages';
 import { hoverDecoration } from '../base/pm-plugins/decoration';
-import { createToolbarCopyCommand, resetCopiedState } from './commands';
-import { pluginKey } from './pm-plugins/plugin-key';
-export var getCopyButtonConfig = function getCopyButtonConfig(state, formatMessage, nodeType, onMouseEnter, onMouseLeave) {
-  var copyButtonState = pluginKey.getState(state);
-  return {
+import { createToolbarCopyCommandForNode, createToolbarCopyCommandForMark, resetCopiedState, getProvideMarkVisualFeedbackForCopyButtonCommand, removeMarkVisualFeedbackForCopyButtonCommand } from './commands';
+import { copyButtonPluginKey } from './pm-plugins/plugin-key';
+
+function isSeparator(item) {
+  return (item === null || item === void 0 ? void 0 : item.type) === 'separator';
+}
+
+function isNodeOptions(options) {
+  return 'nodeType' in options && options.nodeType !== undefined;
+}
+
+export function getCopyButtonConfig(options) {
+  var state = options.state,
+      formatMessage = options.formatMessage,
+      onMouseEnter = options.onMouseEnter,
+      onMouseLeave = options.onMouseLeave;
+  var copyButtonState = copyButtonPluginKey.getState(state);
+  var buttonActionHandlers;
+
+  if (isNodeOptions(options)) {
+    buttonActionHandlers = {
+      onClick: createToolbarCopyCommandForNode(options.nodeType),
+      // Note for future changes: these two handlers should perform
+      // the same action.
+      onMouseEnter: onMouseEnter || hoverDecoration(options.nodeType, true, 'ak-editor-selected-node'),
+      onFocus: hoverDecoration(options.nodeType, true, 'ak-editor-selected-node'),
+      // Note for future changes: these two handlers should perform
+      // the same action.
+      onMouseLeave: resetCopiedState(options.nodeType, onMouseLeave),
+      onBlur: resetCopiedState(options.nodeType)
+    };
+  } else {
+    buttonActionHandlers = {
+      onClick: createToolbarCopyCommandForMark(options.markType),
+      onMouseEnter: getProvideMarkVisualFeedbackForCopyButtonCommand(options.markType),
+      onFocus: getProvideMarkVisualFeedbackForCopyButtonCommand(options.markType),
+      onMouseLeave: removeMarkVisualFeedbackForCopyButtonCommand,
+      onBlur: removeMarkVisualFeedbackForCopyButtonCommand
+    };
+  }
+
+  return _objectSpread(_objectSpread({
     id: 'editor.floatingToolbar.copy',
     type: 'button',
     appearance: 'subtle',
     icon: CopyIcon,
-    onClick: createToolbarCopyCommand(nodeType),
-    title: formatMessage(copyButtonState !== null && copyButtonState !== void 0 && copyButtonState.copied ? commonMessages.copiedToClipboard : commonMessages.copyToClipboard),
-    onMouseEnter: onMouseEnter || hoverDecoration(nodeType, true, 'ak-editor-selected-node'),
-    onMouseLeave: resetCopiedState(nodeType, onMouseLeave),
-    onFocus: hoverDecoration(nodeType, true, 'ak-editor-selected-node'),
-    onBlur: hoverDecoration(nodeType, false),
+    title: formatMessage(copyButtonState !== null && copyButtonState !== void 0 && copyButtonState.copied ? commonMessages.copiedToClipboard : commonMessages.copyToClipboard)
+  }, buttonActionHandlers), {}, {
     hideTooltipOnClick: false,
     tabIndex: null // TODO select and delete styling needs to be removed when keyboard cursor moves away
     // problem already exist with delete as well
 
-  };
-};
+  });
+}
 export var showCopyButton = function showCopyButton(state) {
   return state && // Check if the Copy button plugin is enabled
-  // @ts-ignore pluginKey.key
+  // @ts-ignore copyButtonPluginKey.key
   state.plugins.find(function (p) {
-    return p.key === pluginKey.key;
+    return p.key === copyButtonPluginKey.key;
   });
-};
+};
+/**
+ * Process floatingToolbar items for copyButton
+ *
+ * If copy button plugin not enabled, remove copy button item from toolbar items
+ * else process copy button to standard floatingtoobarbutton
+ */
+
+export function processCopyButtonItems(state) {
+  return function (items) {
+    return items.flatMap(function (item) {
+      switch (item.type) {
+        case 'copy-button':
+          if (item !== null && item !== void 0 && item.hidden || !showCopyButton(state)) {
+            return [];
+          }
+
+          return item === null || item === void 0 ? void 0 : item.items.map(function (copyButtonItem) {
+            return isSeparator(copyButtonItem) ? copyButtonItem : getCopyButtonConfig(copyButtonItem);
+          });
+
+        default:
+          return [item];
+      }
+    });
+  };
+}

package/dist/esm/plugins/emoji/pm-plugins/ascii-input-rules.js

@@ -19,9 +19,7 @@ export function inputRulePlugin(schema, providerFactory, featureFlags) {
   if (schema.nodes.emoji && providerFactory) {
     initMatcher(providerFactory);
     var asciiEmojiRule = createRule(AsciiEmojiMatcher.REGEX, inputRuleHandler);
-    return createPlugin('emoji', [asciiEmojiRule], {
-      useUnpredictableInputRule: featureFlags.useUnpredictableInputRule
-    });
+    return createPlugin('emoji', [asciiEmojiRule]);
   }
 
   return;

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

@@ -1,10 +1,8 @@
-import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import RemoveIcon from '@atlaskit/icon/glyph/editor/remove';
 import commonMessages from '../../messages';
 import { deleteExpand } from './commands';
 import { hoverDecoration } from '../base/pm-plugins/decoration';
 import { getPluginState } from './pm-plugins/plugin-factory';
-import { getCopyButtonConfig, showCopyButton } from '../copy-button/toolbar';
 export var getToolbarConfig = function getToolbarConfig(state, _ref) {
   var formatMessage = _ref.formatMessage;
 
@@ -22,9 +20,16 @@ export var getToolbarConfig = function getToolbarConfig(state, _ref) {
       },
       nodeType: [nestedExpand, expand],
       offset: [0, 6],
-      items: [].concat(_toConsumableArray(state && showCopyButton(state) ? [getCopyButtonConfig(state, formatMessage, [nestedExpand, expand]), {
-        type: 'separator'
-      }] : []), [{
+      items: [{
+        type: 'copy-button',
+        items: [{
+          state: state,
+          formatMessage: formatMessage,
+          nodeType: [nestedExpand, expand]
+        }, {
+          type: 'separator'
+        }]
+      }, {
         id: 'editor.expand.delete',
         type: 'button',
         appearance: 'danger',
@@ -36,7 +41,7 @@ export var getToolbarConfig = function getToolbarConfig(state, _ref) {
         onBlur: hoverDecoration([nestedExpand, expand], false),
         title: formatMessage(commonMessages.remove),
         tabIndex: null
-      }])
+      }]
     };
   }
 

package/dist/esm/plugins/expand/ui/ExpandIconButton.js

@@ -64,7 +64,7 @@ export var CustomButton = function CustomButton(props) {
       buttonStyles: _objectSpread(_objectSpread({}, buttonStyles), {}, {
         height: '100%',
         '& svg': {
-          transform: props.expanded ? 'transform: rotate(90deg);' : 'tranform: rotate(0deg);',
+          transform: props.expanded ? 'transform: rotate(90deg);' : 'transform: rotate(0deg);',
           transition: "transform 0.2s ".concat(akEditorSwoopCubicBezier, ";")
         }
       })

package/dist/esm/plugins/expand/ui/styles.js

@@ -46,7 +46,7 @@ var DANGER_STATE_BORDER_RADIUS = themed({
   dark: '3px'
 });
 export var expandStyles = function expandStyles(props) {
-  return css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  .", " > div {\n    display: flex;\n  }\n\n  .", " {\n    ", "\n    overflow: hidden;\n    cursor: pointer;\n    box-sizing: border-box;\n\n    td > & {\n      margin-top: 0;\n    }\n\n    .", " svg {\n      ", ";\n      transform: rotate(90deg);\n    }\n\n    &.", ":not(.danger) {\n      ", "\n\n      ::after {\n        // Custom background color and borders (for dark theme).\n        background-color: ", ";\n        border: ", ";\n        border-radius: ", ";\n      }\n    }\n\n    &.danger {\n      background: ", ";\n      border: ", ";\n      border-color: ", ";\n      border-radius: ", ";\n    }\n  }\n\n  .ProseMirror\n    > .", ",\n    .", "\n    > .", " {\n    margin-left: -", "px;\n    margin-right: -", "px;\n  }\n\n  .", " {\n    ", "\n    cursor: text;\n    padding-top: 0px;\n  }\n\n  .", " {\n    ", "\n  }\n\n  .", " {\n    ", ";\n    overflow: visible;\n  }\n\n  .", " {\n    background: ", ";\n    border-color: ", ";\n\n    .", " {\n      padding-top: ", "px;\n    }\n  }\n\n  .", " {\n    width: 100%;\n  }\n\n  /* stylelint-disable property-no-unknown, value-keyword-case */\n  .", ":(.", ") {\n    .expand-content-wrapper {\n      height: auto;\n    }\n  }\n  /* stylelint-enable property-no-unknown, value-keyword-case */\n\n  .", ":not(.", ") {\n    .ak-editor-expand__content {\n      position: absolute;\n      height: 1px;\n      width: 1px;\n      overflow: hidden;\n      clip: rect(1px, 1px, 1px, 1px);\n      white-space: nowrap;\n    }\n\n    .", " svg {\n      ", ";\n      transform: rotate(0deg);\n    }\n\n    &:not(.", "):not(.danger) {\n      background: transparent;\n      border-color: transparent;\n\n      &:hover {\n        border-color: ", ";\n        background: ", ";\n      }\n    }\n  }\n"])), expandClassNames.icon, expandClassNames.prefix, sharedExpandStyles.containerStyles({
+  return css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  .", " > div {\n    display: flex;\n  }\n\n  .", " {\n    ", "\n    overflow: hidden;\n    cursor: pointer;\n    box-sizing: border-box;\n\n    td > & {\n      margin-top: 0;\n    }\n\n    .", " svg {\n      ", ";\n      transform: rotate(90deg);\n    }\n\n    &.", ":not(.danger) {\n      ", "\n\n      ::after {\n        // Custom background color and borders (for dark theme).\n        background-color: ", ";\n        border: ", ";\n        border-radius: ", ";\n      }\n    }\n\n    &.danger {\n      background: ", ";\n      border: ", ";\n      border-color: ", ";\n      border-radius: ", ";\n    }\n  }\n\n  .ProseMirror\n    > .", ",\n    .", "\n    > .", " {\n    margin-left: -", "px;\n    margin-right: -", "px;\n  }\n\n  .", " {\n    ", "\n    cursor: text;\n    padding-top: 0px;\n  }\n\n  .", " {\n    ", "\n  }\n\n  .", " {\n    ", ";\n    align-items: center;\n    overflow: visible;\n  }\n\n  .", " {\n    background: ", ";\n    border-color: ", ";\n\n    .", " {\n      padding-top: ", "px;\n    }\n  }\n\n  .", " {\n    width: 100%;\n  }\n\n  /* stylelint-disable property-no-unknown, value-keyword-case */\n  .", ":(.", ") {\n    .expand-content-wrapper {\n      height: auto;\n    }\n  }\n  /* stylelint-enable property-no-unknown, value-keyword-case */\n\n  .", ":not(.", ") {\n    .ak-editor-expand__content {\n      position: absolute;\n      height: 1px;\n      width: 1px;\n      overflow: hidden;\n      clip: rect(1px, 1px, 1px, 1px);\n      white-space: nowrap;\n    }\n\n    .", " svg {\n      ", ";\n      transform: rotate(0deg);\n    }\n\n    &:not(.", "):not(.danger) {\n      background: transparent;\n      border-color: transparent;\n\n      &:hover {\n        border-color: ", ";\n        background: ", ";\n      }\n    }\n  }\n"])), expandClassNames.icon, expandClassNames.prefix, sharedExpandStyles.containerStyles({
     expanded: false,
     focused: false
   })(props), expandClassNames.iconContainer, EXPAND_ICON_COLOR(props), akEditorSelectedNodeClassName, getSelectionStyles([SelectionStyle.Blanket, SelectionStyle.Border]), ACTIVE_STATE_BACKGROUND_COLOR(props), ACTIVE_STATE_BORDER(props), ACTIVE_STATE_BORDER_RADIUS(props), DANGER_STATE_BACKGROUND_COLOR(props), DANGER_STATE_BORDER(props), DANGER_STATE_BORDER_COLOR(props), DANGER_STATE_BORDER_RADIUS(props), expandClassNames.type('expand'), BreakoutCssClassName.BREAKOUT_MARK_DOM, expandClassNames.type('expand'), akLayoutGutterOffset, akLayoutGutterOffset, expandClassNames.content, sharedExpandStyles.contentStyles({