@atlaskit/editor-plugin-paste-options-toolbar 13.2.9 → 13.3.0

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/editor-plugin-paste-options-toolbar
 
+## 13.3.0
+
+### Minor Changes
+
+- [`24fdd04e3b469`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/24fdd04e3b469) -
+  Switch Paste as Markdown to the markdown-plus parser behind existing gates, with legacy fallback
+  retained. Wire the converter through Confluence preset configuration for the gated path.
+
+### Patch Changes
+
+- Updated dependencies
+
+## 13.2.10
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 13.2.9
 
 ### Patch Changes

package/dist/cjs/editor-commands/commands.js

@@ -107,13 +107,13 @@ var changeToRichTextWithAnalytics = exports.changeToRichTextWithAnalytics = func
     return (0, _editorAnalytics.withAnalytics)(editorAnalyticsAPI, payloadCallback)(changeToRichText());
   };
 };
-var changeToMarkDown = exports.changeToMarkDown = function changeToMarkDown() {
+var changeToMarkDown = exports.changeToMarkDown = function changeToMarkDown(markdownToPmConverter) {
   var markdownTransformer = function markdownTransformer(tr, state) {
     var pluginState = _types.pasteOptionsPluginKey.getState(state);
     if (pluginState.selectedOption === _types.ToolbarDropdownOption.Markdown) {
       return tr;
     }
-    return (0, _formatHandlers.formatMarkdown)(tr, pluginState);
+    return (0, _formatHandlers.formatMarkdown)(tr, pluginState, markdownToPmConverter);
   };
   var commandAction = function commandAction(_editorState) {
     return {
@@ -125,7 +125,7 @@ var changeToMarkDown = exports.changeToMarkDown = function changeToMarkDown() {
   };
   return (0, _pluginFactory.createCommand)(commandAction, markdownTransformer);
 };
-var changeToMarkdownWithAnalytics = exports.changeToMarkdownWithAnalytics = function changeToMarkdownWithAnalytics(editorAnalyticsAPI, sliceSize, invokedFrom) {
+var changeToMarkdownWithAnalytics = exports.changeToMarkdownWithAnalytics = function changeToMarkdownWithAnalytics(editorAnalyticsAPI, sliceSize, invokedFrom, markdownToPmConverter) {
   return function () {
     return (0, _editorAnalytics.withAnalytics)(editorAnalyticsAPI, {
       action: _analytics.ACTION.PASTED,
@@ -138,7 +138,7 @@ var changeToMarkdownWithAnalytics = exports.changeToMarkdownWithAnalytics = func
         pasteSize: sliceSize,
         invokedFrom: invokedFrom
       }
-    })(changeToMarkDown());
+    })(changeToMarkDown(markdownToPmConverter));
   };
 };
 var highlightContent = exports.highlightContent = function highlightContent() {

package/dist/cjs/pasteOptionsToolbarPlugin.js

@@ -49,7 +49,8 @@ var pasteOptionsToolbarPlugin = exports.pasteOptionsToolbarPlugin = function pas
   if (config !== null && config !== void 0 && config.usePopupBasedPasteActionsMenu && (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_paste_actions_menu', 'isEnabled', true)) {
     var _api$uiControlRegistr;
     api === null || api === void 0 || (_api$uiControlRegistr = api.uiControlRegistry) === null || _api$uiControlRegistr === void 0 || _api$uiControlRegistr.actions.register((0, _PasteMenuComponents.getPasteMenuComponents)({
-      api: api
+      api: api,
+      markdownToPmConverter: config === null || config === void 0 ? void 0 : config.markdownToPmConverter
     }));
   }
   if (config !== null && config !== void 0 && config.pasteMenuButtonsFactory && config !== null && config !== void 0 && config.usePopupBasedPasteActionsMenu) {
@@ -171,7 +172,7 @@ var pasteOptionsToolbarPlugin = exports.pasteOptionsToolbarPlugin = function pas
         }
         var pastePluginState = _types.pasteOptionsPluginKey.getState(state);
         if (pastePluginState.showToolbar) {
-          return (0, _toolbar.buildToolbar)(state, intl, editorAnalyticsAPI);
+          return (0, _toolbar.buildToolbar)(state, intl, editorAnalyticsAPI, config === null || config === void 0 ? void 0 : config.markdownToPmConverter);
         }
         return;
       }

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

@@ -12,11 +12,13 @@ var _editorMarkdownTransformer = require("@atlaskit/editor-markdown-transformer"
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _transform = require("@atlaskit/editor-prosemirror/transform");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _index = require("./index");
 // Ignored via go/ees005
 // eslint-disable-next-line require-unicode-regexp
 var CODE_BLOCK_FENCE_REGEX = /```/;
-var formatMarkdown = exports.formatMarkdown = function formatMarkdown(tr, pluginState) {
+var formatMarkdown = exports.formatMarkdown = function formatMarkdown(tr, pluginState, markdownToPmConverter) {
   var pasteStartPos = pluginState.pasteStartPos;
   var pasteEndPos = pluginState.pasteEndPos;
   var plaintext = pluginState.plaintext;
@@ -28,7 +30,7 @@ var formatMarkdown = exports.formatMarkdown = function formatMarkdown(tr, plugin
   if (parentOffset === 0 && resolvedPasteStartPos.depth > 0) {
     pasteStartPos = resolvedPasteStartPos.before();
   }
-  var markdownSlice = getMarkdownSlice(plaintext, tr.doc.type.schema, tr.selection);
+  var markdownSlice = getMarkdownSlice(plaintext, tr.doc.type.schema, tr.selection, markdownToPmConverter);
   if (!markdownSlice) {
     return tr;
   }
@@ -148,7 +150,12 @@ function richTextSliceTransactionWithSelectionAdjust(_ref2) {
     tr.setSelection(nextSelection);
   }
 }
-function getMarkdownSlice(text, schema, selection) {
+
+/**
+ * Parse markdown text into a slice for paste replacement, using markdown-plus
+ * only when both markdown-mode experiment and paste parser gate are enabled.
+ */
+function getMarkdownSlice(text, schema, selection, markdownToPmConverter) {
   var targetOpenStartNode = selection.$from.parent;
   var targetOpenEndNode = selection.$to.parent;
   try {
@@ -163,8 +170,10 @@ function getMarkdownSlice(text, schema, selection) {
       }
     }
     textInput = textSplitByCodeBlock.join('```');
-    var atlassianMarkDownParser = new _editorMarkdownTransformer.MarkdownTransformer(schema, _paste.md);
-    var doc = atlassianMarkDownParser.parse((0, _index.escapeLinks)(textInput));
+    var doc = markdownToPmConverter && (0, _expValEquals.expValEquals)('cc-markdown-mode', 'isEnabled', true) && (0, _platformFeatureFlags.fg)('platform_editor_paste_as_md_use_gfm_transformer') ? schema.nodes.doc.createAndFill({}, markdownToPmConverter({
+      markdown: textInput,
+      schema: schema
+    })) : new _editorMarkdownTransformer.MarkdownTransformer(schema, _paste.md).parse((0, _index.escapeLinks)(textInput));
     if (!doc || !doc.content) {
       return;
     }

package/dist/cjs/ui/on-paste-actions-menu/PasteMenuComponents.js

@@ -43,7 +43,8 @@ var isPasteOptionSelected = exports.isPasteOptionSelected = function isPasteOpti
 var PasteMenuItem = function PasteMenuItem(_ref) {
   var _api$analytics;
   var api = _ref.api,
-    pasteType = _ref.pasteType;
+    pasteType = _ref.pasteType,
+    markdownToPmConverter = _ref.markdownToPmConverter;
   var intl = (0, _reactIntl.useIntl)();
   var _useEditorToolbar = (0, _toolbar.useEditorToolbar)(),
     editorView = _useEditorToolbar.editorView;
@@ -82,13 +83,13 @@ var PasteMenuItem = function PasteMenuItem(_ref) {
         (0, _commands.changeToRichTextWithAnalytics)(editorAnalyticsAPI, 'pasteMenu')()(editorView.state, editorView.dispatch);
         break;
       case 'markdown':
-        (0, _commands.changeToMarkdownWithAnalytics)(editorAnalyticsAPI, plaintextLength, 'pasteMenu')()(editorView.state, editorView.dispatch);
+        (0, _commands.changeToMarkdownWithAnalytics)(editorAnalyticsAPI, plaintextLength, 'pasteMenu', markdownToPmConverter)()(editorView.state, editorView.dispatch);
         break;
       case 'plain-text':
         (0, _commands.changeToPlainTextWithAnalytics)(editorAnalyticsAPI, plaintextLength, 'pasteMenu')()(editorView.state, editorView.dispatch);
         break;
     }
-  }, [editorView, editorAnalyticsAPI, plaintextLength, pasteType]);
+  }, [editorView, editorAnalyticsAPI, markdownToPmConverter, plaintextLength, pasteType]);
   if (pasteType === 'rich-text' && isPlainText) {
     return null;
   }
@@ -146,7 +147,8 @@ var getHasVisibleAiActions = function getHasVisibleAiActions(api) {
   return (0, _hasVisibleButton.getVisibleKeys)(aiMenuItems, ['menu-item']).length > 0;
 };
 var getPasteMenuComponents = exports.getPasteMenuComponents = function getPasteMenuComponents(_ref3) {
-  var api = _ref3.api;
+  var api = _ref3.api,
+    markdownToPmConverter = _ref3.markdownToPmConverter;
   return [{
     type: _toolbar.PASTE_MENU.type,
     key: _toolbar.PASTE_MENU.key
@@ -221,6 +223,7 @@ var getPasteMenuComponents = exports.getPasteMenuComponents = function getPasteM
     component: function component() {
       return /*#__PURE__*/_react.default.createElement(PasteMenuItem, {
         api: api,
+        markdownToPmConverter: markdownToPmConverter,
         pasteType: "markdown"
       });
     },

package/dist/cjs/ui/toolbar.js

@@ -32,7 +32,7 @@ var isToolbarVisible = exports.isToolbarVisible = function isToolbarVisible(stat
   }
   return false;
 };
-var getToolbarMenuConfig = exports.getToolbarMenuConfig = function getToolbarMenuConfig(pluginState, intl, editorAnalyticsAPI) {
+var getToolbarMenuConfig = exports.getToolbarMenuConfig = function getToolbarMenuConfig(pluginState, intl, editorAnalyticsAPI, markdownToPmConverter) {
   var options = [{
     id: 'editor.paste.richText',
     title: intl.formatMessage(_messages.pasteOptionsToolbarMessages.richText),
@@ -43,7 +43,7 @@ var getToolbarMenuConfig = exports.getToolbarMenuConfig = function getToolbarMen
     id: 'editor.paste.markdown',
     title: intl.formatMessage(_messages.pasteOptionsToolbarMessages.markdown),
     selected: pluginState.selectedOption === _types.ToolbarDropdownOption.Markdown,
-    onClick: (0, _commands.changeToMarkdownWithAnalytics)(editorAnalyticsAPI, pluginState.plaintext.length)()
+    onClick: (0, _commands.changeToMarkdownWithAnalytics)(editorAnalyticsAPI, pluginState.plaintext.length, undefined, markdownToPmConverter)()
   }, {
     id: 'editor.paste.plainText',
     title: intl.formatMessage(_messages.pasteOptionsToolbarMessages.plainText),
@@ -63,11 +63,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, intl, editorAnalyticsAPI) {
+var buildToolbar = exports.buildToolbar = function buildToolbar(state, intl, editorAnalyticsAPI, markdownToPmConverter) {
   var schema = state.schema;
   var validNodes = Object.values(schema.nodes);
   var pluginState = _types.pasteOptionsPluginKey.getState(state);
-  var menu = getToolbarMenuConfig(pluginState, intl, editorAnalyticsAPI);
+  var menu = getToolbarMenuConfig(pluginState, intl, editorAnalyticsAPI, markdownToPmConverter);
   return {
     title: intl.formatMessage(_messages.pasteOptionsToolbarMessages.pasteOptions),
     nodeType: validNodes,

package/dist/es2019/editor-commands/commands.js

@@ -95,13 +95,13 @@ export const changeToRichTextWithAnalytics = (editorAnalyticsAPI, invokedFrom) =
   };
   return withAnalytics(editorAnalyticsAPI, payloadCallback)(changeToRichText());
 };
-export const changeToMarkDown = () => {
+export const changeToMarkDown = markdownToPmConverter => {
   const markdownTransformer = (tr, state) => {
     const pluginState = pasteOptionsPluginKey.getState(state);
     if (pluginState.selectedOption === ToolbarDropdownOption.Markdown) {
       return tr;
     }
-    return formatMarkdown(tr, pluginState);
+    return formatMarkdown(tr, pluginState, markdownToPmConverter);
   };
   const commandAction = _editorState => {
     return {
@@ -113,7 +113,7 @@ export const changeToMarkDown = () => {
   };
   return createCommand(commandAction, markdownTransformer);
 };
-export const changeToMarkdownWithAnalytics = (editorAnalyticsAPI, sliceSize, invokedFrom) => () => {
+export const changeToMarkdownWithAnalytics = (editorAnalyticsAPI, sliceSize, invokedFrom, markdownToPmConverter) => () => {
   return withAnalytics(editorAnalyticsAPI, {
     action: ACTION.PASTED,
     actionSubject: ACTION_SUBJECT.DOCUMENT,
@@ -125,7 +125,7 @@ export const changeToMarkdownWithAnalytics = (editorAnalyticsAPI, sliceSize, inv
       pasteSize: sliceSize,
       invokedFrom
     }
-  })(changeToMarkDown());
+  })(changeToMarkDown(markdownToPmConverter));
 };
 export const highlightContent = () => {
   const commandAction = _editorState => {

package/dist/es2019/pasteOptionsToolbarPlugin.js

@@ -40,7 +40,8 @@ export const pasteOptionsToolbarPlugin = ({
   if (config !== null && config !== void 0 && config.usePopupBasedPasteActionsMenu && expValEqualsNoExposure('platform_editor_paste_actions_menu', 'isEnabled', true)) {
     var _api$uiControlRegistr;
     api === null || api === void 0 ? void 0 : (_api$uiControlRegistr = api.uiControlRegistry) === null || _api$uiControlRegistr === void 0 ? void 0 : _api$uiControlRegistr.actions.register(getPasteMenuComponents({
-      api
+      api,
+      markdownToPmConverter: config === null || config === void 0 ? void 0 : config.markdownToPmConverter
     }));
   }
   if (config !== null && config !== void 0 && config.pasteMenuButtonsFactory && config !== null && config !== void 0 && config.usePopupBasedPasteActionsMenu) {
@@ -157,7 +158,7 @@ export const pasteOptionsToolbarPlugin = ({
         }
         const pastePluginState = pasteOptionsPluginKey.getState(state);
         if (pastePluginState.showToolbar) {
-          return buildToolbar(state, intl, editorAnalyticsAPI);
+          return buildToolbar(state, intl, editorAnalyticsAPI, config === null || config === void 0 ? void 0 : config.markdownToPmConverter);
         }
         return;
       }

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

@@ -5,12 +5,14 @@ import { MarkdownTransformer } from '@atlaskit/editor-markdown-transformer';
 import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
 import { Selection } from '@atlaskit/editor-prosemirror/state';
 import { ReplaceStep } from '@atlaskit/editor-prosemirror/transform';
+import { fg } from '@atlaskit/platform-feature-flags';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { escapeLinks } from './index';
 
 // Ignored via go/ees005
 // eslint-disable-next-line require-unicode-regexp
 const CODE_BLOCK_FENCE_REGEX = /```/;
-export const formatMarkdown = (tr, pluginState) => {
+export const formatMarkdown = (tr, pluginState, markdownToPmConverter) => {
   let pasteStartPos = pluginState.pasteStartPos;
   const pasteEndPos = pluginState.pasteEndPos;
   const plaintext = pluginState.plaintext;
@@ -22,7 +24,7 @@ export const formatMarkdown = (tr, pluginState) => {
   if (parentOffset === 0 && resolvedPasteStartPos.depth > 0) {
     pasteStartPos = resolvedPasteStartPos.before();
   }
-  const markdownSlice = getMarkdownSlice(plaintext, tr.doc.type.schema, tr.selection);
+  const markdownSlice = getMarkdownSlice(plaintext, tr.doc.type.schema, tr.selection, markdownToPmConverter);
   if (!markdownSlice) {
     return tr;
   }
@@ -144,7 +146,12 @@ function richTextSliceTransactionWithSelectionAdjust({
     tr.setSelection(nextSelection);
   }
 }
-export function getMarkdownSlice(text, schema, selection) {
+
+/**
+ * Parse markdown text into a slice for paste replacement, using markdown-plus
+ * only when both markdown-mode experiment and paste parser gate are enabled.
+ */
+export function getMarkdownSlice(text, schema, selection, markdownToPmConverter) {
   const targetOpenStartNode = selection.$from.parent;
   const targetOpenEndNode = selection.$to.parent;
   try {
@@ -159,8 +166,10 @@ export function getMarkdownSlice(text, schema, selection) {
       }
     }
     textInput = textSplitByCodeBlock.join('```');
-    const atlassianMarkDownParser = new MarkdownTransformer(schema, md);
-    const doc = atlassianMarkDownParser.parse(escapeLinks(textInput));
+    const doc = markdownToPmConverter && expValEquals('cc-markdown-mode', 'isEnabled', true) && fg('platform_editor_paste_as_md_use_gfm_transformer') ? schema.nodes.doc.createAndFill({}, markdownToPmConverter({
+      markdown: textInput,
+      schema
+    })) : new MarkdownTransformer(schema, md).parse(escapeLinks(textInput));
     if (!doc || !doc.content) {
       return;
     }

package/dist/es2019/ui/on-paste-actions-menu/PasteMenuComponents.js

@@ -33,7 +33,8 @@ export const isPasteOptionSelected = (pasteType, selectedOption) => {
 };
 const PasteMenuItem = ({
   api,
-  pasteType
+  pasteType,
+  markdownToPmConverter
 }) => {
   var _api$analytics;
   const intl = useIntl();
@@ -76,13 +77,13 @@ const PasteMenuItem = ({
         changeToRichTextWithAnalytics(editorAnalyticsAPI, 'pasteMenu')()(editorView.state, editorView.dispatch);
         break;
       case 'markdown':
-        changeToMarkdownWithAnalytics(editorAnalyticsAPI, plaintextLength, 'pasteMenu')()(editorView.state, editorView.dispatch);
+        changeToMarkdownWithAnalytics(editorAnalyticsAPI, plaintextLength, 'pasteMenu', markdownToPmConverter)()(editorView.state, editorView.dispatch);
         break;
       case 'plain-text':
         changeToPlainTextWithAnalytics(editorAnalyticsAPI, plaintextLength, 'pasteMenu')()(editorView.state, editorView.dispatch);
         break;
     }
-  }, [editorView, editorAnalyticsAPI, plaintextLength, pasteType]);
+  }, [editorView, editorAnalyticsAPI, markdownToPmConverter, plaintextLength, pasteType]);
   if (pasteType === 'rich-text' && isPlainText) {
     return null;
   }
@@ -139,7 +140,8 @@ const getHasVisibleAiActions = api => {
   return getVisibleKeys(aiMenuItems, ['menu-item']).length > 0;
 };
 export const getPasteMenuComponents = ({
-  api
+  api,
+  markdownToPmConverter
 }) => [{
   type: PASTE_MENU.type,
   key: PASTE_MENU.key
@@ -209,6 +211,7 @@ export const getPasteMenuComponents = ({
   type: PASTE_MARKDOWN_MENU_ITEM.type,
   component: () => /*#__PURE__*/React.createElement(PasteMenuItem, {
     api: api,
+    markdownToPmConverter: markdownToPmConverter,
     pasteType: "markdown"
   }),
   parents: [{

package/dist/es2019/ui/toolbar.js

@@ -25,7 +25,7 @@ export const isToolbarVisible = (state, lastContentPasted) => {
   }
   return false;
 };
-export const getToolbarMenuConfig = (pluginState, intl, editorAnalyticsAPI) => {
+export const getToolbarMenuConfig = (pluginState, intl, editorAnalyticsAPI, markdownToPmConverter) => {
   const options = [{
     id: 'editor.paste.richText',
     title: intl.formatMessage(messages.richText),
@@ -36,7 +36,7 @@ export const getToolbarMenuConfig = (pluginState, intl, editorAnalyticsAPI) => {
     id: 'editor.paste.markdown',
     title: intl.formatMessage(messages.markdown),
     selected: pluginState.selectedOption === ToolbarDropdownOption.Markdown,
-    onClick: changeToMarkdownWithAnalytics(editorAnalyticsAPI, pluginState.plaintext.length)()
+    onClick: changeToMarkdownWithAnalytics(editorAnalyticsAPI, pluginState.plaintext.length, undefined, markdownToPmConverter)()
   }, {
     id: 'editor.paste.plainText',
     title: intl.formatMessage(messages.plainText),
@@ -56,13 +56,13 @@ export const getToolbarMenuConfig = (pluginState, intl, editorAnalyticsAPI) => {
 const onToggleHandler = (state, dispatch) => {
   return dropdownClickHandler()(state, dispatch);
 };
-export const buildToolbar = (state, intl, editorAnalyticsAPI) => {
+export const buildToolbar = (state, intl, editorAnalyticsAPI, markdownToPmConverter) => {
   const {
     schema
   } = state;
   const validNodes = Object.values(schema.nodes);
   const pluginState = pasteOptionsPluginKey.getState(state);
-  const menu = getToolbarMenuConfig(pluginState, intl, editorAnalyticsAPI);
+  const menu = getToolbarMenuConfig(pluginState, intl, editorAnalyticsAPI, markdownToPmConverter);
   return {
     title: intl.formatMessage(messages.pasteOptions),
     nodeType: validNodes,

package/dist/esm/editor-commands/commands.js

@@ -101,13 +101,13 @@ export var changeToRichTextWithAnalytics = function changeToRichTextWithAnalytic
     return withAnalytics(editorAnalyticsAPI, payloadCallback)(changeToRichText());
   };
 };
-export var changeToMarkDown = function changeToMarkDown() {
+export var changeToMarkDown = function changeToMarkDown(markdownToPmConverter) {
   var markdownTransformer = function markdownTransformer(tr, state) {
     var pluginState = pasteOptionsPluginKey.getState(state);
     if (pluginState.selectedOption === ToolbarDropdownOption.Markdown) {
       return tr;
     }
-    return formatMarkdown(tr, pluginState);
+    return formatMarkdown(tr, pluginState, markdownToPmConverter);
   };
   var commandAction = function commandAction(_editorState) {
     return {
@@ -119,7 +119,7 @@ export var changeToMarkDown = function changeToMarkDown() {
   };
   return createCommand(commandAction, markdownTransformer);
 };
-export var changeToMarkdownWithAnalytics = function changeToMarkdownWithAnalytics(editorAnalyticsAPI, sliceSize, invokedFrom) {
+export var changeToMarkdownWithAnalytics = function changeToMarkdownWithAnalytics(editorAnalyticsAPI, sliceSize, invokedFrom, markdownToPmConverter) {
   return function () {
     return withAnalytics(editorAnalyticsAPI, {
       action: ACTION.PASTED,
@@ -132,7 +132,7 @@ export var changeToMarkdownWithAnalytics = function changeToMarkdownWithAnalytic
         pasteSize: sliceSize,
         invokedFrom: invokedFrom
       }
-    })(changeToMarkDown());
+    })(changeToMarkDown(markdownToPmConverter));
   };
 };
 export var highlightContent = function highlightContent() {

package/dist/esm/pasteOptionsToolbarPlugin.js

@@ -41,7 +41,8 @@ export var pasteOptionsToolbarPlugin = function pasteOptionsToolbarPlugin(_ref)
   if (config !== null && config !== void 0 && config.usePopupBasedPasteActionsMenu && expValEqualsNoExposure('platform_editor_paste_actions_menu', 'isEnabled', true)) {
     var _api$uiControlRegistr;
     api === null || api === void 0 || (_api$uiControlRegistr = api.uiControlRegistry) === null || _api$uiControlRegistr === void 0 || _api$uiControlRegistr.actions.register(getPasteMenuComponents({
-      api: api
+      api: api,
+      markdownToPmConverter: config === null || config === void 0 ? void 0 : config.markdownToPmConverter
     }));
   }
   if (config !== null && config !== void 0 && config.pasteMenuButtonsFactory && config !== null && config !== void 0 && config.usePopupBasedPasteActionsMenu) {
@@ -163,7 +164,7 @@ export var pasteOptionsToolbarPlugin = function pasteOptionsToolbarPlugin(_ref)
         }
         var pastePluginState = pasteOptionsPluginKey.getState(state);
         if (pastePluginState.showToolbar) {
-          return buildToolbar(state, intl, editorAnalyticsAPI);
+          return buildToolbar(state, intl, editorAnalyticsAPI, config === null || config === void 0 ? void 0 : config.markdownToPmConverter);
         }
         return;
       }

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

@@ -5,12 +5,14 @@ import { MarkdownTransformer } from '@atlaskit/editor-markdown-transformer';
 import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
 import { Selection } from '@atlaskit/editor-prosemirror/state';
 import { ReplaceStep } from '@atlaskit/editor-prosemirror/transform';
+import { fg } from '@atlaskit/platform-feature-flags';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { escapeLinks } from './index';
 
 // Ignored via go/ees005
 // eslint-disable-next-line require-unicode-regexp
 var CODE_BLOCK_FENCE_REGEX = /```/;
-export var formatMarkdown = function formatMarkdown(tr, pluginState) {
+export var formatMarkdown = function formatMarkdown(tr, pluginState, markdownToPmConverter) {
   var pasteStartPos = pluginState.pasteStartPos;
   var pasteEndPos = pluginState.pasteEndPos;
   var plaintext = pluginState.plaintext;
@@ -22,7 +24,7 @@ export var formatMarkdown = function formatMarkdown(tr, pluginState) {
   if (parentOffset === 0 && resolvedPasteStartPos.depth > 0) {
     pasteStartPos = resolvedPasteStartPos.before();
   }
-  var markdownSlice = getMarkdownSlice(plaintext, tr.doc.type.schema, tr.selection);
+  var markdownSlice = getMarkdownSlice(plaintext, tr.doc.type.schema, tr.selection, markdownToPmConverter);
   if (!markdownSlice) {
     return tr;
   }
@@ -142,7 +144,12 @@ function richTextSliceTransactionWithSelectionAdjust(_ref2) {
     tr.setSelection(nextSelection);
   }
 }
-export function getMarkdownSlice(text, schema, selection) {
+
+/**
+ * Parse markdown text into a slice for paste replacement, using markdown-plus
+ * only when both markdown-mode experiment and paste parser gate are enabled.
+ */
+export function getMarkdownSlice(text, schema, selection, markdownToPmConverter) {
   var targetOpenStartNode = selection.$from.parent;
   var targetOpenEndNode = selection.$to.parent;
   try {
@@ -157,8 +164,10 @@ export function getMarkdownSlice(text, schema, selection) {
       }
     }
     textInput = textSplitByCodeBlock.join('```');
-    var atlassianMarkDownParser = new MarkdownTransformer(schema, md);
-    var doc = atlassianMarkDownParser.parse(escapeLinks(textInput));
+    var doc = markdownToPmConverter && expValEquals('cc-markdown-mode', 'isEnabled', true) && fg('platform_editor_paste_as_md_use_gfm_transformer') ? schema.nodes.doc.createAndFill({}, markdownToPmConverter({
+      markdown: textInput,
+      schema: schema
+    })) : new MarkdownTransformer(schema, md).parse(escapeLinks(textInput));
     if (!doc || !doc.content) {
       return;
     }

package/dist/esm/ui/on-paste-actions-menu/PasteMenuComponents.js

@@ -34,7 +34,8 @@ export var isPasteOptionSelected = function isPasteOptionSelected(pasteType, sel
 var PasteMenuItem = function PasteMenuItem(_ref) {
   var _api$analytics;
   var api = _ref.api,
-    pasteType = _ref.pasteType;
+    pasteType = _ref.pasteType,
+    markdownToPmConverter = _ref.markdownToPmConverter;
   var intl = useIntl();
   var _useEditorToolbar = useEditorToolbar(),
     editorView = _useEditorToolbar.editorView;
@@ -73,13 +74,13 @@ var PasteMenuItem = function PasteMenuItem(_ref) {
         changeToRichTextWithAnalytics(editorAnalyticsAPI, 'pasteMenu')()(editorView.state, editorView.dispatch);
         break;
       case 'markdown':
-        changeToMarkdownWithAnalytics(editorAnalyticsAPI, plaintextLength, 'pasteMenu')()(editorView.state, editorView.dispatch);
+        changeToMarkdownWithAnalytics(editorAnalyticsAPI, plaintextLength, 'pasteMenu', markdownToPmConverter)()(editorView.state, editorView.dispatch);
         break;
       case 'plain-text':
         changeToPlainTextWithAnalytics(editorAnalyticsAPI, plaintextLength, 'pasteMenu')()(editorView.state, editorView.dispatch);
         break;
     }
-  }, [editorView, editorAnalyticsAPI, plaintextLength, pasteType]);
+  }, [editorView, editorAnalyticsAPI, markdownToPmConverter, plaintextLength, pasteType]);
   if (pasteType === 'rich-text' && isPlainText) {
     return null;
   }
@@ -137,7 +138,8 @@ var getHasVisibleAiActions = function getHasVisibleAiActions(api) {
   return getVisibleKeys(aiMenuItems, ['menu-item']).length > 0;
 };
 export var getPasteMenuComponents = function getPasteMenuComponents(_ref3) {
-  var api = _ref3.api;
+  var api = _ref3.api,
+    markdownToPmConverter = _ref3.markdownToPmConverter;
   return [{
     type: PASTE_MENU.type,
     key: PASTE_MENU.key
@@ -212,6 +214,7 @@ export var getPasteMenuComponents = function getPasteMenuComponents(_ref3) {
     component: function component() {
       return /*#__PURE__*/React.createElement(PasteMenuItem, {
         api: api,
+        markdownToPmConverter: markdownToPmConverter,
         pasteType: "markdown"
       });
     },

package/dist/esm/ui/toolbar.js

@@ -25,7 +25,7 @@ export var isToolbarVisible = function isToolbarVisible(state, lastContentPasted
   }
   return false;
 };
-export var getToolbarMenuConfig = function getToolbarMenuConfig(pluginState, intl, editorAnalyticsAPI) {
+export var getToolbarMenuConfig = function getToolbarMenuConfig(pluginState, intl, editorAnalyticsAPI, markdownToPmConverter) {
   var options = [{
     id: 'editor.paste.richText',
     title: intl.formatMessage(messages.richText),
@@ -36,7 +36,7 @@ export var getToolbarMenuConfig = function getToolbarMenuConfig(pluginState, int
     id: 'editor.paste.markdown',
     title: intl.formatMessage(messages.markdown),
     selected: pluginState.selectedOption === ToolbarDropdownOption.Markdown,
-    onClick: changeToMarkdownWithAnalytics(editorAnalyticsAPI, pluginState.plaintext.length)()
+    onClick: changeToMarkdownWithAnalytics(editorAnalyticsAPI, pluginState.plaintext.length, undefined, markdownToPmConverter)()
   }, {
     id: 'editor.paste.plainText',
     title: intl.formatMessage(messages.plainText),
@@ -56,11 +56,11 @@ export var getToolbarMenuConfig = function getToolbarMenuConfig(pluginState, int
 var onToggleHandler = function onToggleHandler(state, dispatch) {
   return dropdownClickHandler()(state, dispatch);
 };
-export var buildToolbar = function buildToolbar(state, intl, editorAnalyticsAPI) {
+export var buildToolbar = function buildToolbar(state, intl, editorAnalyticsAPI, markdownToPmConverter) {
   var schema = state.schema;
   var validNodes = Object.values(schema.nodes);
   var pluginState = pasteOptionsPluginKey.getState(state);
-  var menu = getToolbarMenuConfig(pluginState, intl, editorAnalyticsAPI);
+  var menu = getToolbarMenuConfig(pluginState, intl, editorAnalyticsAPI, markdownToPmConverter);
   return {
     title: intl.formatMessage(messages.pasteOptions),
     nodeType: validNodes,

package/dist/types/editor-commands/commands.d.ts

@@ -2,6 +2,7 @@ import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import type { Command } from '@atlaskit/editor-common/types';
 import type { LastContentPasted } from '@atlaskit/editor-plugin-paste';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
+import type { MarkdownToPmConverter } from '../pasteOptionsToolbarPluginType';
 import { ToolbarDropdownOption } from '../types/types';
 export declare const showToolbar: (lastContentPasted: LastContentPasted, selectedOption: ToolbarDropdownOption, showLegacyOptions?: boolean, pasteAncestorNodeNames?: string[]) => Command;
 export declare const changeToPlainText: () => Command;
@@ -9,8 +10,8 @@ export declare const changeToPlainTextWithAnalytics: (editorAnalyticsAPI: Editor
 export declare const dropdownClickHandler: () => Command;
 export declare const changeToRichText: () => Command;
 export declare const changeToRichTextWithAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined, invokedFrom?: string) => () => Command;
-export declare const changeToMarkDown: () => Command;
-export declare const changeToMarkdownWithAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined, sliceSize: number, invokedFrom?: string) => () => Command;
+export declare const changeToMarkDown: (markdownToPmConverter?: MarkdownToPmConverter) => Command;
+export declare const changeToMarkdownWithAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined, sliceSize: number, invokedFrom?: string, markdownToPmConverter?: MarkdownToPmConverter) => () => Command;
 export declare const highlightContent: () => Command;
 export declare const hideToolbar: () => Command;
 export declare const checkAndHideToolbar: (view: EditorView) => void;

package/dist/types/pasteOptionsToolbarPluginType.d.ts

@@ -2,6 +2,7 @@ import type { NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/t
 import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import type { PastePlugin } from '@atlaskit/editor-plugin-paste';
 import type { UiControlRegistryPlugin } from '@atlaskit/editor-plugin-ui-control-registry';
+import type { Fragment, Schema } from '@atlaskit/editor-prosemirror/model';
 import type { RegisterComponent } from '@atlaskit/editor-ui-control-model';
 import type { ToolbarDropdownOption } from './types/types';
 import type { PasteMenuRuleFactories } from './ui/utils/paste-menu-rules/types';
@@ -27,7 +28,12 @@ export type PasteOptionsToolbarPasteMenuContext = {
         pasteStartPos: number;
     } | undefined;
 };
+export type MarkdownToPmConverter = (params: {
+    markdown: string;
+    schema: Schema;
+}) => Fragment;
 export type PasteOptionsToolbarPluginConfiguration = {
+    markdownToPmConverter?: MarkdownToPmConverter;
     /**
      * Optional factory for composing product-specific paste menu buttons.
      * Called with the pre-bound rule factories so products can compose

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

@@ -2,8 +2,13 @@ import type { Schema } from '@atlaskit/editor-prosemirror/model';
 import { Slice } from '@atlaskit/editor-prosemirror/model';
 import type { Transaction } from '@atlaskit/editor-prosemirror/state';
 import { Selection } from '@atlaskit/editor-prosemirror/state';
+import type { MarkdownToPmConverter } from '../../pasteOptionsToolbarPluginType';
 import type { PasteOptionsPluginState } from '../../types/types';
-export declare const formatMarkdown: (tr: Transaction, pluginState: PasteOptionsPluginState) => Transaction;
+export declare const formatMarkdown: (tr: Transaction, pluginState: PasteOptionsPluginState, markdownToPmConverter?: MarkdownToPmConverter) => Transaction;
 export declare const formatRichText: (tr: Transaction, pluginState: PasteOptionsPluginState) => Transaction;
 export declare const formatPlainText: (tr: Transaction, pluginState: PasteOptionsPluginState) => Transaction;
-export declare function getMarkdownSlice(text: string, schema: Schema, selection: Selection): Slice | undefined;
+/**
+ * Parse markdown text into a slice for paste replacement, using markdown-plus
+ * only when both markdown-mode experiment and paste parser gate are enabled.
+ */
+export declare function getMarkdownSlice(text: string, schema: Schema, selection: Selection, markdownToPmConverter?: MarkdownToPmConverter): Slice | undefined;

package/dist/types/ui/on-paste-actions-menu/PasteMenuComponents.d.ts

@@ -1,10 +1,11 @@
 import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { RegisterComponent } from '@atlaskit/editor-ui-control-model';
-import type { PasteOptionsToolbarPlugin } from '../../pasteOptionsToolbarPluginType';
+import type { MarkdownToPmConverter, PasteOptionsToolbarPlugin } from '../../pasteOptionsToolbarPluginType';
 import { ToolbarDropdownOption, type PasteType } from '../../types/types';
 export declare const isPasteOptionSelected: (pasteType: PasteType, selectedOption: ToolbarDropdownOption) => boolean;
 interface PasteMenuComponentsConfig {
     api: ExtractInjectionAPI<PasteOptionsToolbarPlugin> | undefined;
+    markdownToPmConverter?: MarkdownToPmConverter;
 }
-export declare const getPasteMenuComponents: ({ api }: PasteMenuComponentsConfig) => RegisterComponent[];
+export declare const getPasteMenuComponents: ({ api, markdownToPmConverter, }: PasteMenuComponentsConfig) => RegisterComponent[];
 export {};

package/dist/types/ui/on-paste-actions-menu/hasVisibleButton.d.ts

@@ -3,7 +3,7 @@ import type { RegisterComponent } from '@atlaskit/editor-ui-control-model';
  * Returns the keys of visible button/menu-item components in the list.
  * A component is visible when neither it nor any of its ancestors are hidden.
  */
-export declare const getVisibleKeys: (components: RegisterComponent[], types?: RegisterComponent["type"][]) => string[];
+export declare const getVisibleKeys: (components: RegisterComponent[], types?: RegisterComponent['type'][]) => string[];
 /**
  * Returns true when at least one menu-item button in the list is visible.
  * A button is visible when neither it nor any of its ancestors are hidden.

package/dist/types/ui/toolbar.d.ts

@@ -3,7 +3,8 @@ import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import type { Command, FloatingToolbarConfig, FloatingToolbarDropdown } from '@atlaskit/editor-common/types';
 import type { LastContentPasted } from '@atlaskit/editor-plugin-paste';
 import type { EditorState } from '@atlaskit/editor-prosemirror/state';
+import type { MarkdownToPmConverter } from '../pasteOptionsToolbarPluginType';
 import type { PasteOptionsPluginState } from '../types/types';
 export declare const isToolbarVisible: (state: EditorState, lastContentPasted: LastContentPasted) => boolean;
-export declare const getToolbarMenuConfig: (pluginState: PasteOptionsPluginState, intl: IntlShape, editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => FloatingToolbarDropdown<Command>;
-export declare const buildToolbar: (state: EditorState, intl: IntlShape, editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => FloatingToolbarConfig | undefined;
+export declare const getToolbarMenuConfig: (pluginState: PasteOptionsPluginState, intl: IntlShape, editorAnalyticsAPI: EditorAnalyticsAPI | undefined, markdownToPmConverter?: MarkdownToPmConverter) => FloatingToolbarDropdown<Command>;
+export declare const buildToolbar: (state: EditorState, intl: IntlShape, editorAnalyticsAPI: EditorAnalyticsAPI | undefined, markdownToPmConverter?: MarkdownToPmConverter) => FloatingToolbarConfig | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-paste-options-toolbar",
-	"version": "13.2.9",
+	"version": "13.3.0",
 	"description": "Paste options toolbar for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -22,7 +22,7 @@
 	"atlaskit:src": "src/index.ts",
 	"dependencies": {
 		"@atlaskit/css": "^1.0.0",
-		"@atlaskit/dropdown-menu": "^17.1.0",
+		"@atlaskit/dropdown-menu": "^17.2.0",
 		"@atlaskit/editor-markdown-transformer": "^6.0.0",
 		"@atlaskit/editor-plugin-analytics": "^12.0.0",
 		"@atlaskit/editor-plugin-paste": "^13.4.0",
@@ -31,17 +31,17 @@
 		"@atlaskit/editor-shared-styles": "^4.0.0",
 		"@atlaskit/editor-toolbar": "^2.3.0",
 		"@atlaskit/editor-ui-control-model": "^2.2.0",
-		"@atlaskit/icon": "^37.1.0",
+		"@atlaskit/icon": "^37.2.0",
 		"@atlaskit/platform-feature-flags": "^2.1.0",
 		"@atlaskit/primitives": "^22.2.0",
-		"@atlaskit/tmp-editor-statsig": "^133.0.0",
+		"@atlaskit/tmp-editor-statsig": "^135.0.0",
 		"@atlaskit/tokens": "^16.3.0",
 		"@babel/runtime": "^7.0.0",
 		"@compiled/react": "^1.0.0",
 		"@emotion/react": "^11.7.1"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^116.39.0",
+		"@atlaskit/editor-common": "^116.41.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"
@@ -65,6 +65,9 @@
 		},
 		"platform_editor_paste_actions_menu_v2_exposure": {
 			"type": "boolean"
+		},
+		"platform_editor_paste_as_md_use_gfm_transformer": {
+			"type": "boolean"
 		}
 	},
 	"techstack": {