@atlaskit/editor-plugin-code-block 3.6.1 → 3.6.2

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/editor-plugin-code-block
 
+## 3.6.2
+
+### Patch Changes
+
+- [#107782](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/107782)
+  [`bc422d0adbbb5`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/bc422d0adbbb5) -
+  [ux] ED-26378 remove editor_nest_media_and_codeblock_in_quotes_jira
+- [#107782](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/107782)
+  [`cccc7a8347929`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/cccc7a8347929) -
+  [ux] ED-26378 Remove editor_nest_media_and_codeblock_in_quotes_jira and
+  nestMediaAndCodeblockInQuote
+
 ## 3.6.1
 
 ### Patch Changes

package/dist/cjs/codeBlockPlugin.js

@@ -11,7 +11,6 @@ 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 _editorCommands = require("./editor-commands");
 var _codeBlockAutoFullStopTransformPlugin = require("./pm-plugins/codeBlockAutoFullStopTransformPlugin");
 var _codeBlockCopySelectionPlugin = require("./pm-plugins/codeBlockCopySelectionPlugin");
@@ -24,10 +23,8 @@ var _toolbar = require("./pm-plugins/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() {
@@ -59,7 +56,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, isNestingInQuoteSupported);
+          return (0, _inputRule.createCodeBlockInputRule)(schema, api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions);
         }
       }, {
         name: 'codeBlockIDEKeyBindings',
@@ -95,7 +92,7 @@ var codeBlockPlugin = function codeBlockPlugin(_ref) {
        */
       insertCodeBlock: function insertCodeBlock(inputMethod) {
         var _api$analytics2;
-        return (0, _editorCommands.insertCodeBlockWithAnalytics)(inputMethod, api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions, isNestingInQuoteSupported);
+        return (0, _editorCommands.insertCodeBlockWithAnalytics)(inputMethod, api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions);
       }
     },
     pluginsOptions: {
@@ -114,8 +111,7 @@ var codeBlockPlugin = function codeBlockPlugin(_ref) {
           action: function action(_insert, state) {
             var _api$analytics3;
             var tr = (0, _editorCommands.createInsertCodeBlockTransaction)({
-              state: state,
-              isNestingInQuoteSupported: isNestingInQuoteSupported
+              state: state
             });
             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/editor-commands/index.js

@@ -138,12 +138,9 @@ var resetShouldIgnoreFollowingMutations = exports.resetShouldIgnoreFollowingMuta
  * append the codeblock to the end of the document.
  */
 function createInsertCodeBlockTransaction(_ref) {
-  var state = _ref.state,
-    isNestingInQuoteSupported = _ref.isNestingInQuoteSupported;
+  var state = _ref.state;
   var tr = state.tr;
-  var _state$selection = state.selection,
-    from = _state$selection.from,
-    $from = _state$selection.$from;
+  var from = state.selection.from;
   var codeBlock = state.schema.nodes.codeBlock;
   var grandParentNode = state.selection.$from.node(-1);
   var grandParentNodeType = grandParentNode === null || grandParentNode === void 0 ? void 0 : grandParentNode.type;
@@ -160,17 +157,13 @@ function createInsertCodeBlockTransaction(_ref) {
     content: codeBlock.createAndFill()
   }) && (0, _insert.contentAllowedInCodeBlock)(state);
   if (canInsertCodeBlock) {
-    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();
+    tr = (0, _transformToCodeBlock.transformToCodeBlockAction)(state, from, undefined);
   } else {
     (0, _utils.safeInsert)(codeBlock.createAndFill())(tr).scrollIntoView();
   }
   return tr;
 }
-function insertCodeBlockWithAnalytics(inputMethod, analyticsAPI, isNestingInQuoteSupported) {
+function insertCodeBlockWithAnalytics(inputMethod, analyticsAPI) {
   return (0, _editorAnalytics.withAnalytics)(analyticsAPI, {
     action: _analytics.ACTION.INSERTED,
     actionSubject: _analytics.ACTION_SUBJECT.DOCUMENT,
@@ -181,8 +174,7 @@ function insertCodeBlockWithAnalytics(inputMethod, analyticsAPI, isNestingInQuot
     eventType: _analytics.EVENT_TYPE.TRACK
   })(function (state, dispatch) {
     var tr = createInsertCodeBlockTransaction({
-      state: state,
-      isNestingInQuoteSupported: isNestingInQuoteSupported
+      state: state
     });
     if (dispatch) {
       dispatch(tr);

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, isNestingInQuoteSupported) {
-  var rules = getCodeBlockRules(editorAnalyticsAPI, schema, isNestingInQuoteSupported);
+function createCodeBlockInputRule(schema, editorAnalyticsAPI) {
+  var rules = getCodeBlockRules(editorAnalyticsAPI, schema);
   return new _safePlugin.SafePlugin((0, _prosemirrorInputRules.createPlugin)('code-block-input-rule', rules, {
     isBlockNodeRule: true
   }));
@@ -24,7 +24,7 @@ function createCodeBlockInputRule(schema, editorAnalyticsAPI, isNestingInQuoteSu
  * @param {Schema} schema
  * @returns {InputRuleWithHandler[]}
  */
-function getCodeBlockRules(editorAnalyticsAPI, schema, isNestingInQuoteSupported) {
+function getCodeBlockRules(editorAnalyticsAPI, schema) {
   var ruleAnalytics = (0, _utils.inputRuleWithAnalytics)({
     action: _analytics.ACTION.INSERTED,
     actionSubject: _analytics.ACTION_SUBJECT.DOCUMENT,
@@ -51,7 +51,7 @@ function getCodeBlockRules(editorAnalyticsAPI, schema, isNestingInQuoteSupported
       attributes.language = match[4];
     }
     if ((0, _transformToCodeBlock.isConvertableToCodeBlock)(state)) {
-      return (0, _transformToCodeBlock.transformToCodeBlockAction)(state, start, attributes, isNestingInQuoteSupported);
+      return (0, _transformToCodeBlock.transformToCodeBlockAction)(state, start, attributes);
     }
     var tr = state.tr;
     tr.delete(start, end);

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

@@ -9,11 +9,10 @@ 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");
-var _utils2 = require("@atlaskit/editor-prosemirror/utils");
 function transformToCodeBlockAction(state, start,
 // Ignored via go/ees005
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-attrs, isNestingInQuoteSupported) {
+attrs) {
   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();
@@ -61,16 +60,6 @@ attrs, isNestingInQuoteSupported) {
   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/codeBlockPlugin.js

@@ -3,7 +3,6 @@ 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 './editor-commands';
 import { codeBlockAutoFullStopTransformPlugin } from './pm-plugins/codeBlockAutoFullStopTransformPlugin';
 import { codeBlockCopySelectionPlugin, copySelectionPluginKey } from './pm-plugins/codeBlockCopySelectionPlugin';
@@ -17,8 +16,6 @@ const codeBlockPlugin = ({
   config: options,
   api
 }) => {
-  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() {
@@ -51,7 +48,7 @@ const codeBlockPlugin = ({
           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);
+          return createCodeBlockInputRule(schema, api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions);
         }
       }, {
         name: 'codeBlockIDEKeyBindings',
@@ -80,7 +77,7 @@ const codeBlockPlugin = ({
        */
       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);
+        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: {
@@ -97,8 +94,7 @@ const codeBlockPlugin = ({
         action(_insert, state) {
           var _api$analytics3;
           const tr = createInsertCodeBlockTransaction({
-            state,
-            isNestingInQuoteSupported
+            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,

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

@@ -140,15 +140,13 @@ export const resetShouldIgnoreFollowingMutations = (state, dispatch) => {
  * append the codeblock to the end of the document.
  */
 export function createInsertCodeBlockTransaction({
-  state,
-  isNestingInQuoteSupported
+  state
 }) {
   let {
     tr
   } = state;
   const {
-    from,
-    $from
+    from
   } = state.selection;
   const {
     codeBlock
@@ -168,17 +166,13 @@ export function createInsertCodeBlockTransaction({
     content: codeBlock.createAndFill()
   }) && contentAllowedInCodeBlock(state);
   if (canInsertCodeBlock) {
-    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();
+    tr = transformToCodeBlockAction(state, from, undefined);
   } else {
     safeInsert(codeBlock.createAndFill())(tr).scrollIntoView();
   }
   return tr;
 }
-export function insertCodeBlockWithAnalytics(inputMethod, analyticsAPI, isNestingInQuoteSupported) {
+export function insertCodeBlockWithAnalytics(inputMethod, analyticsAPI) {
   return withAnalytics(analyticsAPI, {
     action: ACTION.INSERTED,
     actionSubject: ACTION_SUBJECT.DOCUMENT,
@@ -189,8 +183,7 @@ export function insertCodeBlockWithAnalytics(inputMethod, analyticsAPI, isNestin
     eventType: EVENT_TYPE.TRACK
   })(function (state, dispatch) {
     const tr = createInsertCodeBlockTransaction({
-      state,
-      isNestingInQuoteSupported
+      state
     });
     if (dispatch) {
       dispatch(tr);

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

@@ -5,8 +5,8 @@ import { createRule, inputRuleWithAnalytics } from '@atlaskit/editor-common/util
 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, isNestingInQuoteSupported) {
-  const rules = getCodeBlockRules(editorAnalyticsAPI, schema, isNestingInQuoteSupported);
+export function createCodeBlockInputRule(schema, editorAnalyticsAPI) {
+  const rules = getCodeBlockRules(editorAnalyticsAPI, schema);
   return new SafePlugin(createPlugin('code-block-input-rule', rules, {
     isBlockNodeRule: true
   }));
@@ -18,7 +18,7 @@ export function createCodeBlockInputRule(schema, editorAnalyticsAPI, isNestingIn
  * @param {Schema} schema
  * @returns {InputRuleWithHandler[]}
  */
-function getCodeBlockRules(editorAnalyticsAPI, schema, isNestingInQuoteSupported) {
+function getCodeBlockRules(editorAnalyticsAPI, schema) {
   const ruleAnalytics = inputRuleWithAnalytics({
     action: ACTION.INSERTED,
     actionSubject: ACTION_SUBJECT.DOCUMENT,
@@ -43,7 +43,7 @@ function getCodeBlockRules(editorAnalyticsAPI, schema, isNestingInQuoteSupported
       attributes.language = match[4];
     }
     if (isConvertableToCodeBlock(state)) {
-      return transformToCodeBlockAction(state, start, attributes, isNestingInQuoteSupported);
+      return transformToCodeBlockAction(state, start, attributes);
     }
     const tr = state.tr;
     tr.delete(start, end);

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

@@ -2,11 +2,10 @@ 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';
-import { safeInsert } from '@atlaskit/editor-prosemirror/utils';
 export function transformToCodeBlockAction(state, start,
 // Ignored via go/ees005
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-attrs, isNestingInQuoteSupported) {
+attrs) {
   const startOfCodeBlockText = state.selection.$from;
   const endPosition = state.selection.empty && !(state.selection instanceof GapCursorSelection) ? startOfCodeBlockText.end() : state.selection.$to.pos;
   const startLinePosition = startOfCodeBlockText.start();
@@ -54,16 +53,6 @@ attrs, isNestingInQuoteSupported) {
   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/codeBlockPlugin.js

@@ -6,7 +6,6 @@ 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 './editor-commands';
 import { codeBlockAutoFullStopTransformPlugin } from './pm-plugins/codeBlockAutoFullStopTransformPlugin';
 import { codeBlockCopySelectionPlugin, copySelectionPluginKey } from './pm-plugins/codeBlockCopySelectionPlugin';
@@ -17,10 +16,8 @@ import { createPlugin } from './pm-plugins/main';
 import refreshBrowserSelectionOnChange from './pm-plugins/refresh-browser-selection';
 import { getToolbarConfig } from './pm-plugins/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() {
@@ -52,7 +49,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, isNestingInQuoteSupported);
+          return createCodeBlockInputRule(schema, api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions);
         }
       }, {
         name: 'codeBlockIDEKeyBindings',
@@ -88,7 +85,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, isNestingInQuoteSupported);
+        return insertCodeBlockWithAnalytics(inputMethod, api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions);
       }
     },
     pluginsOptions: {
@@ -107,8 +104,7 @@ var codeBlockPlugin = function codeBlockPlugin(_ref) {
           action: function action(_insert, state) {
             var _api$analytics3;
             var tr = createInsertCodeBlockTransaction({
-              state: state,
-              isNestingInQuoteSupported: isNestingInQuoteSupported
+              state: state
             });
             api === null || api === void 0 || (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 || _api$analytics3.actions.attachAnalyticsEvent({
               action: ACTION.INSERTED,

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

@@ -128,12 +128,9 @@ export var resetShouldIgnoreFollowingMutations = function resetShouldIgnoreFollo
  * append the codeblock to the end of the document.
  */
 export function createInsertCodeBlockTransaction(_ref) {
-  var state = _ref.state,
-    isNestingInQuoteSupported = _ref.isNestingInQuoteSupported;
+  var state = _ref.state;
   var tr = state.tr;
-  var _state$selection = state.selection,
-    from = _state$selection.from,
-    $from = _state$selection.$from;
+  var from = state.selection.from;
   var codeBlock = state.schema.nodes.codeBlock;
   var grandParentNode = state.selection.$from.node(-1);
   var grandParentNodeType = grandParentNode === null || grandParentNode === void 0 ? void 0 : grandParentNode.type;
@@ -150,17 +147,13 @@ export function createInsertCodeBlockTransaction(_ref) {
     content: codeBlock.createAndFill()
   }) && contentAllowedInCodeBlock(state);
   if (canInsertCodeBlock) {
-    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();
+    tr = transformToCodeBlockAction(state, from, undefined);
   } else {
     safeInsert(codeBlock.createAndFill())(tr).scrollIntoView();
   }
   return tr;
 }
-export function insertCodeBlockWithAnalytics(inputMethod, analyticsAPI, isNestingInQuoteSupported) {
+export function insertCodeBlockWithAnalytics(inputMethod, analyticsAPI) {
   return withAnalytics(analyticsAPI, {
     action: ACTION.INSERTED,
     actionSubject: ACTION_SUBJECT.DOCUMENT,
@@ -171,8 +164,7 @@ export function insertCodeBlockWithAnalytics(inputMethod, analyticsAPI, isNestin
     eventType: EVENT_TYPE.TRACK
   })(function (state, dispatch) {
     var tr = createInsertCodeBlockTransaction({
-      state: state,
-      isNestingInQuoteSupported: isNestingInQuoteSupported
+      state: state
     });
     if (dispatch) {
       dispatch(tr);

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

@@ -5,8 +5,8 @@ import { createRule, inputRuleWithAnalytics } from '@atlaskit/editor-common/util
 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, isNestingInQuoteSupported) {
-  var rules = getCodeBlockRules(editorAnalyticsAPI, schema, isNestingInQuoteSupported);
+export function createCodeBlockInputRule(schema, editorAnalyticsAPI) {
+  var rules = getCodeBlockRules(editorAnalyticsAPI, schema);
   return new SafePlugin(createPlugin('code-block-input-rule', rules, {
     isBlockNodeRule: true
   }));
@@ -18,7 +18,7 @@ export function createCodeBlockInputRule(schema, editorAnalyticsAPI, isNestingIn
  * @param {Schema} schema
  * @returns {InputRuleWithHandler[]}
  */
-function getCodeBlockRules(editorAnalyticsAPI, schema, isNestingInQuoteSupported) {
+function getCodeBlockRules(editorAnalyticsAPI, schema) {
   var ruleAnalytics = inputRuleWithAnalytics({
     action: ACTION.INSERTED,
     actionSubject: ACTION_SUBJECT.DOCUMENT,
@@ -45,7 +45,7 @@ function getCodeBlockRules(editorAnalyticsAPI, schema, isNestingInQuoteSupported
       attributes.language = match[4];
     }
     if (isConvertableToCodeBlock(state)) {
-      return transformToCodeBlockAction(state, start, attributes, isNestingInQuoteSupported);
+      return transformToCodeBlockAction(state, start, attributes);
     }
     var tr = state.tr;
     tr.delete(start, end);

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

@@ -2,11 +2,10 @@ 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';
-import { safeInsert } from '@atlaskit/editor-prosemirror/utils';
 export function transformToCodeBlockAction(state, start,
 // Ignored via go/ees005
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-attrs, isNestingInQuoteSupported) {
+attrs) {
   var startOfCodeBlockText = state.selection.$from;
   var endPosition = state.selection.empty && !(state.selection instanceof GapCursorSelection) ? startOfCodeBlockText.end() : state.selection.$to.pos;
   var startLinePosition = startOfCodeBlockText.start();
@@ -54,16 +53,6 @@ attrs, isNestingInQuoteSupported) {
   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/editor-commands/index.d.ts

@@ -12,11 +12,10 @@ 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, isNestingInQuoteSupported, }: {
+export declare function createInsertCodeBlockTransaction({ state }: {
     state: EditorState;
-    isNestingInQuoteSupported?: boolean;
 }): import("prosemirror-state").Transaction;
-export declare function insertCodeBlockWithAnalytics(inputMethod: INPUT_METHOD, analyticsAPI?: EditorAnalyticsAPI, isNestingInQuoteSupported?: boolean): Command;
+export declare function insertCodeBlockWithAnalytics(inputMethod: INPUT_METHOD, analyticsAPI?: EditorAnalyticsAPI): Command;
 /**
  * Add the given node to the codeBlockWrappedStates WeakMap with the toggle boolean value.
  */

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, isNestingInQuoteSupported?: boolean): SafePlugin<any>;
+export declare function createCodeBlockInputRule(schema: Schema, editorAnalyticsAPI?: EditorAnalyticsAPI): SafePlugin<any>;

package/dist/types/pm-plugins/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, isNestingInQuoteSupported?: boolean): Transaction;
+export declare function transformToCodeBlockAction(state: EditorState, start: number, attrs?: any): Transaction;
 export declare function isConvertableToCodeBlock(state: EditorState): boolean;

package/dist/types/ui/icons/WrapIcon.d.ts

@@ -1,2 +1,2 @@
-/// <reference types="react" />
-export declare const WrapIcon: () => JSX.Element;
+import React from 'react';
+export declare const WrapIcon: () => React.JSX.Element;

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

@@ -12,11 +12,10 @@ 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, isNestingInQuoteSupported, }: {
+export declare function createInsertCodeBlockTransaction({ state }: {
     state: EditorState;
-    isNestingInQuoteSupported?: boolean;
 }): import("prosemirror-state").Transaction;
-export declare function insertCodeBlockWithAnalytics(inputMethod: INPUT_METHOD, analyticsAPI?: EditorAnalyticsAPI, isNestingInQuoteSupported?: boolean): Command;
+export declare function insertCodeBlockWithAnalytics(inputMethod: INPUT_METHOD, analyticsAPI?: EditorAnalyticsAPI): Command;
 /**
  * Add the given node to the codeBlockWrappedStates WeakMap with the toggle boolean value.
  */

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, isNestingInQuoteSupported?: boolean): SafePlugin<any>;
+export declare function createCodeBlockInputRule(schema: Schema, editorAnalyticsAPI?: EditorAnalyticsAPI): SafePlugin<any>;

package/dist/types-ts4.5/pm-plugins/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, isNestingInQuoteSupported?: boolean): Transaction;
+export declare function transformToCodeBlockAction(state: EditorState, start: number, attrs?: any): Transaction;
 export declare function isConvertableToCodeBlock(state: EditorState): boolean;

package/dist/types-ts4.5/ui/icons/WrapIcon.d.ts

@@ -1,2 +1,2 @@
-/// <reference types="react" />
-export declare const WrapIcon: () => JSX.Element;
+import React from 'react';
+export declare const WrapIcon: () => React.JSX.Element;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-code-block",
-	"version": "3.6.1",
+	"version": "3.6.2",
 	"description": "Code block plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -33,7 +33,7 @@
 	"dependencies": {
 		"@atlaskit/adf-schema": "^46.1.0",
 		"@atlaskit/code": "^15.7.0",
-		"@atlaskit/editor-common": "^99.7.0",
+		"@atlaskit/editor-common": "^99.8.0",
 		"@atlaskit/editor-plugin-analytics": "^1.11.0",
 		"@atlaskit/editor-plugin-composition": "^1.2.0",
 		"@atlaskit/editor-plugin-decorations": "^1.4.0",
@@ -96,9 +96,6 @@
 		"code_block_auto_insertion_bug_fix": {
 			"type": "boolean"
 		},
-		"editor_nest_media_and_codeblock_in_quotes_jira": {
-			"type": "boolean"
-		},
 		"editor_code_wrapping_perf_improvement_ed-25141": {
 			"type": "boolean"
 		}