@atlaskit/editor-plugin-code-block 3.3.16 → 3.3.17

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaskit/editor-plugin-code-block
 
+## 3.3.17
+
+### Patch Changes
+
+- [#141594](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/141594)
+  [`3f6b2eb7bd493`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/3f6b2eb7bd493) -
+  [ux] [ED-24867] This change moves nesting codeblocks and media in blockquotes via insertion
+  methods behind an experiment gate.
+
 ## 3.3.16
 
 ### Patch Changes

package/dist/cjs/actions.js

@@ -139,12 +139,15 @@ var resetShouldIgnoreFollowingMutations = exports.resetShouldIgnoreFollowingMuta
  * append the codeblock to the end of the document.
  */
 function createInsertCodeBlockTransaction(_ref) {
-  var _state$selection$$fro;
-  var state = _ref.state;
+  var state = _ref.state,
+    isNestingInQuoteSupported = _ref.isNestingInQuoteSupported;
   var tr = state.tr;
-  var from = state.selection.from;
+  var _state$selection = state.selection,
+    from = _state$selection.from,
+    $from = _state$selection.$from;
   var codeBlock = state.schema.nodes.codeBlock;
-  var grandParentNodeType = (_state$selection$$fro = state.selection.$from.node(-1)) === null || _state$selection$$fro === void 0 ? void 0 : _state$selection$$fro.type;
+  var grandParentNode = state.selection.$from.node(-1);
+  var grandParentNodeType = grandParentNode === null || grandParentNode === void 0 ? void 0 : grandParentNode.type;
   var parentNodeType = state.selection.$from.parent.type;
 
   /** We always want to append a codeBlock unless we're inserting into a paragraph
@@ -158,13 +161,17 @@ function createInsertCodeBlockTransaction(_ref) {
     content: codeBlock.createAndFill()
   }) && (0, _insert.contentAllowedInCodeBlock)(state);
   if (canInsertCodeBlock) {
-    tr = (0, _transformToCodeBlock.transformToCodeBlockAction)(state, from);
+    tr = (0, _transformToCodeBlock.transformToCodeBlockAction)(state, from, undefined, isNestingInQuoteSupported);
+  } else if (!isNestingInQuoteSupported && (grandParentNodeType === null || grandParentNodeType === void 0 ? void 0 : grandParentNodeType.name) === 'blockquote') {
+    /** we only allow the insertion of a codeblock inside a blockquote if nesting in quotes is supported */
+    var grandparentEndPos = $from.start(-1) + grandParentNode.nodeSize - 1;
+    (0, _utils.safeInsert)(codeBlock.createAndFill(), grandparentEndPos)(tr).scrollIntoView();
   } else {
     (0, _utils.safeInsert)(codeBlock.createAndFill())(tr).scrollIntoView();
   }
   return tr;
 }
-function insertCodeBlockWithAnalytics(inputMethod, analyticsAPI) {
+function insertCodeBlockWithAnalytics(inputMethod, analyticsAPI, isNestingInQuoteSupported) {
   return (0, _editorAnalytics.withAnalytics)(analyticsAPI, {
     action: _analytics.ACTION.INSERTED,
     actionSubject: _analytics.ACTION_SUBJECT.DOCUMENT,
@@ -175,7 +182,8 @@ function insertCodeBlockWithAnalytics(inputMethod, analyticsAPI) {
     eventType: _analytics.EVENT_TYPE.TRACK
   })(function (state, dispatch) {
     var tr = createInsertCodeBlockTransaction({
-      state: state
+      state: state,
+      isNestingInQuoteSupported: isNestingInQuoteSupported
     });
     if (dispatch) {
       dispatch(tr);

package/dist/cjs/plugin.js

@@ -11,6 +11,7 @@ var _adfSchema = require("@atlaskit/adf-schema");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _messages = require("@atlaskit/editor-common/messages");
 var _quickInsert = require("@atlaskit/editor-common/quick-insert");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _actions = require("./actions");
 var _codeBlockAutoFullStopTransformPlugin = require("./pm-plugins/codeBlockAutoFullStopTransformPlugin");
 var _codeBlockCopySelectionPlugin = require("./pm-plugins/codeBlockCopySelectionPlugin");
@@ -23,8 +24,10 @@ var _toolbar = require("./toolbar");
 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 codeBlockPlugin = function codeBlockPlugin(_ref) {
+  var _api$featureFlags;
   var options = _ref.config,
     api = _ref.api;
+  var isNestingInQuoteSupported = (api === null || api === void 0 || (_api$featureFlags = api.featureFlags) === null || _api$featureFlags === void 0 || (_api$featureFlags = _api$featureFlags.sharedState.currentState()) === null || _api$featureFlags === void 0 ? void 0 : _api$featureFlags.nestMediaAndCodeblockInQuote) || (0, _platformFeatureFlags.fg)('editor_nest_media_and_codeblock_in_quotes_jira');
   return {
     name: 'codeBlock',
     nodes: function nodes() {
@@ -48,7 +51,7 @@ var codeBlockPlugin = function codeBlockPlugin(_ref) {
         plugin: function plugin(_ref3) {
           var _api$analytics;
           var schema = _ref3.schema;
-          return (0, _inputRule.createCodeBlockInputRule)(schema, api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions);
+          return (0, _inputRule.createCodeBlockInputRule)(schema, api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions, isNestingInQuoteSupported);
         }
       }, {
         name: 'codeBlockIDEKeyBindings',
@@ -84,7 +87,7 @@ var codeBlockPlugin = function codeBlockPlugin(_ref) {
        */
       insertCodeBlock: function insertCodeBlock(inputMethod) {
         var _api$analytics2;
-        return (0, _actions.insertCodeBlockWithAnalytics)(inputMethod, api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions);
+        return (0, _actions.insertCodeBlockWithAnalytics)(inputMethod, api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions, isNestingInQuoteSupported);
       }
     },
     pluginsOptions: {
@@ -103,7 +106,8 @@ var codeBlockPlugin = function codeBlockPlugin(_ref) {
           action: function action(_insert, state) {
             var _api$analytics3;
             var tr = (0, _actions.createInsertCodeBlockTransaction)({
-              state: state
+              state: state,
+              isNestingInQuoteSupported: isNestingInQuoteSupported
             });
             api === null || api === void 0 || (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 || _api$analytics3.actions.attachAnalyticsEvent({
               action: _analytics.ACTION.INSERTED,

package/dist/cjs/pm-plugins/input-rule.js

@@ -11,8 +11,8 @@ var _utils = require("@atlaskit/editor-common/utils");
 var _utils2 = require("@atlaskit/editor-prosemirror/utils");
 var _prosemirrorInputRules = require("@atlaskit/prosemirror-input-rules");
 var _transformToCodeBlock = require("../transform-to-code-block");
-function createCodeBlockInputRule(schema, editorAnalyticsAPI) {
-  var rules = getCodeBlockRules(editorAnalyticsAPI, schema);
+function createCodeBlockInputRule(schema, editorAnalyticsAPI, isNestingInQuoteSupported) {
+  var rules = getCodeBlockRules(editorAnalyticsAPI, schema, isNestingInQuoteSupported);
   return new _safePlugin.SafePlugin((0, _prosemirrorInputRules.createPlugin)('code-block-input-rule', rules, {
     isBlockNodeRule: true
   }));
@@ -24,7 +24,7 @@ function createCodeBlockInputRule(schema, editorAnalyticsAPI) {
  * @param {Schema} schema
  * @returns {InputRuleWithHandler[]}
  */
-function getCodeBlockRules(editorAnalyticsAPI, schema) {
+function getCodeBlockRules(editorAnalyticsAPI, schema, isNestingInQuoteSupported) {
   var ruleAnalytics = (0, _utils.inputRuleWithAnalytics)({
     action: _analytics.ACTION.INSERTED,
     actionSubject: _analytics.ACTION_SUBJECT.DOCUMENT,
@@ -46,7 +46,7 @@ function getCodeBlockRules(editorAnalyticsAPI, schema) {
       attributes.language = match[4];
     }
     if ((0, _transformToCodeBlock.isConvertableToCodeBlock)(state)) {
-      return (0, _transformToCodeBlock.transformToCodeBlockAction)(state, start, attributes);
+      return (0, _transformToCodeBlock.transformToCodeBlockAction)(state, start, attributes, isNestingInQuoteSupported);
     }
     var tr = state.tr;
     tr.delete(start, end);

package/dist/cjs/transform-to-code-block.js

@@ -9,7 +9,8 @@ var _selection = require("@atlaskit/editor-common/selection");
 var _utils = require("@atlaskit/editor-common/utils");
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _state = require("@atlaskit/editor-prosemirror/state");
-function transformToCodeBlockAction(state, start, attrs) {
+var _utils2 = require("@atlaskit/editor-prosemirror/utils");
+function transformToCodeBlockAction(state, start, attrs, isNestingInQuoteSupported) {
   var startOfCodeBlockText = state.selection.$from;
   var endPosition = state.selection.empty && !(state.selection instanceof _selection.GapCursorSelection) ? startOfCodeBlockText.end() : state.selection.$to.pos;
   var startLinePosition = startOfCodeBlockText.start();
@@ -57,6 +58,16 @@ function transformToCodeBlockAction(state, start, attrs) {
   var startMapped = startLinePosition === start ? parentStartPosition : start;
   var codeBlock = state.schema.nodes.codeBlock;
   var codeBlockNode = codeBlock.createChecked(attrs, codeBlockSlice.content);
+
+  /** we only allow the insertion of a codeblock inside a blockquote if nesting in quotes is supported */
+  var grandParentNode = state.selection.$from.node(-1);
+  var grandParentNodeType = grandParentNode === null || grandParentNode === void 0 ? void 0 : grandParentNode.type.name;
+  if (grandParentNodeType === 'blockquote' && !isNestingInQuoteSupported) {
+    var grandparentEndPos = startOfCodeBlockText.start(-1) + grandParentNode.nodeSize - 1;
+    (0, _utils2.safeInsert)(codeBlock.createChecked(attrs, codeBlockSlice.content), grandparentEndPos)(tr).scrollIntoView();
+    tr.delete(startMapped, Math.min(endPosition, tr.doc.content.size));
+    return tr;
+  }
   tr.replaceWith(startMapped, Math.min(endPosition, tr.doc.content.size), codeBlockNode);
 
   // Reposition cursor when inserting into layouts or table headers

package/dist/es2019/actions.js

@@ -141,19 +141,21 @@ export const resetShouldIgnoreFollowingMutations = (state, dispatch) => {
  * append the codeblock to the end of the document.
  */
 export function createInsertCodeBlockTransaction({
-  state
+  state,
+  isNestingInQuoteSupported
 }) {
-  var _state$selection$$fro;
   let {
     tr
   } = state;
   const {
-    from
+    from,
+    $from
   } = state.selection;
   const {
     codeBlock
   } = state.schema.nodes;
-  const grandParentNodeType = (_state$selection$$fro = state.selection.$from.node(-1)) === null || _state$selection$$fro === void 0 ? void 0 : _state$selection$$fro.type;
+  const grandParentNode = state.selection.$from.node(-1);
+  const grandParentNodeType = grandParentNode === null || grandParentNode === void 0 ? void 0 : grandParentNode.type;
   const parentNodeType = state.selection.$from.parent.type;
 
   /** We always want to append a codeBlock unless we're inserting into a paragraph
@@ -167,13 +169,17 @@ export function createInsertCodeBlockTransaction({
     content: codeBlock.createAndFill()
   }) && contentAllowedInCodeBlock(state);
   if (canInsertCodeBlock) {
-    tr = transformToCodeBlockAction(state, from);
+    tr = transformToCodeBlockAction(state, from, undefined, isNestingInQuoteSupported);
+  } else if (!isNestingInQuoteSupported && (grandParentNodeType === null || grandParentNodeType === void 0 ? void 0 : grandParentNodeType.name) === 'blockquote') {
+    /** we only allow the insertion of a codeblock inside a blockquote if nesting in quotes is supported */
+    const grandparentEndPos = $from.start(-1) + grandParentNode.nodeSize - 1;
+    safeInsert(codeBlock.createAndFill(), grandparentEndPos)(tr).scrollIntoView();
   } else {
     safeInsert(codeBlock.createAndFill())(tr).scrollIntoView();
   }
   return tr;
 }
-export function insertCodeBlockWithAnalytics(inputMethod, analyticsAPI) {
+export function insertCodeBlockWithAnalytics(inputMethod, analyticsAPI, isNestingInQuoteSupported) {
   return withAnalytics(analyticsAPI, {
     action: ACTION.INSERTED,
     actionSubject: ACTION_SUBJECT.DOCUMENT,
@@ -184,7 +190,8 @@ export function insertCodeBlockWithAnalytics(inputMethod, analyticsAPI) {
     eventType: EVENT_TYPE.TRACK
   })(function (state, dispatch) {
     let tr = createInsertCodeBlockTransaction({
-      state
+      state,
+      isNestingInQuoteSupported
     });
     if (dispatch) {
       dispatch(tr);

package/dist/es2019/plugin.js

@@ -3,6 +3,7 @@ import { codeBlock } from '@atlaskit/adf-schema';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { blockTypeMessages } from '@atlaskit/editor-common/messages';
 import { IconCode } from '@atlaskit/editor-common/quick-insert';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { createInsertCodeBlockTransaction, insertCodeBlockWithAnalytics } from './actions';
 import { codeBlockAutoFullStopTransformPlugin } from './pm-plugins/codeBlockAutoFullStopTransformPlugin';
 import { codeBlockCopySelectionPlugin } from './pm-plugins/codeBlockCopySelectionPlugin';
@@ -15,91 +16,96 @@ import { getToolbarConfig } from './toolbar';
 const codeBlockPlugin = ({
   config: options,
   api
-}) => ({
-  name: 'codeBlock',
-  nodes() {
-    return [{
-      name: 'codeBlock',
-      node: codeBlock
-    }];
-  },
-  pmPlugins() {
-    return [{
-      name: 'codeBlock',
-      plugin: ({
-        getIntl
-      }) => createPlugin({
-        ...options,
-        getIntl,
-        api
-      })
-    }, {
-      name: 'codeBlockInputRule',
-      plugin: ({
-        schema
-      }) => {
-        var _api$analytics;
-        return createCodeBlockInputRule(schema, api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions);
+}) => {
+  var _api$featureFlags, _api$featureFlags$sha;
+  const isNestingInQuoteSupported = (api === null || api === void 0 ? void 0 : (_api$featureFlags = api.featureFlags) === null || _api$featureFlags === void 0 ? void 0 : (_api$featureFlags$sha = _api$featureFlags.sharedState.currentState()) === null || _api$featureFlags$sha === void 0 ? void 0 : _api$featureFlags$sha.nestMediaAndCodeblockInQuote) || fg('editor_nest_media_and_codeblock_in_quotes_jira');
+  return {
+    name: 'codeBlock',
+    nodes() {
+      return [{
+        name: 'codeBlock',
+        node: codeBlock
+      }];
+    },
+    pmPlugins() {
+      return [{
+        name: 'codeBlock',
+        plugin: ({
+          getIntl
+        }) => createPlugin({
+          ...options,
+          getIntl,
+          api
+        })
+      }, {
+        name: 'codeBlockInputRule',
+        plugin: ({
+          schema
+        }) => {
+          var _api$analytics;
+          return createCodeBlockInputRule(schema, api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions, isNestingInQuoteSupported);
+        }
+      }, {
+        name: 'codeBlockIDEKeyBindings',
+        plugin: () => ideUX(api)
+      }, {
+        name: 'codeBlockKeyMap',
+        plugin: ({
+          schema
+        }) => keymap(schema)
+      }, {
+        name: 'codeBlockCopySelection',
+        plugin: () => codeBlockCopySelectionPlugin()
+      }, {
+        name: 'codeBlockAutoFullStopTransform',
+        plugin: () => codeBlockAutoFullStopTransformPlugin()
+      }];
+    },
+    // Workaround for a firefox issue where dom selection is off sync
+    // https://product-fabric.atlassian.net/browse/ED-12442
+    onEditorViewStateUpdated(props) {
+      refreshBrowserSelectionOnChange(props.originalTransaction, props.newEditorState);
+    },
+    actions: {
+      /*
+       * Function will insert code block at current selection if block is empty or below current selection and set focus on it.
+       */
+      insertCodeBlock: inputMethod => {
+        var _api$analytics2;
+        return insertCodeBlockWithAnalytics(inputMethod, api === null || api === void 0 ? void 0 : (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions, isNestingInQuoteSupported);
       }
-    }, {
-      name: 'codeBlockIDEKeyBindings',
-      plugin: () => ideUX(api)
-    }, {
-      name: 'codeBlockKeyMap',
-      plugin: ({
-        schema
-      }) => keymap(schema)
-    }, {
-      name: 'codeBlockCopySelection',
-      plugin: () => codeBlockCopySelectionPlugin()
-    }, {
-      name: 'codeBlockAutoFullStopTransform',
-      plugin: () => codeBlockAutoFullStopTransformPlugin()
-    }];
-  },
-  // Workaround for a firefox issue where dom selection is off sync
-  // https://product-fabric.atlassian.net/browse/ED-12442
-  onEditorViewStateUpdated(props) {
-    refreshBrowserSelectionOnChange(props.originalTransaction, props.newEditorState);
-  },
-  actions: {
-    /*
-     * Function will insert code block at current selection if block is empty or below current selection and set focus on it.
-     */
-    insertCodeBlock: inputMethod => {
-      var _api$analytics2;
-      return insertCodeBlockWithAnalytics(inputMethod, api === null || api === void 0 ? void 0 : (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions);
+    },
+    pluginsOptions: {
+      quickInsert: ({
+        formatMessage
+      }) => [{
+        id: 'codeblock',
+        title: formatMessage(blockTypeMessages.codeblock),
+        description: formatMessage(blockTypeMessages.codeblockDescription),
+        keywords: ['code block'],
+        priority: 700,
+        keyshortcut: '```',
+        icon: () => /*#__PURE__*/React.createElement(IconCode, null),
+        action(_insert, state) {
+          var _api$analytics3;
+          const tr = createInsertCodeBlockTransaction({
+            state,
+            isNestingInQuoteSupported
+          });
+          api === null || api === void 0 ? void 0 : (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions.attachAnalyticsEvent({
+            action: ACTION.INSERTED,
+            actionSubject: ACTION_SUBJECT.DOCUMENT,
+            actionSubjectId: ACTION_SUBJECT_ID.CODE_BLOCK,
+            attributes: {
+              inputMethod: INPUT_METHOD.QUICK_INSERT
+            },
+            eventType: EVENT_TYPE.TRACK
+          })(tr);
+          return tr;
+        }
+      }],
+      floatingToolbar: getToolbarConfig(options === null || options === void 0 ? void 0 : options.allowCopyToClipboard, api)
     }
-  },
-  pluginsOptions: {
-    quickInsert: ({
-      formatMessage
-    }) => [{
-      id: 'codeblock',
-      title: formatMessage(blockTypeMessages.codeblock),
-      description: formatMessage(blockTypeMessages.codeblockDescription),
-      keywords: ['code block'],
-      priority: 700,
-      keyshortcut: '```',
-      icon: () => /*#__PURE__*/React.createElement(IconCode, null),
-      action(_insert, state) {
-        var _api$analytics3;
-        const tr = createInsertCodeBlockTransaction({
-          state
-        });
-        api === null || api === void 0 ? void 0 : (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions.attachAnalyticsEvent({
-          action: ACTION.INSERTED,
-          actionSubject: ACTION_SUBJECT.DOCUMENT,
-          actionSubjectId: ACTION_SUBJECT_ID.CODE_BLOCK,
-          attributes: {
-            inputMethod: INPUT_METHOD.QUICK_INSERT
-          },
-          eventType: EVENT_TYPE.TRACK
-        })(tr);
-        return tr;
-      }
-    }],
-    floatingToolbar: getToolbarConfig(options === null || options === void 0 ? void 0 : options.allowCopyToClipboard, api)
-  }
-});
+  };
+};
 export default codeBlockPlugin;

package/dist/es2019/pm-plugins/input-rule.js

@@ -1,13 +1,12 @@
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { insertBlock } from '@atlaskit/editor-common/commands';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import { inputRuleWithAnalytics } from '@atlaskit/editor-common/utils';
-import { createRule } from '@atlaskit/editor-common/utils';
+import { createRule, inputRuleWithAnalytics } from '@atlaskit/editor-common/utils';
 import { safeInsert } from '@atlaskit/editor-prosemirror/utils';
 import { createPlugin, leafNodeReplacementCharacter } from '@atlaskit/prosemirror-input-rules';
 import { isConvertableToCodeBlock, transformToCodeBlockAction } from '../transform-to-code-block';
-export function createCodeBlockInputRule(schema, editorAnalyticsAPI) {
-  const rules = getCodeBlockRules(editorAnalyticsAPI, schema);
+export function createCodeBlockInputRule(schema, editorAnalyticsAPI, isNestingInQuoteSupported) {
+  const rules = getCodeBlockRules(editorAnalyticsAPI, schema, isNestingInQuoteSupported);
   return new SafePlugin(createPlugin('code-block-input-rule', rules, {
     isBlockNodeRule: true
   }));
@@ -19,7 +18,7 @@ export function createCodeBlockInputRule(schema, editorAnalyticsAPI) {
  * @param {Schema} schema
  * @returns {InputRuleWithHandler[]}
  */
-function getCodeBlockRules(editorAnalyticsAPI, schema) {
+function getCodeBlockRules(editorAnalyticsAPI, schema, isNestingInQuoteSupported) {
   const ruleAnalytics = inputRuleWithAnalytics({
     action: ACTION.INSERTED,
     actionSubject: ACTION_SUBJECT.DOCUMENT,
@@ -39,7 +38,7 @@ function getCodeBlockRules(editorAnalyticsAPI, schema) {
       attributes.language = match[4];
     }
     if (isConvertableToCodeBlock(state)) {
-      return transformToCodeBlockAction(state, start, attributes);
+      return transformToCodeBlockAction(state, start, attributes, isNestingInQuoteSupported);
     }
     const tr = state.tr;
     tr.delete(start, end);

package/dist/es2019/transform-to-code-block.js

@@ -2,7 +2,8 @@ import { GapCursorSelection } from '@atlaskit/editor-common/selection';
 import { mapSlice, timestampToString } from '@atlaskit/editor-common/utils';
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
-export function transformToCodeBlockAction(state, start, attrs) {
+import { safeInsert } from '@atlaskit/editor-prosemirror/utils';
+export function transformToCodeBlockAction(state, start, attrs, isNestingInQuoteSupported) {
   const startOfCodeBlockText = state.selection.$from;
   const endPosition = state.selection.empty && !(state.selection instanceof GapCursorSelection) ? startOfCodeBlockText.end() : state.selection.$to.pos;
   const startLinePosition = startOfCodeBlockText.start();
@@ -50,6 +51,16 @@ export function transformToCodeBlockAction(state, start, attrs) {
   const startMapped = startLinePosition === start ? parentStartPosition : start;
   const codeBlock = state.schema.nodes.codeBlock;
   const codeBlockNode = codeBlock.createChecked(attrs, codeBlockSlice.content);
+
+  /** we only allow the insertion of a codeblock inside a blockquote if nesting in quotes is supported */
+  const grandParentNode = state.selection.$from.node(-1);
+  const grandParentNodeType = grandParentNode === null || grandParentNode === void 0 ? void 0 : grandParentNode.type.name;
+  if (grandParentNodeType === 'blockquote' && !isNestingInQuoteSupported) {
+    const grandparentEndPos = startOfCodeBlockText.start(-1) + grandParentNode.nodeSize - 1;
+    safeInsert(codeBlock.createChecked(attrs, codeBlockSlice.content), grandparentEndPos)(tr).scrollIntoView();
+    tr.delete(startMapped, Math.min(endPosition, tr.doc.content.size));
+    return tr;
+  }
   tr.replaceWith(startMapped, Math.min(endPosition, tr.doc.content.size), codeBlockNode);
 
   // Reposition cursor when inserting into layouts or table headers

package/dist/esm/actions.js

@@ -129,12 +129,15 @@ export var resetShouldIgnoreFollowingMutations = function resetShouldIgnoreFollo
  * append the codeblock to the end of the document.
  */
 export function createInsertCodeBlockTransaction(_ref) {
-  var _state$selection$$fro;
-  var state = _ref.state;
+  var state = _ref.state,
+    isNestingInQuoteSupported = _ref.isNestingInQuoteSupported;
   var tr = state.tr;
-  var from = state.selection.from;
+  var _state$selection = state.selection,
+    from = _state$selection.from,
+    $from = _state$selection.$from;
   var codeBlock = state.schema.nodes.codeBlock;
-  var grandParentNodeType = (_state$selection$$fro = state.selection.$from.node(-1)) === null || _state$selection$$fro === void 0 ? void 0 : _state$selection$$fro.type;
+  var grandParentNode = state.selection.$from.node(-1);
+  var grandParentNodeType = grandParentNode === null || grandParentNode === void 0 ? void 0 : grandParentNode.type;
   var parentNodeType = state.selection.$from.parent.type;
 
   /** We always want to append a codeBlock unless we're inserting into a paragraph
@@ -148,13 +151,17 @@ export function createInsertCodeBlockTransaction(_ref) {
     content: codeBlock.createAndFill()
   }) && contentAllowedInCodeBlock(state);
   if (canInsertCodeBlock) {
-    tr = transformToCodeBlockAction(state, from);
+    tr = transformToCodeBlockAction(state, from, undefined, isNestingInQuoteSupported);
+  } else if (!isNestingInQuoteSupported && (grandParentNodeType === null || grandParentNodeType === void 0 ? void 0 : grandParentNodeType.name) === 'blockquote') {
+    /** we only allow the insertion of a codeblock inside a blockquote if nesting in quotes is supported */
+    var grandparentEndPos = $from.start(-1) + grandParentNode.nodeSize - 1;
+    safeInsert(codeBlock.createAndFill(), grandparentEndPos)(tr).scrollIntoView();
   } else {
     safeInsert(codeBlock.createAndFill())(tr).scrollIntoView();
   }
   return tr;
 }
-export function insertCodeBlockWithAnalytics(inputMethod, analyticsAPI) {
+export function insertCodeBlockWithAnalytics(inputMethod, analyticsAPI, isNestingInQuoteSupported) {
   return withAnalytics(analyticsAPI, {
     action: ACTION.INSERTED,
     actionSubject: ACTION_SUBJECT.DOCUMENT,
@@ -165,7 +172,8 @@ export function insertCodeBlockWithAnalytics(inputMethod, analyticsAPI) {
     eventType: EVENT_TYPE.TRACK
   })(function (state, dispatch) {
     var tr = createInsertCodeBlockTransaction({
-      state: state
+      state: state,
+      isNestingInQuoteSupported: isNestingInQuoteSupported
     });
     if (dispatch) {
       dispatch(tr);

package/dist/esm/plugin.js

@@ -6,6 +6,7 @@ import { codeBlock } from '@atlaskit/adf-schema';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { blockTypeMessages } from '@atlaskit/editor-common/messages';
 import { IconCode } from '@atlaskit/editor-common/quick-insert';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { createInsertCodeBlockTransaction, insertCodeBlockWithAnalytics } from './actions';
 import { codeBlockAutoFullStopTransformPlugin } from './pm-plugins/codeBlockAutoFullStopTransformPlugin';
 import { codeBlockCopySelectionPlugin } from './pm-plugins/codeBlockCopySelectionPlugin';
@@ -16,8 +17,10 @@ import { createPlugin } from './pm-plugins/main';
 import refreshBrowserSelectionOnChange from './refresh-browser-selection';
 import { getToolbarConfig } from './toolbar';
 var codeBlockPlugin = function codeBlockPlugin(_ref) {
+  var _api$featureFlags;
   var options = _ref.config,
     api = _ref.api;
+  var isNestingInQuoteSupported = (api === null || api === void 0 || (_api$featureFlags = api.featureFlags) === null || _api$featureFlags === void 0 || (_api$featureFlags = _api$featureFlags.sharedState.currentState()) === null || _api$featureFlags === void 0 ? void 0 : _api$featureFlags.nestMediaAndCodeblockInQuote) || fg('editor_nest_media_and_codeblock_in_quotes_jira');
   return {
     name: 'codeBlock',
     nodes: function nodes() {
@@ -41,7 +44,7 @@ var codeBlockPlugin = function codeBlockPlugin(_ref) {
         plugin: function plugin(_ref3) {
           var _api$analytics;
           var schema = _ref3.schema;
-          return createCodeBlockInputRule(schema, api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions);
+          return createCodeBlockInputRule(schema, api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions, isNestingInQuoteSupported);
         }
       }, {
         name: 'codeBlockIDEKeyBindings',
@@ -77,7 +80,7 @@ var codeBlockPlugin = function codeBlockPlugin(_ref) {
        */
       insertCodeBlock: function insertCodeBlock(inputMethod) {
         var _api$analytics2;
-        return insertCodeBlockWithAnalytics(inputMethod, api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions);
+        return insertCodeBlockWithAnalytics(inputMethod, api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions, isNestingInQuoteSupported);
       }
     },
     pluginsOptions: {
@@ -96,7 +99,8 @@ var codeBlockPlugin = function codeBlockPlugin(_ref) {
           action: function action(_insert, state) {
             var _api$analytics3;
             var tr = createInsertCodeBlockTransaction({
-              state: state
+              state: state,
+              isNestingInQuoteSupported: isNestingInQuoteSupported
             });
             api === null || api === void 0 || (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 || _api$analytics3.actions.attachAnalyticsEvent({
               action: ACTION.INSERTED,

package/dist/esm/pm-plugins/input-rule.js

@@ -1,13 +1,12 @@
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { insertBlock } from '@atlaskit/editor-common/commands';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import { inputRuleWithAnalytics } from '@atlaskit/editor-common/utils';
-import { createRule } from '@atlaskit/editor-common/utils';
+import { createRule, inputRuleWithAnalytics } from '@atlaskit/editor-common/utils';
 import { safeInsert } from '@atlaskit/editor-prosemirror/utils';
 import { createPlugin, leafNodeReplacementCharacter } from '@atlaskit/prosemirror-input-rules';
 import { isConvertableToCodeBlock, transformToCodeBlockAction } from '../transform-to-code-block';
-export function createCodeBlockInputRule(schema, editorAnalyticsAPI) {
-  var rules = getCodeBlockRules(editorAnalyticsAPI, schema);
+export function createCodeBlockInputRule(schema, editorAnalyticsAPI, isNestingInQuoteSupported) {
+  var rules = getCodeBlockRules(editorAnalyticsAPI, schema, isNestingInQuoteSupported);
   return new SafePlugin(createPlugin('code-block-input-rule', rules, {
     isBlockNodeRule: true
   }));
@@ -19,7 +18,7 @@ export function createCodeBlockInputRule(schema, editorAnalyticsAPI) {
  * @param {Schema} schema
  * @returns {InputRuleWithHandler[]}
  */
-function getCodeBlockRules(editorAnalyticsAPI, schema) {
+function getCodeBlockRules(editorAnalyticsAPI, schema, isNestingInQuoteSupported) {
   var ruleAnalytics = inputRuleWithAnalytics({
     action: ACTION.INSERTED,
     actionSubject: ACTION_SUBJECT.DOCUMENT,
@@ -41,7 +40,7 @@ function getCodeBlockRules(editorAnalyticsAPI, schema) {
       attributes.language = match[4];
     }
     if (isConvertableToCodeBlock(state)) {
-      return transformToCodeBlockAction(state, start, attributes);
+      return transformToCodeBlockAction(state, start, attributes, isNestingInQuoteSupported);
     }
     var tr = state.tr;
     tr.delete(start, end);

package/dist/esm/transform-to-code-block.js

@@ -2,7 +2,8 @@ import { GapCursorSelection } from '@atlaskit/editor-common/selection';
 import { mapSlice, timestampToString } from '@atlaskit/editor-common/utils';
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
-export function transformToCodeBlockAction(state, start, attrs) {
+import { safeInsert } from '@atlaskit/editor-prosemirror/utils';
+export function transformToCodeBlockAction(state, start, attrs, isNestingInQuoteSupported) {
   var startOfCodeBlockText = state.selection.$from;
   var endPosition = state.selection.empty && !(state.selection instanceof GapCursorSelection) ? startOfCodeBlockText.end() : state.selection.$to.pos;
   var startLinePosition = startOfCodeBlockText.start();
@@ -50,6 +51,16 @@ export function transformToCodeBlockAction(state, start, attrs) {
   var startMapped = startLinePosition === start ? parentStartPosition : start;
   var codeBlock = state.schema.nodes.codeBlock;
   var codeBlockNode = codeBlock.createChecked(attrs, codeBlockSlice.content);
+
+  /** we only allow the insertion of a codeblock inside a blockquote if nesting in quotes is supported */
+  var grandParentNode = state.selection.$from.node(-1);
+  var grandParentNodeType = grandParentNode === null || grandParentNode === void 0 ? void 0 : grandParentNode.type.name;
+  if (grandParentNodeType === 'blockquote' && !isNestingInQuoteSupported) {
+    var grandparentEndPos = startOfCodeBlockText.start(-1) + grandParentNode.nodeSize - 1;
+    safeInsert(codeBlock.createChecked(attrs, codeBlockSlice.content), grandparentEndPos)(tr).scrollIntoView();
+    tr.delete(startMapped, Math.min(endPosition, tr.doc.content.size));
+    return tr;
+  }
   tr.replaceWith(startMapped, Math.min(endPosition, tr.doc.content.size), codeBlockNode);
 
   // Reposition cursor when inserting into layouts or table headers

package/dist/types/actions.d.ts

@@ -12,10 +12,11 @@ export declare const resetShouldIgnoreFollowingMutations: Command;
  * if there is text selected it will wrap the current selection if not it will
  * append the codeblock to the end of the document.
  */
-export declare function createInsertCodeBlockTransaction({ state }: {
+export declare function createInsertCodeBlockTransaction({ state, isNestingInQuoteSupported, }: {
     state: EditorState;
+    isNestingInQuoteSupported?: boolean;
 }): import("prosemirror-state").Transaction;
-export declare function insertCodeBlockWithAnalytics(inputMethod: INPUT_METHOD, analyticsAPI?: EditorAnalyticsAPI): Command;
+export declare function insertCodeBlockWithAnalytics(inputMethod: INPUT_METHOD, analyticsAPI?: EditorAnalyticsAPI, isNestingInQuoteSupported?: boolean): Command;
 /**
  * Add the given node to the codeBlockWrappedStates WeakMap with the toggle boolean value.
  */

package/dist/types/plugin.d.ts

@@ -4,6 +4,7 @@ import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import type { CompositionPlugin } from '@atlaskit/editor-plugin-composition';
 import type { DecorationsPlugin } from '@atlaskit/editor-plugin-decorations';
 import type { EditorDisabledPlugin } from '@atlaskit/editor-plugin-editor-disabled';
+import type { FeatureFlagsPlugin } from '@atlaskit/editor-plugin-feature-flags';
 import type { CodeBlockOptions } from './types';
 export type CodeBlockPlugin = NextEditorPlugin<'codeBlock', {
     pluginConfiguration: CodeBlockOptions | undefined;
@@ -11,7 +12,8 @@ export type CodeBlockPlugin = NextEditorPlugin<'codeBlock', {
         DecorationsPlugin,
         CompositionPlugin,
         OptionalPlugin<AnalyticsPlugin>,
-        OptionalPlugin<EditorDisabledPlugin>
+        OptionalPlugin<EditorDisabledPlugin>,
+        OptionalPlugin<FeatureFlagsPlugin>
     ];
     actions: {
         insertCodeBlock: (inputMethod: INPUT_METHOD) => Command;

package/dist/types/pm-plugins/input-rule.d.ts

@@ -1,4 +1,4 @@
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import type { Schema } from '@atlaskit/editor-prosemirror/model';
-export declare function createCodeBlockInputRule(schema: Schema, editorAnalyticsAPI?: EditorAnalyticsAPI): SafePlugin<any>;
+export declare function createCodeBlockInputRule(schema: Schema, editorAnalyticsAPI?: EditorAnalyticsAPI, isNestingInQuoteSupported?: boolean): SafePlugin<any>;

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

@@ -32,7 +32,10 @@ export declare const createPlugin: ({ useLongPressSelection, getIntl, allowCompo
             actions: import("@atlaskit/editor-common/analytics").EditorAnalyticsAPI;
         }, import("@atlaskit/editor-plugin-analytics").AnalyticsPluginOptions>>, import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"editorDisabled", {
             sharedState: import("@atlaskit/editor-plugin-editor-disabled").EditorDisabledPluginState;
-        }, undefined>>];
+        }, undefined>>, import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"featureFlags", {
+            pluginConfiguration: import("@atlaskit/editor-common/types").FeatureFlags;
+            sharedState: import("@atlaskit/editor-common/types").FeatureFlags;
+        }, import("@atlaskit/editor-common/types").FeatureFlags>>];
         actions: {
             insertCodeBlock: (inputMethod: import("@atlaskit/editor-common/analytics").INPUT_METHOD) => import("@atlaskit/editor-common/types").Command;
         };

package/dist/types/transform-to-code-block.d.ts

@@ -1,3 +1,3 @@
 import type { EditorState, Transaction } from '@atlaskit/editor-prosemirror/state';
-export declare function transformToCodeBlockAction(state: EditorState, start: number, attrs?: any): Transaction;
+export declare function transformToCodeBlockAction(state: EditorState, start: number, attrs?: any, isNestingInQuoteSupported?: boolean): Transaction;
 export declare function isConvertableToCodeBlock(state: EditorState): boolean;

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

@@ -12,10 +12,11 @@ export declare const resetShouldIgnoreFollowingMutations: Command;
  * if there is text selected it will wrap the current selection if not it will
  * append the codeblock to the end of the document.
  */
-export declare function createInsertCodeBlockTransaction({ state }: {
+export declare function createInsertCodeBlockTransaction({ state, isNestingInQuoteSupported, }: {
     state: EditorState;
+    isNestingInQuoteSupported?: boolean;
 }): import("prosemirror-state").Transaction;
-export declare function insertCodeBlockWithAnalytics(inputMethod: INPUT_METHOD, analyticsAPI?: EditorAnalyticsAPI): Command;
+export declare function insertCodeBlockWithAnalytics(inputMethod: INPUT_METHOD, analyticsAPI?: EditorAnalyticsAPI, isNestingInQuoteSupported?: boolean): Command;
 /**
  * Add the given node to the codeBlockWrappedStates WeakMap with the toggle boolean value.
  */

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

@@ -4,6 +4,7 @@ import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import type { CompositionPlugin } from '@atlaskit/editor-plugin-composition';
 import type { DecorationsPlugin } from '@atlaskit/editor-plugin-decorations';
 import type { EditorDisabledPlugin } from '@atlaskit/editor-plugin-editor-disabled';
+import type { FeatureFlagsPlugin } from '@atlaskit/editor-plugin-feature-flags';
 import type { CodeBlockOptions } from './types';
 export type CodeBlockPlugin = NextEditorPlugin<'codeBlock', {
     pluginConfiguration: CodeBlockOptions | undefined;
@@ -11,7 +12,8 @@ export type CodeBlockPlugin = NextEditorPlugin<'codeBlock', {
         DecorationsPlugin,
         CompositionPlugin,
         OptionalPlugin<AnalyticsPlugin>,
-        OptionalPlugin<EditorDisabledPlugin>
+        OptionalPlugin<EditorDisabledPlugin>,
+        OptionalPlugin<FeatureFlagsPlugin>
     ];
     actions: {
         insertCodeBlock: (inputMethod: INPUT_METHOD) => Command;

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

@@ -1,4 +1,4 @@
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import type { Schema } from '@atlaskit/editor-prosemirror/model';
-export declare function createCodeBlockInputRule(schema: Schema, editorAnalyticsAPI?: EditorAnalyticsAPI): SafePlugin<any>;
+export declare function createCodeBlockInputRule(schema: Schema, editorAnalyticsAPI?: EditorAnalyticsAPI, isNestingInQuoteSupported?: boolean): SafePlugin<any>;

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

@@ -38,7 +38,11 @@ export declare const createPlugin: ({ useLongPressSelection, getIntl, allowCompo
             }, import("@atlaskit/editor-plugin-analytics").AnalyticsPluginOptions>>,
             import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"editorDisabled", {
                 sharedState: import("@atlaskit/editor-plugin-editor-disabled").EditorDisabledPluginState;
-            }, undefined>>
+            }, undefined>>,
+            import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"featureFlags", {
+                pluginConfiguration: import("@atlaskit/editor-common/types").FeatureFlags;
+                sharedState: import("@atlaskit/editor-common/types").FeatureFlags;
+            }, import("@atlaskit/editor-common/types").FeatureFlags>>
         ];
         actions: {
             insertCodeBlock: (inputMethod: import("@atlaskit/editor-common/analytics").INPUT_METHOD) => import("@atlaskit/editor-common/types").Command;

package/dist/types-ts4.5/transform-to-code-block.d.ts

@@ -1,3 +1,3 @@
 import type { EditorState, Transaction } from '@atlaskit/editor-prosemirror/state';
-export declare function transformToCodeBlockAction(state: EditorState, start: number, attrs?: any): Transaction;
+export declare function transformToCodeBlockAction(state: EditorState, start: number, attrs?: any, isNestingInQuoteSupported?: boolean): Transaction;
 export declare function isConvertableToCodeBlock(state: EditorState): boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-code-block",
-	"version": "3.3.16",
+	"version": "3.3.17",
 	"description": "Code block plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -33,13 +33,13 @@
 	"dependencies": {
 		"@atlaskit/adf-schema": "^40.9.0",
 		"@atlaskit/code": "^15.6.0",
-		"@atlaskit/editor-common": "^89.0.0",
+		"@atlaskit/editor-common": "^89.2.0",
 		"@atlaskit/editor-plugin-analytics": "^1.8.0",
 		"@atlaskit/editor-plugin-composition": "^1.2.0",
 		"@atlaskit/editor-plugin-decorations": "^1.3.0",
 		"@atlaskit/editor-plugin-editor-disabled": "^1.3.0",
 		"@atlaskit/editor-prosemirror": "6.0.0",
-		"@atlaskit/icon": "^22.16.0",
+		"@atlaskit/icon": "^22.18.0",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
 		"@atlaskit/prosemirror-input-rules": "^3.2.0",
 		"@babel/runtime": "^7.0.0",
@@ -102,6 +102,9 @@
 		},
 		"platform.editor.live-view.disable-editing-in-view-mode_fi1rx": {
 			"type": "boolean"
+		},
+		"editor_nest_media_and_codeblock_in_quotes_jira": {
+			"type": "boolean"
 		}
 	}
 }