@atlaskit/editor-plugin-block-menu 5.0.12 → 5.0.14

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/editor-plugin-block-menu
 
+## 5.0.14
+
+### Patch Changes
+
+- [`b5dc6946c55d9`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/b5dc6946c55d9) -
+  Clean up platform_editor_block_menu_layout_format
+- Updated dependencies
+
+## 5.0.13
+
+### Patch Changes
+
+- [`6f765533c791b`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/6f765533c791b) -
+  FG platform_editor_block_menu_patch_1 clean up.
+- Updated dependencies
+
 ## 5.0.12
 
 ### Patch Changes

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

@@ -146,10 +146,7 @@ var formatNode = exports.formatNode = function formatNode(api) {
           return newTr;
         } else {
           var _newTr = formatNodeWhenSelectionEmpty(tr, targetType, nodePos, schema);
-          var allowedNodes = [nodes.blockquote, nodes.panel, nodes.codeBlock];
-          if ((0, _expValEquals.expValEquals)('platform_editor_block_menu_layout_format', 'isEnabled', true)) {
-            allowedNodes.push(nodes.layoutSection);
-          }
+          var allowedNodes = [nodes.blockquote, nodes.panel, nodes.codeBlock, nodes.layoutSection];
           if ((0, _expValEquals.expValEquals)('platform_editor_block_menu_expand_format', 'isEnabled', true)) {
             allowedNodes.push(nodes.expand);
           }

package/dist/cjs/ui/copy-block.js

@@ -9,7 +9,6 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _react = _interopRequireDefault(require("react"));
 var _reactIntlNext = require("react-intl-next");
 var _analytics = require("@atlaskit/editor-common/analytics");
-var _blockMenu = require("@atlaskit/editor-common/block-menu");
 var _clipboard = require("@atlaskit/editor-common/clipboard");
 var _copyButton = require("@atlaskit/editor-common/copy-button");
 var _messages = require("@atlaskit/editor-common/messages");
@@ -18,7 +17,6 @@ var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-tables/utils");
 var _editorToolbar = require("@atlaskit/editor-toolbar");
 var _copy = _interopRequireDefault(require("@atlaskit/icon/core/copy"));
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _blockMenuProvider = require("./block-menu-provider");
 var _consts = require("./consts");
@@ -114,7 +112,7 @@ var CopyBlockMenuItem = function CopyBlockMenuItem(_ref) {
         }
         // source sync block (bodiedSyncBlock) is also a special case
         // where we need to copy the content of the bodiedSyncBlock node
-        else if (selection.node.type.name === 'bodiedSyncBlock' && (0, _expValEquals.expValEquals)('platform_synced_block', 'isEnabled', true) && (0, _platformFeatureFlags.fg)('platform_editor_block_menu_patch_1')) {
+        else if (selection.node.type.name === 'bodiedSyncBlock' && (0, _expValEquals.expValEquals)('platform_synced_block', 'isEnabled', true)) {
           var bodiedSyncBlockNode = selection.node;
           var _domNode3 = toDOMFromFragment(bodiedSyncBlockNode.content, schema);
           (0, _copyButton.copyDomNode)(_domNode3, bodiedSyncBlockNode.type, selection);
@@ -133,12 +131,11 @@ var CopyBlockMenuItem = function CopyBlockMenuItem(_ref) {
       onDropdownOpenChanged(false);
     }
   };
-  var text = (0, _platformFeatureFlags.fg)('platform_editor_block_menu_patch_1') ? formatMessage(_messages.blockMenuMessages.copyContent) : formatMessage(_blockMenu.messages.copyBlock);
   return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItem, {
     elemBefore: /*#__PURE__*/_react.default.createElement(_copy.default, {
       label: ""
     }),
     onClick: copyHandler
-  }, text);
+  }, formatMessage(_messages.blockMenuMessages.copyContent));
 };
 var _default = exports.default = (0, _reactIntlNext.injectIntl)(CopyBlockMenuItem);

package/dist/cjs/ui/copy-link.js

@@ -62,12 +62,11 @@ var CopyLinkDropdownItemContent = function CopyLinkDropdownItemContent(_ref) {
   if (!(0, _platformFeatureFlags.fg)('platform_editor_adf_with_localid') || checkIsNestedNode()) {
     return null;
   }
-  var text = (0, _platformFeatureFlags.fg)('platform_editor_block_menu_patch_1') ? formatMessage(_messages.blockMenuMessages.copyLinkToBlock) : formatMessage(_messages.blockMenuMessages.copyLink);
   return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItem, {
     onClick: handleClick,
     elemBefore: /*#__PURE__*/_react.default.createElement(_link.default, {
       label: ""
     })
-  }, text);
+  }, formatMessage(_messages.blockMenuMessages.copyLinkToBlock));
 };
 var CopyLinkDropdownItem = exports.CopyLinkDropdownItem = (0, _reactIntlNext.injectIntl)(CopyLinkDropdownItemContent);

package/dist/cjs/ui/delete-button.js

@@ -9,14 +9,12 @@ exports.DeleteDropdownItem = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _reactIntlNext = require("react-intl-next");
 var _analytics = require("@atlaskit/editor-common/analytics");
-var _blockMenu = require("@atlaskit/editor-common/block-menu");
 var _messages = require("@atlaskit/editor-common/messages");
 var _selection = require("@atlaskit/editor-common/selection");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-tables/utils");
 var _editorToolbar = require("@atlaskit/editor-toolbar");
 var _delete = _interopRequireDefault(require("@atlaskit/icon/core/delete"));
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _box = require("@atlaskit/primitives/box");
 var _text = _interopRequireDefault(require("@atlaskit/primitives/text"));
 var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure");
@@ -103,7 +101,6 @@ var DeleteDropdownItemContent = function DeleteDropdownItemContent(_ref) {
       onRemoveHoverDecoration();
     };
   }, [onRemoveHoverDecoration]);
-  var text = (0, _platformFeatureFlags.fg)('platform_editor_block_menu_patch_1') ? formatMessage(_messages.blockMenuMessages.deleteBlock) : formatMessage(_blockMenu.messages.deleteBlock);
   return /*#__PURE__*/_react.default.createElement(_box.Box, {
     onMouseEnter: onShowHoverDecoration,
     onMouseLeave: onRemoveHoverDecoration,
@@ -118,6 +115,6 @@ var DeleteDropdownItemContent = function DeleteDropdownItemContent(_ref) {
   }, /*#__PURE__*/_react.default.createElement(_text.default, {
     as: "span",
     color: "color.text.danger"
-  }, text)));
+  }, formatMessage(_messages.blockMenuMessages.deleteBlock))));
 };
 var DeleteDropdownItem = exports.DeleteDropdownItem = (0, _reactIntlNext.injectIntl)(DeleteDropdownItemContent);

package/dist/cjs/ui/format-menu-nested.js

@@ -9,7 +9,6 @@ exports.FormatMenuComponent = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _reactIntlNext = require("react-intl-next");
 var _analytics = require("@atlaskit/editor-common/analytics");
-var _blockMenu = require("@atlaskit/editor-common/block-menu");
 var _messages = require("@atlaskit/editor-common/messages");
 var _editorToolbar = require("@atlaskit/editor-toolbar");
 var _changes = _interopRequireDefault(require("@atlaskit/icon/core/changes"));
@@ -23,7 +22,6 @@ var FormatMenuComponent = exports.FormatMenuComponent = function FormatMenuCompo
     children = _ref.children;
   var _useIntl = (0, _reactIntlNext.useIntl)(),
     formatMessage = _useIntl.formatMessage;
-  var text = (0, _platformFeatureFlags.fg)('platform_editor_block_menu_patch_1') ? formatMessage(_messages.blockMenuMessages.turnInto) : formatMessage(_blockMenu.messages.turnInto);
   var isDisabled = (0, _platformFeatureFlags.fg)('platform_editor_block_menu_for_disabled_nodes') ? (0, _checkIsFormatMenuHidden.checkIsFormatMenuHidden)(api) : false;
   var handleClick = (0, _react.useCallback)(function () {
     api === null || api === void 0 || api.core.actions.execute(function (_ref2) {
@@ -42,7 +40,7 @@ var FormatMenuComponent = exports.FormatMenuComponent = function FormatMenuCompo
     });
   }, [api]);
   return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarNestedDropdownMenu, {
-    text: text,
+    text: formatMessage(_messages.blockMenuMessages.turnInto),
     elemBefore: /*#__PURE__*/_react.default.createElement(_changes.default, {
       label: ""
     }),

package/dist/cjs/ui/utils/checkIsFormatMenuHidden.js

@@ -22,10 +22,7 @@ var getIsFormatMenuHidden = function getIsFormatMenuHidden(selection, schema, me
     return !!disabledNode || isNested && !(0, _platformFeatureFlags.fg)('platform_editor_block_menu_transform_nested_node');
   }
   var content;
-  var allowedNodes = [nodes.paragraph, nodes.heading, nodes.blockquote, nodes.panel, nodes.codeBlock, nodes.bulletList, nodes.orderedList, nodes.taskList];
-  if ((0, _expValEquals.expValEquals)('platform_editor_block_menu_layout_format', 'isEnabled', true)) {
-    allowedNodes.push(nodes.layoutSection);
-  }
+  var allowedNodes = [nodes.paragraph, nodes.heading, nodes.blockquote, nodes.panel, nodes.codeBlock, nodes.bulletList, nodes.orderedList, nodes.taskList, nodes.layoutSection];
   if ((0, _expValEquals.expValEquals)('platform_editor_block_menu_expand_format', 'isEnabled', true)) {
     allowedNodes.push(nodes.expand);
   }
@@ -59,10 +56,7 @@ var getIsFormatMenuHiddenEmptyLine = function getIsFormatMenuHiddenEmptyLine(sel
     return true;
   } else {
     var content;
-    var allowedNodes = [nodes.paragraph, nodes.heading, nodes.blockquote, nodes.panel, nodes.codeBlock, nodes.bulletList, nodes.orderedList, nodes.taskList];
-    if ((0, _expValEquals.expValEquals)('platform_editor_block_menu_layout_format', 'isEnabled', true)) {
-      allowedNodes.push(nodes.layoutSection);
-    }
+    var allowedNodes = [nodes.paragraph, nodes.heading, nodes.blockquote, nodes.panel, nodes.codeBlock, nodes.bulletList, nodes.orderedList, nodes.taskList, nodes.layoutSection];
     if ((0, _expValEquals.expValEquals)('platform_editor_block_menu_expand_format', 'isEnabled', true)) {
       allowedNodes.push(nodes.expand);
     }

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

@@ -151,10 +151,7 @@ export const formatNode = api => (targetType, analyticsAttrs) => {
         return newTr;
       } else {
         const newTr = formatNodeWhenSelectionEmpty(tr, targetType, nodePos, schema);
-        const allowedNodes = [nodes.blockquote, nodes.panel, nodes.codeBlock];
-        if (expValEquals('platform_editor_block_menu_layout_format', 'isEnabled', true)) {
-          allowedNodes.push(nodes.layoutSection);
-        }
+        const allowedNodes = [nodes.blockquote, nodes.panel, nodes.codeBlock, nodes.layoutSection];
         if (expValEquals('platform_editor_block_menu_expand_format', 'isEnabled', true)) {
           allowedNodes.push(nodes.expand);
         }

package/dist/es2019/ui/copy-block.js

@@ -1,7 +1,6 @@
 import React from 'react';
 import { injectIntl, useIntl } from 'react-intl-next';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
-import { messages } from '@atlaskit/editor-common/block-menu';
 import { copyHTMLToClipboard } from '@atlaskit/editor-common/clipboard';
 import { toDOM, copyDomNode } from '@atlaskit/editor-common/copy-button';
 import { blockMenuMessages } from '@atlaskit/editor-common/messages';
@@ -10,7 +9,6 @@ import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state
 import { isTableSelected } from '@atlaskit/editor-tables/utils';
 import { ToolbarDropdownItem } from '@atlaskit/editor-toolbar';
 import CopyIcon from '@atlaskit/icon/core/copy';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { useBlockMenu } from './block-menu-provider';
 import { BLOCK_MENU_ITEM_NAME } from './consts';
@@ -109,7 +107,7 @@ const CopyBlockMenuItem = ({
         }
         // source sync block (bodiedSyncBlock) is also a special case
         // where we need to copy the content of the bodiedSyncBlock node
-        else if (selection.node.type.name === 'bodiedSyncBlock' && expValEquals('platform_synced_block', 'isEnabled', true) && fg('platform_editor_block_menu_patch_1')) {
+        else if (selection.node.type.name === 'bodiedSyncBlock' && expValEquals('platform_synced_block', 'isEnabled', true)) {
           const bodiedSyncBlockNode = selection.node;
           const domNode = toDOMFromFragment(bodiedSyncBlockNode.content, schema);
           copyDomNode(domNode, bodiedSyncBlockNode.type, selection);
@@ -128,12 +126,11 @@ const CopyBlockMenuItem = ({
       onDropdownOpenChanged(false);
     }
   };
-  const text = fg('platform_editor_block_menu_patch_1') ? formatMessage(blockMenuMessages.copyContent) : formatMessage(messages.copyBlock);
   return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
     elemBefore: /*#__PURE__*/React.createElement(CopyIcon, {
       label: ""
     }),
     onClick: copyHandler
-  }, text);
+  }, formatMessage(blockMenuMessages.copyContent));
 };
 export default injectIntl(CopyBlockMenuItem);

package/dist/es2019/ui/copy-link.js

@@ -57,12 +57,11 @@ const CopyLinkDropdownItemContent = ({
   if (!fg('platform_editor_adf_with_localid') || checkIsNestedNode()) {
     return null;
   }
-  const text = fg('platform_editor_block_menu_patch_1') ? formatMessage(messages.copyLinkToBlock) : formatMessage(messages.copyLink);
   return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
     onClick: handleClick,
     elemBefore: /*#__PURE__*/React.createElement(LinkIcon, {
       label: ""
     })
-  }, text);
+  }, formatMessage(messages.copyLinkToBlock));
 };
 export const CopyLinkDropdownItem = injectIntl(CopyLinkDropdownItemContent);

package/dist/es2019/ui/delete-button.js

@@ -1,14 +1,12 @@
 import React, { useCallback, useEffect } from 'react';
 import { useIntl, injectIntl } from 'react-intl-next';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
-import { messages } from '@atlaskit/editor-common/block-menu';
 import { blockMenuMessages } from '@atlaskit/editor-common/messages';
 import { deleteSelectedRange } from '@atlaskit/editor-common/selection';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findTable, isTableSelected } from '@atlaskit/editor-tables/utils';
 import { ToolbarDropdownItem } from '@atlaskit/editor-toolbar';
 import DeleteIcon from '@atlaskit/icon/core/delete';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { Box } from '@atlaskit/primitives/box';
 import Text from '@atlaskit/primitives/text';
 import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
@@ -99,7 +97,6 @@ const DeleteDropdownItemContent = ({
       onRemoveHoverDecoration();
     };
   }, [onRemoveHoverDecoration]);
-  const text = fg('platform_editor_block_menu_patch_1') ? formatMessage(blockMenuMessages.deleteBlock) : formatMessage(messages.deleteBlock);
   return /*#__PURE__*/React.createElement(Box, {
     onMouseEnter: onShowHoverDecoration,
     onMouseLeave: onRemoveHoverDecoration,
@@ -114,6 +111,6 @@ const DeleteDropdownItemContent = ({
   }, /*#__PURE__*/React.createElement(Text, {
     as: "span",
     color: "color.text.danger"
-  }, text)));
+  }, formatMessage(blockMenuMessages.deleteBlock))));
 };
 export const DeleteDropdownItem = injectIntl(DeleteDropdownItemContent);

package/dist/es2019/ui/format-menu-nested.js

@@ -1,7 +1,6 @@
 import React, { useCallback } from 'react';
 import { useIntl } from 'react-intl-next';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
-import { messages } from '@atlaskit/editor-common/block-menu';
 import { blockMenuMessages } from '@atlaskit/editor-common/messages';
 import { ToolbarNestedDropdownMenu } from '@atlaskit/editor-toolbar';
 import ChangesIcon from '@atlaskit/icon/core/changes';
@@ -16,7 +15,6 @@ export const FormatMenuComponent = ({
   const {
     formatMessage
   } = useIntl();
-  const text = fg('platform_editor_block_menu_patch_1') ? formatMessage(blockMenuMessages.turnInto) : formatMessage(messages.turnInto);
   const isDisabled = fg('platform_editor_block_menu_for_disabled_nodes') ? checkIsFormatMenuHidden(api) : false;
   const handleClick = useCallback(() => {
     api === null || api === void 0 ? void 0 : api.core.actions.execute(({
@@ -36,7 +34,7 @@ export const FormatMenuComponent = ({
     });
   }, [api]);
   return /*#__PURE__*/React.createElement(ToolbarNestedDropdownMenu, {
-    text: text,
+    text: formatMessage(blockMenuMessages.turnInto),
     elemBefore: /*#__PURE__*/React.createElement(ChangesIcon, {
       label: ""
     }),

package/dist/es2019/ui/utils/checkIsFormatMenuHidden.js

@@ -16,10 +16,7 @@ const getIsFormatMenuHidden = (selection, schema, menuTriggerBy) => {
     return !!disabledNode || isNested && !fg('platform_editor_block_menu_transform_nested_node');
   }
   let content;
-  const allowedNodes = [nodes.paragraph, nodes.heading, nodes.blockquote, nodes.panel, nodes.codeBlock, nodes.bulletList, nodes.orderedList, nodes.taskList];
-  if (expValEquals('platform_editor_block_menu_layout_format', 'isEnabled', true)) {
-    allowedNodes.push(nodes.layoutSection);
-  }
+  const allowedNodes = [nodes.paragraph, nodes.heading, nodes.blockquote, nodes.panel, nodes.codeBlock, nodes.bulletList, nodes.orderedList, nodes.taskList, nodes.layoutSection];
   if (expValEquals('platform_editor_block_menu_expand_format', 'isEnabled', true)) {
     allowedNodes.push(nodes.expand);
   }
@@ -53,10 +50,7 @@ const getIsFormatMenuHiddenEmptyLine = (selection, schema, menuTriggerBy) => {
     return true;
   } else {
     let content;
-    const allowedNodes = [nodes.paragraph, nodes.heading, nodes.blockquote, nodes.panel, nodes.codeBlock, nodes.bulletList, nodes.orderedList, nodes.taskList];
-    if (expValEquals('platform_editor_block_menu_layout_format', 'isEnabled', true)) {
-      allowedNodes.push(nodes.layoutSection);
-    }
+    const allowedNodes = [nodes.paragraph, nodes.heading, nodes.blockquote, nodes.panel, nodes.codeBlock, nodes.bulletList, nodes.orderedList, nodes.taskList, nodes.layoutSection];
     if (expValEquals('platform_editor_block_menu_expand_format', 'isEnabled', true)) {
       allowedNodes.push(nodes.expand);
     }

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

@@ -141,10 +141,7 @@ export var formatNode = function formatNode(api) {
           return newTr;
         } else {
           var _newTr = formatNodeWhenSelectionEmpty(tr, targetType, nodePos, schema);
-          var allowedNodes = [nodes.blockquote, nodes.panel, nodes.codeBlock];
-          if (expValEquals('platform_editor_block_menu_layout_format', 'isEnabled', true)) {
-            allowedNodes.push(nodes.layoutSection);
-          }
+          var allowedNodes = [nodes.blockquote, nodes.panel, nodes.codeBlock, nodes.layoutSection];
           if (expValEquals('platform_editor_block_menu_expand_format', 'isEnabled', true)) {
             allowedNodes.push(nodes.expand);
           }

package/dist/esm/ui/copy-block.js

@@ -4,7 +4,6 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import React from 'react';
 import { injectIntl, useIntl } from 'react-intl-next';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
-import { messages } from '@atlaskit/editor-common/block-menu';
 import { copyHTMLToClipboard } from '@atlaskit/editor-common/clipboard';
 import { toDOM, copyDomNode } from '@atlaskit/editor-common/copy-button';
 import { blockMenuMessages } from '@atlaskit/editor-common/messages';
@@ -13,7 +12,6 @@ import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state
 import { isTableSelected } from '@atlaskit/editor-tables/utils';
 import { ToolbarDropdownItem } from '@atlaskit/editor-toolbar';
 import CopyIcon from '@atlaskit/icon/core/copy';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { useBlockMenu } from './block-menu-provider';
 import { BLOCK_MENU_ITEM_NAME } from './consts';
@@ -107,7 +105,7 @@ var CopyBlockMenuItem = function CopyBlockMenuItem(_ref) {
         }
         // source sync block (bodiedSyncBlock) is also a special case
         // where we need to copy the content of the bodiedSyncBlock node
-        else if (selection.node.type.name === 'bodiedSyncBlock' && expValEquals('platform_synced_block', 'isEnabled', true) && fg('platform_editor_block_menu_patch_1')) {
+        else if (selection.node.type.name === 'bodiedSyncBlock' && expValEquals('platform_synced_block', 'isEnabled', true)) {
           var bodiedSyncBlockNode = selection.node;
           var _domNode3 = toDOMFromFragment(bodiedSyncBlockNode.content, schema);
           copyDomNode(_domNode3, bodiedSyncBlockNode.type, selection);
@@ -126,12 +124,11 @@ var CopyBlockMenuItem = function CopyBlockMenuItem(_ref) {
       onDropdownOpenChanged(false);
     }
   };
-  var text = fg('platform_editor_block_menu_patch_1') ? formatMessage(blockMenuMessages.copyContent) : formatMessage(messages.copyBlock);
   return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
     elemBefore: /*#__PURE__*/React.createElement(CopyIcon, {
       label: ""
     }),
     onClick: copyHandler
-  }, text);
+  }, formatMessage(blockMenuMessages.copyContent));
 };
 export default injectIntl(CopyBlockMenuItem);

package/dist/esm/ui/copy-link.js

@@ -53,12 +53,11 @@ var CopyLinkDropdownItemContent = function CopyLinkDropdownItemContent(_ref) {
   if (!fg('platform_editor_adf_with_localid') || checkIsNestedNode()) {
     return null;
   }
-  var text = fg('platform_editor_block_menu_patch_1') ? formatMessage(messages.copyLinkToBlock) : formatMessage(messages.copyLink);
   return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
     onClick: handleClick,
     elemBefore: /*#__PURE__*/React.createElement(LinkIcon, {
       label: ""
     })
-  }, text);
+  }, formatMessage(messages.copyLinkToBlock));
 };
 export var CopyLinkDropdownItem = injectIntl(CopyLinkDropdownItemContent);

package/dist/esm/ui/delete-button.js

@@ -1,14 +1,12 @@
 import React, { useCallback, useEffect } from 'react';
 import { useIntl, injectIntl } from 'react-intl-next';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
-import { messages } from '@atlaskit/editor-common/block-menu';
 import { blockMenuMessages } from '@atlaskit/editor-common/messages';
 import { deleteSelectedRange } from '@atlaskit/editor-common/selection';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findTable, isTableSelected } from '@atlaskit/editor-tables/utils';
 import { ToolbarDropdownItem } from '@atlaskit/editor-toolbar';
 import DeleteIcon from '@atlaskit/icon/core/delete';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { Box } from '@atlaskit/primitives/box';
 import Text from '@atlaskit/primitives/text';
 import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
@@ -94,7 +92,6 @@ var DeleteDropdownItemContent = function DeleteDropdownItemContent(_ref) {
       onRemoveHoverDecoration();
     };
   }, [onRemoveHoverDecoration]);
-  var text = fg('platform_editor_block_menu_patch_1') ? formatMessage(blockMenuMessages.deleteBlock) : formatMessage(messages.deleteBlock);
   return /*#__PURE__*/React.createElement(Box, {
     onMouseEnter: onShowHoverDecoration,
     onMouseLeave: onRemoveHoverDecoration,
@@ -109,6 +106,6 @@ var DeleteDropdownItemContent = function DeleteDropdownItemContent(_ref) {
   }, /*#__PURE__*/React.createElement(Text, {
     as: "span",
     color: "color.text.danger"
-  }, text)));
+  }, formatMessage(blockMenuMessages.deleteBlock))));
 };
 export var DeleteDropdownItem = injectIntl(DeleteDropdownItemContent);

package/dist/esm/ui/format-menu-nested.js

@@ -1,7 +1,6 @@
 import React, { useCallback } from 'react';
 import { useIntl } from 'react-intl-next';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
-import { messages } from '@atlaskit/editor-common/block-menu';
 import { blockMenuMessages } from '@atlaskit/editor-common/messages';
 import { ToolbarNestedDropdownMenu } from '@atlaskit/editor-toolbar';
 import ChangesIcon from '@atlaskit/icon/core/changes';
@@ -14,7 +13,6 @@ export var FormatMenuComponent = function FormatMenuComponent(_ref) {
     children = _ref.children;
   var _useIntl = useIntl(),
     formatMessage = _useIntl.formatMessage;
-  var text = fg('platform_editor_block_menu_patch_1') ? formatMessage(blockMenuMessages.turnInto) : formatMessage(messages.turnInto);
   var isDisabled = fg('platform_editor_block_menu_for_disabled_nodes') ? checkIsFormatMenuHidden(api) : false;
   var handleClick = useCallback(function () {
     api === null || api === void 0 || api.core.actions.execute(function (_ref2) {
@@ -33,7 +31,7 @@ export var FormatMenuComponent = function FormatMenuComponent(_ref) {
     });
   }, [api]);
   return /*#__PURE__*/React.createElement(ToolbarNestedDropdownMenu, {
-    text: text,
+    text: formatMessage(blockMenuMessages.turnInto),
     elemBefore: /*#__PURE__*/React.createElement(ChangesIcon, {
       label: ""
     }),

package/dist/esm/ui/utils/checkIsFormatMenuHidden.js

@@ -16,10 +16,7 @@ var getIsFormatMenuHidden = function getIsFormatMenuHidden(selection, schema, me
     return !!disabledNode || isNested && !fg('platform_editor_block_menu_transform_nested_node');
   }
   var content;
-  var allowedNodes = [nodes.paragraph, nodes.heading, nodes.blockquote, nodes.panel, nodes.codeBlock, nodes.bulletList, nodes.orderedList, nodes.taskList];
-  if (expValEquals('platform_editor_block_menu_layout_format', 'isEnabled', true)) {
-    allowedNodes.push(nodes.layoutSection);
-  }
+  var allowedNodes = [nodes.paragraph, nodes.heading, nodes.blockquote, nodes.panel, nodes.codeBlock, nodes.bulletList, nodes.orderedList, nodes.taskList, nodes.layoutSection];
   if (expValEquals('platform_editor_block_menu_expand_format', 'isEnabled', true)) {
     allowedNodes.push(nodes.expand);
   }
@@ -53,10 +50,7 @@ var getIsFormatMenuHiddenEmptyLine = function getIsFormatMenuHiddenEmptyLine(sel
     return true;
   } else {
     var content;
-    var allowedNodes = [nodes.paragraph, nodes.heading, nodes.blockquote, nodes.panel, nodes.codeBlock, nodes.bulletList, nodes.orderedList, nodes.taskList];
-    if (expValEquals('platform_editor_block_menu_layout_format', 'isEnabled', true)) {
-      allowedNodes.push(nodes.layoutSection);
-    }
+    var allowedNodes = [nodes.paragraph, nodes.heading, nodes.blockquote, nodes.panel, nodes.codeBlock, nodes.bulletList, nodes.orderedList, nodes.taskList, nodes.layoutSection];
     if (expValEquals('platform_editor_block_menu_expand_format', 'isEnabled', true)) {
       allowedNodes.push(nodes.expand);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-menu",
-	"version": "5.0.12",
+	"version": "5.0.14",
 	"description": "BlockMenu plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -44,12 +44,12 @@
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/platform-feature-flags-react": "^0.4.0",
 		"@atlaskit/primitives": "^16.2.0",
-		"@atlaskit/tmp-editor-statsig": "^13.39.0",
-		"@atlaskit/tokens": "^8.1.0",
+		"@atlaskit/tmp-editor-statsig": "^13.41.0",
+		"@atlaskit/tokens": "^8.2.0",
 		"@babel/runtime": "^7.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^110.32.0",
+		"@atlaskit/editor-common": "^110.33.0",
 		"react": "^18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"
 	},
@@ -96,9 +96,6 @@
 		"platform_editor_block_menu_transform_nested_node": {
 			"type": "boolean"
 		},
-		"platform_editor_block_menu_patch_1": {
-			"type": "boolean"
-		},
 		"platform_editor_block_menu_for_disabled_nodes": {
 			"type": "boolean"
 		},