@atlaskit/editor-plugin-block-menu 7.0.35 → 7.0.36

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaskit/editor-plugin-block-menu
 
+## 7.0.36
+
+### Patch Changes
+
+- [`1bd298ad0a152`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/1bd298ad0a152) -
+  [ux] EDITOR-6280 Clean up platform_editor_block_menu_v2_patch_3 to fix icon and copy in jira block
+  menu
+- Updated dependencies
+
 ## 7.0.35
 
 ### Patch Changes

package/dist/cjs/ui/block-menu-renderer/fallbacks.js

@@ -10,20 +10,15 @@ var _reactIntlNext = require("react-intl-next");
 var _messages = require("@atlaskit/editor-common/messages");
 var _editorToolbar = require("@atlaskit/editor-toolbar");
 var _chevronRight = _interopRequireDefault(require("@atlaskit/icon/core/chevron-right"));
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var FallbackNestedMenu = function FallbackNestedMenu(_ref) {
   var children = _ref.children;
   var _useIntl = (0, _reactIntlNext.useIntl)(),
     formatMessage = _useIntl.formatMessage;
-  // [FEATURE FLAG: platform_editor_block_menu_v2_patch_3]
-  // Adds size="small" to icons for better visual consistency in block menu.
-  // To clean up: remove conditional, keep only size="small" version.
-  var iconSize = (0, _platformFeatureFlags.fg)('platform_editor_block_menu_v2_patch_3') ? 'small' : undefined;
   return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarNestedDropdownMenu, {
     elemBefore: undefined,
     elemAfter: /*#__PURE__*/_react.default.createElement(_chevronRight.default, {
       label: "",
-      size: iconSize
+      size: "small"
     }),
     text: formatMessage(_messages.blockMenuMessages.fallbackNestedMenu),
     enableMaxHeight: true,

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

@@ -89,28 +89,18 @@ var CopyLinkDropdownItemContent = function CopyLinkDropdownItemContent(_ref) {
   if (!(0, _platformFeatureFlags.fg)('platform_editor_adf_with_localid')) {
     return null;
   }
-
-  // [FEATURE FLAG: platform_editor_block_menu_v2_patch_3]
-  // Conditionally display message based on feature flag
-  // To clean up: remove the conditional and use only copyLinkToSelection message
-  var message = (0, _platformFeatureFlags.fg)('platform_editor_block_menu_v2_patch_3') ? _messages.blockMenuMessages.copyLinkToSelection : _messages.blockMenuMessages.copyLinkToBlock;
-
-  // [FEATURE FLAG: platform_editor_block_menu_v2_patch_3]
-  // Adds size="small" to icons for better visual consistency in block menu.
-  // To clean up: remove conditional, keep only size="small" version.
-  var iconSize = (0, _platformFeatureFlags.fg)('platform_editor_block_menu_v2_patch_3') ? 'small' : undefined;
   return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItem, {
     onClick: handleClick,
     elemBefore: /*#__PURE__*/_react.default.createElement(_link.default, {
       label: "",
-      size: iconSize
+      size: "small"
     }),
     elemAfter: shortcut ? /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarKeyboardShortcutHint, {
       shortcut: shortcut
     }) : undefined,
     ariaKeyshortcuts: shortcut,
     testId: _blockMenu.BLOCK_MENU_ACTION_TEST_ID.COPY_LINK
-  }, formatMessage(message));
+  }, formatMessage(_messages.blockMenuMessages.copyLinkToSelection));
 };
 
 // eslint-disable-next-line @typescript-eslint/ban-types

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

@@ -110,11 +110,6 @@ var DeleteDropdownItemContent = function DeleteDropdownItemContent(_ref) {
       onRemoveHoverDecoration();
     };
   }, [onRemoveHoverDecoration]);
-
-  // [FEATURE FLAG: platform_editor_block_menu_v2_patch_3]
-  // Adds size="small" to icons for better visual consistency in block menu.
-  // To clean up: remove conditional, keep only size="small" version.
-  var iconSize = (0, _platformFeatureFlags.fg)('platform_editor_block_menu_v2_patch_3') ? 'small' : undefined;
   return /*#__PURE__*/_react.default.createElement(_box.Box, {
     onMouseEnter: onShowHoverDecoration,
     onMouseLeave: onRemoveHoverDecoration,
@@ -124,7 +119,7 @@ var DeleteDropdownItemContent = function DeleteDropdownItemContent(_ref) {
     elemBefore: /*#__PURE__*/_react.default.createElement(_delete.default, {
       color: "var(--ds-icon-danger, #C9372C)",
       label: "",
-      size: iconSize
+      size: "small"
     }),
     onClick: onClick,
     testId: _blockMenu.BLOCK_MENU_ACTION_TEST_ID.DELETE

package/dist/cjs/ui/flag.js

@@ -13,7 +13,6 @@ var _hooks = require("@atlaskit/editor-common/hooks");
 var _messages = require("@atlaskit/editor-common/messages");
 var _flag = _interopRequireWildcard(require("@atlaskit/flag"));
 var _checkCircle = _interopRequireDefault(require("@atlaskit/icon/core/check-circle"));
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _blockMenuPluginType = require("../blockMenuPluginType");
 var _main = require("../pm-plugins/main");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
@@ -47,11 +46,6 @@ var Flag = exports.Flag = function Flag(_ref) {
     api === null || api === void 0 || api.core.actions.focus();
   };
   var FlagComponent = flagMap[showFlag].autoDismiss ? _flag.AutoDismissFlag : _flag.default;
-
-  // [FEATURE FLAG: platform_editor_block_menu_v2_patch_3]
-  // Adds size="small" to icons for better visual consistency in block menu.
-  // To clean up: remove conditional, keep only size="small" version.
-  var iconSize = (0, _platformFeatureFlags.fg)('platform_editor_block_menu_v2_patch_3') ? 'small' : undefined;
   return /*#__PURE__*/_react.default.createElement(_flag.FlagGroup, null, /*#__PURE__*/_react.default.createElement(FlagComponent, {
     onDismissed: onDismissed,
     title: formatMessage(title),
@@ -60,7 +54,7 @@ var Flag = exports.Flag = function Flag(_ref) {
     icon: /*#__PURE__*/_react.default.createElement(_checkCircle.default, {
       label: "",
       color: "var(--ds-icon-success, #6A9A23)",
-      size: iconSize
+      size: "small"
     })
   }));
 };

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

@@ -13,7 +13,6 @@ var _messages = require("@atlaskit/editor-common/messages");
 var _editorToolbar = require("@atlaskit/editor-toolbar");
 var _changes = _interopRequireDefault(require("@atlaskit/icon/core/changes"));
 var _chevronRight = _interopRequireDefault(require("@atlaskit/icon/core/chevron-right"));
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _consts = require("./consts");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 var FormatMenuComponent = exports.FormatMenuComponent = function FormatMenuComponent(_ref) {
@@ -37,20 +36,15 @@ var FormatMenuComponent = exports.FormatMenuComponent = function FormatMenuCompo
       return tr;
     });
   }, [api]);
-
-  // [FEATURE FLAG: platform_editor_block_menu_v2_patch_3]
-  // Adds size="small" to icons for better visual consistency in block menu.
-  // To clean up: remove conditional, keep only size="small" version.
-  var iconSize = (0, _platformFeatureFlags.fg)('platform_editor_block_menu_v2_patch_3') ? 'small' : undefined;
   return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarNestedDropdownMenu, {
     text: formatMessage(_messages.blockMenuMessages.turnInto),
     elemBefore: /*#__PURE__*/_react.default.createElement(_changes.default, {
       label: "",
-      size: iconSize
+      size: "small"
     }),
     elemAfter: /*#__PURE__*/_react.default.createElement(_chevronRight.default, {
       label: "",
-      size: iconSize
+      size: "small"
     }),
     enableMaxHeight: true,
     onClick: handleClick,

package/dist/cjs/ui/move-down.js

@@ -16,7 +16,6 @@ var _messages = require("@atlaskit/editor-common/messages");
 var _types = require("@atlaskit/editor-common/types");
 var _editorToolbar = require("@atlaskit/editor-toolbar");
 var _arrowDown = _interopRequireDefault(require("@atlaskit/icon/core/arrow-down"));
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _blockMenuProvider = require("./block-menu-provider");
 var _consts = require("./consts");
 var _fixBlockMenuPositionAndScroll = require("./utils/fixBlockMenuPositionAndScroll");
@@ -68,17 +67,12 @@ var MoveDownDropdownItemContent = function MoveDownDropdownItemContent(_ref) {
       (0, _fixBlockMenuPositionAndScroll.fixBlockMenuPositionAndScroll)(newFirstNode);
     });
   };
-
-  // [FEATURE FLAG: platform_editor_block_menu_v2_patch_3]
-  // Adds size="small" to icons for better visual consistency in block menu.
-  // To clean up: remove conditional, keep only size="small" version.
-  var iconSize = (0, _platformFeatureFlags.fg)('platform_editor_block_menu_v2_patch_3') ? 'small' : undefined;
   return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItem, {
     triggerRef: moveDownRef,
     onClick: handleClick,
     elemBefore: /*#__PURE__*/_react.default.createElement(_arrowDown.default, {
       label: "",
-      size: iconSize
+      size: "small"
     }),
     isDisabled: !canMoveDown,
     testId: _blockMenu.BLOCK_MENU_ACTION_TEST_ID.MOVE_DOWN

package/dist/cjs/ui/move-up.js

@@ -16,7 +16,6 @@ var _messages = require("@atlaskit/editor-common/messages");
 var _types = require("@atlaskit/editor-common/types");
 var _editorToolbar = require("@atlaskit/editor-toolbar");
 var _arrowUp = _interopRequireDefault(require("@atlaskit/icon/core/arrow-up"));
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _blockMenuProvider = require("./block-menu-provider");
 var _consts = require("./consts");
 var _fixBlockMenuPositionAndScroll = require("./utils/fixBlockMenuPositionAndScroll");
@@ -66,17 +65,12 @@ var MoveUpDropdownItemContent = function MoveUpDropdownItemContent(_ref) {
       (0, _fixBlockMenuPositionAndScroll.fixBlockMenuPositionAndScroll)(newFirstNode);
     });
   };
-
-  // [FEATURE FLAG: platform_editor_block_menu_v2_patch_3]
-  // Adds size="small" to icons for better visual consistency in block menu.
-  // To clean up: remove conditional, keep only size="small" version.
-  var iconSize = (0, _platformFeatureFlags.fg)('platform_editor_block_menu_v2_patch_3') ? 'small' : undefined;
   return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItem, {
     triggerRef: moveUpRef,
     onClick: handleClick,
     elemBefore: /*#__PURE__*/_react.default.createElement(_arrowUp.default, {
       label: "",
-      size: iconSize
+      size: "small"
     }),
     isDisabled: !canMoveUp,
     testId: _blockMenu.BLOCK_MENU_ACTION_TEST_ID.MOVE_UP

package/dist/cjs/ui/suggested-items-menu-section.js

@@ -9,7 +9,6 @@ var _react = _interopRequireDefault(require("react"));
 var _reactIntlNext = require("react-intl-next");
 var _messages = require("@atlaskit/editor-common/messages");
 var _editorToolbar = require("@atlaskit/editor-toolbar");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _useSuggestedItems = require("./hooks/useSuggestedItems");
 var _checkHasPreviousSectionContent = require("./utils/checkHasPreviousSectionContent");
 var SuggestedItemsMenuSection = exports.SuggestedItemsMenuSection = /*#__PURE__*/_react.default.memo(function (_ref) {
@@ -21,12 +20,7 @@ var SuggestedItemsMenuSection = exports.SuggestedItemsMenuSection = /*#__PURE__*
   if (suggestedItems.length === 0) {
     return null;
   }
-
-  // [FEATURE FLAG: platform_editor_block_menu_v2_patch_3]
-  // Conditionally show separator based on whether there's content after this section.
-  // Old behavior: always show separator (true).
-  // To clean up: remove conditional, keep only the hasCreateSectionContent || hasStructureSectionContent logic.
-  var hasSeparator = (0, _platformFeatureFlags.fg)('platform_editor_block_menu_v2_patch_3') ? (0, _checkHasPreviousSectionContent.hasCreateSectionContent)(api) || (0, _checkHasPreviousSectionContent.hasStructureSectionContent)(api) : true;
+  var hasSeparator = (0, _checkHasPreviousSectionContent.hasCreateSectionContent)(api) || (0, _checkHasPreviousSectionContent.hasStructureSectionContent)(api);
   return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItemSection, {
     title: formatMessage(_messages.blockMenuMessages.suggested),
     hasSeparator: hasSeparator

package/dist/es2019/ui/block-menu-renderer/fallbacks.js

@@ -3,22 +3,17 @@ import { useIntl } from 'react-intl-next';
 import { blockMenuMessages } from '@atlaskit/editor-common/messages';
 import { ToolbarDropdownItem, ToolbarDropdownItemSection, ToolbarNestedDropdownMenu } from '@atlaskit/editor-toolbar';
 import ChevronRightIcon from '@atlaskit/icon/core/chevron-right';
-import { fg } from '@atlaskit/platform-feature-flags';
 const FallbackNestedMenu = ({
   children
 }) => {
   const {
     formatMessage
   } = useIntl();
-  // [FEATURE FLAG: platform_editor_block_menu_v2_patch_3]
-  // Adds size="small" to icons for better visual consistency in block menu.
-  // To clean up: remove conditional, keep only size="small" version.
-  const iconSize = fg('platform_editor_block_menu_v2_patch_3') ? 'small' : undefined;
   return /*#__PURE__*/React.createElement(ToolbarNestedDropdownMenu, {
     elemBefore: undefined,
     elemAfter: /*#__PURE__*/React.createElement(ChevronRightIcon, {
       label: "",
-      size: iconSize
+      size: "small"
     }),
     text: formatMessage(blockMenuMessages.fallbackNestedMenu),
     enableMaxHeight: true,

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

@@ -88,28 +88,18 @@ const CopyLinkDropdownItemContent = ({
   if (!fg('platform_editor_adf_with_localid')) {
     return null;
   }
-
-  // [FEATURE FLAG: platform_editor_block_menu_v2_patch_3]
-  // Conditionally display message based on feature flag
-  // To clean up: remove the conditional and use only copyLinkToSelection message
-  const message = fg('platform_editor_block_menu_v2_patch_3') ? messages.copyLinkToSelection : messages.copyLinkToBlock;
-
-  // [FEATURE FLAG: platform_editor_block_menu_v2_patch_3]
-  // Adds size="small" to icons for better visual consistency in block menu.
-  // To clean up: remove conditional, keep only size="small" version.
-  const iconSize = fg('platform_editor_block_menu_v2_patch_3') ? 'small' : undefined;
   return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
     onClick: handleClick,
     elemBefore: /*#__PURE__*/React.createElement(LinkIcon, {
       label: "",
-      size: iconSize
+      size: "small"
     }),
     elemAfter: shortcut ? /*#__PURE__*/React.createElement(ToolbarKeyboardShortcutHint, {
       shortcut: shortcut
     }) : undefined,
     ariaKeyshortcuts: shortcut,
     testId: BLOCK_MENU_ACTION_TEST_ID.COPY_LINK
-  }, formatMessage(message));
+  }, formatMessage(messages.copyLinkToSelection));
 };
 
 // eslint-disable-next-line @typescript-eslint/ban-types

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

@@ -106,11 +106,6 @@ const DeleteDropdownItemContent = ({
       onRemoveHoverDecoration();
     };
   }, [onRemoveHoverDecoration]);
-
-  // [FEATURE FLAG: platform_editor_block_menu_v2_patch_3]
-  // Adds size="small" to icons for better visual consistency in block menu.
-  // To clean up: remove conditional, keep only size="small" version.
-  const iconSize = fg('platform_editor_block_menu_v2_patch_3') ? 'small' : undefined;
   return /*#__PURE__*/React.createElement(Box, {
     onMouseEnter: onShowHoverDecoration,
     onMouseLeave: onRemoveHoverDecoration,
@@ -120,7 +115,7 @@ const DeleteDropdownItemContent = ({
     elemBefore: /*#__PURE__*/React.createElement(DeleteIcon, {
       color: "var(--ds-icon-danger, #C9372C)",
       label: "",
-      size: iconSize
+      size: "small"
     }),
     onClick: onClick,
     testId: BLOCK_MENU_ACTION_TEST_ID.DELETE

package/dist/es2019/ui/flag.js

@@ -4,7 +4,6 @@ import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks'
 import { blockMenuMessages as messages } from '@atlaskit/editor-common/messages';
 import AkFlag, { FlagGroup, AutoDismissFlag } from '@atlaskit/flag';
 import SuccessIcon from '@atlaskit/icon/core/check-circle';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { FLAG_ID } from '../blockMenuPluginType';
 import { blockMenuPluginKey } from '../pm-plugins/main';
 const flagMap = {
@@ -45,11 +44,6 @@ export const Flag = ({
     api === null || api === void 0 ? void 0 : api.core.actions.focus();
   };
   const FlagComponent = flagMap[showFlag].autoDismiss ? AutoDismissFlag : AkFlag;
-
-  // [FEATURE FLAG: platform_editor_block_menu_v2_patch_3]
-  // Adds size="small" to icons for better visual consistency in block menu.
-  // To clean up: remove conditional, keep only size="small" version.
-  const iconSize = fg('platform_editor_block_menu_v2_patch_3') ? 'small' : undefined;
   return /*#__PURE__*/React.createElement(FlagGroup, null, /*#__PURE__*/React.createElement(FlagComponent, {
     onDismissed: onDismissed,
     title: formatMessage(title),
@@ -58,7 +52,7 @@ export const Flag = ({
     icon: /*#__PURE__*/React.createElement(SuccessIcon, {
       label: "",
       color: "var(--ds-icon-success, #6A9A23)",
-      size: iconSize
+      size: "small"
     })
   }));
 };

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

@@ -5,7 +5,6 @@ import { blockMenuMessages } from '@atlaskit/editor-common/messages';
 import { ToolbarNestedDropdownMenu } from '@atlaskit/editor-toolbar';
 import ChangesIcon from '@atlaskit/icon/core/changes';
 import ChevronRightIcon from '@atlaskit/icon/core/chevron-right';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { BLOCK_MENU_ITEM_NAME } from './consts';
 export const FormatMenuComponent = ({
   api,
@@ -31,20 +30,15 @@ export const FormatMenuComponent = ({
       return tr;
     });
   }, [api]);
-
-  // [FEATURE FLAG: platform_editor_block_menu_v2_patch_3]
-  // Adds size="small" to icons for better visual consistency in block menu.
-  // To clean up: remove conditional, keep only size="small" version.
-  const iconSize = fg('platform_editor_block_menu_v2_patch_3') ? 'small' : undefined;
   return /*#__PURE__*/React.createElement(ToolbarNestedDropdownMenu, {
     text: formatMessage(blockMenuMessages.turnInto),
     elemBefore: /*#__PURE__*/React.createElement(ChangesIcon, {
       label: "",
-      size: iconSize
+      size: "small"
     }),
     elemAfter: /*#__PURE__*/React.createElement(ChevronRightIcon, {
       label: "",
-      size: iconSize
+      size: "small"
     }),
     enableMaxHeight: true,
     onClick: handleClick,

package/dist/es2019/ui/move-down.js

@@ -8,7 +8,6 @@ import { blockMenuMessages as messages } from '@atlaskit/editor-common/messages'
 import { DIRECTION } from '@atlaskit/editor-common/types';
 import { ToolbarDropdownItem } from '@atlaskit/editor-toolbar';
 import ArrowDownIcon from '@atlaskit/icon/core/arrow-down';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { useBlockMenu } from './block-menu-provider';
 import { BLOCK_MENU_ITEM_NAME } from './consts';
 import { fixBlockMenuPositionAndScroll } from './utils/fixBlockMenuPositionAndScroll';
@@ -65,17 +64,12 @@ const MoveDownDropdownItemContent = ({
       fixBlockMenuPositionAndScroll(newFirstNode);
     });
   };
-
-  // [FEATURE FLAG: platform_editor_block_menu_v2_patch_3]
-  // Adds size="small" to icons for better visual consistency in block menu.
-  // To clean up: remove conditional, keep only size="small" version.
-  const iconSize = fg('platform_editor_block_menu_v2_patch_3') ? 'small' : undefined;
   return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
     triggerRef: moveDownRef,
     onClick: handleClick,
     elemBefore: /*#__PURE__*/React.createElement(ArrowDownIcon, {
       label: "",
-      size: iconSize
+      size: "small"
     }),
     isDisabled: !canMoveDown,
     testId: BLOCK_MENU_ACTION_TEST_ID.MOVE_DOWN

package/dist/es2019/ui/move-up.js

@@ -8,7 +8,6 @@ import { blockMenuMessages as messages } from '@atlaskit/editor-common/messages'
 import { DIRECTION } from '@atlaskit/editor-common/types';
 import { ToolbarDropdownItem } from '@atlaskit/editor-toolbar';
 import ArrowUpIcon from '@atlaskit/icon/core/arrow-up';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { useBlockMenu } from './block-menu-provider';
 import { BLOCK_MENU_ITEM_NAME } from './consts';
 import { fixBlockMenuPositionAndScroll } from './utils/fixBlockMenuPositionAndScroll';
@@ -63,17 +62,12 @@ const MoveUpDropdownItemContent = ({
       fixBlockMenuPositionAndScroll(newFirstNode);
     });
   };
-
-  // [FEATURE FLAG: platform_editor_block_menu_v2_patch_3]
-  // Adds size="small" to icons for better visual consistency in block menu.
-  // To clean up: remove conditional, keep only size="small" version.
-  const iconSize = fg('platform_editor_block_menu_v2_patch_3') ? 'small' : undefined;
   return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
     triggerRef: moveUpRef,
     onClick: handleClick,
     elemBefore: /*#__PURE__*/React.createElement(ArrowUpIcon, {
       label: "",
-      size: iconSize
+      size: "small"
     }),
     isDisabled: !canMoveUp,
     testId: BLOCK_MENU_ACTION_TEST_ID.MOVE_UP

package/dist/es2019/ui/suggested-items-menu-section.js

@@ -2,7 +2,6 @@ import React from 'react';
 import { useIntl } from 'react-intl-next';
 import { blockMenuMessages } from '@atlaskit/editor-common/messages';
 import { ToolbarDropdownItemSection } from '@atlaskit/editor-toolbar';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { useSuggestedItems } from './hooks/useSuggestedItems';
 import { hasCreateSectionContent, hasStructureSectionContent } from './utils/checkHasPreviousSectionContent';
 export const SuggestedItemsMenuSection = /*#__PURE__*/React.memo(({
@@ -16,12 +15,7 @@ export const SuggestedItemsMenuSection = /*#__PURE__*/React.memo(({
   if (suggestedItems.length === 0) {
     return null;
   }
-
-  // [FEATURE FLAG: platform_editor_block_menu_v2_patch_3]
-  // Conditionally show separator based on whether there's content after this section.
-  // Old behavior: always show separator (true).
-  // To clean up: remove conditional, keep only the hasCreateSectionContent || hasStructureSectionContent logic.
-  const hasSeparator = fg('platform_editor_block_menu_v2_patch_3') ? hasCreateSectionContent(api) || hasStructureSectionContent(api) : true;
+  const hasSeparator = hasCreateSectionContent(api) || hasStructureSectionContent(api);
   return /*#__PURE__*/React.createElement(ToolbarDropdownItemSection, {
     title: formatMessage(blockMenuMessages.suggested),
     hasSeparator: hasSeparator

package/dist/esm/ui/block-menu-renderer/fallbacks.js

@@ -3,20 +3,15 @@ import { useIntl } from 'react-intl-next';
 import { blockMenuMessages } from '@atlaskit/editor-common/messages';
 import { ToolbarDropdownItem, ToolbarDropdownItemSection, ToolbarNestedDropdownMenu } from '@atlaskit/editor-toolbar';
 import ChevronRightIcon from '@atlaskit/icon/core/chevron-right';
-import { fg } from '@atlaskit/platform-feature-flags';
 var FallbackNestedMenu = function FallbackNestedMenu(_ref) {
   var children = _ref.children;
   var _useIntl = useIntl(),
     formatMessage = _useIntl.formatMessage;
-  // [FEATURE FLAG: platform_editor_block_menu_v2_patch_3]
-  // Adds size="small" to icons for better visual consistency in block menu.
-  // To clean up: remove conditional, keep only size="small" version.
-  var iconSize = fg('platform_editor_block_menu_v2_patch_3') ? 'small' : undefined;
   return /*#__PURE__*/React.createElement(ToolbarNestedDropdownMenu, {
     elemBefore: undefined,
     elemAfter: /*#__PURE__*/React.createElement(ChevronRightIcon, {
       label: "",
-      size: iconSize
+      size: "small"
     }),
     text: formatMessage(blockMenuMessages.fallbackNestedMenu),
     enableMaxHeight: true,

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

@@ -80,28 +80,18 @@ var CopyLinkDropdownItemContent = function CopyLinkDropdownItemContent(_ref) {
   if (!fg('platform_editor_adf_with_localid')) {
     return null;
   }
-
-  // [FEATURE FLAG: platform_editor_block_menu_v2_patch_3]
-  // Conditionally display message based on feature flag
-  // To clean up: remove the conditional and use only copyLinkToSelection message
-  var message = fg('platform_editor_block_menu_v2_patch_3') ? messages.copyLinkToSelection : messages.copyLinkToBlock;
-
-  // [FEATURE FLAG: platform_editor_block_menu_v2_patch_3]
-  // Adds size="small" to icons for better visual consistency in block menu.
-  // To clean up: remove conditional, keep only size="small" version.
-  var iconSize = fg('platform_editor_block_menu_v2_patch_3') ? 'small' : undefined;
   return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
     onClick: handleClick,
     elemBefore: /*#__PURE__*/React.createElement(LinkIcon, {
       label: "",
-      size: iconSize
+      size: "small"
     }),
     elemAfter: shortcut ? /*#__PURE__*/React.createElement(ToolbarKeyboardShortcutHint, {
       shortcut: shortcut
     }) : undefined,
     ariaKeyshortcuts: shortcut,
     testId: BLOCK_MENU_ACTION_TEST_ID.COPY_LINK
-  }, formatMessage(message));
+  }, formatMessage(messages.copyLinkToSelection));
 };
 
 // eslint-disable-next-line @typescript-eslint/ban-types

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

@@ -101,11 +101,6 @@ var DeleteDropdownItemContent = function DeleteDropdownItemContent(_ref) {
       onRemoveHoverDecoration();
     };
   }, [onRemoveHoverDecoration]);
-
-  // [FEATURE FLAG: platform_editor_block_menu_v2_patch_3]
-  // Adds size="small" to icons for better visual consistency in block menu.
-  // To clean up: remove conditional, keep only size="small" version.
-  var iconSize = fg('platform_editor_block_menu_v2_patch_3') ? 'small' : undefined;
   return /*#__PURE__*/React.createElement(Box, {
     onMouseEnter: onShowHoverDecoration,
     onMouseLeave: onRemoveHoverDecoration,
@@ -115,7 +110,7 @@ var DeleteDropdownItemContent = function DeleteDropdownItemContent(_ref) {
     elemBefore: /*#__PURE__*/React.createElement(DeleteIcon, {
       color: "var(--ds-icon-danger, #C9372C)",
       label: "",
-      size: iconSize
+      size: "small"
     }),
     onClick: onClick,
     testId: BLOCK_MENU_ACTION_TEST_ID.DELETE

package/dist/esm/ui/flag.js

@@ -5,7 +5,6 @@ import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks'
 import { blockMenuMessages as messages } from '@atlaskit/editor-common/messages';
 import AkFlag, { FlagGroup, AutoDismissFlag } from '@atlaskit/flag';
 import SuccessIcon from '@atlaskit/icon/core/check-circle';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { FLAG_ID } from '../blockMenuPluginType';
 import { blockMenuPluginKey } from '../pm-plugins/main';
 var flagMap = _defineProperty({}, FLAG_ID.LINK_COPIED_TO_CLIPBOARD, {
@@ -38,11 +37,6 @@ export var Flag = function Flag(_ref) {
     api === null || api === void 0 || api.core.actions.focus();
   };
   var FlagComponent = flagMap[showFlag].autoDismiss ? AutoDismissFlag : AkFlag;
-
-  // [FEATURE FLAG: platform_editor_block_menu_v2_patch_3]
-  // Adds size="small" to icons for better visual consistency in block menu.
-  // To clean up: remove conditional, keep only size="small" version.
-  var iconSize = fg('platform_editor_block_menu_v2_patch_3') ? 'small' : undefined;
   return /*#__PURE__*/React.createElement(FlagGroup, null, /*#__PURE__*/React.createElement(FlagComponent, {
     onDismissed: onDismissed,
     title: formatMessage(title),
@@ -51,7 +45,7 @@ export var Flag = function Flag(_ref) {
     icon: /*#__PURE__*/React.createElement(SuccessIcon, {
       label: "",
       color: "var(--ds-icon-success, #6A9A23)",
-      size: iconSize
+      size: "small"
     })
   }));
 };

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

@@ -5,7 +5,6 @@ import { blockMenuMessages } from '@atlaskit/editor-common/messages';
 import { ToolbarNestedDropdownMenu } from '@atlaskit/editor-toolbar';
 import ChangesIcon from '@atlaskit/icon/core/changes';
 import ChevronRightIcon from '@atlaskit/icon/core/chevron-right';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { BLOCK_MENU_ITEM_NAME } from './consts';
 export var FormatMenuComponent = function FormatMenuComponent(_ref) {
   var api = _ref.api,
@@ -28,20 +27,15 @@ export var FormatMenuComponent = function FormatMenuComponent(_ref) {
       return tr;
     });
   }, [api]);
-
-  // [FEATURE FLAG: platform_editor_block_menu_v2_patch_3]
-  // Adds size="small" to icons for better visual consistency in block menu.
-  // To clean up: remove conditional, keep only size="small" version.
-  var iconSize = fg('platform_editor_block_menu_v2_patch_3') ? 'small' : undefined;
   return /*#__PURE__*/React.createElement(ToolbarNestedDropdownMenu, {
     text: formatMessage(blockMenuMessages.turnInto),
     elemBefore: /*#__PURE__*/React.createElement(ChangesIcon, {
       label: "",
-      size: iconSize
+      size: "small"
     }),
     elemAfter: /*#__PURE__*/React.createElement(ChevronRightIcon, {
       label: "",
-      size: iconSize
+      size: "small"
     }),
     enableMaxHeight: true,
     onClick: handleClick,

package/dist/esm/ui/move-down.js

@@ -8,7 +8,6 @@ import { blockMenuMessages as messages } from '@atlaskit/editor-common/messages'
 import { DIRECTION } from '@atlaskit/editor-common/types';
 import { ToolbarDropdownItem } from '@atlaskit/editor-toolbar';
 import ArrowDownIcon from '@atlaskit/icon/core/arrow-down';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { useBlockMenu } from './block-menu-provider';
 import { BLOCK_MENU_ITEM_NAME } from './consts';
 import { fixBlockMenuPositionAndScroll } from './utils/fixBlockMenuPositionAndScroll';
@@ -59,17 +58,12 @@ var MoveDownDropdownItemContent = function MoveDownDropdownItemContent(_ref) {
       fixBlockMenuPositionAndScroll(newFirstNode);
     });
   };
-
-  // [FEATURE FLAG: platform_editor_block_menu_v2_patch_3]
-  // Adds size="small" to icons for better visual consistency in block menu.
-  // To clean up: remove conditional, keep only size="small" version.
-  var iconSize = fg('platform_editor_block_menu_v2_patch_3') ? 'small' : undefined;
   return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
     triggerRef: moveDownRef,
     onClick: handleClick,
     elemBefore: /*#__PURE__*/React.createElement(ArrowDownIcon, {
       label: "",
-      size: iconSize
+      size: "small"
     }),
     isDisabled: !canMoveDown,
     testId: BLOCK_MENU_ACTION_TEST_ID.MOVE_DOWN

package/dist/esm/ui/move-up.js

@@ -8,7 +8,6 @@ import { blockMenuMessages as messages } from '@atlaskit/editor-common/messages'
 import { DIRECTION } from '@atlaskit/editor-common/types';
 import { ToolbarDropdownItem } from '@atlaskit/editor-toolbar';
 import ArrowUpIcon from '@atlaskit/icon/core/arrow-up';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { useBlockMenu } from './block-menu-provider';
 import { BLOCK_MENU_ITEM_NAME } from './consts';
 import { fixBlockMenuPositionAndScroll } from './utils/fixBlockMenuPositionAndScroll';
@@ -57,17 +56,12 @@ var MoveUpDropdownItemContent = function MoveUpDropdownItemContent(_ref) {
       fixBlockMenuPositionAndScroll(newFirstNode);
     });
   };
-
-  // [FEATURE FLAG: platform_editor_block_menu_v2_patch_3]
-  // Adds size="small" to icons for better visual consistency in block menu.
-  // To clean up: remove conditional, keep only size="small" version.
-  var iconSize = fg('platform_editor_block_menu_v2_patch_3') ? 'small' : undefined;
   return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
     triggerRef: moveUpRef,
     onClick: handleClick,
     elemBefore: /*#__PURE__*/React.createElement(ArrowUpIcon, {
       label: "",
-      size: iconSize
+      size: "small"
     }),
     isDisabled: !canMoveUp,
     testId: BLOCK_MENU_ACTION_TEST_ID.MOVE_UP

package/dist/esm/ui/suggested-items-menu-section.js

@@ -2,7 +2,6 @@ import React from 'react';
 import { useIntl } from 'react-intl-next';
 import { blockMenuMessages } from '@atlaskit/editor-common/messages';
 import { ToolbarDropdownItemSection } from '@atlaskit/editor-toolbar';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { useSuggestedItems } from './hooks/useSuggestedItems';
 import { hasCreateSectionContent, hasStructureSectionContent } from './utils/checkHasPreviousSectionContent';
 export var SuggestedItemsMenuSection = /*#__PURE__*/React.memo(function (_ref) {
@@ -14,12 +13,7 @@ export var SuggestedItemsMenuSection = /*#__PURE__*/React.memo(function (_ref) {
   if (suggestedItems.length === 0) {
     return null;
   }
-
-  // [FEATURE FLAG: platform_editor_block_menu_v2_patch_3]
-  // Conditionally show separator based on whether there's content after this section.
-  // Old behavior: always show separator (true).
-  // To clean up: remove conditional, keep only the hasCreateSectionContent || hasStructureSectionContent logic.
-  var hasSeparator = fg('platform_editor_block_menu_v2_patch_3') ? hasCreateSectionContent(api) || hasStructureSectionContent(api) : true;
+  var hasSeparator = hasCreateSectionContent(api) || hasStructureSectionContent(api);
   return /*#__PURE__*/React.createElement(ToolbarDropdownItemSection, {
     title: formatMessage(blockMenuMessages.suggested),
     hasSeparator: hasSeparator

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-menu",
-	"version": "7.0.35",
+	"version": "7.0.36",
 	"description": "BlockMenu plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -44,7 +44,7 @@
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/primitives": "^19.0.0",
 		"@atlaskit/prosemirror-history": "^0.2.0",
-		"@atlaskit/tmp-editor-statsig": "^62.0.0",
+		"@atlaskit/tmp-editor-statsig": "^62.2.0",
 		"@atlaskit/tokens": "^13.0.0",
 		"@babel/runtime": "^7.0.0",
 		"bind-event-listener": "^3.0.0"
@@ -94,16 +94,13 @@
 		"platform_editor_adf_with_localid": {
 			"type": "boolean"
 		},
-		"platform_editor_block_menu_jira_patch_1": {
-			"type": "boolean"
-		},
 		"platform_editor_block_menu_copy_section": {
 			"type": "boolean"
 		},
 		"platform_editor_block_menu_v2_patch_2": {
 			"type": "boolean"
 		},
-		"platform_editor_block_menu_v2_patch_3": {
+		"platform_editor_block_menu_jira_patch_1": {
 			"type": "boolean"
 		},
 		"platform_editor_block_menu_divider_patch": {