@atlaskit/editor-plugin-paste-options-toolbar 0.2.2 → 0.2.3

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/editor-plugin-paste-options-toolbar
 
+## 0.2.3
+
+### Patch Changes
+
+- [#42152](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/42152) [`0097171c562`](https://bitbucket.org/atlassian/atlassian-frontend/commits/0097171c562) - ED-19766-collab: Adding collab support for paste options toolbar for confluence
+
 ## 0.2.2
 
 ### Patch Changes

package/dist/cjs/commands.js

@@ -26,9 +26,13 @@ var showToolbar = exports.showToolbar = function showToolbar(lastContentPasted,
   };
   return (0, _pluginFactory.createCommand)(commandAction);
 };
-var changeToPlainText = exports.changeToPlainText = function changeToPlainText(pasteStartPos, plaintext) {
+var changeToPlainText = exports.changeToPlainText = function changeToPlainText() {
   var plaintextTransformer = function plaintextTransformer(tr, state) {
-    return (0, _formatHandlers.formatPlainText)(state, pasteStartPos, plaintext);
+    var pluginState = _types.pasteOptionsPluginKey.getState(state);
+    if (pluginState.selectedOption === _types.ToolbarDropdownOption.PlainText) {
+      return tr;
+    }
+    return (0, _formatHandlers.formatPlainText)(tr, pluginState);
   };
   var commandAction = function commandAction(editorState) {
     return {
@@ -41,7 +45,7 @@ var changeToPlainText = exports.changeToPlainText = function changeToPlainText(p
   return (0, _pluginFactory.createCommand)(commandAction, plaintextTransformer);
 };
 var changeToPlainTextWithAnalytics = exports.changeToPlainTextWithAnalytics = function changeToPlainTextWithAnalytics(editorAnalyticsAPI, sliceSize) {
-  return function (pasteStartPos, plaintext) {
+  return function () {
     return (0, _editorAnalytics.withAnalytics)(editorAnalyticsAPI, {
       action: _analytics.ACTION.PASTED,
       actionSubject: _analytics.ACTION_SUBJECT.DOCUMENT,
@@ -52,16 +56,19 @@ var changeToPlainTextWithAnalytics = exports.changeToPlainTextWithAnalytics = fu
         content: _analytics.PasteContents.text,
         pasteSize: sliceSize
       }
-    })(changeToPlainText(pasteStartPos, plaintext));
+    })(changeToPlainText());
   };
 };
 var dropdownClickHandler = exports.dropdownClickHandler = function dropdownClickHandler() {
   return highlightContent();
 };
-var changeToRichText = exports.changeToRichText = function changeToRichText(pasteStartPos) {
+var changeToRichText = exports.changeToRichText = function changeToRichText() {
   var transformer = function transformer(tr, state) {
-    var pastePluginState = _types.pasteOptionsPluginKey.getState(state);
-    return (0, _formatHandlers.formatRichText)(state, pasteStartPos, pastePluginState.richTextSlice);
+    var pluginState = _types.pasteOptionsPluginKey.getState(state);
+    if (pluginState.selectedOption === _types.ToolbarDropdownOption.RichText) {
+      return tr;
+    }
+    return (0, _formatHandlers.formatRichText)(tr, pluginState);
   };
   var commandAction = function commandAction(editorState) {
     return {
@@ -74,7 +81,7 @@ var changeToRichText = exports.changeToRichText = function changeToRichText(past
   return (0, _pluginFactory.createCommand)(commandAction, transformer);
 };
 var changeToRichTextWithAnalytics = exports.changeToRichTextWithAnalytics = function changeToRichTextWithAnalytics(editorAnalyticsAPI) {
-  return function (pasteStartPos) {
+  return function () {
     var payloadCallback = function payloadCallback(state) {
       var _pastePluginState$ric;
       var pastePluginState = _types.pasteOptionsPluginKey.getState(state);
@@ -90,12 +97,16 @@ var changeToRichTextWithAnalytics = exports.changeToRichTextWithAnalytics = func
         }
       };
     };
-    return (0, _editorAnalytics.withAnalytics)(editorAnalyticsAPI, payloadCallback)(changeToRichText(pasteStartPos));
+    return (0, _editorAnalytics.withAnalytics)(editorAnalyticsAPI, payloadCallback)(changeToRichText());
   };
 };
-var changeToMarkDown = exports.changeToMarkDown = function changeToMarkDown(pasteStartPos, plaintext) {
+var changeToMarkDown = exports.changeToMarkDown = function changeToMarkDown() {
   var markdownTransformer = function markdownTransformer(tr, state) {
-    return (0, _formatHandlers.formatMarkdown)(state, pasteStartPos, plaintext);
+    var pluginState = _types.pasteOptionsPluginKey.getState(state);
+    if (pluginState.selectedOption === _types.ToolbarDropdownOption.Markdown) {
+      return tr;
+    }
+    return (0, _formatHandlers.formatMarkdown)(tr, pluginState);
   };
   var commandAction = function commandAction(editorState) {
     return {
@@ -108,7 +119,7 @@ var changeToMarkDown = exports.changeToMarkDown = function changeToMarkDown(past
   return (0, _pluginFactory.createCommand)(commandAction, markdownTransformer);
 };
 var changeToMarkdownWithAnalytics = exports.changeToMarkdownWithAnalytics = function changeToMarkdownWithAnalytics(editorAnalyticsAPI, sliceSize) {
-  return function (pasteStartPos, plaintext) {
+  return function () {
     return (0, _editorAnalytics.withAnalytics)(editorAnalyticsAPI, {
       action: _analytics.ACTION.PASTED,
       actionSubject: _analytics.ACTION_SUBJECT.DOCUMENT,
@@ -119,7 +130,7 @@ var changeToMarkdownWithAnalytics = exports.changeToMarkdownWithAnalytics = func
         content: _analytics.PasteContents.text,
         pasteSize: sliceSize
       }
-    })(changeToMarkDown(pasteStartPos, plaintext));
+    })(changeToMarkDown());
   };
 };
 var highlightContent = exports.highlightContent = function highlightContent() {

package/dist/cjs/plugin.js

@@ -29,18 +29,14 @@ var pasteOptionsToolbarPlugin = exports.pasteOptionsToolbarPlugin = function pas
     pluginsOptions: {
       floatingToolbar: function floatingToolbar(state, intl) {
         var pastePluginState = _types.pasteOptionsPluginKey.getState(state);
-        var _ref3 = pastePluginState || {},
-          showToolbar = _ref3.showToolbar,
-          pasteStartPos = _ref3.pasteStartPos,
-          plaintext = _ref3.plaintext;
-        if (showToolbar) {
-          return (0, _toolbar.buildToolbar)(state, pasteStartPos, plaintext, intl, editorAnalyticsAPI);
+        if (pastePluginState.showToolbar) {
+          return (0, _toolbar.buildToolbar)(state, intl, editorAnalyticsAPI);
         }
         return;
       }
     },
-    usePluginHook: function usePluginHook(_ref4) {
-      var editorView = _ref4.editorView;
+    usePluginHook: function usePluginHook(_ref3) {
+      var editorView = _ref3.editorView;
       var _useSharedPluginState = (0, _hooks.useSharedPluginState)(api, ['paste']),
         pasteState = _useSharedPluginState.pasteState;
       var lastContentPasted = pasteState === null || pasteState === void 0 ? void 0 : pasteState.lastContentPasted;

package/dist/cjs/pm-plugins/constants.js

@@ -3,11 +3,12 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.TEXT_HIGHLIGHT_CLASS = exports.PASTE_TOOLBAR_MENU_ID = exports.PASTE_TOOLBAR_ITEM_CLASS = exports.PASTE_TOOLBAR_CLASS = exports.PASTE_OPTIONS_TEST_ID = exports.PASTE_HIGHLIGHT_DECORATION_KEY = exports.EDITOR_WRAPPER_CLASS = void 0;
+exports.TEXT_HIGHLIGHT_CLASS = exports.PASTE_TOOLBAR_MENU_ID = exports.PASTE_TOOLBAR_ITEM_CLASS = exports.PASTE_TOOLBAR_CLASS = exports.PASTE_OPTIONS_TEST_ID = exports.PASTE_OPTIONS_META_ID = exports.PASTE_HIGHLIGHT_DECORATION_KEY = exports.EDITOR_WRAPPER_CLASS = void 0;
 var PASTE_TOOLBAR_CLASS = exports.PASTE_TOOLBAR_CLASS = 'ak-editor-paste-toolbar';
 var PASTE_TOOLBAR_MENU_ID = exports.PASTE_TOOLBAR_MENU_ID = 'ak-editor-paste-toolbar-item-dropdownList';
 var TEXT_HIGHLIGHT_CLASS = exports.TEXT_HIGHLIGHT_CLASS = 'text-highlight';
 var PASTE_HIGHLIGHT_DECORATION_KEY = exports.PASTE_HIGHLIGHT_DECORATION_KEY = 'paste-highlight-decoration-key';
 var PASTE_TOOLBAR_ITEM_CLASS = exports.PASTE_TOOLBAR_ITEM_CLASS = 'ak-editor-paste-toolbar-item';
 var EDITOR_WRAPPER_CLASS = exports.EDITOR_WRAPPER_CLASS = 'akEditor';
-var PASTE_OPTIONS_TEST_ID = exports.PASTE_OPTIONS_TEST_ID = 'paste-options-testid';
+var PASTE_OPTIONS_TEST_ID = exports.PASTE_OPTIONS_TEST_ID = 'paste-options-testid';
+var PASTE_OPTIONS_META_ID = exports.PASTE_OPTIONS_META_ID = 'paste-options$';

package/dist/cjs/pm-plugins/plugin-factory.js

@@ -7,13 +7,36 @@ Object.defineProperty(exports, "__esModule", {
 exports.getPluginState = exports.createPluginState = exports.createCommand = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _utils = require("@atlaskit/editor-common/utils");
+var _actions = require("../actions");
 var _reducer = require("../reducer");
 var _types = require("../types");
+var _constants = require("./constants");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var _pluginFactory = (0, _utils.pluginFactory)(_types.pasteOptionsPluginKey, _reducer.reducer, {
     mapping: function mapping(tr, pluginState) {
-      return pluginState;
+      if (!tr.docChanged || !pluginState.showToolbar) {
+        return pluginState;
+      }
+      var oldPasteStartPos = pluginState.pasteStartPos;
+      var oldPasteEndPos = pluginState.pasteEndPos;
+      var newPasteStartPos = tr.mapping.map(oldPasteStartPos);
+      var newPasteEndPos = tr.mapping.map(oldPasteEndPos);
+
+      //this is true when user changes format from the toolbar.
+      //only change pasteEndPos in this case
+      if (changedFormatFromToolbar(tr)) {
+        return _objectSpread(_objectSpread({}, pluginState), {}, {
+          pasteEndPos: newPasteEndPos
+        });
+      }
+      if (oldPasteStartPos === newPasteStartPos && oldPasteEndPos === newPasteEndPos) {
+        return pluginState;
+      }
+      return _objectSpread(_objectSpread({}, pluginState), {}, {
+        pasteStartPos: newPasteStartPos,
+        pasteEndPos: newPasteEndPos
+      });
     },
     onSelectionChanged: function onSelectionChanged(tr, pluginState) {
       // Detect click outside the editor
@@ -28,4 +51,11 @@ var _pluginFactory = (0, _utils.pluginFactory)(_types.pasteOptionsPluginKey, _re
   }),
   createPluginState = exports.createPluginState = _pluginFactory.createPluginState,
   createCommand = exports.createCommand = _pluginFactory.createCommand,
-  getPluginState = exports.getPluginState = _pluginFactory.getPluginState;
+  getPluginState = exports.getPluginState = _pluginFactory.getPluginState;
+var changedFormatFromToolbar = function changedFormatFromToolbar(tr) {
+  var meta = tr.getMeta(_constants.PASTE_OPTIONS_META_ID);
+  if (meta && meta.type === _actions.PastePluginActionTypes.CHANGE_FORMAT) {
+    return true;
+  }
+  return false;
+};

package/dist/cjs/toolbar.js

@@ -37,23 +37,23 @@ var isToolbarVisible = exports.isToolbarVisible = function isToolbarVisible(stat
   }
   return false;
 };
-var getToolbarMenuConfig = exports.getToolbarMenuConfig = function getToolbarMenuConfig(pluginState, pasteStartPos, plaintext, intl, editorAnalyticsAPI) {
+var getToolbarMenuConfig = exports.getToolbarMenuConfig = function getToolbarMenuConfig(pluginState, intl, editorAnalyticsAPI) {
   var options = [{
     id: 'editor.paste.richText',
     title: intl.formatMessage(_messages.messages.richText),
     selected: pluginState.selectedOption === _types.ToolbarDropdownOption.RichText,
     hidden: pluginState.isPlainText,
-    onClick: (0, _commands.changeToRichTextWithAnalytics)(editorAnalyticsAPI)(pasteStartPos)
+    onClick: (0, _commands.changeToRichTextWithAnalytics)(editorAnalyticsAPI)()
   }, {
     id: 'editor.paste.markdown',
     title: intl.formatMessage(_messages.messages.markdown),
     selected: pluginState.selectedOption === _types.ToolbarDropdownOption.Markdown,
-    onClick: (0, _commands.changeToMarkdownWithAnalytics)(editorAnalyticsAPI, plaintext.length)(pasteStartPos, plaintext)
+    onClick: (0, _commands.changeToMarkdownWithAnalytics)(editorAnalyticsAPI, pluginState.plaintext.length)()
   }, {
     id: 'editor.paste.plainText',
     title: intl.formatMessage(_messages.messages.plainText),
     selected: pluginState.selectedOption === _types.ToolbarDropdownOption.PlainText,
-    onClick: (0, _commands.changeToPlainTextWithAnalytics)(editorAnalyticsAPI, plaintext.length)(pasteStartPos, plaintext)
+    onClick: (0, _commands.changeToPlainTextWithAnalytics)(editorAnalyticsAPI, pluginState.plaintext.length)()
   }];
   return {
     id: _constants.PASTE_TOOLBAR_ITEM_CLASS,
@@ -68,11 +68,11 @@ var getToolbarMenuConfig = exports.getToolbarMenuConfig = function getToolbarMen
 var onToggleHandler = function onToggleHandler(state, dispatch) {
   return (0, _commands.dropdownClickHandler)()(state, dispatch);
 };
-var buildToolbar = exports.buildToolbar = function buildToolbar(state, pasteStartPos, plaintext, intl, editorAnalyticsAPI) {
+var buildToolbar = exports.buildToolbar = function buildToolbar(state, intl, editorAnalyticsAPI) {
   var schema = state.schema;
   var validNodes = Object.values(schema.nodes);
   var pluginState = _types.pasteOptionsPluginKey.getState(state);
-  var menu = getToolbarMenuConfig(pluginState, pasteStartPos, plaintext, intl, editorAnalyticsAPI);
+  var menu = getToolbarMenuConfig(pluginState, intl, editorAnalyticsAPI);
   return {
     title: intl.formatMessage(_messages.messages.pasteOptions),
     nodeType: validNodes,

package/dist/cjs/util/format-handlers.js

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.formatRichText = exports.formatPlainText = exports.formatMarkdown = void 0;
 exports.getMarkdownSlice = getMarkdownSlice;
-exports.getRichTextSlice = void 0;
 var _monitoring = require("@atlaskit/editor-common/monitoring");
 var _paste = require("@atlaskit/editor-common/paste");
 var _editorMarkdownTransformer = require("@atlaskit/editor-markdown-transformer");
@@ -13,10 +12,10 @@ var _model = require("@atlaskit/editor-prosemirror/model");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _transform = require("@atlaskit/editor-prosemirror/transform");
 var _index = require("./index");
-var formatMarkdown = exports.formatMarkdown = function formatMarkdown(state, pasteStartPos, plaintext) {
-  var schema = state.schema;
-  var tr = state.tr;
-  var selection = tr.selection;
+var formatMarkdown = exports.formatMarkdown = function formatMarkdown(tr, pluginState) {
+  var pasteStartPos = pluginState.pasteStartPos;
+  var pasteEndPos = pluginState.pasteEndPos;
+  var plaintext = pluginState.plaintext;
   if (pasteStartPos < 0) {
     return tr;
   }
@@ -25,11 +24,10 @@ var formatMarkdown = exports.formatMarkdown = function formatMarkdown(state, pas
   if (parentOffset === 0 && resolvedPasteStartPos.depth > 0) {
     pasteStartPos = resolvedPasteStartPos.before();
   }
-  var markdownSlice = getMarkdownSlice(plaintext, schema, selection);
+  var markdownSlice = getMarkdownSlice(plaintext, tr.doc.type.schema, tr.selection);
   if (!markdownSlice) {
     return tr;
   }
-  var pasteEndPos = selection.$to.pos;
   pasteSliceIntoTransactionWithSelectionAdjust({
     tr: tr,
     pasteStartPos: pasteStartPos,
@@ -38,22 +36,16 @@ var formatMarkdown = exports.formatMarkdown = function formatMarkdown(state, pas
   });
   return tr;
 };
-var getRichTextSlice = exports.getRichTextSlice = function getRichTextSlice(state, pasteStartPos) {
-  var tr = state.tr;
-  var selection = tr.selection;
-  var pasteEndPos = selection.$to.pos;
-  return state.doc.slice(pasteStartPos, pasteEndPos);
-};
-var formatRichText = exports.formatRichText = function formatRichText(state, pasteStartPos, richTextSlice) {
-  var tr = state.tr;
-  var selection = tr.selection;
+var formatRichText = exports.formatRichText = function formatRichText(tr, pluginState) {
+  var pasteStartPos = pluginState.pasteStartPos;
+  var pasteEndPos = pluginState.pasteEndPos;
+  var richTextSlice = pluginState.richTextSlice;
   if (pasteStartPos < 0) {
     return tr;
   }
-  if (richTextSlice === _model.Slice.empty) {
+  if (richTextSlice.content.size === 0) {
     return tr;
   }
-  var pasteEndPos = selection.$to.pos;
   var resolvedPasteStartPos = tr.doc.resolve(pasteStartPos);
   var parentOffset = resolvedPasteStartPos.parentOffset;
   if (parentOffset === 0 && resolvedPasteStartPos.depth > 0) {
@@ -67,21 +59,21 @@ var formatRichText = exports.formatRichText = function formatRichText(state, pas
   });
   return tr;
 };
-var formatPlainText = exports.formatPlainText = function formatPlainText(state, pasteStartPos, plaintext) {
-  var tr = state.tr,
-    schema = state.schema;
+var formatPlainText = exports.formatPlainText = function formatPlainText(tr, pluginState) {
+  var pasteStartPos = pluginState.pasteStartPos;
+  var pasteEndPos = pluginState.pasteEndPos;
+  var plaintext = pluginState.plaintext;
 
   //not possible to create plain text slice with empty string
   if (pasteStartPos < 0 || plaintext === '') {
     return tr;
   }
-  var selection = tr.selection;
-  var pasteEndPos = selection.$to.pos;
   var resolvedPasteStartPos = tr.doc.resolve(pasteStartPos);
   var parentOffset = resolvedPasteStartPos.parentOffset;
   if (parentOffset === 0 && resolvedPasteStartPos.depth > 0) {
     pasteStartPos = resolvedPasteStartPos.before();
   }
+  var schema = tr.doc.type.schema;
   var plainTextNode = schema.text(plaintext);
   var plainTextFragment = _model.Fragment.from(schema.nodes.paragraph.createAndFill(null, plainTextNode));
   var plainTextSlice = new _model.Slice(plainTextFragment, resolvedPasteStartPos.depth, resolvedPasteStartPos.depth);

package/dist/es2019/commands.js

@@ -20,9 +20,13 @@ export const showToolbar = (lastContentPasted, selectedOption) => {
   };
   return createCommand(commandAction);
 };
-export const changeToPlainText = (pasteStartPos, plaintext) => {
+export const changeToPlainText = () => {
   const plaintextTransformer = (tr, state) => {
-    return formatPlainText(state, pasteStartPos, plaintext);
+    const pluginState = pasteOptionsPluginKey.getState(state);
+    if (pluginState.selectedOption === ToolbarDropdownOption.PlainText) {
+      return tr;
+    }
+    return formatPlainText(tr, pluginState);
   };
   const commandAction = editorState => {
     return {
@@ -34,7 +38,7 @@ export const changeToPlainText = (pasteStartPos, plaintext) => {
   };
   return createCommand(commandAction, plaintextTransformer);
 };
-export const changeToPlainTextWithAnalytics = (editorAnalyticsAPI, sliceSize) => (pasteStartPos, plaintext) => {
+export const changeToPlainTextWithAnalytics = (editorAnalyticsAPI, sliceSize) => () => {
   return withAnalytics(editorAnalyticsAPI, {
     action: ACTION.PASTED,
     actionSubject: ACTION_SUBJECT.DOCUMENT,
@@ -45,15 +49,18 @@ export const changeToPlainTextWithAnalytics = (editorAnalyticsAPI, sliceSize) =>
       content: PasteContents.text,
       pasteSize: sliceSize
     }
-  })(changeToPlainText(pasteStartPos, plaintext));
+  })(changeToPlainText());
 };
 export const dropdownClickHandler = () => {
   return highlightContent();
 };
-export const changeToRichText = pasteStartPos => {
+export const changeToRichText = () => {
   const transformer = (tr, state) => {
-    const pastePluginState = pasteOptionsPluginKey.getState(state);
-    return formatRichText(state, pasteStartPos, pastePluginState.richTextSlice);
+    const pluginState = pasteOptionsPluginKey.getState(state);
+    if (pluginState.selectedOption === ToolbarDropdownOption.RichText) {
+      return tr;
+    }
+    return formatRichText(tr, pluginState);
   };
   const commandAction = editorState => {
     return {
@@ -65,7 +72,7 @@ export const changeToRichText = pasteStartPos => {
   };
   return createCommand(commandAction, transformer);
 };
-export const changeToRichTextWithAnalytics = editorAnalyticsAPI => pasteStartPos => {
+export const changeToRichTextWithAnalytics = editorAnalyticsAPI => () => {
   const payloadCallback = state => {
     var _pastePluginState$ric;
     const pastePluginState = pasteOptionsPluginKey.getState(state);
@@ -81,11 +88,15 @@ export const changeToRichTextWithAnalytics = editorAnalyticsAPI => pasteStartPos
       }
     };
   };
-  return withAnalytics(editorAnalyticsAPI, payloadCallback)(changeToRichText(pasteStartPos));
+  return withAnalytics(editorAnalyticsAPI, payloadCallback)(changeToRichText());
 };
-export const changeToMarkDown = (pasteStartPos, plaintext) => {
+export const changeToMarkDown = () => {
   const markdownTransformer = (tr, state) => {
-    return formatMarkdown(state, pasteStartPos, plaintext);
+    const pluginState = pasteOptionsPluginKey.getState(state);
+    if (pluginState.selectedOption === ToolbarDropdownOption.Markdown) {
+      return tr;
+    }
+    return formatMarkdown(tr, pluginState);
   };
   const commandAction = editorState => {
     return {
@@ -97,7 +108,7 @@ export const changeToMarkDown = (pasteStartPos, plaintext) => {
   };
   return createCommand(commandAction, markdownTransformer);
 };
-export const changeToMarkdownWithAnalytics = (editorAnalyticsAPI, sliceSize) => (pasteStartPos, plaintext) => {
+export const changeToMarkdownWithAnalytics = (editorAnalyticsAPI, sliceSize) => () => {
   return withAnalytics(editorAnalyticsAPI, {
     action: ACTION.PASTED,
     actionSubject: ACTION_SUBJECT.DOCUMENT,
@@ -108,7 +119,7 @@ export const changeToMarkdownWithAnalytics = (editorAnalyticsAPI, sliceSize) =>
       content: PasteContents.text,
       pasteSize: sliceSize
     }
-  })(changeToMarkDown(pasteStartPos, plaintext));
+  })(changeToMarkDown());
 };
 export const highlightContent = () => {
   const commandAction = editorState => {

package/dist/es2019/plugin.js

@@ -23,13 +23,8 @@ export const pasteOptionsToolbarPlugin = ({
     pluginsOptions: {
       floatingToolbar(state, intl) {
         const pastePluginState = pasteOptionsPluginKey.getState(state);
-        const {
-          showToolbar,
-          pasteStartPos,
-          plaintext
-        } = pastePluginState || {};
-        if (showToolbar) {
-          return buildToolbar(state, pasteStartPos, plaintext, intl, editorAnalyticsAPI);
+        if (pastePluginState.showToolbar) {
+          return buildToolbar(state, intl, editorAnalyticsAPI);
         }
         return;
       }

package/dist/es2019/pm-plugins/constants.js

@@ -4,4 +4,5 @@ export const TEXT_HIGHLIGHT_CLASS = 'text-highlight';
 export const PASTE_HIGHLIGHT_DECORATION_KEY = 'paste-highlight-decoration-key';
 export const PASTE_TOOLBAR_ITEM_CLASS = 'ak-editor-paste-toolbar-item';
 export const EDITOR_WRAPPER_CLASS = 'akEditor';
-export const PASTE_OPTIONS_TEST_ID = 'paste-options-testid';
+export const PASTE_OPTIONS_TEST_ID = 'paste-options-testid';
+export const PASTE_OPTIONS_META_ID = 'paste-options$';

package/dist/es2019/pm-plugins/plugin-factory.js

@@ -1,13 +1,38 @@
 import { pluginFactory } from '@atlaskit/editor-common/utils';
+import { PastePluginActionTypes } from '../actions';
 import { reducer } from '../reducer';
 import { pasteOptionsPluginKey } from '../types';
+import { PASTE_OPTIONS_META_ID } from './constants';
 export const {
   createPluginState,
   createCommand,
   getPluginState
 } = pluginFactory(pasteOptionsPluginKey, reducer, {
   mapping: (tr, pluginState) => {
-    return pluginState;
+    if (!tr.docChanged || !pluginState.showToolbar) {
+      return pluginState;
+    }
+    const oldPasteStartPos = pluginState.pasteStartPos;
+    const oldPasteEndPos = pluginState.pasteEndPos;
+    const newPasteStartPos = tr.mapping.map(oldPasteStartPos);
+    const newPasteEndPos = tr.mapping.map(oldPasteEndPos);
+
+    //this is true when user changes format from the toolbar.
+    //only change pasteEndPos in this case
+    if (changedFormatFromToolbar(tr)) {
+      return {
+        ...pluginState,
+        pasteEndPos: newPasteEndPos
+      };
+    }
+    if (oldPasteStartPos === newPasteStartPos && oldPasteEndPos === newPasteEndPos) {
+      return pluginState;
+    }
+    return {
+      ...pluginState,
+      pasteStartPos: newPasteStartPos,
+      pasteEndPos: newPasteEndPos
+    };
   },
   onSelectionChanged: (tr, pluginState) => {
     // Detect click outside the editor
@@ -20,4 +45,11 @@ export const {
     }
     return pluginState;
   }
-});
+});
+const changedFormatFromToolbar = tr => {
+  const meta = tr.getMeta(PASTE_OPTIONS_META_ID);
+  if (meta && meta.type === PastePluginActionTypes.CHANGE_FORMAT) {
+    return true;
+  }
+  return false;
+};

package/dist/es2019/toolbar.js

@@ -30,23 +30,23 @@ export const isToolbarVisible = (state, lastContentPasted) => {
   }
   return false;
 };
-export const getToolbarMenuConfig = (pluginState, pasteStartPos, plaintext, intl, editorAnalyticsAPI) => {
+export const getToolbarMenuConfig = (pluginState, intl, editorAnalyticsAPI) => {
   const options = [{
     id: 'editor.paste.richText',
     title: intl.formatMessage(messages.richText),
     selected: pluginState.selectedOption === ToolbarDropdownOption.RichText,
     hidden: pluginState.isPlainText,
-    onClick: changeToRichTextWithAnalytics(editorAnalyticsAPI)(pasteStartPos)
+    onClick: changeToRichTextWithAnalytics(editorAnalyticsAPI)()
   }, {
     id: 'editor.paste.markdown',
     title: intl.formatMessage(messages.markdown),
     selected: pluginState.selectedOption === ToolbarDropdownOption.Markdown,
-    onClick: changeToMarkdownWithAnalytics(editorAnalyticsAPI, plaintext.length)(pasteStartPos, plaintext)
+    onClick: changeToMarkdownWithAnalytics(editorAnalyticsAPI, pluginState.plaintext.length)()
   }, {
     id: 'editor.paste.plainText',
     title: intl.formatMessage(messages.plainText),
     selected: pluginState.selectedOption === ToolbarDropdownOption.PlainText,
-    onClick: changeToPlainTextWithAnalytics(editorAnalyticsAPI, plaintext.length)(pasteStartPos, plaintext)
+    onClick: changeToPlainTextWithAnalytics(editorAnalyticsAPI, pluginState.plaintext.length)()
   }];
   return {
     id: PASTE_TOOLBAR_ITEM_CLASS,
@@ -61,13 +61,13 @@ export const getToolbarMenuConfig = (pluginState, pasteStartPos, plaintext, intl
 const onToggleHandler = (state, dispatch) => {
   return dropdownClickHandler()(state, dispatch);
 };
-export const buildToolbar = (state, pasteStartPos, plaintext, intl, editorAnalyticsAPI) => {
+export const buildToolbar = (state, intl, editorAnalyticsAPI) => {
   const {
     schema
   } = state;
   const validNodes = Object.values(schema.nodes);
   const pluginState = pasteOptionsPluginKey.getState(state);
-  const menu = getToolbarMenuConfig(pluginState, pasteStartPos, plaintext, intl, editorAnalyticsAPI);
+  const menu = getToolbarMenuConfig(pluginState, intl, editorAnalyticsAPI);
   return {
     title: intl.formatMessage(messages.pasteOptions),
     nodeType: validNodes,

package/dist/es2019/util/format-handlers.js

@@ -5,14 +5,10 @@ import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
 import { Selection } from '@atlaskit/editor-prosemirror/state';
 import { ReplaceStep } from '@atlaskit/editor-prosemirror/transform';
 import { escapeLinks } from './index';
-export const formatMarkdown = (state, pasteStartPos, plaintext) => {
-  const schema = state.schema;
-  let {
-    tr
-  } = state;
-  const {
-    selection
-  } = tr;
+export const formatMarkdown = (tr, pluginState) => {
+  let pasteStartPos = pluginState.pasteStartPos;
+  let pasteEndPos = pluginState.pasteEndPos;
+  let plaintext = pluginState.plaintext;
   if (pasteStartPos < 0) {
     return tr;
   }
@@ -21,11 +17,10 @@ export const formatMarkdown = (state, pasteStartPos, plaintext) => {
   if (parentOffset === 0 && resolvedPasteStartPos.depth > 0) {
     pasteStartPos = resolvedPasteStartPos.before();
   }
-  const markdownSlice = getMarkdownSlice(plaintext, schema, selection);
+  const markdownSlice = getMarkdownSlice(plaintext, tr.doc.type.schema, tr.selection);
   if (!markdownSlice) {
     return tr;
   }
-  const pasteEndPos = selection.$to.pos;
   pasteSliceIntoTransactionWithSelectionAdjust({
     tr,
     pasteStartPos,
@@ -34,30 +29,16 @@ export const formatMarkdown = (state, pasteStartPos, plaintext) => {
   });
   return tr;
 };
-export const getRichTextSlice = (state, pasteStartPos) => {
-  const {
-    tr
-  } = state;
-  const {
-    selection
-  } = tr;
-  let pasteEndPos = selection.$to.pos;
-  return state.doc.slice(pasteStartPos, pasteEndPos);
-};
-export const formatRichText = (state, pasteStartPos, richTextSlice) => {
-  let {
-    tr
-  } = state;
-  const {
-    selection
-  } = tr;
+export const formatRichText = (tr, pluginState) => {
+  let pasteStartPos = pluginState.pasteStartPos;
+  let pasteEndPos = pluginState.pasteEndPos;
+  const richTextSlice = pluginState.richTextSlice;
   if (pasteStartPos < 0) {
     return tr;
   }
-  if (richTextSlice === Slice.empty) {
+  if (richTextSlice.content.size === 0) {
     return tr;
   }
-  let pasteEndPos = selection.$to.pos;
   const resolvedPasteStartPos = tr.doc.resolve(pasteStartPos);
   const parentOffset = resolvedPasteStartPos.parentOffset;
   if (parentOffset === 0 && resolvedPasteStartPos.depth > 0) {
@@ -71,25 +52,21 @@ export const formatRichText = (state, pasteStartPos, richTextSlice) => {
   });
   return tr;
 };
-export const formatPlainText = (state, pasteStartPos, plaintext) => {
-  const {
-    tr,
-    schema
-  } = state;
+export const formatPlainText = (tr, pluginState) => {
+  let pasteStartPos = pluginState.pasteStartPos;
+  let pasteEndPos = pluginState.pasteEndPos;
+  let plaintext = pluginState.plaintext;
 
   //not possible to create plain text slice with empty string
   if (pasteStartPos < 0 || plaintext === '') {
     return tr;
   }
-  const {
-    selection
-  } = tr;
-  const pasteEndPos = selection.$to.pos;
   const resolvedPasteStartPos = tr.doc.resolve(pasteStartPos);
   const parentOffset = resolvedPasteStartPos.parentOffset;
   if (parentOffset === 0 && resolvedPasteStartPos.depth > 0) {
     pasteStartPos = resolvedPasteStartPos.before();
   }
+  const schema = tr.doc.type.schema;
   const plainTextNode = schema.text(plaintext);
   const plainTextFragment = Fragment.from(schema.nodes.paragraph.createAndFill(null, plainTextNode));
   const plainTextSlice = new Slice(plainTextFragment, resolvedPasteStartPos.depth, resolvedPasteStartPos.depth);

package/dist/esm/commands.js

@@ -20,9 +20,13 @@ export var showToolbar = function showToolbar(lastContentPasted, selectedOption)
   };
   return createCommand(commandAction);
 };
-export var changeToPlainText = function changeToPlainText(pasteStartPos, plaintext) {
+export var changeToPlainText = function changeToPlainText() {
   var plaintextTransformer = function plaintextTransformer(tr, state) {
-    return formatPlainText(state, pasteStartPos, plaintext);
+    var pluginState = pasteOptionsPluginKey.getState(state);
+    if (pluginState.selectedOption === ToolbarDropdownOption.PlainText) {
+      return tr;
+    }
+    return formatPlainText(tr, pluginState);
   };
   var commandAction = function commandAction(editorState) {
     return {
@@ -35,7 +39,7 @@ export var changeToPlainText = function changeToPlainText(pasteStartPos, plainte
   return createCommand(commandAction, plaintextTransformer);
 };
 export var changeToPlainTextWithAnalytics = function changeToPlainTextWithAnalytics(editorAnalyticsAPI, sliceSize) {
-  return function (pasteStartPos, plaintext) {
+  return function () {
     return withAnalytics(editorAnalyticsAPI, {
       action: ACTION.PASTED,
       actionSubject: ACTION_SUBJECT.DOCUMENT,
@@ -46,16 +50,19 @@ export var changeToPlainTextWithAnalytics = function changeToPlainTextWithAnalyt
         content: PasteContents.text,
         pasteSize: sliceSize
       }
-    })(changeToPlainText(pasteStartPos, plaintext));
+    })(changeToPlainText());
   };
 };
 export var dropdownClickHandler = function dropdownClickHandler() {
   return highlightContent();
 };
-export var changeToRichText = function changeToRichText(pasteStartPos) {
+export var changeToRichText = function changeToRichText() {
   var transformer = function transformer(tr, state) {
-    var pastePluginState = pasteOptionsPluginKey.getState(state);
-    return formatRichText(state, pasteStartPos, pastePluginState.richTextSlice);
+    var pluginState = pasteOptionsPluginKey.getState(state);
+    if (pluginState.selectedOption === ToolbarDropdownOption.RichText) {
+      return tr;
+    }
+    return formatRichText(tr, pluginState);
   };
   var commandAction = function commandAction(editorState) {
     return {
@@ -68,7 +75,7 @@ export var changeToRichText = function changeToRichText(pasteStartPos) {
   return createCommand(commandAction, transformer);
 };
 export var changeToRichTextWithAnalytics = function changeToRichTextWithAnalytics(editorAnalyticsAPI) {
-  return function (pasteStartPos) {
+  return function () {
     var payloadCallback = function payloadCallback(state) {
       var _pastePluginState$ric;
       var pastePluginState = pasteOptionsPluginKey.getState(state);
@@ -84,12 +91,16 @@ export var changeToRichTextWithAnalytics = function changeToRichTextWithAnalytic
         }
       };
     };
-    return withAnalytics(editorAnalyticsAPI, payloadCallback)(changeToRichText(pasteStartPos));
+    return withAnalytics(editorAnalyticsAPI, payloadCallback)(changeToRichText());
   };
 };
-export var changeToMarkDown = function changeToMarkDown(pasteStartPos, plaintext) {
+export var changeToMarkDown = function changeToMarkDown() {
   var markdownTransformer = function markdownTransformer(tr, state) {
-    return formatMarkdown(state, pasteStartPos, plaintext);
+    var pluginState = pasteOptionsPluginKey.getState(state);
+    if (pluginState.selectedOption === ToolbarDropdownOption.Markdown) {
+      return tr;
+    }
+    return formatMarkdown(tr, pluginState);
   };
   var commandAction = function commandAction(editorState) {
     return {
@@ -102,7 +113,7 @@ export var changeToMarkDown = function changeToMarkDown(pasteStartPos, plaintext
   return createCommand(commandAction, markdownTransformer);
 };
 export var changeToMarkdownWithAnalytics = function changeToMarkdownWithAnalytics(editorAnalyticsAPI, sliceSize) {
-  return function (pasteStartPos, plaintext) {
+  return function () {
     return withAnalytics(editorAnalyticsAPI, {
       action: ACTION.PASTED,
       actionSubject: ACTION_SUBJECT.DOCUMENT,
@@ -113,7 +124,7 @@ export var changeToMarkdownWithAnalytics = function changeToMarkdownWithAnalytic
         content: PasteContents.text,
         pasteSize: sliceSize
       }
-    })(changeToMarkDown(pasteStartPos, plaintext));
+    })(changeToMarkDown());
   };
 };
 export var highlightContent = function highlightContent() {

package/dist/esm/plugin.js

@@ -23,18 +23,14 @@ export var pasteOptionsToolbarPlugin = function pasteOptionsToolbarPlugin(_ref)
     pluginsOptions: {
       floatingToolbar: function floatingToolbar(state, intl) {
         var pastePluginState = pasteOptionsPluginKey.getState(state);
-        var _ref3 = pastePluginState || {},
-          showToolbar = _ref3.showToolbar,
-          pasteStartPos = _ref3.pasteStartPos,
-          plaintext = _ref3.plaintext;
-        if (showToolbar) {
-          return buildToolbar(state, pasteStartPos, plaintext, intl, editorAnalyticsAPI);
+        if (pastePluginState.showToolbar) {
+          return buildToolbar(state, intl, editorAnalyticsAPI);
         }
         return;
       }
     },
-    usePluginHook: function usePluginHook(_ref4) {
-      var editorView = _ref4.editorView;
+    usePluginHook: function usePluginHook(_ref3) {
+      var editorView = _ref3.editorView;
       var _useSharedPluginState = useSharedPluginState(api, ['paste']),
         pasteState = _useSharedPluginState.pasteState;
       var lastContentPasted = pasteState === null || pasteState === void 0 ? void 0 : pasteState.lastContentPasted;

package/dist/esm/pm-plugins/constants.js

@@ -4,4 +4,5 @@ export var TEXT_HIGHLIGHT_CLASS = 'text-highlight';
 export var PASTE_HIGHLIGHT_DECORATION_KEY = 'paste-highlight-decoration-key';
 export var PASTE_TOOLBAR_ITEM_CLASS = 'ak-editor-paste-toolbar-item';
 export var EDITOR_WRAPPER_CLASS = 'akEditor';
-export var PASTE_OPTIONS_TEST_ID = 'paste-options-testid';
+export var PASTE_OPTIONS_TEST_ID = 'paste-options-testid';
+export var PASTE_OPTIONS_META_ID = 'paste-options$';

package/dist/esm/pm-plugins/plugin-factory.js

@@ -2,11 +2,34 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import { pluginFactory } from '@atlaskit/editor-common/utils';
+import { PastePluginActionTypes } from '../actions';
 import { reducer } from '../reducer';
 import { pasteOptionsPluginKey } from '../types';
+import { PASTE_OPTIONS_META_ID } from './constants';
 var _pluginFactory = pluginFactory(pasteOptionsPluginKey, reducer, {
     mapping: function mapping(tr, pluginState) {
-      return pluginState;
+      if (!tr.docChanged || !pluginState.showToolbar) {
+        return pluginState;
+      }
+      var oldPasteStartPos = pluginState.pasteStartPos;
+      var oldPasteEndPos = pluginState.pasteEndPos;
+      var newPasteStartPos = tr.mapping.map(oldPasteStartPos);
+      var newPasteEndPos = tr.mapping.map(oldPasteEndPos);
+
+      //this is true when user changes format from the toolbar.
+      //only change pasteEndPos in this case
+      if (changedFormatFromToolbar(tr)) {
+        return _objectSpread(_objectSpread({}, pluginState), {}, {
+          pasteEndPos: newPasteEndPos
+        });
+      }
+      if (oldPasteStartPos === newPasteStartPos && oldPasteEndPos === newPasteEndPos) {
+        return pluginState;
+      }
+      return _objectSpread(_objectSpread({}, pluginState), {}, {
+        pasteStartPos: newPasteStartPos,
+        pasteEndPos: newPasteEndPos
+      });
     },
     onSelectionChanged: function onSelectionChanged(tr, pluginState) {
       // Detect click outside the editor
@@ -22,4 +45,11 @@ var _pluginFactory = pluginFactory(pasteOptionsPluginKey, reducer, {
   createPluginState = _pluginFactory.createPluginState,
   createCommand = _pluginFactory.createCommand,
   getPluginState = _pluginFactory.getPluginState;
-export { createPluginState, createCommand, getPluginState };
+export { createPluginState, createCommand, getPluginState };
+var changedFormatFromToolbar = function changedFormatFromToolbar(tr) {
+  var meta = tr.getMeta(PASTE_OPTIONS_META_ID);
+  if (meta && meta.type === PastePluginActionTypes.CHANGE_FORMAT) {
+    return true;
+  }
+  return false;
+};

package/dist/esm/toolbar.js

@@ -30,23 +30,23 @@ export var isToolbarVisible = function isToolbarVisible(state, lastContentPasted
   }
   return false;
 };
-export var getToolbarMenuConfig = function getToolbarMenuConfig(pluginState, pasteStartPos, plaintext, intl, editorAnalyticsAPI) {
+export var getToolbarMenuConfig = function getToolbarMenuConfig(pluginState, intl, editorAnalyticsAPI) {
   var options = [{
     id: 'editor.paste.richText',
     title: intl.formatMessage(messages.richText),
     selected: pluginState.selectedOption === ToolbarDropdownOption.RichText,
     hidden: pluginState.isPlainText,
-    onClick: changeToRichTextWithAnalytics(editorAnalyticsAPI)(pasteStartPos)
+    onClick: changeToRichTextWithAnalytics(editorAnalyticsAPI)()
   }, {
     id: 'editor.paste.markdown',
     title: intl.formatMessage(messages.markdown),
     selected: pluginState.selectedOption === ToolbarDropdownOption.Markdown,
-    onClick: changeToMarkdownWithAnalytics(editorAnalyticsAPI, plaintext.length)(pasteStartPos, plaintext)
+    onClick: changeToMarkdownWithAnalytics(editorAnalyticsAPI, pluginState.plaintext.length)()
   }, {
     id: 'editor.paste.plainText',
     title: intl.formatMessage(messages.plainText),
     selected: pluginState.selectedOption === ToolbarDropdownOption.PlainText,
-    onClick: changeToPlainTextWithAnalytics(editorAnalyticsAPI, plaintext.length)(pasteStartPos, plaintext)
+    onClick: changeToPlainTextWithAnalytics(editorAnalyticsAPI, pluginState.plaintext.length)()
   }];
   return {
     id: PASTE_TOOLBAR_ITEM_CLASS,
@@ -61,11 +61,11 @@ export var getToolbarMenuConfig = function getToolbarMenuConfig(pluginState, pas
 var onToggleHandler = function onToggleHandler(state, dispatch) {
   return dropdownClickHandler()(state, dispatch);
 };
-export var buildToolbar = function buildToolbar(state, pasteStartPos, plaintext, intl, editorAnalyticsAPI) {
+export var buildToolbar = function buildToolbar(state, intl, editorAnalyticsAPI) {
   var schema = state.schema;
   var validNodes = Object.values(schema.nodes);
   var pluginState = pasteOptionsPluginKey.getState(state);
-  var menu = getToolbarMenuConfig(pluginState, pasteStartPos, plaintext, intl, editorAnalyticsAPI);
+  var menu = getToolbarMenuConfig(pluginState, intl, editorAnalyticsAPI);
   return {
     title: intl.formatMessage(messages.pasteOptions),
     nodeType: validNodes,

package/dist/esm/util/format-handlers.js

@@ -5,10 +5,10 @@ import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
 import { Selection } from '@atlaskit/editor-prosemirror/state';
 import { ReplaceStep } from '@atlaskit/editor-prosemirror/transform';
 import { escapeLinks } from './index';
-export var formatMarkdown = function formatMarkdown(state, pasteStartPos, plaintext) {
-  var schema = state.schema;
-  var tr = state.tr;
-  var selection = tr.selection;
+export var formatMarkdown = function formatMarkdown(tr, pluginState) {
+  var pasteStartPos = pluginState.pasteStartPos;
+  var pasteEndPos = pluginState.pasteEndPos;
+  var plaintext = pluginState.plaintext;
   if (pasteStartPos < 0) {
     return tr;
   }
@@ -17,11 +17,10 @@ export var formatMarkdown = function formatMarkdown(state, pasteStartPos, plaint
   if (parentOffset === 0 && resolvedPasteStartPos.depth > 0) {
     pasteStartPos = resolvedPasteStartPos.before();
   }
-  var markdownSlice = getMarkdownSlice(plaintext, schema, selection);
+  var markdownSlice = getMarkdownSlice(plaintext, tr.doc.type.schema, tr.selection);
   if (!markdownSlice) {
     return tr;
   }
-  var pasteEndPos = selection.$to.pos;
   pasteSliceIntoTransactionWithSelectionAdjust({
     tr: tr,
     pasteStartPos: pasteStartPos,
@@ -30,22 +29,16 @@ export var formatMarkdown = function formatMarkdown(state, pasteStartPos, plaint
   });
   return tr;
 };
-export var getRichTextSlice = function getRichTextSlice(state, pasteStartPos) {
-  var tr = state.tr;
-  var selection = tr.selection;
-  var pasteEndPos = selection.$to.pos;
-  return state.doc.slice(pasteStartPos, pasteEndPos);
-};
-export var formatRichText = function formatRichText(state, pasteStartPos, richTextSlice) {
-  var tr = state.tr;
-  var selection = tr.selection;
+export var formatRichText = function formatRichText(tr, pluginState) {
+  var pasteStartPos = pluginState.pasteStartPos;
+  var pasteEndPos = pluginState.pasteEndPos;
+  var richTextSlice = pluginState.richTextSlice;
   if (pasteStartPos < 0) {
     return tr;
   }
-  if (richTextSlice === Slice.empty) {
+  if (richTextSlice.content.size === 0) {
     return tr;
   }
-  var pasteEndPos = selection.$to.pos;
   var resolvedPasteStartPos = tr.doc.resolve(pasteStartPos);
   var parentOffset = resolvedPasteStartPos.parentOffset;
   if (parentOffset === 0 && resolvedPasteStartPos.depth > 0) {
@@ -59,21 +52,21 @@ export var formatRichText = function formatRichText(state, pasteStartPos, richTe
   });
   return tr;
 };
-export var formatPlainText = function formatPlainText(state, pasteStartPos, plaintext) {
-  var tr = state.tr,
-    schema = state.schema;
+export var formatPlainText = function formatPlainText(tr, pluginState) {
+  var pasteStartPos = pluginState.pasteStartPos;
+  var pasteEndPos = pluginState.pasteEndPos;
+  var plaintext = pluginState.plaintext;
 
   //not possible to create plain text slice with empty string
   if (pasteStartPos < 0 || plaintext === '') {
     return tr;
   }
-  var selection = tr.selection;
-  var pasteEndPos = selection.$to.pos;
   var resolvedPasteStartPos = tr.doc.resolve(pasteStartPos);
   var parentOffset = resolvedPasteStartPos.parentOffset;
   if (parentOffset === 0 && resolvedPasteStartPos.depth > 0) {
     pasteStartPos = resolvedPasteStartPos.before();
   }
+  var schema = tr.doc.type.schema;
   var plainTextNode = schema.text(plaintext);
   var plainTextFragment = Fragment.from(schema.nodes.paragraph.createAndFill(null, plainTextNode));
   var plainTextSlice = new Slice(plainTextFragment, resolvedPasteStartPos.depth, resolvedPasteStartPos.depth);

package/dist/types/commands.d.ts

@@ -4,13 +4,13 @@ import type { LastContentPasted } from '@atlaskit/editor-plugin-paste';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import { ToolbarDropdownOption } from './types';
 export declare const showToolbar: (lastContentPasted: LastContentPasted, selectedOption: ToolbarDropdownOption) => Command;
-export declare const changeToPlainText: (pasteStartPos: number, plaintext: string) => Command;
-export declare const changeToPlainTextWithAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined, sliceSize: number) => (pasteStartPos: number, plaintext: string) => Command;
+export declare const changeToPlainText: () => Command;
+export declare const changeToPlainTextWithAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined, sliceSize: number) => () => Command;
 export declare const dropdownClickHandler: () => Command;
-export declare const changeToRichText: (pasteStartPos: number) => Command;
-export declare const changeToRichTextWithAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (pasteStartPos: number) => Command;
-export declare const changeToMarkDown: (pasteStartPos: number, plaintext: string) => Command;
-export declare const changeToMarkdownWithAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined, sliceSize: number) => (pasteStartPos: number, plaintext: string) => Command;
+export declare const changeToRichText: () => Command;
+export declare const changeToRichTextWithAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => () => Command;
+export declare const changeToMarkDown: () => Command;
+export declare const changeToMarkdownWithAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined, sliceSize: number) => () => Command;
 export declare const highlightContent: () => Command;
 export declare const hideToolbar: () => Command;
 export declare const checkAndHideToolbar: (view: EditorView) => void;

package/dist/types/pm-plugins/constants.d.ts

@@ -5,3 +5,4 @@ export declare const PASTE_HIGHLIGHT_DECORATION_KEY = "paste-highlight-decoratio
 export declare const PASTE_TOOLBAR_ITEM_CLASS = "ak-editor-paste-toolbar-item";
 export declare const EDITOR_WRAPPER_CLASS = "akEditor";
 export declare const PASTE_OPTIONS_TEST_ID = "paste-options-testid";
+export declare const PASTE_OPTIONS_META_ID = "paste-options$";

package/dist/types/toolbar.d.ts

@@ -5,5 +5,5 @@ import type { LastContentPasted } from '@atlaskit/editor-plugin-paste';
 import type { EditorState } from '@atlaskit/editor-prosemirror/state';
 import type { PasteOtionsPluginState } from './types';
 export declare const isToolbarVisible: (state: EditorState, lastContentPasted: LastContentPasted) => boolean;
-export declare const getToolbarMenuConfig: (pluginState: PasteOtionsPluginState, pasteStartPos: number, plaintext: string, intl: IntlShape, editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => FloatingToolbarDropdown<Command>;
-export declare const buildToolbar: (state: EditorState, pasteStartPos: number, plaintext: string, intl: IntlShape, editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => FloatingToolbarConfig | undefined;
+export declare const getToolbarMenuConfig: (pluginState: PasteOtionsPluginState, intl: IntlShape, editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => FloatingToolbarDropdown<Command>;
+export declare const buildToolbar: (state: EditorState, intl: IntlShape, editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => FloatingToolbarConfig | undefined;

package/dist/types/util/format-handlers.d.ts

@@ -1,9 +1,9 @@
 import type { Schema } from '@atlaskit/editor-prosemirror/model';
 import { Slice } from '@atlaskit/editor-prosemirror/model';
-import type { EditorState, Transaction } from '@atlaskit/editor-prosemirror/state';
+import type { Transaction } from '@atlaskit/editor-prosemirror/state';
 import { Selection } from '@atlaskit/editor-prosemirror/state';
-export declare const formatMarkdown: (state: EditorState, pasteStartPos: number, plaintext: string) => Transaction;
-export declare const getRichTextSlice: (state: EditorState, pasteStartPos: number) => Slice;
-export declare const formatRichText: (state: EditorState, pasteStartPos: number, richTextSlice: Slice) => Transaction;
-export declare const formatPlainText: (state: EditorState, pasteStartPos: number, plaintext: string) => Transaction;
+import type { PasteOtionsPluginState } from '../types';
+export declare const formatMarkdown: (tr: Transaction, pluginState: PasteOtionsPluginState) => Transaction;
+export declare const formatRichText: (tr: Transaction, pluginState: PasteOtionsPluginState) => Transaction;
+export declare const formatPlainText: (tr: Transaction, pluginState: PasteOtionsPluginState) => Transaction;
 export declare function getMarkdownSlice(text: string, schema: Schema, selection: Selection): Slice | undefined;

package/dist/types-ts4.5/commands.d.ts

@@ -4,13 +4,13 @@ import type { LastContentPasted } from '@atlaskit/editor-plugin-paste';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import { ToolbarDropdownOption } from './types';
 export declare const showToolbar: (lastContentPasted: LastContentPasted, selectedOption: ToolbarDropdownOption) => Command;
-export declare const changeToPlainText: (pasteStartPos: number, plaintext: string) => Command;
-export declare const changeToPlainTextWithAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined, sliceSize: number) => (pasteStartPos: number, plaintext: string) => Command;
+export declare const changeToPlainText: () => Command;
+export declare const changeToPlainTextWithAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined, sliceSize: number) => () => Command;
 export declare const dropdownClickHandler: () => Command;
-export declare const changeToRichText: (pasteStartPos: number) => Command;
-export declare const changeToRichTextWithAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (pasteStartPos: number) => Command;
-export declare const changeToMarkDown: (pasteStartPos: number, plaintext: string) => Command;
-export declare const changeToMarkdownWithAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined, sliceSize: number) => (pasteStartPos: number, plaintext: string) => Command;
+export declare const changeToRichText: () => Command;
+export declare const changeToRichTextWithAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => () => Command;
+export declare const changeToMarkDown: () => Command;
+export declare const changeToMarkdownWithAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined, sliceSize: number) => () => Command;
 export declare const highlightContent: () => Command;
 export declare const hideToolbar: () => Command;
 export declare const checkAndHideToolbar: (view: EditorView) => void;

package/dist/types-ts4.5/pm-plugins/constants.d.ts

@@ -5,3 +5,4 @@ export declare const PASTE_HIGHLIGHT_DECORATION_KEY = "paste-highlight-decoratio
 export declare const PASTE_TOOLBAR_ITEM_CLASS = "ak-editor-paste-toolbar-item";
 export declare const EDITOR_WRAPPER_CLASS = "akEditor";
 export declare const PASTE_OPTIONS_TEST_ID = "paste-options-testid";
+export declare const PASTE_OPTIONS_META_ID = "paste-options$";

package/dist/types-ts4.5/toolbar.d.ts

@@ -5,5 +5,5 @@ import type { LastContentPasted } from '@atlaskit/editor-plugin-paste';
 import type { EditorState } from '@atlaskit/editor-prosemirror/state';
 import type { PasteOtionsPluginState } from './types';
 export declare const isToolbarVisible: (state: EditorState, lastContentPasted: LastContentPasted) => boolean;
-export declare const getToolbarMenuConfig: (pluginState: PasteOtionsPluginState, pasteStartPos: number, plaintext: string, intl: IntlShape, editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => FloatingToolbarDropdown<Command>;
-export declare const buildToolbar: (state: EditorState, pasteStartPos: number, plaintext: string, intl: IntlShape, editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => FloatingToolbarConfig | undefined;
+export declare const getToolbarMenuConfig: (pluginState: PasteOtionsPluginState, intl: IntlShape, editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => FloatingToolbarDropdown<Command>;
+export declare const buildToolbar: (state: EditorState, intl: IntlShape, editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => FloatingToolbarConfig | undefined;

package/dist/types-ts4.5/util/format-handlers.d.ts

@@ -1,9 +1,9 @@
 import type { Schema } from '@atlaskit/editor-prosemirror/model';
 import { Slice } from '@atlaskit/editor-prosemirror/model';
-import type { EditorState, Transaction } from '@atlaskit/editor-prosemirror/state';
+import type { Transaction } from '@atlaskit/editor-prosemirror/state';
 import { Selection } from '@atlaskit/editor-prosemirror/state';
-export declare const formatMarkdown: (state: EditorState, pasteStartPos: number, plaintext: string) => Transaction;
-export declare const getRichTextSlice: (state: EditorState, pasteStartPos: number) => Slice;
-export declare const formatRichText: (state: EditorState, pasteStartPos: number, richTextSlice: Slice) => Transaction;
-export declare const formatPlainText: (state: EditorState, pasteStartPos: number, plaintext: string) => Transaction;
+import type { PasteOtionsPluginState } from '../types';
+export declare const formatMarkdown: (tr: Transaction, pluginState: PasteOtionsPluginState) => Transaction;
+export declare const formatRichText: (tr: Transaction, pluginState: PasteOtionsPluginState) => Transaction;
+export declare const formatPlainText: (tr: Transaction, pluginState: PasteOtionsPluginState) => Transaction;
 export declare function getMarkdownSlice(text: string, schema: Schema, selection: Selection): Slice | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-paste-options-toolbar",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "Paste options toolbar for @atlaskit/editor-core",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",