@atlaskit/editor-plugin-block-menu 5.0.19 → 5.0.21

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/editor-plugin-block-menu
 
+## 5.0.21
+
+### Patch Changes
+
+- [`7583860e8637f`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/7583860e8637f) -
+  EDITOR-3621 Clean up platform_editor_block_menu_keyboard_navigation feature gate
+- [`e3fe76664f63b`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/e3fe76664f63b) -
+  Clean up platform_editor_block_menu_shouldfitcontainer
+- Updated dependencies
+
+## 5.0.20
+
+### Patch Changes
+
+- [`a26ad89b7926c`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/a26ad89b7926c) -
+  [ux] FG cleanup platform_editor_block_menu_for_disabled_nodes
+- Updated dependencies
+
 ## 5.0.19
 
 ### Patch Changes

package/afm-cc/tsconfig.json

@@ -6,7 +6,10 @@
 		"rootDir": "../",
 		"composite": true
 	},
-	"include": ["../src/**/*.ts", "../src/**/*.tsx"],
+	"include": [
+		"../src/**/*.ts",
+		"../src/**/*.tsx"
+	],
 	"exclude": [
 		"../src/**/__tests__/*",
 		"../src/**/*.test.*",
@@ -47,9 +50,6 @@
 		{
 			"path": "../../../design-system/icon/afm-cc/tsconfig.json"
 		},
-		{
-			"path": "../../../design-system/icon-lab/afm-cc/tsconfig.json"
-		},
 		{
 			"path": "../../../platform/feature-flags/afm-cc/tsconfig.json"
 		},

package/afm-jira/tsconfig.json

@@ -50,9 +50,6 @@
 		{
 			"path": "../../../design-system/icon/afm-jira/tsconfig.json"
 		},
-		{
-			"path": "../../../design-system/icon-lab/afm-jira/tsconfig.json"
-		},
 		{
 			"path": "../../../platform/feature-flags/afm-jira/tsconfig.json"
 		},

package/afm-products/tsconfig.json

@@ -50,9 +50,6 @@
 		{
 			"path": "../../../design-system/icon/afm-products/tsconfig.json"
 		},
-		{
-			"path": "../../../design-system/icon-lab/afm-products/tsconfig.json"
-		},
 		{
 			"path": "../../../platform/feature-flags/afm-products/tsconfig.json"
 		},

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

@@ -9,9 +9,8 @@ exports.BlockMenuRenderer = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _react = _interopRequireWildcard(require("react"));
 var _uiMenu = require("@atlaskit/editor-common/ui-menu");
-var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure");
 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 NoOp = function NoOp(props) {
+var NoOp = function NoOp() {
   return null;
 };
 var isNonNestedMenuSection = function isNonNestedMenuSection(component) {
@@ -99,7 +98,7 @@ var BlockMenuRenderer = exports.BlockMenuRenderer = function BlockMenuRenderer(_
       }, children);
     }));
   };
-  return (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu_keyboard_navigation', 'isEnabled', true) ? /*#__PURE__*/_react.default.createElement(_uiMenu.ArrowKeyNavigationProvider, {
+  return /*#__PURE__*/_react.default.createElement(_uiMenu.ArrowKeyNavigationProvider, {
     type: _uiMenu.ArrowKeyNavigationType.MENU
-  }, renderMenu()) : renderMenu();
+  }, renderMenu());
 };

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

@@ -139,7 +139,7 @@ var BlockMenuContent = function BlockMenuContent(_ref3) {
   }));
 };
 var BlockMenu = function BlockMenu(_ref4) {
-  var _editorView$dom, _ref5, _editorView$hasFocus;
+  var _editorView$dom, _ref5;
   var editorView = _ref4.editorView,
     api = _ref4.api,
     mountTo = _ref4.mountTo,
@@ -165,12 +165,12 @@ var BlockMenu = function BlockMenu(_ref4) {
   var targetHandleRef = editorView === null || editorView === void 0 || (_editorView$dom = editorView.dom) === null || _editorView$dom === void 0 ? void 0 : _editorView$dom.querySelector(_styles.DRAG_HANDLE_SELECTOR);
   var prevIsMenuOpenRef = (0, _react.useRef)(false);
   var popupRef = (0, _react.useRef)(undefined);
-  var hasFocus = (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu_keyboard_navigation', 'isEnabled', true) ? (_ref5 = (editorView === null || editorView === void 0 ? void 0 : editorView.hasFocus()) || document.activeElement === targetHandleRef || popupRef.current && (popupRef.current.contains(document.activeElement) || popupRef.current === document.activeElement)) !== null && _ref5 !== void 0 ? _ref5 : false : (_editorView$hasFocus = editorView === null || editorView === void 0 ? void 0 : editorView.hasFocus()) !== null && _editorView$hasFocus !== void 0 ? _editorView$hasFocus : false;
+  var hasFocus = (_ref5 = (editorView === null || editorView === void 0 ? void 0 : editorView.hasFocus()) || document.activeElement === targetHandleRef || popupRef.current && (popupRef.current.contains(document.activeElement) || popupRef.current === document.activeElement)) !== null && _ref5 !== void 0 ? _ref5 : false;
   var hasSelection = !!editorView && !editorView.state.selection.empty;
   // hasSelection true, always show block menu
   // hasSelection false, only show block menu when empty line experiment is enabled
   var shouldShowBlockMenuForEmptyLine = hasSelection || !hasSelection && (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu_empty_line', 'isEnabled', true);
-  var selectedByShortcutOrDragHandle = !!isSelectedViaDragHandle || !!openedViaKeyboard && (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu_keyboard_navigation', 'isEnabled', true);
+  var selectedByShortcutOrDragHandle = !!isSelectedViaDragHandle || !!openedViaKeyboard;
 
   // Use conditional hook based on feature flag
   useConditionalBlockMenuEffect({
@@ -237,7 +237,7 @@ var BlockMenu = function BlockMenu(_ref4) {
       ,
       handleClickOutside: closeMenu,
       handleEscapeKeydown: closeMenu,
-      handleBackspaceDeleteKeydown: (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu_keyboard_navigation', 'isEnabled', true) ? handleBackspaceDeleteKeydown : undefined,
+      handleBackspaceDeleteKeydown: handleBackspaceDeleteKeydown,
       mountTo: mountTo,
       boundariesElement: boundariesElement,
       scrollableElement: scrollableElement,
@@ -248,7 +248,7 @@ var BlockMenu = function BlockMenu(_ref4) {
       preventOverflow: true // disables forced horizontal placement when forcePlacement is on, so fitWidth controls flipping
       ,
       stick: true,
-      focusTrap: (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu_keyboard_navigation', 'isEnabled', true) && openedViaKeyboard ?
+      focusTrap: openedViaKeyboard ?
       // Only enable focus trap when opened via keyboard to make sure the focus is on the first focusable menu item
       {
         initialFocus: undefined
@@ -256,7 +256,7 @@ var BlockMenu = function BlockMenu(_ref4) {
       offset: [_styles.DRAG_HANDLE_WIDTH + DRAG_HANDLE_OFFSET_PADDING, 0]
     }, /*#__PURE__*/_react.default.createElement(BlockMenuContent, {
       api: api,
-      setRef: (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu_keyboard_navigation', 'isEnabled', true) ? setRef : undefined
+      setRef: setRef
     })));
   } else {
     return null;

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

@@ -11,13 +11,10 @@ var _reactIntlNext = require("react-intl-next");
 var _analytics = require("@atlaskit/editor-common/analytics");
 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 _box = require("@atlaskit/primitives/box");
 var _text = _interopRequireDefault(require("@atlaskit/primitives/text"));
-var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure");
 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 DeleteDropdownItemContent = function DeleteDropdownItemContent(_ref) {
@@ -26,7 +23,7 @@ var DeleteDropdownItemContent = function DeleteDropdownItemContent(_ref) {
   var _useIntl = (0, _reactIntlNext.useIntl)(),
     formatMessage = _useIntl.formatMessage;
   var nodeTypes = Object.values((api === null || api === void 0 || (_api$core$sharedState = api.core.sharedState.currentState()) === null || _api$core$sharedState === void 0 || (_api$core$sharedState = _api$core$sharedState.schema) === null || _api$core$sharedState === void 0 ? void 0 : _api$core$sharedState.nodes) || {});
-  var onClick = function onClick(e) {
+  var onClick = function onClick() {
     api === null || api === void 0 || api.core.actions.execute(function (_ref2) {
       var _api$analytics, _api$blockControls;
       var tr = _ref2.tr;
@@ -39,24 +36,7 @@ var DeleteDropdownItemContent = function DeleteDropdownItemContent(_ref) {
         eventType: _analytics.EVENT_TYPE.UI
       };
       api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 || (_api$analytics = _api$analytics.actions) === null || _api$analytics === void 0 || _api$analytics.attachAnalyticsEvent(payload)(tr);
-      if ((0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu_keyboard_navigation', 'isEnabled', true)) {
-        (0, _selection.deleteSelectedRange)(tr);
-      } else {
-        var selection = tr.selection;
-        var from = selection.$from.pos;
-        var to = selection.$to.pos;
-        if (selection instanceof _state.TextSelection) {
-          from = from - 1;
-          to = to + 1;
-        } else if ((0, _utils.isTableSelected)(selection)) {
-          var table = (0, _utils.findTable)(selection);
-          if (table) {
-            from = table.pos;
-            to = table.pos + table.node.nodeSize;
-          }
-        }
-        tr.deleteRange(from, to);
-      }
+      (0, _selection.deleteSelectedRange)(tr);
       api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 || (_api$blockControls = _api$blockControls.commands) === null || _api$blockControls === void 0 || _api$blockControls.toggleBlockMenu({
         closeMenu: true
       })({
@@ -90,13 +70,7 @@ var DeleteDropdownItemContent = function DeleteDropdownItemContent(_ref) {
     });
   }, [api]);
   (0, _react.useEffect)(function () {
-    if (!(0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu_keyboard_navigation', 'isEnabled', true)) {
-      return;
-    }
     return function () {
-      if (!(0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu_keyboard_navigation', 'isEnabled', true)) {
-        return;
-      }
       // clean up hover decoration when unmounting
       onRemoveHoverDecoration();
     };
@@ -104,8 +78,8 @@ var DeleteDropdownItemContent = function DeleteDropdownItemContent(_ref) {
   return /*#__PURE__*/_react.default.createElement(_box.Box, {
     onMouseEnter: onShowHoverDecoration,
     onMouseLeave: onRemoveHoverDecoration,
-    onFocus: (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu_keyboard_navigation', 'isEnabled', true) ? onShowHoverDecoration : undefined,
-    onBlur: (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu_keyboard_navigation', 'isEnabled', true) ? onRemoveHoverDecoration : undefined
+    onFocus: onShowHoverDecoration,
+    onBlur: onRemoveHoverDecoration
   }, /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItem, {
     elemBefore: /*#__PURE__*/_react.default.createElement(_delete.default, {
       color: "var(--ds-icon-danger, #C9372C)",

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

@@ -13,16 +13,13 @@ 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");
-var _checkIsFormatMenuHidden = require("./utils/checkIsFormatMenuHidden");
 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) {
   var api = _ref.api,
     children = _ref.children;
   var _useIntl = (0, _reactIntlNext.useIntl)(),
     formatMessage = _useIntl.formatMessage;
-  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) {
       var _api$analytics;
@@ -48,9 +45,8 @@ var FormatMenuComponent = exports.FormatMenuComponent = function FormatMenuCompo
       label: ""
     }),
     enableMaxHeight: true,
-    isDisabled: isDisabled,
     onClick: handleClick,
     dropdownTestId: "editor-nested-turn-into-menu",
-    shouldFitContainer: (0, _platformFeatureFlags.fg)('platform_editor_block_menu_shouldfitcontainer') ? true : undefined
+    shouldFitContainer: true
   }, children);
 };

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

@@ -7,7 +7,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.FormatMenuSection = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _editorToolbar = require("@atlaskit/editor-toolbar");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _checkIsFormatMenuHidden = require("./utils/checkIsFormatMenuHidden");
 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 FormatMenuSection = exports.FormatMenuSection = function FormatMenuSection(_ref) {
@@ -16,9 +15,7 @@ var FormatMenuSection = exports.FormatMenuSection = function FormatMenuSection(_
   var isFormatMenuHidden = (0, _react.useCallback)(function () {
     return (0, _checkIsFormatMenuHidden.checkIsFormatMenuHidden)(api);
   }, [api]);
-
-  // When platform_editor_block_menu_for_disabled_nodes feature flag is OFF, use the original behavior (hide the menu)
-  if (isFormatMenuHidden() && !(0, _platformFeatureFlags.fg)('platform_editor_block_menu_for_disabled_nodes')) {
+  if (isFormatMenuHidden()) {
     return null;
   }
   return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItemSection, null, children);

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

@@ -1,7 +1,6 @@
 import React, { Fragment } from 'react';
 import { ArrowKeyNavigationProvider, ArrowKeyNavigationType } from '@atlaskit/editor-common/ui-menu';
-import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
-const NoOp = props => null;
+const NoOp = () => null;
 const isNonNestedMenuSection = component => {
   return component.type === 'block-menu-section' && !('parent' in component);
 };
@@ -78,7 +77,7 @@ export const BlockMenuRenderer = ({
       }, children);
     }));
   };
-  return expValEqualsNoExposure('platform_editor_block_menu_keyboard_navigation', 'isEnabled', true) ? /*#__PURE__*/React.createElement(ArrowKeyNavigationProvider, {
+  return /*#__PURE__*/React.createElement(ArrowKeyNavigationProvider, {
     type: ArrowKeyNavigationType.MENU
-  }, renderMenu()) : renderMenu();
+  }, renderMenu());
 };

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

@@ -132,7 +132,7 @@ const BlockMenu = ({
   boundariesElement,
   scrollableElement
 }) => {
-  var _editorView$dom, _ref, _editorView$hasFocus;
+  var _editorView$dom, _ref;
   const {
     menuTriggerBy,
     isSelectedViaDragHandle,
@@ -155,12 +155,12 @@ const BlockMenu = ({
   const targetHandleRef = editorView === null || editorView === void 0 ? void 0 : (_editorView$dom = editorView.dom) === null || _editorView$dom === void 0 ? void 0 : _editorView$dom.querySelector(DRAG_HANDLE_SELECTOR);
   const prevIsMenuOpenRef = useRef(false);
   const popupRef = useRef(undefined);
-  const hasFocus = expValEqualsNoExposure('platform_editor_block_menu_keyboard_navigation', 'isEnabled', true) ? (_ref = (editorView === null || editorView === void 0 ? void 0 : editorView.hasFocus()) || document.activeElement === targetHandleRef || popupRef.current && (popupRef.current.contains(document.activeElement) || popupRef.current === document.activeElement)) !== null && _ref !== void 0 ? _ref : false : (_editorView$hasFocus = editorView === null || editorView === void 0 ? void 0 : editorView.hasFocus()) !== null && _editorView$hasFocus !== void 0 ? _editorView$hasFocus : false;
+  const hasFocus = (_ref = (editorView === null || editorView === void 0 ? void 0 : editorView.hasFocus()) || document.activeElement === targetHandleRef || popupRef.current && (popupRef.current.contains(document.activeElement) || popupRef.current === document.activeElement)) !== null && _ref !== void 0 ? _ref : false;
   const hasSelection = !!editorView && !editorView.state.selection.empty;
   // hasSelection true, always show block menu
   // hasSelection false, only show block menu when empty line experiment is enabled
   const shouldShowBlockMenuForEmptyLine = hasSelection || !hasSelection && expValEqualsNoExposure('platform_editor_block_menu_empty_line', 'isEnabled', true);
-  const selectedByShortcutOrDragHandle = !!isSelectedViaDragHandle || !!openedViaKeyboard && expValEqualsNoExposure('platform_editor_block_menu_keyboard_navigation', 'isEnabled', true);
+  const selectedByShortcutOrDragHandle = !!isSelectedViaDragHandle || !!openedViaKeyboard;
 
   // Use conditional hook based on feature flag
   useConditionalBlockMenuEffect({
@@ -229,7 +229,7 @@ const BlockMenu = ({
       ,
       handleClickOutside: closeMenu,
       handleEscapeKeydown: closeMenu,
-      handleBackspaceDeleteKeydown: expValEqualsNoExposure('platform_editor_block_menu_keyboard_navigation', 'isEnabled', true) ? handleBackspaceDeleteKeydown : undefined,
+      handleBackspaceDeleteKeydown: handleBackspaceDeleteKeydown,
       mountTo: mountTo,
       boundariesElement: boundariesElement,
       scrollableElement: scrollableElement,
@@ -240,7 +240,7 @@ const BlockMenu = ({
       preventOverflow: true // disables forced horizontal placement when forcePlacement is on, so fitWidth controls flipping
       ,
       stick: true,
-      focusTrap: expValEqualsNoExposure('platform_editor_block_menu_keyboard_navigation', 'isEnabled', true) && openedViaKeyboard ?
+      focusTrap: openedViaKeyboard ?
       // Only enable focus trap when opened via keyboard to make sure the focus is on the first focusable menu item
       {
         initialFocus: undefined
@@ -248,7 +248,7 @@ const BlockMenu = ({
       offset: [DRAG_HANDLE_WIDTH + DRAG_HANDLE_OFFSET_PADDING, 0]
     }, /*#__PURE__*/React.createElement(BlockMenuContent, {
       api: api,
-      setRef: expValEqualsNoExposure('platform_editor_block_menu_keyboard_navigation', 'isEnabled', true) ? setRef : undefined
+      setRef: setRef
     })));
   } else {
     return null;

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

@@ -3,13 +3,10 @@ import { useIntl, injectIntl } from 'react-intl-next';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 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 { Box } from '@atlaskit/primitives/box';
 import Text from '@atlaskit/primitives/text';
-import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { BLOCK_MENU_ITEM_NAME } from './consts';
 const DeleteDropdownItemContent = ({
   api
@@ -19,7 +16,7 @@ const DeleteDropdownItemContent = ({
     formatMessage
   } = useIntl();
   const nodeTypes = Object.values((api === null || api === void 0 ? void 0 : (_api$core$sharedState = api.core.sharedState.currentState()) === null || _api$core$sharedState === void 0 ? void 0 : (_api$core$sharedState2 = _api$core$sharedState.schema) === null || _api$core$sharedState2 === void 0 ? void 0 : _api$core$sharedState2.nodes) || {});
-  const onClick = e => {
+  const onClick = () => {
     api === null || api === void 0 ? void 0 : api.core.actions.execute(({
       tr
     }) => {
@@ -33,24 +30,7 @@ const DeleteDropdownItemContent = ({
         eventType: EVENT_TYPE.UI
       };
       api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : (_api$analytics$action = _api$analytics.actions) === null || _api$analytics$action === void 0 ? void 0 : _api$analytics$action.attachAnalyticsEvent(payload)(tr);
-      if (expValEqualsNoExposure('platform_editor_block_menu_keyboard_navigation', 'isEnabled', true)) {
-        deleteSelectedRange(tr);
-      } else {
-        const selection = tr.selection;
-        let from = selection.$from.pos;
-        let to = selection.$to.pos;
-        if (selection instanceof TextSelection) {
-          from = from - 1;
-          to = to + 1;
-        } else if (isTableSelected(selection)) {
-          const table = findTable(selection);
-          if (table) {
-            from = table.pos;
-            to = table.pos + table.node.nodeSize;
-          }
-        }
-        tr.deleteRange(from, to);
-      }
+      deleteSelectedRange(tr);
       api === null || api === void 0 ? void 0 : (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : (_api$blockControls$co = _api$blockControls.commands) === null || _api$blockControls$co === void 0 ? void 0 : _api$blockControls$co.toggleBlockMenu({
         closeMenu: true
       })({
@@ -86,13 +66,7 @@ const DeleteDropdownItemContent = ({
     });
   }, [api]);
   useEffect(() => {
-    if (!expValEqualsNoExposure('platform_editor_block_menu_keyboard_navigation', 'isEnabled', true)) {
-      return;
-    }
     return () => {
-      if (!expValEqualsNoExposure('platform_editor_block_menu_keyboard_navigation', 'isEnabled', true)) {
-        return;
-      }
       // clean up hover decoration when unmounting
       onRemoveHoverDecoration();
     };
@@ -100,8 +74,8 @@ const DeleteDropdownItemContent = ({
   return /*#__PURE__*/React.createElement(Box, {
     onMouseEnter: onShowHoverDecoration,
     onMouseLeave: onRemoveHoverDecoration,
-    onFocus: expValEqualsNoExposure('platform_editor_block_menu_keyboard_navigation', 'isEnabled', true) ? onShowHoverDecoration : undefined,
-    onBlur: expValEqualsNoExposure('platform_editor_block_menu_keyboard_navigation', 'isEnabled', true) ? onRemoveHoverDecoration : undefined
+    onFocus: onShowHoverDecoration,
+    onBlur: onRemoveHoverDecoration
   }, /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
     elemBefore: /*#__PURE__*/React.createElement(DeleteIcon, {
       color: "var(--ds-icon-danger, #C9372C)",

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

@@ -5,9 +5,7 @@ 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';
-import { checkIsFormatMenuHidden } from './utils/checkIsFormatMenuHidden';
 export const FormatMenuComponent = ({
   api,
   children
@@ -15,7 +13,6 @@ export const FormatMenuComponent = ({
   const {
     formatMessage
   } = useIntl();
-  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(({
       tr
@@ -42,9 +39,8 @@ export const FormatMenuComponent = ({
       label: ""
     }),
     enableMaxHeight: true,
-    isDisabled: isDisabled,
     onClick: handleClick,
     dropdownTestId: "editor-nested-turn-into-menu",
-    shouldFitContainer: fg('platform_editor_block_menu_shouldfitcontainer') ? true : undefined
+    shouldFitContainer: true
   }, children);
 };

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

@@ -1,6 +1,5 @@
 import React, { useCallback } from 'react';
 import { ToolbarDropdownItemSection } from '@atlaskit/editor-toolbar';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { checkIsFormatMenuHidden } from './utils/checkIsFormatMenuHidden';
 export const FormatMenuSection = ({
   children,
@@ -9,9 +8,7 @@ export const FormatMenuSection = ({
   const isFormatMenuHidden = useCallback(() => {
     return checkIsFormatMenuHidden(api);
   }, [api]);
-
-  // When platform_editor_block_menu_for_disabled_nodes feature flag is OFF, use the original behavior (hide the menu)
-  if (isFormatMenuHidden() && !fg('platform_editor_block_menu_for_disabled_nodes')) {
+  if (isFormatMenuHidden()) {
     return null;
   }
   return /*#__PURE__*/React.createElement(ToolbarDropdownItemSection, null, children);

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

@@ -1,8 +1,7 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import React, { Fragment } from 'react';
 import { ArrowKeyNavigationProvider, ArrowKeyNavigationType } from '@atlaskit/editor-common/ui-menu';
-import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
-var NoOp = function NoOp(props) {
+var NoOp = function NoOp() {
   return null;
 };
 var isNonNestedMenuSection = function isNonNestedMenuSection(component) {
@@ -90,7 +89,7 @@ export var BlockMenuRenderer = function BlockMenuRenderer(_ref) {
       }, children);
     }));
   };
-  return expValEqualsNoExposure('platform_editor_block_menu_keyboard_navigation', 'isEnabled', true) ? /*#__PURE__*/React.createElement(ArrowKeyNavigationProvider, {
+  return /*#__PURE__*/React.createElement(ArrowKeyNavigationProvider, {
     type: ArrowKeyNavigationType.MENU
-  }, renderMenu()) : renderMenu();
+  }, renderMenu());
 };

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

@@ -131,7 +131,7 @@ var BlockMenuContent = function BlockMenuContent(_ref3) {
   }));
 };
 var BlockMenu = function BlockMenu(_ref4) {
-  var _editorView$dom, _ref5, _editorView$hasFocus;
+  var _editorView$dom, _ref5;
   var editorView = _ref4.editorView,
     api = _ref4.api,
     mountTo = _ref4.mountTo,
@@ -157,12 +157,12 @@ var BlockMenu = function BlockMenu(_ref4) {
   var targetHandleRef = editorView === null || editorView === void 0 || (_editorView$dom = editorView.dom) === null || _editorView$dom === void 0 ? void 0 : _editorView$dom.querySelector(DRAG_HANDLE_SELECTOR);
   var prevIsMenuOpenRef = useRef(false);
   var popupRef = useRef(undefined);
-  var hasFocus = expValEqualsNoExposure('platform_editor_block_menu_keyboard_navigation', 'isEnabled', true) ? (_ref5 = (editorView === null || editorView === void 0 ? void 0 : editorView.hasFocus()) || document.activeElement === targetHandleRef || popupRef.current && (popupRef.current.contains(document.activeElement) || popupRef.current === document.activeElement)) !== null && _ref5 !== void 0 ? _ref5 : false : (_editorView$hasFocus = editorView === null || editorView === void 0 ? void 0 : editorView.hasFocus()) !== null && _editorView$hasFocus !== void 0 ? _editorView$hasFocus : false;
+  var hasFocus = (_ref5 = (editorView === null || editorView === void 0 ? void 0 : editorView.hasFocus()) || document.activeElement === targetHandleRef || popupRef.current && (popupRef.current.contains(document.activeElement) || popupRef.current === document.activeElement)) !== null && _ref5 !== void 0 ? _ref5 : false;
   var hasSelection = !!editorView && !editorView.state.selection.empty;
   // hasSelection true, always show block menu
   // hasSelection false, only show block menu when empty line experiment is enabled
   var shouldShowBlockMenuForEmptyLine = hasSelection || !hasSelection && expValEqualsNoExposure('platform_editor_block_menu_empty_line', 'isEnabled', true);
-  var selectedByShortcutOrDragHandle = !!isSelectedViaDragHandle || !!openedViaKeyboard && expValEqualsNoExposure('platform_editor_block_menu_keyboard_navigation', 'isEnabled', true);
+  var selectedByShortcutOrDragHandle = !!isSelectedViaDragHandle || !!openedViaKeyboard;
 
   // Use conditional hook based on feature flag
   useConditionalBlockMenuEffect({
@@ -229,7 +229,7 @@ var BlockMenu = function BlockMenu(_ref4) {
       ,
       handleClickOutside: closeMenu,
       handleEscapeKeydown: closeMenu,
-      handleBackspaceDeleteKeydown: expValEqualsNoExposure('platform_editor_block_menu_keyboard_navigation', 'isEnabled', true) ? handleBackspaceDeleteKeydown : undefined,
+      handleBackspaceDeleteKeydown: handleBackspaceDeleteKeydown,
       mountTo: mountTo,
       boundariesElement: boundariesElement,
       scrollableElement: scrollableElement,
@@ -240,7 +240,7 @@ var BlockMenu = function BlockMenu(_ref4) {
       preventOverflow: true // disables forced horizontal placement when forcePlacement is on, so fitWidth controls flipping
       ,
       stick: true,
-      focusTrap: expValEqualsNoExposure('platform_editor_block_menu_keyboard_navigation', 'isEnabled', true) && openedViaKeyboard ?
+      focusTrap: openedViaKeyboard ?
       // Only enable focus trap when opened via keyboard to make sure the focus is on the first focusable menu item
       {
         initialFocus: undefined
@@ -248,7 +248,7 @@ var BlockMenu = function BlockMenu(_ref4) {
       offset: [DRAG_HANDLE_WIDTH + DRAG_HANDLE_OFFSET_PADDING, 0]
     }, /*#__PURE__*/React.createElement(BlockMenuContent, {
       api: api,
-      setRef: expValEqualsNoExposure('platform_editor_block_menu_keyboard_navigation', 'isEnabled', true) ? setRef : undefined
+      setRef: setRef
     })));
   } else {
     return null;

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

@@ -3,13 +3,10 @@ import { useIntl, injectIntl } from 'react-intl-next';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 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 { Box } from '@atlaskit/primitives/box';
 import Text from '@atlaskit/primitives/text';
-import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { BLOCK_MENU_ITEM_NAME } from './consts';
 var DeleteDropdownItemContent = function DeleteDropdownItemContent(_ref) {
   var _api$core$sharedState;
@@ -17,7 +14,7 @@ var DeleteDropdownItemContent = function DeleteDropdownItemContent(_ref) {
   var _useIntl = useIntl(),
     formatMessage = _useIntl.formatMessage;
   var nodeTypes = Object.values((api === null || api === void 0 || (_api$core$sharedState = api.core.sharedState.currentState()) === null || _api$core$sharedState === void 0 || (_api$core$sharedState = _api$core$sharedState.schema) === null || _api$core$sharedState === void 0 ? void 0 : _api$core$sharedState.nodes) || {});
-  var onClick = function onClick(e) {
+  var onClick = function onClick() {
     api === null || api === void 0 || api.core.actions.execute(function (_ref2) {
       var _api$analytics, _api$blockControls;
       var tr = _ref2.tr;
@@ -30,24 +27,7 @@ var DeleteDropdownItemContent = function DeleteDropdownItemContent(_ref) {
         eventType: EVENT_TYPE.UI
       };
       api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 || (_api$analytics = _api$analytics.actions) === null || _api$analytics === void 0 || _api$analytics.attachAnalyticsEvent(payload)(tr);
-      if (expValEqualsNoExposure('platform_editor_block_menu_keyboard_navigation', 'isEnabled', true)) {
-        deleteSelectedRange(tr);
-      } else {
-        var selection = tr.selection;
-        var from = selection.$from.pos;
-        var to = selection.$to.pos;
-        if (selection instanceof TextSelection) {
-          from = from - 1;
-          to = to + 1;
-        } else if (isTableSelected(selection)) {
-          var table = findTable(selection);
-          if (table) {
-            from = table.pos;
-            to = table.pos + table.node.nodeSize;
-          }
-        }
-        tr.deleteRange(from, to);
-      }
+      deleteSelectedRange(tr);
       api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 || (_api$blockControls = _api$blockControls.commands) === null || _api$blockControls === void 0 || _api$blockControls.toggleBlockMenu({
         closeMenu: true
       })({
@@ -81,13 +61,7 @@ var DeleteDropdownItemContent = function DeleteDropdownItemContent(_ref) {
     });
   }, [api]);
   useEffect(function () {
-    if (!expValEqualsNoExposure('platform_editor_block_menu_keyboard_navigation', 'isEnabled', true)) {
-      return;
-    }
     return function () {
-      if (!expValEqualsNoExposure('platform_editor_block_menu_keyboard_navigation', 'isEnabled', true)) {
-        return;
-      }
       // clean up hover decoration when unmounting
       onRemoveHoverDecoration();
     };
@@ -95,8 +69,8 @@ var DeleteDropdownItemContent = function DeleteDropdownItemContent(_ref) {
   return /*#__PURE__*/React.createElement(Box, {
     onMouseEnter: onShowHoverDecoration,
     onMouseLeave: onRemoveHoverDecoration,
-    onFocus: expValEqualsNoExposure('platform_editor_block_menu_keyboard_navigation', 'isEnabled', true) ? onShowHoverDecoration : undefined,
-    onBlur: expValEqualsNoExposure('platform_editor_block_menu_keyboard_navigation', 'isEnabled', true) ? onRemoveHoverDecoration : undefined
+    onFocus: onShowHoverDecoration,
+    onBlur: onRemoveHoverDecoration
   }, /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
     elemBefore: /*#__PURE__*/React.createElement(DeleteIcon, {
       color: "var(--ds-icon-danger, #C9372C)",

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

@@ -5,15 +5,12 @@ 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';
-import { checkIsFormatMenuHidden } from './utils/checkIsFormatMenuHidden';
 export var FormatMenuComponent = function FormatMenuComponent(_ref) {
   var api = _ref.api,
     children = _ref.children;
   var _useIntl = useIntl(),
     formatMessage = _useIntl.formatMessage;
-  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) {
       var _api$analytics;
@@ -39,9 +36,8 @@ export var FormatMenuComponent = function FormatMenuComponent(_ref) {
       label: ""
     }),
     enableMaxHeight: true,
-    isDisabled: isDisabled,
     onClick: handleClick,
     dropdownTestId: "editor-nested-turn-into-menu",
-    shouldFitContainer: fg('platform_editor_block_menu_shouldfitcontainer') ? true : undefined
+    shouldFitContainer: true
   }, children);
 };

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

@@ -1,6 +1,5 @@
 import React, { useCallback } from 'react';
 import { ToolbarDropdownItemSection } from '@atlaskit/editor-toolbar';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { checkIsFormatMenuHidden } from './utils/checkIsFormatMenuHidden';
 export var FormatMenuSection = function FormatMenuSection(_ref) {
   var children = _ref.children,
@@ -8,9 +7,7 @@ export var FormatMenuSection = function FormatMenuSection(_ref) {
   var isFormatMenuHidden = useCallback(function () {
     return checkIsFormatMenuHidden(api);
   }, [api]);
-
-  // When platform_editor_block_menu_for_disabled_nodes feature flag is OFF, use the original behavior (hide the menu)
-  if (isFormatMenuHidden() && !fg('platform_editor_block_menu_for_disabled_nodes')) {
+  if (isFormatMenuHidden()) {
     return null;
   }
   return /*#__PURE__*/React.createElement(ToolbarDropdownItemSection, null, children);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-menu",
-	"version": "5.0.19",
+	"version": "5.0.21",
 	"description": "BlockMenu plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -31,7 +31,7 @@
 		"@atlaskit/css": "^0.17.0",
 		"@atlaskit/dropdown-menu": "^16.3.0",
 		"@atlaskit/editor-plugin-analytics": "^6.2.0",
-		"@atlaskit/editor-plugin-block-controls": "^7.9.0",
+		"@atlaskit/editor-plugin-block-controls": "^7.10.0",
 		"@atlaskit/editor-plugin-decorations": "^6.1.0",
 		"@atlaskit/editor-plugin-selection": "^6.1.0",
 		"@atlaskit/editor-plugin-user-intent": "^4.0.0",
@@ -40,16 +40,15 @@
 		"@atlaskit/editor-tables": "^2.9.0",
 		"@atlaskit/editor-toolbar": "^0.17.0",
 		"@atlaskit/icon": "^29.0.0",
-		"@atlaskit/icon-lab": "^5.12.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/platform-feature-flags-react": "^0.4.0",
 		"@atlaskit/primitives": "^16.4.0",
-		"@atlaskit/tmp-editor-statsig": "^13.44.0",
+		"@atlaskit/tmp-editor-statsig": "^14.1.0",
 		"@atlaskit/tokens": "^8.4.0",
 		"@babel/runtime": "^7.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^110.35.0",
+		"@atlaskit/editor-common": "^110.36.0",
 		"react": "^18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"
 	},
@@ -96,12 +95,6 @@
 		"platform_editor_block_menu_transform_nested_node": {
 			"type": "boolean"
 		},
-		"platform_editor_block_menu_for_disabled_nodes": {
-			"type": "boolean"
-		},
-		"platform_editor_block_menu_shouldfitcontainer": {
-			"type": "boolean"
-		},
 		"platform_editor_toolbar_aifc_user_intent_fix": {
 			"type": "boolean"
 		}