@atlaskit/editor-plugin-block-type 4.0.13 → 4.0.14

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/editor-plugin-block-type
 
+## 4.0.14
+
+### Patch Changes
+
+- [#99053](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/99053)
+  [`a850374dfb10a`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/a850374dfb10a) -
+  [ux] ED-26049 Disable text styles menu button if lists are nested inside blockquot
+
 ## 4.0.13
 
 ### Patch Changes

package/dist/cjs/pm-plugins/commands/block-type.js

@@ -68,6 +68,9 @@ function setHeading(level, fromBlockQuote) {
     return tr;
   };
 }
+
+// Ignored via go/ees005
+// eslint-disable-next-line @typescript-eslint/max-params
 function setBlockTypeWithAnalytics(name, inputMethod, editorAnalyticsApi, fromBlockQuote) {
   return function (_ref4) {
     var tr = _ref4.tr;
@@ -166,7 +169,10 @@ function setNormalTextWithAnalytics(inputMethod, editorAnalyticsApi, fromBlockQu
     };
   });
 }
-var setHeadingWithAnalytics = exports.setHeadingWithAnalytics = function setHeadingWithAnalytics(newHeadingLevel, inputMethod, editorAnalyticsApi, fromBlockQuote) {
+var setHeadingWithAnalytics = exports.setHeadingWithAnalytics = function setHeadingWithAnalytics(newHeadingLevel, inputMethod, editorAnalyticsApi, fromBlockQuote
+// Ignored via go/ees005
+// eslint-disable-next-line @typescript-eslint/max-params
+) {
   return withCurrentHeadingLevel(function (previousHeadingLevel) {
     return function (_ref9) {
       var tr = _ref9.tr;

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

@@ -20,12 +20,16 @@ function getHeadingLevel(match) {
 }
 function headingRule(nodeType, maxLevel) {
   return (0, _utils2.createWrappingTextBlockRule)({
+    // Ignored via go/ees005
+    // eslint-disable-next-line require-unicode-regexp
     match: new RegExp('^(#{1,' + maxLevel + '})\\s$'),
     nodeType: nodeType,
     getAttrs: getHeadingLevel
   });
 }
 function blockQuoteRule(nodeType) {
+  // Ignored via go/ees005
+  // eslint-disable-next-line require-unicode-regexp
   return (0, _utils2.createJoinNodesRule)(/^\s*>\s$/, nodeType);
 }
 
@@ -38,7 +42,13 @@ function blockQuoteRule(nodeType) {
 function getHeadingRules(editorAnalyticsAPI, schema) {
   // '# ' for h1, '## ' for h2 and etc
   var hashRule = headingRule(schema.nodes.heading, MAX_HEADING_LEVEL);
-  var leftNodeReplacementHashRule = (0, _utils.createRule)(new RegExp("".concat(_prosemirrorInputRules.leafNodeReplacementCharacter, "(#{1,6})\\s$")), function (state, match, start, end) {
+  var leftNodeReplacementHashRule = (0, _utils.createRule)(
+  // Ignored via go/ees005
+  // eslint-disable-next-line require-unicode-regexp
+  new RegExp("".concat(_prosemirrorInputRules.leafNodeReplacementCharacter, "(#{1,6})\\s$")),
+  // Ignored via go/ees005
+  // eslint-disable-next-line @typescript-eslint/max-params
+  function (state, match, start, end) {
     var level = match[1].length;
     return (0, _commands.insertBlock)(state, schema.nodes.heading, start, end, {
       level: level
@@ -70,7 +80,13 @@ function getHeadingRules(editorAnalyticsAPI, schema) {
 function getBlockQuoteRules(editorAnalyticsAPI, schema) {
   // '> ' for blockquote
   var greatherThanRule = blockQuoteRule(schema.nodes.blockquote);
-  var leftNodeReplacementGreatherRule = (0, _utils.createRule)(new RegExp("".concat(_prosemirrorInputRules.leafNodeReplacementCharacter, "\\s*>\\s$")), function (state, _match, start, end) {
+  var leftNodeReplacementGreatherRule = (0, _utils.createRule)(
+  // Ignored via go/ees005
+  // eslint-disable-next-line require-unicode-regexp
+  new RegExp("".concat(_prosemirrorInputRules.leafNodeReplacementCharacter, "\\s*>\\s$")),
+  // Ignored via go/ees005
+  // eslint-disable-next-line @typescript-eslint/max-params
+  function (state, _match, start, end) {
     return (0, _commands.insertBlock)(state, schema.nodes.blockquote, start, end);
   });
 

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

@@ -17,20 +17,44 @@ var _deleteBlockContent = require("./commands/delete-block-content");
 var _utils2 = require("./utils");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+// Ignored via go/ees005
+// eslint-disable-next-line import/no-namespace
+
 var backspaceCommand = (0, _commands.chainCommands)(_blockType.cleanUpAtTheStartOfDocument, (0, _deleteBlockContent.deleteBlockContent)(_utils2.isNodeAWrappingBlockNode), _deleteAndMoveCursor.deleteAndMoveCursor);
 var del = (0, _commands.chainCommands)((0, _utils.deleteEmptyParagraphAndMoveBlockUp)(_utils2.isNodeAWrappingBlockNode), (0, _deleteBlockContent.deleteBlockContent)(_utils2.isNodeAWrappingBlockNode), _deleteAndMoveCursor.deleteAndMoveCursor);
 function keymapPlugin(editorAnalyticsApi, schema, _featureFlags) {
   var list = {};
-  (0, _keymaps.bindKeymapWithCommand)(_keymaps.insertNewLine.common, (0, _utils.insertNewLineWithAnalytics)(editorAnalyticsApi), list);
+  (0, _keymaps.bindKeymapWithCommand)(
+  // Ignored via go/ees005
+  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+  _keymaps.insertNewLine.common, (0, _utils.insertNewLineWithAnalytics)(editorAnalyticsApi), list);
+  // Ignored via go/ees005
+  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   (0, _keymaps.bindKeymapWithCommand)(_keymaps.moveUp.common, _utils.createNewParagraphAbove, list);
+  // Ignored via go/ees005
+  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   (0, _keymaps.bindKeymapWithCommand)(_keymaps.moveDown.common, _utils.createNewParagraphBelow, list);
+  // Ignored via go/ees005
+  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   (0, _keymaps.bindKeymapWithCommand)((0, _keymaps.findKeyMapForBrowser)(_keymaps.redo), _history.redo, list);
+
+  // Ignored via go/ees005
+  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   (0, _keymaps.bindKeymapWithCommand)(_keymaps.undo.common, _history.undo, list);
+
+  // Ignored via go/ees005
+  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   (0, _keymaps.bindKeymapWithCommand)(_keymaps.backspace.common, backspaceCommand, list);
+
+  // Ignored via go/ees005
+  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   (0, _keymaps.bindKeymapWithCommand)(_keymaps.deleteKey.common, del, list);
   (0, _keymaps.bindKeymapWithCommand)(_keymaps.forwardDelete.mac, del, list);
   if (schema.nodes[blockTypes.BLOCK_QUOTE.nodeName]) {
-    (0, _keymaps.bindKeymapWithCommand)((0, _keymaps.findShortcutByKeymap)(_keymaps.toggleBlockQuote), (0, _blockType.insertBlockQuoteWithAnalytics)(_analytics.INPUT_METHOD.KEYBOARD, editorAnalyticsApi), list);
+    (0, _keymaps.bindKeymapWithCommand)(
+    // Ignored via go/ees005
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    (0, _keymaps.findShortcutByKeymap)(_keymaps.toggleBlockQuote), (0, _blockType.insertBlockQuoteWithAnalytics)(_analytics.INPUT_METHOD.KEYBOARD, editorAnalyticsApi), list);
   }
   return (0, _keymaps.keymap)(list);
 }

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

@@ -81,7 +81,10 @@ var autoformatHeading = function autoformatHeading(headingLevel, editorAnalytics
   return (0, _blockType.setHeadingWithAnalytics)(headingLevel, _analytics.INPUT_METHOD.FORMATTING, editorAnalyticsApi);
 };
 var pluginKey = exports.pluginKey = new _state.PluginKey('blockTypePlugin');
-var createPlugin = exports.createPlugin = function createPlugin(editorAPI, dispatch, lastNodeMustBeParagraph, includeBlockQuoteAsTextstyleOption) {
+var createPlugin = exports.createPlugin = function createPlugin(editorAPI, dispatch, lastNodeMustBeParagraph, includeBlockQuoteAsTextstyleOption
+// Ignored via go/ees005
+// eslint-disable-next-line @typescript-eslint/max-params
+) {
   var _editorAPI$analytics;
   var editorAnalyticsApi = editorAPI === null || editorAPI === void 0 || (_editorAPI$analytics = editorAPI.analytics) === null || _editorAPI$analytics === void 0 ? void 0 : _editorAPI$analytics.actions;
   var altKeyLocation = 0;
@@ -116,6 +119,8 @@ var createPlugin = exports.createPlugin = function createPlugin(editorAPI, dispa
           availableBlockTypesInDropdown: availableBlockTypesInDropdown
         };
       },
+      // Ignored via go/ees005
+      // eslint-disable-next-line @typescript-eslint/max-params
       apply: function apply(_tr, oldPluginState, _oldState, newState) {
         var newPluginState = _objectSpread(_objectSpread({}, oldPluginState), {}, {
           currentBlockType: detectBlockType(oldPluginState.availableBlockTypesInDropdown, newState),
@@ -155,6 +160,8 @@ var createPlugin = exports.createPlugin = function createPlugin(editorAPI, dispa
         }
         return false;
       },
+      // Ignored via go/ees005
+      // eslint-disable-next-line @typescript-eslint/max-params
       handleDrop: function handleDrop(view, event, slice, moved) {
         return handleBlockQuoteDND(view, event, slice);
       }

package/dist/cjs/pm-plugins/ui/FloatingToolbarComponent.js

@@ -34,7 +34,10 @@ function FloatingToolbarComponent(_ref) {
     isSmall: FloatingToolbarSettings.isSmall,
     isDisabled: FloatingToolbarSettings.disabled,
     isReducedSpacing: FloatingToolbarSettings.isToolbarReducedSpacing,
-    setTextLevel: boundSetBlockType,
+    setTextLevel: boundSetBlockType
+    // Ignored via go/ees005
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    ,
     pluginState: blockTypeState,
     wrapBlockQuote: wrapBlockQuote,
     shouldUseDefaultRole: FloatingToolbarSettings.shouldUseDefaultRole,

package/dist/cjs/pm-plugins/ui/PrimaryToolbarComponent.js

@@ -33,7 +33,10 @@ function PrimaryToolbarComponent(_ref) {
     isDisabled: disabled,
     isReducedSpacing: isToolbarReducedSpacing,
     setTextLevel: boundSetBlockType,
-    wrapBlockQuote: wrapBlockQuote,
+    wrapBlockQuote: wrapBlockQuote
+    // Ignored via go/ees005
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    ,
     pluginState: blockTypeState,
     popupsMountPoint: popupsMountPoint,
     popupsBoundariesElement: popupsBoundariesElement,

package/dist/cjs/pm-plugins/ui/ToolbarBlockType/blocktype-button.js

@@ -71,5 +71,8 @@ var BlockTypeButton = exports.BlockTypeButton = function BlockTypeButton(props)
     }))))
   }, !props.isSmall && (0, _react2.jsx)(_primitives.Box, {
     xcss: [buttonContentStyle, props.isReducedSpacing && buttonContentReducedSpacingStyle]
-  }, (0, _react2.jsx)(_reactIntlNext.FormattedMessage, props.title || _blockTypes.NORMAL_TEXT.title)));
+  }, (0, _react2.jsx)(_reactIntlNext.FormattedMessage
+  // Ignored via go/ees005
+  // eslint-disable-next-line react/jsx-props-no-spreading
+  , props.title || _blockTypes.NORMAL_TEXT.title)));
 };

package/dist/cjs/pm-plugins/ui/ToolbarBlockType/index.js

@@ -173,7 +173,7 @@ var ToolbarBlockType = /*#__PURE__*/function (_React$PureComponent) {
       }).map(function (blockType) {
         return blockType.title;
       });
-      if (!this.props.isDisabled && (!blockTypesDisabled || currentBlockType.name === 'blockquote')) {
+      if (!this.props.isDisabled && !blockTypesDisabled) {
         var items = this.createItems();
         return (
           // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766

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

@@ -31,7 +31,10 @@ var createWrappingTextBlockRule = exports.createWrappingTextBlockRule = function
   var match = _ref.match,
     nodeType = _ref.nodeType,
     getAttrs = _ref.getAttrs;
-  var handler = function handler(state, match, start, end) {
+  var handler = function handler(state, match, start, end
+  // Ignored via go/ees005
+  // eslint-disable-next-line @typescript-eslint/max-params
+  ) {
     var fixedStart = Math.max(start, 1);
     var $start = state.doc.resolve(fixedStart);
     var attrs = getAttrs instanceof Function ? getAttrs(match) : getAttrs;
@@ -85,19 +88,31 @@ function areBlockTypesDisabled(state) {
   var nodesTypes = getSelectedWrapperNodes(state);
   var _state$schema$nodes2 = state.schema.nodes,
     panel = _state$schema$nodes2.panel,
-    blockquote = _state$schema$nodes2.blockquote;
+    blockquote = _state$schema$nodes2.blockquote,
+    bulletList = _state$schema$nodes2.bulletList,
+    orderedList = _state$schema$nodes2.orderedList;
   if ((0, _experiments.editorExperiment)('platform_editor_blockquote_in_text_formatting_menu', true)) {
     var hasQuote = false;
+    var hasNestedListInQuote = false;
     var _state$selection2 = state.selection,
       $from = _state$selection2.$from,
       $to = _state$selection2.$to;
     state.doc.nodesBetween($from.pos, $to.pos, function (node) {
-      hasQuote = node.type === blockquote;
-      return !hasQuote;
+      if (node.type === blockquote) {
+        hasQuote = true;
+        node.descendants(function (child) {
+          if (child.type === bulletList || child.type === orderedList) {
+            hasNestedListInQuote = true;
+            return false;
+          }
+          return true;
+        });
+      }
+      return !hasNestedListInQuote;
     });
     return nodesTypes.filter(function (type) {
       return type !== panel;
-    }).length > 0 || hasQuote;
+    }).length > 0 && (!hasQuote || hasNestedListInQuote);
   }
   return nodesTypes.filter(function (type) {
     return type !== panel;

package/dist/es2019/pm-plugins/commands/block-type.js

@@ -63,6 +63,9 @@ export function setHeading(level, fromBlockQuote) {
     return tr;
   };
 }
+
+// Ignored via go/ees005
+// eslint-disable-next-line @typescript-eslint/max-params
 export function setBlockTypeWithAnalytics(name, inputMethod, editorAnalyticsApi, fromBlockQuote) {
   return ({
     tr
@@ -129,7 +132,7 @@ function withCurrentHeadingLevel(fn) {
 
     // Check each paragraph and/or heading and check for consistent level
     let level;
-    for (let node of nodes) {
+    for (const node of nodes) {
       const nodeLevel = node.node.type === heading ? node.node.attrs.level : 0;
       if (!level) {
         level = nodeLevel;
@@ -164,7 +167,10 @@ export function setNormalTextWithAnalytics(inputMethod, editorAnalyticsApi, from
     });
   });
 }
-export const setHeadingWithAnalytics = (newHeadingLevel, inputMethod, editorAnalyticsApi, fromBlockQuote) => {
+export const setHeadingWithAnalytics = (newHeadingLevel, inputMethod, editorAnalyticsApi, fromBlockQuote
+// Ignored via go/ees005
+// eslint-disable-next-line @typescript-eslint/max-params
+) => {
   return withCurrentHeadingLevel(previousHeadingLevel => ({
     tr
   }) => {

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

@@ -12,12 +12,16 @@ function getHeadingLevel(match) {
 }
 function headingRule(nodeType, maxLevel) {
   return createWrappingTextBlockRule({
+    // Ignored via go/ees005
+    // eslint-disable-next-line require-unicode-regexp
     match: new RegExp('^(#{1,' + maxLevel + '})\\s$'),
     nodeType,
     getAttrs: getHeadingLevel
   });
 }
 function blockQuoteRule(nodeType) {
+  // Ignored via go/ees005
+  // eslint-disable-next-line require-unicode-regexp
   return createJoinNodesRule(/^\s*>\s$/, nodeType);
 }
 
@@ -30,7 +34,13 @@ function blockQuoteRule(nodeType) {
 function getHeadingRules(editorAnalyticsAPI, schema) {
   // '# ' for h1, '## ' for h2 and etc
   const hashRule = headingRule(schema.nodes.heading, MAX_HEADING_LEVEL);
-  const leftNodeReplacementHashRule = createRule(new RegExp(`${leafNodeReplacementCharacter}(#{1,6})\\s$`), (state, match, start, end) => {
+  const leftNodeReplacementHashRule = createRule(
+  // Ignored via go/ees005
+  // eslint-disable-next-line require-unicode-regexp
+  new RegExp(`${leafNodeReplacementCharacter}(#{1,6})\\s$`),
+  // Ignored via go/ees005
+  // eslint-disable-next-line @typescript-eslint/max-params
+  (state, match, start, end) => {
     const level = match[1].length;
     return insertBlock(state, schema.nodes.heading, start, end, {
       level
@@ -60,7 +70,13 @@ function getHeadingRules(editorAnalyticsAPI, schema) {
 function getBlockQuoteRules(editorAnalyticsAPI, schema) {
   // '> ' for blockquote
   const greatherThanRule = blockQuoteRule(schema.nodes.blockquote);
-  const leftNodeReplacementGreatherRule = createRule(new RegExp(`${leafNodeReplacementCharacter}\\s*>\\s$`), (state, _match, start, end) => {
+  const leftNodeReplacementGreatherRule = createRule(
+  // Ignored via go/ees005
+  // eslint-disable-next-line require-unicode-regexp
+  new RegExp(`${leafNodeReplacementCharacter}\\s*>\\s$`),
+  // Ignored via go/ees005
+  // eslint-disable-next-line @typescript-eslint/max-params
+  (state, _match, start, end) => {
     return insertBlock(state, schema.nodes.blockquote, start, end);
   });
 

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

@@ -3,6 +3,8 @@ import { backspace, bindKeymapWithCommand, deleteKey, findKeyMapForBrowser, find
 import { createNewParagraphAbove, createNewParagraphBelow, deleteEmptyParagraphAndMoveBlockUp, insertNewLineWithAnalytics } from '@atlaskit/editor-common/utils';
 import { chainCommands } from '@atlaskit/editor-prosemirror/commands';
 import { redo, undo } from '@atlaskit/editor-prosemirror/history';
+// Ignored via go/ees005
+// eslint-disable-next-line import/no-namespace
 import * as blockTypes from './block-types';
 import { cleanUpAtTheStartOfDocument, insertBlockQuoteWithAnalytics } from './commands/block-type';
 import { deleteAndMoveCursor } from './commands/delete-and-move-cursor';
@@ -12,16 +14,37 @@ const backspaceCommand = chainCommands(cleanUpAtTheStartOfDocument, deleteBlockC
 const del = chainCommands(deleteEmptyParagraphAndMoveBlockUp(isNodeAWrappingBlockNode), deleteBlockContent(isNodeAWrappingBlockNode), deleteAndMoveCursor);
 export default function keymapPlugin(editorAnalyticsApi, schema, _featureFlags) {
   const list = {};
-  bindKeymapWithCommand(insertNewLine.common, insertNewLineWithAnalytics(editorAnalyticsApi), list);
+  bindKeymapWithCommand(
+  // Ignored via go/ees005
+  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+  insertNewLine.common, insertNewLineWithAnalytics(editorAnalyticsApi), list);
+  // Ignored via go/ees005
+  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   bindKeymapWithCommand(moveUp.common, createNewParagraphAbove, list);
+  // Ignored via go/ees005
+  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   bindKeymapWithCommand(moveDown.common, createNewParagraphBelow, list);
+  // Ignored via go/ees005
+  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   bindKeymapWithCommand(findKeyMapForBrowser(redoKeymap), redo, list);
+
+  // Ignored via go/ees005
+  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   bindKeymapWithCommand(undoKeymap.common, undo, list);
+
+  // Ignored via go/ees005
+  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   bindKeymapWithCommand(backspace.common, backspaceCommand, list);
+
+  // Ignored via go/ees005
+  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   bindKeymapWithCommand(deleteKey.common, del, list);
   bindKeymapWithCommand(forwardDelete.mac, del, list);
   if (schema.nodes[blockTypes.BLOCK_QUOTE.nodeName]) {
-    bindKeymapWithCommand(findShortcutByKeymap(toggleBlockQuote), insertBlockQuoteWithAnalytics(INPUT_METHOD.KEYBOARD, editorAnalyticsApi), list);
+    bindKeymapWithCommand(
+    // Ignored via go/ees005
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    findShortcutByKeymap(toggleBlockQuote), insertBlockQuoteWithAnalytics(INPUT_METHOD.KEYBOARD, editorAnalyticsApi), list);
   }
   return keymap(list);
 }

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

@@ -70,7 +70,10 @@ const autoformatHeading = (headingLevel, editorAnalyticsApi) => {
   return setHeadingWithAnalytics(headingLevel, INPUT_METHOD.FORMATTING, editorAnalyticsApi);
 };
 export const pluginKey = new PluginKey('blockTypePlugin');
-export const createPlugin = (editorAPI, dispatch, lastNodeMustBeParagraph, includeBlockQuoteAsTextstyleOption) => {
+export const createPlugin = (editorAPI, dispatch, lastNodeMustBeParagraph, includeBlockQuoteAsTextstyleOption
+// Ignored via go/ees005
+// eslint-disable-next-line @typescript-eslint/max-params
+) => {
   var _editorAPI$analytics;
   const editorAnalyticsApi = editorAPI === null || editorAPI === void 0 ? void 0 : (_editorAPI$analytics = editorAPI.analytics) === null || _editorAPI$analytics === void 0 ? void 0 : _editorAPI$analytics.actions;
   let altKeyLocation = 0;
@@ -101,6 +104,8 @@ export const createPlugin = (editorAPI, dispatch, lastNodeMustBeParagraph, inclu
           availableBlockTypesInDropdown
         };
       },
+      // Ignored via go/ees005
+      // eslint-disable-next-line @typescript-eslint/max-params
       apply(_tr, oldPluginState, _oldState, newState) {
         const newPluginState = {
           ...oldPluginState,
@@ -141,6 +146,8 @@ export const createPlugin = (editorAPI, dispatch, lastNodeMustBeParagraph, inclu
         }
         return false;
       },
+      // Ignored via go/ees005
+      // eslint-disable-next-line @typescript-eslint/max-params
       handleDrop(view, event, slice, moved) {
         return handleBlockQuoteDND(view, event, slice);
       }

package/dist/es2019/pm-plugins/ui/FloatingToolbarComponent.js

@@ -26,7 +26,10 @@ export function FloatingToolbarComponent({
     isSmall: FloatingToolbarSettings.isSmall,
     isDisabled: FloatingToolbarSettings.disabled,
     isReducedSpacing: FloatingToolbarSettings.isToolbarReducedSpacing,
-    setTextLevel: boundSetBlockType,
+    setTextLevel: boundSetBlockType
+    // Ignored via go/ees005
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    ,
     pluginState: blockTypeState,
     wrapBlockQuote: wrapBlockQuote,
     shouldUseDefaultRole: FloatingToolbarSettings.shouldUseDefaultRole,

package/dist/es2019/pm-plugins/ui/PrimaryToolbarComponent.js

@@ -28,7 +28,10 @@ export function PrimaryToolbarComponent({
     isDisabled: disabled,
     isReducedSpacing: isToolbarReducedSpacing,
     setTextLevel: boundSetBlockType,
-    wrapBlockQuote: wrapBlockQuote,
+    wrapBlockQuote: wrapBlockQuote
+    // Ignored via go/ees005
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    ,
     pluginState: blockTypeState,
     popupsMountPoint: popupsMountPoint,
     popupsBoundariesElement: popupsBoundariesElement,

package/dist/es2019/pm-plugins/ui/ToolbarBlockType/blocktype-button.js

@@ -63,5 +63,8 @@ export const BlockTypeButton = props => {
     }))))
   }, !props.isSmall && jsx(Box, {
     xcss: [buttonContentStyle, props.isReducedSpacing && buttonContentReducedSpacingStyle]
-  }, jsx(FormattedMessage, props.title || NORMAL_TEXT.title)));
+  }, jsx(FormattedMessage
+  // Ignored via go/ees005
+  // eslint-disable-next-line react/jsx-props-no-spreading
+  , props.title || NORMAL_TEXT.title)));
 };

package/dist/es2019/pm-plugins/ui/ToolbarBlockType/index.js

@@ -152,7 +152,7 @@ class ToolbarBlockType extends React.PureComponent {
       return null;
     }
     const blockTypeTitles = availableBlockTypesInDropdown.filter(blockType => blockType.name === currentBlockType.name).map(blockType => blockType.title);
-    if (!this.props.isDisabled && (!blockTypesDisabled || currentBlockType.name === 'blockquote')) {
+    if (!this.props.isDisabled && !blockTypesDisabled) {
       const items = this.createItems();
       return (
         // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766

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

@@ -21,7 +21,10 @@ export const createWrappingTextBlockRule = ({
   nodeType,
   getAttrs
 }) => {
-  const handler = (state, match, start, end) => {
+  const handler = (state, match, start, end
+  // Ignored via go/ees005
+  // eslint-disable-next-line @typescript-eslint/max-params
+  ) => {
     const fixedStart = Math.max(start, 1);
     const $start = state.doc.resolve(fixedStart);
     const attrs = getAttrs instanceof Function ? getAttrs(match) : getAttrs;
@@ -77,19 +80,31 @@ export function areBlockTypesDisabled(state) {
   const nodesTypes = getSelectedWrapperNodes(state);
   const {
     panel,
-    blockquote
+    blockquote,
+    bulletList,
+    orderedList
   } = state.schema.nodes;
   if (editorExperiment('platform_editor_blockquote_in_text_formatting_menu', true)) {
     let hasQuote = false;
+    let hasNestedListInQuote = false;
     const {
       $from,
       $to
     } = state.selection;
     state.doc.nodesBetween($from.pos, $to.pos, node => {
-      hasQuote = node.type === blockquote;
-      return !hasQuote;
+      if (node.type === blockquote) {
+        hasQuote = true;
+        node.descendants(child => {
+          if (child.type === bulletList || child.type === orderedList) {
+            hasNestedListInQuote = true;
+            return false;
+          }
+          return true;
+        });
+      }
+      return !hasNestedListInQuote;
     });
-    return nodesTypes.filter(type => type !== panel).length > 0 || hasQuote;
+    return nodesTypes.filter(type => type !== panel).length > 0 && (!hasQuote || hasNestedListInQuote);
   }
   return nodesTypes.filter(type => type !== panel).length > 0;
 }

package/dist/esm/pm-plugins/commands/block-type.js

@@ -55,6 +55,9 @@ export function setHeading(level, fromBlockQuote) {
     return tr;
   };
 }
+
+// Ignored via go/ees005
+// eslint-disable-next-line @typescript-eslint/max-params
 export function setBlockTypeWithAnalytics(name, inputMethod, editorAnalyticsApi, fromBlockQuote) {
   return function (_ref4) {
     var tr = _ref4.tr;
@@ -153,7 +156,10 @@ export function setNormalTextWithAnalytics(inputMethod, editorAnalyticsApi, from
     };
   });
 }
-export var setHeadingWithAnalytics = function setHeadingWithAnalytics(newHeadingLevel, inputMethod, editorAnalyticsApi, fromBlockQuote) {
+export var setHeadingWithAnalytics = function setHeadingWithAnalytics(newHeadingLevel, inputMethod, editorAnalyticsApi, fromBlockQuote
+// Ignored via go/ees005
+// eslint-disable-next-line @typescript-eslint/max-params
+) {
   return withCurrentHeadingLevel(function (previousHeadingLevel) {
     return function (_ref9) {
       var tr = _ref9.tr;

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

@@ -13,12 +13,16 @@ function getHeadingLevel(match) {
 }
 function headingRule(nodeType, maxLevel) {
   return createWrappingTextBlockRule({
+    // Ignored via go/ees005
+    // eslint-disable-next-line require-unicode-regexp
     match: new RegExp('^(#{1,' + maxLevel + '})\\s$'),
     nodeType: nodeType,
     getAttrs: getHeadingLevel
   });
 }
 function blockQuoteRule(nodeType) {
+  // Ignored via go/ees005
+  // eslint-disable-next-line require-unicode-regexp
   return createJoinNodesRule(/^\s*>\s$/, nodeType);
 }
 
@@ -31,7 +35,13 @@ function blockQuoteRule(nodeType) {
 function getHeadingRules(editorAnalyticsAPI, schema) {
   // '# ' for h1, '## ' for h2 and etc
   var hashRule = headingRule(schema.nodes.heading, MAX_HEADING_LEVEL);
-  var leftNodeReplacementHashRule = createRule(new RegExp("".concat(leafNodeReplacementCharacter, "(#{1,6})\\s$")), function (state, match, start, end) {
+  var leftNodeReplacementHashRule = createRule(
+  // Ignored via go/ees005
+  // eslint-disable-next-line require-unicode-regexp
+  new RegExp("".concat(leafNodeReplacementCharacter, "(#{1,6})\\s$")),
+  // Ignored via go/ees005
+  // eslint-disable-next-line @typescript-eslint/max-params
+  function (state, match, start, end) {
     var level = match[1].length;
     return insertBlock(state, schema.nodes.heading, start, end, {
       level: level
@@ -63,7 +73,13 @@ function getHeadingRules(editorAnalyticsAPI, schema) {
 function getBlockQuoteRules(editorAnalyticsAPI, schema) {
   // '> ' for blockquote
   var greatherThanRule = blockQuoteRule(schema.nodes.blockquote);
-  var leftNodeReplacementGreatherRule = createRule(new RegExp("".concat(leafNodeReplacementCharacter, "\\s*>\\s$")), function (state, _match, start, end) {
+  var leftNodeReplacementGreatherRule = createRule(
+  // Ignored via go/ees005
+  // eslint-disable-next-line require-unicode-regexp
+  new RegExp("".concat(leafNodeReplacementCharacter, "\\s*>\\s$")),
+  // Ignored via go/ees005
+  // eslint-disable-next-line @typescript-eslint/max-params
+  function (state, _match, start, end) {
     return insertBlock(state, schema.nodes.blockquote, start, end);
   });
 

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

@@ -3,6 +3,8 @@ import { backspace, bindKeymapWithCommand, deleteKey, findKeyMapForBrowser, find
 import { createNewParagraphAbove, createNewParagraphBelow, deleteEmptyParagraphAndMoveBlockUp, insertNewLineWithAnalytics } from '@atlaskit/editor-common/utils';
 import { chainCommands } from '@atlaskit/editor-prosemirror/commands';
 import { redo, undo } from '@atlaskit/editor-prosemirror/history';
+// Ignored via go/ees005
+// eslint-disable-next-line import/no-namespace
 import * as blockTypes from './block-types';
 import { cleanUpAtTheStartOfDocument, insertBlockQuoteWithAnalytics } from './commands/block-type';
 import { deleteAndMoveCursor } from './commands/delete-and-move-cursor';
@@ -12,16 +14,37 @@ var backspaceCommand = chainCommands(cleanUpAtTheStartOfDocument, deleteBlockCon
 var del = chainCommands(deleteEmptyParagraphAndMoveBlockUp(isNodeAWrappingBlockNode), deleteBlockContent(isNodeAWrappingBlockNode), deleteAndMoveCursor);
 export default function keymapPlugin(editorAnalyticsApi, schema, _featureFlags) {
   var list = {};
-  bindKeymapWithCommand(insertNewLine.common, insertNewLineWithAnalytics(editorAnalyticsApi), list);
+  bindKeymapWithCommand(
+  // Ignored via go/ees005
+  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+  insertNewLine.common, insertNewLineWithAnalytics(editorAnalyticsApi), list);
+  // Ignored via go/ees005
+  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   bindKeymapWithCommand(moveUp.common, createNewParagraphAbove, list);
+  // Ignored via go/ees005
+  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   bindKeymapWithCommand(moveDown.common, createNewParagraphBelow, list);
+  // Ignored via go/ees005
+  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   bindKeymapWithCommand(findKeyMapForBrowser(redoKeymap), redo, list);
+
+  // Ignored via go/ees005
+  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   bindKeymapWithCommand(undoKeymap.common, undo, list);
+
+  // Ignored via go/ees005
+  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   bindKeymapWithCommand(backspace.common, backspaceCommand, list);
+
+  // Ignored via go/ees005
+  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   bindKeymapWithCommand(deleteKey.common, del, list);
   bindKeymapWithCommand(forwardDelete.mac, del, list);
   if (schema.nodes[blockTypes.BLOCK_QUOTE.nodeName]) {
-    bindKeymapWithCommand(findShortcutByKeymap(toggleBlockQuote), insertBlockQuoteWithAnalytics(INPUT_METHOD.KEYBOARD, editorAnalyticsApi), list);
+    bindKeymapWithCommand(
+    // Ignored via go/ees005
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    findShortcutByKeymap(toggleBlockQuote), insertBlockQuoteWithAnalytics(INPUT_METHOD.KEYBOARD, editorAnalyticsApi), list);
   }
   return keymap(list);
 }

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

@@ -74,7 +74,10 @@ var autoformatHeading = function autoformatHeading(headingLevel, editorAnalytics
   return setHeadingWithAnalytics(headingLevel, INPUT_METHOD.FORMATTING, editorAnalyticsApi);
 };
 export var pluginKey = new PluginKey('blockTypePlugin');
-export var createPlugin = function createPlugin(editorAPI, dispatch, lastNodeMustBeParagraph, includeBlockQuoteAsTextstyleOption) {
+export var createPlugin = function createPlugin(editorAPI, dispatch, lastNodeMustBeParagraph, includeBlockQuoteAsTextstyleOption
+// Ignored via go/ees005
+// eslint-disable-next-line @typescript-eslint/max-params
+) {
   var _editorAPI$analytics;
   var editorAnalyticsApi = editorAPI === null || editorAPI === void 0 || (_editorAPI$analytics = editorAPI.analytics) === null || _editorAPI$analytics === void 0 ? void 0 : _editorAPI$analytics.actions;
   var altKeyLocation = 0;
@@ -109,6 +112,8 @@ export var createPlugin = function createPlugin(editorAPI, dispatch, lastNodeMus
           availableBlockTypesInDropdown: availableBlockTypesInDropdown
         };
       },
+      // Ignored via go/ees005
+      // eslint-disable-next-line @typescript-eslint/max-params
       apply: function apply(_tr, oldPluginState, _oldState, newState) {
         var newPluginState = _objectSpread(_objectSpread({}, oldPluginState), {}, {
           currentBlockType: detectBlockType(oldPluginState.availableBlockTypesInDropdown, newState),
@@ -148,6 +153,8 @@ export var createPlugin = function createPlugin(editorAPI, dispatch, lastNodeMus
         }
         return false;
       },
+      // Ignored via go/ees005
+      // eslint-disable-next-line @typescript-eslint/max-params
       handleDrop: function handleDrop(view, event, slice, moved) {
         return handleBlockQuoteDND(view, event, slice);
       }

package/dist/esm/pm-plugins/ui/FloatingToolbarComponent.js

@@ -24,7 +24,10 @@ export function FloatingToolbarComponent(_ref) {
     isSmall: FloatingToolbarSettings.isSmall,
     isDisabled: FloatingToolbarSettings.disabled,
     isReducedSpacing: FloatingToolbarSettings.isToolbarReducedSpacing,
-    setTextLevel: boundSetBlockType,
+    setTextLevel: boundSetBlockType
+    // Ignored via go/ees005
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    ,
     pluginState: blockTypeState,
     wrapBlockQuote: wrapBlockQuote,
     shouldUseDefaultRole: FloatingToolbarSettings.shouldUseDefaultRole,

package/dist/esm/pm-plugins/ui/PrimaryToolbarComponent.js

@@ -26,7 +26,10 @@ export function PrimaryToolbarComponent(_ref) {
     isDisabled: disabled,
     isReducedSpacing: isToolbarReducedSpacing,
     setTextLevel: boundSetBlockType,
-    wrapBlockQuote: wrapBlockQuote,
+    wrapBlockQuote: wrapBlockQuote
+    // Ignored via go/ees005
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    ,
     pluginState: blockTypeState,
     popupsMountPoint: popupsMountPoint,
     popupsBoundariesElement: popupsBoundariesElement,

package/dist/esm/pm-plugins/ui/ToolbarBlockType/blocktype-button.js

@@ -63,5 +63,8 @@ export var BlockTypeButton = function BlockTypeButton(props) {
     }))))
   }, !props.isSmall && jsx(Box, {
     xcss: [buttonContentStyle, props.isReducedSpacing && buttonContentReducedSpacingStyle]
-  }, jsx(FormattedMessage, props.title || NORMAL_TEXT.title)));
+  }, jsx(FormattedMessage
+  // Ignored via go/ees005
+  // eslint-disable-next-line react/jsx-props-no-spreading
+  , props.title || NORMAL_TEXT.title)));
 };

package/dist/esm/pm-plugins/ui/ToolbarBlockType/index.js

@@ -169,7 +169,7 @@ var ToolbarBlockType = /*#__PURE__*/function (_React$PureComponent) {
       }).map(function (blockType) {
         return blockType.title;
       });
-      if (!this.props.isDisabled && (!blockTypesDisabled || currentBlockType.name === 'blockquote')) {
+      if (!this.props.isDisabled && !blockTypesDisabled) {
         var items = this.createItems();
         return (
           // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766

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

@@ -24,7 +24,10 @@ export var createWrappingTextBlockRule = function createWrappingTextBlockRule(_r
   var match = _ref.match,
     nodeType = _ref.nodeType,
     getAttrs = _ref.getAttrs;
-  var handler = function handler(state, match, start, end) {
+  var handler = function handler(state, match, start, end
+  // Ignored via go/ees005
+  // eslint-disable-next-line @typescript-eslint/max-params
+  ) {
     var fixedStart = Math.max(start, 1);
     var $start = state.doc.resolve(fixedStart);
     var attrs = getAttrs instanceof Function ? getAttrs(match) : getAttrs;
@@ -78,19 +81,31 @@ export function areBlockTypesDisabled(state) {
   var nodesTypes = getSelectedWrapperNodes(state);
   var _state$schema$nodes2 = state.schema.nodes,
     panel = _state$schema$nodes2.panel,
-    blockquote = _state$schema$nodes2.blockquote;
+    blockquote = _state$schema$nodes2.blockquote,
+    bulletList = _state$schema$nodes2.bulletList,
+    orderedList = _state$schema$nodes2.orderedList;
   if (editorExperiment('platform_editor_blockquote_in_text_formatting_menu', true)) {
     var hasQuote = false;
+    var hasNestedListInQuote = false;
     var _state$selection2 = state.selection,
       $from = _state$selection2.$from,
       $to = _state$selection2.$to;
     state.doc.nodesBetween($from.pos, $to.pos, function (node) {
-      hasQuote = node.type === blockquote;
-      return !hasQuote;
+      if (node.type === blockquote) {
+        hasQuote = true;
+        node.descendants(function (child) {
+          if (child.type === bulletList || child.type === orderedList) {
+            hasNestedListInQuote = true;
+            return false;
+          }
+          return true;
+        });
+      }
+      return !hasNestedListInQuote;
     });
     return nodesTypes.filter(function (type) {
       return type !== panel;
-    }).length > 0 || hasQuote;
+    }).length > 0 && (!hasQuote || hasNestedListInQuote);
   }
   return nodesTypes.filter(function (type) {
     return type !== panel;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-type",
-	"version": "4.0.13",
+	"version": "4.0.14",
 	"description": "BlockType plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -34,7 +34,7 @@
 	},
 	"dependencies": {
 		"@atlaskit/adf-schema": "^46.1.0",
-		"@atlaskit/editor-common": "^97.0.0",
+		"@atlaskit/editor-common": "^97.3.0",
 		"@atlaskit/editor-plugin-analytics": "^1.10.0",
 		"@atlaskit/editor-plugin-primary-toolbar": "^2.1.0",
 		"@atlaskit/editor-prosemirror": "6.2.1",
@@ -45,7 +45,7 @@
 		"@atlaskit/primitives": "^13.3.0",
 		"@atlaskit/prosemirror-input-rules": "^3.2.0",
 		"@atlaskit/theme": "^14.0.0",
-		"@atlaskit/tmp-editor-statsig": "^2.29.0",
+		"@atlaskit/tmp-editor-statsig": "^2.30.0",
 		"@atlaskit/tokens": "^2.5.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1"